equal
deleted
inserted
replaced
301 if not patcher: |
301 if not patcher: |
302 patcher = util.find_exe('gpatch') or util.find_exe('patch') |
302 patcher = util.find_exe('gpatch') or util.find_exe('patch') |
303 # Try to be smart only if patch call was not supplied |
303 # Try to be smart only if patch call was not supplied |
304 if util.needbinarypatch(): |
304 if util.needbinarypatch(): |
305 args.append('--binary') |
305 args.append('--binary') |
306 |
306 |
307 if not patcher: |
307 if not patcher: |
308 raise util.Abort(_('no patch command found in hgrc or PATH')) |
308 raise util.Abort(_('no patch command found in hgrc or PATH')) |
309 |
309 |
310 if cwd: |
310 if cwd: |
311 args.append('-d %s' % util.shellquote(cwd)) |
311 args.append('-d %s' % util.shellquote(cwd)) |