This is an archive of the discontinued Mercurial Phabricator instance.

Differential D126

phabricator: add status to revision query language
ClosedPublic

Authored by quark on Jul 18 2017, 5:10 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGfb59192b4981: phabricator: add status to revision query language
Summary

This patch adds status words (ex. abandoned, accepted, needsreview,
needsrevision, closed) to the revision query language so people can
select revision in a more flexible way.

Test Plan

Try something like phabread ':2 & accepted', phabread ':105 - closed and
make sure they have desired outputs.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

quark created this revision.Jul 18 2017, 5:10 AM
quark abandoned this revision.Jul 18 2017, 5:37 PM
quark reclaimed this revision.Aug 1 2017, 4:39 PM
quark updated this revision to Diff 488.
quark updated this revision to Diff 556.Aug 4 2017, 3:55 PM
quark updated this revision to Diff 571.Aug 4 2017, 6:13 PM
quark updated this revision to Diff 841.Aug 13 2017, 12:41 AM
durin42 accepted this revision.Aug 15 2017, 5:43 PM
durin42 added a subscriber: durin42.

queued, thanks

This revision is now accepted and ready to land.Aug 15 2017, 5:43 PM
Closed by commit rHGfb59192b4981: phabricator: add status to revision query language (authored by quark). · Explain WhyAug 15 2017, 5:49 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/phabricator.py (28 lines)

Diff 571

contrib/phabricator.py

ui.write(('%s\n' % desc), label='phabsend.desc') ui.write(('%s\n' % desc), label='phabsend.desc')
if ui.promptchoice(_('Phabsend the above changes (yn)?' if ui.promptchoice(_('Phabsend the above changes (yn)?'
'$$ &Yes $$ &No')): '$$ &Yes $$ &No')):
return False return False
return True return True
_knownstatusnames = {'accepted', 'needsreview', 'needsrevision', 'closed',
'abandoned'}
def _getstatusname(drev):
"""get normalized status name from a Differential Revision"""
return drev[r'statusName'].replace(' ', '').lower()
# Small language to specify differential revisions. Support symbols: (), :X, # Small language to specify differential revisions. Support symbols: (), :X,
# +, and -. # +, and -.
_elements = { _elements = {
# token-type: binding-strength, primary, prefix, infix, suffix # token-type: binding-strength, primary, prefix, infix, suffix
'(': (12, None, ('group', 1, ')'), None, None), '(': (12, None, ('group', 1, ')'), None, None),
':': (8, None, ('ancestors', 8), None, None), ':': (8, None, ('ancestors', 8), None, None),
'&': (5, None, None, ('and_', 5), None), '&': (5, None, None, ('and_', 5), None),
'+': (4, None, None, ('add', 4), None), '+': (4, None, None, ('add', 4), None),
'-': (4, None, None, ('sub', 4), None), '-': (4, None, None, ('sub', 4), None),
')': (0, None, None, None, None), ')': (0, None, None, None, None),
'symbol': (0, 'symbol', None, None, None), 'symbol': (0, 'symbol', None, None, None),
'end': (0, None, None, None, None), 'end': (0, None, None, None, None),
} }
def _tokenize(text): def _tokenize(text):
text = text.replace(' ', '') # remove space
view = memoryview(text) # zero-copy slice view = memoryview(text) # zero-copy slice
special = '():+-&' special = '():+-& '
pos = 0 pos = 0
length = len(text) length = len(text)
while pos < length: while pos < length:
symbol = ''.join(itertools.takewhile(lambda ch: ch not in special, symbol = ''.join(itertools.takewhile(lambda ch: ch not in special,
view[pos:])) view[pos:]))
if symbol: if symbol:
yield ('symbol', symbol, pos) yield ('symbol', symbol, pos)
pos += len(symbol) pos += len(symbol)
else: # special char else: # special char, ignore space
if text[pos] != ' ':
yield (text[pos], None, pos) yield (text[pos], None, pos)
pos += 1 pos += 1
yield ('end', None, pos) yield ('end', None, pos)
def _parse(text): def _parse(text):
tree, pos = parser.parser(_elements).parse(_tokenize(text)) tree, pos = parser.parser(_elements).parse(_tokenize(text))
if pos != len(text): if pos != len(text):
raise error.ParseError('invalid token', pos) raise error.ParseError('invalid token', pos)
return tree return tree
batchsize = repo.ui.configint('phabricator', 'batchsize', 12) batchsize = repo.ui.configint('phabricator', 'batchsize', 12)
# Prefetch Differential Revisions in batch # Prefetch Differential Revisions in batch
tofetch = set(drevs) tofetch = set(drevs)
for r in ancestordrevs: for r in ancestordrevs:
tofetch.update(range(max(1, r - batchsize), r + 1)) tofetch.update(range(max(1, r - batchsize), r + 1))
if drevs: if drevs:
fetch({r'ids': list(tofetch)}) fetch({r'ids': list(tofetch)})
getstack(list(ancestordrevs)) validids = sorted(set(getstack(list(ancestordrevs))) | set(drevs))
# Walk through the tree, return smartsets # Walk through the tree, return smartsets
def walk(tree): def walk(tree):
op = tree[0] op = tree[0]
if op == 'symbol': if op == 'symbol':
drev = _parsedrev(tree[1]) drev = _parsedrev(tree[1])
if drev: if drev:
return smartset.baseset([drev]) return smartset.baseset([drev])
elif tree[1] in _knownstatusnames:
drevs = [r for r in validids
if _getstatusname(prefetched[r]) == tree[1]]
return smartset.baseset(drevs)
else: else:
raise error.Abort(_('unknown symbol: %s') % tree[1]) raise error.Abort(_('unknown symbol: %s') % tree[1])
elif op in {'and_', 'add', 'sub'}: elif op in {'and_', 'add', 'sub'}:
assert len(tree) == 3 assert len(tree) == 3
return getattr(operator, op)(walk(tree[1]), walk(tree[2])) return getattr(operator, op)(walk(tree[1]), walk(tree[2]))
elif op == 'group': elif op == 'group':
return walk(tree[1]) return walk(tree[1])
elif op == 'ancestors': elif op == 'ancestors':
def phabread(ui, repo, spec, **opts): def phabread(ui, repo, spec, **opts):
"""print patches from Phabricator suitable for importing """print patches from Phabricator suitable for importing
DREVSPEC could be a Differential Revision identity, like ``D123``, or just DREVSPEC could be a Differential Revision identity, like ``D123``, or just
the number ``123``. It could also have common operators like ``+``, ``-``, the number ``123``. It could also have common operators like ``+``, ``-``,
``&``, ``(``, ``)`` for complex queries. Prefix ``:`` could be used to ``&``, ``(``, ``)`` for complex queries. Prefix ``:`` could be used to
select a stack. select a stack.
``abandoned``, ``accepted``, ``closed``, ``needsreview``, ``needsrevision``
could be used to filter patches by status. For performance reason, they
only represent a subset of non-status selections and cannot be used alone.
For example, ``:D6+8-(2+D4)`` selects a stack up to D6, plus D8 and exclude For example, ``:D6+8-(2+D4)`` selects a stack up to D6, plus D8 and exclude
D2 and D4. D2 and D4. ``:D9 & needsreview`` selects "Needs Review" revisions in a
stack up to D9.
If --stack is given, follow dependencies information and read all patches. If --stack is given, follow dependencies information and read all patches.
It is equivalent to the ``:`` operator. It is equivalent to the ``:`` operator.
""" """
if opts.get('stack'): if opts.get('stack'):
spec = ':(%s)' % spec spec = ':(%s)' % spec
drevs = querydrev(repo, spec) drevs = querydrev(repo, spec)
readpatch(repo, drevs, ui.write) readpatch(repo, drevs, ui.write)