test-histedit-obsolete.t
460 lines
| 12.4 KiB
| text/troff
|
Tads3Lexer
/ tests / test-histedit-obsolete.t
|
r17759 | $ . "$TESTDIR/histedit-helpers.sh" | ||
Enable obsolete | ||||
$ cat > ${TESTTMP}/obs.py << EOF | ||||
> import mercurial.obsolete | ||||
> mercurial.obsolete._enabled = True | ||||
> EOF | ||||
$ cat >> $HGRCPATH << EOF | ||||
> [ui] | ||||
> logtemplate= {rev}:{node|short} {desc|firstline} | ||||
> [phases] | ||||
> publish=False | ||||
> [extensions]' | ||||
> histedit= | ||||
|
r18438 | > rebase= | ||
|
r17759 | > | ||
> obs=${TESTTMP}/obs.py | ||||
> EOF | ||||
$ hg init base | ||||
$ cd base | ||||
$ for x in a b c d e f ; do | ||||
> echo $x > $x | ||||
> hg add $x | ||||
> hg ci -m $x | ||||
> done | ||||
$ hg log --graph | ||||
@ 5:652413bf663e f | ||||
| | ||||
o 4:e860deea161a e | ||||
| | ||||
o 3:055a42cdd887 d | ||||
| | ||||
o 2:177f92b77385 c | ||||
| | ||||
o 1:d2ae7f538514 b | ||||
| | ||||
o 0:cb9a9f314b8b a | ||||
$ HGEDITOR=cat hg histedit 1 | ||||
pick d2ae7f538514 1 b | ||||
pick 177f92b77385 2 c | ||||
pick 055a42cdd887 3 d | ||||
pick e860deea161a 4 e | ||||
pick 652413bf663e 5 f | ||||
# Edit history between d2ae7f538514 and 652413bf663e | ||||
# | ||||
# Commands: | ||||
# p, pick = use commit | ||||
# e, edit = use commit, but stop for amending | ||||
# f, fold = use commit, but fold into previous commit (combines N and N-1) | ||||
# d, drop = remove commit from history | ||||
# m, mess = edit message without changing commit content | ||||
# | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
|
r19019 | $ hg histedit 1 --commands - --verbose <<EOF | grep histedit | ||
|
r17759 | > pick 177f92b77385 2 c | ||
> drop d2ae7f538514 1 b | ||||
> pick 055a42cdd887 3 d | ||||
> fold e860deea161a 4 e | ||||
> pick 652413bf663e 5 f | ||||
> EOF | ||||
|
r18437 | saved backup bundle to $TESTTMP/base/.hg/strip-backup/96e494a2d553-backup.hg (glob) | ||
|
r17759 | $ hg log --graph --hidden | ||
|
r18437 | @ 8:cacdfd884a93 f | ||
|
r17759 | | | ||
|
r18437 | o 7:59d9f330561f d | ||
|
r17759 | | | ||
|
r18437 | o 6:b346ab9a313d c | ||
|
r17759 | | | ||
| x 5:652413bf663e f | ||||
| | | ||||
| x 4:e860deea161a e | ||||
| | | ||||
| x 3:055a42cdd887 d | ||||
| | | ||||
| x 2:177f92b77385 c | ||||
| | | ||||
| x 1:d2ae7f538514 b | ||||
|/ | ||||
o 0:cb9a9f314b8b a | ||||
$ hg debugobsolete | ||||
|
r17771 | d2ae7f538514cd87c17547b0de4cea71fe1af9fb 0 {'date': '* *', 'user': 'test'} (glob) | ||
|
r18437 | 177f92b773850b59254aa5e923436f921b55483b b346ab9a313db8537ecf96fca3ca3ca984ef3bd7 0 {'date': '* *', 'user': 'test'} (glob) | ||
055a42cdd88768532f9cf79daa407fc8d138de9b 59d9f330561fd6c88b1a6b32f0e45034d88db784 0 {'date': '* *', 'user': 'test'} (glob) | ||||
e860deea161a2f77de56603b340ebbb4536308ae 59d9f330561fd6c88b1a6b32f0e45034d88db784 0 {'date': '* *', 'user': 'test'} (glob) | ||||
652413bf663ef2a641cab26574e46d5f5a64a55a cacdfd884a9321ec4e1de275ef3949fa953a1f83 0 {'date': '* *', 'user': 'test'} (glob) | ||||
|
r17771 | |||
|
r17761 | |||
Ensure hidden revision does not prevent histedit | ||||
------------------------------------------------- | ||||
create an hidden revision | ||||
|
r19019 | $ hg histedit 6 --commands - << EOF | ||
|
r18437 | > pick b346ab9a313d 6 c | ||
> drop 59d9f330561f 7 d | ||||
> pick cacdfd884a93 8 f | ||||
|
r17761 | > EOF | ||
0 files updated, 0 files merged, 3 files removed, 0 files unresolved | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ hg log --graph | ||||
|
r18437 | @ 9:c13eb81022ca f | ||
|
r17761 | | | ||
|
r18437 | o 6:b346ab9a313d c | ||
|
r17761 | | | ||
o 0:cb9a9f314b8b a | ||||
check hidden revision are ignored (6 have hidden children 7 and 8) | ||||
|
r19019 | $ hg histedit 6 --commands - << EOF | ||
|
r18437 | > pick b346ab9a313d 6 c | ||
> pick c13eb81022ca 8 f | ||||
|
r17761 | > EOF | ||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
|
r17762 | |||
|
r18165 | |||
|
r18398 | Test that rewriting leaving instability behind is allowed | ||
--------------------------------------------------------------------- | ||||
|
r18165 | |||
$ hg up '.^' | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ hg log -r 'children(.)' | ||||
|
r18437 | 9:c13eb81022ca f (no-eol) | ||
|
r19019 | $ hg histedit -r '.' --commands - <<EOF | ||
|
r18438 | > edit b346ab9a313d 6 c | ||
> EOF | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
adding c | ||||
|
r18934 | Make changes as needed, you may commit or record as needed now. | ||
|
r18438 | When you are finished, run hg histedit --continue to resume. | ||
|
r18935 | [1] | ||
|
r18438 | $ echo c >> c | ||
$ hg histedit --continue | ||||
|
r18165 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r18438 | |||
$ hg log -r 'unstable()' | ||||
9:c13eb81022ca f (no-eol) | ||||
stabilise | ||||
$ hg rebase -r 'unstable()' -d . | ||||
|
r19924 | $ hg up tip -q | ||
|
r18439 | |||
|
r18509 | Test dropping of changeset on the top of the stack | ||
------------------------------------------------------- | ||||
Nothing is rewritten below, the working directory parent must be change for the | ||||
dropped changeset to be hidden. | ||||
$ cd .. | ||||
$ hg clone base droplast | ||||
updating to branch default | ||||
3 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ cd droplast | ||||
|
r19019 | $ hg histedit -r '40db8afa467b' --commands - << EOF | ||
|
r18509 | > pick 40db8afa467b 10 c | ||
> drop b449568bf7fc 11 f | ||||
> EOF | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ hg log -G | ||||
@ 10:40db8afa467b c | ||||
| | ||||
o 0:cb9a9f314b8b a | ||||
With rewritten ancestors | ||||
$ echo e > e | ||||
$ hg add e | ||||
$ hg commit -m g | ||||
$ echo f > f | ||||
$ hg add f | ||||
$ hg commit -m h | ||||
|
r19019 | $ hg histedit -r '40db8afa467b' --commands - << EOF | ||
|
r18509 | > pick 47a8561c0449 12 g | ||
> pick 40db8afa467b 10 c | ||||
> drop 1b3b05f35ff0 13 h | ||||
> EOF | ||||
0 files updated, 0 files merged, 3 files removed, 0 files unresolved | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ hg log -G | ||||
@ 15:ee6544123ab8 c | ||||
| | ||||
o 14:269e713e9eae g | ||||
| | ||||
o 0:cb9a9f314b8b a | ||||
$ cd ../base | ||||
|
r18439 | |||
|
r18440 | Test phases support | ||
=========================================== | ||||
Check that histedit respect immutability | ||||
------------------------------------------- | ||||
|
r18439 | |||
$ cat >> $HGRCPATH << EOF | ||||
> [ui] | ||||
> logtemplate= {rev}:{node|short} ({phase}) {desc|firstline}\n | ||||
> EOF | ||||
$ hg ph -pv '.^' | ||||
phase changed for 2 changesets | ||||
$ hg log -G | ||||
@ 11:b449568bf7fc (draft) f | ||||
| | ||||
o 10:40db8afa467b (public) c | ||||
| | ||||
o 0:cb9a9f314b8b (public) a | ||||
$ hg histedit -r '.~2' | ||||
abort: cannot edit immutable changeset: cb9a9f314b8b | ||||
[255] | ||||
|
r18440 | Prepare further testing | ||
------------------------------------------- | ||||
$ for x in g h i j k ; do | ||||
> echo $x > $x | ||||
> hg add $x | ||||
> hg ci -m $x | ||||
> done | ||||
$ hg phase --force --secret .~2 | ||||
$ hg log -G | ||||
@ 16:ee118ab9fa44 (secret) k | ||||
| | ||||
o 15:3a6c53ee7f3d (secret) j | ||||
| | ||||
o 14:b605fb7503f2 (secret) i | ||||
| | ||||
o 13:7395e1ff83bd (draft) h | ||||
| | ||||
o 12:6b70183d2492 (draft) g | ||||
| | ||||
o 11:b449568bf7fc (draft) f | ||||
| | ||||
o 10:40db8afa467b (public) c | ||||
| | ||||
o 0:cb9a9f314b8b (public) a | ||||
$ cd .. | ||||
simple phase conservation | ||||
------------------------------------------- | ||||
Resulting changeset should conserve the phase of the original one whatever the | ||||
phases.new-commit option is. | ||||
New-commit as draft (default) | ||||
$ cp -r base simple-draft | ||||
$ cd simple-draft | ||||
|
r19019 | $ hg histedit -r 'b449568bf7fc' --commands - << EOF | ||
|
r18440 | > edit b449568bf7fc 11 f | ||
> pick 6b70183d2492 12 g | ||||
> pick 7395e1ff83bd 13 h | ||||
> pick b605fb7503f2 14 i | ||||
> pick 3a6c53ee7f3d 15 j | ||||
> pick ee118ab9fa44 16 k | ||||
> EOF | ||||
0 files updated, 0 files merged, 6 files removed, 0 files unresolved | ||||
adding f | ||||
|
r18934 | Make changes as needed, you may commit or record as needed now. | ||
|
r18440 | When you are finished, run hg histedit --continue to resume. | ||
|
r18935 | [1] | ||
|
r18440 | $ echo f >> f | ||
$ hg histedit --continue | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ hg log -G | ||||
@ 22:12e89af74238 (secret) k | ||||
| | ||||
o 21:636a8687b22e (secret) j | ||||
| | ||||
o 20:ccaf0a38653f (secret) i | ||||
| | ||||
o 19:11a89d1c2613 (draft) h | ||||
| | ||||
o 18:c1dec7ca82ea (draft) g | ||||
| | ||||
o 17:087281e68428 (draft) f | ||||
| | ||||
o 10:40db8afa467b (public) c | ||||
| | ||||
o 0:cb9a9f314b8b (public) a | ||||
$ cd .. | ||||
New-commit as draft (default) | ||||
$ cp -r base simple-secret | ||||
$ cd simple-secret | ||||
$ cat >> .hg/hgrc << EOF | ||||
> [phases] | ||||
> new-commit=secret | ||||
> EOF | ||||
|
r19019 | $ hg histedit -r 'b449568bf7fc' --commands - << EOF | ||
|
r18440 | > edit b449568bf7fc 11 f | ||
> pick 6b70183d2492 12 g | ||||
> pick 7395e1ff83bd 13 h | ||||
> pick b605fb7503f2 14 i | ||||
> pick 3a6c53ee7f3d 15 j | ||||
> pick ee118ab9fa44 16 k | ||||
> EOF | ||||
0 files updated, 0 files merged, 6 files removed, 0 files unresolved | ||||
adding f | ||||
|
r18934 | Make changes as needed, you may commit or record as needed now. | ||
|
r18440 | When you are finished, run hg histedit --continue to resume. | ||
|
r18935 | [1] | ||
|
r18440 | $ echo f >> f | ||
$ hg histedit --continue | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ hg log -G | ||||
@ 22:12e89af74238 (secret) k | ||||
| | ||||
o 21:636a8687b22e (secret) j | ||||
| | ||||
o 20:ccaf0a38653f (secret) i | ||||
| | ||||
o 19:11a89d1c2613 (draft) h | ||||
| | ||||
o 18:c1dec7ca82ea (draft) g | ||||
| | ||||
o 17:087281e68428 (draft) f | ||||
| | ||||
o 10:40db8afa467b (public) c | ||||
| | ||||
o 0:cb9a9f314b8b (public) a | ||||
$ cd .. | ||||
Changeset reordering | ||||
------------------------------------------- | ||||
If a secret changeset is put before a draft one, all descendant should be secret. | ||||
It seems more important to present the secret phase. | ||||
$ cp -r base reorder | ||||
$ cd reorder | ||||
|
r19019 | $ hg histedit -r 'b449568bf7fc' --commands - << EOF | ||
|
r18440 | > pick b449568bf7fc 11 f | ||
> pick 3a6c53ee7f3d 15 j | ||||
> pick 6b70183d2492 12 g | ||||
> pick b605fb7503f2 14 i | ||||
> pick 7395e1ff83bd 13 h | ||||
> pick ee118ab9fa44 16 k | ||||
> EOF | ||||
0 files updated, 0 files merged, 5 files removed, 0 files unresolved | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ hg log -G | ||||
@ 21:558246857888 (secret) k | ||||
| | ||||
o 20:28bd44768535 (secret) h | ||||
| | ||||
o 19:d5395202aeb9 (secret) i | ||||
| | ||||
o 18:21edda8e341b (secret) g | ||||
| | ||||
o 17:5ab64f3a4832 (secret) j | ||||
| | ||||
o 11:b449568bf7fc (draft) f | ||||
| | ||||
o 10:40db8afa467b (public) c | ||||
| | ||||
o 0:cb9a9f314b8b (public) a | ||||
$ cd .. | ||||
Changeset folding | ||||
------------------------------------------- | ||||
Folding a secret changeset with a draft one turn the result secret (again, | ||||
better safe than sorry). Folding between same phase changeset still works | ||||
Note that there is a few reordering in this series for more extensive test | ||||
$ cp -r base folding | ||||
$ cd folding | ||||
$ cat >> .hg/hgrc << EOF | ||||
> [phases] | ||||
> new-commit=secret | ||||
> EOF | ||||
|
r19019 | $ hg histedit -r 'b449568bf7fc' --commands - << EOF | ||
|
r18440 | > pick 7395e1ff83bd 13 h | ||
> fold b449568bf7fc 11 f | ||||
> pick 6b70183d2492 12 g | ||||
> fold 3a6c53ee7f3d 15 j | ||||
> pick b605fb7503f2 14 i | ||||
> fold ee118ab9fa44 16 k | ||||
> EOF | ||||
0 files updated, 0 files merged, 6 files removed, 0 files unresolved | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
0 files updated, 0 files merged, 2 files removed, 0 files unresolved | ||||
2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
0 files updated, 0 files merged, 2 files removed, 0 files unresolved | ||||
2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
0 files updated, 0 files merged, 2 files removed, 0 files unresolved | ||||
2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
saved backup bundle to $TESTTMP/folding/.hg/strip-backup/58019c66f35f-backup.hg (glob) | ||||
saved backup bundle to $TESTTMP/folding/.hg/strip-backup/83d1858e070b-backup.hg (glob) | ||||
saved backup bundle to $TESTTMP/folding/.hg/strip-backup/859969f5ed7e-backup.hg (glob) | ||||
$ hg log -G | ||||
@ 19:f9daec13fb98 (secret) i | ||||
| | ||||
o 18:49807617f46a (secret) g | ||||
| | ||||
o 17:050280826e04 (draft) h | ||||
| | ||||
o 10:40db8afa467b (public) c | ||||
| | ||||
o 0:cb9a9f314b8b (public) a | ||||
|
r19473 | $ hg co 18 | ||
0 files updated, 0 files merged, 2 files removed, 0 files unresolved | ||||
$ echo wat >> wat | ||||
$ hg add wat | ||||
$ hg ci -m 'add wat' | ||||
created new head | ||||
$ hg merge 19 | ||||
2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
(branch merge, don't forget to commit) | ||||
$ hg ci -m 'merge' | ||||
$ echo not wat > wat | ||||
$ hg ci -m 'modify wat' | ||||
$ hg histedit 17 | ||||
abort: cannot edit history that contains merges | ||||
[255] | ||||
|
r18440 | $ cd .. | ||