Patchwork [4,of,7] help: document about "resolve" template keywords

login
register
mail settings
Submitter Yuya Nishihara
Date Oct. 7, 2018, 2:32 p.m.
Message ID <d1b6f5e6f40350df11ec.1538922747@mimosa>
Download mbox | patch
Permalink /patch/35536/
State New
Headers show

Comments

Yuya Nishihara - Oct. 7, 2018, 2:32 p.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1538921100 -32400
#      Sun Oct 07 23:05:00 2018 +0900
# Node ID d1b6f5e6f40350df11ecd25c70c724ab8082ce96
# Parent  df05cead5b1b6b06939f20790a43b696189a8012
help: document about "resolve" template keywords
Gregory Szorc - Oct. 11, 2018, 8:38 a.m.
On Sun, Oct 7, 2018 at 4:40 PM Yuya Nishihara <yuya@tcha.org> wrote:

> # HG changeset patch
> # User Yuya Nishihara <yuya@tcha.org>
> # Date 1538921100 -32400
> #      Sun Oct 07 23:05:00 2018 +0900
> # Node ID d1b6f5e6f40350df11ecd25c70c724ab8082ce96
> # Parent  df05cead5b1b6b06939f20790a43b696189a8012
> help: document about "resolve" template keywords
>
> diff --git a/mercurial/commands.py b/mercurial/commands.py
> --- a/mercurial/commands.py
> +++ b/mercurial/commands.py
> @@ -4678,6 +4678,16 @@ def resolve(ui, repo, *pats, **opts):
>         conflicts. You must use :hg:`resolve -m ...` before you can
>         commit after a conflicting merge.
>
> +    .. container:: verbose
> +
> +      Template:
> +
> +      The following keywords are supported in addition to the common
> template
> +      keywords and functions. See also :hg:`help templates`.
> +
> +      :mergestatus: String. Character denoting merge conflicts, ``U`` or
> ``R``.
> +      :path:    String. Repository-absolute path of the file.
>

The indentation here seems inconsistent with other patches. Is this
intentional?


> +
>      Returns 0 on success, 1 if any files fail a resolve attempt.
>      """
>
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
>
Yuya Nishihara - Oct. 11, 2018, 2:48 p.m.
On Thu, 11 Oct 2018 10:38:31 +0200, Gregory Szorc wrote:
> On Sun, Oct 7, 2018 at 4:40 PM Yuya Nishihara <yuya@tcha.org> wrote:
> 
> > # HG changeset patch
> > # User Yuya Nishihara <yuya@tcha.org>
> > # Date 1538921100 -32400
> > #      Sun Oct 07 23:05:00 2018 +0900
> > # Node ID d1b6f5e6f40350df11ecd25c70c724ab8082ce96
> > # Parent  df05cead5b1b6b06939f20790a43b696189a8012
> > help: document about "resolve" template keywords
> >
> > diff --git a/mercurial/commands.py b/mercurial/commands.py
> > --- a/mercurial/commands.py
> > +++ b/mercurial/commands.py
> > @@ -4678,6 +4678,16 @@ def resolve(ui, repo, *pats, **opts):
> >         conflicts. You must use :hg:`resolve -m ...` before you can
> >         commit after a conflicting merge.
> >
> > +    .. container:: verbose
> > +
> > +      Template:
> > +
> > +      The following keywords are supported in addition to the common
> > template
> > +      keywords and functions. See also :hg:`help templates`.
> > +
> > +      :mergestatus: String. Character denoting merge conflicts, ``U`` or
> > ``R``.
> > +      :path:    String. Repository-absolute path of the file.
> >
> 
> The indentation here seems inconsistent with other patches. Is this
> intentional?

:mergestatus: is slightly longer word. I just left the shorter terms at the
same indent level.

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -4678,6 +4678,16 @@  def resolve(ui, repo, *pats, **opts):
        conflicts. You must use :hg:`resolve -m ...` before you can
        commit after a conflicting merge.
 
+    .. container:: verbose
+
+      Template:
+
+      The following keywords are supported in addition to the common template
+      keywords and functions. See also :hg:`help templates`.
+
+      :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
+      :path:    String. Repository-absolute path of the file.
+
     Returns 0 on success, 1 if any files fail a resolve attempt.
     """