Mercurial > hg

changeset 46104:6f8a94bbfba1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
histedit: adjust comment describing `edit` action for clarity Differential Revision: https://phab.mercurial-scm.org/D9561
author Augie Fackler <augie@google.com>
date Thu, 10 Dec 2020 13:15:15 -0500
parents 3f82a915ab2a
children ed5a0b5d21a6
files hgext/histedit.py tests/test-histedit-arguments.t tests/test-histedit-bookmark-motion.t tests/test-histedit-commute.t tests/test-histedit-edit.t tests/test-histedit-obsolete.t tests/test-histedit-outgoing.t
diffstat 7 files changed, 17 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/histedit.py	Thu Dec 10 11:42:49 2020 -0500
+++ b/hgext/histedit.py	Thu Dec 10 13:15:15 2020 -0500
@@ -34,7 +34,7 @@
  #
  # Commands:
  #  p, pick = use commit
- #  e, edit = use commit, but stop for amending
+ #  e, edit = use commit, but allow edits before making new commit
  #  f, fold = use commit, but combine it with the one above
  #  r, roll = like fold, but discard this commit's description and date
  #  d, drop = remove commit from history
@@ -57,7 +57,7 @@
  #
  # Commands:
  #  p, pick = use commit
- #  e, edit = use commit, but stop for amending
+ #  e, edit = use commit, but allow edits before making new commit
  #  f, fold = use commit, but combine it with the one above
  #  r, roll = like fold, but discard this commit's description and date
  #  d, drop = remove commit from history
@@ -792,7 +792,7 @@
         return super(pick, self).run()
 
 
-@action([b'edit', b'e'], _(b'use commit, but stop for amending'), priority=True)
+@action([b'edit', b'e'], _(b'use commit, but allow edits before making new commit'), priority=True)
 class edit(histeditaction):
     def run(self):
         repo = self.repo
--- a/tests/test-histedit-arguments.t	Thu Dec 10 11:42:49 2020 -0500
+++ b/tests/test-histedit-arguments.t	Thu Dec 10 13:15:15 2020 -0500
@@ -77,7 +77,7 @@
   #
   # Commands:
   #
-  #  e, edit = use commit, but stop for amending
+  #  e, edit = use commit, but allow edits before making new commit
   #  m, mess = edit commit message without changing commit content
   #  p, pick = use commit
   #  b, base = checkout changeset and apply further changesets from there
@@ -319,7 +319,7 @@
   #
   # Commands:
   #
-  #  e, edit = use commit, but stop for amending
+  #  e, edit = use commit, but allow edits before making new commit
   #  m, mess = edit commit message without changing commit content
   #  p, pick = use commit
   #  b, base = checkout changeset and apply further changesets from there
@@ -557,7 +557,7 @@
   #
   # Commands:
   #
-  #  e, edit = use commit, but stop for amending
+  #  e, edit = use commit, but allow edits before making new commit
   #  m, mess = edit commit message without changing commit content
   #  p, pick = use commit
   #  b, base = checkout changeset and apply further changesets from there
--- a/tests/test-histedit-bookmark-motion.t	Thu Dec 10 11:42:49 2020 -0500
+++ b/tests/test-histedit-bookmark-motion.t	Thu Dec 10 13:15:15 2020 -0500
@@ -73,7 +73,7 @@
   #
   # Commands:
   #
-  #  e, edit = use commit, but stop for amending
+  #  e, edit = use commit, but allow edits before making new commit
   #  m, mess = edit commit message without changing commit content
   #  p, pick = use commit
   #  b, base = checkout changeset and apply further changesets from there
@@ -130,7 +130,7 @@
   #
   # Commands:
   #
-  #  e, edit = use commit, but stop for amending
+  #  e, edit = use commit, but allow edits before making new commit
   #  m, mess = edit commit message without changing commit content
   #  p, pick = use commit
   #  b, base = checkout changeset and apply further changesets from there
--- a/tests/test-histedit-commute.t	Thu Dec 10 11:42:49 2020 -0500
+++ b/tests/test-histedit-commute.t	Thu Dec 10 13:15:15 2020 -0500
@@ -68,7 +68,7 @@
   #
   # Commands:
   #
-  #  e, edit = use commit, but stop for amending
+  #  e, edit = use commit, but allow edits before making new commit
   #  m, mess = edit commit message without changing commit content
   #  p, pick = use commit
   #  b, base = checkout changeset and apply further changesets from there
@@ -94,7 +94,7 @@
   #
   # Commands:
   #
-  #  e, edit = use commit, but stop for amending
+  #  e, edit = use commit, but allow edits before making new commit
   #  m, mess = edit commit message without changing commit content
   #  p, pick = use commit
   #  b, base = checkout changeset and apply further changesets from there
@@ -120,7 +120,7 @@
   #
   # Commands:
   #
-  #  e, edit = use commit, but stop for amending
+  #  e, edit = use commit, but allow edits before making new commit
   #  m, mess = edit commit message without changing commit content
   #  p, pick = use commit
   #  b, base = checkout changeset and apply further changesets from there
@@ -405,7 +405,7 @@
   #
   # Commands:
   #
-  #  e, edit = use commit, but stop for amending
+  #  e, edit = use commit, but allow edits before making new commit
   #  m, mess = edit commit message without changing commit content
   #  p, pick = use commit
   #  b, base = checkout changeset and apply further changesets from there
--- a/tests/test-histedit-edit.t	Thu Dec 10 11:42:49 2020 -0500
+++ b/tests/test-histedit-edit.t	Thu Dec 10 13:15:15 2020 -0500
@@ -475,7 +475,7 @@
   #
   # Commands:
   #
-  #  e, edit = use commit, but stop for amending
+  #  e, edit = use commit, but allow edits before making new commit
   #  m, mess = edit commit message without changing commit content
   #  p, fold = use commit
   #  b, base = checkout changeset and apply further changesets from there
--- a/tests/test-histedit-obsolete.t	Thu Dec 10 11:42:49 2020 -0500
+++ b/tests/test-histedit-obsolete.t	Thu Dec 10 13:15:15 2020 -0500
@@ -139,7 +139,7 @@
   #
   # Commands:
   #
-  #  e, edit = use commit, but stop for amending
+  #  e, edit = use commit, but allow edits before making new commit
   #  m, mess = edit commit message without changing commit content
   #  p, pick = use commit
   #  b, base = checkout changeset and apply further changesets from there
--- a/tests/test-histedit-outgoing.t	Thu Dec 10 11:42:49 2020 -0500
+++ b/tests/test-histedit-outgoing.t	Thu Dec 10 13:15:15 2020 -0500
@@ -49,7 +49,7 @@
   #
   # Commands:
   #
-  #  e, edit = use commit, but stop for amending
+  #  e, edit = use commit, but allow edits before making new commit
   #  m, mess = edit commit message without changing commit content
   #  p, pick = use commit
   #  b, base = checkout changeset and apply further changesets from there
@@ -84,7 +84,7 @@
   #
   # Commands:
   #
-  #  e, edit = use commit, but stop for amending
+  #  e, edit = use commit, but allow edits before making new commit
   #  m, mess = edit commit message without changing commit content
   #  p, pick = use commit
   #  b, base = checkout changeset and apply further changesets from there
@@ -111,7 +111,7 @@
   #
   # Commands:
   #
-  #  e, edit = use commit, but stop for amending
+  #  e, edit = use commit, but allow edits before making new commit
   #  m, mess = edit commit message without changing commit content
   #  p, pick = use commit
   #  b, base = checkout changeset and apply further changesets from there