[PATCH] histedit: remove extra histedit constructor call

Durham Goode durham at fb.com
Wed Mar 11 09:20:57 CDT 2015

# HG changeset patch
# User Durham Goode <durham at fb.com>
# Date 1426083595 25200
#      Wed Mar 11 07:19:55 2015 -0700
# Node ID c00fe123cfeb0a8935a3b636da31f23eee6c67ba
# Parent  913347bcd59c33110f029d83203b3b4c2ecd91a8
histedit: remove extra histedit constructor call

In a previous commit we removed the extra histedit object instance being
constructed in --continue and --abort. The new --edit-todo missed this fix
though (which means the state object it produces doesn't have the locks on it).
It's not breaking anything now, but let's go ahead and clean that up before we

diff --git a/hgext/histedit.py b/hgext/histedit.py
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -616,7 +616,6 @@ def _histedit(ui, repo, state, *freeargs
         state = bootstrapcontinue(ui, state, opts)
     elif goal == 'edit-plan':
-        state = histeditstate(repo)
         if not rules:
             comment = editcomment % (state.parentctx, node.short(state.topmost))

More information about the Mercurial-devel mailing list