equal
deleted
inserted
replaced
1135 files) |
1135 files) |
1136 else: |
1136 else: |
1137 try: |
1137 try: |
1138 return internalpatch(patchname, ui, strip, cwd, files) |
1138 return internalpatch(patchname, ui, strip, cwd, files) |
1139 except NoHunks: |
1139 except NoHunks: |
1140 patcher = util.find_exe('gpatch') or util.find_exe('patch') |
1140 patcher = util.find_exe('gpatch') or util.find_exe('patch') or 'patch' |
1141 ui.debug(_('no valid hunks found; trying with %r instead\n') % |
1141 ui.debug(_('no valid hunks found; trying with %r instead\n') % |
1142 patcher) |
1142 patcher) |
1143 if util.needbinarypatch(): |
1143 if util.needbinarypatch(): |
1144 args.append('--binary') |
1144 args.append('--binary') |
1145 return externalpatch(patcher, args, patchname, ui, strip, cwd, |
1145 return externalpatch(patcher, args, patchname, ui, strip, cwd, |