Mercurial > hg > mercurial-source

annotate tests/test-histedit-fold.t @ 28098:f209c85183a7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
histedit: add progress support
author timeless <timeless@mozdev.org>
date Fri, 18 Dec 2015 06:19:22 +0000
parents 11be6b7f95da
children dcbba68e076f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
21024
7731a2281cf0 spelling: fixes from spell checker
Mads Kiilerich <madski@unity3d.com>
parents: 20859
diff changeset
1 Test histedit extension: Fold commands
19015
07db88f053fe test: improve documentation of some histedit tests
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 19014
diff changeset
2 ======================================
07db88f053fe test: improve documentation of some histedit tests
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 19014
diff changeset
3
07db88f053fe test: improve documentation of some histedit tests
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 19014
diff changeset
4 This test file is dedicated to testing the fold command in non conflicting
07db88f053fe test: improve documentation of some histedit tests
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 19014
diff changeset
5 case.
07db88f053fe test: improve documentation of some histedit tests
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 19014
diff changeset
6
07db88f053fe test: improve documentation of some histedit tests
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 19014
diff changeset
7 Initialization
07db88f053fe test: improve documentation of some histedit tests
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 19014
diff changeset
8 ---------------
07db88f053fe test: improve documentation of some histedit tests
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 19014
diff changeset
9
07db88f053fe test: improve documentation of some histedit tests
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 19014
diff changeset
10
17071
35729bdd59b6 tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents: 17064
diff changeset
11 $ . "$TESTDIR/histedit-helpers.sh"
17064
168cc52ad7c2 histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff changeset
12
17071
35729bdd59b6 tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents: 17064
diff changeset
13 $ cat >> $HGRCPATH <<EOF
19014
7b50120e8f6e test: use a lighter log style in histedit test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18935
diff changeset
14 > [alias]
7b50120e8f6e test: use a lighter log style in histedit test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18935
diff changeset
15 > logt = log --template '{rev}:{node|short} {desc|firstline}\n'
17071
35729bdd59b6 tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents: 17064
diff changeset
16 > [extensions]
35729bdd59b6 tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents: 17064
diff changeset
17 > histedit=
35729bdd59b6 tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents: 17064
diff changeset
18 > EOF
17064
168cc52ad7c2 histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff changeset
19
19015
07db88f053fe test: improve documentation of some histedit tests
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 19014
diff changeset
20
07db88f053fe test: improve documentation of some histedit tests
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 19014
diff changeset
21 Simple folding
07db88f053fe test: improve documentation of some histedit tests
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 19014
diff changeset
22 --------------------
17071
35729bdd59b6 tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents: 17064
diff changeset
23 $ initrepo ()
35729bdd59b6 tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents: 17064
diff changeset
24 > {
35729bdd59b6 tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents: 17064
diff changeset
25 > hg init r
35729bdd59b6 tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents: 17064
diff changeset
26 > cd r
35729bdd59b6 tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents: 17064
diff changeset
27 > for x in a b c d e f ; do
35729bdd59b6 tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents: 17064
diff changeset
28 > echo $x > $x
35729bdd59b6 tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents: 17064
diff changeset
29 > hg add $x
35729bdd59b6 tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents: 17064
diff changeset
30 > hg ci -m $x
35729bdd59b6 tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents: 17064
diff changeset
31 > done
35729bdd59b6 tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents: 17064
diff changeset
32 > }
35729bdd59b6 tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents: 17064
diff changeset
33
35729bdd59b6 tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents: 17064
diff changeset
34 $ initrepo
17064
168cc52ad7c2 histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff changeset
35
17071
35729bdd59b6 tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents: 17064
diff changeset
36 log before edit
19014
7b50120e8f6e test: use a lighter log style in histedit test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18935
diff changeset
37 $ hg logt --graph
7b50120e8f6e test: use a lighter log style in histedit test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18935
diff changeset
38 @ 5:652413bf663e f
17071
35729bdd59b6 tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents: 17064
diff changeset
39 |
19014
7b50120e8f6e test: use a lighter log style in histedit test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18935
diff changeset
40 o 4:e860deea161a e
17071
35729bdd59b6 tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents: 17064
diff changeset
41 |
19014
7b50120e8f6e test: use a lighter log style in histedit test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18935
diff changeset
42 o 3:055a42cdd887 d
17071
35729bdd59b6 tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents: 17064
diff changeset
43 |
19014
7b50120e8f6e test: use a lighter log style in histedit test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18935
diff changeset
44 o 2:177f92b77385 c
17071
35729bdd59b6 tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents: 17064
diff changeset
45 |
19014
7b50120e8f6e test: use a lighter log style in histedit test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18935
diff changeset
46 o 1:d2ae7f538514 b
17071
35729bdd59b6 tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents: 17064
diff changeset
47 |
19014
7b50120e8f6e test: use a lighter log style in histedit test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18935
diff changeset
48 o 0:cb9a9f314b8b a
17071
35729bdd59b6 tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents: 17064
diff changeset
49
17064
168cc52ad7c2 histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff changeset
50
19018
730614b9b352 histedit: allow "-" as a command file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 19017
diff changeset
51 $ hg histedit 177f92b77385 --commands - 2>&1 <<EOF | fixbundle
19015
07db88f053fe test: improve documentation of some histedit tests
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 19014
diff changeset
52 > pick e860deea161a e
07db88f053fe test: improve documentation of some histedit tests
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 19014
diff changeset
53 > pick 652413bf663e f
07db88f053fe test: improve documentation of some histedit tests
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 19014
diff changeset
54 > fold 177f92b77385 c
07db88f053fe test: improve documentation of some histedit tests
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 19014
diff changeset
55 > pick 055a42cdd887 d
07db88f053fe test: improve documentation of some histedit tests
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 19014
diff changeset
56 > EOF
17071
35729bdd59b6 tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents: 17064
diff changeset
57 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
35729bdd59b6 tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents: 17064
diff changeset
58 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
17644
9ae073f10572 histedit: fold in memory
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17258
diff changeset
59 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
17064
168cc52ad7c2 histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff changeset
60
17071
35729bdd59b6 tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents: 17064
diff changeset
61 log after edit
19014
7b50120e8f6e test: use a lighter log style in histedit test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18935
diff changeset
62 $ hg logt --graph
19018
730614b9b352 histedit: allow "-" as a command file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 19017
diff changeset
63 @ 4:9c277da72c9b d
17071
35729bdd59b6 tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents: 17064
diff changeset
64 |
19018
730614b9b352 histedit: allow "-" as a command file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 19017
diff changeset
65 o 3:6de59d13424a f
17071
35729bdd59b6 tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents: 17064
diff changeset
66 |
19014
7b50120e8f6e test: use a lighter log style in histedit test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18935
diff changeset
67 o 2:ee283cb5f2d5 e
17071
35729bdd59b6 tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents: 17064
diff changeset
68 |
19014
7b50120e8f6e test: use a lighter log style in histedit test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18935
diff changeset
69 o 1:d2ae7f538514 b
17071
35729bdd59b6 tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents: 17064
diff changeset
70 |
19014
7b50120e8f6e test: use a lighter log style in histedit test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18935
diff changeset
71 o 0:cb9a9f314b8b a
17071
35729bdd59b6 tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents: 17064
diff changeset
72
17064
168cc52ad7c2 histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff changeset
73
17071
35729bdd59b6 tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents: 17064
diff changeset
74 post-fold manifest
35729bdd59b6 tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents: 17064
diff changeset
75 $ hg manifest
35729bdd59b6 tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents: 17064
diff changeset
76 a
35729bdd59b6 tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents: 17064
diff changeset
77 b
35729bdd59b6 tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents: 17064
diff changeset
78 c
35729bdd59b6 tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents: 17064
diff changeset
79 d
35729bdd59b6 tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents: 17064
diff changeset
80 e
35729bdd59b6 tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents: 17064
diff changeset
81 f
17064
168cc52ad7c2 histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff changeset
82
18437
358c23e8f1c6 histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17686
diff changeset
83
358c23e8f1c6 histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17686
diff changeset
84 check histedit_source
358c23e8f1c6 histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17686
diff changeset
85
358c23e8f1c6 histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17686
diff changeset
86 $ hg log --debug --rev 3
19019
53060cc1b601 histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 19018
diff changeset
87 changeset: 3:6de59d13424a8a13acd3e975514aed29dd0d9b2d
18437
358c23e8f1c6 histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17686
diff changeset
88 phase: draft
358c23e8f1c6 histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17686
diff changeset
89 parent: 2:ee283cb5f2d5955443f23a27b697a04339e9a39a
358c23e8f1c6 histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17686
diff changeset
90 parent: -1:0000000000000000000000000000000000000000
358c23e8f1c6 histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17686
diff changeset
91 manifest: 3:81eede616954057198ead0b2c73b41d1f392829a
358c23e8f1c6 histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17686
diff changeset
92 user: test
358c23e8f1c6 histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17686
diff changeset
93 date: Thu Jan 01 00:00:00 1970 +0000
358c23e8f1c6 histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17686
diff changeset
94 files+: c f
358c23e8f1c6 histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17686
diff changeset
95 extra: branch=default
358c23e8f1c6 histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17686
diff changeset
96 extra: histedit_source=a4f7421b80f79fcc59fff01bcbf4a53d127dd6d3,177f92b773850b59254aa5e923436f921b55483b
358c23e8f1c6 histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17686
diff changeset
97 description:
19019
53060cc1b601 histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 19018
diff changeset
98 f
53060cc1b601 histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 19018
diff changeset
99 ***
53060cc1b601 histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 19018
diff changeset
100 c
18437
358c23e8f1c6 histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17686
diff changeset
101
358c23e8f1c6 histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17686
diff changeset
102
358c23e8f1c6 histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17686
diff changeset
103
22152
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents: 21947
diff changeset
104 rollup will fold without preserving the folded commit's message
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents: 21947
diff changeset
105
25007
5045a003260b histedit: fix rollup prompting for a commit message (issue4606)
Durham Goode <durham@fb.com>
parents: 24950
diff changeset
106 $ OLDHGEDITOR=$HGEDITOR
5045a003260b histedit: fix rollup prompting for a commit message (issue4606)
Durham Goode <durham@fb.com>
parents: 24950
diff changeset
107 $ HGEDITOR=false
22152
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents: 21947
diff changeset
108 $ hg histedit d2ae7f538514 --commands - 2>&1 <<EOF | fixbundle
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents: 21947
diff changeset
109 > pick d2ae7f538514 b
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents: 21947
diff changeset
110 > roll ee283cb5f2d5 e
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents: 21947
diff changeset
111 > pick 6de59d13424a f
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents: 21947
diff changeset
112 > pick 9c277da72c9b d
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents: 21947
diff changeset
113 > EOF
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents: 21947
diff changeset
114 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents: 21947
diff changeset
115 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents: 21947
diff changeset
116 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents: 21947
diff changeset
117
25007
5045a003260b histedit: fix rollup prompting for a commit message (issue4606)
Durham Goode <durham@fb.com>
parents: 24950
diff changeset
118 $ HGEDITOR=$OLDHGEDITOR
5045a003260b histedit: fix rollup prompting for a commit message (issue4606)
Durham Goode <durham@fb.com>
parents: 24950
diff changeset
119
22152
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents: 21947
diff changeset
120 log after edit
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents: 21947
diff changeset
121 $ hg logt --graph
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents: 21947
diff changeset
122 @ 3:c4a9eb7989fc d
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents: 21947
diff changeset
123 |
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents: 21947
diff changeset
124 o 2:8e03a72b6f83 f
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents: 21947
diff changeset
125 |
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents: 21947
diff changeset
126 o 1:391ee782c689 b
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents: 21947
diff changeset
127 |
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents: 21947
diff changeset
128 o 0:cb9a9f314b8b a
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents: 21947
diff changeset
129
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents: 21947
diff changeset
130
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents: 21947
diff changeset
131 description is taken from rollup target commit
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents: 21947
diff changeset
132
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents: 21947
diff changeset
133 $ hg log --debug --rev 1
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents: 21947
diff changeset
134 changeset: 1:391ee782c68930be438ccf4c6a403daedbfbffa5
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents: 21947
diff changeset
135 phase: draft
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents: 21947
diff changeset
136 parent: 0:cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents: 21947
diff changeset
137 parent: -1:0000000000000000000000000000000000000000
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents: 21947
diff changeset
138 manifest: 1:b5e112a3a8354e269b1524729f0918662d847c38
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents: 21947
diff changeset
139 user: test
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents: 21947
diff changeset
140 date: Thu Jan 01 00:00:00 1970 +0000
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents: 21947
diff changeset
141 files+: b e
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents: 21947
diff changeset
142 extra: branch=default
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents: 21947
diff changeset
143 extra: histedit_source=d2ae7f538514cd87c17547b0de4cea71fe1af9fb,ee283cb5f2d5955443f23a27b697a04339e9a39a
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents: 21947
diff changeset
144 description:
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents: 21947
diff changeset
145 b
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents: 21947
diff changeset
146
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents: 21947
diff changeset
147
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents: 21947
diff changeset
148
20770
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
149 check saving last-message.txt
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
150
20859
e259d4c462b5 tests: use TESTTMP instead of TESTDIR
Sean Farley <sean.michael.farley@gmail.com>
parents: 20770
diff changeset
151 $ cat > $TESTTMP/abortfolding.py <<EOF
20770
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
152 > from mercurial import util
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
153 > def abortfolding(ui, repo, hooktype, **kwargs):
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
154 > ctx = repo[kwargs.get('node')]
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
155 > if set(ctx.files()) == set(['c', 'd', 'f']):
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
156 > return True # abort folding commit only
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
157 > ui.warn('allow non-folding commit\\n')
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
158 > EOF
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
159 $ cat > .hg/hgrc <<EOF
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
160 > [hooks]
20859
e259d4c462b5 tests: use TESTTMP instead of TESTDIR
Sean Farley <sean.michael.farley@gmail.com>
parents: 20770
diff changeset
161 > pretxncommit.abortfolding = python:$TESTTMP/abortfolding.py:abortfolding
20770
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
162 > EOF
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
163
20859
e259d4c462b5 tests: use TESTTMP instead of TESTDIR
Sean Farley <sean.michael.farley@gmail.com>
parents: 20770
diff changeset
164 $ cat > $TESTTMP/editor.sh << EOF
20770
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
165 > echo "==== before editing"
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
166 > cat \$1
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
167 > echo "===="
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
168 > echo "check saving last-message.txt" >> \$1
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
169 > EOF
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
170
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
171 $ rm -f .hg/last-message.txt
23599
8063901e56cd memctx: calculate exact status being committed from specified files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23390
diff changeset
172 $ hg status --rev '8e03a72b6f83^1::c4a9eb7989fc'
8063901e56cd memctx: calculate exact status being committed from specified files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23390
diff changeset
173 A c
8063901e56cd memctx: calculate exact status being committed from specified files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23390
diff changeset
174 A d
8063901e56cd memctx: calculate exact status being committed from specified files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23390
diff changeset
175 A f
8063901e56cd memctx: calculate exact status being committed from specified files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23390
diff changeset
176 $ HGEDITOR="sh $TESTTMP/editor.sh" hg histedit 8e03a72b6f83 --commands - 2>&1 <<EOF
22152
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents: 21947
diff changeset
177 > pick 8e03a72b6f83 f
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents: 21947
diff changeset
178 > fold c4a9eb7989fc d
20770
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
179 > EOF
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
180 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
23599
8063901e56cd memctx: calculate exact status being committed from specified files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23390
diff changeset
181 adding d
20770
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
182 allow non-folding commit
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
183 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
184 ==== before editing
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
185 f
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
186 ***
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
187 c
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
188 ***
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
189 d
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
190
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
191
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
192
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
193 HG: Enter commit message. Lines beginning with 'HG:' are removed.
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
194 HG: Leave message empty to abort commit.
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
195 HG: --
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
196 HG: user: test
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
197 HG: branch 'default'
23599
8063901e56cd memctx: calculate exact status being committed from specified files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23390
diff changeset
198 HG: added c
8063901e56cd memctx: calculate exact status being committed from specified files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23390
diff changeset
199 HG: added d
8063901e56cd memctx: calculate exact status being committed from specified files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23390
diff changeset
200 HG: added f
20770
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
201 ====
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
202 transaction abort!
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
203 rollback completed
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
204 abort: pretxncommit.abortfolding hook failed
23599
8063901e56cd memctx: calculate exact status being committed from specified files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23390
diff changeset
205 [255]
20770
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
206
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
207 $ cat .hg/last-message.txt
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
208 f
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
209 ***
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
210 c
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
211 ***
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
212 d
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
213
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
214
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
215
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
216 check saving last-message.txt
5d22cadd1938 histedit: save manually edited commit message into ".hg/last-message.txt"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20117
diff changeset
217
17071
35729bdd59b6 tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents: 17064
diff changeset
218 $ cd ..
22147
9ac98c2aa95c histedit: preserve initial author on fold (issue4296)
Martin von Zweigbergk <martinvonz@gmail.com>
parents: 21947
diff changeset
219 $ rm -r r
9ac98c2aa95c histedit: preserve initial author on fold (issue4296)
Martin von Zweigbergk <martinvonz@gmail.com>
parents: 21947
diff changeset
220
9ac98c2aa95c histedit: preserve initial author on fold (issue4296)
Martin von Zweigbergk <martinvonz@gmail.com>
parents: 21947
diff changeset
221 folding preserves initial author
9ac98c2aa95c histedit: preserve initial author on fold (issue4296)
Martin von Zweigbergk <martinvonz@gmail.com>
parents: 21947
diff changeset
222 --------------------------------
9ac98c2aa95c histedit: preserve initial author on fold (issue4296)
Martin von Zweigbergk <martinvonz@gmail.com>
parents: 21947
diff changeset
223
9ac98c2aa95c histedit: preserve initial author on fold (issue4296)
Martin von Zweigbergk <martinvonz@gmail.com>
parents: 21947
diff changeset
224 $ initrepo
9ac98c2aa95c histedit: preserve initial author on fold (issue4296)
Martin von Zweigbergk <martinvonz@gmail.com>
parents: 21947
diff changeset
225
9ac98c2aa95c histedit: preserve initial author on fold (issue4296)
Martin von Zweigbergk <martinvonz@gmail.com>
parents: 21947
diff changeset
226 $ hg ci --user "someone else" --amend --quiet
9ac98c2aa95c histedit: preserve initial author on fold (issue4296)
Martin von Zweigbergk <martinvonz@gmail.com>
parents: 21947
diff changeset
227
9ac98c2aa95c histedit: preserve initial author on fold (issue4296)
Martin von Zweigbergk <martinvonz@gmail.com>
parents: 21947
diff changeset
228 tip before edit
9ac98c2aa95c histedit: preserve initial author on fold (issue4296)
Martin von Zweigbergk <martinvonz@gmail.com>
parents: 21947
diff changeset
229 $ hg log --rev .
9ac98c2aa95c histedit: preserve initial author on fold (issue4296)
Martin von Zweigbergk <martinvonz@gmail.com>
parents: 21947
diff changeset
230 changeset: 5:a00ad806cb55
9ac98c2aa95c histedit: preserve initial author on fold (issue4296)
Martin von Zweigbergk <martinvonz@gmail.com>
parents: 21947
diff changeset
231 tag: tip
9ac98c2aa95c histedit: preserve initial author on fold (issue4296)
Martin von Zweigbergk <martinvonz@gmail.com>
parents: 21947
diff changeset
232 user: someone else
9ac98c2aa95c histedit: preserve initial author on fold (issue4296)
Martin von Zweigbergk <martinvonz@gmail.com>
parents: 21947
diff changeset
233 date: Thu Jan 01 00:00:00 1970 +0000
9ac98c2aa95c histedit: preserve initial author on fold (issue4296)
Martin von Zweigbergk <martinvonz@gmail.com>
parents: 21947
diff changeset
234 summary: f
9ac98c2aa95c histedit: preserve initial author on fold (issue4296)
Martin von Zweigbergk <martinvonz@gmail.com>
parents: 21947
diff changeset
235
9ac98c2aa95c histedit: preserve initial author on fold (issue4296)
Martin von Zweigbergk <martinvonz@gmail.com>
parents: 21947
diff changeset
236
28098
f209c85183a7 histedit: add progress support
timeless <timeless@mozdev.org>
parents: 28053
diff changeset
237 $ hg --config progress.debug=1 --debug \
f209c85183a7 histedit: add progress support
timeless <timeless@mozdev.org>
parents: 28053
diff changeset
238 > histedit e860deea161a --commands - 2>&1 <<EOF | \
f209c85183a7 histedit: add progress support
timeless <timeless@mozdev.org>
parents: 28053
diff changeset
239 > egrep 'editing|unresolved'
22147
9ac98c2aa95c histedit: preserve initial author on fold (issue4296)
Martin von Zweigbergk <martinvonz@gmail.com>
parents: 21947
diff changeset
240 > pick e860deea161a e
9ac98c2aa95c histedit: preserve initial author on fold (issue4296)
Martin von Zweigbergk <martinvonz@gmail.com>
parents: 21947
diff changeset
241 > fold a00ad806cb55 f
9ac98c2aa95c histedit: preserve initial author on fold (issue4296)
Martin von Zweigbergk <martinvonz@gmail.com>
parents: 21947
diff changeset
242 > EOF
28098
f209c85183a7 histedit: add progress support
timeless <timeless@mozdev.org>
parents: 28053
diff changeset
243 editing: pick e860deea161a 4 e 1/2 changes (50.00%)
f209c85183a7 histedit: add progress support
timeless <timeless@mozdev.org>
parents: 28053
diff changeset
244 editing: fold a00ad806cb55 5 f 2/2 changes (100.00%)
22147
9ac98c2aa95c histedit: preserve initial author on fold (issue4296)
Martin von Zweigbergk <martinvonz@gmail.com>
parents: 21947
diff changeset
245 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
9ac98c2aa95c histedit: preserve initial author on fold (issue4296)
Martin von Zweigbergk <martinvonz@gmail.com>
parents: 21947
diff changeset
246 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
9ac98c2aa95c histedit: preserve initial author on fold (issue4296)
Martin von Zweigbergk <martinvonz@gmail.com>
parents: 21947
diff changeset
247 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
9ac98c2aa95c histedit: preserve initial author on fold (issue4296)
Martin von Zweigbergk <martinvonz@gmail.com>
parents: 21947
diff changeset
248
9ac98c2aa95c histedit: preserve initial author on fold (issue4296)
Martin von Zweigbergk <martinvonz@gmail.com>
parents: 21947
diff changeset
249 tip after edit
9ac98c2aa95c histedit: preserve initial author on fold (issue4296)
Martin von Zweigbergk <martinvonz@gmail.com>
parents: 21947
diff changeset
250 $ hg log --rev .
9ac98c2aa95c histedit: preserve initial author on fold (issue4296)
Martin von Zweigbergk <martinvonz@gmail.com>
parents: 21947
diff changeset
251 changeset: 4:698d4e8040a1
9ac98c2aa95c histedit: preserve initial author on fold (issue4296)
Martin von Zweigbergk <martinvonz@gmail.com>
parents: 21947
diff changeset
252 tag: tip
9ac98c2aa95c histedit: preserve initial author on fold (issue4296)
Martin von Zweigbergk <martinvonz@gmail.com>
parents: 21947
diff changeset
253 user: test
9ac98c2aa95c histedit: preserve initial author on fold (issue4296)
Martin von Zweigbergk <martinvonz@gmail.com>
parents: 21947
diff changeset
254 date: Thu Jan 01 00:00:00 1970 +0000
9ac98c2aa95c histedit: preserve initial author on fold (issue4296)
Martin von Zweigbergk <martinvonz@gmail.com>
parents: 21947
diff changeset
255 summary: e
9ac98c2aa95c histedit: preserve initial author on fold (issue4296)
Martin von Zweigbergk <martinvonz@gmail.com>
parents: 21947
diff changeset
256
9ac98c2aa95c histedit: preserve initial author on fold (issue4296)
Martin von Zweigbergk <martinvonz@gmail.com>
parents: 21947
diff changeset
257
9ac98c2aa95c histedit: preserve initial author on fold (issue4296)
Martin von Zweigbergk <martinvonz@gmail.com>
parents: 21947
diff changeset
258 $ cd ..
9ac98c2aa95c histedit: preserve initial author on fold (issue4296)
Martin von Zweigbergk <martinvonz@gmail.com>
parents: 21947
diff changeset
259 $ rm -r r
17137
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty
Augie Fackler <raf@durin42.com>
parents: 17073
diff changeset
260
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty
Augie Fackler <raf@durin42.com>
parents: 17073
diff changeset
261 folding and creating no new change doesn't break:
19015
07db88f053fe test: improve documentation of some histedit tests
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 19014
diff changeset
262 -------------------------------------------------
07db88f053fe test: improve documentation of some histedit tests
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 19014
diff changeset
263
21024
7731a2281cf0 spelling: fixes from spell checker
Mads Kiilerich <madski@unity3d.com>
parents: 20859
diff changeset
264 folded content is dropped during a merge. The folded commit should properly disappear.
19015
07db88f053fe test: improve documentation of some histedit tests
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 19014
diff changeset
265
17137
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty
Augie Fackler <raf@durin42.com>
parents: 17073
diff changeset
266 $ mkdir fold-to-empty-test
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty
Augie Fackler <raf@durin42.com>
parents: 17073
diff changeset
267 $ cd fold-to-empty-test
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty
Augie Fackler <raf@durin42.com>
parents: 17073
diff changeset
268 $ hg init
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty
Augie Fackler <raf@durin42.com>
parents: 17073
diff changeset
269 $ printf "1\n2\n3\n" > file
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty
Augie Fackler <raf@durin42.com>
parents: 17073
diff changeset
270 $ hg add file
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty
Augie Fackler <raf@durin42.com>
parents: 17073
diff changeset
271 $ hg commit -m '1+2+3'
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty
Augie Fackler <raf@durin42.com>
parents: 17073
diff changeset
272 $ echo 4 >> file
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty
Augie Fackler <raf@durin42.com>
parents: 17073
diff changeset
273 $ hg commit -m '+4'
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty
Augie Fackler <raf@durin42.com>
parents: 17073
diff changeset
274 $ echo 5 >> file
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty
Augie Fackler <raf@durin42.com>
parents: 17073
diff changeset
275 $ hg commit -m '+5'
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty
Augie Fackler <raf@durin42.com>
parents: 17073
diff changeset
276 $ echo 6 >> file
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty
Augie Fackler <raf@durin42.com>
parents: 17073
diff changeset
277 $ hg commit -m '+6'
19014
7b50120e8f6e test: use a lighter log style in histedit test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18935
diff changeset
278 $ hg logt --graph
7b50120e8f6e test: use a lighter log style in histedit test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18935
diff changeset
279 @ 3:251d831eeec5 +6
17137
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty
Augie Fackler <raf@durin42.com>
parents: 17073
diff changeset
280 |
19014
7b50120e8f6e test: use a lighter log style in histedit test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18935
diff changeset
281 o 2:888f9082bf99 +5
17137
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty
Augie Fackler <raf@durin42.com>
parents: 17073
diff changeset
282 |
19014
7b50120e8f6e test: use a lighter log style in histedit test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18935
diff changeset
283 o 1:617f94f13c0f +4
17137
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty
Augie Fackler <raf@durin42.com>
parents: 17073
diff changeset
284 |
19014
7b50120e8f6e test: use a lighter log style in histedit test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18935
diff changeset
285 o 0:0189ba417d34 1+2+3
17137
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty
Augie Fackler <raf@durin42.com>
parents: 17073
diff changeset
286
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty
Augie Fackler <raf@durin42.com>
parents: 17073
diff changeset
287
19019
53060cc1b601 histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 19018
diff changeset
288 $ hg histedit 1 --commands - << EOF
19016
27ec54f2946e histedit-test: replace obscure python script by a plain file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 19015
diff changeset
289 > pick 617f94f13c0f 1 +4
27ec54f2946e histedit-test: replace obscure python script by a plain file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 19015
diff changeset
290 > drop 888f9082bf99 2 +5
19017
c5c8613f265e histedit: properly handle --continue on empty fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 19016
diff changeset
291 > fold 251d831eeec5 3 +6
17137
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty
Augie Fackler <raf@durin42.com>
parents: 17073
diff changeset
292 > EOF
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty
Augie Fackler <raf@durin42.com>
parents: 17073
diff changeset
293 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
17647
d34ba4991188 histedit: replaces patching logic by merges
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17644
diff changeset
294 merging file
27254
ef1eb6df7071 simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents: 26864
diff changeset
295 warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
18934
93f3a06b2035 histedit: switch from util.Abort to util.InterventionRequired where appropriate (bc)
Augie Fackler <raf@durin42.com>
parents: 18642
diff changeset
296 Fix up the change and run hg histedit --continue
18935
e5d9441ec281 dispatch: exit with status 1 for an InterventionRequired exception (bc)
Augie Fackler <raf@durin42.com>
parents: 18934
diff changeset
297 [1]
17647
d34ba4991188 histedit: replaces patching logic by merges
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17644
diff changeset
298 There were conflicts, we keep P1 content. This
17137
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty
Augie Fackler <raf@durin42.com>
parents: 17073
diff changeset
299 should effectively drop the changes from +6.
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty
Augie Fackler <raf@durin42.com>
parents: 17073
diff changeset
300 $ hg status
17647
d34ba4991188 histedit: replaces patching logic by merges
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17644
diff changeset
301 M file
d34ba4991188 histedit: replaces patching logic by merges
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17644
diff changeset
302 ? file.orig
d34ba4991188 histedit: replaces patching logic by merges
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17644
diff changeset
303 $ hg resolve -l
d34ba4991188 histedit: replaces patching logic by merges
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17644
diff changeset
304 U file
d34ba4991188 histedit: replaces patching logic by merges
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17644
diff changeset
305 $ hg revert -r 'p1()' file
d34ba4991188 histedit: replaces patching logic by merges
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17644
diff changeset
306 $ hg resolve --mark file
21947
b081decd9062 resolve: add parenthesis around "no more unresolved files" message
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21267
diff changeset
307 (no more unresolved files)
17137
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty
Augie Fackler <raf@durin42.com>
parents: 17073
diff changeset
308 $ hg histedit --continue
24950
3133e246c912 histedit: convert fold/roll actions into a class
Durham Goode <durham@fb.com>
parents: 23847
diff changeset
309 251d831eeec5: empty changeset
17137
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty
Augie Fackler <raf@durin42.com>
parents: 17073
diff changeset
310 saved backup bundle to $TESTTMP/*-backup.hg (glob)
19014
7b50120e8f6e test: use a lighter log style in histedit test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18935
diff changeset
311 $ hg logt --graph
7b50120e8f6e test: use a lighter log style in histedit test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18935
diff changeset
312 @ 1:617f94f13c0f +4
17137
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty
Augie Fackler <raf@durin42.com>
parents: 17073
diff changeset
313 |
19014
7b50120e8f6e test: use a lighter log style in histedit test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18935
diff changeset
314 o 0:0189ba417d34 1+2+3
17137
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty
Augie Fackler <raf@durin42.com>
parents: 17073
diff changeset
315
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty
Augie Fackler <raf@durin42.com>
parents: 17073
diff changeset
316
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty
Augie Fackler <raf@durin42.com>
parents: 17073
diff changeset
317 $ cd ..
17242
336121088ef1 histedit: fix new nodes computation with --continue (issue3534)
Patrick Mezard <patrick@mezard.eu>
parents: 17137
diff changeset
318
19015
07db88f053fe test: improve documentation of some histedit tests
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 19014
diff changeset
319
07db88f053fe test: improve documentation of some histedit tests
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 19014
diff changeset
320 Test fold through dropped
07db88f053fe test: improve documentation of some histedit tests
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 19014
diff changeset
321 -------------------------
07db88f053fe test: improve documentation of some histedit tests
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 19014
diff changeset
322
07db88f053fe test: improve documentation of some histedit tests
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 19014
diff changeset
323
17242
336121088ef1 histedit: fix new nodes computation with --continue (issue3534)
Patrick Mezard <patrick@mezard.eu>
parents: 17137
diff changeset
324 Test corner case where folded revision is separated from its parent by a
336121088ef1 histedit: fix new nodes computation with --continue (issue3534)
Patrick Mezard <patrick@mezard.eu>
parents: 17137
diff changeset
325 dropped revision.
336121088ef1 histedit: fix new nodes computation with --continue (issue3534)
Patrick Mezard <patrick@mezard.eu>
parents: 17137
diff changeset
326
336121088ef1 histedit: fix new nodes computation with --continue (issue3534)
Patrick Mezard <patrick@mezard.eu>
parents: 17137
diff changeset
327
336121088ef1 histedit: fix new nodes computation with --continue (issue3534)
Patrick Mezard <patrick@mezard.eu>
parents: 17137
diff changeset
328 $ hg init fold-with-dropped
336121088ef1 histedit: fix new nodes computation with --continue (issue3534)
Patrick Mezard <patrick@mezard.eu>
parents: 17137
diff changeset
329 $ cd fold-with-dropped
336121088ef1 histedit: fix new nodes computation with --continue (issue3534)
Patrick Mezard <patrick@mezard.eu>
parents: 17137
diff changeset
330 $ printf "1\n2\n3\n" > file
336121088ef1 histedit: fix new nodes computation with --continue (issue3534)
Patrick Mezard <patrick@mezard.eu>
parents: 17137
diff changeset
331 $ hg commit -Am '1+2+3'
336121088ef1 histedit: fix new nodes computation with --continue (issue3534)
Patrick Mezard <patrick@mezard.eu>
parents: 17137
diff changeset
332 adding file
336121088ef1 histedit: fix new nodes computation with --continue (issue3534)
Patrick Mezard <patrick@mezard.eu>
parents: 17137
diff changeset
333 $ echo 4 >> file
336121088ef1 histedit: fix new nodes computation with --continue (issue3534)
Patrick Mezard <patrick@mezard.eu>
parents: 17137
diff changeset
334 $ hg commit -m '+4'
336121088ef1 histedit: fix new nodes computation with --continue (issue3534)
Patrick Mezard <patrick@mezard.eu>
parents: 17137
diff changeset
335 $ echo 5 >> file
336121088ef1 histedit: fix new nodes computation with --continue (issue3534)
Patrick Mezard <patrick@mezard.eu>
parents: 17137
diff changeset
336 $ hg commit -m '+5'
336121088ef1 histedit: fix new nodes computation with --continue (issue3534)
Patrick Mezard <patrick@mezard.eu>
parents: 17137
diff changeset
337 $ echo 6 >> file
336121088ef1 histedit: fix new nodes computation with --continue (issue3534)
Patrick Mezard <patrick@mezard.eu>
parents: 17137
diff changeset
338 $ hg commit -m '+6'
19391
347ccd936fa6 test-histedit-fold: remove unnecessary --template
Martin Geisler <martin@geisler.net>
parents: 19019
diff changeset
339 $ hg logt -G
17242
336121088ef1 histedit: fix new nodes computation with --continue (issue3534)
Patrick Mezard <patrick@mezard.eu>
parents: 17137
diff changeset
340 @ 3:251d831eeec5 +6
336121088ef1 histedit: fix new nodes computation with --continue (issue3534)
Patrick Mezard <patrick@mezard.eu>
parents: 17137
diff changeset
341 |
336121088ef1 histedit: fix new nodes computation with --continue (issue3534)
Patrick Mezard <patrick@mezard.eu>
parents: 17137
diff changeset
342 o 2:888f9082bf99 +5
336121088ef1 histedit: fix new nodes computation with --continue (issue3534)
Patrick Mezard <patrick@mezard.eu>
parents: 17137
diff changeset
343 |
336121088ef1 histedit: fix new nodes computation with --continue (issue3534)
Patrick Mezard <patrick@mezard.eu>
parents: 17137
diff changeset
344 o 1:617f94f13c0f +4
336121088ef1 histedit: fix new nodes computation with --continue (issue3534)
Patrick Mezard <patrick@mezard.eu>
parents: 17137
diff changeset
345 |
336121088ef1 histedit: fix new nodes computation with --continue (issue3534)
Patrick Mezard <patrick@mezard.eu>
parents: 17137
diff changeset
346 o 0:0189ba417d34 1+2+3
336121088ef1 histedit: fix new nodes computation with --continue (issue3534)
Patrick Mezard <patrick@mezard.eu>
parents: 17137
diff changeset
347
19019
53060cc1b601 histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 19018
diff changeset
348 $ hg histedit 1 --commands - << EOF
17242
336121088ef1 histedit: fix new nodes computation with --continue (issue3534)
Patrick Mezard <patrick@mezard.eu>
parents: 17137
diff changeset
349 > pick 617f94f13c0f 1 +4
336121088ef1 histedit: fix new nodes computation with --continue (issue3534)
Patrick Mezard <patrick@mezard.eu>
parents: 17137
diff changeset
350 > drop 888f9082bf99 2 +5
336121088ef1 histedit: fix new nodes computation with --continue (issue3534)
Patrick Mezard <patrick@mezard.eu>
parents: 17137
diff changeset
351 > fold 251d831eeec5 3 +6
336121088ef1 histedit: fix new nodes computation with --continue (issue3534)
Patrick Mezard <patrick@mezard.eu>
parents: 17137
diff changeset
352 > EOF
336121088ef1 histedit: fix new nodes computation with --continue (issue3534)
Patrick Mezard <patrick@mezard.eu>
parents: 17137
diff changeset
353 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
17647
d34ba4991188 histedit: replaces patching logic by merges
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17644
diff changeset
354 merging file
27254
ef1eb6df7071 simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents: 26864
diff changeset
355 warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
18934
93f3a06b2035 histedit: switch from util.Abort to util.InterventionRequired where appropriate (bc)
Augie Fackler <raf@durin42.com>
parents: 18642
diff changeset
356 Fix up the change and run hg histedit --continue
18935
e5d9441ec281 dispatch: exit with status 1 for an InterventionRequired exception (bc)
Augie Fackler <raf@durin42.com>
parents: 18934
diff changeset
357 [1]
17647
d34ba4991188 histedit: replaces patching logic by merges
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17644
diff changeset
358 $ cat > file << EOF
d34ba4991188 histedit: replaces patching logic by merges
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17644
diff changeset
359 > 1
d34ba4991188 histedit: replaces patching logic by merges
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17644
diff changeset
360 > 2
d34ba4991188 histedit: replaces patching logic by merges
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17644
diff changeset
361 > 3
d34ba4991188 histedit: replaces patching logic by merges
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17644
diff changeset
362 > 4
d34ba4991188 histedit: replaces patching logic by merges
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17644
diff changeset
363 > 5
d34ba4991188 histedit: replaces patching logic by merges
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17644
diff changeset
364 > EOF
d34ba4991188 histedit: replaces patching logic by merges
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17644
diff changeset
365 $ hg resolve --mark file
21947
b081decd9062 resolve: add parenthesis around "no more unresolved files" message
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21267
diff changeset
366 (no more unresolved files)
19496
607191a45f8c checkunfinished: accommodate histedit quirk
Matt Mackall <mpm@selenic.com>
parents: 19479
diff changeset
367 $ hg commit -m '+5.2'
17242
336121088ef1 histedit: fix new nodes computation with --continue (issue3534)
Patrick Mezard <patrick@mezard.eu>
parents: 17137
diff changeset
368 created new head
336121088ef1 histedit: fix new nodes computation with --continue (issue3534)
Patrick Mezard <patrick@mezard.eu>
parents: 17137
diff changeset
369 $ echo 6 >> file
336121088ef1 histedit: fix new nodes computation with --continue (issue3534)
Patrick Mezard <patrick@mezard.eu>
parents: 17137
diff changeset
370 $ HGEDITOR=cat hg histedit --continue
336121088ef1 histedit: fix new nodes computation with --continue (issue3534)
Patrick Mezard <patrick@mezard.eu>
parents: 17137
diff changeset
371 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
336121088ef1 histedit: fix new nodes computation with --continue (issue3534)
Patrick Mezard <patrick@mezard.eu>
parents: 17137
diff changeset
372 +4
336121088ef1 histedit: fix new nodes computation with --continue (issue3534)
Patrick Mezard <patrick@mezard.eu>
parents: 17137
diff changeset
373 ***
336121088ef1 histedit: fix new nodes computation with --continue (issue3534)
Patrick Mezard <patrick@mezard.eu>
parents: 17137
diff changeset
374 +5.2
336121088ef1 histedit: fix new nodes computation with --continue (issue3534)
Patrick Mezard <patrick@mezard.eu>
parents: 17137
diff changeset
375 ***
336121088ef1 histedit: fix new nodes computation with --continue (issue3534)
Patrick Mezard <patrick@mezard.eu>
parents: 17137
diff changeset
376 +6
17644
9ae073f10572 histedit: fold in memory
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17258
diff changeset
377
9ae073f10572 histedit: fold in memory
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17258
diff changeset
378
9ae073f10572 histedit: fold in memory
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17258
diff changeset
379
9ae073f10572 histedit: fold in memory
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17258
diff changeset
380 HG: Enter commit message. Lines beginning with 'HG:' are removed.
9ae073f10572 histedit: fold in memory
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17258
diff changeset
381 HG: Leave message empty to abort commit.
9ae073f10572 histedit: fold in memory
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17258
diff changeset
382 HG: --
9ae073f10572 histedit: fold in memory
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17258
diff changeset
383 HG: user: test
9ae073f10572 histedit: fold in memory
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17258
diff changeset
384 HG: branch 'default'
9ae073f10572 histedit: fold in memory
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17258
diff changeset
385 HG: changed file
9ae073f10572 histedit: fold in memory
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17258
diff changeset
386 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
27403
50fc80e46786 histedit: make histedit prune when obsolete is enabled
Durham Goode <durham@fb.com>
parents: 27254
diff changeset
387 saved backup bundle to $TESTTMP/fold-with-dropped/.hg/strip-backup/55c8d8dc79ce-4066cd98-backup.hg (glob)
50fc80e46786 histedit: make histedit prune when obsolete is enabled
Durham Goode <durham@fb.com>
parents: 27254
diff changeset
388 saved backup bundle to $TESTTMP/fold-with-dropped/.hg/strip-backup/617f94f13c0f-a35700fc-backup.hg (glob)
19014
7b50120e8f6e test: use a lighter log style in histedit test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18935
diff changeset
389 $ hg logt -G
7b50120e8f6e test: use a lighter log style in histedit test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18935
diff changeset
390 @ 1:10c647b2cdd5 +4
17686
8853f37b1e62 histedit-test: make test-fold more verbose
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17647
diff changeset
391 |
19014
7b50120e8f6e test: use a lighter log style in histedit test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18935
diff changeset
392 o 0:0189ba417d34 1+2+3
17686
8853f37b1e62 histedit-test: make test-fold more verbose
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17647
diff changeset
393
8853f37b1e62 histedit-test: make test-fold more verbose
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17647
diff changeset
394 $ hg export tip
8853f37b1e62 histedit-test: make test-fold more verbose
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17647
diff changeset
395 # HG changeset patch
8853f37b1e62 histedit-test: make test-fold more verbose
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17647
diff changeset
396 # User test
8853f37b1e62 histedit-test: make test-fold more verbose
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17647
diff changeset
397 # Date 0 0
18642
76b69cccb07a export: show 'Date' header in a format that also is readable for humans
Mads Kiilerich <mads@kiilerich.com>
parents: 18437
diff changeset
398 # Thu Jan 01 00:00:00 1970 +0000
18437
358c23e8f1c6 histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17686
diff changeset
399 # Node ID 10c647b2cdd54db0603ecb99b2ff5ce66d5a5323
17686
8853f37b1e62 histedit-test: make test-fold more verbose
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17647
diff changeset
400 # Parent 0189ba417d34df9dda55f88b637dcae9917b5964
8853f37b1e62 histedit-test: make test-fold more verbose
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17647
diff changeset
401 +4
8853f37b1e62 histedit-test: make test-fold more verbose
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17647
diff changeset
402 ***
8853f37b1e62 histedit-test: make test-fold more verbose
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17647
diff changeset
403 +5.2
8853f37b1e62 histedit-test: make test-fold more verbose
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17647
diff changeset
404 ***
8853f37b1e62 histedit-test: make test-fold more verbose
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17647
diff changeset
405 +6
8853f37b1e62 histedit-test: make test-fold more verbose
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17647
diff changeset
406
18437
358c23e8f1c6 histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17686
diff changeset
407 diff -r 0189ba417d34 -r 10c647b2cdd5 file
17686
8853f37b1e62 histedit-test: make test-fold more verbose
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17647
diff changeset
408 --- a/file Thu Jan 01 00:00:00 1970 +0000
8853f37b1e62 histedit-test: make test-fold more verbose
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17647
diff changeset
409 +++ b/file Thu Jan 01 00:00:00 1970 +0000
8853f37b1e62 histedit-test: make test-fold more verbose
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17647
diff changeset
410 @@ -1,3 +1,6 @@
8853f37b1e62 histedit-test: make test-fold more verbose
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17647
diff changeset
411 1
8853f37b1e62 histedit-test: make test-fold more verbose
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17647
diff changeset
412 2
8853f37b1e62 histedit-test: make test-fold more verbose
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17647
diff changeset
413 3
8853f37b1e62 histedit-test: make test-fold more verbose
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17647
diff changeset
414 +4
8853f37b1e62 histedit-test: make test-fold more verbose
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17647
diff changeset
415 +5
8853f37b1e62 histedit-test: make test-fold more verbose
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17647
diff changeset
416 +6
17242
336121088ef1 histedit: fix new nodes computation with --continue (issue3534)
Patrick Mezard <patrick@mezard.eu>
parents: 17137
diff changeset
417 $ cd ..
336121088ef1 histedit: fix new nodes computation with --continue (issue3534)
Patrick Mezard <patrick@mezard.eu>
parents: 17137
diff changeset
418
19392
f6b047cf9272 histedit: use base for computing renames when folding (issue3729)
Martin Geisler <martin@geisler.net>
parents: 19391
diff changeset
419
f6b047cf9272 histedit: use base for computing renames when folding (issue3729)
Martin Geisler <martin@geisler.net>
parents: 19391
diff changeset
420 Folding with initial rename (issue3729)
f6b047cf9272 histedit: use base for computing renames when folding (issue3729)
Martin Geisler <martin@geisler.net>
parents: 19391
diff changeset
421 ---------------------------------------
f6b047cf9272 histedit: use base for computing renames when folding (issue3729)
Martin Geisler <martin@geisler.net>
parents: 19391
diff changeset
422
f6b047cf9272 histedit: use base for computing renames when folding (issue3729)
Martin Geisler <martin@geisler.net>
parents: 19391
diff changeset
423 $ hg init fold-rename
f6b047cf9272 histedit: use base for computing renames when folding (issue3729)
Martin Geisler <martin@geisler.net>
parents: 19391
diff changeset
424 $ cd fold-rename
f6b047cf9272 histedit: use base for computing renames when folding (issue3729)
Martin Geisler <martin@geisler.net>
parents: 19391
diff changeset
425 $ echo a > a.txt
f6b047cf9272 histedit: use base for computing renames when folding (issue3729)
Martin Geisler <martin@geisler.net>
parents: 19391
diff changeset
426 $ hg add a.txt
f6b047cf9272 histedit: use base for computing renames when folding (issue3729)
Martin Geisler <martin@geisler.net>
parents: 19391
diff changeset
427 $ hg commit -m a
f6b047cf9272 histedit: use base for computing renames when folding (issue3729)
Martin Geisler <martin@geisler.net>
parents: 19391
diff changeset
428 $ hg rename a.txt b.txt
f6b047cf9272 histedit: use base for computing renames when folding (issue3729)
Martin Geisler <martin@geisler.net>
parents: 19391
diff changeset
429 $ hg commit -m rename
f6b047cf9272 histedit: use base for computing renames when folding (issue3729)
Martin Geisler <martin@geisler.net>
parents: 19391
diff changeset
430 $ echo b >> b.txt
f6b047cf9272 histedit: use base for computing renames when folding (issue3729)
Martin Geisler <martin@geisler.net>
parents: 19391
diff changeset
431 $ hg commit -m b
f6b047cf9272 histedit: use base for computing renames when folding (issue3729)
Martin Geisler <martin@geisler.net>
parents: 19391
diff changeset
432
f6b047cf9272 histedit: use base for computing renames when folding (issue3729)
Martin Geisler <martin@geisler.net>
parents: 19391
diff changeset
433 $ hg logt --follow b.txt
f6b047cf9272 histedit: use base for computing renames when folding (issue3729)
Martin Geisler <martin@geisler.net>
parents: 19391
diff changeset
434 2:e0371e0426bc b
f6b047cf9272 histedit: use base for computing renames when folding (issue3729)
Martin Geisler <martin@geisler.net>
parents: 19391
diff changeset
435 1:1c4f440a8085 rename
f6b047cf9272 histedit: use base for computing renames when folding (issue3729)
Martin Geisler <martin@geisler.net>
parents: 19391
diff changeset
436 0:6c795aa153cb a
f6b047cf9272 histedit: use base for computing renames when folding (issue3729)
Martin Geisler <martin@geisler.net>
parents: 19391
diff changeset
437
f6b047cf9272 histedit: use base for computing renames when folding (issue3729)
Martin Geisler <martin@geisler.net>
parents: 19391
diff changeset
438 $ hg histedit 1c4f440a8085 --commands - 2>&1 << EOF | fixbundle
f6b047cf9272 histedit: use base for computing renames when folding (issue3729)
Martin Geisler <martin@geisler.net>
parents: 19391
diff changeset
439 > pick 1c4f440a8085 rename
f6b047cf9272 histedit: use base for computing renames when folding (issue3729)
Martin Geisler <martin@geisler.net>
parents: 19391
diff changeset
440 > fold e0371e0426bc b
f6b047cf9272 histedit: use base for computing renames when folding (issue3729)
Martin Geisler <martin@geisler.net>
parents: 19391
diff changeset
441 > EOF
f6b047cf9272 histedit: use base for computing renames when folding (issue3729)
Martin Geisler <martin@geisler.net>
parents: 19391
diff changeset
442 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
f6b047cf9272 histedit: use base for computing renames when folding (issue3729)
Martin Geisler <martin@geisler.net>
parents: 19391
diff changeset
443 reverting b.txt
f6b047cf9272 histedit: use base for computing renames when folding (issue3729)
Martin Geisler <martin@geisler.net>
parents: 19391
diff changeset
444 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
f6b047cf9272 histedit: use base for computing renames when folding (issue3729)
Martin Geisler <martin@geisler.net>
parents: 19391
diff changeset
445 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
f6b047cf9272 histedit: use base for computing renames when folding (issue3729)
Martin Geisler <martin@geisler.net>
parents: 19391
diff changeset
446
f6b047cf9272 histedit: use base for computing renames when folding (issue3729)
Martin Geisler <martin@geisler.net>
parents: 19391
diff changeset
447 $ hg logt --follow b.txt
f6b047cf9272 histedit: use base for computing renames when folding (issue3729)
Martin Geisler <martin@geisler.net>
parents: 19391
diff changeset
448 1:cf858d235c76 rename
f6b047cf9272 histedit: use base for computing renames when folding (issue3729)
Martin Geisler <martin@geisler.net>
parents: 19391
diff changeset
449 0:6c795aa153cb a
f6b047cf9272 histedit: use base for computing renames when folding (issue3729)
Martin Geisler <martin@geisler.net>
parents: 19391
diff changeset
450
f6b047cf9272 histedit: use base for computing renames when folding (issue3729)
Martin Geisler <martin@geisler.net>
parents: 19391
diff changeset
451 $ cd ..
23129
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22165
diff changeset
452
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22165
diff changeset
453 Folding with swapping
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22165
diff changeset
454 ---------------------
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22165
diff changeset
455
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22165
diff changeset
456 This is an excuse to test hook with histedit temporary commit (issue4422)
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22165
diff changeset
457
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22165
diff changeset
458
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22165
diff changeset
459 $ hg init issue4422
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22165
diff changeset
460 $ cd issue4422
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22165
diff changeset
461 $ echo a > a.txt
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22165
diff changeset
462 $ hg add a.txt
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22165
diff changeset
463 $ hg commit -m a
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22165
diff changeset
464 $ echo b > b.txt
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22165
diff changeset
465 $ hg add b.txt
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22165
diff changeset
466 $ hg commit -m b
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22165
diff changeset
467 $ echo c > c.txt
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22165
diff changeset
468 $ hg add c.txt
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22165
diff changeset
469 $ hg commit -m c
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22165
diff changeset
470
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22165
diff changeset
471 $ hg logt
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22165
diff changeset
472 2:a1a953ffb4b0 c
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22165
diff changeset
473 1:199b6bb90248 b
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22165
diff changeset
474 0:6c795aa153cb a
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22165
diff changeset
475
23390
6a3e38a173ec tests: choose the proper environment variable style for the platform
Matt Harbison <matt_harbison@yahoo.com>
parents: 23129
diff changeset
476 Setup the proper environment variable symbol for the platform, to be subbed
6a3e38a173ec tests: choose the proper environment variable style for the platform
Matt Harbison <matt_harbison@yahoo.com>
parents: 23129
diff changeset
477 into the hook command.
6a3e38a173ec tests: choose the proper environment variable style for the platform
Matt Harbison <matt_harbison@yahoo.com>
parents: 23129
diff changeset
478 #if windows
6a3e38a173ec tests: choose the proper environment variable style for the platform
Matt Harbison <matt_harbison@yahoo.com>
parents: 23129
diff changeset
479 $ NODE="%HG_NODE%"
6a3e38a173ec tests: choose the proper environment variable style for the platform
Matt Harbison <matt_harbison@yahoo.com>
parents: 23129
diff changeset
480 #else
6a3e38a173ec tests: choose the proper environment variable style for the platform
Matt Harbison <matt_harbison@yahoo.com>
parents: 23129
diff changeset
481 $ NODE="\$HG_NODE"
6a3e38a173ec tests: choose the proper environment variable style for the platform
Matt Harbison <matt_harbison@yahoo.com>
parents: 23129
diff changeset
482 #endif
6a3e38a173ec tests: choose the proper environment variable style for the platform
Matt Harbison <matt_harbison@yahoo.com>
parents: 23129
diff changeset
483 $ hg histedit 6c795aa153cb --config hooks.commit="echo commit $NODE" --commands - 2>&1 << EOF | fixbundle
23129
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22165
diff changeset
484 > pick 199b6bb90248 b
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22165
diff changeset
485 > fold a1a953ffb4b0 c
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22165
diff changeset
486 > pick 6c795aa153cb a
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22165
diff changeset
487 > EOF
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22165
diff changeset
488 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22165
diff changeset
489 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22165
diff changeset
490 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22165
diff changeset
491 commit 9599899f62c05f4377548c32bf1c9f1a39634b0c
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22165
diff changeset
492
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22165
diff changeset
493 $ hg logt
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22165
diff changeset
494 1:9599899f62c0 a
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22165
diff changeset
495 0:79b99e9c8e49 b
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22165
diff changeset
496
26609
ba8089433090 largefiles: ensure lfutil.getstandinmatcher() only matches standins
Matt Harbison <matt_harbison@yahoo.com>
parents: 25007
diff changeset
497 $ echo "foo" > amended.txt
ba8089433090 largefiles: ensure lfutil.getstandinmatcher() only matches standins
Matt Harbison <matt_harbison@yahoo.com>
parents: 25007
diff changeset
498 $ hg add amended.txt
ba8089433090 largefiles: ensure lfutil.getstandinmatcher() only matches standins
Matt Harbison <matt_harbison@yahoo.com>
parents: 25007
diff changeset
499 $ hg ci -q --config extensions.largefiles= --amend -I amended.txt
ba8089433090 largefiles: ensure lfutil.getstandinmatcher() only matches standins
Matt Harbison <matt_harbison@yahoo.com>
parents: 25007
diff changeset
500
26864
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
501 Test that folding multiple changes in a row doesn't show multiple
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
502 editors.
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
503
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
504 $ echo foo >> foo
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
505 $ hg add foo
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
506 $ hg ci -m foo1
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
507 $ echo foo >> foo
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
508 $ hg ci -m foo2
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
509 $ echo foo >> foo
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
510 $ hg ci -m foo3
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
511 $ hg logt
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
512 4:21679ff7675c foo3
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
513 3:b7389cc4d66e foo2
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
514 2:0e01aeef5fa8 foo1
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
515 1:578c7455730c a
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
516 0:79b99e9c8e49 b
27702
e4f2e4f5e98d test-histedit: $TESTTMP quoting fixes for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 27403
diff changeset
517 $ cat > "$TESTTMP/editor.sh" <<EOF
e4f2e4f5e98d test-histedit: $TESTTMP quoting fixes for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 27403
diff changeset
518 > echo ran editor >> "$TESTTMP/editorlog.txt"
e4f2e4f5e98d test-histedit: $TESTTMP quoting fixes for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 27403
diff changeset
519 > cat \$1 >> "$TESTTMP/editorlog.txt"
e4f2e4f5e98d test-histedit: $TESTTMP quoting fixes for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 27403
diff changeset
520 > echo END >> "$TESTTMP/editorlog.txt"
26864
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
521 > echo merged foos > \$1
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
522 > EOF
27702
e4f2e4f5e98d test-histedit: $TESTTMP quoting fixes for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 27403
diff changeset
523 $ HGEDITOR="sh \"$TESTTMP/editor.sh\"" hg histedit 1 --commands - 2>&1 <<EOF | fixbundle
26864
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
524 > pick 578c7455730c 1 a
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
525 > pick 0e01aeef5fa8 2 foo1
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
526 > fold b7389cc4d66e 3 foo2
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
527 > fold 21679ff7675c 4 foo3
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
528 > EOF
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
529 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
530 reverting foo
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
531 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
532 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
533 merging foo
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
534 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
535 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
536 $ hg logt
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
537 2:e8bedbda72c1 merged foos
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
538 1:578c7455730c a
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
539 0:79b99e9c8e49 b
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
540 Editor should have run only once
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
541 $ cat $TESTTMP/editorlog.txt
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
542 ran editor
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
543 foo1
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
544 ***
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
545 foo2
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
546 ***
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
547 foo3
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
548
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
549
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
550
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
551 HG: Enter commit message. Lines beginning with 'HG:' are removed.
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
552 HG: Leave message empty to abort commit.
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
553 HG: --
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
554 HG: user: test
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
555 HG: branch 'default'
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
556 HG: added foo
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
557 END
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
Augie Fackler <augie@google.com>
parents: 26609
diff changeset
558
23129
eb315418224c hook: protect commit hooks against stripping of temporary commit (issue4422)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22165
diff changeset
559 $ cd ..