From 21d8fa089a3aca7fd66c61493289a2fc9fd4cb74 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@gmail.com>
Date: Fri, 30 Aug 2019 18:11:29 +0200
Subject: [PATCH] Support building arbitrary branches

---
 master.cfg       | 15 +++++++++------
 master_unpack.py |  3 ++-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/master.cfg b/master.cfg
index 5d79d7a..d53de5f 100644
--- a/master.cfg
+++ b/master.cfg
@@ -6,9 +6,6 @@
 # List of the branches being built automatically overnight
 NIGHT_SCHEDULE_BRANCHES = ["master"]
 
-# List of the branches available for force build
-FORCE_SCHEDULE_BRANCHES = ["master", "experimental-build"]
-
 # Dictionary that the buildmaster pays attention to.
 c = BuildmasterConfig = {}
 
@@ -75,11 +72,17 @@ def schedule_force_build(name):
         builderNames=[name],
         codebases=[forcesched.CodebaseParameter(
                 codebase="blender",
-                branch=forcesched.ChoiceStringParameter(
+                branch=forcesched.StringParameter(
                     name="branch",
-                    choices=FORCE_SCHEDULE_BRANCHES,
+                    label="Branch:",
                     default="master"),
-                # Do not hide revision, can be handy!
+                # Hide revision. We don't want to allow anyone to overwrite the
+                # master build with an older version. Could be added back once we
+                # have authentication.
+                revision=forcesched.FixedParameter(
+                    name="revision",
+                    default="",
+                    hide=True),
                 repository=forcesched.FixedParameter(
                     name="repository",
                     default="",
diff --git a/master_unpack.py b/master_unpack.py
index 3a25be9..9c88219 100644
--- a/master_unpack.py
+++ b/master_unpack.py
@@ -122,7 +122,8 @@ if not branch or branch == 'master':
 elif branch == 'experimental-build':
     directory = os.path.join(download_prefix, "experimental")
 else:
-    directory = download_prefix
+    directory = os.path.join(download_prefix, branch)
+    os.makedirs(directory, exist_ok=True)
 
 try:
     filename = os.path.join(directory, packagename)