1519 Returns whether patch was applied with fuzz factor. |
1519 Returns whether patch was applied with fuzz factor. |
1520 """ |
1520 """ |
1521 patcher = ui.config('ui', 'patch') |
1521 patcher = ui.config('ui', 'patch') |
1522 if files is None: |
1522 if files is None: |
1523 files = set() |
1523 files = set() |
1524 try: |
1524 if patcher: |
1525 if patcher: |
1525 return _externalpatch(ui, repo, patcher, patchname, strip, |
1526 return _externalpatch(ui, repo, patcher, patchname, strip, |
1526 files, similarity) |
1527 files, similarity) |
1527 return internalpatch(ui, repo, patchname, strip, files, eolmode, |
1528 return internalpatch(ui, repo, patchname, strip, files, eolmode, |
1528 similarity) |
1529 similarity) |
|
1530 except PatchError, err: |
|
1531 raise util.Abort(str(err)) |
|
1532 |
1529 |
1533 def changedfiles(ui, repo, patchpath, strip=1): |
1530 def changedfiles(ui, repo, patchpath, strip=1): |
1534 backend = fsbackend(ui, repo.root) |
1531 backend = fsbackend(ui, repo.root) |
1535 fp = open(patchpath, 'rb') |
1532 fp = open(patchpath, 'rb') |
1536 try: |
1533 try: |