This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1801

Use named group for parsing differential reviews lines.
ClosedPublic

Authored by tom.prince on Jan 2 2018, 12:09 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGa0d33f4ddff9: phabricator: use named group for parsing differential reviews lines

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

tom.prince created this revision.Jan 2 2018, 12:09 PM
indygreg accepted this revision.Jan 14 2018, 2:26 PM
indygreg added a subscriber: indygreg.

Thanks for the improvement.

For future patches, please make the commit message of the form topic: short summary of changes. hg log should give you plenty of examples.

I'll tweak the commit message as part of landing this.

This revision is now accepted and ready to land.Jan 14 2018, 2:26 PM
Closed by commit rHGa0d33f4ddff9: phabricator: use named group for parsing differential reviews lines (authored by tom.prince). · Explain WhyJan 14 2018, 2:34 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/phabricator.py (6 lines)

Diff 4818

contrib/phabricator.py

if len(query[r'data']) == 0: if len(query[r'data']) == 0:
return None return None
repophid = encoding.strtolocal(query[r'data'][0][r'phid']) repophid = encoding.strtolocal(query[r'data'][0][r'phid'])
repo.ui.setconfig('phabricator', 'repophid', repophid) repo.ui.setconfig('phabricator', 'repophid', repophid)
return repophid return repophid
_differentialrevisiontagre = re.compile('\AD([1-9][0-9]*)\Z') _differentialrevisiontagre = re.compile('\AD([1-9][0-9]*)\Z')
_differentialrevisiondescre = re.compile( _differentialrevisiondescre = re.compile(
'^Differential Revision:\s*(?:.*)D([1-9][0-9]*)$', re.M) '^Differential Revision:\s*(?P<url>(?:.*)D(?P<id>[1-9][0-9]*))$', re.M)
def getoldnodedrevmap(repo, nodelist): def getoldnodedrevmap(repo, nodelist):
"""find previous nodes that has been sent to Phabricator """find previous nodes that has been sent to Phabricator
return {node: (oldnode, Differential diff, Differential Revision ID)} return {node: (oldnode, Differential diff, Differential Revision ID)}
for node in nodelist with known previous sent versions, or associated for node in nodelist with known previous sent versions, or associated
Differential Revision IDs. ``oldnode`` and ``Differential diff`` could Differential Revision IDs. ``oldnode`` and ``Differential diff`` could
be ``None``. be ``None``.
m = _differentialrevisiontagre.match(tag) m = _differentialrevisiontagre.match(tag)
if m: if m:
toconfirm[node] = (0, set(precnodes), int(m.group(1))) toconfirm[node] = (0, set(precnodes), int(m.group(1)))
continue continue
# Check commit message # Check commit message
m = _differentialrevisiondescre.search(ctx.description()) m = _differentialrevisiondescre.search(ctx.description())
if m: if m:
toconfirm[node] = (1, set(precnodes), int(m.group(1))) toconfirm[node] = (1, set(precnodes), int(m.group('id')))
# Double check if tags are genuine by collecting all old nodes from # Double check if tags are genuine by collecting all old nodes from
# Phabricator, and expect precursors overlap with it. # Phabricator, and expect precursors overlap with it.
if toconfirm: if toconfirm:
drevs = [drev for force, precs, drev in toconfirm.values()] drevs = [drev for force, precs, drev in toconfirm.values()]
alldiffs = callconduit(unfi, 'differential.querydiffs', alldiffs = callconduit(unfi, 'differential.querydiffs',
{'revisionIDs': drevs}) {'revisionIDs': drevs})
getnode = lambda d: bin(encoding.unitolocal( getnode = lambda d: bin(encoding.unitolocal(
if revid: if revid:
action = 'updated' action = 'updated'
else: else:
action = 'created' action = 'created'
# Create a local tag to note the association, if commit message # Create a local tag to note the association, if commit message
# does not have it already # does not have it already
m = _differentialrevisiondescre.search(ctx.description()) m = _differentialrevisiondescre.search(ctx.description())
if not m or int(m.group(1)) != newrevid: if not m or int(m.group('id')) != newrevid:
tagname = 'D%d' % newrevid tagname = 'D%d' % newrevid
tags.tag(repo, tagname, ctx.node(), message=None, user=None, tags.tag(repo, tagname, ctx.node(), message=None, user=None,
date=None, local=True) date=None, local=True)
else: else:
# Nothing changed. But still set "newrevid" so the next revision # Nothing changed. But still set "newrevid" so the next revision
# could depend on this one. # could depend on this one.
newrevid = revid newrevid = revid
action = 'skipped' action = 'skipped'