comparison contrib/phabricator.py @ 33978:088598153aa2

phabsend: show associated Differential Revisions with --confirm

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)?

Differential Revision: https://phab.mercurial-scm.org/D514

33977:edeb8f28c031

    if not revs:
        raise error.Abort(_('phabsend requires at least one changeset'))
    if opts.get('amend'):
        cmdutil.checkunfinished(repo)

    confirm = ui.configbool('phabsend', 'confirm')
    confirm |= bool(opts.get('confirm'))
    if confirm:
        confirmed = _confirmbeforesend(repo, revs)
        if not confirmed:
            raise error.Abort(_('phabsend cancelled'))

    actions = []
    reviewers = opts.get('reviewer', [])
    if reviewers:
        phids = userphids(repo, reviewers)
        actions.append({'type': 'reviewers.add', 'value': phids})

    # {newnode: (oldnode, olddiff, olddrev}
    oldmap = getoldnodedrevmap(repo, [repo[r].node() for r in revs])

    drevids = [] # [int]
    diffmap = {} # {newnode: diff}

    # Send patches one by one so we know their Differential Revision IDs and

# Map from "hg:meta" keys to header understood by "hg import". The order is
# consistent with "hg export" output.
_metanamemap = util.sortdict([(r'user', 'User'), (r'date', 'Date'),
                              (r'node', 'Node ID'), (r'parent', 'Parent ')])

def _confirmbeforesend(repo, revs):
    url, token = readurltoken(repo)
    ui = repo.ui
    for rev in revs:
        ctx = repo[rev]
        desc = ctx.description().splitlines()[0]
        ui.write(('%d: ' % rev), label='phabsend.revnumber')
        ui.write(('%s\n' % desc), label='phabsend.desc')

    if ui.promptchoice(_('Send the above changes to %s (yn)?'
                         '$$ &Yes $$ &No') % url):
        return False

33978:088598153aa2

    if not revs:
        raise error.Abort(_('phabsend requires at least one changeset'))
    if opts.get('amend'):
        cmdutil.checkunfinished(repo)

    # {newnode: (oldnode, olddiff, olddrev}
    oldmap = getoldnodedrevmap(repo, [repo[r].node() for r in revs])

    confirm = ui.configbool('phabsend', 'confirm')
    confirm |= bool(opts.get('confirm'))
    if confirm:
        confirmed = _confirmbeforesend(repo, revs, oldmap)
        if not confirmed:
            raise error.Abort(_('phabsend cancelled'))

    actions = []
    reviewers = opts.get('reviewer', [])
    if reviewers:
        phids = userphids(repo, reviewers)
        actions.append({'type': 'reviewers.add', 'value': phids})

    drevids = [] # [int]
    diffmap = {} # {newnode: diff}

    # Send patches one by one so we know their Differential Revision IDs and

# Map from "hg:meta" keys to header understood by "hg import". The order is
# consistent with "hg export" output.
_metanamemap = util.sortdict([(r'user', 'User'), (r'date', 'Date'),
                              (r'node', 'Node ID'), (r'parent', 'Parent ')])

def _confirmbeforesend(repo, revs, oldmap):
    url, token = readurltoken(repo)
    ui = repo.ui
    for rev in revs:
        ctx = repo[rev]
        desc = ctx.description().splitlines()[0]
        oldnode, olddiff, drevid = oldmap.get(ctx.node(), (None, None, None))
        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)?'
                         '$$ &Yes $$ &No') % url):
        return False