Mercurial > hg-stable

changeset 46104:3f82a915ab2a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
histedit: tweak `edit` message to try and guide users to our workflow histedit predates evolve, so it drops you on an _uncommitted_ version of the commit you're amending/splitting, which is in contrast to git which expects you to use `git commit --amend` (I think - I'm basing this on internal bug reports). My hope is that this output will guide users a little more towards the expected workflow. Differential Revision: https://phab.mercurial-scm.org/D9560
author Augie Fackler <augie@google.com>
date Thu, 10 Dec 2020 11:42:49 -0500
parents 7ce24d3761e8
children 6f8a94bbfba1
files hgext/histedit.py tests/test-histedit-arguments.t tests/test-histedit-commute.t tests/test-histedit-edit.t tests/test-histedit-no-backup.t tests/test-histedit-no-change.t tests/test-histedit-obsolete.t tests/test-qrecord.t tests/test-rebase-pull.t
diffstat 9 files changed, 51 insertions(+), 50 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/histedit.py	Thu Dec 10 14:03:46 2020 +0530
+++ b/hgext/histedit.py	Thu Dec 10 11:42:49 2020 -0500
@@ -799,10 +799,11 @@
         rulectx = repo[self.node]
         hg.update(repo, self.state.parentctxnode, quietempty=True)
         applychanges(repo.ui, repo, rulectx, {})
+        hint = _(b'to edit %s, `hg histedit --continue` after making changes')
         raise error.InterventionRequired(
-            _(b'Editing (%s), you may commit or record as needed now.')
+            _(b'Editing (%s), commit as needed now to split the change')
             % node.short(self.node),
-            hint=_(b'hg histedit --continue to resume'),
+            hint=hint % node.short(self.node),
         )
 
     def commiteditor(self):
--- a/tests/test-histedit-arguments.t	Thu Dec 10 14:03:46 2020 +0530
+++ b/tests/test-histedit-arguments.t	Thu Dec 10 11:42:49 2020 -0500
@@ -149,8 +149,8 @@
   > edit 08d98a8350f3 4 five
   > EOF
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  Editing (08d98a8350f3), you may commit or record as needed now.
-  (hg histedit --continue to resume)
+  Editing (08d98a8350f3), commit as needed now to split the change
+  (to edit 08d98a8350f3, `hg histedit --continue` after making changes)
   [240]
 
   $ hg graft --continue
@@ -335,8 +335,8 @@
   > edit eb57da33312f 2 three
   > pick f3cfcca30c44 4 x
   > EOF
-  Editing (eb57da33312f), you may commit or record as needed now.
-  (hg histedit --continue to resume)
+  Editing (eb57da33312f), commit as needed now to split the change
+  (to edit eb57da33312f, `hg histedit --continue` after making changes)
   [240]
   $ echo edit >> alpha
   $ hg histedit -q --continue
@@ -362,8 +362,8 @@
   $ hg histedit . -q --commands - << EOF
   > edit 8fda0c726bf2 6 x
   > EOF
-  Editing (8fda0c726bf2), you may commit or record as needed now.
-  (hg histedit --continue to resume)
+  Editing (8fda0c726bf2), commit as needed now to split the change
+  (to edit 8fda0c726bf2, `hg histedit --continue` after making changes)
   [240]
 Corrupt histedit state file
   $ sed 's/8fda0c726bf2/123456789012/' .hg/histedit-state > ../corrupt-histedit
@@ -496,8 +496,8 @@
   $ hg histedit --cont
   merging foo
   warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
-  Editing (6f2f0241f119), you may commit or record as needed now.
-  (hg histedit --continue to resume)
+  Editing (6f2f0241f119), commit as needed now to split the change
+  (to edit 6f2f0241f119, `hg histedit --continue` after making changes)
   [240]
   $ hg resolve -m --all
   (no more unresolved files)
--- a/tests/test-histedit-commute.t	Thu Dec 10 14:03:46 2020 +0530
+++ b/tests/test-histedit-commute.t	Thu Dec 10 11:42:49 2020 -0500
@@ -142,8 +142,8 @@
   > EOF
   $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle
   0 files updated, 0 files merged, 4 files removed, 0 files unresolved
-  Editing (177f92b77385), you may commit or record as needed now.
-  (hg histedit --continue to resume)
+  Editing (177f92b77385), commit as needed now to split the change
+  (to edit 177f92b77385, `hg histedit --continue` after making changes)
 
 rules should end up in .hg/histedit-last-edit.txt:
   $ cat .hg/histedit-last-edit.txt
--- a/tests/test-histedit-edit.t	Thu Dec 10 14:03:46 2020 +0530
+++ b/tests/test-histedit-edit.t	Thu Dec 10 11:42:49 2020 -0500
@@ -75,8 +75,8 @@
   > pick 3c6a8ed2ebe8 g
   > EOF
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
-  Editing (e860deea161a), you may commit or record as needed now.
-  (hg histedit --continue to resume)
+  Editing (e860deea161a), commit as needed now to split the change
+  (to edit e860deea161a, `hg histedit --continue` after making changes)
 
 try to update and get an error
   $ hg update tip
