##// END OF EJS Templates
filemerge: use revset notation for p1/p2 of local/other descriptions
timeless -
r28640:4fc640fd default
parent child Browse files
Show More
@@ -230,8 +230,8 b' def _matcheol(file, origfile):'
230
230
231 @internaltool('prompt', nomerge)
231 @internaltool('prompt', nomerge)
232 def _iprompt(repo, mynode, orig, fcd, fco, fca, toolconf):
232 def _iprompt(repo, mynode, orig, fcd, fco, fca, toolconf):
233 """Asks the user which of the local (p1) or the other (p2) version to keep
233 """Asks the user which of the local `p1()` or the other `p2()` version to
234 as the merged version."""
234 keep as the merged version."""
235 ui = repo.ui
235 ui = repo.ui
236 fd = fcd.path()
236 fd = fcd.path()
237
237
@@ -268,12 +268,12 b' def _iprompt(repo, mynode, orig, fcd, fc'
268
268
269 @internaltool('local', nomerge)
269 @internaltool('local', nomerge)
270 def _ilocal(repo, mynode, orig, fcd, fco, fca, toolconf):
270 def _ilocal(repo, mynode, orig, fcd, fco, fca, toolconf):
271 """Uses the local (p1) version of files as the merged version."""
271 """Uses the local `p1()` version of files as the merged version."""
272 return 0, fcd.isabsent()
272 return 0, fcd.isabsent()
273
273
274 @internaltool('other', nomerge)
274 @internaltool('other', nomerge)
275 def _iother(repo, mynode, orig, fcd, fco, fca, toolconf):
275 def _iother(repo, mynode, orig, fcd, fco, fca, toolconf):
276 """Uses the other (p2) version of files as the merged version."""
276 """Uses the other `p2()` version of files as the merged version."""
277 if fco.isabsent():
277 if fco.isabsent():
278 # local changed, remote deleted -- 'deleted' picked
278 # local changed, remote deleted -- 'deleted' picked
279 repo.wvfs.unlinkpath(fcd.path())
279 repo.wvfs.unlinkpath(fcd.path())
@@ -411,7 +411,7 b' def _imergeauto(repo, mynode, orig, fcd,'
411 def _imergelocal(*args, **kwargs):
411 def _imergelocal(*args, **kwargs):
412 """
412 """
413 Like :merge, but resolve all conflicts non-interactively in favor
413 Like :merge, but resolve all conflicts non-interactively in favor
414 of the local (p1) changes."""
414 of the local `p1()` changes."""
415 success, status = _imergeauto(localorother='local', *args, **kwargs)
415 success, status = _imergeauto(localorother='local', *args, **kwargs)
416 return success, status, False
416 return success, status, False
417
417
@@ -419,7 +419,7 b' def _imergelocal(*args, **kwargs):'
419 def _imergeother(*args, **kwargs):
419 def _imergeother(*args, **kwargs):
420 """
420 """
421 Like :merge, but resolve all conflicts non-interactively in favor
421 Like :merge, but resolve all conflicts non-interactively in favor
422 of the other (p2) changes."""
422 of the other `p2()` changes."""
423 success, status = _imergeauto(localorother='other', *args, **kwargs)
423 success, status = _imergeauto(localorother='other', *args, **kwargs)
424 return success, status, False
424 return success, status, False
425
425
@@ -1540,7 +1540,7 b' Test dynamic list of merge tools only sh'
1540 to resolve these conflicts.
1540 to resolve these conflicts.
1541
1541
1542 ":local"
1542 ":local"
1543 Uses the local (p1) version of files as the merged version.
1543 Uses the local 'p1()' version of files as the merged version.
1544
1544
1545 ":merge"
1545 ":merge"
1546 Uses the internal non-interactive simple merge algorithm for merging
1546 Uses the internal non-interactive simple merge algorithm for merging
@@ -1550,11 +1550,11 b' Test dynamic list of merge tools only sh'
1550
1550
1551 ":merge-local"
1551 ":merge-local"
1552 Like :merge, but resolve all conflicts non-interactively in favor of the
1552 Like :merge, but resolve all conflicts non-interactively in favor of the
1553 local (p1) changes.
1553 local 'p1()' changes.
1554
1554
1555 ":merge-other"
1555 ":merge-other"
1556 Like :merge, but resolve all conflicts non-interactively in favor of the
1556 Like :merge, but resolve all conflicts non-interactively in favor of the
1557 other (p2) changes.
1557 other 'p2()' changes.
1558
1558
1559 ":merge3"
1559 ":merge3"
1560 Uses the internal non-interactive simple merge algorithm for merging
1560 Uses the internal non-interactive simple merge algorithm for merging
@@ -1563,11 +1563,11 b' Test dynamic list of merge tools only sh'
1563 side of the merge and one for the base content.
1563 side of the merge and one for the base content.
1564
1564
1565 ":other"
1565 ":other"
1566 Uses the other (p2) version of files as the merged version.
1566 Uses the other 'p2()' version of files as the merged version.
1567
1567
1568 ":prompt"
1568 ":prompt"
1569 Asks the user which of the local (p1) or the other (p2) version to keep
1569 Asks the user which of the local 'p1()' or the other 'p2()' version to
1570 as the merged version.
1570 keep as the merged version.
1571
1571
1572 ":tagmerge"
1572 ":tagmerge"
1573 Uses the internal tag merge algorithm (experimental).
1573 Uses the internal tag merge algorithm (experimental).
General Comments 0
You need to be logged in to leave comments. Login now