revi-archive/phorge-arcanist
1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-09-19 00:18:50 +02:00
Code Issues Releases Wiki Activity

Update arc-hg to support mercurial 6.1

Browse source 
Summary:
Updated the mercurial script to pull the `parseurl` function from the new module if pulling from the old module fails.

Also updated pulling of `remoteopts` to follow the same pattern of fallback.

Fixes T13672

Test Plan:
Using mercurial 6.1 I ran `arc patch Dnnnnn --trace` and verified that it succeeded and in the trace output it used the `arc-ls-markers` extension.

Using mercurial 4.7 I ran `arc patch Dnnnnn --trace` and verified that it succeeded and in the trace output it used the `arc-ls-markers` extension.

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: Korvin

Maniphest Tasks: T13672

Differential Revision: https://secure.phabricator.com/D21747
This commit is contained in:
Christopher Speck 2022-03-11 12:55:56 -05:00
parent b50a646a3f
commit f0a2b699ba
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
support/hg/arc-hg.py
View file

@ -39,12 +39,17 @@ except:
command = cmdutil.command(cmdtable)
try:
if "remoteopts" in cmdutil:
remoteopts = cmdutil.remoteopts
remoteopts = cmdutil.remoteopts
except:
from mercurial import commands
remoteopts = commands.remoteopts
try:
parseurl = hg.parseurl
except:
from mercurial import utils
parseurl = utils.urlutil.parseurl
@command(
b'arc-amend',
[
@ -268,7 +273,7 @@ def remotemarkers(ui, repo, source, opts):
markers = []
source, branches = hg.parseurl(ui.expandpath(source))
source, branches = parseurl(ui.expandpath(source))
remote = hg.peer(repo, opts, source)
with remote.commandexecutor() as e: