equal
deleted
inserted
replaced
1154 |
1154 |
1155 if rejects: |
1155 if rejects: |
1156 return -1 |
1156 return -1 |
1157 return err |
1157 return err |
1158 |
1158 |
1159 def externalpatch(patcher, patchname, ui, strip, cwd, files): |
1159 def _externalpatch(patcher, patchname, ui, strip, cwd, files): |
1160 """use <patcher> to apply <patchname> to the working directory. |
1160 """use <patcher> to apply <patchname> to the working directory. |
1161 returns whether patch was applied with fuzz factor.""" |
1161 returns whether patch was applied with fuzz factor.""" |
1162 |
1162 |
1163 fuzz = False |
1163 fuzz = False |
1164 args = [] |
1164 args = [] |
1238 patcher = ui.config('ui', 'patch') |
1238 patcher = ui.config('ui', 'patch') |
1239 if files is None: |
1239 if files is None: |
1240 files = {} |
1240 files = {} |
1241 try: |
1241 try: |
1242 if patcher: |
1242 if patcher: |
1243 return externalpatch(patcher, patchname, ui, strip, cwd, files) |
1243 return _externalpatch(patcher, patchname, ui, strip, cwd, files) |
1244 return internalpatch(patchname, ui, strip, cwd, files, eolmode) |
1244 return internalpatch(patchname, ui, strip, cwd, files, eolmode) |
1245 except PatchError, err: |
1245 except PatchError, err: |
1246 raise util.Abort(str(err)) |
1246 raise util.Abort(str(err)) |
1247 |
1247 |
1248 def b85diff(to, tn): |
1248 def b85diff(to, tn): |