Show More
@@ -779,9 +779,7 b' class fold(histeditaction):' | |||||
779 |
|
779 | |||
780 | def finishfold(self, ui, repo, ctx, oldctx, newnode, internalchanges): |
|
780 | def finishfold(self, ui, repo, ctx, oldctx, newnode, internalchanges): | |
781 | parent = ctx.parents()[0].node() |
|
781 | parent = ctx.parents()[0].node() | |
782 | repo.ui.pushbuffer() |
|
782 | hg.updaterepo(repo, parent, False) | |
783 | hg.update(repo, parent) |
|
|||
784 | repo.ui.popbuffer() |
|
|||
785 | ### prepare new commit data |
|
783 | ### prepare new commit data | |
786 | commitopts = {} |
|
784 | commitopts = {} | |
787 | commitopts['user'] = ctx.user() |
|
785 | commitopts['user'] = ctx.user() | |
@@ -812,9 +810,7 b' class fold(histeditaction):' | |||||
812 | skipprompt=self.skipprompt()) |
|
810 | skipprompt=self.skipprompt()) | |
813 | if n is None: |
|
811 | if n is None: | |
814 | return ctx, [] |
|
812 | return ctx, [] | |
815 | repo.ui.pushbuffer() |
|
813 | hg.updaterepo(repo, n, False) | |
816 | hg.update(repo, n) |
|
|||
817 | repo.ui.popbuffer() |
|
|||
818 | replacements = [(oldctx.node(), (newnode,)), |
|
814 | replacements = [(oldctx.node(), (newnode,)), | |
819 | (ctx.node(), (n,)), |
|
815 | (ctx.node(), (n,)), | |
820 | (newnode, (n,)), |
|
816 | (newnode, (n,)), | |
@@ -1176,9 +1172,7 b' def _continuehistedit(ui, repo, state):' | |||||
1176 |
|
1172 | |||
1177 | def _finishhistedit(ui, repo, state, fm): |
|
1173 | def _finishhistedit(ui, repo, state, fm): | |
1178 | """This action runs when histedit is finishing its session""" |
|
1174 | """This action runs when histedit is finishing its session""" | |
1179 | repo.ui.pushbuffer() |
|
1175 | hg.updaterepo(repo, state.parentctxnode, False) | |
1180 | hg.update(repo, state.parentctxnode, quietempty=True) |
|
|||
1181 | repo.ui.popbuffer() |
|
|||
1182 |
|
1176 | |||
1183 | mapping, tmpnodes, created, ntm = processreplacement(state) |
|
1177 | mapping, tmpnodes, created, ntm = processreplacement(state) | |
1184 | if mapping: |
|
1178 | if mapping: |
General Comments 0
You need to be logged in to leave comments.
Login now