[PATCH] Modify description of fold command in editor window

Augie Fackler raf at durin42.com
Fri Feb 14 10:50:15 CST 2014


On Fri, Feb 14, 2014 at 03:53:08AM +0000, Adrian Zgorzalek wrote:
> # HG changeset patch
> # User Adrian Zgorzałek <adek at fb.com>
> # Date 1392343535 28800
> #      Thu Feb 13 18:05:35 2014 -0800
> # Node ID 119950eb09d71e031ebaf28d711693e4980916a7
> # Parent  0f1ef9e9e904c18f1ac96aef3a0e0d3aa5f1190c
> histedit: clarify description of fold command

Queued.

Kind of a bummer that you didn't use patchbomb here, because the
subject line doesn't include the "histedit" bit.

>
> N and (N-1) didn't add any information to description of fold.
> More useful is refering to the commit list as it is displayed in editor.
>
> diff -r 0f1ef9e9e904 -r 119950eb09d7 hgext/histedit.py
> --- a/hgext/histedit.py Thu Feb 06 15:56:25 2014 -0800
> +++ b/hgext/histedit.py Thu Feb 13 18:05:35 2014 -0800
> @@ -30,10 +30,12 @@
>
>   # Edit history between c561b4e977df and 7c2fd3b9020c
>   #
> + # Commits are listed from least to most recent
> + #
>   # Commands:
>   #  p, pick = use commit
>   #  e, edit = use commit, but stop for amending
> - #  f, fold = use commit, but fold into previous commit (combines N and N-1)
> + #  f, fold = use commit, but fold into previous commit (combines this commit with the one above)
>   #  d, drop = remove commit from history
>   #  m, mess = edit message without changing commit content
>   #
> @@ -49,10 +51,12 @@
>
>   # Edit history between c561b4e977df and 7c2fd3b9020c
>   #
> + # Commits are listed from least to most recent
> + #
>   # Commands:
>   #  p, pick = use commit
>   #  e, edit = use commit, but stop for amending
> - #  f, fold = use commit, but fold into previous commit (combines N and N-1)
> + #  f, fold = use commit, but fold into previous commit (combines this commit with the one above)
>   #  d, drop = remove commit from history
>   #  m, mess = edit message without changing commit content
>   #
> @@ -170,10 +174,12 @@
>  # i18n: command names and abbreviations must remain untranslated
>  editcomment = _("""# Edit history between %s and %s
>  #
> +# Commits are listed from least to most recent
> +#
>  # Commands:
>  #  p, pick = use commit
>  #  e, edit = use commit, but stop for amending
> -#  f, fold = use commit, but fold into previous commit (combines N and N-1)
> +#  f, fold = use commit, but fold into previous commit (combines this commit with the one above)
>  #  d, drop = remove commit from history
>  #  m, mess = edit message without changing commit content
>  #
> diff -r 0f1ef9e9e904 -r 119950eb09d7 tests/test-histedit-arguments.t
> --- a/tests/test-histedit-arguments.t Thu Feb 06 15:56:25 2014 -0800
> +++ b/tests/test-histedit-arguments.t Thu Feb 13 18:05:35 2014 -0800
> @@ -51,10 +51,12 @@
>
>    # Edit history between eb57da33312f and 08d98a8350f3
>    #
> +  # Commits are listed from least to most recent
> +  #
>    # Commands:
>    #  p, pick = use commit
>    #  e, edit = use commit, but stop for amending
> -  #  f, fold = use commit, but fold into previous commit (combines N and N-1)
> +  #  f, fold = use commit, but fold into previous commit (combines this commit with the one above)
>    #  d, drop = remove commit from history
>    #  m, mess = edit message without changing commit content
>    #
> diff -r 0f1ef9e9e904 -r 119950eb09d7 tests/test-histedit-bookmark-motion.t
> --- a/tests/test-histedit-bookmark-motion.t Thu Feb 06 15:56:25 2014 -0800
> +++ b/tests/test-histedit-bookmark-motion.t Thu Feb 13 18:05:35 2014 -0800
> @@ -67,10 +67,12 @@
>
>    # Edit history between d2ae7f538514 and 652413bf663e
>    #
> +  # Commits are listed from least to most recent
> +  #
>    # Commands:
>    #  p, pick = use commit
>    #  e, edit = use commit, but stop for amending
> -  #  f, fold = use commit, but fold into previous commit (combines N and N-1)
> +  #  f, fold = use commit, but fold into previous commit (combines this commit with the one above)
>    #  d, drop = remove commit from history
>    #  m, mess = edit message without changing commit content
>    #
> @@ -125,10 +127,12 @@
>
>    # Edit history between b346ab9a313d and cacdfd884a93
>    #
> +  # Commits are listed from least to most recent
> +  #
>    # Commands:
>    #  p, pick = use commit
>    #  e, edit = use commit, but stop for amending
> -  #  f, fold = use commit, but fold into previous commit (combines N and N-1)
> +  #  f, fold = use commit, but fold into previous commit (combines this commit with the one above)
>    #  d, drop = remove commit from history
>    #  m, mess = edit message without changing commit content
>    #
> diff -r 0f1ef9e9e904 -r 119950eb09d7 tests/test-histedit-commute.t
> --- a/tests/test-histedit-commute.t Thu Feb 06 15:56:25 2014 -0800
> +++ b/tests/test-histedit-commute.t Thu Feb 13 18:05:35 2014 -0800
> @@ -61,10 +61,12 @@
>
>    # Edit history between 177f92b77385 and 652413bf663e
>    #
> +  # Commits are listed from least to most recent
> +  #
>    # Commands:
>    #  p, pick = use commit
>    #  e, edit = use commit, but stop for amending
> -  #  f, fold = use commit, but fold into previous commit (combines N and N-1)
> +  #  f, fold = use commit, but fold into previous commit (combines this commit with the one above)
>    #  d, drop = remove commit from history
>    #  m, mess = edit message without changing commit content
>    #
> diff -r 0f1ef9e9e904 -r 119950eb09d7 tests/test-histedit-obsolete.t
> --- a/tests/test-histedit-obsolete.t Thu Feb 06 15:56:25 2014 -0800
> +++ b/tests/test-histedit-obsolete.t Thu Feb 13 18:05:35 2014 -0800
> @@ -51,10 +51,12 @@
>
>    # Edit history between d2ae7f538514 and 652413bf663e
>    #
> +  # Commits are listed from least to most recent
> +  #
>    # Commands:
>    #  p, pick = use commit
>    #  e, edit = use commit, but stop for amending
> -  #  f, fold = use commit, but fold into previous commit (combines N and N-1)
> +  #  f, fold = use commit, but fold into previous commit (combines this commit with the one above)
>    #  d, drop = remove commit from history
>    #  m, mess = edit message without changing commit content
>    #
> diff -r 0f1ef9e9e904 -r 119950eb09d7 tests/test-histedit-outgoing.t
> --- a/tests/test-histedit-outgoing.t Thu Feb 06 15:56:25 2014 -0800
> +++ b/tests/test-histedit-outgoing.t Thu Feb 13 18:05:35 2014 -0800
> @@ -43,10 +43,12 @@
>
>    # Edit history between 055a42cdd887 and 652413bf663e
>    #
> +  # Commits are listed from least to most recent
> +  #
>    # Commands:
>    #  p, pick = use commit
>    #  e, edit = use commit, but stop for amending
> -  #  f, fold = use commit, but fold into previous commit (combines N and N-1)
> +  #  f, fold = use commit, but fold into previous commit (combines this commit with the one above)
>    #  d, drop = remove commit from history
>    #  m, mess = edit message without changing commit content
>    #
> @@ -72,10 +74,12 @@
>
>    # Edit history between 2a4042b45417 and 51281e65ba79
>    #
> +  # Commits are listed from least to most recent
> +  #
>    # Commands:
>    #  p, pick = use commit
>    #  e, edit = use commit, but stop for amending
> -  #  f, fold = use commit, but fold into previous commit (combines N and N-1)
> +  #  f, fold = use commit, but fold into previous commit (combines this commit with the one above)
>    #  d, drop = remove commit from history
>    #  m, mess = edit message without changing commit content
>    #
> @@ -93,10 +97,12 @@
>
>    # Edit history between f26599ee3441 and f26599ee3441
>    #
> +  # Commits are listed from least to most recent
> +  #
>    # Commands:
>    #  p, pick = use commit
>    #  e, edit = use commit, but stop for amending
> -  #  f, fold = use commit, but fold into previous commit (combines N and N-1)
> +  #  f, fold = use commit, but fold into previous commit (combines this commit with the one above)
>    #  d, drop = remove commit from history
>    #  m, mess = edit message without changing commit content
>    #
>

> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel


More information about the Mercurial-devel mailing list