Show More
@@ -432,6 +432,9 b' ui::' | |||
|
432 | 432 | merge;; |
|
433 | 433 | The conflict resolution program to use during a manual merge. |
|
434 | 434 | Default is "hgmerge". |
|
435 | patch;; | |
|
436 | command to use to apply patches. Look for 'gpatch' or 'patch' in PATH if | |
|
437 | unset. | |
|
435 | 438 | quiet;; |
|
436 | 439 | Reduce the amount of output printed. True or False. Default is False. |
|
437 | 440 | remotecmd;; |
@@ -881,6 +881,8 b' def debuginstall(ui):' | |||
|
881 | 881 | # patch |
|
882 | 882 | ui.status(_("Checking patch...\n")) |
|
883 | 883 | path = os.environ.get('PATH', '') |
|
884 | patcher = ui.config('ui', 'patch') | |
|
885 | if not patcher: | |
|
884 | 886 | patcher = util.find_in_path('gpatch', path, |
|
885 | 887 | util.find_in_path('patch', path, None)) |
|
886 | 888 | if not patcher: |
@@ -293,9 +293,11 b' def patch(patchname, ui, strip=1, cwd=No' | |||
|
293 | 293 | """patch and updates the files and fuzz variables""" |
|
294 | 294 | fuzz = False |
|
295 | 295 | |
|
296 | args = [] | |
|
297 | patcher = ui.config('ui', 'patch') | |
|
298 | if not patcher: | |
|
296 | 299 | patcher = util.find_in_path('gpatch', os.environ.get('PATH', ''), |
|
297 | 300 | 'patch') |
|
298 | args = [] | |
|
299 | 301 | if util.needbinarypatch(): |
|
300 | 302 | args.append('--binary') |
|
301 | 303 |
General Comments 0
You need to be logged in to leave comments.
Login now