Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
e.stages[stage].mode = mode
e.stages[stage].sha1 = sha1
else:
e.stages[stage].mode = mode
e.stages[stage].sha1 = sha1
else:
- print 'Error: Merge program failed: Unexpected output from', \
- 'git-ls-files:', l
- sys.exit(2)
+ die('Error: Merge program failed: Unexpected output from', \
+ 'git-ls-files:', l)
return res
def mergeTrees(head, merge, common, branch1Name, branch2Name,
return res
def mergeTrees(head, merge, common, branch1Name, branch2Name,
os.unlink(src1)
os.unlink(src2)
else:
os.unlink(src1)
os.unlink(src2)
else:
- print 'ERROR: Fatal merge failure.'
- print "ERROR: Shouldn't happen"
- sys.exit(2)
+ die("ERROR: Fatal merge failure, shouldn't happen.")
return cleanMerge
def usage():
return cleanMerge
def usage():
- print 'Usage:', sys.argv[0], ' <base>... -- <head> <remote>..'
- sys.exit(2)
+ die('Usage:', sys.argv[0], ' <base>... -- <head> <remote>..')
# main entry point as merge strategy module
# The first parameters up to -- are merge bases, and the rest are heads.
# main entry point as merge strategy module
# The first parameters up to -- are merge bases, and the rest are heads.
for nextArg in xrange(1, len(sys.argv)):
if sys.argv[nextArg] == '--':
if len(sys.argv) != nextArg + 3:
for nextArg in xrange(1, len(sys.argv)):
if sys.argv[nextArg] == '--':
if len(sys.argv) != nextArg + 3:
- print 'Not handling anything other than two heads merge.'
- sys.exit(2)
+ die('Not handling anything other than two heads merge.')
try:
h1 = firstBranch = sys.argv[nextArg + 1]
h2 = secondBranch = sys.argv[nextArg + 2]
try:
h1 = firstBranch = sys.argv[nextArg + 1]
h2 = secondBranch = sys.argv[nextArg + 2]
+def die(*args):
+ printList(args, sys.stderr)
+ sys.exit(2)
+
# Debugging machinery
# -------------------
# Debugging machinery
# -------------------
if funcName in functionsToDebug:
printList(args)
if funcName in functionsToDebug:
printList(args)
+def printList(list, file=sys.stdout):
- sys.stdout.write(str(x))
- sys.stdout.write(' ')
- sys.stdout.write('\n')
+ file.write(str(x))
+ file.write(' ')
+ file.write('\n')
# Program execution
# -----------------
# Program execution
# -----------------