This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10517

rewriteutil: point to help about instability when rewriting creates orphan
ClosedPublic

Authored by martinvonz on Apr 27 2021, 6:53 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG7a90fddb13b0: rewriteutil: point to help about instability when rewriting creates orphan
Summary

This replicates the message from the evolve extension.

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

Diff 27247

mercurial/rewriteutil.py

publicrevs = repo.revs(b'%ld and public()', revs) publicrevs = repo.revs(b'%ld and public()', revs)
if publicrevs: if publicrevs:
msg = _(b"cannot %s public changesets") % action msg = _(b"cannot %s public changesets") % action
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:
raise error.InputError(_(b"cannot %s changeset with children") % action) hint = _(b"see 'hg help evolution.instability'")
raise error.InputError(
_(b"cannot %s changeset with children") % action, hint=hint
)
def disallowednewunstable(repo, revs): def disallowednewunstable(repo, revs):
"""Checks whether editing the revs will create new unstable changesets and """Checks whether editing the revs will create new unstable changesets and
are we allowed to create them. are we allowed to create them.
To allow new unstable changesets, set the config: To allow new unstable changesets, set the config:
`experimental.evolution.allowunstable=True` `experimental.evolution.allowunstable=True`

tests/test-amend.t

> | > |
> 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 with children
(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
> [experimental] > [experimental]

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 with children
(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
[20] [20]
$ 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 with children
(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
$ hg branch -r 2 foo $ hg branch -r 2 foo

tests/test-fix.t

$ 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 with children
(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

| * 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 with children
(use --keep to keep original changesets) (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"
saved backup bundle to $TESTTMP/copies/.hg/strip-backup/1352765a01d4-45a352ea-rebase.hg saved backup bundle to $TESTTMP/copies/.hg/strip-backup/1352765a01d4-45a352ea-rebase.hg

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 with children
(use --keep to keep original changesets) (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"
$ hg tglog $ hg tglog
$ 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 with children
(use --keep to keep original changesets) (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
o 12: 9d7da0053b1c 'I' o 12: 9d7da0053b1c 'I'
$ 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 with children
(use --keep to keep original changesets) (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 with children
(use --keep to keep original changesets) (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"
$ hg tglog $ hg tglog

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 with children
(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
d3 4:777940761eba d3 4:777940761eba
> | > |
> 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 with children
(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
> EOF > EOF

tests/test-unamend.t

| |
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 with children
(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
$ hg up -C 23 $ hg up -C 23