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