[PATCH] bookmarks: fix correct command in help text

Yuya Nishihara yuya at tcha.org
Sun Dec 16 00:01:45 CST 2012


On Sat, 15 Dec 2012 10:45:51 -0600, Kevin Bullock wrote:
> On 15 Dec 2012, at 7:15 AM, hokorobi.hokorobi at gmail.com wrote:
> > # HG changeset patch
> > # User hokorobi <hokorobi.hokorobi at gmail.com>
> > # Date 1355570183 -32400
> > # Branch stable
> > # Node ID 2a0abf67303de557d180992b7c962a3205f73c45
> > # Parent  ebc0fa067c07808b77f060e285d0c9d8d25c6750
> > bookmarks: fix correct command in help text
> > 
> > diff -r ebc0fa067c07 -r 2a0abf67303d mercurial/commands.py
> > --- a/mercurial/commands.py	Thu Dec 06 13:21:27 2012 -0600
> > +++ b/mercurial/commands.py	Sat Dec 15 20:16:23 2012 +0900
> > @@ -770,7 +770,7 @@
> >     possible to use :hg:`merge NAME` to merge from a given bookmark, and
> >     :hg:`update NAME` to update to a given bookmark.
> > 
> > -    You can use :hg:`bookmark NAME` to set a bookmark on the working
> > +    You can use :hg:`bookmarks NAME` to set a bookmark on the working
> 
> `hg bookmark NAME` will work just as well as `hg bookmarks NAME`, because of how hg's command parsing works, and it's more natural in English to write the former ('bookmark' is a verb, meaning "set a bookmark called NAME").

It isn't true if ui.strict = True.
If we prefer 'bookmark' over 'bookmarks', IMHO, we shoud provide it as
an alternative command name, i.e. 'bookmarks|bookmark'.

Regards,


More information about the Mercurial-devel mailing list