kallithea Changeset - 42bca6fa923b

Changeset - 42bca6fa923b

Parent rev.

Child rev.

[Not reviewed]

default

1 3 0

Mads Kiilerich - 12 years ago 2013-06-12 01:36:35
madski@unity3d.com

unionrepo: update for Mercurial 2.6

4 files changed with 3 insertions and 221 deletions:

rhodecode/controllers/compare.py

rhodecode/lib/dbmigrate/schema/db_1_6_0.py

rhodecode/lib/unionrepo.py

218

rhodecode/lib/vcs/utils/hgcompat.py

0 comments (0 inline, 0 general)

rhodecode/controllers/compare.py

➞

Show inline comments

@@ @@ -32,17 +32,17 @@ from webob.exc import HTTPNotFound @@
 from pylons import request, response, session, tmpl_context as c, url
 from pylons.controllers.util import abort, redirect
 from pylons.i18n.translation import _
 from rhodecode.lib.vcs.exceptions import EmptyRepositoryError, RepositoryError
 from rhodecode.lib.vcs.utils import safe_str
 from rhodecode.lib.vcs.utils.hgcompat import scmutil
+from rhodecode.lib.vcs.utils.hgcompat import scmutil, unionrepo
 from rhodecode.lib import helpers as h
 from rhodecode.lib.base import BaseRepoController, render
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
-from rhodecode.lib import diffs, unionrepo
 from rhodecode.lib import diffs
 from rhodecode.model.db import Repository
 from webob.exc import HTTPBadRequest
 from rhodecode.lib.diffs import LimitedDiffContainer

rhodecode/lib/dbmigrate/schema/db_1_6_0.py

➞

Show inline comments

@@ @@ -2036,7 +2036,6 @@ class DbMigrateVersion(Base, BaseModel): @@
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8'},
+    )
     repository_id = Column('repository_id', String(250), primary_key=True)
     repository_path = Column('repository_path', Text)
     version = Column('version', Integer)

rhodecode/lib/unionrepo.py

➞

Show inline comments

deleted file

rhodecode/lib/vcs/utils/hgcompat.py

➞

Show inline comments

@@ @@ -6,12 +6,13 @@ import mercurial @@
 import mercurial.demandimport
 ## patch demandimport, due to bug in mercurial when it allways triggers demandimport.enable()
 mercurial.demandimport.enable = lambda *args, **kwargs: 1
 from mercurial import archival, merge as hg_merge, patch, ui
 from mercurial import discovery
 from mercurial import localrepo
 from mercurial import unionrepo
 from mercurial import scmutil
 from mercurial import config
 from mercurial.commands import clone, nullid, pull
 from mercurial.context import memctx, memfilectx
 from mercurial.error import RepoError, RepoLookupError, Abort
 from mercurial.hgweb import hgweb_mod

0 comments (0 inline, 0 general)