# HG changeset patch # User timeless@mozdev.org # Date 1440791436 14400 # Node ID 5706d130ec1688d984857d26eef39944613cece1 # Parent ab66c1dee405aca0c51b8f76eab255d805c194d7 histedit: improve discoverability of edit commit message diff -r ab66c1dee405 -r 5706d130ec16 hgext/histedit.py --- a/hgext/histedit.py Thu Aug 27 17:57:33 2015 -0700 +++ b/hgext/histedit.py Fri Aug 28 15:50:36 2015 -0400 @@ -38,7 +38,7 @@ # f, fold = use commit, but combine it with the one above # r, roll = like fold, but discard this commit's description # d, drop = remove commit from history - # m, mess = edit message without changing commit content + # m, mess = edit commit message without changing commit content # In this file, lines beginning with ``#`` are ignored. You must specify a rule @@ -60,7 +60,7 @@ # f, fold = use commit, but combine it with the one above # r, roll = like fold, but discard this commit's description # d, drop = remove commit from history - # m, mess = edit message without changing commit content + # m, mess = edit commit message without changing commit content # At which point you close the editor and ``histedit`` starts working. When you @@ -198,7 +198,7 @@ # f, fold = use commit, but combine it with the one above # r, roll = like fold, but discard this commit's description # d, drop = remove commit from history -# m, mess = edit message without changing commit content +# m, mess = edit commit message without changing commit content # """) diff -r ab66c1dee405 -r 5706d130ec16 tests/test-histedit-arguments.t --- a/tests/test-histedit-arguments.t Thu Aug 27 17:57:33 2015 -0700 +++ b/tests/test-histedit-arguments.t Fri Aug 28 15:50:36 2015 -0400 @@ -69,7 +69,7 @@ # f, fold = use commit, but combine it with the one above # r, roll = like fold, but discard this commit's description # d, drop = remove commit from history - # m, mess = edit message without changing commit content + # m, mess = edit commit message without changing commit content # 0 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -292,7 +292,7 @@ # f, fold = use commit, but combine it with the one above # r, roll = like fold, but discard this commit's description # d, drop = remove commit from history - # m, mess = edit message without changing commit content + # m, mess = edit commit message without changing commit content # 0 files updated, 0 files merged, 0 files removed, 0 files unresolved diff -r ab66c1dee405 -r 5706d130ec16 tests/test-histedit-bookmark-motion.t --- a/tests/test-histedit-bookmark-motion.t Thu Aug 27 17:57:33 2015 -0700 +++ b/tests/test-histedit-bookmark-motion.t Fri Aug 28 15:50:36 2015 -0400 @@ -75,7 +75,7 @@ # f, fold = use commit, but combine it with the one above # r, roll = like fold, but discard this commit's description # d, drop = remove commit from history - # m, mess = edit message without changing commit content + # m, mess = edit commit message without changing commit content # 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg histedit 1 --commands - --verbose << EOF | grep histedit @@ -136,7 +136,7 @@ # f, fold = use commit, but combine it with the one above # r, roll = like fold, but discard this commit's description # d, drop = remove commit from history - # m, mess = edit message without changing commit content + # m, mess = edit commit message without changing commit content # 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg histedit 1 --commands - --verbose << EOF | grep histedit diff -r ab66c1dee405 -r 5706d130ec16 tests/test-histedit-commute.t --- a/tests/test-histedit-commute.t Thu Aug 27 17:57:33 2015 -0700 +++ b/tests/test-histedit-commute.t Fri Aug 28 15:50:36 2015 -0400 @@ -69,7 +69,7 @@ # f, fold = use commit, but combine it with the one above # r, roll = like fold, but discard this commit's description # d, drop = remove commit from history - # m, mess = edit message without changing commit content + # m, mess = edit commit message without changing commit content # 0 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -347,7 +347,7 @@ # f, fold = use commit, but combine it with the one above # r, roll = like fold, but discard this commit's description # d, drop = remove commit from history - # m, mess = edit message without changing commit content + # m, mess = edit commit message without changing commit content # 0 files updated, 0 files merged, 0 files removed, 0 files unresolved diff -r ab66c1dee405 -r 5706d130ec16 tests/test-histedit-obsolete.t --- a/tests/test-histedit-obsolete.t Thu Aug 27 17:57:33 2015 -0700 +++ b/tests/test-histedit-obsolete.t Fri Aug 28 15:50:36 2015 -0400 @@ -54,7 +54,7 @@ # f, fold = use commit, but combine it with the one above # r, roll = like fold, but discard this commit's description # d, drop = remove commit from history - # m, mess = edit message without changing commit content + # m, mess = edit commit message without changing commit content # 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg histedit 1 --commands - --verbose <