This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10444

template: add a `paths` field to all entry in peerurls
ClosedPublic

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

Details

Reviewers
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHG9c4d30b079e0: template: add a `paths` field to all entry in peerurls
Summary

This make it possible to display multiple path per name in the near future.

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:03 PM
baymax updated this revision to Diff 27013.Apr 17 2021, 7:44 PM

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

Alphare accepted this revision.Apr 20 2021, 11:24 AM
Alphare added a subscriber: Alphare.

Note, your description contains peersurl instead of peerurls, which had me confused when grepping.

This revision is now accepted and ready to land.Apr 20 2021, 11:24 AM
baymax updated this revision to Diff 27204.Apr 29 2021, 1:47 PM

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

pulkit added a subscriber: pulkit.Apr 30 2021, 5:58 AM
In D10444#159506, @Alphare wrote:

Note, your description contains peersurl instead of peerurls, which had me confused when grepping.

Yeah the description needs an update.

baymax retitled this revision from template: add a `paths` field to all entry in peersurl to template: add a `paths` field to all entry in peerurls.Apr 30 2021, 8:25 AM
baymax updated this revision to Diff 27232.

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

baymax updated this revision to Diff 27416.May 3 2021, 9:52 AM

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

pulkit accepted this revision.May 6 2021, 3:07 PM
marmoute added a commit: rHG9c4d30b079e0: template: add a `paths` field to all entry in peerurls.May 15 2021, 7:21 PM
Closed by commit rHG9c4d30b079e0: template: add a `paths` field to all entry in peerurls (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/templatekw.py (7 lines)
Mtests/test-paths.t (3 lines)

Diff 27921

mercurial/templatekw.py

# see commands.paths() for naming of dictionary keys # see commands.paths() for naming of dictionary keys
paths = repo.ui.paths paths = repo.ui.paths
all_paths = urlutil.list_paths(repo.ui) all_paths = urlutil.list_paths(repo.ui)
urls = util.sortdict((k, p.rawloc) for k, p in all_paths) urls = util.sortdict((k, p.rawloc) for k, p in all_paths)
def makemap(k): def makemap(k):
p = paths[k] p = paths[k]
d = {b'name': k, b'url': p.rawloc} d = {b'name': k, b'url': p.rawloc}
d.update((o, v) for o, v in sorted(pycompat.iteritems(p.suboptions))) sub_opts = util.sortdict(sorted(pycompat.iteritems(p.suboptions)))
d.update(sub_opts)
path_dict = util.sortdict()
path_dict[b'url'] = p.rawloc
path_dict.update(sub_opts)
d[b'urls'] = [path_dict]
return d return d
def format_one(k): def format_one(k):
return b'%s=%s' % (k, urls[k]) return b'%s=%s' % (k, urls[k])
return _hybrid(None, urls, makemap, format_one) return _hybrid(None, urls, makemap, format_one)

tests/test-paths.t

$ hg log -rnull -T '{join(peerurls, "\n")}\n' $ hg log -rnull -T '{join(peerurls, "\n")}\n'
dupe=$TESTTMP/b#tip dupe=$TESTTMP/b#tip
expand=$TESTTMP/a/$SOMETHING/bar expand=$TESTTMP/a/$SOMETHING/bar
$ hg log -rnull -T '{peerurls % "{name}: {url}\n"}' $ hg log -rnull -T '{peerurls % "{name}: {url}\n"}'
dupe: $TESTTMP/b#tip dupe: $TESTTMP/b#tip
expand: $TESTTMP/a/$SOMETHING/bar expand: $TESTTMP/a/$SOMETHING/bar
$ hg log -rnull -T '{get(peerurls, "dupe")}\n' $ hg log -rnull -T '{get(peerurls, "dupe")}\n'
$TESTTMP/b#tip $TESTTMP/b#tip
$ hg log -rnull -T '{peerurls % "{urls|json}\n"}'
[{"pushurl": "https://example.com/dupe", "url": "$TESTTMP/b#tip"}]
[{"url": "$TESTTMP/a/$SOMETHING/bar"}]
(sub options can be populated by map/dot operation) (sub options can be populated by map/dot operation)
$ hg log -rnull \ $ hg log -rnull \
> -T '{get(peerurls, "dupe") % "url: {url}\npushurl: {pushurl}\n"}' > -T '{get(peerurls, "dupe") % "url: {url}\npushurl: {pushurl}\n"}'
url: $TESTTMP/b#tip url: $TESTTMP/b#tip
pushurl: https://example.com/dupe pushurl: https://example.com/dupe
$ hg log -rnull -T '{peerurls.dupe.pushurl}\n' $ hg log -rnull -T '{peerurls.dupe.pushurl}\n'