undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge-recursive: Fix limited output of rename messages

Browse Source 
The previous code did the right thing, but it did it by accident.

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Fredrik Kuivinen 2005-11-09 11:36:55 +01:00 committed by Junio C Hamano
parent e09f5d7b07
commit c8a4f5e542
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
git-merge-recursive.py
View File

@ -162,13 +162,10 @@ def mergeTrees(head, merge, common, branch1Name, branch2Name):
# Low level file merging, update and removal # Low level file merging, update and removal
# ------------------------------------------ # ------------------------------------------
MERGE_NONE = 0
MERGE_TRIVIAL = 1
MERGE_3WAY = 2
def mergeFile(oPath, oSha, oMode, aPath, aSha, aMode, bPath, bSha, bMode, def mergeFile(oPath, oSha, oMode, aPath, aSha, aMode, bPath, bSha, bMode,
branch1Name, branch2Name): branch1Name, branch2Name):
merge = MERGE_NONE merge = False
clean = True clean = True
if stat.S_IFMT(aMode) != stat.S_IFMT(bMode): if stat.S_IFMT(aMode) != stat.S_IFMT(bMode):
@ -181,7 +178,7 @@ def mergeFile(oPath, oSha, oMode, aPath, aSha, aMode, bPath, bSha, bMode,
sha = bSha sha = bSha
else: else:
if aSha != oSha and bSha != oSha: if aSha != oSha and bSha != oSha:
merge = MERGE_TRIVIAL merge = True
if aMode == oMode: if aMode == oMode:
mode = bMode mode = bMode
@ -211,7 +208,6 @@ def mergeFile(oPath, oSha, oMode, aPath, aSha, aMode, bPath, bSha, bMode,
os.unlink(src1) os.unlink(src1)
os.unlink(src2) os.unlink(src2)
merge = MERGE_3WAY
clean = (code == 0) clean = (code == 0)
else: else:
assert(stat.S_ISLNK(aMode) and stat.S_ISLNK(bMode)) assert(stat.S_ISLNK(aMode) and stat.S_ISLNK(bMode))
@ -590,7 +586,7 @@ def processRenames(renamesA, renamesB, branchNameA, branchNameB):
if merge or not clean: if merge or not clean:
print 'Renaming', fmtRename(path, ren1.dstName) print 'Renaming', fmtRename(path, ren1.dstName)
if merge == MERGE_3WAY: if merge:
print 'Auto-merging', ren1.dstName print 'Auto-merging', ren1.dstName
if not clean: if not clean:
@ -668,7 +664,7 @@ def processRenames(renamesA, renamesB, branchNameA, branchNameB):
if merge or not clean: if merge or not clean:
print 'Renaming', fmtRename(ren1.srcName, ren1.dstName) print 'Renaming', fmtRename(ren1.srcName, ren1.dstName)
if merge == MERGE_3WAY: if merge:
print 'Auto-merging', ren1.dstName print 'Auto-merging', ren1.dstName
if not clean: if not clean: