Mercurial > hg
annotate tests/test-split.t @ 41731:92055d539e49
tests: conditionalize msys path mangling in test-bundle.t
This broke in 252cc56c9ff6 when the variables were printed one per line. The
only reason I can think of is that MSYS knew the former string couldn't be a
list of paths, but thinks this form is.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sat, 16 Feb 2019 22:03:58 -0500 |
parents | 66399f2e92aa |
children | 7da6307cc07a |
rev | line source |
---|---|
35455 | 1 #testcases obsstore-on obsstore-off |
2 | |
3 $ cat > $TESTTMP/editor.py <<EOF | |
39707
5abc47d4ca6b
tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents:
38424
diff
changeset
|
4 > #!"$PYTHON" |
36645
7bc33d677c0c
tests: fix various test-check-module-imports.t violations
Augie Fackler <augie@google.com>
parents:
35709
diff
changeset
|
5 > import os |
7bc33d677c0c
tests: fix various test-check-module-imports.t violations
Augie Fackler <augie@google.com>
parents:
35709
diff
changeset
|
6 > import sys |
35455 | 7 > path = os.path.join(os.environ['TESTTMP'], 'messages') |
8 > messages = open(path).read().split('--\n') | |
9 > prompt = open(sys.argv[1]).read() | |
10 > sys.stdout.write(''.join('EDITOR: %s' % l for l in prompt.splitlines(True))) | |
11 > sys.stdout.flush() | |
12 > with open(sys.argv[1], 'w') as f: | |
13 > f.write(messages[0]) | |
14 > with open(path, 'w') as f: | |
15 > f.write('--\n'.join(messages[1:])) | |
16 > EOF | |
17 | |
18 $ cat >> $HGRCPATH <<EOF | |
19 > [extensions] | |
20 > drawdag=$TESTDIR/drawdag.py | |
21 > split= | |
22 > [ui] | |
23 > interactive=1 | |
35479
8d05705bde0a
test-split: stabilize for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
35455
diff
changeset
|
24 > color=no |
8d05705bde0a
test-split: stabilize for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
35455
diff
changeset
|
25 > paginate=never |
35455 | 26 > [diff] |
27 > git=1 | |
28 > unified=0 | |
41560
66399f2e92aa
commit: if interactive, look elsewhere for whitespace settings (BC)
Kyle Lippincott <spectral@google.com>
parents:
41557
diff
changeset
|
29 > [commands] |
66399f2e92aa
commit: if interactive, look elsewhere for whitespace settings (BC)
Kyle Lippincott <spectral@google.com>
parents:
41557
diff
changeset
|
30 > commit.interactive.unified=0 |
35455 | 31 > [alias] |
32 > glog=log -G -T '{rev}:{node|short} {desc} {bookmarks}\n' | |
33 > EOF | |
34 | |
35 #if obsstore-on | |
36 $ cat >> $HGRCPATH <<EOF | |
37 > [experimental] | |
38 > evolution=all | |
39 > EOF | |
40 #endif | |
41 | |
42 $ hg init a | |
43 $ cd a | |
44 | |
45 Nothing to split | |
46 | |
47 $ hg split | |
48 nothing to split | |
49 [1] | |
50 | |
51 $ hg commit -m empty --config ui.allowemptycommit=1 | |
52 $ hg split | |
53 abort: cannot split an empty revision | |
54 [255] | |
55 | |
56 $ rm -rf .hg | |
57 $ hg init | |
58 | |
59 Cannot split working directory | |
60 | |
61 $ hg split -r 'wdir()' | |
62 abort: cannot split working directory | |
63 [255] | |
64 | |
35479
8d05705bde0a
test-split: stabilize for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
35455
diff
changeset
|
65 Generate some content. The sed filter drop CR on Windows, which is dropped in |
8d05705bde0a
test-split: stabilize for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
35455
diff
changeset
|
66 the a > b line. |
35455 | 67 |
35479
8d05705bde0a
test-split: stabilize for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
35455
diff
changeset
|
68 $ $TESTDIR/seq.py 1 5 | sed 's/\r$//' >> a |
35455 | 69 $ hg ci -m a1 -A a -q |
70 $ hg bookmark -i r1 | |
71 $ sed 's/1/11/;s/3/33/;s/5/55/' a > b | |
72 $ mv b a | |
73 $ hg ci -m a2 -q | |
74 $ hg bookmark -i r2 | |
75 | |
76 Cannot split a public changeset | |
77 | |
78 $ hg phase --public -r 'all()' | |
79 $ hg split . | |
80 abort: cannot split public changeset | |
81 (see 'hg help phases' for details) | |
82 [255] | |
83 | |
84 $ hg phase --draft -f -r 'all()' | |
85 | |
86 Cannot split while working directory is dirty | |
87 | |
88 $ touch dirty | |
89 $ hg add dirty | |
90 $ hg split . | |
91 abort: uncommitted changes | |
92 [255] | |
93 $ hg forget dirty | |
94 $ rm dirty | |
95 | |
38412
a0e185f10454
tests: in test-split.t, save a "clean" copy of pre-split repo for later use
Kyle Lippincott <spectral@google.com>
parents:
36645
diff
changeset
|
96 Make a clean directory for future tests to build off of |
35455 | 97 |
38412
a0e185f10454
tests: in test-split.t, save a "clean" copy of pre-split repo for later use
Kyle Lippincott <spectral@google.com>
parents:
36645
diff
changeset
|
98 $ cp -R . ../clean |
a0e185f10454
tests: in test-split.t, save a "clean" copy of pre-split repo for later use
Kyle Lippincott <spectral@google.com>
parents:
36645
diff
changeset
|
99 |
a0e185f10454
tests: in test-split.t, save a "clean" copy of pre-split repo for later use
Kyle Lippincott <spectral@google.com>
parents:
36645
diff
changeset
|
100 Split a head |
35455 | 101 |
102 $ hg bookmark r3 | |
103 | |
104 $ hg split 'all()' | |
105 abort: cannot split multiple revisions | |
106 [255] | |
107 | |
41454
d1d3094b54f9
patch: handle 0 context lines (diff.unified=0) when parsing patches
Kyle Lippincott <spectral@google.com>
parents:
39707
diff
changeset
|
108 This function splits a bit strangely primarily to avoid changing the behavior of |
d1d3094b54f9
patch: handle 0 context lines (diff.unified=0) when parsing patches
Kyle Lippincott <spectral@google.com>
parents:
39707
diff
changeset
|
109 the test after a bug was fixed with how split/commit --interactive handled |
41560
66399f2e92aa
commit: if interactive, look elsewhere for whitespace settings (BC)
Kyle Lippincott <spectral@google.com>
parents:
41557
diff
changeset
|
110 `commands.commit.interactive.unified=0`: when there were no context lines, |
66399f2e92aa
commit: if interactive, look elsewhere for whitespace settings (BC)
Kyle Lippincott <spectral@google.com>
parents:
41557
diff
changeset
|
111 it kept only the last diff hunk. When running split, this meant that runsplit |
66399f2e92aa
commit: if interactive, look elsewhere for whitespace settings (BC)
Kyle Lippincott <spectral@google.com>
parents:
41557
diff
changeset
|
112 was always recording three commits, one for each diff hunk, in reverse order |
66399f2e92aa
commit: if interactive, look elsewhere for whitespace settings (BC)
Kyle Lippincott <spectral@google.com>
parents:
41557
diff
changeset
|
113 (the base commit was the last diff hunk in the file). |
35455 | 114 $ runsplit() { |
115 > cat > $TESTTMP/messages <<EOF | |
116 > split 1 | |
117 > -- | |
118 > split 2 | |
119 > -- | |
120 > split 3 | |
121 > EOF | |
122 > cat <<EOF | hg split "$@" | |
123 > y | |
41454
d1d3094b54f9
patch: handle 0 context lines (diff.unified=0) when parsing patches
Kyle Lippincott <spectral@google.com>
parents:
39707
diff
changeset
|
124 > n |
d1d3094b54f9
patch: handle 0 context lines (diff.unified=0) when parsing patches
Kyle Lippincott <spectral@google.com>
parents:
39707
diff
changeset
|
125 > n |
35455 | 126 > y |
127 > y | |
41454
d1d3094b54f9
patch: handle 0 context lines (diff.unified=0) when parsing patches
Kyle Lippincott <spectral@google.com>
parents:
39707
diff
changeset
|
128 > n |
35455 | 129 > y |
130 > y | |
131 > y | |
132 > EOF | |
133 > } | |
134 | |
135 $ HGEDITOR=false runsplit | |
136 diff --git a/a b/a | |
41454
d1d3094b54f9
patch: handle 0 context lines (diff.unified=0) when parsing patches
Kyle Lippincott <spectral@google.com>
parents:
39707
diff
changeset
|
137 3 hunks, 3 lines changed |
35455 | 138 examine changes to 'a'? [Ynesfdaq?] y |
139 | |
41454
d1d3094b54f9
patch: handle 0 context lines (diff.unified=0) when parsing patches
Kyle Lippincott <spectral@google.com>
parents:
39707
diff
changeset
|
140 @@ -1,1 +1,1 @@ |
d1d3094b54f9
patch: handle 0 context lines (diff.unified=0) when parsing patches
Kyle Lippincott <spectral@google.com>
parents:
39707
diff
changeset
|
141 -1 |
d1d3094b54f9
patch: handle 0 context lines (diff.unified=0) when parsing patches
Kyle Lippincott <spectral@google.com>
parents:
39707
diff
changeset
|
142 +11 |
d1d3094b54f9
patch: handle 0 context lines (diff.unified=0) when parsing patches
Kyle Lippincott <spectral@google.com>
parents:
39707
diff
changeset
|
143 record change 1/3 to 'a'? [Ynesfdaq?] n |
d1d3094b54f9
patch: handle 0 context lines (diff.unified=0) when parsing patches
Kyle Lippincott <spectral@google.com>
parents:
39707
diff
changeset
|
144 |
d1d3094b54f9
patch: handle 0 context lines (diff.unified=0) when parsing patches
Kyle Lippincott <spectral@google.com>
parents:
39707
diff
changeset
|
145 @@ -3,1 +3,1 @@ 2 |
d1d3094b54f9
patch: handle 0 context lines (diff.unified=0) when parsing patches
Kyle Lippincott <spectral@google.com>
parents:
39707
diff
changeset
|
146 -3 |
d1d3094b54f9
patch: handle 0 context lines (diff.unified=0) when parsing patches
Kyle Lippincott <spectral@google.com>
parents:
39707
diff
changeset
|
147 +33 |
d1d3094b54f9
patch: handle 0 context lines (diff.unified=0) when parsing patches
Kyle Lippincott <spectral@google.com>
parents:
39707
diff
changeset
|
148 record change 2/3 to 'a'? [Ynesfdaq?] n |
d1d3094b54f9
patch: handle 0 context lines (diff.unified=0) when parsing patches
Kyle Lippincott <spectral@google.com>
parents:
39707
diff
changeset
|
149 |
35455 | 150 @@ -5,1 +5,1 @@ 4 |
151 -5 | |
152 +55 | |
41454
d1d3094b54f9
patch: handle 0 context lines (diff.unified=0) when parsing patches
Kyle Lippincott <spectral@google.com>
parents:
39707
diff
changeset
|
153 record change 3/3 to 'a'? [Ynesfdaq?] y |
35455 | 154 |
155 transaction abort! | |
156 rollback completed | |
157 abort: edit failed: false exited with status 1 | |
158 [255] | |
159 $ hg status | |
160 | |
35479
8d05705bde0a
test-split: stabilize for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
35455
diff
changeset
|
161 $ HGEDITOR="\"$PYTHON\" $TESTTMP/editor.py" |
35455 | 162 $ runsplit |
163 diff --git a/a b/a | |
41454
d1d3094b54f9
patch: handle 0 context lines (diff.unified=0) when parsing patches
Kyle Lippincott <spectral@google.com>
parents:
39707
diff
changeset
|
164 3 hunks, 3 lines changed |
35455 | 165 examine changes to 'a'? [Ynesfdaq?] y |
166 | |
41454
d1d3094b54f9
patch: handle 0 context lines (diff.unified=0) when parsing patches
Kyle Lippincott <spectral@google.com>
parents:
39707
diff
changeset
|
167 @@ -1,1 +1,1 @@ |
d1d3094b54f9
patch: handle 0 context lines (diff.unified=0) when parsing patches
Kyle Lippincott <spectral@google.com>
parents:
39707
diff
changeset
|
168 -1 |
d1d3094b54f9
patch: handle 0 context lines (diff.unified=0) when parsing patches
Kyle Lippincott <spectral@google.com>
parents:
39707
diff
changeset
|
169 +11 |
d1d3094b54f9
patch: handle 0 context lines (diff.unified=0) when parsing patches
Kyle Lippincott <spectral@google.com>
parents:
39707
diff
changeset
|
170 record change 1/3 to 'a'? [Ynesfdaq?] n |
d1d3094b54f9
patch: handle 0 context lines (diff.unified=0) when parsing patches
Kyle Lippincott <spectral@google.com>
parents:
39707
diff
changeset
|
171 |
d1d3094b54f9
patch: handle 0 context lines (diff.unified=0) when parsing patches
Kyle Lippincott <spectral@google.com>
parents:
39707
diff
changeset
|
172 @@ -3,1 +3,1 @@ 2 |
d1d3094b54f9
patch: handle 0 context lines (diff.unified=0) when parsing patches
Kyle Lippincott <spectral@google.com>
parents:
39707
diff
changeset
|
173 -3 |
d1d3094b54f9
patch: handle 0 context lines (diff.unified=0) when parsing patches
Kyle Lippincott <spectral@google.com>
parents:
39707
diff
changeset
|
174 +33 |
d1d3094b54f9
patch: handle 0 context lines (diff.unified=0) when parsing patches
Kyle Lippincott <spectral@google.com>
parents:
39707
diff
changeset
|
175 record change 2/3 to 'a'? [Ynesfdaq?] n |
d1d3094b54f9
patch: handle 0 context lines (diff.unified=0) when parsing patches
Kyle Lippincott <spectral@google.com>
parents:
39707
diff
changeset
|
176 |
35455 | 177 @@ -5,1 +5,1 @@ 4 |
178 -5 | |
179 +55 | |
41454
d1d3094b54f9
patch: handle 0 context lines (diff.unified=0) when parsing patches
Kyle Lippincott <spectral@google.com>
parents:
39707
diff
changeset
|
180 record change 3/3 to 'a'? [Ynesfdaq?] y |
35455 | 181 |
182 EDITOR: HG: Splitting 1df0d5c5a3ab. Write commit message for the first split changeset. | |
183 EDITOR: a2 | |
184 EDITOR: | |
185 EDITOR: | |
186 EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed. | |
187 EDITOR: HG: Leave message empty to abort commit. | |
188 EDITOR: HG: -- | |
189 EDITOR: HG: user: test | |
190 EDITOR: HG: branch 'default' | |
191 EDITOR: HG: changed a | |
192 created new head | |
193 diff --git a/a b/a | |
41454
d1d3094b54f9
patch: handle 0 context lines (diff.unified=0) when parsing patches
Kyle Lippincott <spectral@google.com>
parents:
39707
diff
changeset
|
194 2 hunks, 2 lines changed |
35455 | 195 examine changes to 'a'? [Ynesfdaq?] y |
196 | |
41454
d1d3094b54f9
patch: handle 0 context lines (diff.unified=0) when parsing patches
Kyle Lippincott <spectral@google.com>
parents:
39707
diff
changeset
|
197 @@ -1,1 +1,1 @@ |
d1d3094b54f9
patch: handle 0 context lines (diff.unified=0) when parsing patches
Kyle Lippincott <spectral@google.com>
parents:
39707
diff
changeset
|
198 -1 |
d1d3094b54f9
patch: handle 0 context lines (diff.unified=0) when parsing patches
Kyle Lippincott <spectral@google.com>
parents:
39707
diff
changeset
|
199 +11 |
d1d3094b54f9
patch: handle 0 context lines (diff.unified=0) when parsing patches
Kyle Lippincott <spectral@google.com>
parents:
39707
diff
changeset
|
200 record change 1/2 to 'a'? [Ynesfdaq?] n |
d1d3094b54f9
patch: handle 0 context lines (diff.unified=0) when parsing patches
Kyle Lippincott <spectral@google.com>
parents:
39707
diff
changeset
|
201 |
35455 | 202 @@ -3,1 +3,1 @@ 2 |
203 -3 | |
204 +33 | |
41454
d1d3094b54f9
patch: handle 0 context lines (diff.unified=0) when parsing patches
Kyle Lippincott <spectral@google.com>
parents:
39707
diff
changeset
|
205 record change 2/2 to 'a'? [Ynesfdaq?] y |
35455 | 206 |
207 EDITOR: HG: Splitting 1df0d5c5a3ab. So far it has been split into: | |
208 EDITOR: HG: - e704349bd21b: split 1 | |
209 EDITOR: HG: Write commit message for the next split changeset. | |
210 EDITOR: a2 | |
211 EDITOR: | |
212 EDITOR: | |
213 EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed. | |
214 EDITOR: HG: Leave message empty to abort commit. | |
215 EDITOR: HG: -- | |
216 EDITOR: HG: user: test | |
217 EDITOR: HG: branch 'default' | |
218 EDITOR: HG: changed a | |
219 diff --git a/a b/a | |
220 1 hunks, 1 lines changed | |
221 examine changes to 'a'? [Ynesfdaq?] y | |
222 | |
223 @@ -1,1 +1,1 @@ | |
224 -1 | |
225 +11 | |
226 record this change to 'a'? [Ynesfdaq?] y | |
227 | |
228 EDITOR: HG: Splitting 1df0d5c5a3ab. So far it has been split into: | |
229 EDITOR: HG: - e704349bd21b: split 1 | |
230 EDITOR: HG: - a09ad58faae3: split 2 | |
231 EDITOR: HG: Write commit message for the next split changeset. | |
232 EDITOR: a2 | |
233 EDITOR: | |
234 EDITOR: | |
235 EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed. | |
236 EDITOR: HG: Leave message empty to abort commit. | |
237 EDITOR: HG: -- | |
238 EDITOR: HG: user: test | |
239 EDITOR: HG: branch 'default' | |
240 EDITOR: HG: changed a | |
35479
8d05705bde0a
test-split: stabilize for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
35455
diff
changeset
|
241 saved backup bundle to $TESTTMP/a/.hg/strip-backup/1df0d5c5a3ab-8341b760-split.hg (obsstore-off !) |
35455 | 242 |
243 #if obsstore-off | |
244 $ hg bookmark | |
245 r1 0:a61bcde8c529 | |
246 r2 3:00eebaf8d2e2 | |
247 * r3 3:00eebaf8d2e2 | |
248 $ hg glog -p | |
249 @ 3:00eebaf8d2e2 split 3 r2 r3 | |
250 | diff --git a/a b/a | |
251 | --- a/a | |
252 | +++ b/a | |
253 | @@ -1,1 +1,1 @@ | |
254 | -1 | |
255 | +11 | |
256 | | |
257 o 2:a09ad58faae3 split 2 | |
258 | diff --git a/a b/a | |
259 | --- a/a | |
260 | +++ b/a | |
261 | @@ -3,1 +3,1 @@ | |
262 | -3 | |
263 | +33 | |
264 | | |
265 o 1:e704349bd21b split 1 | |
266 | diff --git a/a b/a | |
267 | --- a/a | |
268 | +++ b/a | |
269 | @@ -5,1 +5,1 @@ | |
270 | -5 | |
271 | +55 | |
272 | | |
273 o 0:a61bcde8c529 a1 r1 | |
274 diff --git a/a b/a | |
275 new file mode 100644 | |
276 --- /dev/null | |
277 +++ b/a | |
278 @@ -0,0 +1,5 @@ | |
279 +1 | |
280 +2 | |
281 +3 | |
282 +4 | |
283 +5 | |
284 | |
285 #else | |
286 $ hg bookmark | |
287 r1 0:a61bcde8c529 | |
288 r2 4:00eebaf8d2e2 | |
289 * r3 4:00eebaf8d2e2 | |
290 $ hg glog | |
291 @ 4:00eebaf8d2e2 split 3 r2 r3 | |
292 | | |
293 o 3:a09ad58faae3 split 2 | |
294 | | |
295 o 2:e704349bd21b split 1 | |
296 | | |
297 o 0:a61bcde8c529 a1 r1 | |
298 | |
299 #endif | |
300 | |
301 Split a head while working parent is not that head | |
302 | |
38412
a0e185f10454
tests: in test-split.t, save a "clean" copy of pre-split repo for later use
Kyle Lippincott <spectral@google.com>
parents:
36645
diff
changeset
|
303 $ cp -R $TESTTMP/clean $TESTTMP/b |
35455 | 304 $ cd $TESTTMP/b |
305 | |
306 $ hg up 0 -q | |
307 $ hg bookmark r3 | |
308 | |
309 $ runsplit tip >/dev/null | |
310 | |
311 #if obsstore-off | |
312 $ hg bookmark | |
313 r1 0:a61bcde8c529 | |
314 r2 3:00eebaf8d2e2 | |
315 * r3 0:a61bcde8c529 | |
316 $ hg glog | |
317 o 3:00eebaf8d2e2 split 3 r2 | |
318 | | |
319 o 2:a09ad58faae3 split 2 | |
320 | | |
321 o 1:e704349bd21b split 1 | |
322 | | |
323 @ 0:a61bcde8c529 a1 r1 r3 | |
324 | |
325 #else | |
326 $ hg bookmark | |
327 r1 0:a61bcde8c529 | |
328 r2 4:00eebaf8d2e2 | |
329 * r3 0:a61bcde8c529 | |
330 $ hg glog | |
331 o 4:00eebaf8d2e2 split 3 r2 | |
332 | | |
333 o 3:a09ad58faae3 split 2 | |
334 | | |
335 o 2:e704349bd21b split 1 | |
336 | | |
337 @ 0:a61bcde8c529 a1 r1 r3 | |
338 | |
339 #endif | |
340 | |
341 Split a non-head | |
342 | |
38412
a0e185f10454
tests: in test-split.t, save a "clean" copy of pre-split repo for later use
Kyle Lippincott <spectral@google.com>
parents:
36645
diff
changeset
|
343 $ cp -R $TESTTMP/clean $TESTTMP/c |
35455 | 344 $ cd $TESTTMP/c |
345 $ echo d > d | |
346 $ hg ci -m d1 -A d | |
347 $ hg bookmark -i d1 | |
348 $ echo 2 >> d | |
349 $ hg ci -m d2 | |
350 $ echo 3 >> d | |
351 $ hg ci -m d3 | |
352 $ hg bookmark -i d3 | |
353 $ hg up '.^' -q | |
354 $ hg bookmark d2 | |
355 $ cp -R . ../d | |
356 | |
357 $ runsplit -r 1 | grep rebasing | |
358 rebasing 2:b5c5ea414030 "d1" (d1) | |
359 rebasing 3:f4a0a8d004cc "d2" (d2) | |
360 rebasing 4:777940761eba "d3" (d3) | |
361 #if obsstore-off | |
362 $ hg bookmark | |
363 d1 4:c4b449ef030e | |
364 * d2 5:c9dd00ab36a3 | |
365 d3 6:19f476bc865c | |
366 r1 0:a61bcde8c529 | |
367 r2 3:00eebaf8d2e2 | |
368 $ hg glog -p | |
369 o 6:19f476bc865c d3 d3 | |
370 | diff --git a/d b/d | |
371 | --- a/d | |
372 | +++ b/d | |
373 | @@ -2,0 +3,1 @@ | |
374 | +3 | |
375 | | |
376 @ 5:c9dd00ab36a3 d2 d2 | |
377 | diff --git a/d b/d | |
378 | --- a/d | |
379 | +++ b/d | |
380 | @@ -1,0 +2,1 @@ | |
381 | +2 | |
382 | | |
383 o 4:c4b449ef030e d1 d1 | |
384 | diff --git a/d b/d | |
385 | new file mode 100644 | |
386 | --- /dev/null | |
387 | +++ b/d | |
388 | @@ -0,0 +1,1 @@ | |
389 | +d | |
390 | | |
391 o 3:00eebaf8d2e2 split 3 r2 | |
392 | diff --git a/a b/a | |
393 | --- a/a | |
394 | +++ b/a | |
395 | @@ -1,1 +1,1 @@ | |
396 | -1 | |
397 | +11 | |
398 | | |
399 o 2:a09ad58faae3 split 2 | |
400 | diff --git a/a b/a | |
401 | --- a/a | |
402 | +++ b/a | |
403 | @@ -3,1 +3,1 @@ | |
404 | -3 | |
405 | +33 | |
406 | | |
407 o 1:e704349bd21b split 1 | |
408 | diff --git a/a b/a | |
409 | --- a/a | |
410 | +++ b/a | |
411 | @@ -5,1 +5,1 @@ | |
412 | -5 | |
413 | +55 | |
414 | | |
415 o 0:a61bcde8c529 a1 r1 | |
416 diff --git a/a b/a | |
417 new file mode 100644 | |
418 --- /dev/null | |
419 +++ b/a | |
420 @@ -0,0 +1,5 @@ | |
421 +1 | |
422 +2 | |
423 +3 | |
424 +4 | |
425 +5 | |
426 | |
427 #else | |
428 $ hg bookmark | |
429 d1 8:c4b449ef030e | |
430 * d2 9:c9dd00ab36a3 | |
431 d3 10:19f476bc865c | |
432 r1 0:a61bcde8c529 | |
433 r2 7:00eebaf8d2e2 | |
434 $ hg glog | |
435 o 10:19f476bc865c d3 d3 | |
436 | | |
437 @ 9:c9dd00ab36a3 d2 d2 | |
438 | | |
439 o 8:c4b449ef030e d1 d1 | |
440 | | |
441 o 7:00eebaf8d2e2 split 3 r2 | |
442 | | |
443 o 6:a09ad58faae3 split 2 | |
444 | | |
445 o 5:e704349bd21b split 1 | |
446 | | |
447 o 0:a61bcde8c529 a1 r1 | |
448 | |
449 #endif | |
450 | |
451 Split a non-head without rebase | |
452 | |
453 $ cd $TESTTMP/d | |
454 #if obsstore-off | |
455 $ runsplit -r 1 --no-rebase | |
456 abort: cannot split changeset with children without rebase | |
457 [255] | |
458 #else | |
459 $ runsplit -r 1 --no-rebase >/dev/null | |
35709
1a09dad8b85a
evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
35508
diff
changeset
|
460 3 new orphan changesets |
35455 | 461 $ hg bookmark |
462 d1 2:b5c5ea414030 | |
463 * d2 3:f4a0a8d004cc | |
464 d3 4:777940761eba | |
465 r1 0:a61bcde8c529 | |
466 r2 7:00eebaf8d2e2 | |
467 | |
468 $ hg glog | |
469 o 7:00eebaf8d2e2 split 3 r2 | |
470 | | |
471 o 6:a09ad58faae3 split 2 | |
472 | | |
473 o 5:e704349bd21b split 1 | |
474 | | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35479
diff
changeset
|
475 | * 4:777940761eba d3 d3 |
35455 | 476 | | |
477 | @ 3:f4a0a8d004cc d2 d2 | |
478 | | | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35479
diff
changeset
|
479 | * 2:b5c5ea414030 d1 d1 |
35455 | 480 | | |
481 | x 1:1df0d5c5a3ab a2 | |
482 |/ | |
483 o 0:a61bcde8c529 a1 r1 | |
484 | |
485 #endif | |
486 | |
487 Split a non-head with obsoleted descendants | |
488 | |
489 #if obsstore-on | |
490 $ hg init $TESTTMP/e | |
491 $ cd $TESTTMP/e | |
492 $ hg debugdrawdag <<'EOS' | |
493 > H I J | |
494 > | | | | |
495 > F G1 G2 # amend: G1 -> G2 | |
496 > | | / # prune: F | |
497 > C D E | |
498 > \|/ | |
499 > B | |
500 > | | |
501 > A | |
502 > EOS | |
35709
1a09dad8b85a
evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
35508
diff
changeset
|
503 2 new orphan changesets |
35455 | 504 $ eval `hg tags -T '{tag}={node}\n'` |
505 $ rm .hg/localtags | |
506 $ hg split $B --config experimental.evolution=createmarkers | |
507 abort: split would leave orphaned changesets behind | |
508 [255] | |
509 $ cat > $TESTTMP/messages <<EOF | |
510 > Split B | |
511 > EOF | |
512 $ cat <<EOF | hg split $B | |
513 > y | |
514 > y | |
515 > EOF | |
516 diff --git a/B b/B | |
517 new file mode 100644 | |
518 examine changes to 'B'? [Ynesfdaq?] y | |
519 | |
520 @@ -0,0 +1,1 @@ | |
521 +B | |
522 \ No newline at end of file | |
523 record this change to 'B'? [Ynesfdaq?] y | |
524 | |
525 EDITOR: HG: Splitting 112478962961. Write commit message for the first split changeset. | |
526 EDITOR: B | |
527 EDITOR: | |
528 EDITOR: | |
529 EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed. | |
530 EDITOR: HG: Leave message empty to abort commit. | |
531 EDITOR: HG: -- | |
532 EDITOR: HG: user: test | |
533 EDITOR: HG: branch 'default' | |
534 EDITOR: HG: added B | |
535 created new head | |
536 rebasing 2:26805aba1e60 "C" | |
537 rebasing 3:be0ef73c17ad "D" | |
538 rebasing 4:49cb92066bfd "E" | |
539 rebasing 7:97a6268cc7ef "G2" | |
540 rebasing 10:e2f1e425c0db "J" | |
541 $ hg glog -r 'sort(all(), topo)' | |
542 o 16:556c085f8b52 J | |
543 | | |
544 o 15:8761f6c9123f G2 | |
545 | | |
546 o 14:a7aeffe59b65 E | |
547 | | |
548 | o 13:e1e914ede9ab D | |
549 |/ | |
550 | o 12:01947e9b98aa C | |
551 |/ | |
552 o 11:0947baa74d47 Split B | |
553 | | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35479
diff
changeset
|
554 | * 9:88ede1d5ee13 I |
35455 | 555 | | |
556 | x 6:af8cbf225b7b G1 | |
557 | | | |
558 | x 3:be0ef73c17ad D | |
559 | | | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35479
diff
changeset
|
560 | | * 8:74863e5b5074 H |
35455 | 561 | | | |
562 | | x 5:ee481a2a1e69 F | |
563 | | | | |
564 | | x 2:26805aba1e60 C | |
565 | |/ | |
566 | x 1:112478962961 B | |
567 |/ | |
568 o 0:426bada5c675 A | |
569 | |
570 #endif | |
38424
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
571 |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
572 Preserve secret phase in split |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
573 |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
574 $ cp -R $TESTTMP/clean $TESTTMP/phases1 |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
575 $ cd $TESTTMP/phases1 |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
576 $ hg phase --secret -fr tip |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
577 $ hg log -T '{short(node)} {phase}\n' |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
578 1df0d5c5a3ab secret |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
579 a61bcde8c529 draft |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
580 $ runsplit tip >/dev/null |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
581 $ hg log -T '{short(node)} {phase}\n' |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
582 00eebaf8d2e2 secret |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
583 a09ad58faae3 secret |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
584 e704349bd21b secret |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
585 a61bcde8c529 draft |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
586 |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
587 Do not move things to secret even if phases.new-commit=secret |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
588 |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
589 $ cp -R $TESTTMP/clean $TESTTMP/phases2 |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
590 $ cd $TESTTMP/phases2 |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
591 $ cat >> .hg/hgrc <<EOF |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
592 > [phases] |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
593 > new-commit=secret |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
594 > EOF |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
595 $ hg log -T '{short(node)} {phase}\n' |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
596 1df0d5c5a3ab draft |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
597 a61bcde8c529 draft |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
598 $ runsplit tip >/dev/null |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
599 $ hg log -T '{short(node)} {phase}\n' |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
600 00eebaf8d2e2 draft |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
601 a09ad58faae3 draft |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
602 e704349bd21b draft |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
603 a61bcde8c529 draft |
41557
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
604 |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
605 `hg split` with ignoreblanklines=1 does not infinite loop |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
606 |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
607 $ mkdir $TESTTMP/f |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
608 $ hg init $TESTTMP/f/a |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
609 $ cd $TESTTMP/f/a |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
610 $ printf '1\n2\n3\n4\n5\n' > foo |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
611 $ cp foo bar |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
612 $ hg ci -qAm initial |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
613 $ printf '1\n\n2\n3\ntest\n4\n5\n' > bar |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
614 $ printf '1\n2\n3\ntest\n4\n5\n' > foo |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
615 $ hg ci -qm splitme |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
616 $ cat > $TESTTMP/messages <<EOF |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
617 > split 1 |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
618 > -- |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
619 > split 2 |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
620 > EOF |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
621 $ printf 'f\nn\nf\n' | hg --config extensions.split= --config diff.ignoreblanklines=1 split |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
622 diff --git a/bar b/bar |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
623 2 hunks, 2 lines changed |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
624 examine changes to 'bar'? [Ynesfdaq?] f |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
625 |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
626 diff --git a/foo b/foo |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
627 1 hunks, 1 lines changed |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
628 examine changes to 'foo'? [Ynesfdaq?] n |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
629 |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
630 EDITOR: HG: Splitting dd3c45017cbf. Write commit message for the first split changeset. |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
631 EDITOR: splitme |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
632 EDITOR: |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
633 EDITOR: |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
634 EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed. |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
635 EDITOR: HG: Leave message empty to abort commit. |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
636 EDITOR: HG: -- |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
637 EDITOR: HG: user: test |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
638 EDITOR: HG: branch 'default' |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
639 EDITOR: HG: changed bar |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
640 created new head |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
641 diff --git a/foo b/foo |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
642 1 hunks, 1 lines changed |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
643 examine changes to 'foo'? [Ynesfdaq?] f |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
644 |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
645 EDITOR: HG: Splitting dd3c45017cbf. So far it has been split into: |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
646 EDITOR: HG: - f205aea1c624: split 1 |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
647 EDITOR: HG: Write commit message for the next split changeset. |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
648 EDITOR: splitme |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
649 EDITOR: |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
650 EDITOR: |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
651 EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed. |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
652 EDITOR: HG: Leave message empty to abort commit. |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
653 EDITOR: HG: -- |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
654 EDITOR: HG: user: test |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
655 EDITOR: HG: branch 'default' |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
656 EDITOR: HG: changed foo |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
657 saved backup bundle to $TESTTMP/f/a/.hg/strip-backup/dd3c45017cbf-463441b5-split.hg (obsstore-off !) |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
658 |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
659 Let's try that again, with a slightly different set of patches, to ensure that |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
660 the ignoreblanklines thing isn't somehow position dependent. |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
661 |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
662 $ hg init $TESTTMP/f/b |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
663 $ cd $TESTTMP/f/b |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
664 $ printf '1\n2\n3\n4\n5\n' > foo |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
665 $ cp foo bar |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
666 $ hg ci -qAm initial |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
667 $ printf '1\n2\n3\ntest\n4\n5\n' > bar |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
668 $ printf '1\n2\n3\ntest\n4\n\n5\n' > foo |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
669 $ hg ci -qm splitme |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
670 $ cat > $TESTTMP/messages <<EOF |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
671 > split 1 |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
672 > -- |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
673 > split 2 |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
674 > EOF |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
675 $ printf 'f\nn\nf\n' | hg --config extensions.split= --config diff.ignoreblanklines=1 split |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
676 diff --git a/bar b/bar |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
677 1 hunks, 1 lines changed |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
678 examine changes to 'bar'? [Ynesfdaq?] f |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
679 |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
680 diff --git a/foo b/foo |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
681 2 hunks, 2 lines changed |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
682 examine changes to 'foo'? [Ynesfdaq?] n |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
683 |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
684 EDITOR: HG: Splitting 904c80b40a4a. Write commit message for the first split changeset. |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
685 EDITOR: splitme |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
686 EDITOR: |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
687 EDITOR: |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
688 EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed. |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
689 EDITOR: HG: Leave message empty to abort commit. |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
690 EDITOR: HG: -- |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
691 EDITOR: HG: user: test |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
692 EDITOR: HG: branch 'default' |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
693 EDITOR: HG: changed bar |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
694 created new head |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
695 diff --git a/foo b/foo |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
696 2 hunks, 2 lines changed |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
697 examine changes to 'foo'? [Ynesfdaq?] f |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
698 |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
699 EDITOR: HG: Splitting 904c80b40a4a. So far it has been split into: |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
700 EDITOR: HG: - ffecf40fa954: split 1 |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
701 EDITOR: HG: Write commit message for the next split changeset. |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
702 EDITOR: splitme |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
703 EDITOR: |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
704 EDITOR: |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
705 EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed. |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
706 EDITOR: HG: Leave message empty to abort commit. |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
707 EDITOR: HG: -- |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
708 EDITOR: HG: user: test |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
709 EDITOR: HG: branch 'default' |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
710 EDITOR: HG: changed foo |
3a01ce246ece
commit: ignore diff whitespace settings when doing `commit -i` (issue5839)
Kyle Lippincott <spectral@google.com>
parents:
41454
diff
changeset
|
711 saved backup bundle to $TESTTMP/f/b/.hg/strip-backup/904c80b40a4a-47fb907f-split.hg (obsstore-off !) |