comparison hgext/histedit.py @ 24267:365fdbc54f1f

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.
author Durham Goode <durham@fb.com>
date Wed, 11 Mar 2015 07:19:55 -0700
parents f9e8739018d5
children e767f5aba810
comparison
equal deleted inserted replaced
24266:c14b1d349af3 24267:365fdbc54f1f
614 # rebuild state 614 # rebuild state
615 if goal == 'continue': 615 if goal == 'continue':
616 state.read() 616 state.read()
617 state = bootstrapcontinue(ui, state, opts) 617 state = bootstrapcontinue(ui, state, opts)
618 elif goal == 'edit-plan': 618 elif goal == 'edit-plan':
619 state = histeditstate(repo)
620 state.read() 619 state.read()
621 if not rules: 620 if not rules:
622 comment = editcomment % (state.parentctx, node.short(state.topmost)) 621 comment = editcomment % (state.parentctx, node.short(state.topmost))
623 rules = ruleeditor(repo, ui, state.rules, comment) 622 rules = ruleeditor(repo, ui, state.rules, comment)
624 else: 623 else: