quark updated this revision to Diff 841. REPOSITORY rHG Mercurial
CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D126?vs=571&id=841 REVISION DETAIL https://phab.mercurial-scm.org/D126 AFFECTED FILES contrib/phabricator.py CHANGE DETAILS diff --git a/contrib/phabricator.py b/contrib/phabricator.py --- a/contrib/phabricator.py +++ b/contrib/phabricator.py @@ -488,6 +488,13 @@ 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, # +, and -. @@ -504,19 +511,19 @@ } def _tokenize(text): - text = text.replace(' ', '') # remove space view = memoryview(text) # zero-copy slice - special = '():+-&' + special = '():+-& ' pos = 0 length = len(text) while pos < length: symbol = ''.join(itertools.takewhile(lambda ch: ch not in special, view[pos:])) if symbol: yield ('symbol', symbol, pos) pos += len(symbol) - else: # special char - yield (text[pos], None, pos) + else: # special char, ignore space + if text[pos] != ' ': + yield (text[pos], None, pos) pos += 1 yield ('end', None, pos) @@ -644,15 +651,19 @@ tofetch.update(range(max(1, r - batchsize), r + 1)) if drevs: fetch({r'ids': list(tofetch)}) - getstack(list(ancestordrevs)) + validids = sorted(set(getstack(list(ancestordrevs))) | set(drevs)) # Walk through the tree, return smartsets def walk(tree): op = tree[0] if op == 'symbol': drev = _parsedrev(tree[1]) if 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: raise error.Abort(_('unknown symbol: %s') % tree[1]) elif op in {'and_', 'add', 'sub'}: @@ -772,8 +783,13 @@ ``&``, ``(``, ``)`` for complex queries. Prefix ``:`` could be used to 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 - 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. It is equivalent to the ``:`` operator. To: quark, #hg-reviewers Cc: mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
