Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/filemerge.py @ 27041:0e330f59ef68

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: don't attempt to premerge change/delete conflicts This is mostly for completeness' sake -- at the moment we don't support any tools for change/delete conflicts that would do a premerge.
author Siddharth Agarwal <sid0@fb.com>
date Fri, 13 Nov 2015 23:56:00 -0800
parents 1bde66b89bb2
children 30b919bc49bf
comparison
equal deleted inserted replaced
27040:1bde66b89bb2 27041:0e330f59ef68
285 Rather than attempting to merge files that were modified on both 285 Rather than attempting to merge files that were modified on both
286 branches, it marks them as unresolved. The resolve command must be 286 branches, it marks them as unresolved. The resolve command must be
287 used to resolve these conflicts.""" 287 used to resolve these conflicts."""
288 return 1, False 288 return 1, False
289 289
290 def _premerge(repo, toolconf, files, labels=None): 290 def _premerge(repo, fcd, fco, fca, toolconf, files, labels=None):
291 tool, toolpath, binary, symlink = toolconf 291 tool, toolpath, binary, symlink = toolconf
292 if symlink: 292 if symlink or fcd.isabsent() or fco.isabsent():
293 return 1 293 return 1
294 a, b, c, back = files 294 a, b, c, back = files
295 295
296 ui = repo.ui 296 ui = repo.ui
297 297
608 labels = _defaultconflictlabels 608 labels = _defaultconflictlabels
609 if markerstyle != 'basic': 609 if markerstyle != 'basic':
610 labels = _formatlabels(repo, fcd, fco, fca, labels) 610 labels = _formatlabels(repo, fcd, fco, fca, labels)
611 611
612 if premerge and mergetype == fullmerge: 612 if premerge and mergetype == fullmerge:
613 r = _premerge(repo, toolconf, files, labels=labels) 613 r = _premerge(repo, fcd, fco, fca, toolconf, files, labels=labels)
614 # complete if premerge successful (r is 0) 614 # complete if premerge successful (r is 0)
615 return not r, r, False 615 return not r, r, False
616 616
617 needcheck, r, deleted = func(repo, mynode, orig, fcd, fco, fca, 617 needcheck, r, deleted = func(repo, mynode, orig, fcd, fco, fca,
618 toolconf, files, labels=labels) 618 toolconf, files, labels=labels)