( )⚙ D8761 phabricator: clarify the multiple heads/roots error message for phabsend

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8761

phabricator: clarify the multiple heads/roots error message for phabsend
ClosedPublic

Authored by mharbison72 on Jul 16 2020, 2:18 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGb3b0cd8b9366: phabricator: clarify the multiple heads/roots error message for phabsend
Summary

As pointed out in followup feedback for c1c922391314, it's confusing to say
there are multiple items and then only list one.

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

mharbison72 created this revision.Jul 16 2020, 2:18 PM
pulkit accepted this revision.Jul 17 2020, 4:45 AM
This revision is now accepted and ready to land.Jul 17 2020, 4:45 AM

Revision Contents
Changeset List

PathPackages
Mhgext/phabricator.py (8 lines)
Mtests/test-phabricator.t (2 lines)

Diff 21958

hgext/phabricator.py

if any(c for c in ctxs if c.obsolete()): if any(c for c in ctxs if c.obsolete()):
raise error.Abort(_(b"obsolete commits cannot be posted for review")) raise error.Abort(_(b"obsolete commits cannot be posted for review"))
# Ensure the local commits are an unbroken range. The semantics of the # Ensure the local commits are an unbroken range. The semantics of the
# --fold option implies this, and the auto restacking of orphans requires # --fold option implies this, and the auto restacking of orphans requires
# it. Otherwise A+C in A->B->C will cause B to be orphaned, and C' to # it. Otherwise A+C in A->B->C will cause B to be orphaned, and C' to
# get A' as a parent. # get A' as a parent.
def _fail_nonlinear_revs(revs, skiprev, revtype): def _fail_nonlinear_revs(revs, revtype):
badnodes = [repo[r].node() for r in revs if r != skiprev] badnodes = [repo[r].node() for r in revs]
raise error.Abort( raise error.Abort(
_(b"cannot phabsend multiple %s revisions: %s") _(b"cannot phabsend multiple %s revisions: %s")
% (revtype, scmutil.nodesummaries(repo, badnodes)), % (revtype, scmutil.nodesummaries(repo, badnodes)),
hint=_(b"the revisions must form a linear chain"), hint=_(b"the revisions must form a linear chain"),
) )
heads = repo.revs(b'heads(%ld)', revs) heads = repo.revs(b'heads(%ld)', revs)
if len(heads) > 1: if len(heads) > 1:
_fail_nonlinear_revs(heads, heads.max(), b"head") _fail_nonlinear_revs(heads, b"head")
roots = repo.revs(b'roots(%ld)', revs) roots = repo.revs(b'roots(%ld)', revs)
if len(roots) > 1: if len(roots) > 1:
_fail_nonlinear_revs(roots, roots.min(), b"root") _fail_nonlinear_revs(roots, b"root")
fold = opts.get(b'fold') fold = opts.get(b'fold')
if fold: if fold:
if len(revs) == 1: if len(revs) == 1:
# TODO: just switch to --no-fold instead? # TODO: just switch to --no-fold instead?
raise error.Abort(_(b"cannot fold a single revision")) raise error.Abort(_(b"cannot fold a single revision"))
# There's no clear way to manage multiple commits with a Dxxx tag, so # There's no clear way to manage multiple commits with a Dxxx tag, so

tests/test-phabricator.t

repository tip rolled back to revision 1 (undo phabimport) repository tip rolled back to revision 1 (undo phabimport)
$ hg phabimport --no-stack D7917 D7918 --test-vcr "$VCR/phabimport-multi-drev.json" $ hg phabimport --no-stack D7917 D7918 --test-vcr "$VCR/phabimport-multi-drev.json"
applying patch from D7917 applying patch from D7917
applying patch from D7918 applying patch from D7918
Phabsend requires a linear range of commits Phabsend requires a linear range of commits
$ hg phabsend -r 0+2+3 $ hg phabsend -r 0+2+3
abort: cannot phabsend multiple head revisions: c44b38f24a45 abort: cannot phabsend multiple head revisions: c44b38f24a45 aaef04066140
(the revisions must form a linear chain) (the revisions must form a linear chain)
[255] [255]
Validate arguments with --fold Validate arguments with --fold
$ hg phabsend --fold -r 1 $ hg phabsend --fold -r 1
abort: cannot fold a single revision abort: cannot fold a single revision
[255] [255]