[PATCH 3 of 3] help/phases: make individual examples referencable

Pierre-Yves David pierre-yves.david at ens-lyon.org
Wed Sep 9 03:01:23 CDT 2015



On 09/08/2015 06:09 PM, timeless at mozdev.org wrote:
> # HG changeset patch
> # User timeless at mozdev.org
> # Date 1441749501 14400
> #      Tue Sep 08 17:58:21 2015 -0400
> # Node ID 0eb1437be53909c01b6ddca86cfe379f33bc937c
> # Parent  b8b8222bb2dc08088dd10a0191f2bcbaf94ecc40
> help/phases: make individual examples referencable
>
> reference phases.forcetodraft

This seems an improvement, but the result is a bit big and probably 
requires discussion. I've left review of patch 3 for another day.


>
> diff --git a/hgext/rebase.py b/hgext/rebase.py
> --- a/hgext/rebase.py
> +++ b/hgext/rebase.py
> @@ -872,7 +872,7 @@
>       if immutable:
>           repo.ui.warn(_("warning: can't clean up public changesets %s\n")
>                        % ', '.join(str(repo[r]) for r in immutable),
> -                     hint=_('see "hg help phases" for details'))
> +                     hint=_('see "hg help phases.forcetodraft" for details'))
>           cleanup = False
>
>       descendants = set()
> diff --git a/mercurial/help/phases.txt b/mercurial/help/phases.txt
> --- a/mercurial/help/phases.txt
> +++ b/mercurial/help/phases.txt
> @@ -71,24 +71,29 @@
>   Examples
>   ========
>
> - - list changesets in draft or secret phase::
> +   listnotpublic
> +       list changesets in draft or secret phase:
>
> -     hg log -r "not public()"
> +         hg log -r "not public()"
>
> - - change all secret changesets to draft::
> +   todraft
> +       change all secret changesets to draft:
>
> -     hg phase --draft "secret()"
> +         hg phase --draft "secret()"
>
> - - forcibly move the current changeset and descendants from public to draft::
> +   forcemove
> +       forcibly move the current changeset and descendants from public to draft:
>
> -     hg phase --force --draft .
> +         hg phase --force --draft .
>
> - - show a list of changeset revision and phase::
> +   list
> +       show a list of changeset revision and phase:
>
> -     hg log --template "{rev} {phase}\n"
> +         hg log --template "{rev} {phase}\n"
>
> - - resynchronize draft changesets relative to a remote repository::
> +   forcetodraft
> +       resynchronize draft changesets relative to a remote repository:
>
> -     hg phase -fd "outgoing(URL)"
> +         hg phase -fd "outgoing(URL)"
>
>   See :hg:`help phase` for more information on manually manipulating phases.
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> https://selenic.com/mailman/listinfo/mercurial-devel
>

-- 
Pierre-Yves David


More information about the Mercurial-devel mailing list