Patchwork [v2] bookmark: improve ambiguous documentation for rename

login
register
mail settings
Submitter timeless@mozdev.org
Date Sept. 4, 2015, 3:40 p.m.
Message ID <3bd05c042c132bbb0e0c.1441381227@waste.org>
Download mbox | patch
Permalink /patch/10408/
State Accepted
Headers show

Comments

timeless@mozdev.org - Sept. 4, 2015, 3:40 p.m.
# HG changeset patch
# User timeless@mozdev.org
# Date 1441380638 14400
#      Fri Sep 04 11:30:38 2015 -0400
# Node ID 3bd05c042c132bbb0e0c9155d57d4eaa223bf8cf
# Parent  7187f6e923d55cf6b7e6910d24645f303db671ee
bookmark: improve ambiguous documentation for rename
Augie Fackler - Sept. 8, 2015, 5:17 p.m.
On Fri, Sep 04, 2015 at 10:40:27AM -0500, timeless@mozdev.org wrote:
> # HG changeset patch
> # User timeless@mozdev.org
> # Date 1441380638 14400
> #      Fri Sep 04 11:30:38 2015 -0400
> # Node ID 3bd05c042c132bbb0e0c9155d57d4eaa223bf8cf
> # Parent  7187f6e923d55cf6b7e6910d24645f303db671ee
> bookmark: improve ambiguous documentation for rename

queued, thanks

>
> diff --git a/mercurial/commands.py b/mercurial/commands.py
> --- a/mercurial/commands.py
> +++ b/mercurial/commands.py
> @@ -875,7 +875,7 @@
>      [('f', 'force', False, _('force')),
>      ('r', 'rev', '', _('revision'), _('REV')),
>      ('d', 'delete', False, _('delete a given bookmark')),
> -    ('m', 'rename', '', _('rename a given bookmark'), _('NAME')),
> +    ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
>      ('i', 'inactive', False, _('mark a bookmark inactive')),
>      ] + formatteropts,
>      _('hg bookmarks [OPTIONS]... [NAME]...'))
> @@ -916,6 +916,10 @@
>
>            hg book -r .^ tested
>
> +      - rename bookmark turkey to dinner::
> +
> +          hg book -m turkey dinner
> +
>        - move the '@' bookmark from another branch::
>
>            hg book -f @
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@selenic.com
> https://selenic.com/mailman/listinfo/mercurial-devel

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -875,7 +875,7 @@ 
     [('f', 'force', False, _('force')),
     ('r', 'rev', '', _('revision'), _('REV')),
     ('d', 'delete', False, _('delete a given bookmark')),
-    ('m', 'rename', '', _('rename a given bookmark'), _('NAME')),
+    ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
     ('i', 'inactive', False, _('mark a bookmark inactive')),
     ] + formatteropts,
     _('hg bookmarks [OPTIONS]... [NAME]...'))
@@ -916,6 +916,10 @@ 
 
           hg book -r .^ tested
 
+      - rename bookmark turkey to dinner::
+
+          hg book -m turkey dinner
+
       - move the '@' bookmark from another branch::
 
           hg book -f @