Bibisect: Factor-out branchName; move initBranch in prep for refactor

Change-Id: Ia54213873aefdca819504e790aa70acbcf1bf032
Reviewed-on: https://gerrit.libreoffice.org/6919
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>

1 files changed, 9 insertions, 2 deletions

diff --git a/bibisect/mergeranges b/bibisect/mergeranges
index abe92a5c..1dcb008a 100755
--- a/bibisect/mergeranges
+++ b/bibisect/mergeranges
@@ -13,7 +13,13 @@ def subrun(arglist):
     return subprocess.check_output(arglist).decode('utf-8')
 
 def justrunit(arglist):
-    print(subprocess.check_output(arglist).decode('utf-8'))
+    print(subrun(arglist))
+
+# There is only one initial branch.
+initBranch = False
+
+# The branch on which we should store our merged commits.
+branchName = 'mergeranges'
 
 # Given a commit hash, create (if necessary) and checkout branchName
 # at that hash.
@@ -55,7 +61,8 @@ def cherry_pick_theirs(revision):
     justrunit(['git', 'tag', tag])
     
 
-initBranch = False
+
+# Take input from the 'ranges' file passed-in on the command line.
 for line in open(sys.argv[1]).readlines():
     revisions = [r for r in subprocess.check_output(['git', 'rev-list', '--reverse', line.rstrip()]).decode('utf-8').split('\n') if r.rstrip()]
     for revision in revisions: