durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches.
REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9561 AFFECTED 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 CHANGE DETAILS diff --git a/tests/test-histedit-outgoing.t b/tests/test-histedit-outgoing.t --- a/tests/test-histedit-outgoing.t +++ b/tests/test-histedit-outgoing.t @@ -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 diff --git a/tests/test-histedit-obsolete.t b/tests/test-histedit-obsolete.t --- a/tests/test-histedit-obsolete.t +++ b/tests/test-histedit-obsolete.t @@ -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 diff --git a/tests/test-histedit-edit.t b/tests/test-histedit-edit.t --- a/tests/test-histedit-edit.t +++ b/tests/test-histedit-edit.t @@ -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 diff --git a/tests/test-histedit-commute.t b/tests/test-histedit-commute.t --- a/tests/test-histedit-commute.t +++ b/tests/test-histedit-commute.t @@ -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 diff --git a/tests/test-histedit-bookmark-motion.t b/tests/test-histedit-bookmark-motion.t --- a/tests/test-histedit-bookmark-motion.t +++ b/tests/test-histedit-bookmark-motion.t @@ -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 diff --git a/tests/test-histedit-arguments.t b/tests/test-histedit-arguments.t --- a/tests/test-histedit-arguments.t +++ b/tests/test-histedit-arguments.t @@ -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 diff --git a/hgext/histedit.py b/hgext/histedit.py --- a/hgext/histedit.py +++ b/hgext/histedit.py @@ -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 To: durin42, #hg-reviewers Cc: mercurial-patches, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
