Patchwork [3,of,3] rebase: RFC switch help from -x/--extended to --extended

login
register
mail settings
Submitter timeless@mozdev.org
Date Dec. 18, 2015, 5:35 p.m.
Message ID <26d7a0c34b00ec5c5e07.1450460119@waste.org>
Download mbox | patch
Permalink /patch/12157/
State Rejected
Headers show

Comments

timeless@mozdev.org - Dec. 18, 2015, 5:35 p.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1450460052 0
#      Fri Dec 18 17:34:12 2015 +0000
# Node ID 26d7a0c34b00ec5c5e079fa3255cf06bb05db1a4
# Parent  9bfe5ae1c2cb79342258bebdb4f555a0c175546e
rebase: RFC switch help from -x/--extended to --extended

This is an almost global replace.
Instances of -x short flags in samples should be retained,
but long forms should be favored in prose.

-- I have excluded this from the cleanup, because I am in the middle of rewriting
the help content for rebase, and this churn is not really worth it right now,
since much of the content will go away.

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -118,7 +118,7 @@ 
     In its default configuration, Mercurial will prevent you from
     rebasing published changes. See :hg:`help phases` for details.
 
-    If you don't specify a destination changeset (``-d/--dest``),
+    If you don't specify a destination changeset (``--dest``),
     rebase uses the current branch tip as the destination. (The
     destination changeset is not modified by rebasing, but new
     changesets are added as its descendants.)
@@ -126,13 +126,13 @@ 
     You can specify which changesets to rebase in two ways: as a
     "source" changeset or as a "base" changeset. Both are shorthand
     for a topologically related set of changesets (the "source
-    branch"). If you specify source (``-s/--source``), rebase will
+    branch"). If you specify source (``--source``), rebase will
     rebase that changeset and all of its descendants onto dest. If you
-    specify base (``-b/--base``), rebase will select ancestors of base
+    specify base (``--base``), rebase will select ancestors of base
     back to but not including the common ancestor with dest. Thus,
-    ``-b`` is less precise but more convenient than ``-s``: you can
+    ``--base`` is less precise but more convenient than ``--source``: you can
     specify any changeset in the source branch, and rebase will select
-    the whole branch. If you specify neither ``-s`` nor ``-b``, rebase
+    the whole branch. If you specify neither ``--source`` nor ``--base``, rebase
     uses the parent of the working directory as the base.
 
     For advanced usage, a third way is available through the ``--rev``