This is an archive of the discontinued Mercurial Phabricator instance.

Differential D543

revset: accept additional arguments for stringset
ClosedPublic

Authored by quark on Aug 28 2017, 2:09 PM.
Tags
None
Subscribers
ikostia, durham

Details

Reviewers
durham
Group Reviewers
Restricted Project
Commits
rFBHGX2ce6a458869c: revset: accept additional arguments for stringset
Summary

D451 is going to add an order parameter so let's update our code.

Also remove the wrapping of revset.symbols['stringset'], which is no
longer needed by the current Mercurial.

Diff Detail

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

Event Timeline

quark created this revision.Aug 28 2017, 2:09 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptAug 28 2017, 2:09 PM
quark updated this revision to Diff 1357.Aug 28 2017, 2:16 PM
durham accepted this revision.Aug 28 2017, 7:35 PM
durham added a subscriber: durham.

I assume these have adequate test coverage to ensure this didn't break anything.

This revision is now accepted and ready to land.Aug 28 2017, 7:35 PM
ikostia added a subscriber: ikostia.Aug 31 2017, 9:45 AM
ikostia added inline comments.
hgext3rd/gitrevset.py
18

Import keyword is missing here

Closed by commit rFBHGX2ce6a458869c: revset: accept additional arguments for stringset (authored by quark). · Explain WhyAug 31 2017, 2:30 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/fbconduit.py (5 lines)
Mhgext3rd/gitrevset.py (24 lines)
Mhgext3rd/phrevset.py (5 lines)

Diff 1493

hgext3rd/fbconduit.py

def extsetup(ui): def extsetup(ui):
if not conduit_config(ui): if not conduit_config(ui):
ui.warn(_('No conduit host specified in config; disabling fbconduit\n')) ui.warn(_('No conduit host specified in config; disabling fbconduit\n'))
return return
revset.symbols['gitnode'] = gitnode revset.symbols['gitnode'] = gitnode
extensions.wrapfunction(revset, 'stringset', overridestringset) extensions.wrapfunction(revset, 'stringset', overridestringset)
revset.symbols['stringset'] = revset.stringset
revset.methods['string'] = revset.stringset revset.methods['string'] = revset.stringset
revset.methods['symbol'] = revset.stringset revset.methods['symbol'] = revset.stringset
def conduit_config(ui, host=None, path=None, protocol=None): def conduit_config(ui, host=None, path=None, protocol=None):
global conduit_host, conduit_path, conduit_protocol global conduit_host, conduit_path, conduit_protocol
conduit_host = host or ui.config('fbconduit', 'host') conduit_host = host or ui.config('fbconduit', 'host')
conduit_path = path or ui.config('fbconduit', 'path') conduit_path = path or ui.config('fbconduit', 'path')
conduit_protocol = protocol or ui.config('fbconduit', 'protocol') conduit_protocol = protocol or ui.config('fbconduit', 'protocol')
n, lasterror))) n, lasterror)))
else: else:
repo.ui.warn(("Could not translate revision {0}\n".format(n))) repo.ui.warn(("Could not translate revision {0}\n".format(n)))
return subset.filter(lambda r: False) return subset.filter(lambda r: False)
rn = repo[node.bin(hghash)].rev() rn = repo[node.bin(hghash)].rev()
return subset.filter(lambda r: r == rn) return subset.filter(lambda r: r == rn)
def overridestringset(orig, repo, subset, x): def overridestringset(orig, repo, subset, x, *args, **kwargs):
# Is the given revset a phabricator hg hash (ie: rHGEXTaaacb34aacb34aa) # Is the given revset a phabricator hg hash (ie: rHGEXTaaacb34aacb34aa)
phabmatch = phabhashre.match(x) phabmatch = phabhashre.match(x)
if phabmatch: if phabmatch:
phabrepo = phabmatch.group(1) phabrepo = phabmatch.group(1)
phabhash = phabmatch.group(2) phabhash = phabmatch.group(2)
# The hash may be a git hash # The hash may be a git hash
if phabrepo in repo.ui.configlist('fbconduit', 'gitcallsigns', []): if phabrepo in repo.ui.configlist('fbconduit', 'gitcallsigns', []):
return overridestringset(orig, repo, subset, 'g%s' % phabhash) return overridestringset(orig, repo, subset, 'g%s' % phabhash)
m = githashre.match(x) m = githashre.match(x)
if m is not None: if m is not None:
githash = m.group(1) githash = m.group(1)
if len(githash) == 40: if len(githash) == 40:
return gitnode(repo, subset, ('string', githash)) return gitnode(repo, subset, ('string', githash))
else: else:
raise error.Abort('git hash must be 40 characters') raise error.Abort('git hash must be 40 characters')
return orig(repo, subset, x) return orig(repo, subset, x, *args, **kwargs)

hgext3rd/gitrevset.py

# gitrevset.py # gitrevset.py
# #
# Copyright 2014 Facebook, Inc. # Copyright 2014 Facebook, Inc.
"""map a git hash to a Mercurial hash: """map a git hash to a Mercurial hash:
$ hg log -r 'gitnode($HASH)' $ hg log -r 'gitnode($HASH)'
$ hg id -r 'gitnode($HASH)' $ hg id -r 'gitnode($HASH)'
shortversion: shortversion:
$ hg log -r 'g$HASH' $ hg log -r 'g$HASH'
$ hg id -r 'g$HASH' $ hg id -r 'g$HASH'
""" """
from mercurial import extensions
from mercurial import error from __future__ import absolute_import
from mercurial import hg
from mercurial import registrar from mercurial (
ikostiaUnsubmitted
Not Done

Import keyword is missing here

ikostia: Import keyword is missing here
from mercurial import revset error,
extensions,
hg,
registrar,
revset,
)
from mercurial.i18n import _ from mercurial.i18n import _
import re import re
revsetpredicate = registrar.revsetpredicate()
githashre = re.compile('g([0-9a-fA-F]{40,40})') githashre = re.compile('g([0-9a-fA-F]{40,40})')
templatekeyword = registrar.templatekeyword() templatekeyword = registrar.templatekeyword()
@templatekeyword("gitnode") @templatekeyword("gitnode")
def showgitnode(repo, ctx, templ, **args): def showgitnode(repo, ctx, templ, **args):
"""Return the git revision corresponding to a given hg rev""" """Return the git revision corresponding to a given hg rev"""
hexgitnode = _lookup_node(repo, ctx.hex(), from_scm_type='hg') hexgitnode = _lookup_node(repo, ctx.hex(), from_scm_type='hg')
# templates are expected to return an empty string when no # templates are expected to return an empty string when no
# data exists # data exists
return hexgitnode.encode('hex') if hexgitnode else '' return hexgitnode.encode('hex') if hexgitnode else ''
@revsetpredicate('gitnode(id)')
def gitnode(repo, subset, x): def gitnode(repo, subset, x):
"""``gitnode(id)`` """``gitnode(id)``
Return the hg revision corresponding to a given git rev.""" Return the hg revision corresponding to a given git rev."""
l = revset.getargs(x, 1, 1, _("id requires one argument")) l = revset.getargs(x, 1, 1, _("id requires one argument"))
n = revset.getstring(l[0], _("id requires a string")) n = revset.getstring(l[0], _("id requires a string"))
hexhgnode = _lookup_node(repo, n, from_scm_type='git') hexhgnode = _lookup_node(repo, n, from_scm_type='git')
if not hexhgnode: if not hexhgnode:
except error.RepoError: except error.RepoError:
# Note: RepoError can be thrown by hg.peer(), RepoLookupError # Note: RepoError can be thrown by hg.peer(), RepoLookupError
# can be thrown by remoterepo.lookup(). RepoLookupError is a # can be thrown by remoterepo.lookup(). RepoLookupError is a
# subclass of RepoError so catching just error.RepoError is enough. # subclass of RepoError so catching just error.RepoError is enough.
return None return None
finally: finally:
repo.baseui.fout = oldfout repo.baseui.fout = oldfout
def overridestringset(orig, repo, subset, x): def overridestringset(orig, repo, subset, x, *args, **kwargs):
m = githashre.match(x) m = githashre.match(x)
if m is not None: if m is not None:
return gitnode(repo, subset, ('string', m.group(1))) return gitnode(repo, subset, ('string', m.group(1)))
return orig(repo, subset, x) return orig(repo, subset, x, *args, **kwargs)
def extsetup(ui): def extsetup(ui):
revset.symbols['gitnode'] = gitnode
extensions.wrapfunction(revset, 'stringset', overridestringset) extensions.wrapfunction(revset, 'stringset', overridestringset)
revset.symbols['stringset'] = revset.stringset
revset.methods['string'] = revset.stringset revset.methods['string'] = revset.stringset
revset.methods['symbol'] = revset.stringset revset.methods['symbol'] = revset.stringset

hgext3rd/phrevset.py

"You can view the diff at http://phabricator.fb.com/D%s\n\n" "You can view the diff at http://phabricator.fb.com/D%s\n\n"
repo.ui.warn(msg % (diffid, diffid)) repo.ui.warn(msg % (diffid, diffid))
return [] return []
else: else:
raise error.Abort('Conduit returned unknown ' raise error.Abort('Conduit returned unknown '
'sourceControlSystem "%s"' % vcs) 'sourceControlSystem "%s"' % vcs)
def revsetstringset(orig, repo, subset, revstr): def revsetstringset(orig, repo, subset, revstr, *args, **kwargs):
"""Wrapper that recognizes revisions starting with 'D'""" """Wrapper that recognizes revisions starting with 'D'"""
if revstr.startswith('D') and revstr[1:].isdigit(): if revstr.startswith('D') and revstr[1:].isdigit():
return smartset.baseset(revsetdiff(repo, subset, revstr[1:])) return smartset.baseset(revsetdiff(repo, subset, revstr[1:]))
return orig(repo, subset, revstr) return orig(repo, subset, revstr, *args, **kwargs)
def extsetup(ui): def extsetup(ui):
extensions.wrapfunction(revset, 'stringset', revsetstringset) extensions.wrapfunction(revset, 'stringset', revsetstringset)
revset.symbols['stringset'] = revset.stringset
revset.methods['string'] = revset.stringset revset.methods['string'] = revset.stringset
revset.methods['symbol'] = revset.stringset revset.methods['symbol'] = revset.stringset