Show More
@@ -272,13 +272,68 b' Abort the rebasing:' | |||
|
272 | 272 | o 0:public 'A' |
|
273 | 273 | |
|
274 | 274 | |
|
275 |
Test rebase interrupted by hooks |
|
|
275 | Test rebase interrupted by hooks | |
|
276 | 276 | |
|
277 | 277 | $ hg up 2 |
|
278 | 278 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
279 | 279 | $ echo F > F |
|
280 | 280 | $ hg add F |
|
281 | 281 | $ hg ci -m F |
|
282 | ||
|
283 | $ cd .. | |
|
284 | ||
|
285 | (precommit version) | |
|
286 | ||
|
287 | $ cp -R a3 hook-precommit | |
|
288 | $ cd hook-precommit | |
|
289 | $ hg rebase --source 2 --dest 5 --tool internal:other --config 'hooks.precommit=hg status | grep "M A"' | |
|
290 | rebasing 2:965c486023db "C" | |
|
291 | M A | |
|
292 | rebasing 6:a0b2430ebfb8 "F" (tip) | |
|
293 | abort: precommit hook exited with status 1 | |
|
294 | [255] | |
|
295 | $ hg tglogp | |
|
296 | @ 7:secret 'C' | |
|
297 | | | |
|
298 | | @ 6:secret 'F' | |
|
299 | | | | |
|
300 | o | 5:public 'B' | |
|
301 | | | | |
|
302 | o | 4:public 'E' | |
|
303 | | | | |
|
304 | o | 3:public 'D' | |
|
305 | | | | |
|
306 | | o 2:secret 'C' | |
|
307 | | | | |
|
308 | | o 1:public 'B' | |
|
309 | |/ | |
|
310 | o 0:public 'A' | |
|
311 | ||
|
312 | $ hg rebase --continue | |
|
313 | already rebased 2:965c486023db "C" as 401ccec5e39f | |
|
314 | rebasing 6:a0b2430ebfb8 "F" | |
|
315 | saved backup bundle to $TESTTMP/hook-precommit/.hg/strip-backup/965c486023db-aa6250e7-backup.hg (glob) | |
|
316 | $ hg tglogp | |
|
317 | @ 6:secret 'F' | |
|
318 | | | |
|
319 | o 5:secret 'C' | |
|
320 | | | |
|
321 | o 4:public 'B' | |
|
322 | | | |
|
323 | o 3:public 'E' | |
|
324 | | | |
|
325 | o 2:public 'D' | |
|
326 | | | |
|
327 | | o 1:public 'B' | |
|
328 | |/ | |
|
329 | o 0:public 'A' | |
|
330 | ||
|
331 | $ cd .. | |
|
332 | ||
|
333 | (pretxncommit version) | |
|
334 | ||
|
335 | $ cp -R a3 hook-pretxncommit | |
|
336 | $ cd hook-pretxncommit | |
|
282 | 337 | $ hg rebase --source 2 --dest 5 --tool internal:other --config 'hooks.pretxncommit=hg log -r $HG_NODE | grep "summary: C"' |
|
283 | 338 | rebasing 2:965c486023db "C" |
|
284 | 339 | summary: C |
@@ -307,7 +362,7 b' Test rebase interrupted by hooks (pretxn' | |||
|
307 | 362 | $ hg rebase --continue |
|
308 | 363 | already rebased 2:965c486023db "C" as 401ccec5e39f |
|
309 | 364 | rebasing 6:a0b2430ebfb8 "F" |
|
310 |
saved backup bundle to $TESTTMP/ |
|
|
365 | saved backup bundle to $TESTTMP/hook-pretxncommit/.hg/strip-backup/965c486023db-aa6250e7-backup.hg (glob) | |
|
311 | 366 | $ hg tglogp |
|
312 | 367 | @ 6:secret 'F' |
|
313 | 368 | | |
General Comments 0
You need to be logged in to leave comments.
Login now