Patchwork [3,of,4] histedit: clarify modes

login
register
mail settings
Submitter timeless@mozdev.org
Date Jan. 10, 2016, 7:01 p.m.
Message ID <1532327bebd926fa7ade.1452452482@waste.org>
Download mbox | patch
Permalink /patch/12638/
State Accepted
Headers show

Comments

timeless@mozdev.org - Jan. 10, 2016, 7:01 p.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1450852607 0
#      Wed Dec 23 06:36:47 2015 +0000
# Node ID 1532327bebd926fa7ade9c84da7392ca08777ec7
# Parent  9c11ec13ff85be280b72b391fc165413ce960ec3
histedit: clarify modes

also fix terse command syntax

Patch

diff --git a/hgext/histedit.py b/hgext/histedit.py
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -867,7 +867,7 @@ 
      ('f', 'force', False,
       _('force outgoing even for unrelated repositories')),
      ('r', 'rev', [], _('first revision to be edited'), _('REV'))],
-     _("[ANCESTOR] | --outgoing [URL]"))
+     _("[OPTIONS] ([ANCESTOR] | --outgoing [URL])"))
 def histedit(ui, repo, *freeargs, **opts):
     """interactively edit changeset history
 
@@ -887,15 +887,18 @@ 
 
     - `edit` to edit this changeset
 
-    The value from the "histedit.defaultrev" config option is used as a
-    revset to select the base revision when ANCESTOR is not specified.
-    The first revision returned by the revset is used. By default, this
-    selects the editable history that is unique to the ancestry of the
-    working directory.
+    There are a number of ways to select the root changset::
 
-    With --outgoing, this edits changesets not found in the
-    destination repository. If URL of the destination is omitted, the
-    'default-push' (or 'default') path will be used.
+    - Specify ANCESTOR directly
+
+    - Use --outgoing -- it will be the first linear changeset not
+      included in destination. (See :hg:"help default-push")
+
+    - Otherwise, the value from the "histedit.defaultrev" config option
+      is used as a revset to select the base revision when ANCESTOR is not
+      specified. The first revision returned by the revset is used. By
+      default, this selects the editable history that is unique to the
+      ancestry of the working directory.
 
     .. container:: verbose