[PATCH 1 of 2] bookmarks: clarify help for -i/--inactive

Kevin Bullock kbullock at ringworld.org
Thu Jan 19 16:24:49 CST 2012


On Jan 19, 2012, at 3:28 PM, Kevin Bullock wrote:

> # HG changeset patch
> # User Kevin Bullock <kbullock at ringworld.org>
> # Date 1327008034 21600
> # Branch stable
> # Node ID 51f042f4c3ff137f240b7a2bf4b512695aeef7c2
> # Parent  7ed056f1e97db94338c7ef1c49fd5dd49870f3e3
> bookmarks: clarify help for -i/--inactive
> 
> diff --git a/mercurial/commands.py b/mercurial/commands.py
> --- a/mercurial/commands.py
> +++ b/mercurial/commands.py
> @@ -725,7 +725,7 @@
>     ('r', 'rev', '', _('revision'), _('REV')),
>     ('d', 'delete', False, _('delete a given bookmark')),
>     ('m', 'rename', '', _('rename a given bookmark'), _('NAME')),
> -    ('i', 'inactive', False, _('do not mark a new bookmark active'))],
> +    ('i', 'inactive', False, _('do not mark a new bookmark active (without NAME, deactivate active bookmark)'))],

This broke test-check-code. Fixed and re-sent.

pacem in terris / мир / शान्ति / ‎‫سَلاَم‬ / 平和
Kevin R. Bullock

>     _('hg bookmarks [-f] [-d] [-i] [-m NAME] [-r REV] [NAME]'))
> def bookmark(ui, repo, mark=None, rev=None, force=False, delete=False,
>              rename=None, inactive=False):
> @@ -745,6 +745,11 @@
>     push` and :hg:`help pull`). This requires both the local and remote
>     repositories to support bookmarks. For versions prior to 1.8, this means
>     the bookmarks extension must be enabled.
> +
> +    With -i/--inactive, the new bookmark will not be made the active
> +    bookmark. If -r/--rev is given, the new bookmark will not be made
> +    active even if -i/--inactive is not given. If no NAME is given, the
> +    current active bookmark will be marked inactive.
>     '''
>     hexfn = ui.debugflag and hex or short
>     marks = repo._bookmarks

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20120119/77db5e58/attachment.html>


More information about the Mercurial-devel mailing list