Patchwork [5,of,7,v2] histedit: hide --outgoing warnings

login
register
mail settings
Submitter timeless@mozdev.org
Date Dec. 28, 2015, 7:15 p.m.
Message ID <0ece2a738f11720b5966.1451330101@waste.org>
Download mbox | patch
Permalink /patch/12375/
State Accepted
Headers show

Comments

timeless@mozdev.org - Dec. 28, 2015, 7:15 p.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1450826717 0
#      Tue Dec 22 23:25:17 2015 +0000
# Node ID 0ece2a738f11720b59666380adebd1810a3de77b
# Parent  7cc457bca6694793584a06c612e9b076129dce95
histedit: hide --outgoing warnings
Augie Fackler - Jan. 5, 2016, 4:53 p.m.
On Mon, Dec 28, 2015 at 01:15:01PM -0600, timeless wrote:
> # HG changeset patch
> # User timeless <timeless@mozdev.org>
> # Date 1450826717 0
> #      Tue Dec 22 23:25:17 2015 +0000
> # Node ID 0ece2a738f11720b59666380adebd1810a3de77b
> # Parent  7cc457bca6694793584a06c612e9b076129dce95
> histedit: hide --outgoing warnings

Patches 1,2,3, and 5 are queued, thanks.

>
> diff --git a/hgext/histedit.py b/hgext/histedit.py
> --- a/hgext/histedit.py
> +++ b/hgext/histedit.py
> @@ -833,14 +833,16 @@
>      destination repository. If URL of the destination is omitted, the
>      'default-push' (or 'default') path will be used.
>
> -    For safety, this command is also aborted if there are ambiguous
> -    outgoing revisions which may confuse users: for example, if there
> -    are multiple branches containing outgoing revisions.
> +    .. container:: verbose
>
> -    Use "min(outgoing() and ::.)" or similar revset specification
> -    instead of --outgoing to specify edit target revision exactly in
> -    such ambiguous situation. See :hg:`help revsets` for detail about
> -    selecting revisions.
> +       If you use --outgoing, this command will abort if there are ambiguous
> +       outgoing revisions. For example, if there are multiple branches
> +       containing outgoing revisions.
> +
> +       Use "min(outgoing() and ::.)" or similar revset specification
> +       instead of --outgoing to specify edit target revision exactly in
> +       such ambiguous situation. See :hg:`help revsets` for detail about
> +       selecting revisions.
>
>      .. 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
@@ -833,14 +833,16 @@ 
     destination repository. If URL of the destination is omitted, the
     'default-push' (or 'default') path will be used.
 
-    For safety, this command is also aborted if there are ambiguous
-    outgoing revisions which may confuse users: for example, if there
-    are multiple branches containing outgoing revisions.
+    .. container:: verbose
 
-    Use "min(outgoing() and ::.)" or similar revset specification
-    instead of --outgoing to specify edit target revision exactly in
-    such ambiguous situation. See :hg:`help revsets` for detail about
-    selecting revisions.
+       If you use --outgoing, this command will abort if there are ambiguous
+       outgoing revisions. For example, if there are multiple branches
+       containing outgoing revisions.
+
+       Use "min(outgoing() and ::.)" or similar revset specification
+       instead of --outgoing to specify edit target revision exactly in
+       such ambiguous situation. See :hg:`help revsets` for detail about
+       selecting revisions.
 
     .. container:: verbose