mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge-recursive: cleanup setIndexStages

Browse Source 
Fredrik points out there is a useful wrapper runProgram() used
everywhere that we can use to feed input into subprocess.  Use
it to catch errors from the subprocess; it is a good cleanup as
well.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano
2005-12-11 01:55:52 -08:00
parent 28e77a8164
commit 157dc07368
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
git-merge-recursive.py
View File

@ -284,17 +284,11 @@ def setIndexStages(path,
oSHA1, oMode, oSHA1, oMode,
aSHA1, aMode, aSHA1, aMode,
bSHA1, bMode): bSHA1, bMode):
prog = ['git-update-index', '-z', '--index-info'] runProgram(['git-update-index', '-z', '--index-info'],
proc = subprocess.Popen(prog, stdin=subprocess.PIPE) input="0 " + ("0" * 40) + "\t" + path + "\0" + \
pipe = proc.stdin "%o %s %d\t%s\0" % (oMode, oSHA1, 1, path) + \
# Clear stages first. "%o %s %d\t%s\0" % (aMode, aSHA1, 2, path) + \
pipe.write("0 " + ("0" * 40) + "\t" + path + "\0") "%o %s %d\t%s\0" % (bMode, bSHA1, 3, path))
# Set stages
pipe.write("%o %s %d\t%s\0" % (oMode, oSHA1, 1, path))
pipe.write("%o %s %d\t%s\0" % (aMode, aSHA1, 2, path))
pipe.write("%o %s %d\t%s\0" % (bMode, bSHA1, 3, path))
pipe.close()
proc.wait()
def removeFile(clean, path): def removeFile(clean, path):
updateCache = cacheOnly or clean updateCache = cacheOnly or clean
@ -724,7 +718,6 @@ def processRenames(renamesA, renamesB, branchNameA, branchNameB):
cleanMerge = False cleanMerge = False
if not cacheOnly: if not cacheOnly:
# Stuff stage1/2/3
setIndexStages(ren1.dstName, setIndexStages(ren1.dstName,
oSHA1, oMode, oSHA1, oMode,
aSHA1, aMode, aSHA1, aMode,