# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1472577230 14400
# Node ID 6d66200bff3bf14a996c2908d691b96ab6b14f02
# Parent  e2c086f147efa7f4a07e2d89fe46cf685892ce0b
histedit: correct output of error when 'base' is from the edit list

This was made more obvious by marmoute's recent rearrangement of this code.

diff -r e2c086f147ef -r 6d66200bff3b hgext/histedit.py
--- a/hgext/histedit.py	Tue Aug 30 13:33:48 2016 -0400
+++ b/hgext/histedit.py	Tue Aug 30 13:13:50 2016 -0400
@@ -789,9 +789,10 @@
     def _verifynodeconstraints(self, prev, expected, seen):
         # base can only be use with a node not in the edited set
         if self.node in expected:
-            msg = _('%s "%s" changeset was not an edited list candidate')
-            raise error.ParseError(msg % (self.verb, node.short(self.node)),
-                                   hint=_('only use listed changesets'))
+            msg = _('%s "%s" changeset was an edited list candidate')
+            raise error.ParseError(
+                msg % (self.verb, node.short(self.node)),
+                hint=_('base must only use unlisted changesets'))
 
 @action(['_multifold'],
         _(
diff -r e2c086f147ef -r 6d66200bff3b tests/test-histedit-base.t
--- a/tests/test-histedit-base.t	Tue Aug 30 13:33:48 2016 -0400
+++ b/tests/test-histedit-base.t	Tue Aug 30 13:13:50 2016 -0400
@@ -235,8 +235,8 @@
   > base d273e35dcdf2 B
   > pick b2f90fd8aa85 I
   > EOF
-  hg: parse error: base "d273e35dcdf2" changeset was not an edited list candidate
-  (only use listed changesets)
+  hg: parse error: base "d273e35dcdf2" changeset was an edited list candidate
+  (base must only use unlisted changesets)
 
   $ hg --config experimental.histeditng=False histedit 5 --commands - 2>&1 << EOF | fixbundle
   > base cd010b8cd998 A