summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
28e77a8)
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>
oSHA1, oMode,
aSHA1, aMode,
bSHA1, bMode):
oSHA1, oMode,
aSHA1, aMode,
bSHA1, bMode):
- prog = ['git-update-index', '-z', '--index-info']
- proc = subprocess.Popen(prog, stdin=subprocess.PIPE)
- pipe = proc.stdin
- # Clear stages first.
- pipe.write("0 " + ("0" * 40) + "\t" + path + "\0")
- # 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()
+ runProgram(['git-update-index', '-z', '--index-info'],
+ input="0 " + ("0" * 40) + "\t" + path + "\0" + \
+ "%o %s %d\t%s\0" % (oMode, oSHA1, 1, path) + \
+ "%o %s %d\t%s\0" % (aMode, aSHA1, 2, path) + \
+ "%o %s %d\t%s\0" % (bMode, bSHA1, 3, path))
def removeFile(clean, path):
updateCache = cacheOnly or clean
def removeFile(clean, path):
updateCache = cacheOnly or clean
cleanMerge = False
if not cacheOnly:
cleanMerge = False
if not cacheOnly:
setIndexStages(ren1.dstName,
oSHA1, oMode,
aSHA1, aMode,
setIndexStages(ren1.dstName,
oSHA1, oMode,
aSHA1, aMode,