Mercurial > hg
annotate tests/test-histedit-obsolete.t @ 25881:9de443515f1d stable
help: scripting help topic
There are a lot of non-human consumers of Mercurial. And the challenges
and considerations for machines consuming Mercurial is significantly
different from what humans face.
I think there are enough special considerations around how machines
consume Mercurial that a dedicated help topic is warranted. I concede
the audience for this topic is probably small compared to the general
audience. However, lots of normal Mercurial users do things like create
one-off shell scripts for common workflows that I think this is useful
enough to be in the install (as opposed to, say, a wiki page - which
most users will likely never find).
This text is by no means perfect. But you have to start somewhere. I
think I did cover the important parts, though.
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Sat, 18 Jul 2015 17:10:28 -0700 |
parents | ebb5bb9bc32e |
children | 54f9561088c7 |
rev | line source |
---|---|
17759
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
1 $ . "$TESTDIR/histedit-helpers.sh" |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
2 |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
3 Enable obsolete |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
4 |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
5 $ cat >> $HGRCPATH << EOF |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
6 > [ui] |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
7 > logtemplate= {rev}:{node|short} {desc|firstline} |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
8 > [phases] |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
9 > publish=False |
22955
fab9dda0f2a3
obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents:
22392
diff
changeset
|
10 > [experimental] |
fab9dda0f2a3
obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents:
22392
diff
changeset
|
11 > evolution=createmarkers,allowunstable |
22392
2dd1cbee569d
tests: remove unnecessary apostrophe
David Soria Parra <davidsp@fb.com>
parents:
22260
diff
changeset
|
12 > [extensions] |
17759
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
13 > histedit= |
18438
81e77a8820f3
test-histedit: fix instability creation test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18437
diff
changeset
|
14 > rebase= |
17759
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
15 > EOF |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
16 |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
17 $ hg init base |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
18 $ cd base |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
19 |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
20 $ for x in a b c d e f ; do |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
21 > echo $x > $x |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
22 > hg add $x |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
23 > hg ci -m $x |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
24 > done |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
25 |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
26 $ hg log --graph |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
27 @ 5:652413bf663e f |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
28 | |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
29 o 4:e860deea161a e |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
30 | |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
31 o 3:055a42cdd887 d |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
32 | |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
33 o 2:177f92b77385 c |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
34 | |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
35 o 1:d2ae7f538514 b |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
36 | |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
37 o 0:cb9a9f314b8b a |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
38 |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
39 |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
40 $ HGEDITOR=cat hg histedit 1 |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
41 pick d2ae7f538514 1 b |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
42 pick 177f92b77385 2 c |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
43 pick 055a42cdd887 3 d |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
44 pick e860deea161a 4 e |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
45 pick 652413bf663e 5 f |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
46 |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
47 # Edit history between d2ae7f538514 and 652413bf663e |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
48 # |
20503
23dc77874191
histedit: clarify description of fold command
Adrian Zgorzałek <adek@fb.com>
parents:
19924
diff
changeset
|
49 # Commits are listed from least to most recent |
23dc77874191
histedit: clarify description of fold command
Adrian Zgorzałek <adek@fb.com>
parents:
19924
diff
changeset
|
50 # |
17759
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
51 # Commands: |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
52 # p, pick = use commit |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
53 # e, edit = use commit, but stop for amending |
20511
5840da876235
histedit: shorten new fold message
Matt Mackall <mpm@selenic.com>
parents:
20503
diff
changeset
|
54 # f, fold = use commit, but combine it with the one above |
22152
d2a5986cb89d
histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents:
20511
diff
changeset
|
55 # r, roll = like fold, but discard this commit's description |
17759
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
56 # d, drop = remove commit from history |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
57 # m, mess = edit message without changing commit content |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
58 # |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
59 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
19019
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18935
diff
changeset
|
60 $ hg histedit 1 --commands - --verbose <<EOF | grep histedit |
17759
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
61 > pick 177f92b77385 2 c |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
62 > drop d2ae7f538514 1 b |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
63 > pick 055a42cdd887 3 d |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
64 > fold e860deea161a 4 e |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
65 > pick 652413bf663e 5 f |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
66 > EOF |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
67 [1] |
17759
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
68 $ hg log --graph --hidden |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
69 @ 10:cacdfd884a93 f |
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
70 | |
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
71 o 9:59d9f330561f d |
17759
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
72 | |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
73 | x 8:b558abc46d09 fold-temp-revision e860deea161a |
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
74 | | |
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
75 | x 7:96e494a2d553 d |
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
76 |/ |
18437
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18398
diff
changeset
|
77 o 6:b346ab9a313d c |
17759
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
78 | |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
79 | x 5:652413bf663e f |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
80 | | |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
81 | x 4:e860deea161a e |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
82 | | |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
83 | x 3:055a42cdd887 d |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
84 | | |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
85 | x 2:177f92b77385 c |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
86 | | |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
87 | x 1:d2ae7f538514 b |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
88 |/ |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
89 o 0:cb9a9f314b8b a |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
90 |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
91 $ hg debugobsolete |
22260
2229d757802d
debugobsolete: display parents information from markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22220
diff
changeset
|
92 d2ae7f538514cd87c17547b0de4cea71fe1af9fb 0 {cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b} (*) {'user': 'test'} (glob) |
22220
908c76e84ec5
debugobsolete: explicitly display date in the output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22152
diff
changeset
|
93 177f92b773850b59254aa5e923436f921b55483b b346ab9a313db8537ecf96fca3ca3ca984ef3bd7 0 (*) {'user': 'test'} (glob) |
908c76e84ec5
debugobsolete: explicitly display date in the output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22152
diff
changeset
|
94 055a42cdd88768532f9cf79daa407fc8d138de9b 59d9f330561fd6c88b1a6b32f0e45034d88db784 0 (*) {'user': 'test'} (glob) |
908c76e84ec5
debugobsolete: explicitly display date in the output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22152
diff
changeset
|
95 e860deea161a2f77de56603b340ebbb4536308ae 59d9f330561fd6c88b1a6b32f0e45034d88db784 0 (*) {'user': 'test'} (glob) |
908c76e84ec5
debugobsolete: explicitly display date in the output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22152
diff
changeset
|
96 652413bf663ef2a641cab26574e46d5f5a64a55a cacdfd884a9321ec4e1de275ef3949fa953a1f83 0 (*) {'user': 'test'} (glob) |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
97 96e494a2d553dd05902ba1cee1d94d4cb7b8faed 0 {b346ab9a313db8537ecf96fca3ca3ca984ef3bd7} (*) {'user': 'test'} (glob) |
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
98 b558abc46d09c30f57ac31e85a8a3d64d2e906e4 0 {96e494a2d553dd05902ba1cee1d94d4cb7b8faed} (*) {'user': 'test'} (glob) |
17771
dcfa526b180b
histedit: create obsolescence markers in deterministic order
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17764
diff
changeset
|
99 |
17761
c80a7a0c7d22
histedit: ignores hidden revision when checking for orphaned nodes
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17759
diff
changeset
|
100 |
c80a7a0c7d22
histedit: ignores hidden revision when checking for orphaned nodes
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17759
diff
changeset
|
101 Ensure hidden revision does not prevent histedit |
c80a7a0c7d22
histedit: ignores hidden revision when checking for orphaned nodes
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17759
diff
changeset
|
102 ------------------------------------------------- |
c80a7a0c7d22
histedit: ignores hidden revision when checking for orphaned nodes
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17759
diff
changeset
|
103 |
c80a7a0c7d22
histedit: ignores hidden revision when checking for orphaned nodes
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17759
diff
changeset
|
104 create an hidden revision |
c80a7a0c7d22
histedit: ignores hidden revision when checking for orphaned nodes
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17759
diff
changeset
|
105 |
19019
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18935
diff
changeset
|
106 $ hg histedit 6 --commands - << EOF |
18437
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18398
diff
changeset
|
107 > pick b346ab9a313d 6 c |
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18398
diff
changeset
|
108 > drop 59d9f330561f 7 d |
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18398
diff
changeset
|
109 > pick cacdfd884a93 8 f |
17761
c80a7a0c7d22
histedit: ignores hidden revision when checking for orphaned nodes
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17759
diff
changeset
|
110 > EOF |
c80a7a0c7d22
histedit: ignores hidden revision when checking for orphaned nodes
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17759
diff
changeset
|
111 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
c80a7a0c7d22
histedit: ignores hidden revision when checking for orphaned nodes
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17759
diff
changeset
|
112 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
c80a7a0c7d22
histedit: ignores hidden revision when checking for orphaned nodes
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17759
diff
changeset
|
113 $ hg log --graph |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
114 @ 11:c13eb81022ca f |
17761
c80a7a0c7d22
histedit: ignores hidden revision when checking for orphaned nodes
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17759
diff
changeset
|
115 | |
18437
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18398
diff
changeset
|
116 o 6:b346ab9a313d c |
17761
c80a7a0c7d22
histedit: ignores hidden revision when checking for orphaned nodes
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17759
diff
changeset
|
117 | |
c80a7a0c7d22
histedit: ignores hidden revision when checking for orphaned nodes
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17759
diff
changeset
|
118 o 0:cb9a9f314b8b a |
c80a7a0c7d22
histedit: ignores hidden revision when checking for orphaned nodes
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17759
diff
changeset
|
119 |
c80a7a0c7d22
histedit: ignores hidden revision when checking for orphaned nodes
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17759
diff
changeset
|
120 check hidden revision are ignored (6 have hidden children 7 and 8) |
c80a7a0c7d22
histedit: ignores hidden revision when checking for orphaned nodes
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17759
diff
changeset
|
121 |
19019
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18935
diff
changeset
|
122 $ hg histedit 6 --commands - << EOF |
18437
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18398
diff
changeset
|
123 > pick b346ab9a313d 6 c |
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18398
diff
changeset
|
124 > pick c13eb81022ca 8 f |
17761
c80a7a0c7d22
histedit: ignores hidden revision when checking for orphaned nodes
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17759
diff
changeset
|
125 > EOF |
c80a7a0c7d22
histedit: ignores hidden revision when checking for orphaned nodes
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17759
diff
changeset
|
126 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
17762
57f27cbfc5bb
histedit: refuse to edit public changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17761
diff
changeset
|
127 |
57f27cbfc5bb
histedit: refuse to edit public changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17761
diff
changeset
|
128 |
18165
0f5a0a2073a8
histedit: allow operation from non-head if obsolete is enabled
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17771
diff
changeset
|
129 |
18398
1a00c8451640
test: fix in-test comments related to obsolescence
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18165
diff
changeset
|
130 Test that rewriting leaving instability behind is allowed |
1a00c8451640
test: fix in-test comments related to obsolescence
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18165
diff
changeset
|
131 --------------------------------------------------------------------- |
18165
0f5a0a2073a8
histedit: allow operation from non-head if obsolete is enabled
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17771
diff
changeset
|
132 |
0f5a0a2073a8
histedit: allow operation from non-head if obsolete is enabled
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17771
diff
changeset
|
133 $ hg up '.^' |
0f5a0a2073a8
histedit: allow operation from non-head if obsolete is enabled
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17771
diff
changeset
|
134 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
0f5a0a2073a8
histedit: allow operation from non-head if obsolete is enabled
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17771
diff
changeset
|
135 $ hg log -r 'children(.)' |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
136 11:c13eb81022ca f (no-eol) |
19019
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18935
diff
changeset
|
137 $ hg histedit -r '.' --commands - <<EOF |
18438
81e77a8820f3
test-histedit: fix instability creation test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18437
diff
changeset
|
138 > edit b346ab9a313d 6 c |
81e77a8820f3
test-histedit: fix instability creation test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18437
diff
changeset
|
139 > EOF |
81e77a8820f3
test-histedit: fix instability creation test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18437
diff
changeset
|
140 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
81e77a8820f3
test-histedit: fix instability creation test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18437
diff
changeset
|
141 adding c |
18934
93f3a06b2035
histedit: switch from util.Abort to util.InterventionRequired where appropriate (bc)
Augie Fackler <raf@durin42.com>
parents:
18509
diff
changeset
|
142 Make changes as needed, you may commit or record as needed now. |
18438
81e77a8820f3
test-histedit: fix instability creation test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18437
diff
changeset
|
143 When you are finished, run hg histedit --continue to resume. |
18935
e5d9441ec281
dispatch: exit with status 1 for an InterventionRequired exception (bc)
Augie Fackler <raf@durin42.com>
parents:
18934
diff
changeset
|
144 [1] |
18438
81e77a8820f3
test-histedit: fix instability creation test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18437
diff
changeset
|
145 $ echo c >> c |
81e77a8820f3
test-histedit: fix instability creation test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18437
diff
changeset
|
146 $ hg histedit --continue |
18165
0f5a0a2073a8
histedit: allow operation from non-head if obsolete is enabled
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17771
diff
changeset
|
147 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
18438
81e77a8820f3
test-histedit: fix instability creation test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18437
diff
changeset
|
148 |
81e77a8820f3
test-histedit: fix instability creation test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18437
diff
changeset
|
149 $ hg log -r 'unstable()' |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
150 11:c13eb81022ca f (no-eol) |
18438
81e77a8820f3
test-histedit: fix instability creation test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18437
diff
changeset
|
151 |
81e77a8820f3
test-histedit: fix instability creation test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18437
diff
changeset
|
152 stabilise |
81e77a8820f3
test-histedit: fix instability creation test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18437
diff
changeset
|
153 |
81e77a8820f3
test-histedit: fix instability creation test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18437
diff
changeset
|
154 $ hg rebase -r 'unstable()' -d . |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
155 rebasing 11:c13eb81022ca "f" |
19924
c23c62209cc4
tests: prepare rebase test for wc parent preservation
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
19473
diff
changeset
|
156 $ hg up tip -q |
18439
c6e3fa134da5
test-histedit: reorder phases test and prepare for more
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18438
diff
changeset
|
157 |
18509
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
158 Test dropping of changeset on the top of the stack |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
159 ------------------------------------------------------- |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
160 |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
161 Nothing is rewritten below, the working directory parent must be change for the |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
162 dropped changeset to be hidden. |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
163 |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
164 $ cd .. |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
165 $ hg clone base droplast |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
166 updating to branch default |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
167 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
168 $ cd droplast |
19019
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18935
diff
changeset
|
169 $ hg histedit -r '40db8afa467b' --commands - << EOF |
18509
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
170 > pick 40db8afa467b 10 c |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
171 > drop b449568bf7fc 11 f |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
172 > EOF |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
173 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
174 $ hg log -G |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
175 @ 12:40db8afa467b c |
18509
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
176 | |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
177 o 0:cb9a9f314b8b a |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
178 |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
179 |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
180 With rewritten ancestors |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
181 |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
182 $ echo e > e |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
183 $ hg add e |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
184 $ hg commit -m g |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
185 $ echo f > f |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
186 $ hg add f |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
187 $ hg commit -m h |
19019
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18935
diff
changeset
|
188 $ hg histedit -r '40db8afa467b' --commands - << EOF |
18509
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
189 > pick 47a8561c0449 12 g |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
190 > pick 40db8afa467b 10 c |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
191 > drop 1b3b05f35ff0 13 h |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
192 > EOF |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
193 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
194 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
195 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
196 $ hg log -G |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
197 @ 17:ee6544123ab8 c |
18509
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
198 | |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
199 o 16:269e713e9eae g |
18509
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
200 | |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
201 o 0:cb9a9f314b8b a |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
202 |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
203 $ cd ../base |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
204 |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
205 |
18439
c6e3fa134da5
test-histedit: reorder phases test and prepare for more
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18438
diff
changeset
|
206 |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
207 Test phases support |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
208 =========================================== |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
209 |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
210 Check that histedit respect immutability |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
211 ------------------------------------------- |
18439
c6e3fa134da5
test-histedit: reorder phases test and prepare for more
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18438
diff
changeset
|
212 |
c6e3fa134da5
test-histedit: reorder phases test and prepare for more
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18438
diff
changeset
|
213 $ cat >> $HGRCPATH << EOF |
c6e3fa134da5
test-histedit: reorder phases test and prepare for more
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18438
diff
changeset
|
214 > [ui] |
c6e3fa134da5
test-histedit: reorder phases test and prepare for more
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18438
diff
changeset
|
215 > logtemplate= {rev}:{node|short} ({phase}) {desc|firstline}\n |
c6e3fa134da5
test-histedit: reorder phases test and prepare for more
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18438
diff
changeset
|
216 > EOF |
c6e3fa134da5
test-histedit: reorder phases test and prepare for more
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18438
diff
changeset
|
217 |
c6e3fa134da5
test-histedit: reorder phases test and prepare for more
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18438
diff
changeset
|
218 $ hg ph -pv '.^' |
c6e3fa134da5
test-histedit: reorder phases test and prepare for more
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18438
diff
changeset
|
219 phase changed for 2 changesets |
c6e3fa134da5
test-histedit: reorder phases test and prepare for more
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18438
diff
changeset
|
220 $ hg log -G |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
221 @ 13:b449568bf7fc (draft) f |
18439
c6e3fa134da5
test-histedit: reorder phases test and prepare for more
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18438
diff
changeset
|
222 | |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
223 o 12:40db8afa467b (public) c |
18439
c6e3fa134da5
test-histedit: reorder phases test and prepare for more
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18438
diff
changeset
|
224 | |
c6e3fa134da5
test-histedit: reorder phases test and prepare for more
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18438
diff
changeset
|
225 o 0:cb9a9f314b8b (public) a |
c6e3fa134da5
test-histedit: reorder phases test and prepare for more
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18438
diff
changeset
|
226 |
c6e3fa134da5
test-histedit: reorder phases test and prepare for more
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18438
diff
changeset
|
227 $ hg histedit -r '.~2' |
25411
d298805fb639
phases: rewrite "immutable changeset" to "public changeset"
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
24771
diff
changeset
|
228 abort: cannot edit public changeset: cb9a9f314b8b |
25412
443d4635e630
phases: add `hg help phases` hint to failures to edit public commits
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
25411
diff
changeset
|
229 (see "hg help phases" for details) |
18439
c6e3fa134da5
test-histedit: reorder phases test and prepare for more
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18438
diff
changeset
|
230 [255] |
c6e3fa134da5
test-histedit: reorder phases test and prepare for more
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18438
diff
changeset
|
231 |
c6e3fa134da5
test-histedit: reorder phases test and prepare for more
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18438
diff
changeset
|
232 |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
233 Prepare further testing |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
234 ------------------------------------------- |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
235 |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
236 $ for x in g h i j k ; do |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
237 > echo $x > $x |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
238 > hg add $x |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
239 > hg ci -m $x |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
240 > done |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
241 $ hg phase --force --secret .~2 |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
242 $ hg log -G |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
243 @ 18:ee118ab9fa44 (secret) k |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
244 | |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
245 o 17:3a6c53ee7f3d (secret) j |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
246 | |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
247 o 16:b605fb7503f2 (secret) i |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
248 | |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
249 o 15:7395e1ff83bd (draft) h |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
250 | |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
251 o 14:6b70183d2492 (draft) g |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
252 | |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
253 o 13:b449568bf7fc (draft) f |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
254 | |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
255 o 12:40db8afa467b (public) c |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
256 | |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
257 o 0:cb9a9f314b8b (public) a |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
258 |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
259 $ cd .. |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
260 |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
261 simple phase conservation |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
262 ------------------------------------------- |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
263 |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
264 Resulting changeset should conserve the phase of the original one whatever the |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
265 phases.new-commit option is. |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
266 |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
267 New-commit as draft (default) |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
268 |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
269 $ cp -r base simple-draft |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
270 $ cd simple-draft |
19019
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18935
diff
changeset
|
271 $ hg histedit -r 'b449568bf7fc' --commands - << EOF |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
272 > edit b449568bf7fc 11 f |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
273 > pick 6b70183d2492 12 g |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
274 > pick 7395e1ff83bd 13 h |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
275 > pick b605fb7503f2 14 i |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
276 > pick 3a6c53ee7f3d 15 j |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
277 > pick ee118ab9fa44 16 k |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
278 > EOF |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
279 0 files updated, 0 files merged, 6 files removed, 0 files unresolved |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
280 adding f |
18934
93f3a06b2035
histedit: switch from util.Abort to util.InterventionRequired where appropriate (bc)
Augie Fackler <raf@durin42.com>
parents:
18509
diff
changeset
|
281 Make changes as needed, you may commit or record as needed now. |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
282 When you are finished, run hg histedit --continue to resume. |
18935
e5d9441ec281
dispatch: exit with status 1 for an InterventionRequired exception (bc)
Augie Fackler <raf@durin42.com>
parents:
18934
diff
changeset
|
283 [1] |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
284 $ echo f >> f |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
285 $ hg histedit --continue |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
286 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
287 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
288 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
289 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
290 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
291 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
292 $ hg log -G |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
293 @ 24:12e89af74238 (secret) k |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
294 | |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
295 o 23:636a8687b22e (secret) j |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
296 | |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
297 o 22:ccaf0a38653f (secret) i |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
298 | |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
299 o 21:11a89d1c2613 (draft) h |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
300 | |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
301 o 20:c1dec7ca82ea (draft) g |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
302 | |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
303 o 19:087281e68428 (draft) f |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
304 | |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
305 o 12:40db8afa467b (public) c |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
306 | |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
307 o 0:cb9a9f314b8b (public) a |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
308 |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
309 $ cd .. |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
310 |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
311 |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
312 New-commit as draft (default) |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
313 |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
314 $ cp -r base simple-secret |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
315 $ cd simple-secret |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
316 $ cat >> .hg/hgrc << EOF |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
317 > [phases] |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
318 > new-commit=secret |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
319 > EOF |
19019
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18935
diff
changeset
|
320 $ hg histedit -r 'b449568bf7fc' --commands - << EOF |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
321 > edit b449568bf7fc 11 f |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
322 > pick 6b70183d2492 12 g |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
323 > pick 7395e1ff83bd 13 h |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
324 > pick b605fb7503f2 14 i |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
325 > pick 3a6c53ee7f3d 15 j |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
326 > pick ee118ab9fa44 16 k |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
327 > EOF |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
328 0 files updated, 0 files merged, 6 files removed, 0 files unresolved |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
329 adding f |
18934
93f3a06b2035
histedit: switch from util.Abort to util.InterventionRequired where appropriate (bc)
Augie Fackler <raf@durin42.com>
parents:
18509
diff
changeset
|
330 Make changes as needed, you may commit or record as needed now. |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
331 When you are finished, run hg histedit --continue to resume. |
18935
e5d9441ec281
dispatch: exit with status 1 for an InterventionRequired exception (bc)
Augie Fackler <raf@durin42.com>
parents:
18934
diff
changeset
|
332 [1] |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
333 $ echo f >> f |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
334 $ hg histedit --continue |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
335 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
336 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
337 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
338 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
339 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
340 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
341 $ hg log -G |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
342 @ 24:12e89af74238 (secret) k |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
343 | |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
344 o 23:636a8687b22e (secret) j |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
345 | |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
346 o 22:ccaf0a38653f (secret) i |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
347 | |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
348 o 21:11a89d1c2613 (draft) h |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
349 | |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
350 o 20:c1dec7ca82ea (draft) g |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
351 | |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
352 o 19:087281e68428 (draft) f |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
353 | |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
354 o 12:40db8afa467b (public) c |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
355 | |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
356 o 0:cb9a9f314b8b (public) a |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
357 |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
358 $ cd .. |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
359 |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
360 |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
361 Changeset reordering |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
362 ------------------------------------------- |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
363 |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
364 If a secret changeset is put before a draft one, all descendant should be secret. |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
365 It seems more important to present the secret phase. |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
366 |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
367 $ cp -r base reorder |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
368 $ cd reorder |
19019
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18935
diff
changeset
|
369 $ hg histedit -r 'b449568bf7fc' --commands - << EOF |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
370 > pick b449568bf7fc 11 f |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
371 > pick 3a6c53ee7f3d 15 j |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
372 > pick 6b70183d2492 12 g |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
373 > pick b605fb7503f2 14 i |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
374 > pick 7395e1ff83bd 13 h |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
375 > pick ee118ab9fa44 16 k |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
376 > EOF |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
377 0 files updated, 0 files merged, 5 files removed, 0 files unresolved |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
378 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
379 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
380 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
381 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
382 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
383 $ hg log -G |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
384 @ 23:558246857888 (secret) k |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
385 | |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
386 o 22:28bd44768535 (secret) h |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
387 | |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
388 o 21:d5395202aeb9 (secret) i |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
389 | |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
390 o 20:21edda8e341b (secret) g |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
391 | |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
392 o 19:5ab64f3a4832 (secret) j |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
393 | |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
394 o 13:b449568bf7fc (draft) f |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
395 | |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
396 o 12:40db8afa467b (public) c |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
397 | |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
398 o 0:cb9a9f314b8b (public) a |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
399 |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
400 $ cd .. |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
401 |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
402 Changeset folding |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
403 ------------------------------------------- |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
404 |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
405 Folding a secret changeset with a draft one turn the result secret (again, |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
406 better safe than sorry). Folding between same phase changeset still works |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
407 |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
408 Note that there is a few reordering in this series for more extensive test |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
409 |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
410 $ cp -r base folding |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
411 $ cd folding |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
412 $ cat >> .hg/hgrc << EOF |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
413 > [phases] |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
414 > new-commit=secret |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
415 > EOF |
19019
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18935
diff
changeset
|
416 $ hg histedit -r 'b449568bf7fc' --commands - << EOF |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
417 > pick 7395e1ff83bd 13 h |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
418 > fold b449568bf7fc 11 f |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
419 > pick 6b70183d2492 12 g |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
420 > fold 3a6c53ee7f3d 15 j |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
421 > pick b605fb7503f2 14 i |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
422 > fold ee118ab9fa44 16 k |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
423 > EOF |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
424 0 files updated, 0 files merged, 6 files removed, 0 files unresolved |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
425 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
426 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
427 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
428 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
429 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
430 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
431 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
432 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
433 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
434 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
435 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
436 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
437 $ hg log -G |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
438 @ 27:f9daec13fb98 (secret) i |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
439 | |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
440 o 24:49807617f46a (secret) g |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
441 | |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
442 o 21:050280826e04 (draft) h |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
443 | |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
444 o 12:40db8afa467b (public) c |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
445 | |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
446 o 0:cb9a9f314b8b (public) a |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
447 |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
448 $ hg co 24 |
19473
10a0ae668fe6
histedit: refuse to edit history that contains merges (issue3962)
Augie Fackler <raf@durin42.com>
parents:
19019
diff
changeset
|
449 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
10a0ae668fe6
histedit: refuse to edit history that contains merges (issue3962)
Augie Fackler <raf@durin42.com>
parents:
19019
diff
changeset
|
450 $ echo wat >> wat |
10a0ae668fe6
histedit: refuse to edit history that contains merges (issue3962)
Augie Fackler <raf@durin42.com>
parents:
19019
diff
changeset
|
451 $ hg add wat |
10a0ae668fe6
histedit: refuse to edit history that contains merges (issue3962)
Augie Fackler <raf@durin42.com>
parents:
19019
diff
changeset
|
452 $ hg ci -m 'add wat' |
10a0ae668fe6
histedit: refuse to edit history that contains merges (issue3962)
Augie Fackler <raf@durin42.com>
parents:
19019
diff
changeset
|
453 created new head |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
454 $ hg merge 27 |
19473
10a0ae668fe6
histedit: refuse to edit history that contains merges (issue3962)
Augie Fackler <raf@durin42.com>
parents:
19019
diff
changeset
|
455 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
10a0ae668fe6
histedit: refuse to edit history that contains merges (issue3962)
Augie Fackler <raf@durin42.com>
parents:
19019
diff
changeset
|
456 (branch merge, don't forget to commit) |
10a0ae668fe6
histedit: refuse to edit history that contains merges (issue3962)
Augie Fackler <raf@durin42.com>
parents:
19019
diff
changeset
|
457 $ hg ci -m 'merge' |
10a0ae668fe6
histedit: refuse to edit history that contains merges (issue3962)
Augie Fackler <raf@durin42.com>
parents:
19019
diff
changeset
|
458 $ echo not wat > wat |
10a0ae668fe6
histedit: refuse to edit history that contains merges (issue3962)
Augie Fackler <raf@durin42.com>
parents:
19019
diff
changeset
|
459 $ hg ci -m 'modify wat' |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
460 $ hg histedit 21 |
19473
10a0ae668fe6
histedit: refuse to edit history that contains merges (issue3962)
Augie Fackler <raf@durin42.com>
parents:
19019
diff
changeset
|
461 abort: cannot edit history that contains merges |
10a0ae668fe6
histedit: refuse to edit history that contains merges (issue3962)
Augie Fackler <raf@durin42.com>
parents:
19019
diff
changeset
|
462 [255] |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
463 $ cd .. |