[PATCH] histedit: improve discoverability of edit commit message

[Augie Fackler]

On Fri, Aug 28, 2015 at 02:51:00PM -0500, timeless at mozdev.org wrote:
> # HG changeset patch
> # User timeless at mozdev.org
> # Date 1440791436 14400
> #      Fri Aug 28 15:50:36 2015 -0400
> # Node ID ab423515c37a0e44b03d31e2f46d2de11e4c1caa
> # Parent  e7e7182564f60622bd98083e94af3da74d597eaa
> histedit: improve discoverability of edit commit message

queued, thanks

>
> diff --git a/hgext/histedit.py b/hgext/histedit.py
> --- a/hgext/histedit.py
> +++ b/hgext/histedit.py
> @@ -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 --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
> @@ -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 --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
> @@ -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 --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
> @@ -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 --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
> @@ -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 <<EOF | grep histedit
> 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
> @@ -51,7 +51,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
>    $ cd ..
> @@ -83,7 +83,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
>    $ cd ..
> @@ -107,7 +107,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
>
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> https://selenic.com/mailman/listinfo/mercurial-devel