Rename git_ref to git_branch

Author: encukou

master/custom/branches.py

@@ -24,7 +24,7 @@ def generate_branches():
     yield BranchInfo(
         'main',
         version_tuple=(3, 15),
-        git_ref='main',
+        git_branch='main',
         is_main=True,
         builddir_name='main',
         builder_tag='main',
@@ -38,7 +38,7 @@ def generate_branches():
     yield BranchInfo(
         'PR',
         version_tuple=None,
-        git_ref=None,
+        git_branch=None,
         is_pr=True,
         builddir_name='pull_request',
         builder_tag='PullRequest',
@@ -53,7 +53,7 @@ def _maintenance_branch(major, minor, **kwargs):
         name=version_str,
         builder_tag=version_str,
         version_tuple=version_tuple,
-        git_ref=version_str,
+        git_branch=version_str,
         builddir_name=version_str,
         sort_key=-minor,
     )
@@ -82,7 +82,7 @@ def _maintenance_branch(major, minor, **kwargs):
 class BranchInfo:
     name: str
     version_tuple: tuple[int, int] | None
-    git_ref: str | None
+    git_branch: str | None
     builddir_name: str
     builder_tag: str
 

master/master.cfg

@@ -193,7 +193,7 @@ mail_status_builders = []
 # Regular builders
 
 for branch in BRANCHES:
-    if not branch.git_ref:
+    if not branch.git_branch:
         continue
     buildernames = []
     refleakbuildernames = []
@@ -211,7 +211,7 @@ for branch in BRANCHES:
             continue
 
         buildername = name + " " + branch.name
-        source = Git(repourl=GIT_URL, branch=branch.git_ref, **GIT_KWDS)
+        source = Git(repourl=GIT_URL, branch=branch.git_branch, **GIT_KWDS)
         f = buildfactory(
             source,
             branch=branch,
@@ -262,7 +262,7 @@ for branch in BRANCHES:
     c["schedulers"].append(
         schedulers.SingleBranchScheduler(
             name=branch.name,
-            change_filter=util.ChangeFilter(branch=branch.git_ref),
+            change_filter=util.ChangeFilter(branch=branch.git_branch),
             treeStableTimer=30,  # seconds
             builderNames=buildernames,
             fileIsImportant=is_important_change,
@@ -272,7 +272,7 @@ for branch in BRANCHES:
         c["schedulers"].append(
             schedulers.SingleBranchScheduler(
                 name=branch.name + "-refleak",
-                change_filter=util.ChangeFilter(branch=branch.git_ref),
+                change_filter=util.ChangeFilter(branch=branch.git_branch),
                 # Wait this many seconds for no commits before starting a build
                 # NB: During extremely busy times, this can cause the builders
                 # to never actually fire.  The current expectation is that it