comparison mercurial/patch.py @ 14366:992a7e398ddd

patch: stop changing current directory before patching

_applydiff() patcher argument was added to help hgsubversion like extension
monkeypatching the patching process. While it could be removed at this point, I
prefer to leave it until patch.py is completely refactored and there is a valid
and tested alternative.

14365:a8e3931e3fb5

class fsbackend(abstractbackend):
    def __init__(self, ui, basedir):
        super(fsbackend, self).__init__(ui)
        self.opener = scmutil.opener(basedir)

    def readlines(self, fname):
        if os.path.islink(fname):
            return [os.readlink(fname)]
        fp = self.opener(fname, 'r')
        try:
            return list(fp)
        finally:
            fp.close()

    def writelines(self, fname, lines):
        # Ensure supplied data ends in fname, being a regular file or
        # a symlink. _updatedir will -too magically- take care
        # of setting it to the proper type afterwards.
        st_mode = None
        islink = os.path.islink(fname)
        if islink:
            fp = cStringIO.StringIO()
        else:
            try:
                st_mode = os.lstat(fname).st_mode & 0777
            except OSError, e:
                if e.errno != errno.ENOENT:
                    raise
            fp = self.opener(fname, 'w')
        try:
            fp.writelines(lines)
            if islink:
                self.opener.symlink(fp.getvalue(), fname)
            if st_mode is not None:
                os.chmod(fname, st_mode)
        finally:
            fp.close()

    def unlink(self, fname):
        os.unlink(fname)

    def writerej(self, fname, failed, total, lines):
        fname = fname + ".rej"
        self.ui.warn(
            _("%d out of %d hunks FAILED -- saving rejects to file %s\n") %

                    _("cannot create %s: unable to create destination directory")
                    % dst)
        util.copyfile(abssrc, absdst)

    def exists(self, fname):
        return os.path.lexists(fname)

# @@ -start,len +start,len @@ or @@ -start +start @@ if len is 1
unidesc = re.compile('@@ -(\d+)(,(\d+))? \+(\d+)(,(\d+))? @@')
contextdesc = re.compile('(---|\*\*\*) (\d+)(,(\d+))? (---|\*\*\*)')
eolmodes = ['strict', 'crlf', 'lf', 'auto']

            newfile = False
            emitfile = True
            state = BFILE
            hunknum = 0

def applydiff(ui, fp, changed, strip=1, eolmode='strict'):
    """Reads a patch from fp and tries to apply it.

    The dict 'changed' is filled in with all of the filenames changed
    by the patch. Returns 0 for a clean patch, -1 if any rejects were
    found and 1 if there was any fuzz.

    patching then normalized according to 'eolmode'.

    Callers probably want to call '_updatedir' after this to
    apply certain categories of changes not done by this function.
    """
    return _applydiff(ui, fp, patchfile, changed, strip=strip,
                      eolmode=eolmode)

def _applydiff(ui, fp, patcher, changed, strip=1, eolmode='strict'):
    rejects = 0
    err = 0
    current_file = None
    backend = fsbackend(ui, os.getcwd())

    for state, values in iterhunks(fp):
        if state == 'hunk':
            if not current_file:
                continue

        eolmode = ui.config('patch', 'eol', 'strict')
    if eolmode.lower() not in eolmodes:
        raise util.Abort(_('unsupported line endings type: %s') % eolmode)
    eolmode = eolmode.lower()

    try:
        fp = open(patchobj, 'rb')
    except TypeError:
        fp = patchobj
    if cwd:
        curdir = os.getcwd()
        os.chdir(cwd)
    try:
        ret = applydiff(ui, fp, files, strip=strip, eolmode=eolmode)
    finally:
        if cwd:
            os.chdir(curdir)
        if fp != patchobj:
            fp.close()
        touched = _updatedir(ui, repo, files, similarity)
        files.update(dict.fromkeys(touched))
    if ret < 0:

14366:992a7e398ddd

class fsbackend(abstractbackend):
    def __init__(self, ui, basedir):
        super(fsbackend, self).__init__(ui)
        self.opener = scmutil.opener(basedir)

    def _join(self, f):
        return os.path.join(self.opener.base, f)

    def readlines(self, fname):
        if os.path.islink(self._join(fname)):
            return [os.readlink(self._join(fname))]
        fp = self.opener(fname, 'r')
        try:
            return list(fp)
        finally:
            fp.close()

    def writelines(self, fname, lines):
        # Ensure supplied data ends in fname, being a regular file or
        # a symlink. _updatedir will -too magically- take care
        # of setting it to the proper type afterwards.
        st_mode = None
        islink = os.path.islink(self._join(fname))
        if islink:
            fp = cStringIO.StringIO()
        else:
            try:
                st_mode = os.lstat(self._join(fname)).st_mode & 0777
            except OSError, e:
                if e.errno != errno.ENOENT:
                    raise
            fp = self.opener(fname, 'w')
        try:
            fp.writelines(lines)
            if islink:
                self.opener.symlink(fp.getvalue(), fname)
            if st_mode is not None:
                os.chmod(self._join(fname), st_mode)
        finally:
            fp.close()

    def unlink(self, fname):
        os.unlink(self._join(fname))

    def writerej(self, fname, failed, total, lines):
        fname = fname + ".rej"
        self.ui.warn(
            _("%d out of %d hunks FAILED -- saving rejects to file %s\n") %

                    _("cannot create %s: unable to create destination directory")
                    % dst)
        util.copyfile(abssrc, absdst)

    def exists(self, fname):
        return os.path.lexists(self._join(fname))

# @@ -start,len +start,len @@ or @@ -start +start @@ if len is 1
unidesc = re.compile('@@ -(\d+)(,(\d+))? \+(\d+)(,(\d+))? @@')
contextdesc = re.compile('(---|\*\*\*) (\d+)(,(\d+))? (---|\*\*\*)')
eolmodes = ['strict', 'crlf', 'lf', 'auto']

            newfile = False
            emitfile = True
            state = BFILE
            hunknum = 0

def applydiff(ui, fp, changed, backend, strip=1, eolmode='strict'):
    """Reads a patch from fp and tries to apply it.

    The dict 'changed' is filled in with all of the filenames changed
    by the patch. Returns 0 for a clean patch, -1 if any rejects were
    found and 1 if there was any fuzz.

    patching then normalized according to 'eolmode'.

    Callers probably want to call '_updatedir' after this to
    apply certain categories of changes not done by this function.
    """
    return _applydiff(ui, fp, patchfile, backend, changed, strip=strip,
                      eolmode=eolmode)

def _applydiff(ui, fp, patcher, backend, changed, strip=1, eolmode='strict'):
    rejects = 0
    err = 0
    current_file = None

    for state, values in iterhunks(fp):
        if state == 'hunk':
            if not current_file:
                continue

        eolmode = ui.config('patch', 'eol', 'strict')
    if eolmode.lower() not in eolmodes:
        raise util.Abort(_('unsupported line endings type: %s') % eolmode)
    eolmode = eolmode.lower()

    backend = fsbackend(ui, cwd)
    try:
        fp = open(patchobj, 'rb')
    except TypeError:
        fp = patchobj
    try:
        ret = applydiff(ui, fp, files, backend, strip=strip, eolmode=eolmode)
    finally:
        if fp != patchobj:
            fp.close()
        touched = _updatedir(ui, repo, files, similarity)
        files.update(dict.fromkeys(touched))
    if ret < 0: