mercurial/patch.py
changeset 21553 bee0e1cffdd3
parent 20972 4e2fb0ad00a9
child 21717 2a095d3442e0
--- a/mercurial/patch.py	Mon May 19 01:53:34 2014 +0200
+++ b/mercurial/patch.py	Thu May 08 17:08:17 2014 -0700
@@ -1521,14 +1521,11 @@
     patcher = ui.config('ui', 'patch')
     if files is None:
         files = set()
-    try:
-        if patcher:
-            return _externalpatch(ui, repo, patcher, patchname, strip,
-                                  files, similarity)
-        return internalpatch(ui, repo, patchname, strip, files, eolmode,
-                             similarity)
-    except PatchError, err:
-        raise util.Abort(str(err))
+    if patcher:
+        return _externalpatch(ui, repo, patcher, patchname, strip,
+                              files, similarity)
+    return internalpatch(ui, repo, patchname, strip, files, eolmode,
+                         similarity)
 
 def changedfiles(ui, repo, patchpath, strip=1):
     backend = fsbackend(ui, repo.root)