kallithea Changeset - e8c9ff1da9ba

Changeset - e8c9ff1da9ba

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 15 years ago 2010-12-05 00:52:11
marcin@python-works.com

added revision into version for beta

2 files changed with 38 insertions and 13 deletions:

rhodecode/__init__.py

rhodecode/lib/utils.py

0 comments (0 inline, 0 general)

rhodecode/__init__.py

➞

Show inline comments

 #!/usr/bin/env python
 # encoding: utf-8
 # RhodeCode, a web based repository management based on pylons
 # Copyright (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com>
+#
 # -*- coding: utf-8 -*-
 """
     package.rhodecode.__init__
     ~~~~~~~~~~~~~~
     RhodeCode, a web based repository management based on pylons
     versioning implementation: http://semver.org/
     :created_on: Apr 9, 2010
     :author: marcink
     :copyright: (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 """
 Created on April 9, 2010
 RhodeCode, a web based repository management based on pylons
 versioning implementation: http://semver.org/
 @author: marcink
 """
 VERSION = (1, 1, 0, 'beta')
 __version__ = '.'.join((str(each) for each in VERSION[:4]))
 __version__ = '.'.join((str(each) for each in VERSION[:4]))
 from rhodecode.lib.utils import get_current_revision
 _rev = get_current_revision()
 if 'beta' in VERSION and _rev:
     __version__ += ' [rev:%s]' % _rev[0]
 def get_version():
     """
     Returns shorter version (digit parts only) as string.
     """
     return '.'.join((str(each) for each in VERSION[:3]))
 BACKENDS = {
     'hg': 'Mercurial repository',
    #'git': 'Git repository',
+}

rhodecode/lib/utils.py

➞

Show inline comments

@@ @@ -20,25 +20,24 @@ @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import os
 import logging
 import datetime
 import traceback
 import ConfigParser
 from UserDict import DictMixin
 from mercurial import ui, config, hg
 from mercurial.error import RepoError
 import paste
 import beaker
 from paste.script.command import Command, BadCommand
 from vcs.backends.base import BaseChangeset
 from vcs.utils.lazy import LazyProperty
@@ @@ -434,24 +433,42 @@ def add_cache(settings): @@
             for key, value in cache_settings.items():
                 if key.startswith(region):
                     region_settings[key.split('.')[1]] = value
             region_settings['expire'] = int(region_settings.get('expire',
 ))
             region_settings.setdefault('lock_dir',
                                        cache_settings.get('lock_dir'))
             if 'type' not in region_settings:
                 region_settings['type'] = cache_settings.get('type',
                                                              'memory')
             beaker.cache.cache_regions[region] = region_settings
 def get_current_revision():
     """
     Returns tuple of (number, id) from repository containing this package
     or None if repository could not be found.
     """
     try:
         from vcs import get_repo
         from vcs.utils.helpers import get_scm
         from vcs.exceptions import RepositoryError, VCSError
         repopath = os.path.join(os.path.dirname(__file__), '..', '..')
         scm = get_scm(repopath)[0]
         repo = get_repo(path=repopath, alias=scm)
         tip = repo.get_changeset()
         return (tip.revision, tip.short_id)
     except (ImportError, RepositoryError, VCSError), err:
         logging.debug("Cannot retrieve rhodecode's revision. Original error "
                       "was: %s" % err)
         return None
 #===============================================================================
 # TEST FUNCTIONS AND CREATORS
 #===============================================================================
 def create_test_index(repo_location, full_index):
     """Makes default test index
     :param repo_location:
     :param full_index:
     """
     from rhodecode.lib.indexers.daemon import WhooshIndexingDaemon
     from rhodecode.lib.pidlock import DaemonLock, LockHeld
     import shutil

0 comments (0 inline, 0 general)