| lothiraldan | |
| yuja |
| hg-reviewers |
I'd like to call the function from an extension, passing both "strip"
and "prefix", but it currently only accepts "strip". The only in-tree
caller seems to be mq.py, which doesn't even pass "strip".
| Lint Skipped |
| Unit Tests Skipped |
| If 'eolmode' is 'strict', the patch content and patched file are | If 'eolmode' is 'strict', the patch content and patched file are | ||||
| read in binary mode. Otherwise, line endings are ignored when | read in binary mode. Otherwise, line endings are ignored when | ||||
| patching then normalized according to 'eolmode'. | patching then normalized according to 'eolmode'. | ||||
| """ | """ | ||||
| return _applydiff(ui, fp, patchfile, backend, store, strip=strip, | return _applydiff(ui, fp, patchfile, backend, store, strip=strip, | ||||
| prefix=prefix, eolmode=eolmode) | prefix=prefix, eolmode=eolmode) | ||||
| def _applydiff(ui, fp, patcher, backend, store, strip=1, prefix='', | def _canonprefix(repo, prefix): | ||||
| eolmode='strict'): | |||||
| if prefix: | if prefix: | ||||
| prefix = pathutil.canonpath(backend.repo.root, backend.repo.getcwd(), | prefix = pathutil.canonpath(repo.root, repo.getcwd(), prefix) | ||||
| prefix) | |||||
| if prefix != '': | if prefix != '': | ||||
| prefix += '/' | prefix += '/' | ||||
| return prefix | |||||
| def _applydiff(ui, fp, patcher, backend, store, strip=1, prefix='', | |||||
| eolmode='strict'): | |||||
| prefix = _canonprefix(backend.repo, prefix) | |||||
| def pstrip(p): | def pstrip(p): | ||||
| return pathtransform(p, strip - 1, prefix)[1] | return pathtransform(p, strip - 1, prefix)[1] | ||||
| rejects = 0 | rejects = 0 | ||||
| err = 0 | err = 0 | ||||
| current_file = None | current_file = None | ||||
| for state, values in iterhunks(fp): | for state, values in iterhunks(fp): | ||||
| if files is None: | if files is None: | ||||
| files = set() | files = set() | ||||
| if patcher: | if patcher: | ||||
| return _externalpatch(ui, repo, patcher, patchname, strip, | return _externalpatch(ui, repo, patcher, patchname, strip, | ||||
| files, similarity) | files, similarity) | ||||
| return internalpatch(ui, repo, patchname, strip, prefix, files, eolmode, | return internalpatch(ui, repo, patchname, strip, prefix, files, eolmode, | ||||
| similarity) | similarity) | ||||
| def changedfiles(ui, repo, patchpath, strip=1): | def changedfiles(ui, repo, patchpath, strip=1, prefix=''): | ||||
| backend = fsbackend(ui, repo.root) | backend = fsbackend(ui, repo.root) | ||||
| prefix = _canonprefix(repo, prefix) | |||||
| with open(patchpath, 'rb') as fp: | with open(patchpath, 'rb') as fp: | ||||
| changed = set() | changed = set() | ||||
| for state, values in iterhunks(fp): | for state, values in iterhunks(fp): | ||||
| if state == 'file': | if state == 'file': | ||||
| afile, bfile, first_hunk, gp = values | afile, bfile, first_hunk, gp = values | ||||
| if gp: | if gp: | ||||
| gp.path = pathtransform(gp.path, strip - 1, '')[1] | gp.path = pathtransform(gp.path, strip - 1, prefix)[1] | ||||
| if gp.oldpath: | if gp.oldpath: | ||||
| gp.oldpath = pathtransform(gp.oldpath, strip - 1, '')[1] | gp.oldpath = pathtransform(gp.oldpath, strip - 1, | ||||
| prefix)[1] | |||||
| else: | else: | ||||
| gp = makepatchmeta(backend, afile, bfile, first_hunk, strip, | gp = makepatchmeta(backend, afile, bfile, first_hunk, strip, | ||||
| '') | prefix) | ||||
| changed.add(gp.path) | changed.add(gp.path) | ||||
| if gp.op == 'RENAME': | if gp.op == 'RENAME': | ||||
| changed.add(gp.oldpath) | changed.add(gp.oldpath) | ||||
| elif state not in ('hunk', 'git'): | elif state not in ('hunk', 'git'): | ||||
| raise error.Abort(_('unsupported parser state: %s') % state) | raise error.Abort(_('unsupported parser state: %s') % state) | ||||
| return changed | return changed | ||||
| class GitDiffRequired(Exception): | class GitDiffRequired(Exception): | ||||