Mercurial > hg
comparison tests/test-rebase-interruptions.t @ 45771:f90a5c211251
rebase: change and standarize template for rebase's one-line summary
This removes the default template in rebase and switches to a
centrally defined template. I've simplified it a bit to avoid the
conditional parenthesis. I've also added labels so the different parts
can be easily colored. The template is somewhat similar to what we've
used internally at Google for a few years.
I'm happy to change the template if others have opinions. Should we
reuse the `color.log.` names as I have?
Differential Revision: https://phab.mercurial-scm.org/D9252
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 27 Oct 2020 15:33:15 -0700 |
parents | dc5e5577af39 |
children | 21733e8c924f |
comparison
equal
deleted
inserted
replaced
45770:96fcc37a9c80 | 45771:f90a5c211251 |
---|---|
346 $ cp -R a3 hook-precommit | 346 $ cp -R a3 hook-precommit |
347 $ cd hook-precommit | 347 $ cd hook-precommit |
348 $ hg rebase --source 2 --dest 5 --tool internal:other --config 'hooks.precommit=hg status | grep "M A"' | 348 $ hg rebase --source 2 --dest 5 --tool internal:other --config 'hooks.precommit=hg status | grep "M A"' |
349 rebasing 2:965c486023db "C" | 349 rebasing 2:965c486023db "C" |
350 M A | 350 M A |
351 rebasing 6:a0b2430ebfb8 "F" (tip) | 351 rebasing 6:a0b2430ebfb8 tip "F" |
352 abort: precommit hook exited with status 1 | 352 abort: precommit hook exited with status 1 |
353 [255] | 353 [255] |
354 $ hg tglogp | 354 $ hg tglogp |
355 @ 7: 401ccec5e39f secret 'C' | 355 @ 7: 401ccec5e39f secret 'C' |
356 | | 356 | |
395 $ cd hook-pretxncommit | 395 $ cd hook-pretxncommit |
396 $ hg rebase --source 2 --dest 5 --tool internal:other \ | 396 $ hg rebase --source 2 --dest 5 --tool internal:other \ |
397 > --config 'hooks.tonative.pretxncommit=True' --config 'hooks.pretxncommit=hg log -r $HG_NODE | grep "summary: C"' | 397 > --config 'hooks.tonative.pretxncommit=True' --config 'hooks.pretxncommit=hg log -r $HG_NODE | grep "summary: C"' |
398 rebasing 2:965c486023db "C" | 398 rebasing 2:965c486023db "C" |
399 summary: C | 399 summary: C |
400 rebasing 6:a0b2430ebfb8 "F" (tip) | 400 rebasing 6:a0b2430ebfb8 tip "F" |
401 transaction abort! | 401 transaction abort! |
402 rollback completed | 402 rollback completed |
403 abort: pretxncommit hook exited with status 1 | 403 abort: pretxncommit hook exited with status 1 |
404 [255] | 404 [255] |
405 $ hg tglogp | 405 $ hg tglogp |
445 $ cp -R a3 hook-pretxnclose | 445 $ cp -R a3 hook-pretxnclose |
446 $ cd hook-pretxnclose | 446 $ cd hook-pretxnclose |
447 $ hg rebase --source 2 --dest 5 --tool internal:other --config 'hooks.pretxnclose=hg log -r tip | grep "summary: C"' | 447 $ hg rebase --source 2 --dest 5 --tool internal:other --config 'hooks.pretxnclose=hg log -r tip | grep "summary: C"' |
448 rebasing 2:965c486023db "C" | 448 rebasing 2:965c486023db "C" |
449 summary: C | 449 summary: C |
450 rebasing 6:a0b2430ebfb8 "F" (tip) | 450 rebasing 6:a0b2430ebfb8 tip "F" |
451 transaction abort! | 451 transaction abort! |
452 rollback completed | 452 rollback completed |
453 abort: pretxnclose hook exited with status 1 | 453 abort: pretxnclose hook exited with status 1 |
454 [255] | 454 [255] |
455 $ hg tglogp | 455 $ hg tglogp |
520 $ test -d .hg/merge | 520 $ test -d .hg/merge |
521 [1] | 521 [1] |
522 Now try again with --collapse | 522 Now try again with --collapse |
523 $ hg unbundle -q .hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg | 523 $ hg unbundle -q .hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg |
524 $ hg rebase -s 2 -d 1 --noninteractive --collapse | 524 $ hg rebase -s 2 -d 1 --noninteractive --collapse |
525 rebasing 2:fdaca8533b86 "b" (tip) | 525 rebasing 2:fdaca8533b86 tip "b" |
526 merging a | 526 merging a |
527 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | 527 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
528 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') | 528 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
529 [1] | 529 [1] |
530 $ echo a > a | 530 $ echo a > a |
531 $ echo c >> a | 531 $ echo c >> a |
532 $ hg resolve --mark a | 532 $ hg resolve --mark a |
533 (no more unresolved files) | 533 (no more unresolved files) |
534 continue: hg rebase --continue | 534 continue: hg rebase --continue |
535 $ hg rebase --continue | 535 $ hg rebase --continue |
536 rebasing 2:fdaca8533b86 "b" (tip) | 536 rebasing 2:fdaca8533b86 tip "b" |
537 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg | 537 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg |
538 $ hg resolve --list | 538 $ hg resolve --list |
539 $ test -d .hg/merge | 539 $ test -d .hg/merge |
540 [1] | 540 [1] |