mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 23:38:50 +03:00
675d0280a6
Summary: Only match the "Differential Revision" label at the start of a line. We have some diffs that include legitimate-looking Differential Revision label strings inside parts of their test plan, which previously confused the phabdiff output. Test Plan: Included a unit test. Reviewers: #sourcecontrol, quark, akushner Reviewed By: akushner Subscribers: net-systems-diffs@fb.com, yogeshwer, mjpieters Differential Revision: https://phabricator.intern.facebook.com/D4793483 Signature: t1:4793483:1490756514:05b2c49d5d65e1a3eadd5eb78ed0b91ef3bea42c
58 lines
1.9 KiB
Python
58 lines
1.9 KiB
Python
import re
|
|
from operator import itemgetter
|
|
|
|
diffrevisionregex = re.compile('^Differential Revision:.*/D(\d+)', re.M)
|
|
|
|
def parserevfromcommitmsg(description):
|
|
"""Parses the D123 revision number from a commit message.
|
|
Returns just the revision number without the D prefix.
|
|
Matches any URL as a candidate, not just our internal phabricator
|
|
host, so this can also work with our public phabricator instance,
|
|
or for others.
|
|
"""
|
|
match = diffrevisionregex.search(description)
|
|
return match.group(1) if match else None
|
|
|
|
def getcurrentdiffidforrev(client, phabrev):
|
|
"""Given a revision number (the 123 from D123), returns the current
|
|
diff id associated with that revision. """
|
|
|
|
res = client.call('differential.query', {'ids': [phabrev]})
|
|
if not res:
|
|
return None
|
|
|
|
info = res[0]
|
|
if not info:
|
|
return None
|
|
|
|
diffs = info.get('diffs', [])
|
|
if not diffs:
|
|
return None
|
|
|
|
return max(diffs)
|
|
|
|
def getlocalcommitfordiffid(client, diffid):
|
|
"""Returns the most recent local:commits entry for a phabricator diff_id"""
|
|
|
|
res = client.call('differential.getdiffproperties', {
|
|
'diff_id': diffid,
|
|
'names': ['local:commits']})
|
|
if not res:
|
|
return None
|
|
|
|
localcommits = res.get('local:commits', {})
|
|
if not localcommits:
|
|
return None
|
|
|
|
# Order with most recent commit time first. A more completely correct
|
|
# implementation would toposort based on the parents properties, however,
|
|
# wez thinks that we should only contain a single entry most of the time,
|
|
# and our best prior art used to just take the first item that showed up
|
|
# in the dictionary. Sorting gives us some determinism, so we will at
|
|
# least be consistently wrong if we're wrong.
|
|
localcommits = sorted(localcommits.values(),
|
|
key=itemgetter('time'), reverse=True)
|
|
|
|
return localcommits[0]
|
|
|