Patchwork [2,of,2,STABLE] histedit: use better meta-variable names than VALUE in help text

login
register
mail settings
Submitter Anton Shestakov
Date March 9, 2015, 7:08 a.m.
Message ID <40c4b72ebd196ad186d4.1425884902@neuro>
Download mbox | patch
Permalink /patch/7948/
State Accepted
Delegated to: Pierre-Yves David
Headers show

Comments

Anton Shestakov - March 9, 2015, 7:08 a.m.
# HG changeset patch
# User Anton Shestakov <engored@ya.ru>
# Date 1425882737 -28800
#      Mon Mar 09 14:32:17 2015 +0800
# Node ID 40c4b72ebd196ad186d4dad464a602619b8103ff
# Parent  733ed7c4d9d466c8c8f901e3e323abf0311af394
histedit: use better meta-variable names than VALUE in help text

Before this change hg help histedit would use the default variable label:

    --commands VALUE
...
 -r --rev VALUE [+]

With this change the text will be in the usual help text style and a bit more
explanatory:

    --commands FILE
...
 -r --rev REV [+]
Ryan McElroy - March 9, 2015, 7:18 a.m.
On 3/9/2015 12:08 AM, Anton Shestakov wrote:
> # HG changeset patch
> # User Anton Shestakov <engored@ya.ru>
> # Date 1425882737 -28800
> #      Mon Mar 09 14:32:17 2015 +0800
> # Node ID 40c4b72ebd196ad186d4dad464a602619b8103ff
> # Parent  733ed7c4d9d466c8c8f901e3e323abf0311af394
> histedit: use better meta-variable names than VALUE in help text
>
> Before this change hg help histedit would use the default variable label:
>
>      --commands VALUE
> ...
>   -r --rev VALUE [+]
>
> With this change the text will be in the usual help text style and a bit more
> explanatory:
>
>      --commands FILE
> ...
>   -r --rev REV [+]
>
> diff --git a/hgext/histedit.py b/hgext/histedit.py
> --- a/hgext/histedit.py
> +++ b/hgext/histedit.py
> @@ -514,7 +514,7 @@ actiontable = {'p': pick,
>   
>   @command('histedit',
>       [('', 'commands', '',
> -      _('read history edits from the specified file')),
> +      _('read history edits from the specified file'), _('FILE')),
>        ('c', 'continue', False, _('continue an edit already in progress')),
>        ('', 'edit-plan', False, _('edit remaining actions list')),
>        ('k', 'keep', False,
> @@ -523,7 +523,7 @@ actiontable = {'p': pick,
>        ('o', 'outgoing', False, _('changesets not found in destination')),
>        ('f', 'force', False,
>         _('force outgoing even for unrelated repositories')),
> -     ('r', 'rev', [], _('first revision to be edited'))],
> +     ('r', 'rev', [], _('first revision to be edited'), _('REV'))],
>        _("ANCESTOR | --outgoing [URL]"))
>   def histedit(ui, repo, *freeargs, **opts):
>       """interactively edit changeset history
This series looks straightforward and good to me!
Matt Mackall - March 9, 2015, 6:27 p.m.
On Mon, 2015-03-09 at 15:08 +0800, Anton Shestakov wrote:
> # HG changeset patch
> # User Anton Shestakov <engored@ya.ru>
> # Date 1425882737 -28800
> #      Mon Mar 09 14:32:17 2015 +0800
> # Node ID 40c4b72ebd196ad186d4dad464a602619b8103ff
> # Parent  733ed7c4d9d466c8c8f901e3e323abf0311af394
> histedit: use better meta-variable names than VALUE in help text

These are queued for stable, thanks.

Patch

diff --git a/hgext/histedit.py b/hgext/histedit.py
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -514,7 +514,7 @@  actiontable = {'p': pick,
 
 @command('histedit',
     [('', 'commands', '',
-      _('read history edits from the specified file')),
+      _('read history edits from the specified file'), _('FILE')),
      ('c', 'continue', False, _('continue an edit already in progress')),
      ('', 'edit-plan', False, _('edit remaining actions list')),
      ('k', 'keep', False,
@@ -523,7 +523,7 @@  actiontable = {'p': pick,
      ('o', 'outgoing', False, _('changesets not found in destination')),
      ('f', 'force', False,
       _('force outgoing even for unrelated repositories')),
-     ('r', 'rev', [], _('first revision to be edited'))],
+     ('r', 'rev', [], _('first revision to be edited'), _('REV'))],
      _("ANCESTOR | --outgoing [URL]"))
 def histedit(ui, repo, *freeargs, **opts):
     """interactively edit changeset history