Patchwork [2,of,3] help: move revsets.## documentation into infix section

login
register
mail settings
Submitter timeless
Date Sept. 21, 2016, 5:25 p.m.
Message ID <2ed8375eb6ca1fe2f00f.1474478710@gcc2-power8.osuosl.org>
Download mbox | patch
Permalink /patch/16734/
State Accepted
Headers show

Comments

timeless - Sept. 21, 2016, 5:25 p.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1474478585 0
#      Wed Sep 21 17:23:05 2016 +0000
# Node ID 2ed8375eb6ca1fe2f00fac49f1b9c79d705a522a
# Parent  40410e96c0a2de344edd5a25a7d996731124ee45
# Available At https://bitbucket.org/timeless/mercurial-crew
#              hg pull https://bitbucket.org/timeless/mercurial-crew -r 2ed8375eb6ca
help: move revsets.## documentation into infix section

Patch

diff -r 40410e96c0a2 -r 2ed8375eb6ca mercurial/help/revsets.txt
--- a/mercurial/help/revsets.txt	Wed Sep 21 16:33:37 2016 +0000
+++ b/mercurial/help/revsets.txt	Wed Sep 21 17:23:05 2016 +0000
@@ -55,6 +55,22 @@ 
 ``x~n``
   The nth first ancestor of x; ``x~0`` is x; ``x~3`` is ``x^^^``.
 
+``x ## y``
+  Concatenate strings and identifiers into one string.
+
+  All other prefix, infix and postfix operators have lower priority than
+  ``##``. For example, ``a1 ## a2~2`` is equivalent to ``(a1 ## a2)~2``.
+
+  For example::
+
+    [revsetalias]
+    issue(a1) = grep(r'\bissue[ :]?' ## a1 ## r'\b|\bbug\(' ## a1 ## r'\)')
+
+    ``issue(1234)`` is equivalent to
+    ``grep(r'\bissue[ :]?1234\b|\bbug\(1234\)')``
+    in this case. This matches against all of "issue 1234", "issue:1234",
+    "issue1234" and "bug(1234)".
+
 There is a single postfix operator:
 
 ``x^``
@@ -86,18 +102,6 @@ 
 defines three aliases, ``h``, ``d``, and ``rs``. ``rs(0:tip, author)`` is
 exactly equivalent to ``reverse(sort(0:tip, author))``.
 
-An infix operator ``##`` can concatenate strings and identifiers into
-one string. For example::
-
-  [revsetalias]
-  issue(a1) = grep(r'\bissue[ :]?' ## a1 ## r'\b|\bbug\(' ## a1 ## r'\)')
-
-``issue(1234)`` is equivalent to ``grep(r'\bissue[ :]?1234\b|\bbug\(1234\)')``
-in this case. This matches against all of "issue 1234", "issue:1234",
-"issue1234" and "bug(1234)".
-
-All other prefix, infix and postfix operators have lower priority than
-``##``. For example, ``a1 ## a2~2`` is equivalent to ``(a1 ## a2)~2``.
 
 Command line equivalents for :hg:`log`::