Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/patch.py @ 10751:440786f7f18b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch: warn when the internal patcher fails hopefully we'll soon fix the remaining failures from the internal patcher, and not use the external one anymore.
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 22 Mar 2010 11:08:42 +0100
parents 03225f14c495
children d14d45fae927
comparison
equal deleted inserted replaced
10749:03225f14c495 10751:440786f7f18b
1318 files) 1318 files)
1319 else: 1319 else:
1320 try: 1320 try:
1321 return internalpatch(patchname, ui, strip, cwd, files, eolmode) 1321 return internalpatch(patchname, ui, strip, cwd, files, eolmode)
1322 except NoHunks: 1322 except NoHunks:
1323 ui.warn(_('internal patcher failed\n'
1324 'please report details to '
1325 'http://mercurial.selenic.com/bts/\n'
1326 'or mercurial@selenic.com\n'))
1323 patcher = (util.find_exe('gpatch') or util.find_exe('patch') 1327 patcher = (util.find_exe('gpatch') or util.find_exe('patch')
1324 or 'patch') 1328 or 'patch')
1325 ui.debug('no valid hunks found; trying with %r instead\n' % 1329 ui.debug('no valid hunks found; trying with %r instead\n' %
1326 patcher) 1330 patcher)
1327 if util.needbinarypatch(): 1331 if util.needbinarypatch():