This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8437

phabricator: prevent posting obsolete commits
ClosedPublic

Authored by mharbison72 on Apr 15 2020, 7:57 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGc482e2fe444c: phabricator: prevent posting obsolete commits
Summary

I don't see why this would be useful in the first place. But I had a coworker
submit a single commit that was not a branch head, and the result was to orphan
its child and keep the original commit visible. He then did up arrow + Enter,
and it happily created a new review (since the URL isn't amended into the
original commit specified on the command line) and a new successor, resulting in
a local divergence. I'd like to fix the issue with creating orphans, but this
is simple enough to prevent on its own.

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.Apr 15 2020, 7:57 PM
Alphare accepted this revision.Apr 16 2020, 9:57 AM
Alphare added a subscriber: Alphare.

I think that these kinds of fail-safes are very useful. I might have been bit by this once.

mharbison72 added a commit: rHGc482e2fe444c: phabricator: prevent posting obsolete commits.Apr 16 2020, 12:42 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGc482e2fe444c: phabricator: prevent posting obsolete commits (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/phabricator.py (3 lines)
Mtests/test-phabricator.t (52 lines)

Diff 21136

hgext/phabricator.py

if not revs: if not revs:
raise error.Abort(_(b'phabsend requires at least one changeset')) raise error.Abort(_(b'phabsend requires at least one changeset'))
if opts.get(b'amend'): if opts.get(b'amend'):
cmdutil.checkunfinished(repo) cmdutil.checkunfinished(repo)
ctxs = [repo[rev] for rev in revs] ctxs = [repo[rev] for rev in revs]
if any(c for c in ctxs if c.obsolete()):
raise error.Abort(_(b"obsolete commits cannot be posted for review"))
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
# require the amend option. (We could append "_nnn", but then it # require the amend option. (We could append "_nnn", but then it

tests/test-phabricator.t

| modified 2 | modified 2
| |
o 4:0 eb3752621d45 1970-01-01 00:00 +0000 test o 4:0 eb3752621d45 1970-01-01 00:00 +0000 test
| modified 1 | modified 1
| |
o 0 5cbade24e0fa 1970-01-01 00:00 +0000 test o 0 5cbade24e0fa 1970-01-01 00:00 +0000 test
added added
Posting obsolete commits is disallowed
$ echo "mod3" > file1.txt
$ hg ci -m 'modified A'
$ echo "mod4" > file1.txt
$ hg ci -m 'modified B'
$ hg up '.^'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo 'obsolete' > file1.txt
$ hg amend --config extensions.amend=
1 new orphan changesets
$ hg log -G
@ changeset: 8:8d83edb3cbac
| tag: tip
| parent: 5:1dff6b051abf
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: modified A
|
| * changeset: 7:d4ea1b2e3511
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | instability: orphan
| | summary: modified B
| |
| x changeset: 6:4635d7f0d1ff
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| obsolete: rewritten using amend as 8:8d83edb3cbac
| summary: modified A
|
o changeset: 5:1dff6b051abf
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: modified 2
|
o changeset: 4:eb3752621d45
| parent: 0:5cbade24e0fa
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: modified 1
|
o changeset: 0:5cbade24e0fa
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: added
$ hg phabsend -r 5::
abort: obsolete commits cannot be posted for review
[255]
$ cd .. $ cd ..
Phabesending a new binary, a modified binary, and a removed binary Phabesending a new binary, a modified binary, and a removed binary
>>> open('bin', 'wb').write(b'\0a') and None >>> open('bin', 'wb').write(b'\0a') and None
$ hg ci -Am 'add binary' $ hg ci -Am 'add binary'
adding bin adding bin
>>> open('bin', 'wb').write(b'\0b') and None >>> open('bin', 'wb').write(b'\0b') and None