comparison tests/test-evolve.t @ 5695:8c7de8f8bb42

evolve: respect command-templates.oneline-summary if configured Mercurial has a new `command-templates.oneline-summary` config that is respected by `hg rebase`, `hg phabsend`, and the bundled version of `hg split`. This patch makes `hg evolve` also respect it. Unlike the upstream commands, I let `hg evolve` use the existing template by default. The reason I didn't change the default is that we have a different template when topics are enabled and it's unclear how that should work with the default from upstream. So at least for now, the user will have to explicitly set the new config if they want it to apply to `hg evolve`.
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 30 Oct 2020 13:42:51 -0700
parents e5d91fd1f319
children bf8638b5c526
comparison
equal deleted inserted replaced
5694:bfdd8866f0b7 5695:8c7de8f8bb42
457 o 0 457 o 0
458 458
459 459
460 460
461 (/ninja) 461 (/ninja)
462
463 command-templates.oneline-summary is respected when evolving orphan
464
465 $ hg evolve -n --config 'command-templates.oneline-summary = custom {rev} {desc}'
466 move:custom 8 dansk 2!
467 atop:custom 10 dansk!
468 hg rebase -r 569625323d3e -d 9975c016fe7b
469 skipping 8163b3ed62c7, consider including orphan ancestors
470
471 command-templates.oneline-summary is respected when evolving/updating working copy
472
473 $ hg co -q 7
474 working directory parent is obsolete! (aca219761afb)
475 $ hg evolve --no-all --config 'command-templates.oneline-summary = custom {rev} {desc}'
476 update:custom 10 dansk!
477 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
478 working directory is now at 9975c016fe7b
462 479
463 $ hg evolve --all --traceback 480 $ hg evolve --all --traceback
464 move:[8] dansk 2! 481 move:[8] dansk 2!
465 atop:[10] dansk! 482 atop:[10] dansk!
466 merging main-file-1 483 merging main-file-1