kallithea Changeset - 70e646b2806a

Changeset - 70e646b2806a

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 14 years ago 2011-10-11 02:14:42
marcin@python-works.com

fixes rhodecode upgrade problem that caused setuptool to crash on importing sqlalchemy models

3 files changed with 24 insertions and 21 deletions:

rhodecode/__init__.py

rhodecode/lib/__init__.py

rhodecode/lib/utils.py

0 comments (0 inline, 0 general)

rhodecode/__init__.py

➞

Show inline comments

@@ @@ -32,13 +32,13 @@ __platform__ = platform.system() @@
 __license__ = 'GPLv3'
 PLATFORM_WIN = ('Windows')
 PLATFORM_OTHERS = ('Linux', 'Darwin', 'FreeBSD', 'OpenBSD', 'SunOS')
 try:
-    from rhodecode.lib.utils import get_current_revision
     from rhodecode.lib import get_current_revision
     _rev = get_current_revision()
 except ImportError:
     #this is needed when doing some setup.py operations
     _rev = False
 if len(VERSION) > 3 and _rev:

rhodecode/lib/__init__.py

➞

Show inline comments

@@ @@ -20,12 +20,14 @@ @@
 # 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, see <http://www.gnu.org/licenses/>.
 import os
 def __get_lem():
     from pygments import lexers
     from string import lower
     from collections import defaultdict
     d = defaultdict(lambda: [])
@@ @@ -376,6 +378,27 @@ def get_changeset_safe(repo, rev): @@
     try:
         cs = repo.get_changeset(rev)
     except RepositoryError:
         from rhodecode.lib.utils import EmptyChangeset
         cs = EmptyChangeset(requested_revision=rev)
     return cs
 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:
         print ("Cannot retrieve rhodecode's revision. Original error "
                "was: %s" % err)
         return None

rhodecode/lib/utils.py

➞

Show inline comments

@@ @@ -442,32 +442,12 @@ def add_cache(settings): @@
             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, config, full_index):
     """
     Makes default test index

0 comments (0 inline, 0 general)