Mercurial > hg
comparison mercurial/patch.py @ 24260:76225ab5a5da
cmdutil.tryimportone: allow importing relative patches with --bypass
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Tue, 10 Mar 2015 13:06:38 -0700 |
| parents | 5ac8ce04baa2 |
| children | 20aac24e2114 |
comparison
equal
deleted
inserted
replaced
| 24259:5ac8ce04baa2 | 24260:76225ab5a5da |
|---|---|
| 1526 """use builtin patch to apply <patchobj> to the working directory. | 1526 """use builtin patch to apply <patchobj> to the working directory. |
| 1527 returns whether patch was applied with fuzz factor.""" | 1527 returns whether patch was applied with fuzz factor.""" |
| 1528 backend = workingbackend(ui, repo, similarity) | 1528 backend = workingbackend(ui, repo, similarity) |
| 1529 return patchbackend(ui, backend, patchobj, strip, prefix, files, eolmode) | 1529 return patchbackend(ui, backend, patchobj, strip, prefix, files, eolmode) |
| 1530 | 1530 |
| 1531 def patchrepo(ui, repo, ctx, store, patchobj, strip, files=None, | 1531 def patchrepo(ui, repo, ctx, store, patchobj, strip, prefix, files=None, |
| 1532 eolmode='strict'): | 1532 eolmode='strict'): |
| 1533 backend = repobackend(ui, repo, ctx, store) | 1533 backend = repobackend(ui, repo, ctx, store) |
| 1534 return patchbackend(ui, backend, patchobj, strip, '', files, eolmode) | 1534 return patchbackend(ui, backend, patchobj, strip, prefix, files, eolmode) |
| 1535 | 1535 |
| 1536 def patch(ui, repo, patchname, strip=1, prefix='', files=None, eolmode='strict', | 1536 def patch(ui, repo, patchname, strip=1, prefix='', files=None, eolmode='strict', |
| 1537 similarity=0): | 1537 similarity=0): |
| 1538 """Apply <patchname> to the working directory. | 1538 """Apply <patchname> to the working directory. |
| 1539 | 1539 |