kallithea Changeset - 03dfcbe52906

Changeset - 03dfcbe52906

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 8 years ago 2018-05-11 14:26:48
mads@kiilerich.com

hg: support sshpeer renaming to sshv1peer in Mercurial 4.6

This is only used for URL validation.

1 file changed with 4 insertions and 1 deletions:

kallithea/lib/vcs/utils/hgcompat.py

0 comments (0 inline, 0 general)

kallithea/lib/vcs/utils/hgcompat.py

➞

Show inline comments

@@ @@ -17,25 +17,28 @@ from mercurial.commands import clone, nu @@
 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
 from mercurial.httppeer import httppeer
 from mercurial.sshpeer import sshpeer
 try: # sshpeer was renamed in Mercurial 4.6 (625038cb4b1d), but v1 is still good enough
     from mercurial.sshpeer import sshv1peer as sshpeer
 except ImportError:
     from mercurial.sshpeer import sshpeer
 from mercurial.util import url as hg_url
 from mercurial.scmutil import revrange
 from mercurial.node import nullrev
 from mercurial.url import httpbasicauthhandler, httpdigestauthhandler
 # Mercurial 4.5 8a0cac20a1ad introduced an extra memctx changectx argument
 # - introduce an optional wrapper factory that doesn't pass it on
 import inspect
 if inspect.getargspec(memfilectx.__init__).args[2] != 'changectx':
     __org_memfilectx = memfilectx
     memfilectx = lambda repo, changectx, *args, **kwargs: __org_memfilectx(repo, *args, **kwargs)

0 comments (0 inline, 0 general)