This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10428

debugbackupbundle: use `get_unique_pull_path`
ClosedPublic

Authored by marmoute on Apr 14 2021, 7:39 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGd7b36a4e03de: debugbackupbundle: use `get_unique_pull_path`
Summary

This is the last known user of ui.expandpath outside of urlutil. Hooray.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

marmoute created this revision.Apr 14 2021, 7:39 PM
pulkit accepted this revision.Apr 17 2021, 4:56 PM
This revision is now accepted and ready to land.Apr 17 2021, 4:56 PM
marmoute added a commit: rHGd7b36a4e03de: debugbackupbundle: use `get_unique_pull_path`.Apr 17 2021, 6:12 PM
Closed by commit rHGd7b36a4e03de: debugbackupbundle: use `get_unique_pull_path` (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/debugcommands.py (10 lines)

Diff 26884

mercurial/debugcommands.py

) )
ui.status(msg, label=b"status.removed") ui.status(msg, label=b"status.removed")
else: else:
ui.status(_(b"no backup changesets found\n")) ui.status(_(b"no backup changesets found\n"))
return return
for backup in backups: for backup in backups:
# Much of this is copied from the hg incoming logic # Much of this is copied from the hg incoming logic
source = ui.expandpath(os.path.relpath(backup, encoding.getcwd())) source = os.path.relpath(backup, encoding.getcwd())
source, branches = urlutil.parseurl(source, opts.get(b"branch")) source, branches = urlutil.get_unique_pull_path(
b'debugbackupbundle',
repo,
ui,
source,
default_branches=opts.get(b'branch'),
)
try: try:
other = hg.peer(repo, opts, source) other = hg.peer(repo, opts, source)
except error.LookupError as ex: except error.LookupError as ex:
msg = _(b"\nwarning: unable to open bundle %s") % source msg = _(b"\nwarning: unable to open bundle %s") % source
hint = _(b"\n(missing parent rev %s)\n") % short(ex.name) hint = _(b"\n(missing parent rev %s)\n") % short(ex.name)
ui.warn(msg, hint=hint) ui.warn(msg, hint=hint)
continue continue
revs, checkout = hg.addbranchrevs( revs, checkout = hg.addbranchrevs(