Patchwork [3,of,7,v2] histedit: report the unacceptable changeset

login
register
mail settings
Submitter timeless@mozdev.org
Date Dec. 28, 2015, 7:14 p.m.
Message ID <0eb27264c430c5151c98.1451330099@waste.org>
Download mbox | patch
Permalink /patch/12373/
State Superseded
Commit bb810c8b3ecaff986da3e2a1268e089cda4d7c8b
Headers show

Comments

timeless@mozdev.org - Dec. 28, 2015, 7:14 p.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1450856265 0
#      Wed Dec 23 07:37:45 2015 +0000
# Node ID 0eb27264c430c5151c98262d181d160c60e80177
# Parent  ba6150ed548d370c0c38e277cbc19afb5df05cba
histedit: report the unacceptable changeset
Augie Fackler - Jan. 5, 2016, 4:55 p.m.
On Mon, Dec 28, 2015 at 01:14:59PM -0600, timeless wrote:
> # HG changeset patch
> # User timeless <timeless@mozdev.org>
> # Date 1450856265 0
> #      Wed Dec 23 07:37:45 2015 +0000
> # Node ID 0eb27264c430c5151c98262d181d160c60e80177
> # Parent  ba6150ed548d370c0c38e277cbc19afb5df05cba
> histedit: report the unacceptable changeset

This one failed to apply (probably conflicted with another of your
series?) so could you resend it too?

>
> diff --git a/hgext/histedit.py b/hgext/histedit.py
> --- a/hgext/histedit.py
> +++ b/hgext/histedit.py
> @@ -1229,12 +1229,14 @@
>              ha = node.hex(nodetoverify)
>              if _constraints.noother in constraints and ha not in expected:
>                  raise error.Abort(
> -                    _('may not use "%s" with changesets '
> -                      'other than the ones listed') % action.verb)
> +                    _('%s "%s" changeset was not a candidate')
> +                     % (action.verb, node.short(ha)),
> +                    hint=_('only use listed changesets'))
>              if _constraints.forceother in constraints and ha in expected:
>                  raise error.Abort(
> -                    _('may not use "%s" with changesets '
> -                      'within the edited list') % action.verb)
> +                    _('%s "%s" changeset was not an edited list candidate')
> +                     % (action.verb, node.short(ha)),
> +                    hint=_('only use listed changesets'))
>              if _constraints.noduplicates in constraints and ha in seen:
>                  raise error.Abort(_('duplicated command for changeset %s') %
>                          ha[:12])
> diff --git a/tests/test-histedit-arguments.t b/tests/test-histedit-arguments.t
> --- a/tests/test-histedit-arguments.t
> +++ b/tests/test-histedit-arguments.t
> @@ -170,7 +170,8 @@
>    > pick c8e68270e35a 3 four
>    > pick 08d98a8350f3 4 five
>    > EOF
> -  abort: may not use "pick" with changesets other than the ones listed
> +  abort: pick "363035386362" changeset was not a candidate
> +  (only use listed changesets)
>    [255]
>
>  Test malformed line
> diff --git a/tests/test-histedit-base.t b/tests/test-histedit-base.t
> --- a/tests/test-histedit-base.t
> +++ b/tests/test-histedit-base.t
> @@ -231,7 +231,8 @@
>    > base d273e35dcdf2 B
>    > pick b2f90fd8aa85 I
>    > EOF
> -  abort: may not use "base" with changesets within the edited list
> +  abort: base "643237336533" changeset was not an edited list candidate
> +  (only use listed changesets)
>
>    $ hg --config experimental.histeditng=False histedit 5 --commands - 2>&1 << EOF | fixbundle
>    > base cd010b8cd998 A
> _______________________________________________
> 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
@@ -1229,12 +1229,14 @@ 
             ha = node.hex(nodetoverify)
             if _constraints.noother in constraints and ha not in expected:
                 raise error.Abort(
-                    _('may not use "%s" with changesets '
-                      'other than the ones listed') % action.verb)
+                    _('%s "%s" changeset was not a candidate')
+                     % (action.verb, node.short(ha)),
+                    hint=_('only use listed changesets'))
             if _constraints.forceother in constraints and ha in expected:
                 raise error.Abort(
-                    _('may not use "%s" with changesets '
-                      'within the edited list') % action.verb)
+                    _('%s "%s" changeset was not an edited list candidate')
+                     % (action.verb, node.short(ha)),
+                    hint=_('only use listed changesets'))
             if _constraints.noduplicates in constraints and ha in seen:
                 raise error.Abort(_('duplicated command for changeset %s') %
                         ha[:12])
diff --git a/tests/test-histedit-arguments.t b/tests/test-histedit-arguments.t
--- a/tests/test-histedit-arguments.t
+++ b/tests/test-histedit-arguments.t
@@ -170,7 +170,8 @@ 
   > pick c8e68270e35a 3 four
   > pick 08d98a8350f3 4 five
   > EOF
-  abort: may not use "pick" with changesets other than the ones listed
+  abort: pick "363035386362" changeset was not a candidate
+  (only use listed changesets)
   [255]
 
 Test malformed line
diff --git a/tests/test-histedit-base.t b/tests/test-histedit-base.t
--- a/tests/test-histedit-base.t
+++ b/tests/test-histedit-base.t
@@ -231,7 +231,8 @@ 
   > base d273e35dcdf2 B
   > pick b2f90fd8aa85 I
   > EOF
-  abort: may not use "base" with changesets within the edited list
+  abort: base "643237336533" changeset was not an edited list candidate
+  (only use listed changesets)
 
   $ hg --config experimental.histeditng=False histedit 5 --commands - 2>&1 << EOF | fixbundle
   > base cd010b8cd998 A