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

[Matt Mackall]

On Thu, 2012-01-19 at 16:10 -0600, Kevin Bullock wrote:
> # HG changeset patch
> # User Kevin Bullock <kbullock at ringworld.org>
> # Date 1327010701 21600
> # Branch stable
> # Node ID d674b59e76ef18798c9e59b5b574150999430852
> # Parent  7ed056f1e97db94338c7ef1c49fd5dd49870f3e3
> bookmarks: clarify help for -i/--inactive

I've queue the second hunk of this, as I don't like making the option
descriptions this long.

> diff --git a/mercurial/commands.py b/mercurial/commands.py
> --- a/mercurial/commands.py
> +++ b/mercurial/commands.py
> @@ -725,7 +725,8 @@
>      ('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)'))],
>      _('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 +746,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
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel


-- 
Mathematics is the supreme nostalgia of our time.