@matheusbsbs / matheus-bagliano / commits / 46e651743a
Fork 0

merge-recursive: Indent the output properly

If we have multiple common ancestors and have to recursively merge them then the output will be much more readable with this commit. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>

Fredrik Kuivinen committed Nov 12, 2005 at 00:53 UTC 46e651743ae5c0938c4ff076a0453ecc9611a520
1 file changed +69 -61
git-merge-recursive.py
+69 -61
@@ -7,6 +7,11 @@ from sets import Set
7 sys.path.append('''@@GIT_PYTHON_PATH@@''')
8 from gitMergeCommon import *
9
10 +outputIndent = 0
11 +def output(*args):
12 + sys.stdout.write(' '*outputIndent)
13 + printList(args)
14 +
15 originalIndexFile = os.environ.get('GIT_INDEX_FILE',
16 os.environ.get('GIT_DIR', '.git') + '/index')
17 temporaryIndexFile = os.environ.get('GIT_DIR', '.git') + \
@@ -41,27 +46,27 @@ def merge(h1, h2, branch1Name, branch2Name, graph, callDepth=0):
46 assert(isinstance(h1, Commit) and isinstance(h2, Commit))
47 assert(isinstance(graph, Graph))
48
44 - def infoMsg(*args):
45 - sys.stdout.write(' '*callDepth)
46 - printList(args)
49 + global outputIndent
50
48 - infoMsg('Merging:')
49 - infoMsg(h1)
50 - infoMsg(h2)
51 + output('Merging:')
52 + output(h1)
53 + output(h2)
54 sys.stdout.flush()
55
56 ca = getCommonAncestors(graph, h1, h2)
54 - infoMsg('found', len(ca), 'common ancestor(s):')
57 + output('found', len(ca), 'common ancestor(s):')
58 for x in ca:
56 - infoMsg(x)
59 + output(x)
60 sys.stdout.flush()
61
62 mergedCA = ca[0]
63 for h in ca[1:]:
64 + outputIndent = callDepth+1
65 [mergedCA, dummy] = merge(mergedCA, h,
62 - 'Temporary shared merge branch 1',
63 - 'Temporary shared merge branch 2',
66 + 'Temporary merge branch 1',
67 + 'Temporary merge branch 2',
68 graph, callDepth+1)
69 + outputIndent = callDepth
70 assert(isinstance(mergedCA, Commit))
71
72 global cacheOnly
@@ -116,7 +121,7 @@ def mergeTrees(head, merge, common, branch1Name, branch2Name):
121 assert(isSha(head) and isSha(merge) and isSha(common))
122
123 if common == merge:
119 - print 'Already uptodate!'
124 + output('Already uptodate!')
125 return [head, True]
126
127 if cacheOnly:
@@ -554,23 +559,24 @@ def processRenames(renamesA, renamesB, branchNameA, branchNameB):
559 ren2.processed = True
560
561 if ren1.dstName != ren2.dstName:
557 - print 'CONFLICT (rename/rename): Rename', \
558 - fmtRename(path, ren1.dstName), 'in branch', branchName1, \
559 - 'rename', fmtRename(path, ren2.dstName), 'in', branchName2
562 + output('CONFLICT (rename/rename): Rename',
563 + fmtRename(path, ren1.dstName), 'in branch', branchName1,
564 + 'rename', fmtRename(path, ren2.dstName), 'in',
565 + branchName2)
566 cleanMerge = False
567
568 if ren1.dstName in currentDirectorySet:
569 dstName1 = uniquePath(ren1.dstName, branchName1)
564 - print ren1.dstName, 'is a directory in', branchName2, \
565 - 'adding as', dstName1, 'instead.'
570 + output(ren1.dstName, 'is a directory in', branchName2,
571 + 'adding as', dstName1, 'instead.')
572 removeFile(False, ren1.dstName)
573 else:
574 dstName1 = ren1.dstName
575
576 if ren2.dstName in currentDirectorySet:
577 dstName2 = uniquePath(ren2.dstName, branchName2)
572 - print ren2.dstName, 'is a directory in', branchName1, \
573 - 'adding as', dstName2, 'instead.'
578 + output(ren2.dstName, 'is a directory in', branchName1,
579 + 'adding as', dstName2, 'instead.')
580 removeFile(False, ren2.dstName)
581 else:
582 dstName2 = ren1.dstName
@@ -585,13 +591,14 @@ def processRenames(renamesA, renamesB, branchNameA, branchNameB):
591 branchName1, branchName2)
592
593 if merge or not clean:
588 - print 'Renaming', fmtRename(path, ren1.dstName)
594 + output('Renaming', fmtRename(path, ren1.dstName))
595
596 if merge:
591 - print 'Auto-merging', ren1.dstName
597 + output('Auto-merging', ren1.dstName)
598
599 if not clean:
594 - print 'CONFLICT (content): merge conflict in', ren1.dstName
600 + output('CONFLICT (content): merge conflict in',
601 + ren1.dstName)
602 cleanMerge = False
603
604 if not cacheOnly:
@@ -615,25 +622,25 @@ def processRenames(renamesA, renamesB, branchNameA, branchNameB):
622
623 if ren1.dstName in currentDirectorySet:
624 newPath = uniquePath(ren1.dstName, branchName1)
618 - print 'CONFLICT (rename/directory): Rename', \
619 - fmtRename(ren1.srcName, ren1.dstName), 'in', branchName1,\
620 - 'directory', ren1.dstName, 'added in', branchName2
621 - print 'Renaming', ren1.srcName, 'to', newPath, 'instead'
625 + output('CONFLICT (rename/directory): Rename',
626 + fmtRename(ren1.srcName, ren1.dstName), 'in', branchName1,
627 + 'directory', ren1.dstName, 'added in', branchName2)
628 + output('Renaming', ren1.srcName, 'to', newPath, 'instead')
629 cleanMerge = False
630 removeFile(False, ren1.dstName)
631 updateFile(False, ren1.dstSha, ren1.dstMode, newPath)
632 elif srcShaOtherBranch == None:
626 - print 'CONFLICT (rename/delete): Rename', \
627 - fmtRename(ren1.srcName, ren1.dstName), 'in', \
628 - branchName1, 'and deleted in', branchName2
633 + output('CONFLICT (rename/delete): Rename',
634 + fmtRename(ren1.srcName, ren1.dstName), 'in',
635 + branchName1, 'and deleted in', branchName2)
636 cleanMerge = False
637 updateFile(False, ren1.dstSha, ren1.dstMode, ren1.dstName)
638 elif dstShaOtherBranch:
639 newPath = uniquePath(ren1.dstName, branchName2)
633 - print 'CONFLICT (rename/add): Rename', \
634 - fmtRename(ren1.srcName, ren1.dstName), 'in', \
635 - branchName1 + '.', ren1.dstName, 'added in', branchName2
636 - print 'Adding as', newPath, 'instead'
640 + output('CONFLICT (rename/add): Rename',
641 + fmtRename(ren1.srcName, ren1.dstName), 'in',
642 + branchName1 + '.', ren1.dstName, 'added in', branchName2)
643 + output('Adding as', newPath, 'instead')
644 updateFile(False, dstShaOtherBranch, dstModeOtherBranch, newPath)
645 cleanMerge = False
646 tryMerge = True
@@ -641,12 +648,12 @@ def processRenames(renamesA, renamesB, branchNameA, branchNameB):
648 dst2 = renames2.getDst(ren1.dstName)
649 newPath1 = uniquePath(ren1.dstName, branchName1)
650 newPath2 = uniquePath(dst2.dstName, branchName2)
644 - print 'CONFLICT (rename/rename): Rename', \
645 - fmtRename(ren1.srcName, ren1.dstName), 'in', \
646 - branchName1+'. Rename', \
647 - fmtRename(dst2.srcName, dst2.dstName), 'in', branchName2
648 - print 'Renaming', ren1.srcName, 'to', newPath1, 'and', \
649 - dst2.srcName, 'to', newPath2, 'instead'
651 + output('CONFLICT (rename/rename): Rename',
652 + fmtRename(ren1.srcName, ren1.dstName), 'in',
653 + branchName1+'. Rename',
654 + fmtRename(dst2.srcName, dst2.dstName), 'in', branchName2)
655 + output('Renaming', ren1.srcName, 'to', newPath1, 'and',
656 + dst2.srcName, 'to', newPath2, 'instead')
657 removeFile(False, ren1.dstName)
658 updateFile(False, ren1.dstSha, ren1.dstMode, newPath1)
659 updateFile(False, dst2.dstSha, dst2.dstMode, newPath2)
@@ -663,13 +670,14 @@ def processRenames(renamesA, renamesB, branchNameA, branchNameB):
670 branchName1, branchName2)
671
672 if merge or not clean:
666 - print 'Renaming', fmtRename(ren1.srcName, ren1.dstName)
673 + output('Renaming', fmtRename(ren1.srcName, ren1.dstName))
674
675 if merge:
669 - print 'Auto-merging', ren1.dstName
676 + output('Auto-merging', ren1.dstName)
677
678 if not clean:
672 - print 'CONFLICT (rename/modify): Merge conflict in', ren1.dstName
679 + output('CONFLICT (rename/modify): Merge conflict in',
680 + ren1.dstName)
681 cleanMerge = False
682
683 if not cacheOnly:
@@ -714,21 +722,21 @@ def processEntry(entry, branch1Name, branch2Name):
722 (not aSha and bSha == oSha):
723 # Deleted in both or deleted in one and unchanged in the other
724 if aSha:
717 - print 'Removing', path
725 + output('Removing', path)
726 removeFile(True, path)
727 else:
728 # Deleted in one and changed in the other
729 cleanMerge = False
730 if not aSha:
723 - print 'CONFLICT (delete/modify):', path, 'deleted in', \
724 - branch1Name, 'and modified in', branch2Name + '.', \
725 - 'Version', branch2Name, 'of', path, 'left in tree.'
731 + output('CONFLICT (delete/modify):', path, 'deleted in',
732 + branch1Name, 'and modified in', branch2Name + '.',
733 + 'Version', branch2Name, 'of', path, 'left in tree.')
734 mode = bMode
735 sha = bSha
736 else:
729 - print 'CONFLICT (modify/delete):', path, 'deleted in', \
730 - branch2Name, 'and modified in', branch1Name + '.', \
731 - 'Version', branch1Name, 'of', path, 'left in tree.'
737 + output('CONFLICT (modify/delete):', path, 'deleted in',
738 + branch2Name, 'and modified in', branch1Name + '.',
739 + 'Version', branch1Name, 'of', path, 'left in tree.')
740 mode = aMode
741 sha = aSha
742
@@ -755,14 +763,14 @@ def processEntry(entry, branch1Name, branch2Name):
763 if path in currentDirectorySet:
764 cleanMerge = False
765 newPath = uniquePath(path, addBranch)
758 - print 'CONFLICT (' + conf + '):', \
759 - 'There is a directory with name', path, 'in', \
760 - otherBranch + '. Adding', path, 'as', newPath
766 + output('CONFLICT (' + conf + '):',
767 + 'There is a directory with name', path, 'in',
768 + otherBranch + '. Adding', path, 'as', newPath)
769
770 removeFile(False, path)
771 updateFile(False, sha, mode, newPath)
772 else:
765 - print 'Adding', path
773 + output('Adding', path)
774 updateFile(True, sha, mode, path)
775
776 elif not oSha and aSha and bSha:
@@ -772,10 +780,10 @@ def processEntry(entry, branch1Name, branch2Name):
780 if aSha == bSha:
781 if aMode != bMode:
782 cleanMerge = False
775 - print 'CONFLICT: File', path, \
776 - 'added identically in both branches, but permissions', \
777 - 'conflict', '0%o' % aMode, '->', '0%o' % bMode
778 - print 'CONFLICT: adding with permission:', '0%o' % aMode
783 + output('CONFLICT: File', path,
784 + 'added identically in both branches, but permissions',
785 + 'conflict', '0%o' % aMode, '->', '0%o' % bMode)
786 + output('CONFLICT: adding with permission:', '0%o' % aMode)
787
788 updateFile(False, aSha, aMode, path)
789 else:
@@ -785,9 +793,9 @@ def processEntry(entry, branch1Name, branch2Name):
793 cleanMerge = False
794 newPath1 = uniquePath(path, branch1Name)
795 newPath2 = uniquePath(path, branch2Name)
788 - print 'CONFLICT (add/add): File', path, \
789 - 'added non-identically in both branches. Adding as', \
790 - newPath1, 'and', newPath2, 'instead.'
796 + output('CONFLICT (add/add): File', path,
797 + 'added non-identically in both branches. Adding as',
798 + newPath1, 'and', newPath2, 'instead.')
799 removeFile(False, path)
800 updateFile(False, aSha, aMode, newPath1)
801 updateFile(False, bSha, bMode, newPath2)
@@ -796,7 +804,7 @@ def processEntry(entry, branch1Name, branch2Name):
804 #
805 # case D: Modified in both, but differently.
806 #
799 - print 'Auto-merging', path
807 + output('Auto-merging', path)
808 [sha, mode, clean, dummy] = \
809 mergeFile(path, oSha, oMode,
810 path, aSha, aMode,
@@ -806,7 +814,7 @@ def processEntry(entry, branch1Name, branch2Name):
814 updateFile(True, sha, mode, path)
815 else:
816 cleanMerge = False
809 - print 'CONFLICT (content): Merge conflict in', path
817 + output('CONFLICT (content): Merge conflict in', path)
818
819 if cacheOnly:
820 updateFile(False, sha, mode, path)