Patchwork [6,of,7,v2] histedit: clarify modes

login
register
mail settings
Submitter timeless@mozdev.org
Date Dec. 28, 2015, 7:15 p.m.
Message ID <6eb6fa178ffafc7e1d5c.1451330102@waste.org>
Download mbox | patch
Permalink /patch/12376/
State Superseded
Commit bbb61a8314c3935c882d9d1d65335757ecd0c0f3
Headers show

Comments

timeless@mozdev.org - Dec. 28, 2015, 7:15 p.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1450852607 0
#      Wed Dec 23 06:36:47 2015 +0000
# Node ID 6eb6fa178ffafc7e1d5c2c89036877365fc6827e
# Parent  0ece2a738f11720b59666380adebd1810a3de77b
histedit: clarify modes

also fix terse command syntax
Augie Fackler - Jan. 5, 2016, 4:53 p.m.
On Mon, Dec 28, 2015 at 01:15:02PM -0600, timeless wrote:
> # HG changeset patch
> # User timeless <timeless@mozdev.org>
> # Date 1450852607 0
> #      Wed Dec 23 06:36:47 2015 +0000
> # Node ID 6eb6fa178ffafc7e1d5c2c89036877365fc6827e
> # Parent  0ece2a738f11720b59666380adebd1810a3de77b
> histedit: clarify modes

I like this, but it won't apply without patch 4, so please resend it.

>
> also fix terse command syntax
>
> diff --git a/hgext/histedit.py b/hgext/histedit.py
> --- a/hgext/histedit.py
> +++ b/hgext/histedit.py
> @@ -803,7 +803,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
>
> @@ -823,15 +823,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
>
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@selenic.com
> https://selenic.com/mailman/listinfo/mercurial-devel

Patch

diff --git a/hgext/histedit.py b/hgext/histedit.py
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -803,7 +803,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
 
@@ -823,15 +823,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