Mercurial > hg > mercurial-crew-with-dirclash

changeset 4644:50252ea60549

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch: fix ui.patch regression introduced by 62019c4427e3. The idea is ui.patch is either empty or wisely filled by user.
author Patrick Mezard <pmezard@gmail.com>
date Tue, 19 Jun 2007 17:02:07 +0200
parents a39cec1d5cb8
children 0de7e6e27fe4
files mercurial/patch.py
diffstat 1 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/patch.py
+++ b/mercurial/patch.py
@@ -298,13 +298,14 @@ def patch(patchname, ui, strip=1, cwd=No
 
         args = []
         patcher = ui.config('ui', 'patch')
-        patcher = ((patcher and util.find_exe(patcher)) or
-                   util.find_exe('gpatch') or
-                   util.find_exe('patch'))
+        if not patcher:
+            patcher = util.find_exe('gpatch') or util.find_exe('patch')
+            # Try to be smart only if patch call was not supplied
+            if util.needbinarypatch():
+                args.append('--binary')
+                
         if not patcher:
             raise util.Abort(_('no patch command found in hgrc or PATH'))
-        if util.needbinarypatch():
-            args.append('--binary')
 
         if cwd:
             args.append('-d %s' % util.shellquote(cwd))