This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8313

phabricator: extract logic to print the status when posting a commit
ClosedPublic

Authored by mharbison72 on Mar 20 2020, 5:24 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG949a87145336: phabricator: extract logic to print the status when posting a commit
Summary

This will make it easier to list each commit when folding. That makes the
output less confusing because it matches the output of --confirm and the
revisions listed on the command line.

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.

Revision Contents
Changeset List

PathPackages
Mhgext/phabricator.py (36 lines)

Diff 20946

hgext/phabricator.py

unresolved = set(names) - resolved unresolved = set(names) - resolved
if unresolved: if unresolved:
raise error.Abort( raise error.Abort(
_(b'unknown username: %s') % b' '.join(sorted(unresolved)) _(b'unknown username: %s') % b' '.join(sorted(unresolved))
) )
return [entry[b'phid'] for entry in data] return [entry[b'phid'] for entry in data]
def _print_phabsend_action(ui, ctx, newrevid, action):
"""print the ``action`` that occurred when posting ``ctx`` for review
This is a utility function for the sending phase of ``phabsend``, which
makes it easier to show a status for all local commits with `--fold``.
"""
actiondesc = ui.label(
{
b'created': _(b'created'),
b'skipped': _(b'skipped'),
b'updated': _(b'updated'),
}[action],
b'phabricator.action.%s' % action,
)
drevdesc = ui.label(b'D%d' % newrevid, b'phabricator.drev')
nodedesc = ui.label(bytes(ctx), b'phabricator.node')
desc = ui.label(ctx.description().split(b'\n')[0], b'phabricator.desc')
ui.write(_(b'%s - %s - %s: %s\n') % (drevdesc, actiondesc, nodedesc, desc))
def _amend_diff_properties(unfi, drevid, newnodes, diff): def _amend_diff_properties(unfi, drevid, newnodes, diff):
"""update the local commit list for the ``diff`` associated with ``drevid`` """update the local commit list for the ``diff`` associated with ``drevid``
This is a utility function for the amend phase of ``phabsend``, which This is a utility function for the amend phase of ``phabsend``, which
converts failures to warning messages. converts failures to warning messages.
""" """
try: try:
writediffproperties([unfi[newnode] for newnode in newnodes], diff) writediffproperties([unfi[newnode] for newnode in newnodes], diff)
) )
else: else:
# Nothing changed. But still set "newrevphid" so the next revision # Nothing changed. But still set "newrevphid" so the next revision
# could depend on this one and "newrevid" for the summary line. # could depend on this one and "newrevid" for the summary line.
newrevphid = querydrev(repo.ui, b'%d' % revid)[0][b'phid'] newrevphid = querydrev(repo.ui, b'%d' % revid)[0][b'phid']
newrevid = revid newrevid = revid
action = b'skipped' action = b'skipped'
actiondesc = ui.label(
{
b'created': _(b'created'),
b'skipped': _(b'skipped'),
b'updated': _(b'updated'),
}[action],
b'phabricator.action.%s' % action,
)
drevdesc = ui.label(b'D%d' % newrevid, b'phabricator.drev')
nodedesc = ui.label(bytes(ctx), b'phabricator.node')
desc = ui.label(ctx.description().split(b'\n')[0], b'phabricator.desc')
ui.write(
_(b'%s - %s - %s: %s\n') % (drevdesc, actiondesc, nodedesc, desc)
)
drevids.append(newrevid) drevids.append(newrevid)
lastrevphid = newrevphid lastrevphid = newrevphid
_print_phabsend_action(ui, ctx, newrevid, action)
# Update commit messages and remove tags # Update commit messages and remove tags
if opts.get(b'amend'): if opts.get(b'amend'):
unfi = repo.unfiltered() unfi = repo.unfiltered()
drevs = callconduit(ui, b'differential.query', {b'ids': drevids}) drevs = callconduit(ui, b'differential.query', {b'ids': drevids})
with repo.wlock(), repo.lock(), repo.transaction(b'phabsend'): with repo.wlock(), repo.lock(), repo.transaction(b'phabsend'):
wnode = unfi[b'.'].node() wnode = unfi[b'.'].node()
mapping = {} # {oldnode: [newnode]} mapping = {} # {oldnode: [newnode]}
for i, rev in enumerate(revs): for i, rev in enumerate(revs):