Show More
@@ -378,10 +378,13 b' def phabsend(ui, repo, *revs, **opts):' | |||||
378 | if opts.get('amend'): |
|
378 | if opts.get('amend'): | |
379 | cmdutil.checkunfinished(repo) |
|
379 | cmdutil.checkunfinished(repo) | |
380 |
|
380 | |||
|
381 | # {newnode: (oldnode, olddiff, olddrev} | |||
|
382 | oldmap = getoldnodedrevmap(repo, [repo[r].node() for r in revs]) | |||
|
383 | ||||
381 | confirm = ui.configbool('phabsend', 'confirm') |
|
384 | confirm = ui.configbool('phabsend', 'confirm') | |
382 | confirm |= bool(opts.get('confirm')) |
|
385 | confirm |= bool(opts.get('confirm')) | |
383 | if confirm: |
|
386 | if confirm: | |
384 | confirmed = _confirmbeforesend(repo, revs) |
|
387 | confirmed = _confirmbeforesend(repo, revs, oldmap) | |
385 | if not confirmed: |
|
388 | if not confirmed: | |
386 | raise error.Abort(_('phabsend cancelled')) |
|
389 | raise error.Abort(_('phabsend cancelled')) | |
387 |
|
390 | |||
@@ -391,9 +394,6 b' def phabsend(ui, repo, *revs, **opts):' | |||||
391 | phids = userphids(repo, reviewers) |
|
394 | phids = userphids(repo, reviewers) | |
392 | actions.append({'type': 'reviewers.add', 'value': phids}) |
|
395 | actions.append({'type': 'reviewers.add', 'value': phids}) | |
393 |
|
396 | |||
394 | # {newnode: (oldnode, olddiff, olddrev} |
|
|||
395 | oldmap = getoldnodedrevmap(repo, [repo[r].node() for r in revs]) |
|
|||
396 |
|
||||
397 | drevids = [] # [int] |
|
397 | drevids = [] # [int] | |
398 | diffmap = {} # {newnode: diff} |
|
398 | diffmap = {} # {newnode: diff} | |
399 |
|
399 | |||
@@ -474,14 +474,21 b' def phabsend(ui, repo, *revs, **opts):' | |||||
474 | _metanamemap = util.sortdict([(r'user', 'User'), (r'date', 'Date'), |
|
474 | _metanamemap = util.sortdict([(r'user', 'User'), (r'date', 'Date'), | |
475 | (r'node', 'Node ID'), (r'parent', 'Parent ')]) |
|
475 | (r'node', 'Node ID'), (r'parent', 'Parent ')]) | |
476 |
|
476 | |||
477 | def _confirmbeforesend(repo, revs): |
|
477 | def _confirmbeforesend(repo, revs, oldmap): | |
478 | url, token = readurltoken(repo) |
|
478 | url, token = readurltoken(repo) | |
479 | ui = repo.ui |
|
479 | ui = repo.ui | |
480 | for rev in revs: |
|
480 | for rev in revs: | |
481 | ctx = repo[rev] |
|
481 | ctx = repo[rev] | |
482 | desc = ctx.description().splitlines()[0] |
|
482 | desc = ctx.description().splitlines()[0] | |
483 | ui.write(('%d: ' % rev), label='phabsend.revnumber') |
|
483 | oldnode, olddiff, drevid = oldmap.get(ctx.node(), (None, None, None)) | |
484 | ui.write(('%s\n' % desc), label='phabsend.desc') |
|
484 | if drevid: | |
|
485 | drevdesc = ui.label('D%s' % drevid, 'phabricator.drev') | |||
|
486 | else: | |||
|
487 | drevdesc = ui.label(_('NEW'), 'phabricator.drev') | |||
|
488 | ||||
|
489 | ui.write(_('%s - %s: %s\n') % (drevdesc, | |||
|
490 | ui.label(bytes(ctx), 'phabricator.node'), | |||
|
491 | ui.label(desc, 'phabricator.desc'))) | |||
485 |
|
492 | |||
486 | if ui.promptchoice(_('Send the above changes to %s (yn)?' |
|
493 | if ui.promptchoice(_('Send the above changes to %s (yn)?' | |
487 | '$$ &Yes $$ &No') % url): |
|
494 | '$$ &Yes $$ &No') % url): |
General Comments 0
You need to be logged in to leave comments.
Login now