Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/filemerge.py @ 33924:fa6309c5761d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplemerge: stop accepting, and passing, file parameters Differential Revision: https://phab.mercurial-scm.org/D381
author Phil Cohen <phillco@fb.com>
date Thu, 24 Aug 2017 21:30:51 -0700
parents db3e9f7c91aa
children 52bd006b4f49
comparison
equal deleted inserted replaced
33923:61b267a99fea 33924:fa6309c5761d
339 if premerge == 'keep-merge3': 339 if premerge == 'keep-merge3':
340 if not labels: 340 if not labels:
341 labels = _defaultconflictlabels 341 labels = _defaultconflictlabels
342 if len(labels) < 3: 342 if len(labels) < 3:
343 labels.append('base') 343 labels.append('base')
344 r = simplemerge.simplemerge(ui, a, b, c, fcd, fca, fco, 344 r = simplemerge.simplemerge(ui, fcd, fca, fco,
345 quiet=True, label=labels, repo=repo) 345 quiet=True, label=labels, repo=repo)
346 if not r: 346 if not r:
347 ui.debug(" premerge successful\n") 347 ui.debug(" premerge successful\n")
348 return 0 348 return 0
349 if premerge not in validkeep: 349 if premerge not in validkeep:
370 of merge, unless mode equals 'union' which suppresses the markers.""" 370 of merge, unless mode equals 'union' which suppresses the markers."""
371 a, b, c, back = files 371 a, b, c, back = files
372 372
373 ui = repo.ui 373 ui = repo.ui
374 374
375 r = simplemerge.simplemerge(ui, a, b, c, fcd, fca, fco, 375 r = simplemerge.simplemerge(ui, fcd, fca, fco,
376 label=labels, mode=mode, repo=repo) 376 label=labels, mode=mode, repo=repo)
377 return True, r, False 377 return True, r, False
378 378
379 @internaltool('union', fullmerge, 379 @internaltool('union', fullmerge,
380 _("warning: conflicts while merging %s! " 380 _("warning: conflicts while merging %s! "
423 Generic driver for _imergelocal and _imergeother 423 Generic driver for _imergelocal and _imergeother
424 """ 424 """
425 assert localorother is not None 425 assert localorother is not None
426 tool, toolpath, binary, symlink = toolconf 426 tool, toolpath, binary, symlink = toolconf
427 a, b, c, back = files 427 a, b, c, back = files
428 r = simplemerge.simplemerge(repo.ui, a, b, c, fcd, fca, fco, 428 r = simplemerge.simplemerge(repo.ui, fcd, fca, fco,
429 label=labels, localorother=localorother, 429 label=labels, localorother=localorother,
430 repo=repo) 430 repo=repo)
431 return True, r 431 return True, r
432 432
433 @internaltool('merge-local', mergeonly, precheck=_mergecheck) 433 @internaltool('merge-local', mergeonly, precheck=_mergecheck)