# HG changeset patch # User Anton Shestakov # Date 1623918409 -10800 # Node ID 254e135b46ef2e2cf5548bc76eb860b17c2b6b0d # Parent 8e78e0f316b38a11841879a60e31fa8939d15dba evolve: hg commit has --message flag diff -r 8e78e0f316b3 -r 254e135b46ef hgext3rd/evolve/evolvecmd.py --- 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: diff -r 8e78e0f316b3 -r 254e135b46ef tests/test-evolve-abort-phasediv.t --- 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 diff -r 8e78e0f316b3 -r 254e135b46ef tests/test-evolve-phase-divergence.t --- 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. diff -r 8e78e0f316b3 -r 254e135b46ef tests/test-unstability-resolution-result.t --- 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