##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

histedit: omit useless message from update (_histedit)...
timeless -
r27406:11be6b7f default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -1081,7 +1081,7 b' def _histedit(ui, repo, state, *freeargs'
1081 1081 state.replacements.extend(replacement_)
1082 1082 state.write()
1083 1083
1084 hg.update(repo, state.parentctxnode)
1084 hg.update(repo, state.parentctxnode, quietempty=True)
1085 1085
1086 1086 mapping, tmpnodes, created, ntm = processreplacement(state)
1087 1087 if mapping:
Show file before | Show file after | Hide comments
@@ -71,7 +71,6 b' Run a dummy edit to make sure we get tip'
71 71 # d, drop = remove commit from history
72 72 # m, mess = edit commit message without changing commit content
73 73 #
74 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
75 74
76 75 Run on a revision not ancestors of the current working directory.
77 76 --------------------------------------------------------------------
@@ -92,7 +91,6 b' Test that we pick the minimum of a revra'
92 91 > pick c8e68270e35a 3 four
93 92 > pick 08d98a8350f3 4 five
94 93 > EOF
95 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
96 94 $ hg up --quiet
97 95
98 96 $ HGEDITOR=cat hg histedit 'tip:2' --commands - << EOF
@@ -100,7 +98,6 b' Test that we pick the minimum of a revra'
100 98 > pick c8e68270e35a 3 four
101 99 > pick 08d98a8350f3 4 five
102 100 > EOF
103 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
104 101 $ hg up --quiet
105 102
106 103 Test config specified default
@@ -110,7 +107,6 b' Test config specified default'
110 107 > pick c8e68270e35a 3 four
111 108 > pick 08d98a8350f3 4 five
112 109 > EOF
113 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
114 110
115 111 Run on a revision not descendants of the initial parent
116 112 --------------------------------------------------------------------
@@ -142,7 +138,6 b' temporarily.'
142 138 $ mv .hg/histedit-state.back .hg/histedit-state
143 139
144 140 $ hg histedit --continue
145 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
146 141 saved backup bundle to $TESTTMP/foo/.hg/strip-backup/08d98a8350f3-02594089-backup.hg (glob)
147 142 $ hg log -G -T '{rev} {shortest(node)} {desc}\n' -r 2::
148 143 @ 4 f5ed five
@@ -251,7 +246,6 b' short hash. This tests issue3893.'
251 246 HG: branch 'default'
252 247 HG: changed alpha
253 248 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
254 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
255 249 saved backup bundle to $TESTTMP/foo/.hg/strip-backup/*-backup.hg (glob)
256 250 saved backup bundle to $TESTTMP/foo/.hg/strip-backup/*-backup.hg (glob)
257 251
@@ -295,7 +289,6 b' Test that trimming description using mul'
295 289 # d, drop = remove commit from history
296 290 # m, mess = edit commit message without changing commit content
297 291 #
298 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
299 292
300 293 Test --continue with --keep
301 294
@@ -426,7 +419,6 b' Default base revision should stop at pub'
426 419 > pick 463b8c0d2973
427 420 > pick 8cdc02b9bc63
428 421 > EOF
429 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
430 422
431 423 Default base revision should stop at branchpoint
432 424
@@ -435,7 +427,6 b' Default base revision should stop at bra'
435 427 > pick 931820154288
436 428 > pick 4c35cdf97d5e
437 429 > EOF
438 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
439 430
440 431 Default base revision should stop at merge commit
441 432
@@ -444,4 +435,3 b' Default base revision should stop at mer'
444 435 > pick 6f2f0241f119
445 436 > pick 8cde254db839
446 437 > EOF
447 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Show file before | Show file after | Hide comments
@@ -54,7 +54,6 b' Rebase B onto H'
54 54 > pick 5fddd98957c8 C
55 55 > pick 32af7686d403 D
56 56 > EOF
57 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
58 57
59 58 $ hg tglog
60 59 @ 7:0937e82309df47d14176ee15e45dbec5fbdef340:draft 'D'
@@ -80,7 +79,6 b' Rebase back and drop something'
80 79 > drop f778d1cbddac C
81 80 > pick 0937e82309df D
82 81 > EOF
83 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
84 82
85 83 $ hg tglog
86 84 @ 6:476cc3e4168da2d036b141f7f7dcff7f8e3fe846:draft 'D'
@@ -104,7 +102,6 b' Split stack'
104 102 > base cd010b8cd998
105 103 > pick 476cc3e4168d D
106 104 > EOF
107 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
108 105
109 106 $ hg tglog
110 107 @ 6:d7a6f907a822c4ce6f15662ae45a42aa46d3818a:draft 'D'
@@ -182,7 +179,6 b' Continue'
182 179 $ hg resolve --mark B
183 180 (no more unresolved files)
184 181 $ hg histedit --continue | fixbundle
185 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
186 182 $ hg tglog
187 183 @ 6:03772da75548bb42a8f1eacd8c91d0717a147fcd:draft 'X'
188 184 |
Show file before | Show file after | Hide comments
@@ -77,7 +77,6 b''
77 77 # d, drop = remove commit from history
78 78 # m, mess = edit commit message without changing commit content
79 79 #
80 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
81 80 $ hg histedit 1 --commands - --verbose << EOF | grep histedit
82 81 > pick 177f92b77385 2 c
83 82 > drop d2ae7f538514 1 b
@@ -138,7 +137,6 b''
138 137 # d, drop = remove commit from history
139 138 # m, mess = edit commit message without changing commit content
140 139 #
141 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
142 140 $ hg histedit 1 --commands - --verbose << EOF | grep histedit
143 141 > pick b346ab9a313d 1 c
144 142 > pick cacdfd884a93 3 f
Show file before | Show file after | Hide comments
@@ -71,7 +71,6 b' show the edit commands offered'
71 71 # d, drop = remove commit from history
72 72 # m, mess = edit commit message without changing commit content
73 73 #
74 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
75 74
76 75 edit the history
77 76 (use a hacky editor to check histedit-last-edit.txt backup)
@@ -85,7 +84,6 b' edit the history'
85 84 > EOF
86 85 $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle
87 86 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
88 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
89 87
90 88 rules should end up in .hg/histedit-last-edit.txt:
91 89 $ cat .hg/histedit-last-edit.txt
@@ -137,7 +135,6 b' put things back'
137 135 > pick 8ade9693061e f
138 136 > EOF
139 137 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
140 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
141 138
142 139 $ hg log --graph
143 140 @ changeset: 5:7eca9b5b1148
@@ -181,7 +178,6 b' slightly different this time'
181 178 > pick 177f92b77385 c
182 179 > EOF
183 180 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
184 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
185 181 $ hg log --graph
186 182 @ changeset: 5:38b92f448761
187 183 | tag: tip
@@ -223,7 +219,6 b' keep prevents stripping dead revs'
223 219 > pick de71b079d9ce e
224 220 > EOF
225 221 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
226 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
227 222 $ hg log --graph
228 223 @ changeset: 7:803ef1c6fcfd
229 224 | tag: tip
@@ -341,7 +336,6 b' Verify that revsetalias entries work wit'
341 336 # d, drop = remove commit from history
342 337 # m, mess = edit commit message without changing commit content
343 338 #
344 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
345 339
346 340 should also work if a commit message is missing
347 341 $ BUNDLE="$TESTDIR/missing-comment.hg"
@@ -372,7 +366,6 b' should also work if a commit message is '
372 366 summary: Checked in text file
373 367
374 368 $ hg histedit 0
375 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
376 369 $ cd ..
377 370
378 371 $ cd ..
@@ -413,7 +406,6 b" Now, let's try to fold the second commit"
413 406 removing initial-dir/initial-file (glob)
414 407 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
415 408 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
416 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
417 409 saved backup bundle to $TESTTMP/issue4251/.hg/strip-backup/*-backup.hg (glob)
418 410 saved backup bundle to $TESTTMP/issue4251/.hg/strip-backup/*-backup.hg (glob)
419 411
Show file before | Show file after | Hide comments
@@ -60,7 +60,6 b' edit the history'
60 60 > pick 055a42cdd887 d
61 61 > EOF
62 62 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
63 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
64 63
65 64 log after edit
66 65 $ hg log --graph
Show file before | Show file after | Hide comments
@@ -141,7 +141,6 b" qnew should fail while we're in the midd"
141 141 (use 'hg histedit --continue' or 'hg histedit --abort')
142 142 [255]
143 143 $ HGEDITOR='echo foobaz > ' hg histedit --continue 2>&1 | fixbundle
144 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
145 144
146 145 $ hg log --graph
147 146 @ changeset: 6:b5f70786f9b0
@@ -261,7 +260,6 b' check histedit_source'
261 260 HG: user: test
262 261 HG: branch 'default'
263 262 HG: added f
264 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
265 263 saved backup bundle to $TESTTMP/r/.hg/strip-backup/b5f70786f9b0-c28d9c86-backup.hg (glob)
266 264
267 265 $ hg status
@@ -282,7 +280,6 b" say we'll change the message, but don't."
282 280 > EOF
283 281 $ HGEDITOR="sh ../edit.sh" hg histedit tip 2>&1 | fixbundle
284 282 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
285 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
286 283 $ hg status
287 284 $ hg log --limit 1
288 285 changeset: 6:1fd3b2fe7754
@@ -405,7 +402,6 b' then, check "modify the message" itself'
405 402 > mess 1fd3b2fe7754 f
406 403 > EOF
407 404 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
408 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
409 405 $ hg status
410 406 $ hg log --limit 1
411 407 changeset: 6:62feedb1200e
@@ -433,7 +429,6 b' rollback should not work after a histedi'
433 429 When you are finished, run hg histedit --continue to resume.
434 430 [1]
435 431 $ HGEDITOR=true hg histedit --continue
436 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
437 432 saved backup bundle to $TESTTMP/r0/.hg/strip-backup/cb9a9f314b8b-cc5ccb0b-backup.hg (glob)
438 433
439 434 $ hg log -G
Show file before | Show file after | Hide comments
@@ -130,7 +130,6 b' just continue this time'
130 130 (no more unresolved files)
131 131 $ hg histedit --continue 2>&1 | fixbundle
132 132 7b4e2f4b7bcd: empty changeset
133 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
134 133
135 134 log after edit
136 135 $ hg log --graph
@@ -269,7 +268,6 b' just continue this time'
269 268 (no more unresolved files)
270 269 $ hg histedit --continue 2>&1 | fixbundle
271 270 7b4e2f4b7bcd: empty changeset
272 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
273 271
274 272 log after edit
275 273 $ hg log --graph
Show file before | Show file after | Hide comments
@@ -57,7 +57,6 b' log before edit'
57 57 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
58 58 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
59 59 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
60 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
61 60
62 61 log after edit
63 62 $ hg logt --graph
@@ -115,7 +114,6 b' rollup will fold without preserving the '
115 114 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
116 115 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
117 116 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
118 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
119 117
120 118 $ HGEDITOR=$OLDHGEDITOR
121 119
@@ -243,7 +241,6 b' tip before edit'
243 241 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
244 242 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
245 243 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
246 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
247 244
248 245 tip after edit
249 246 $ hg log --rev .
@@ -306,7 +303,6 b' should effectively drop the changes from'
306 303 (no more unresolved files)
307 304 $ hg histedit --continue
308 305 251d831eeec5: empty changeset
309 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
310 306 saved backup bundle to $TESTTMP/*-backup.hg (glob)
311 307 $ hg logt --graph
312 308 @ 1:617f94f13c0f +4
@@ -384,7 +380,6 b' dropped revision.'
384 380 HG: branch 'default'
385 381 HG: changed file
386 382 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
387 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
388 383 saved backup bundle to $TESTTMP/fold-with-dropped/.hg/strip-backup/55c8d8dc79ce-4066cd98-backup.hg (glob)
389 384 saved backup bundle to $TESTTMP/fold-with-dropped/.hg/strip-backup/617f94f13c0f-a35700fc-backup.hg (glob)
390 385 $ hg logt -G
@@ -444,7 +439,6 b' Folding with initial rename (issue3729)'
444 439 reverting b.txt
445 440 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
446 441 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
447 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
448 442
449 443 $ hg logt --follow b.txt
450 444 1:cf858d235c76 rename
@@ -490,7 +484,6 b' into the hook command.'
490 484 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
491 485 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
492 486 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
493 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
494 487 commit 9599899f62c05f4377548c32bf1c9f1a39634b0c
495 488
496 489 $ hg logt
@@ -536,7 +529,6 b' editors.'
536 529 merging foo
537 530 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
538 531 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
539 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
540 532 $ hg logt
541 533 2:e8bedbda72c1 merged foos
542 534 1:578c7455730c a
Show file before | Show file after | Hide comments
@@ -95,7 +95,6 b' editing a changeset without any actual c'
95 95 When you are finished, run hg histedit --continue to resume.
96 96 $ continueediting true "(leaving commit message unaltered)"
97 97 % finalize changeset editing (leaving commit message unaltered)
98 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
99 98
100 99
101 100 check state of working copy
Show file before | Show file after | Hide comments
@@ -167,7 +167,6 b' just continue this time'
167 167 (no more unresolved files)
168 168 $ hg histedit --continue 2>&1 | fixbundle
169 169 7b4e2f4b7bcd: empty changeset
170 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
171 170
172 171 log after edit
173 172 $ hg log --graph
@@ -247,7 +246,6 b' second edit also fails, but just continu'
247 246 (no more unresolved files)
248 247 $ hg histedit --continue 2>&1 | fixbundle
249 248 7b4e2f4b7bcd: empty changeset
250 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
251 249
252 250 post message fix
253 251 $ hg log --graph
Show file before | Show file after | Hide comments
@@ -56,7 +56,6 b' Enable obsolete'
56 56 # d, drop = remove commit from history
57 57 # m, mess = edit commit message without changing commit content
58 58 #
59 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
60 59 $ hg histedit 1 --commands - --verbose <<EOF | grep histedit
61 60 > pick 177f92b77385 2 c
62 61 > drop d2ae7f538514 1 b
@@ -109,7 +108,6 b' create an hidden revision'
109 108 > pick cacdfd884a93 8 f
110 109 > EOF
111 110 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
112 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
113 111 $ hg log --graph
114 112 @ 11:c13eb81022ca f
115 113 |
@@ -123,7 +121,6 b' check hidden revision are ignored (6 hav'
123 121 > pick b346ab9a313d 6 c
124 122 > pick c13eb81022ca 8 f
125 123 > EOF
126 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
127 124
128 125
129 126
@@ -144,7 +141,6 b' Test that rewriting leaving instability '
144 141 [1]
145 142 $ echo c >> c
146 143 $ hg histedit --continue
147 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
148 144
149 145 $ hg log -r 'unstable()'
150 146 11:c13eb81022ca f (no-eol)
@@ -199,7 +195,6 b' With rewritten ancestors'
199 195 > drop 1b3b05f35ff0 13 h
200 196 > EOF
201 197 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
202 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
203 198 $ hg log -G
204 199 @ 17:ee6544123ab8 c
205 200 |
@@ -290,7 +285,6 b' New-commit as draft (default)'
290 285 [1]
291 286 $ echo f >> f
292 287 $ hg histedit --continue
293 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
294 288 $ hg log -G
295 289 @ 24:12925f763c90 (secret) k
296 290 |
@@ -334,7 +328,6 b' New-commit as draft (default)'
334 328 [1]
335 329 $ echo f >> f
336 330 $ hg histedit --continue
337 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
338 331 $ hg log -G
339 332 @ 24:12925f763c90 (secret) k
340 333 |
@@ -372,7 +365,6 b' It seems more important to present the s'
372 365 > pick 14bda137d5b3 16 k
373 366 > EOF
374 367 0 files updated, 0 files merged, 5 files removed, 0 files unresolved
375 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
376 368 $ hg log -G
377 369 @ 23:9e712162b2c1 (secret) k
378 370 |
@@ -421,7 +413,6 b' Note that there is a few reordering in t'
421 413 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
422 414 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
423 415 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
424 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
425 416 $ hg log -G
426 417 @ 27:769e8ee8708e (secret) i
427 418 |
Show file before | Show file after | Hide comments
@@ -53,7 +53,6 b' show the edit commands offered by outgoi'
53 53 # d, drop = remove commit from history
54 54 # m, mess = edit commit message without changing commit content
55 55 #
56 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
57 56 $ cd ..
58 57
59 58 show the error from unrelated repos
@@ -85,7 +84,6 b' show the error from unrelated repos'
85 84 # d, drop = remove commit from history
86 85 # m, mess = edit commit message without changing commit content
87 86 #
88 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
89 87 $ cd ..
90 88
91 89 test sensitivity to branch in URL:
@@ -109,7 +107,6 b' test sensitivity to branch in URL:'
109 107 # d, drop = remove commit from history
110 108 # m, mess = edit commit message without changing commit content
111 109 #
112 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
113 110
114 111 test to check number of roots in outgoing revisions
115 112
General Comments 0
You need to be logged in to leave comments. Login now