This is an archive of the discontinued Mercurial Phabricator instance.

Differential D514

phabsend: show associated Differential Revisions with --confirm
ClosedPublic

Authored by quark on Aug 24 2017, 9:15 PM.

Details

Reviewers
indygreg
durin42
Group Reviewers
hg-reviewers
Commits
rHG088598153aa2: phabsend: show associated Differential Revisions with --confirm
Summary

Often people running phabsend --confirm just want to check whether a
commit will trigger a creation of new Differential Revision, or update an
existing one. This patch implements that. The --confirm message was
changed to use node instead of revision number to be consistent with what
phabsend outputs.

An example output looks like:

D487 - a80f447973a0 test-extension: enable demandimport explicitly
D494 - cf440ea6e47e test-casecollision-merge: fix the test
NEW - 0a6b97147128 phabsend: polish the docstring a bit
Send the above changes to https://phab.mercurial-scm.org/ (yn)?

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

quark created this revision.Aug 24 2017, 9:15 PM
quark updated this revision to Diff 1275.Aug 25 2017, 12:02 AM
indygreg accepted this revision.Aug 25 2017, 12:06 AM
This revision is now accepted and ready to land.Aug 25 2017, 12:06 AM
quark updated this revision to Diff 1279.Aug 25 2017, 12:33 AM
pulkit added a subscriber: pulkit.Aug 26 2017, 7:32 AM

Thanks for this. I was also thinking to add this to the --confirm option.

durin42 accepted this revision.Aug 28 2017, 2:42 PM
Closed by commit rHG088598153aa2: phabsend: show associated Differential Revisions with --confirm (authored by quark). · Explain WhyAug 28 2017, 3:05 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/phabricator.py (21 lines)

Diff 1363

contrib/phabricator.py

revs = list(revs) + opts.get('rev', []) revs = list(revs) + opts.get('rev', [])
revs = scmutil.revrange(repo, revs) revs = scmutil.revrange(repo, revs)
if not revs: if not revs:
raise error.Abort(_('phabsend requires at least one changeset')) raise error.Abort(_('phabsend requires at least one changeset'))
if opts.get('amend'): if opts.get('amend'):
cmdutil.checkunfinished(repo) cmdutil.checkunfinished(repo)
# {newnode: (oldnode, olddiff, olddrev}
oldmap = getoldnodedrevmap(repo, [repo[r].node() for r in revs])
confirm = ui.configbool('phabsend', 'confirm') confirm = ui.configbool('phabsend', 'confirm')
confirm |= bool(opts.get('confirm')) confirm |= bool(opts.get('confirm'))
if confirm: if confirm:
confirmed = _confirmbeforesend(repo, revs) confirmed = _confirmbeforesend(repo, revs, oldmap)
if not confirmed: if not confirmed:
raise error.Abort(_('phabsend cancelled')) raise error.Abort(_('phabsend cancelled'))
actions = [] actions = []
reviewers = opts.get('reviewer', []) reviewers = opts.get('reviewer', [])
if reviewers: if reviewers:
phids = userphids(repo, reviewers) phids = userphids(repo, reviewers)
actions.append({'type': 'reviewers.add', 'value': phids}) actions.append({'type': 'reviewers.add', 'value': phids})
# {newnode: (oldnode, olddiff, olddrev}
oldmap = getoldnodedrevmap(repo, [repo[r].node() for r in revs])
drevids = [] # [int] drevids = [] # [int]
diffmap = {} # {newnode: diff} diffmap = {} # {newnode: diff}
# Send patches one by one so we know their Differential Revision IDs and # Send patches one by one so we know their Differential Revision IDs and
# can provide dependency relationship # can provide dependency relationship
lastrevid = None lastrevid = None
for rev in revs: for rev in revs:
ui.debug('sending rev %d\n' % rev) ui.debug('sending rev %d\n' % rev)
if wnode in mapping: if wnode in mapping:
unfi.setparents(mapping[wnode][0]) unfi.setparents(mapping[wnode][0])
# Map from "hg:meta" keys to header understood by "hg import". The order is # Map from "hg:meta" keys to header understood by "hg import". The order is
# consistent with "hg export" output. # consistent with "hg export" output.
_metanamemap = util.sortdict([(r'user', 'User'), (r'date', 'Date'), _metanamemap = util.sortdict([(r'user', 'User'), (r'date', 'Date'),
(r'node', 'Node ID'), (r'parent', 'Parent ')]) (r'node', 'Node ID'), (r'parent', 'Parent ')])
def _confirmbeforesend(repo, revs): def _confirmbeforesend(repo, revs, oldmap):
url, token = readurltoken(repo) url, token = readurltoken(repo)
ui = repo.ui ui = repo.ui
for rev in revs: for rev in revs:
ctx = repo[rev] ctx = repo[rev]
desc = ctx.description().splitlines()[0] desc = ctx.description().splitlines()[0]
ui.write(('%d: ' % rev), label='phabsend.revnumber') oldnode, olddiff, drevid = oldmap.get(ctx.node(), (None, None, None))
ui.write(('%s\n' % desc), label='phabsend.desc') if drevid:
drevdesc = ui.label('D%s' % drevid, 'phabricator.drev')
else:
drevdesc = ui.label(_('NEW'), 'phabricator.drev')
ui.write(_('%s - %s: %s\n') % (drevdesc,
ui.label(bytes(ctx), 'phabricator.node'),
ui.label(desc, 'phabricator.desc')))
if ui.promptchoice(_('Send the above changes to %s (yn)?' if ui.promptchoice(_('Send the above changes to %s (yn)?'
'$$ &Yes $$ &No') % url): '$$ &Yes $$ &No') % url):
return False return False
return True return True
_knownstatusnames = {'accepted', 'needsreview', 'needsrevision', 'closed', _knownstatusnames = {'accepted', 'needsreview', 'needsrevision', 'closed',