This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2002

remotenames: add three new revsets related to remotenames
ClosedPublic

Authored by pulkit on Feb 2 2018, 2:48 AM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG828f44cdfee3: remotenames: add three new revsets related to remotenames
Summary

This patch adds three new revsets 'remotenames', 'remotebookmarks' and
'remotebranches' which will return changesets which have remotenames,
remotebookmarks and remotebranches on them respectively.

The remotenames revset exist in hgremotenames extension and is moved from there
whereas rest of the two revsets are introduced in this patch.

hgremotenames: https://bitbucket.org/seanfarley/hgremotenames

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Feb 2 2018, 2:48 AM
yuja requested changes to this revision.Feb 2 2018, 8:03 AM
yuja added a subscriber: yuja.

These functions look quite similar. Perhaps we can extract a helper function
f(repo, subset, x, rtypes).

hgext/remotenames.py
37

Minor nit: use revsetlang instead.

264

Perhaps this should be:

@revsetpredicate('remotenames()')
def remotenamesrevset...
    """All changesets ...
269

Nit: _("remotenames takes no arguments").

278

cl.hasnode(n) instead of n in repo, which creates a changectx
object?

This revision now requires changes to proceed.Feb 2 2018, 8:03 AM
pulkit updated this revision to Diff 5161.Feb 2 2018, 12:47 PM
yuja accepted this revision.Feb 13 2018, 10:06 AM

Fixed help text and queued, thanks.

This revision is now accepted and ready to land.Feb 13 2018, 10:06 AM
Closed by commit rHG828f44cdfee3: remotenames: add three new revsets related to remotenames (authored by pulkit). · Explain WhyFeb 13 2018, 10:19 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/remotenames.py (44 lines)
Mtests/test-logexchange.t (33 lines)

Diff 5161

hgext/remotenames.py

remotenames.branches remotenames.branches
Boolean value to enable or disable showing of remotebranches Boolean value to enable or disable showing of remotebranches
""" """
from __future__ import absolute_import from __future__ import absolute_import
import UserDict import UserDict
from mercurial.i18n import _
from mercurial.node import ( from mercurial.node import (
bin, bin,
) )
from mercurial import ( from mercurial import (
logexchange, logexchange,
namespaces, namespaces,
pycompat, pycompat,
registrar, registrar,
revsetlang,
yujaUnsubmitted
Not Done

Minor nit: use revsetlang instead.

yuja: Minor nit: use `revsetlang` instead.
smartset,
templatekw, templatekw,
) )
# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
# be specifying the version(s) of Mercurial they are tested with, or # be specifying the version(s) of Mercurial they are tested with, or
# leave the attribute unspecified. # leave the attribute unspecified.
testedwith = 'ships-with-hg-core' testedwith = 'ships-with-hg-core'
configtable = {} configtable = {}
configitem = registrar.configitem(configtable) configitem = registrar.configitem(configtable)
templatekeyword = registrar.templatekeyword() templatekeyword = registrar.templatekeyword()
revsetpredicate = registrar.revsetpredicate()
configitem('remotenames', 'bookmarks', configitem('remotenames', 'bookmarks',
default=True, default=True,
) )
configitem('remotenames', 'branches', configitem('remotenames', 'branches',
default=True, default=True,
) )
repo, ctx = args['repo'], args['ctx'] repo, ctx = args['repo'], args['ctx']
remotebranches = [] remotebranches = []
if 'remotebranches' in repo.names: if 'remotebranches' in repo.names:
remotebranches = repo.names['remotebranches'].names(repo, ctx.node()) remotebranches = repo.names['remotebranches'].names(repo, ctx.node())
return templatekw.showlist('remotebranch', remotebranches, args, return templatekw.showlist('remotebranch', remotebranches, args,
plural='remotebranches') plural='remotebranches')
def _revsetutil(repo, subset, x, rtypes):
yujaUnsubmitted
Not Done

Perhaps this should be:

@revsetpredicate('remotenames()')
def remotenamesrevset...
    """All changesets ...
yuja: Perhaps this should be: ``` @revsetpredicate('remotenames()') def remotenamesrevset...
"""utility function to return a set of revs based on the rtypes"""
revs = set()
cl = repo.changelog
for rtype in rtypes:
yujaUnsubmitted
Not Done

Nit: _("remotenames takes no arguments").

yuja: Nit: `_("remotenames takes no arguments")`.
if rtype in repo.names:
ns = repo.names[rtype]
for name in ns.listnames(repo):
revs.update(ns.nodes(repo, name))
results = (cl.rev(n) for n in revs if cl.hasnode(n))
return subset & smartset.baseset(sorted(results))
@revsetpredicate('remotenames()')
yujaUnsubmitted
Not Done

cl.hasnode(n) instead of n in repo, which creates a changectx
object?

yuja: `cl.hasnode(n)` instead of `n in repo`, which creates a changectx object?
def remotenamesrevset(repo, subset, x):
"""``remotenames()``
All changesets which have a remotename on them.
"""
revsetlang.getargs(x, 0, 0, _("remotenames takes no arguments"))
return _revsetutil(repo, subset, x, ('remotebookmarks', 'remotebranches'))
@revsetpredicate('remotebranches()')
def remotebranchesrevset(repo, subset, x):
"""``remotebranches()``
All changesets which are branch heads on remotes.
"""
revsetlang.getargs(x, 0, 0, _("remotebranches takes no arguments"))
return _revsetutil(repo, subset, x, ('remotebranches',))
@revsetpredicate('remotebookmarks()')
def remotebmarksrevset(repo, subset, x):
"""``remotebookmarks()``
All changesets which have bookmarks on remotes.
"""
revsetlang.getargs(x, 0, 0, _("remotebookmarks takes no arguments"))
return _revsetutil(repo, subset, x, ('remotebookmarks',))

tests/test-logexchange.t

o 3:62615734edd5 [$TESTTMP/server2/foo default/foo] () o 3:62615734edd5 [$TESTTMP/server2/foo default/foo] ()
| |
o 2:28ad74487de9 [] () o 2:28ad74487de9 [] ()
| |
o 1:29becc82797a [] () o 1:29becc82797a [] ()
| |
o 0:18d04c59bb5d [] () o 0:18d04c59bb5d [] ()
Testing the revsets provided by remotenames extension
`remotenames` revset
$ hg log -r "remotenames()" -GT "{rev}:{node|short} {remotenames}\n"
@ 8:3e1487808078 $TESTTMP/server2/wat default/wat
:
: o 7:ec2426147f0e $TESTTMP/server2/default default/default
: |
: o 6:87d6d6676308 $TESTTMP/server2/bar default/bar
:/
o 3:62615734edd5 $TESTTMP/server2/foo default/foo
|
~
`remotebranches` revset
$ hg log -r "remotebranches()" -GT "{rev}:{node|short} {remotenames}\n"
@ 8:3e1487808078 $TESTTMP/server2/wat default/wat
|
~
o 7:ec2426147f0e $TESTTMP/server2/default default/default
|
~
`remotebookmarks` revset
$ hg log -r "remotebookmarks()" -GT "{rev}:{node|short} {remotenames}\n"
o 6:87d6d6676308 $TESTTMP/server2/bar default/bar
:
o 3:62615734edd5 $TESTTMP/server2/foo default/foo
|
~