From 81170df509c098b0ec7f4a5b762c4bd2e19ac416 Mon Sep 17 00:00:00 2001
From: timeless <timeless@mozdev.org>
Date: Fri, 11 Dec 2015 07:08:09 +0000
Subject: [PATCH] histedit: limit mentioning histedit-last-edit.txt

Before histedit-last-edit.txt would be mentioned for any failure.
After, it should only be mentioned for failures relating to user
input.
---
 hgext/histedit.py | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/hgext/histedit.py b/hgext/histedit.py
index d22b49f2ad..5e1eb93070 100644
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -902,11 +902,6 @@ def histedit(ui, repo, *freeargs, **opts):
         state.wlock = repo.wlock()
         state.lock = repo.lock()
         _histedit(ui, repo, state, *freeargs, **opts)
-    except error.Abort:
-        if repo.vfs.exists('histedit-last-edit.txt'):
-            ui.warn(_('warning: histedit rules saved '
-                      'to: .hg/histedit-last-edit.txt\n'))
-        raise
     finally:
         release(state.lock, state.wlock)
 
@@ -987,7 +982,7 @@ def _histedit(ui, repo, state, *freeargs, **opts):
         actions = parserules(rules, state)
         ctxs = [repo[act.nodetoverify()] \
                 for act in state.actions if act.nodetoverify()]
-        verifyactions(actions, state, ctxs)
+        warnverifyactions(ui, repo, actions, state, ctxs)
         state.actions = actions
         state.write()
         return
@@ -1070,7 +1065,7 @@ def _histedit(ui, repo, state, *freeargs, **opts):
             rules = f.read()
             f.close()
         actions = parserules(rules, state)
-        verifyactions(actions, state, ctxs)
+        warnverifyactions(ui, repo, actions, state, ctxs)
 
         parentctxnode = repo[root].parents()[0].node()
 
@@ -1222,6 +1217,15 @@ def parserules(rules, state):
         actions.append(action)
     return actions
 
+def warnverifyactions(ui, repo, actions, state, ctxs):
+    try:
+        verifyactions(actions, state, ctxs)
+    except error.Abort:
+        if repo.vfs.exists('histedit-last-edit.txt'):
+            ui.warn(_('warning: histedit rules saved '
+                      'to: .hg/histedit-last-edit.txt\n'))
+        raise
+
 def verifyactions(actions, state, ctxs):
     """Verify that there exists exactly one action per given changeset and
     other constraints.