kallithea Changeset - c363f492c117

Changeset - c363f492c117

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 7 years ago 2018-10-29 01:07:18
mads@kiilerich.com

hg: refactor compat wrapping of repository

2 files changed with 4 insertions and 5 deletions:

kallithea/lib/vcs/backends/hg/repository.py

kallithea/lib/vcs/utils/hgcompat.py

0 comments (0 inline, 0 general)

kallithea/lib/vcs/backends/hg/repository.py

➞

Show inline comments

@@ @@ -27,13 +27,13 @@ from kallithea.lib.vcs.utils import ( @@
+)
 from kallithea.lib.vcs.utils.lazy import LazyProperty
 from kallithea.lib.vcs.utils.ordered_dict import OrderedDict
 from kallithea.lib.vcs.utils.paths import abspath
 from kallithea.lib.vcs.utils.hgcompat import (
     ui, nullid, match, patch, diffopts, clone, get_contact,
-    localrepository, RepoLookupError, Abort, RepoError, hex, scmutil, hg_url,
+    localrepo, RepoLookupError, Abort, RepoError, hex, scmutil, hg_url,
     httpbasicauthhandler, httpdigestauthhandler, peer, httppeer, sshpeer, tag
+)
 from .changeset import MercurialChangeset
 from .inmemory import MercurialInMemoryChangeset
 from .workdir import MercurialWorkdir
@@ @@ -361,13 +361,13 @@ class MercurialRepository(BaseRepository @@
                     opts.update({'noupdate': True})
                 MercurialRepository._check_url(url, self.baseui)
                 clone(self.baseui, url, self.path, **opts)
                 # Don't try to create if we've already cloned repo
                 create = False
             return localrepository(self.baseui, self.path, create=create)
+            return localrepo.localrepository(self.baseui, self.path, create=create)
         except (Abort, RepoError) as err:
             if create:
                 msg = "Cannot create repository at %s. Original error was %s" \
                     % (self.path, err)
             else:
                 msg = "Not valid repository at %s. Original error was %s" \

kallithea/lib/vcs/utils/hgcompat.py

➞

Show inline comments

@@ @@ -15,13 +15,12 @@ from mercurial import config @@
 from mercurial import tags as tagsmod
 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
 from mercurial.hgweb.common import get_contact
 from mercurial.localrepo import localrepository
 from mercurial.match import match
 from mercurial.mdiff import diffopts
 from mercurial.node import hex
 from mercurial.encoding import tolocal
 from mercurial.discovery import findcommonoutgoing
 from mercurial.hg import peer
@@ @@ -42,15 +41,15 @@ import inspect @@
 if inspect.getargspec(memfilectx.__init__).args[2] != 'changectx':
     __org_memfilectx = memfilectx
     memfilectx = lambda repo, changectx, *args, **kwargs: __org_memfilectx(repo, *args, **kwargs)
 # workaround for 3.3 94ac64bcf6fe and not calling largefiles reposetup correctly
 localrepository._lfstatuswriters = [lambda *msg, **opts: None]
+localrepo.localrepository._lfstatuswriters = [lambda *msg, **opts: None]
 # 3.5 7699d3212994 added the invariant that repo.lfstatus must exist before hitting overridearchive
 localrepository.lfstatus = False
+localrepo.localrepository.lfstatus = False
 # Mercurial 4.2 moved tag from localrepo to the tags module
 def tag(repo, *args):
     try:
         tag_f  = tagsmod.tag
     except AttributeError:

0 comments (0 inline, 0 general)