[PATCH] histedit: remove extra histedit constructor call

Augie Fackler raf at durin42.com
Wed Mar 11 10:50:05 CDT 2015


LGTM, queued.

On Mar 11, 2015, at 10:20 AM, Durham Goode <durham at fb.com> wrote:

> # 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
> forget.
> 
> 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.read()
>         state = bootstrapcontinue(ui, state, opts)
>     elif goal == 'edit-plan':
> -        state = histeditstate(repo)
>         state.read()
>         if not rules:
>             comment = editcomment % (state.parentctx, node.short(state.topmost))
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20150311/26bcf1b2/attachment.pgp>


More information about the Mercurial-devel mailing list