This is an archive of the discontinued Mercurial Phabricator instance.

Differential D33

phabricator: respect metadata sent by arc
ClosedPublic

Authored by quark on Jul 11 2017, 11:56 AM.

Details

Reviewers
durin42
Commits
rHGde7c6ec27d99: phabricator: respect metadata sent by arc
Summary

Previously we only respect hg:meta sent by phabsend. This patch makes it
respect local:commits sent by arc as well. This avoids issues where phabread
could lose the author information.

Test Plan

Commit using a customized user, send the patch using arc to a test
Phabricator instance, and then read the patch using phabread. Make sure it
preserves the user information.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

quark created this revision.Jul 11 2017, 11:56 AM
quark updated this revision to Diff 62.Jul 11 2017, 12:22 PM
durin42 accepted this revision.Jul 14 2017, 11:57 AM
This revision is now accepted and ready to land.Jul 14 2017, 11:57 AM
Closed by commit rHGde7c6ec27d99: phabricator: respect metadata sent by arc (authored by quark). · Explain WhyJul 14 2017, 1:24 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/phabricator.py (60 lines)

Diff 62

contrib/phabricator.py

title = drev[r'title'] title = drev[r'title']
summary = drev[r'summary'].rstrip() summary = drev[r'summary'].rstrip()
testplan = drev[r'testPlan'].rstrip() testplan = drev[r'testPlan'].rstrip()
if testplan: if testplan:
testplan = 'Test Plan:\n%s' % testplan testplan = 'Test Plan:\n%s' % testplan
uri = 'Differential Revision: %s' % drev[r'uri'] uri = 'Differential Revision: %s' % drev[r'uri']
return '\n\n'.join(filter(None, [title, summary, testplan, uri])) return '\n\n'.join(filter(None, [title, summary, testplan, uri]))
def getdiffmeta(diff):
"""get commit metadata (date, node, user, p1) from a diff object
The metadata could be "hg:meta", sent by phabsend, like:
"properties": {
"hg:meta": {
"date": "1499571514 25200",
"node": "98c08acae292b2faf60a279b4189beb6cff1414d",
"user": "Foo Bar <foo@example.com>",
"parent": "6d0abad76b30e4724a37ab8721d630394070fe16"
}
}
Or converted from "local:commits", sent by "arc", like:
"properties": {
"local:commits": {
"98c08acae292b2faf60a279b4189beb6cff1414d": {
"author": "Foo Bar",
"time": 1499546314,
"branch": "default",
"tag": "",
"commit": "98c08acae292b2faf60a279b4189beb6cff1414d",
"rev": "98c08acae292b2faf60a279b4189beb6cff1414d",
"local": "1000",
"parents": ["6d0abad76b30e4724a37ab8721d630394070fe16"],
"summary": "...",
"message": "...",
"authorEmail": "foo@example.com"
}
}
}
Note: metadata extracted from "local:commits" will lose time zone
information.
"""
props = diff.get(r'properties') or {}
meta = props.get(r'hg:meta')
if not meta and props.get(r'local:commits'):
commit = sorted(props[r'local:commits'].values())[0]
meta = {
r'date': r'%d 0' % commit[r'time'],
r'node': commit[r'rev'],
r'user': r'%s <%s>' % (commit[r'author'], commit[r'authorEmail']),
}
if len(commit.get(r'parents', ())) >= 1:
meta[r'parent'] = commit[r'parents'][0]
return meta or {}
def readpatch(repo, params, write, stack=False): def readpatch(repo, params, write, stack=False):
"""generate plain-text patch readable by 'hg import' """generate plain-text patch readable by 'hg import'
write is usually ui.write. params is passed to "differential.query". If write is usually ui.write. params is passed to "differential.query". If
stack is True, also write dependent patches. stack is True, also write dependent patches.
""" """
# Differential Revisions # Differential Revisions
drevs = querydrev(repo, params, stack) drevs = querydrev(repo, params, stack)
diffid = max(int(v) for v in drev[r'diffs']) diffid = max(int(v) for v in drev[r'diffs'])
body = callconduit(repo, 'differential.getrawdiff', {'diffID': diffid}) body = callconduit(repo, 'differential.getrawdiff', {'diffID': diffid})
desc = getdescfromdrev(drev) desc = getdescfromdrev(drev)
header = '# HG changeset patch\n' header = '# HG changeset patch\n'
# Try to preserve metadata from hg:meta property. Write hg patch # Try to preserve metadata from hg:meta property. Write hg patch
# headers that can be read by the "import" command. See patchheadermap # headers that can be read by the "import" command. See patchheadermap
# and extract in mercurial/patch.py for supported headers. # and extract in mercurial/patch.py for supported headers.
props = diffs[str(diffid)][r'properties'] # could be empty list or dict meta = getdiffmeta(diffs[str(diffid)])
if props and r'hg:meta' in props:
meta = props[r'hg:meta']
for k in _metanamemap.keys(): for k in _metanamemap.keys():
if k in meta: if k in meta:
header += '# %s %s\n' % (_metanamemap[k], meta[k]) header += '# %s %s\n' % (_metanamemap[k], meta[k])
write(('%s%s\n%s') % (header, desc, body)) write(('%s%s\n%s') % (header, desc, body))
@command('phabread', @command('phabread',
[('', 'stack', False, _('read dependencies'))], [('', 'stack', False, _('read dependencies'))],
_('REVID [OPTIONS]')) _('REVID [OPTIONS]'))
def phabread(ui, repo, revid, **opts): def phabread(ui, repo, revid, **opts):
"""print patches from Phabricator suitable for importing """print patches from Phabricator suitable for importing