--- a/mercurial/patch.py Sun May 27 13:50:59 2007 -0700
+++ b/mercurial/patch.py Sun May 27 14:26:54 2007 -0700
@@ -295,11 +295,13 @@
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_in_path('gpatch', os.environ.get('PATH', ''),
- 'patch')
- if util.needbinarypatch():
- args.append('--binary')
+ 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))
@@ -643,7 +645,7 @@
single(rev, seqno+1, fp)
def diffstat(patchlines):
- if not util.find_in_path('diffstat', os.environ.get('PATH', '')):
+ if not util.find_exe('diffstat'):
return
fd, name = tempfile.mkstemp(prefix="hg-patchbomb-", suffix=".txt")
try: