Mercurial > evolve
changeset 5957:254e135b46ef stable
evolve: hg commit has --message flag
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Thu, 17 Jun 2021 11:26:49 +0300 |
| parents | 8e78e0f316b3 |
| children | 9b507e5e6744 f56e36b5f0a9 |
| files | hgext3rd/evolve/evolvecmd.py tests/test-evolve-abort-phasediv.t tests/test-evolve-phase-divergence.t tests/test-unstability-resolution-result.t |
| diffstat | 4 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/evolvecmd.py Wed Jun 16 08:29:28 2021 +0300 +++ b/hgext3rd/evolve/evolvecmd.py Thu Jun 17 11:26:49 2021 +0300 @@ -206,7 +206,7 @@ repo.ui.write(todo) repo.ui.write((b'hg update %s;\n' % prec)) repo.ui.write((b'hg revert --all --rev %s;\n' % bumped)) - repo.ui.write((b'hg commit --msg "%s update to %s"\n' % + repo.ui.write((b'hg commit --message "%s update to %s"\n' % (TROUBLES['PHASEDIVERGENT'], bumped))) return (False, b".") if progresscb:
--- a/tests/test-evolve-abort-phasediv.t Wed Jun 16 08:29:28 2021 +0300 +++ b/tests/test-evolve-abort-phasediv.t Thu Jun 17 11:26:49 2021 +0300 @@ -182,13 +182,13 @@ hg rebase --rev e44ebefe4f54 --dest ca1b80f7960a; hg update c41c793e0ef1; hg revert --all --rev e44ebefe4f54; - hg commit --msg "phase-divergent update to e44ebefe4f54" + hg commit --message "phase-divergent update to e44ebefe4f54" recreate:[9] added c atop:[3] added c hg rebase --rev 28cd06b3f801 --dest b1661037fa25; hg update ca1b80f7960a; hg revert --all --rev 28cd06b3f801; - hg commit --msg "phase-divergent update to 28cd06b3f801" + hg commit --message "phase-divergent update to 28cd06b3f801" $ hg glog --hidden @ 9:28cd06b3f801 added c
--- a/tests/test-evolve-phase-divergence.t Wed Jun 16 08:29:28 2021 +0300 +++ b/tests/test-evolve-phase-divergence.t Thu Jun 17 11:26:49 2021 +0300 @@ -194,7 +194,7 @@ hg rebase --rev 98bb3a6cfe1a --dest d3873e73d99e; hg update 4d1169d82e47; hg revert --all --rev 98bb3a6cfe1a; - hg commit --msg "phase-divergent update to 98bb3a6cfe1a" + hg commit --message "phase-divergent update to 98bb3a6cfe1a" XXX: evolve should have mentioned that draft commit is just obsoleted in favour of public one. From the message it looks like a new commit is created.
--- a/tests/test-unstability-resolution-result.t Wed Jun 16 08:29:28 2021 +0300 +++ b/tests/test-unstability-resolution-result.t Thu Jun 17 11:26:49 2021 +0300 @@ -168,7 +168,7 @@ hg rebase --rev 99c21c89bcef --dest 66719795a494; hg update 1cf0aacfd363; hg revert --all --rev 99c21c89bcef; - hg commit --msg "phase-divergent update to 99c21c89bcef" + hg commit --message "phase-divergent update to 99c21c89bcef" $ hg evolve --any --confirm --phase-divergent recreate:[9] newer a atop:[6] newer a