patch: fix ui.patch regression introduced by 62019c4427e3.
The idea is ui.patch is either empty or wisely filled by user.
--- 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))