##// END OF EJS Templates
patch: fix ui.patch regression introduced by 62019c4427e3....
Patrick Mezard -
r4644:50252ea6 default
parent child Browse files
Show More
@@ -298,13 +298,14 b' def patch(patchname, ui, strip=1, cwd=No'
298
298
299 args = []
299 args = []
300 patcher = ui.config('ui', 'patch')
300 patcher = ui.config('ui', 'patch')
301 patcher = ((patcher and util.find_exe(patcher)) or
301 if not patcher:
302 util.find_exe('gpatch') or
302 patcher = util.find_exe('gpatch') or util.find_exe('patch')
303 util.find_exe('patch'))
303 # Try to be smart only if patch call was not supplied
304 if util.needbinarypatch():
305 args.append('--binary')
306
304 if not patcher:
307 if not patcher:
305 raise util.Abort(_('no patch command found in hgrc or PATH'))
308 raise util.Abort(_('no patch command found in hgrc or PATH'))
306 if util.needbinarypatch():
307 args.append('--binary')
308
309
309 if cwd:
310 if cwd:
310 args.append('-d %s' % util.shellquote(cwd))
311 args.append('-d %s' % util.shellquote(cwd))
General Comments 0
You need to be logged in to leave comments. Login now