Patchwork [3,of,5] help: merge the various operator sections of revsets, filesets and templates

login
register
mail settings
Submitter Matt Harbison
Date Jan. 8, 2017, 7:55 p.m.
Message ID <88f40d1242b598f22a88.1483905341@Envy>
Download mbox | patch
Permalink /patch/18139/
State Accepted
Headers show

Comments

Matt Harbison - Jan. 8, 2017, 7:55 p.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1483895110 18000
#      Sun Jan 08 12:05:10 2017 -0500
# Node ID 88f40d1242b598f22a886613425477476ad93819
# Parent  c83a2d1663303dff22554a4d9f0f19770c9c3cc8
help: merge the various operator sections of revsets, filesets and templates

Having sections for specific operator types assumes the user already knows what
type of operators are supported.  By having a common heading, the user can
simply lookup help for "(revsets|filesets|templates).operators".

Patch

diff --git a/mercurial/help/filesets.txt b/mercurial/help/filesets.txt
--- a/mercurial/help/filesets.txt
+++ b/mercurial/help/filesets.txt
@@ -17,17 +17,14 @@ 
 
 See also :hg:`help patterns`.
 
-Prefix
-======
+Operators
+=========
 
 There is a single prefix operator:
 
 ``not x``
   Files not in x. Short form is ``! x``.
 
-Infix
-=====
-
 These are the supported infix operators:
 
 ``x and y``
diff --git a/mercurial/help/revsets.txt b/mercurial/help/revsets.txt
--- a/mercurial/help/revsets.txt
+++ b/mercurial/help/revsets.txt
@@ -12,17 +12,14 @@ 
 e.g., ``\n`` is interpreted as a newline. To prevent them from being
 interpreted, strings can be prefixed with ``r``, e.g. ``r'...'``.
 
-Prefix
-======
+Operators
+=========
 
 There is a single prefix operator:
 
 ``not x``
   Changesets not in x. Short form is ``! x``.
 
-Infix
-=====
-
 These are the supported infix operators:
 
 ``x::y``
@@ -77,9 +74,6 @@ 
     in this case. This matches against all of "issue 1234", "issue:1234",
     "issue1234" and "bug(1234)".
 
-Postfix
-=======
-
 There is a single postfix operator:
 
 ``x^``
diff --git a/mercurial/help/templates.txt b/mercurial/help/templates.txt
--- a/mercurial/help/templates.txt
+++ b/mercurial/help/templates.txt
@@ -52,8 +52,8 @@ 
 
 .. functionsmarker
 
-Infix
-=====
+Operators
+=========
 
 We provide a limited set of infix arithmetic operations on integers::