@@ -205,8 +205,8 @@
   > pick b5f70786f9b0 g
   > EOF
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
-  Editing (1a60820cd1f6), you may commit or record as needed now.
-  (hg histedit --continue to resume)
+  Editing (1a60820cd1f6), commit as needed now to split the change
+  (to edit 1a60820cd1f6, `hg histedit --continue` after making changes)
 
   $ mv .hg/histedit-state .hg/histedit-state.bak
   $ hg strip -q -r b5f70786f9b0
@@ -247,8 +247,8 @@
   > edit b5f70786f9b0 f
   > EOF
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  Editing (b5f70786f9b0), you may commit or record as needed now.
-  (hg histedit --continue to resume)
+  Editing (b5f70786f9b0), commit as needed now to split the change
+  (to edit b5f70786f9b0, `hg histedit --continue` after making changes)
   $ hg status
   A f
 
@@ -435,8 +435,8 @@
   > edit cb9a9f314b8b a > $EDITED
   > EOF
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  Editing (cb9a9f314b8b), you may commit or record as needed now.
-  (hg histedit --continue to resume)
+  Editing (cb9a9f314b8b), commit as needed now to split the change
+  (to edit cb9a9f314b8b, `hg histedit --continue` after making changes)
   [240]
   $ HGEDITOR=true hg histedit --continue
   saved backup bundle to $TESTTMP/r0/.hg/strip-backup/cb9a9f314b8b-cc5ccb0b-histedit.hg
--- a/tests/test-histedit-no-backup.t	Thu Dec 10 14:03:46 2020 +0530
+++ b/tests/test-histedit-no-backup.t	Thu Dec 10 11:42:49 2020 -0500
@@ -50,8 +50,8 @@
   > edit 7d5187087c79 3 four
   > EOF
   merging file
-  Editing (7d5187087c79), you may commit or record as needed now.
-  (hg histedit --continue to resume)
+  Editing (7d5187087c79), commit as needed now to split the change
+  (to edit 7d5187087c79, `hg histedit --continue` after making changes)
   [240]
   $ hg abort
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -72,8 +72,8 @@
   > edit 7d5187087c79 3 four
   > EOF
   merging file
-  Editing (7d5187087c79), you may commit or record as needed now.
-  (hg histedit --continue to resume)
+  Editing (7d5187087c79), commit as needed now to split the change
+  (to edit 7d5187087c79, `hg histedit --continue` after making changes)
   [240]
 
   $ hg abort
--- a/tests/test-histedit-no-change.t	Thu Dec 10 14:03:46 2020 +0530
+++ b/tests/test-histedit-no-change.t	Thu Dec 10 11:42:49 2020 -0500
@@ -91,8 +91,8 @@
   | edit e860deea161a 4 e
   | pick 652413bf663e 5 f
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
-  Editing (e860deea161a), you may commit or record as needed now.
-  (hg histedit --continue to resume)
+  Editing (e860deea161a), commit as needed now to split the change
+  (to edit e860deea161a, `hg histedit --continue` after making changes)
   $ continueediting true "(leaving commit message unaltered)"
   % finalize changeset editing (leaving commit message unaltered)
 
@@ -142,12 +142,12 @@
   | edit e860deea161a 4 e
   | pick 652413bf663e 5 f
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
-  Editing (055a42cdd887), you may commit or record as needed now.
-  (hg histedit --continue to resume)
+  Editing (055a42cdd887), commit as needed now to split the change
+  (to edit 055a42cdd887, `hg histedit --continue` after making changes)
   $ continueediting true "(leaving commit message unaltered)"
   % finalize changeset editing (leaving commit message unaltered)
-  Editing (e860deea161a), you may commit or record as needed now.
-  (hg histedit --continue to resume)
+  Editing (e860deea161a), commit as needed now to split the change
+  (to edit e860deea161a, `hg histedit --continue` after making changes)
   $ graphlog "log after first edit"
   % log after first edit
   @  6 e5ae3ca2f1ffdbd89ec41ebc273a231f7c3022f2 "d"
@@ -211,8 +211,8 @@
   $ startediting 1 1 "(not changing anything)" # edit the 3rd of 3 changesets
   % start editing the history (not changing anything)
   | edit 292aec348d9e 6 closebranch
-  Editing (292aec348d9e), you may commit or record as needed now.
-  (hg histedit --continue to resume)
+  Editing (292aec348d9e), commit as needed now to split the change
+  (to edit 292aec348d9e, `hg histedit --continue` after making changes)
   $ hg histedit --abort
 
   $ cd ..
