From patchwork Mon Mar 9 16:59:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [2,of,2] patch.internalpatch: accept a prefix parameter From: Siddharth Agarwal X-Patchwork-Id: 7951 Message-Id: To: Date: Mon, 9 Mar 2015 09:59:44 -0700 # HG changeset patch # User Siddharth Agarwal # Date 1425710627 28800 # Fri Mar 06 22:43:47 2015 -0800 # Node ID ee9d52883035d7d32b18421b33653e597f4e4cf5 # Parent f4f59f9484d44f3941b13b76d168f50e91c3cbb3 patch.internalpatch: accept a prefix parameter diff --git a/hgext/record.py b/hgext/record.py --- a/hgext/record.py +++ b/hgext/record.py @@ -592,7 +592,7 @@ try: ui.debug('applying patch\n') ui.debug(fp.getvalue()) - patch.internalpatch(ui, repo, fp, 1, eolmode=None) + patch.internalpatch(ui, repo, fp, 1, '', eolmode=None) except patch.PatchError, err: raise util.Abort(str(err)) del fp diff --git a/mercurial/patch.py b/mercurial/patch.py --- a/mercurial/patch.py +++ b/mercurial/patch.py @@ -1521,12 +1521,12 @@ raise PatchError(_('patch failed to apply')) return ret > 0 -def internalpatch(ui, repo, patchobj, strip, files=None, eolmode='strict', - similarity=0): +def internalpatch(ui, repo, patchobj, strip, prefix, files=None, + eolmode='strict', similarity=0): """use builtin patch to apply to the working directory. returns whether patch was applied with fuzz factor.""" backend = workingbackend(ui, repo, similarity) - return patchbackend(ui, backend, patchobj, strip, '', files, eolmode) + return patchbackend(ui, backend, patchobj, strip, prefix, files, eolmode) def patchrepo(ui, repo, ctx, store, patchobj, strip, files=None, eolmode='strict'): @@ -1552,7 +1552,7 @@ if patcher: return _externalpatch(ui, repo, patcher, patchname, strip, files, similarity) - return internalpatch(ui, repo, patchname, strip, files, eolmode, + return internalpatch(ui, repo, patchname, strip, '', files, eolmode, similarity) def changedfiles(ui, repo, patchpath, strip=1):