X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-merge-fredrik.py;h=27b84867b03f20a1b284e177df8fc95c72a4033e;hb=22c67ca88ec65c4f278e8c82b2d98f3bd025238b;hp=a5ca0760213386cd2755c4b77f6363c01013fe94;hpb=ace36858d3adfde1e497404e831f1cac8034fd4a;p=git.git
diff --git a/git-merge-fredrik.py b/git-merge-fredrik.py
index a5ca0760..27b84867 100755
--- a/git-merge-fredrik.py
+++ b/git-merge-fredrik.py
@@ -120,9 +120,8 @@ def unmergedCacheEntries():
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,
@@ -381,26 +380,25 @@ def processEntry(entry, branch1Name, branch2Name, files, dirs,
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():
- print 'Usage:', sys.argv[0], ' ... -- ..'
- sys.exit(2)
+ die('Usage:', sys.argv[0], ' ... -- ..')
# main entry point as merge strategy module
# The first parameters up to -- are merge bases, and the rest are heads.
# This strategy module figures out merge bases itself, so we only
# get heads.
+if len(sys.argv) < 4:
+ usage()
+
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]