Mercurial > public > mercurial-scm > hg

comparison mercurial/patch.py @ 6953:63b5f4c73c98

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
i18n: mark strings for translation in Mercurial
author Martin Geisler <mg@daimi.au.dk>
date Sun, 31 Aug 2008 16:12:02 +0200
parents 3fffba1c87d0
children 7b5c063b0b94
comparison
equal deleted inserted replaced
6952:3fffba1c87d0 6953:63b5f4c73c98
227 else: 227 else:
228 try: 228 try:
229 return internalpatch(patchname, ui, strip, cwd, files) 229 return internalpatch(patchname, ui, strip, cwd, files)
230 except NoHunks: 230 except NoHunks:
231 patcher = util.find_exe('gpatch') or util.find_exe('patch') 231 patcher = util.find_exe('gpatch') or util.find_exe('patch')
232 ui.debug('no valid hunks found; trying with %r instead\n' % 232 ui.debug(_('no valid hunks found; trying with %r instead\n') %
233 patcher) 233 patcher)
234 if util.needbinarypatch(): 234 if util.needbinarypatch():
235 args.append('--binary') 235 args.append('--binary')
236 return externalpatch(patcher, args, patchname, ui, strip, cwd, 236 return externalpatch(patcher, args, patchname, ui, strip, cwd,
237 files) 237 files)