--- a/tests/test-histedit-obsolete.t	Thu Dec 10 14:03:46 2020 +0530
+++ b/tests/test-histedit-obsolete.t	Thu Dec 10 11:42:49 2020 -0500
@@ -43,8 +43,8 @@
   $ echo "pick `hg log -r 2 -T '{node|short}'`" >> plan
   $ echo "edit `hg log -r 1 -T '{node|short}'`" >> plan
   $ hg histedit -r 'all()' --commands plan
-  Editing (1b2d564fad96), you may commit or record as needed now.
-  (hg histedit --continue to resume)
+  Editing (1b2d564fad96), commit as needed now to split the change
+  (to edit 1b2d564fad96, `hg histedit --continue` after making changes)
   [240]
   $ hg st
   A b
@@ -70,8 +70,8 @@
   $ echo "pick `hg log -r 5 -T '{node|short}'`" >> plan
   $ echo "edit `hg log -r 4 -T '{node|short}'`" >> plan
   $ hg histedit -r 'all()' --commands plan
-  Editing (49d44ab2be1b), you may commit or record as needed now.
-  (hg histedit --continue to resume)
+  Editing (49d44ab2be1b), commit as needed now to split the change
+  (to edit 49d44ab2be1b, `hg histedit --continue` after making changes)
   [240]
   $ hg st
   A b
@@ -225,8 +225,8 @@
   > edit b346ab9a313d 6 c
   > EOF
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  Editing (b346ab9a313d), you may commit or record as needed now.
-  (hg histedit --continue to resume)
+  Editing (b346ab9a313d), commit as needed now to split the change
+  (to edit b346ab9a313d, `hg histedit --continue` after making changes)
   [240]
   $ echo c >> c
   $ hg histedit --continue
@@ -359,8 +359,8 @@
   > pick ee118ab9fa44 16 k
   > EOF
   0 files updated, 0 files merged, 6 files removed, 0 files unresolved
-  Editing (b449568bf7fc), you may commit or record as needed now.
-  (hg histedit --continue to resume)
+  Editing (b449568bf7fc), commit as needed now to split the change
+  (to edit b449568bf7fc, `hg histedit --continue` after making changes)
   [240]
   $ echo f >> f
   $ hg histedit --continue
@@ -401,8 +401,8 @@
   > pick ee118ab9fa44 16 k
   > EOF
   0 files updated, 0 files merged, 6 files removed, 0 files unresolved
-  Editing (b449568bf7fc), you may commit or record as needed now.
-  (hg histedit --continue to resume)
+  Editing (b449568bf7fc), commit as needed now to split the change
+  (to edit b449568bf7fc, `hg histedit --continue` after making changes)
   [240]
   $ echo f >> f
   $ hg histedit --continue
@@ -527,8 +527,8 @@
   > roll 3a6c53ee7f3d 17 j
   > edit ee118ab9fa44 18 k
   > EOF
-  Editing (ee118ab9fa44), you may commit or record as needed now.
-  (hg histedit --continue to resume)
+  Editing (ee118ab9fa44), commit as needed now to split the change
+  (to edit ee118ab9fa44, `hg histedit --continue` after making changes)
   [240]
 
 #if abortcommand
@@ -566,8 +566,8 @@
   > pick 3a6c53ee7f3d 17 j
   > edit ee118ab9fa44 18 k
   > EOF
-  Editing (ee118ab9fa44), you may commit or record as needed now.
-  (hg histedit --continue to resume)
+  Editing (ee118ab9fa44), commit as needed now to split the change
+  (to edit ee118ab9fa44, `hg histedit --continue` after making changes)
   [240]
   $ hg histedit --continue --config experimental.evolution.track-operation=1
   $ hg log -G
--- a/tests/test-qrecord.t	Thu Dec 10 14:03:46 2020 +0530
+++ b/tests/test-qrecord.t	Thu Dec 10 11:42:49 2020 -0500
@@ -456,8 +456,8 @@
   > edit ea55e2ae468f foo bar
   > EOF
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  Editing (ea55e2ae468f), you may commit or record as needed now.
-  (hg histedit --continue to resume)
+  Editing (ea55e2ae468f), commit as needed now to split the change
+  (to edit ea55e2ae468f, `hg histedit --continue` after making changes)
   [240]
   $ echo 'foo bar' > a
   $ hg qrecord -d '0 0' -m aaa a.patch <<EOF
--- a/tests/test-rebase-pull.t	Thu Dec 10 14:03:46 2020 +0530
+++ b/tests/test-rebase-pull.t	Thu Dec 10 11:42:49 2020 -0500
@@ -88,8 +88,8 @@
   $ hg histedit . -q --commands - << EOF
   > edit d80cc2da061e histedit: generate unfinished state
   > EOF
-  Editing (d80cc2da061e), you may commit or record as needed now.
-  (hg histedit --continue to resume)
+  Editing (d80cc2da061e), commit as needed now to split the change
+  (to edit d80cc2da061e, `hg histedit --continue` after making changes)
   [240]
   $ hg pull --rebase
   abort: histedit in progress