This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10671

rewriteutil: say how many commits would become orphan if commit is rewritten
ClosedPublic

Authored by martinvonz on May 4 2021, 1:58 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGd90f6237b3aa: rewriteutil: say how many commits would become orphan if commit is rewritten
Summary

This copies the message from the evolve extension, but modifies it a
bit to work with the grammar (in particular with the use of "change
branch of" as action). I don't know why it doesn't use the same
_formatrevs() as for public commmits.

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

martinvonz created this revision.May 4 2021, 1:58 PM
martinvonz added a commit: rHGd90f6237b3aa: rewriteutil: say how many commits would become orphan if commit is rewritten.May 5 2021, 6:36 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGd90f6237b3aa: rewriteutil: say how many commits would become orphan if commit is rewritten (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 27597

mercurial/rewriteutil.py

msg = _(b"cannot %s public changesets: %s") % (action, summary) msg = _(b"cannot %s public changesets: %s") % (action, summary)
hint = _(b"see 'hg help phases' for details") hint = _(b"see 'hg help phases' for details")
raise error.InputError(msg, hint=hint) raise error.InputError(msg, hint=hint)
newunstable = disallowednewunstable(repo, revs) newunstable = disallowednewunstable(repo, revs)
if newunstable: if newunstable:
hint = _(b"see 'hg help evolution.instability'") hint = _(b"see 'hg help evolution.instability'")
raise error.InputError( raise error.InputError(
_(b"cannot %s changeset with children") % action, hint=hint _(b"cannot %s changeset, as that will orphan %d descendants")
% (action, len(newunstable)),
hint=hint,
) )
if not obsolete.isenabled(repo, obsolete.allowdivergenceopt): if not obsolete.isenabled(repo, obsolete.allowdivergenceopt):
new_divergence = _find_new_divergence(repo, revs) new_divergence = _find_new_divergence(repo, revs)
if new_divergence: if new_divergence:
local_ctx, other_ctx, base_ctx = new_divergence local_ctx, other_ctx, base_ctx = new_divergence
msg = _( msg = _(
b'cannot %s %s, as that creates content-divergence with %s' b'cannot %s %s, as that creates content-divergence with %s'

tests/test-amend.t

> B > B
> | > |
> A > A
> EOS > EOS
$ hg update -q B $ hg update -q B
$ echo 2 >> B $ echo 2 >> B
$ hg amend $ hg amend
abort: cannot amend changeset with children abort: cannot amend changeset, as that will orphan 1 descendants
(see 'hg help evolution.instability') (see 'hg help evolution.instability')
[10] [10]
#if obsstore-on #if obsstore-on
With allowunstable, amend could work in the middle of a stack With allowunstable, amend could work in the middle of a stack
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF

tests/test-branch-change.t

$ hg branch -r 2 -r 4 foo $ hg branch -r 2 -r 4 foo
abort: cannot change branch of non-linear revisions abort: cannot change branch of non-linear revisions
[10] [10]
Change in middle of the stack (linear commits) Change in middle of the stack (linear commits)
$ hg branch -r 1::3 foo $ hg branch -r 1::3 foo
abort: cannot change branch of changeset with children abort: cannot change branch of changeset, as that will orphan 1 descendants
(see 'hg help evolution.instability') (see 'hg help evolution.instability')
[10] [10]
Change with dirty working directory Change with dirty working directory
$ echo bar > a $ echo bar > a
$ hg branch -r . foo $ hg branch -r . foo
abort: uncommitted changes abort: uncommitted changes
$ hg branch -r . default $ hg branch -r . default
abort: a branch of the same name already exists abort: a branch of the same name already exists
[10] [10]
Changing on a branch head which is not topological head Changing on a branch head which is not topological head
$ hg branch -r 2 stable $ hg branch -r 2 stable
abort: cannot change branch of changeset with children abort: cannot change branch of changeset, as that will orphan 2 descendants
(see 'hg help evolution.instability') (see 'hg help evolution.instability')
[10] [10]
Enabling the allowunstable config and trying to change branch on a branch head Enabling the allowunstable config and trying to change branch on a branch head
which is not a topological head which is not a topological head
$ echo "[experimental]" >> .hg/hgrc $ echo "[experimental]" >> .hg/hgrc
$ echo "evolution.allowunstable=yes" >> .hg/hgrc $ echo "evolution.allowunstable=yes" >> .hg/hgrc

tests/test-fix.t

$ hg init allowunstable $ hg init allowunstable
$ cd allowunstable $ cd allowunstable
$ printf "one\n" > foo.whole $ printf "one\n" > foo.whole
$ hg commit -Aqm "first" $ hg commit -Aqm "first"
$ printf "two\n" > foo.whole $ printf "two\n" > foo.whole
$ hg commit -m "second" $ hg commit -m "second"
$ hg --config experimental.evolution.allowunstable=False fix -r '.^' $ hg --config experimental.evolution.allowunstable=False fix -r '.^'
abort: cannot fix changeset with children abort: cannot fix changeset, as that will orphan 1 descendants
(see 'hg help evolution.instability') (see 'hg help evolution.instability')
[10] [10]
$ hg fix -r '.^' $ hg fix -r '.^'
1 new orphan changesets 1 new orphan changesets
$ hg cat -r 2 foo.whole $ hg cat -r 2 foo.whole
ONE ONE
$ cd .. $ cd ..

tests/test-rebase-collapse.t

@ 2: 64b456429f67 'Collapsed revision @ 2: 64b456429f67 'Collapsed revision
| * move1 | * move1
| * move2' | * move2'
o 1: 1352765a01d4 'change' o 1: 1352765a01d4 'change'
| |
o 0: f447d5abf5ea 'add' o 0: f447d5abf5ea 'add'
$ hg rebase --collapse -r 1 -d 0 $ hg rebase --collapse -r 1 -d 0
abort: cannot rebase changeset with children abort: cannot rebase changeset, as that will orphan 1 descendants
(see 'hg help evolution.instability') (see 'hg help evolution.instability')
[10] [10]
Test collapsing in place Test collapsing in place
$ hg rebase --collapse -b . -d 0 $ hg rebase --collapse -b . -d 0
rebasing 1:1352765a01d4 "change" rebasing 1:1352765a01d4 "change"
rebasing 2:64b456429f67 tip "Collapsed revision" rebasing 2:64b456429f67 tip "Collapsed revision"

tests/test-rebase-scenario-global.t

Simple case with keep: Simple case with keep:
Source on have two descendant heads but ask for one Source on have two descendant heads but ask for one
$ hg clone -q -u . ah ah1 $ hg clone -q -u . ah ah1
$ cd ah1 $ cd ah1
$ hg rebase -r '2::8' -d 1 $ hg rebase -r '2::8' -d 1
abort: cannot rebase changeset with children abort: cannot rebase changeset, as that will orphan 2 descendants
(see 'hg help evolution.instability') (see 'hg help evolution.instability')
[10] [10]
$ hg rebase -r '2::8' -d 1 -k $ hg rebase -r '2::8' -d 1 -k
rebasing 2:c9e50f6cdc55 "C" rebasing 2:c9e50f6cdc55 "C"
rebasing 3:ffd453c31098 "D" rebasing 3:ffd453c31098 "D"
rebasing 6:3d8a618087a7 "G" rebasing 6:3d8a618087a7 "G"
rebasing 7:72434a4e60b0 "H" rebasing 7:72434a4e60b0 "H"
rebasing 8:479ddb54a924 tip "I" rebasing 8:479ddb54a924 tip "I"
$ cd .. $ cd ..
Base on have one descendant heads we ask for but common ancestor have two Base on have one descendant heads we ask for but common ancestor have two
$ hg clone -q -u . ah ah2 $ hg clone -q -u . ah ah2
$ cd ah2 $ cd ah2
$ hg rebase -r '3::8' -d 1 $ hg rebase -r '3::8' -d 1
abort: cannot rebase changeset with children abort: cannot rebase changeset, as that will orphan 2 descendants
(see 'hg help evolution.instability') (see 'hg help evolution.instability')
[10] [10]
$ hg rebase -r '3::8' -d 1 --keep $ hg rebase -r '3::8' -d 1 --keep
rebasing 3:ffd453c31098 "D" rebasing 3:ffd453c31098 "D"
rebasing 6:3d8a618087a7 "G" rebasing 6:3d8a618087a7 "G"
rebasing 7:72434a4e60b0 "H" rebasing 7:72434a4e60b0 "H"
rebasing 8:479ddb54a924 tip "I" rebasing 8:479ddb54a924 tip "I"
$ hg tglog $ hg tglog
$ cd .. $ cd ..
rebase subset rebase subset
$ hg clone -q -u . ah ah3 $ hg clone -q -u . ah ah3
$ cd ah3 $ cd ah3
$ hg rebase -r '3::7' -d 1 $ hg rebase -r '3::7' -d 1
abort: cannot rebase changeset with children abort: cannot rebase changeset, as that will orphan 3 descendants
(see 'hg help evolution.instability') (see 'hg help evolution.instability')
[10] [10]
$ hg rebase -r '3::7' -d 1 --keep $ hg rebase -r '3::7' -d 1 --keep
rebasing 3:ffd453c31098 "D" rebasing 3:ffd453c31098 "D"
rebasing 6:3d8a618087a7 "G" rebasing 6:3d8a618087a7 "G"
rebasing 7:72434a4e60b0 "H" rebasing 7:72434a4e60b0 "H"
$ hg tglog $ hg tglog
o 11: 8fbd00952cbc 'H' o 11: 8fbd00952cbc 'H'
$ cd .. $ cd ..
rebase subset with multiple head rebase subset with multiple head
$ hg clone -q -u . ah ah4 $ hg clone -q -u . ah ah4
$ cd ah4 $ cd ah4
$ hg rebase -r '3::(7+5)' -d 1 $ hg rebase -r '3::(7+5)' -d 1
abort: cannot rebase changeset with children abort: cannot rebase changeset, as that will orphan 1 descendants
(see 'hg help evolution.instability') (see 'hg help evolution.instability')
[10] [10]
$ hg rebase -r '3::(7+5)' -d 1 --keep $ hg rebase -r '3::(7+5)' -d 1 --keep
rebasing 3:ffd453c31098 "D" rebasing 3:ffd453c31098 "D"
rebasing 4:c01897464e7f "E" rebasing 4:c01897464e7f "E"
rebasing 5:41bfcc75ed73 "F" rebasing 5:41bfcc75ed73 "F"
rebasing 6:3d8a618087a7 "G" rebasing 6:3d8a618087a7 "G"
rebasing 7:72434a4e60b0 "H" rebasing 7:72434a4e60b0 "H"

tests/test-split.t

#endif #endif
Split a non-head without rebase Split a non-head without rebase
$ cd $TESTTMP/d $ cd $TESTTMP/d
#if obsstore-off #if obsstore-off
$ runsplit -r 1 --no-rebase $ runsplit -r 1 --no-rebase
abort: cannot split changeset with children abort: cannot split changeset, as that will orphan 3 descendants
(see 'hg help evolution.instability') (see 'hg help evolution.instability')
[10] [10]
#else #else
$ runsplit -r 1 --no-rebase >/dev/null $ runsplit -r 1 --no-rebase >/dev/null
3 new orphan changesets 3 new orphan changesets
$ hg bookmark $ hg bookmark
d1 2:b5c5ea414030 d1 2:b5c5ea414030
* d2 3:f4a0a8d004cc * d2 3:f4a0a8d004cc
> B > B
> | > |
> A > A
> EOS > EOS
2 new orphan changesets 2 new orphan changesets
$ eval `hg tags -T '{tag}={node}\n'` $ eval `hg tags -T '{tag}={node}\n'`
$ rm .hg/localtags $ rm .hg/localtags
$ hg split $B --config experimental.evolution=createmarkers $ hg split $B --config experimental.evolution=createmarkers
abort: cannot split changeset with children abort: cannot split changeset, as that will orphan 4 descendants
(see 'hg help evolution.instability') (see 'hg help evolution.instability')
[10] [10]
$ cat > $TESTTMP/messages <<EOF $ cat > $TESTTMP/messages <<EOF
> Split B > Split B
> EOF > EOF
$ cat <<EOF | hg split $B $ cat <<EOF | hg split $B
> y > y
> y > y

tests/test-unamend.t

o 2:28ad74487de9 Added c o 2:28ad74487de9 Added c
| |
o 1:29becc82797a Added b o 1:29becc82797a Added b
| |
o 0:18d04c59bb5d Added a o 0:18d04c59bb5d Added a
$ hg --config experimental.evolution=createmarkers unamend $ hg --config experimental.evolution=createmarkers unamend
abort: cannot unamend changeset with children abort: cannot unamend changeset, as that will orphan 3 descendants
(see 'hg help evolution.instability') (see 'hg help evolution.instability')
[10] [10]
$ hg unamend $ hg unamend
3 new orphan changesets 3 new orphan changesets
Trying to unamend a public changeset Trying to unamend a public changeset