##// END OF EJS Templates
chore(deps): bumped mercurial to 6.7.4, hg-evolve to 11.1.3, fixed related issues
andverb -
r1248:8cfec191 default
parent child Browse files
Show More
@@ -31,10 +31,10 b' dulwich==0.21.6'
31 urllib3==1.26.14
31 urllib3==1.26.14
32 gunicorn==21.2.0
32 gunicorn==21.2.0
33 packaging==24.0
33 packaging==24.0
34 hg-evolve==11.0.2
34 hg-evolve==11.1.3
35 importlib-metadata==6.0.0
35 importlib-metadata==6.0.0
36 zipp==3.15.0
36 zipp==3.15.0
37 mercurial==6.3.3
37 mercurial==6.7.4
38 more-itertools==9.1.0
38 more-itertools==9.1.0
39 msgpack==1.0.8
39 msgpack==1.0.8
40 orjson==3.10.3
40 orjson==3.10.3
@@ -56,7 +56,7 b' from mercurial.node import bin, hex'
56 from mercurial.encoding import tolocal
56 from mercurial.encoding import tolocal
57 from mercurial.discovery import findcommonoutgoing
57 from mercurial.discovery import findcommonoutgoing
58 from mercurial.hg import peer
58 from mercurial.hg import peer
59 from mercurial.httppeer import makepeer
59 from mercurial.httppeer import make_peer
60 from mercurial.utils.urlutil import url as hg_url
60 from mercurial.utils.urlutil import url as hg_url
61 from mercurial.scmutil import revrange, revsymbol
61 from mercurial.scmutil import revrange, revsymbol
62 from mercurial.node import nullrev
62 from mercurial.node import nullrev
@@ -31,6 +31,7 b' from mercurial import unionrepo'
31 from mercurial import verify
31 from mercurial import verify
32 from mercurial import repair
32 from mercurial import repair
33 from mercurial.error import AmbiguousPrefixLookupError
33 from mercurial.error import AmbiguousPrefixLookupError
34 from mercurial.utils.urlutil import path as hg_path
34
35
35 import vcsserver
36 import vcsserver
36 from vcsserver import exceptions
37 from vcsserver import exceptions
@@ -54,7 +55,7 b' from vcsserver.hgcompat import ('
54 hg_url as url_parser,
55 hg_url as url_parser,
55 httpbasicauthhandler,
56 httpbasicauthhandler,
56 httpdigestauthhandler,
57 httpdigestauthhandler,
57 makepeer,
58 make_peer,
58 instance,
59 instance,
59 match,
60 match,
60 memctx,
61 memctx,
@@ -521,8 +522,10 b' class HgRemote(RemoteBase):'
521 # check for pure hg repos
522 # check for pure hg repos
522 log.debug(
523 log.debug(
523 "Verifying if URL is a Mercurial repository: %s", obfuscated_uri)
524 "Verifying if URL is a Mercurial repository: %s", obfuscated_uri)
525 # Create repo path with custom mercurial path object
524 ui = make_ui_from_config(config)
526 ui = make_ui_from_config(config)
525 peer_checker = makepeer(ui, safe_bytes(url))
527 repo_path = hg_path(ui=ui, rawloc=safe_bytes(test_uri))
528 peer_checker = make_peer(ui, repo_path, False)
526 peer_checker.lookup(b'tip')
529 peer_checker.lookup(b'tip')
527 except Exception as e:
530 except Exception as e:
528 log.warning("URL is not a valid Mercurial repository: %s",
531 log.warning("URL is not a valid Mercurial repository: %s",
@@ -1038,7 +1041,7 b' class HgRemote(RemoteBase):'
1038
1041
1039 # Mercurial internally has a lot of logic that checks ONLY if
1042 # Mercurial internally has a lot of logic that checks ONLY if
1040 # option is defined, we just pass those if they are defined then
1043 # option is defined, we just pass those if they are defined then
1041 opts = {}
1044 opts = {"remote_hidden": False}
1042
1045
1043 if bookmark:
1046 if bookmark:
1044 opts['bookmark'] = [safe_bytes(x) for x in bookmark] \
1047 opts['bookmark'] = [safe_bytes(x) for x in bookmark] \
General Comments 0
You need to be logged in to leave comments. Login now