comparison mercurial/crecord.py @ 28636:de64020bb4ec

crecord: refactor hunk edit action to use ui.edit

The previous version of this code did a lot of dancing around a
temporary edit file that ui.edit already handles.

28635:87f92d6f0bc3

import os
import re
import signal
import struct
import sys
import tempfile

from .i18n import _
from . import (
    encoding,
    error,

    added to the record list. if it does not apply cleanly, a rejects
    file will be generated: you can use that when you try again. if
    all lines of the hunk are removed, then the edit is aborted and
    the hunk is left unchanged.
    """)
            (patchfd, patchfn) = tempfile.mkstemp(prefix="hg-editor-",
                    suffix=".diff", text=True)
            ncpatchfp = None
            try:
                # write the initial patch
                f = os.fdopen(patchfd, "w")
                chunk.header.write(f)
                chunk.write(f)
                f.write('\n'.join(['# ' + i for i in phelp.splitlines()]))
                f.close()
                # start the editor and wait for it to complete
                editor = self.ui.geteditor()
                ret = self.ui.system("%s \"%s\"" % (editor, patchfn),
                          environ={'hguser': self.ui.username()})
                if ret != 0:
                    self.errorstr = "Editor exited with status %d" % ret
                    return None
                # remove comment lines
                patchfp = open(patchfn)
                ncpatchfp = cStringIO.StringIO()
                for line in patchfp:
                    if not line.startswith('#'):
                        ncpatchfp.write(line)
                patchfp.close()
                ncpatchfp.seek(0)
                newpatches = patchmod.parsepatch(ncpatchfp)
            finally:
                os.unlink(patchfn)
                del ncpatchfp
            return newpatches
        if item is None:
            item = self.currentselecteditem
        if isinstance(item, uiheader):
            return
        if isinstance(item, uihunkline):

28636:de64020bb4ec

import os
import re
import signal
import struct
import sys

from .i18n import _
from . import (
    encoding,
    error,

    added to the record list. if it does not apply cleanly, a rejects
    file will be generated: you can use that when you try again. if
    all lines of the hunk are removed, then the edit is aborted and
    the hunk is left unchanged.
    """)
            # write the initial patch
            patch = cStringIO.StringIO()
            patch.write(''.join(['# %s\n' % i for i in phelp.splitlines()]))
            chunk.header.write(patch)
            chunk.write(patch)

            # start the editor and wait for it to complete
            try:
                patch = self.ui.edit(patch.getvalue(), "",
                                     extra={"suffix": ".diff"})
            except error.Abort as exc:
                self.errorstr = str(exc)
                return None

            # remove comment lines
            patch = [line + '\n' for line in patch.splitlines()
                     if not line.startswith('#')]
            return patchmod.parsepatch(patch)

        if item is None:
            item = self.currentselecteditem
        if isinstance(item, uiheader):
            return
        if isinstance(item, uihunkline):