equal
deleted
inserted
replaced
230 patchtext = (crecordmod.diffhelptext |
230 patchtext = (crecordmod.diffhelptext |
231 + crecordmod.patchhelptext |
231 + crecordmod.patchhelptext |
232 + fp.read()) |
232 + fp.read()) |
233 reviewedpatch = ui.edit(patchtext, "", |
233 reviewedpatch = ui.edit(patchtext, "", |
234 extra={"suffix": ".diff"}, |
234 extra={"suffix": ".diff"}, |
235 tmpdir=repo.path) |
235 repopath=repo.path) |
236 fp.truncate(0) |
236 fp.truncate(0) |
237 fp.write(reviewedpatch) |
237 fp.write(reviewedpatch) |
238 fp.seek(0) |
238 fp.seek(0) |
239 |
239 |
240 [os.unlink(repo.wjoin(c)) for c in newlyaddedandmodifiedfiles] |
240 [os.unlink(repo.wjoin(c)) for c in newlyaddedandmodifiedfiles] |
2780 repo.dirstate.write(tr) |
2780 repo.dirstate.write(tr) |
2781 pending = tr and tr.writepending() and repo.root |
2781 pending = tr and tr.writepending() and repo.root |
2782 |
2782 |
2783 editortext = repo.ui.edit(committext, ctx.user(), ctx.extra(), |
2783 editortext = repo.ui.edit(committext, ctx.user(), ctx.extra(), |
2784 editform=editform, pending=pending, |
2784 editform=editform, pending=pending, |
2785 tmpdir=repo.path) |
2785 repopath=repo.path) |
2786 text = editortext |
2786 text = editortext |
2787 |
2787 |
2788 # strip away anything below this special string (used for editors that want |
2788 # strip away anything below this special string (used for editors that want |
2789 # to display the diff) |
2789 # to display the diff) |
2790 stripbelow = re.search(_linebelow, text, flags=re.MULTILINE) |
2790 stripbelow = re.search(_linebelow, text, flags=re.MULTILINE) |