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

[PATCH] Be more like the 'resolve' strategy.

Browse Source 
If there are non-mergeable changes leave the head contents in the
cache and update the working directory with the output from merge(1).

In the add/add and delete/modify conflict cases leave unmerged cache
entries in the index.

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-09-13 23:39:34 +02:00 committed by Junio C Hamano
parent ccfd3e9962
commit d9a23fa6f7
1 changed files with 33 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
git-merge-recursive.py
View File

@ -7,8 +7,6 @@ from sets import Set
sys.path.append('@@GIT_PYTHON_PATH@@') sys.path.append('@@GIT_PYTHON_PATH@@')
from gitMergeCommon import * from gitMergeCommon import *
alwaysWriteTree = False
# The actual merge code # The actual merge code
# --------------------- # ---------------------
@ -46,19 +44,14 @@ def merge(h1, h2, branch1Name, branch2Name, graph, callDepth=0):
runProgram(['git-update-cache', '-q', '--refresh']) runProgram(['git-update-cache', '-q', '--refresh'])
# Use the original index if we only have one common ancestor # Use the original index if we only have one common ancestor
updateWd = True cleanCache = False
if alwaysWriteTree:
cleanCache = True
else:
cleanCache = False
else: else:
runProgram(['git-read-tree', h1.tree()]) runProgram(['git-read-tree', h1.tree()])
updateWd = False
cleanCache = True cleanCache = True
[shaRes, clean] = mergeTrees(h1.tree(), h2.tree(), Ms.tree(), [shaRes, clean] = mergeTrees(h1.tree(), h2.tree(), Ms.tree(),
branch1Name, branch2Name, branch1Name, branch2Name,
cleanCache, updateWd) cleanCache)
if clean or cleanCache: if clean or cleanCache:
res = Commit(None, [h1, h2], tree=shaRes) res = Commit(None, [h1, h2], tree=shaRes)
@ -125,7 +118,7 @@ def unmergedCacheEntries():
return res return res
def mergeTrees(head, merge, common, branch1Name, branch2Name, def mergeTrees(head, merge, common, branch1Name, branch2Name,
cleanCache, updateWd): cleanCache):
'''Merge the trees 'head' and 'merge' with the common ancestor '''Merge the trees 'head' and 'merge' with the common ancestor
'common'. The name of the head branch is 'branch1Name' and the name of 'common'. The name of the head branch is 'branch1Name' and the name of
the merge branch is 'branch2Name'. Return a tuple (tree, cleanMerge) the merge branch is 'branch2Name'. Return a tuple (tree, cleanMerge)
@ -138,10 +131,11 @@ def mergeTrees(head, merge, common, branch1Name, branch2Name,
print 'Already uptodate!' print 'Already uptodate!'
return [head, True] return [head, True]
if updateWd: if cleanCache:
updateArg = '-u'
else:
updateArg = '-i' updateArg = '-i'
else:
updateArg = '-u'
runProgram(['git-read-tree', updateArg, '-m', common, head, merge]) runProgram(['git-read-tree', updateArg, '-m', common, head, merge])
cleanMerge = True cleanMerge = True
@ -157,7 +151,7 @@ def mergeTrees(head, merge, common, branch1Name, branch2Name,
entries = unmergedCacheEntries() entries = unmergedCacheEntries()
for name in entries: for name in entries:
if not processEntry(entries[name], branch1Name, branch2Name, if not processEntry(entries[name], branch1Name, branch2Name,
files, dirs, cleanCache, updateWd): files, dirs, cleanCache):
cleanMerge = False cleanMerge = False
if cleanMerge or cleanCache: if cleanMerge or cleanCache:
@ -169,29 +163,25 @@ def mergeTrees(head, merge, common, branch1Name, branch2Name,
return [tree, cleanMerge] return [tree, cleanMerge]
def processEntry(entry, branch1Name, branch2Name, files, dirs, def processEntry(entry, branch1Name, branch2Name, files, dirs, cleanCache):
cleanCache, updateWd):
'''Merge one cache entry. 'files' is a Set with the files in both of '''Merge one cache entry. 'files' is a Set with the files in both of
the heads that we are going to merge. 'dirs' contains the the heads that we are going to merge. 'dirs' contains the
corresponding data for directories. If 'cleanCache' is True no corresponding data for directories. If 'cleanCache' is True no
non-zero stages will be left in the cache for the path non-zero stages will be left in the cache for the path
corresponding to the entry 'entry'.''' corresponding to the entry 'entry'.'''
# cleanCache == True => Don't leave any non-stage 0 entries in the cache. # cleanCache == True => Don't leave any non-stage 0 entries in the cache and
# False => Leave unmerged entries # don't update the working directory
# False => Leave unmerged entries and update the working directory
# updateWd == True => Update the working directory to correspond to the cache
# False => Leave the working directory unchanged
# clean == True => non-conflict case # clean == True => non-conflict case
# False => conflict case # False => conflict case
# If cleanCache == False then the cache shouldn't be updated if clean == False # If cleanCache == False then the cache shouldn't be updated if clean == False
def updateFile(clean, sha, mode, path): def updateFile(clean, sha, mode, path, onlyWd=False):
if cleanCache or (not cleanCache and clean): updateCache = not onlyWd and (cleanCache or (not cleanCache and clean))
runProgram(['git-update-cache', '--add', '--cacheinfo', updateWd = onlyWd or (not cleanCache and clean)
'0%o' % mode, sha, path])
if updateWd: if updateWd:
prog = ['git-cat-file', 'blob', sha] prog = ['git-cat-file', 'blob', sha]
@ -213,13 +203,18 @@ def processEntry(entry, branch1Name, branch2Name, files, dirs,
os.symlink(linkTarget, path) os.symlink(linkTarget, path)
else: else:
assert(False) assert(False)
runProgram(['git-update-cache', '--', path])
if updateWd and updateCache:
runProgram(['git-update-cache', '--add', '--', path])
elif updateCache:
runProgram(['git-update-cache', '--add', '--cacheinfo',
'0%o' % mode, sha, path])
def removeFile(clean, path): def removeFile(clean, path):
if cleanCache or (not cleanCache and clean): if cleanCache or (not cleanCache and clean):
runProgram(['git-update-cache', '--force-remove', '--', path]) runProgram(['git-update-cache', '--force-remove', '--', path])
if updateWd: if not cleanCache and clean:
try: try:
os.unlink(path) os.unlink(path)
except OSError, e: except OSError, e:
@ -235,8 +230,7 @@ def processEntry(entry, branch1Name, branch2Name, files, dirs,
files.add(newPath) files.add(newPath)
return newPath return newPath
debug('processing', entry.path, 'clean cache:', cleanCache, debug('processing', entry.path, 'clean cache:', cleanCache)
'wd:', updateWd)
cleanMerge = True cleanMerge = True
@ -327,9 +321,9 @@ def processEntry(entry, branch1Name, branch2Name, files, dirs,
if aMode != bMode: if aMode != bMode:
cleanMerge = False cleanMerge = False
print 'CONFLICT: File "' + path + \ print 'CONFLICT: File "' + path + \
'" added identically in both branches,' '" added identically in both branches,', \
print 'CONFLICT: but permissions conflict', '0%o' % aMode, \ 'but permissions conflict', '0%o' % aMode, '->', \
'->', '0%o' % bMode '0%o' % bMode
print 'CONFLICT: adding with permission:', '0%o' % aMode print 'CONFLICT: adding with permission:', '0%o' % aMode
updateFile(False, aSha, aMode, path) updateFile(False, aSha, aMode, path)
@ -341,8 +335,7 @@ def processEntry(entry, branch1Name, branch2Name, files, dirs,
newPath1 = uniquePath(path, branch1Name) newPath1 = uniquePath(path, branch1Name)
newPath2 = uniquePath(path, branch2Name) newPath2 = uniquePath(path, branch2Name)
print 'CONFLICT (add/add): File "' + path + \ print 'CONFLICT (add/add): File "' + path + \
'" added non-identically in both branches.', \ '" added non-identically in both branches.'
'Adding "' + newPath1 + '" and "' + newPath2 + '" instead.'
removeFile(False, path) removeFile(False, path)
updateFile(False, aSha, aMode, newPath1) updateFile(False, aSha, aMode, newPath1)
updateFile(False, bSha, bMode, newPath2) updateFile(False, bSha, bMode, newPath2)
@ -372,7 +365,12 @@ def processEntry(entry, branch1Name, branch2Name, files, dirs,
if ret != 0: if ret != 0:
cleanMerge = False cleanMerge = False
print 'CONFLICT (content): Merge conflict in "' + path + '".' print 'CONFLICT (content): Merge conflict in "' + path + '".'
updateFile(False, sha, mode, path)
if cleanCache:
updateFile(False, sha, mode, path)
else:
updateFile(True, aSha, aMode, path)
updateFile(False, sha, mode, path, True)
else: else:
updateFile(True, sha, mode, path) updateFile(True, sha, mode, path)