Show More
@@ -244,7 +244,7 b' def _premerge(repo, toolconf, files, lab' | |||||
244 | util.copyfile(back, a) # restore from backup and try again |
|
244 | util.copyfile(back, a) # restore from backup and try again | |
245 | return 1 # continue merging |
|
245 | return 1 # continue merging | |
246 |
|
246 | |||
247 |
def _ |
|
247 | def _mergecheck(repo, mynode, orig, fcd, fco, fca, toolconf): | |
248 | tool, toolpath, binary, symlink = toolconf |
|
248 | tool, toolpath, binary, symlink = toolconf | |
249 | if symlink: |
|
249 | if symlink: | |
250 | repo.ui.warn(_('warning: internal %s cannot merge symlinks ' |
|
250 | repo.ui.warn(_('warning: internal %s cannot merge symlinks ' | |
@@ -268,7 +268,7 b' def _merge(repo, mynode, orig, fcd, fco,' | |||||
268 | @internaltool('union', fullmerge, |
|
268 | @internaltool('union', fullmerge, | |
269 | _("warning: conflicts while merging %s! " |
|
269 | _("warning: conflicts while merging %s! " | |
270 | "(edit, then use 'hg resolve --mark')\n"), |
|
270 | "(edit, then use 'hg resolve --mark')\n"), | |
271 |
precheck=_ |
|
271 | precheck=_mergecheck) | |
272 | def _iunion(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): |
|
272 | def _iunion(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): | |
273 | """ |
|
273 | """ | |
274 | Uses the internal non-interactive simple merge algorithm for merging |
|
274 | Uses the internal non-interactive simple merge algorithm for merging | |
@@ -280,7 +280,7 b' def _iunion(repo, mynode, orig, fcd, fco' | |||||
280 | @internaltool('merge', fullmerge, |
|
280 | @internaltool('merge', fullmerge, | |
281 | _("warning: conflicts while merging %s! " |
|
281 | _("warning: conflicts while merging %s! " | |
282 | "(edit, then use 'hg resolve --mark')\n"), |
|
282 | "(edit, then use 'hg resolve --mark')\n"), | |
283 |
precheck=_ |
|
283 | precheck=_mergecheck) | |
284 | def _imerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): |
|
284 | def _imerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): | |
285 | """ |
|
285 | """ | |
286 | Uses the internal non-interactive simple merge algorithm for merging |
|
286 | Uses the internal non-interactive simple merge algorithm for merging | |
@@ -293,7 +293,7 b' def _imerge(repo, mynode, orig, fcd, fco' | |||||
293 | @internaltool('merge3', fullmerge, |
|
293 | @internaltool('merge3', fullmerge, | |
294 | _("warning: conflicts while merging %s! " |
|
294 | _("warning: conflicts while merging %s! " | |
295 | "(edit, then use 'hg resolve --mark')\n"), |
|
295 | "(edit, then use 'hg resolve --mark')\n"), | |
296 |
precheck=_ |
|
296 | precheck=_mergecheck) | |
297 | def _imerge3(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): |
|
297 | def _imerge3(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): | |
298 | """ |
|
298 | """ | |
299 | Uses the internal non-interactive simple merge algorithm for merging |
|
299 | Uses the internal non-interactive simple merge algorithm for merging | |
@@ -318,7 +318,7 b' def _imergeauto(repo, mynode, orig, fcd,' | |||||
318 | localorother=localorother) |
|
318 | localorother=localorother) | |
319 | return True, r |
|
319 | return True, r | |
320 |
|
320 | |||
321 |
@internaltool('merge-local', mergeonly, precheck=_ |
|
321 | @internaltool('merge-local', mergeonly, precheck=_mergecheck) | |
322 | def _imergelocal(*args, **kwargs): |
|
322 | def _imergelocal(*args, **kwargs): | |
323 | """ |
|
323 | """ | |
324 | Like :merge, but resolve all conflicts non-interactively in favor |
|
324 | Like :merge, but resolve all conflicts non-interactively in favor | |
@@ -326,7 +326,7 b' def _imergelocal(*args, **kwargs):' | |||||
326 | success, status = _imergeauto(localorother='local', *args, **kwargs) |
|
326 | success, status = _imergeauto(localorother='local', *args, **kwargs) | |
327 | return success, status |
|
327 | return success, status | |
328 |
|
328 | |||
329 |
@internaltool('merge-other', mergeonly, precheck=_ |
|
329 | @internaltool('merge-other', mergeonly, precheck=_mergecheck) | |
330 | def _imergeother(*args, **kwargs): |
|
330 | def _imergeother(*args, **kwargs): | |
331 | """ |
|
331 | """ | |
332 | Like :merge, but resolve all conflicts non-interactively in favor |
|
332 | Like :merge, but resolve all conflicts non-interactively in favor |
General Comments 0
You need to be logged in to leave comments.
Login now