@matheusbsbs / matheus-bagliano / commits / d1745afa2f
Fork 0

merge-recursive: Only print relevant rename messages

It isn't really interesting to know about the renames that have already been committed to the branch you are working on. Furthermore, the 'git-apply --stat' at the end of git-(merge|pull) will tell us about any renames in the other branch. With this commit only renames which require a file-level merge will be printed. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>

Fredrik Kuivinen committed Nov 8, 2005 at 00:19 UTC d1745afa2f062764b075300bda06aac1402dfcf6
1 file changed +15 -7
git-merge-recursive.py
+15 -7
@@ -162,10 +162,13 @@ def mergeTrees(head, merge, common, branch1Name, branch2Name):
162 # Low level file merging, update and removal
163 # ------------------------------------------
164
165 +MERGE_NONE = 0
166 +MERGE_TRIVIAL = 1
167 +MERGE_3WAY = 2
168 def mergeFile(oPath, oSha, oMode, aPath, aSha, aMode, bPath, bSha, bMode,
169 branch1Name, branch2Name):
170
168 - merge = False
171 + merge = MERGE_NONE
172 clean = True
173
174 if stat.S_IFMT(aMode) != stat.S_IFMT(bMode):
@@ -178,7 +181,7 @@ def mergeFile(oPath, oSha, oMode, aPath, aSha, aMode, bPath, bSha, bMode,
181 sha = bSha
182 else:
183 if aSha != oSha and bSha != oSha:
181 - merge = True
184 + merge = MERGE_TRIVIAL
185
186 if aMode == oMode:
187 mode = bMode
@@ -207,7 +210,8 @@ def mergeFile(oPath, oSha, oMode, aPath, aSha, aMode, bPath, bSha, bMode,
210 os.unlink(orig)
211 os.unlink(src1)
212 os.unlink(src2)
210 -
213 +
214 + merge = MERGE_3WAY
215 clean = (code == 0)
216 else:
217 assert(stat.S_ISLNK(aMode) and stat.S_ISLNK(bMode))
@@ -577,14 +581,16 @@ def processRenames(renamesA, renamesB, branchNameA, branchNameB):
581 updateFile(False, ren1.dstSha, ren1.dstMode, dstName1)
582 updateFile(False, ren2.dstSha, ren2.dstMode, dstName2)
583 else:
580 - print 'Renaming', fmtRename(path, ren1.dstName)
584 [resSha, resMode, clean, merge] = \
585 mergeFile(ren1.srcName, ren1.srcSha, ren1.srcMode,
586 ren1.dstName, ren1.dstSha, ren1.dstMode,
587 ren2.dstName, ren2.dstSha, ren2.dstMode,
588 branchName1, branchName2)
589
587 - if merge:
590 + if merge or not clean:
591 + print 'Renaming', fmtRename(path, ren1.dstName)
592 +
593 + if merge == MERGE_3WAY:
594 print 'Auto-merging', ren1.dstName
595
596 if not clean:
@@ -653,14 +659,16 @@ def processRenames(renamesA, renamesB, branchNameA, branchNameB):
659 tryMerge = True
660
661 if tryMerge:
656 - print 'Renaming', fmtRename(ren1.srcName, ren1.dstName)
662 [resSha, resMode, clean, merge] = \
663 mergeFile(ren1.srcName, ren1.srcSha, ren1.srcMode,
664 ren1.dstName, ren1.dstSha, ren1.dstMode,
665 ren1.srcName, srcShaOtherBranch, srcModeOtherBranch,
666 branchName1, branchName2)
667
663 - if merge:
668 + if merge or not clean:
669 + print 'Renaming', fmtRename(ren1.srcName, ren1.dstName)
670 +
671 + if merge == MERGE_3WAY:
672 print 'Auto-merging', ren1.dstName
673
674 if not clean: