This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10448

bookmark: use `list_paths` to access path definition
ClosedPublic

Authored by marmoute on Apr 15 2021, 8:55 PM.

Details

Reviewers
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHG353718f741a8: bookmark: use `list_paths` to access path definition
Summary

The content of the [paths] config section is receiving transformation that
make it hard to recognise whats the actual name, and the next changeset will
make it worse. So we use the official API for this instead.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Apr 15 2021, 8:55 PM
baymax updated this revision to Diff 27017.Apr 17 2021, 7:44 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Alphare accepted this revision.Apr 29 2021, 9:16 AM
This revision is now accepted and ready to land.Apr 29 2021, 9:16 AM
baymax updated this revision to Diff 27208.Apr 29 2021, 1:47 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 27236.Apr 30 2021, 8:25 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 27420.May 3 2021, 9:53 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

pulkit accepted this revision.May 10 2021, 3:21 PM
marmoute added a commit: rHG353718f741a8: bookmark: use `list_paths` to access path definition.May 15 2021, 7:21 PM
Closed by commit rHG353718f741a8: bookmark: use `list_paths` to access path definition (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/bookmarks.py (11 lines)

Diff 27925

mercurial/bookmarks.py

refers ``remotenode``. refers ``remotenode``.
""" """
if b == b'@': if b == b'@':
b = b'' b = b''
# try to use an @pathalias suffix # try to use an @pathalias suffix
# if an @pathalias already exists, we overwrite (update) it # if an @pathalias already exists, we overwrite (update) it
if path.startswith(b"file:"): if path.startswith(b"file:"):
path = urlutil.url(path).path path = urlutil.url(path).path
for p, u in ui.configitems(b"paths"): for name, p in urlutil.list_paths(ui):
if u.startswith(b"file:"): loc = p.rawloc
u = urlutil.url(u).path if loc.startswith(b"file:"):
if path == u: loc = urlutil.url(loc).path
return b'%s@%s' % (b, p) if path == loc:
return b'%s@%s' % (b, name)
# assign a unique "@number" suffix newly # assign a unique "@number" suffix newly
for x in range(1, 100): for x in range(1, 100):
n = b'%s@%d' % (b, x) n = b'%s@%d' % (b, x)
if n not in localmarks or localmarks[n] == remotenode: if n not in localmarks or localmarks[n] == remotenode:
return n return n
return None return None