Use main as default branch for git recipe module

R=apolito@google.com, ehmaldonado@chromium.org Recipe-Nontrivial-Roll: build_limited_scripts_slave Recipe-Nontrivial-Roll: chromiumos Recipe-Nontrivial-Roll: infra Change-Id: Ia0d39ae574852fa008a55e366c2320eb1845dc86 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2941678 Commit-Queue: Josip Sokcevic <sokcevic@google.com> Reviewed-by: Anthony Polito <apolito@google.com>

Use main as default branch for git recipe module
R=apolito@google.com, ehmaldonado@chromium.org Recipe-Nontrivial-Roll: build_limited_scripts_slave Recipe-Nontrivial-Roll: chromiumos Recipe-Nontrivial-Roll: infra Change-Id: Ia0d39ae574852fa008a55e366c2320eb1845dc86 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2941678 Commit-Queue: Josip Sokcevic <sokcevic@google.com> Reviewed-by: Anthony Polito <apolito@google.com>
6b084326 · Josip Sokcevic · LUCI CQ · 1bfda8ee · 6b084326 · 6b084326
Commit 6b084326 authored Jun 30, 2021 by Josip Sokcevic Committed by LUCI CQ Jun 30, 2021
22 changed files
--- a/recipes/README.recipes.md
+++ b/recipes/README.recipes.md
@@ -557,7 +557,7 @@ upload.
 Args:
  * branch (str): new branch name, which must not yet exist.
  * name (str): step name.
-  * upstream (str): to origin/master.
+  * upstream (str): to origin/main.
  * kwargs: Forwarded to '__call__'.

 &mdash; **def [rebase](/recipes/recipe_modules/git/api.py#328)(self, name_prefix, branch, dir_path, remote_name=None, \*\*kwargs):**

--- a/recipes/recipe_modules/git/api.py
+++ b/recipes/recipe_modules/git/api.py
@@ -211,16 +211,16 @@ class GitApi(recipe_api.RecipeApi):

      # There are five kinds of refs we can be handed:
      # 0) None. In this case, we default to api.buildbucket.gitiles_commit.ref.
-      # 1) A fully qualified branch name, e.g. 'refs/heads/master'.
+      # 1) A fully qualified branch name, e.g. 'refs/heads/main'.
      #    Chop off 'refs/heads/' and now it matches case (4).
      # 2) A 40-character SHA1 hash.
      # 3) A fully-qualifed arbitrary ref, e.g. 'refs/foo/bar/baz'.
-      # 4) A branch name, e.g. 'master'.
+      # 4) A branch name, e.g. 'main'.
      # Note that 'FETCH_HEAD' can be many things (and therefore not a valid
      # checkout target) if many refs are fetched, but we only explicitly fetch
      # one ref here, so this is safe.
      if not ref:                                  # Case 0.
-        ref = self.m.buildbucket.gitiles_commit.ref or 'master'
+        ref = self.m.buildbucket.gitiles_commit.ref or 'main'

      # If it's a fully-qualified branch name, trim the 'refs/heads/' prefix.
      if ref.startswith('refs/heads/'):            # Case 1.
@@ -338,7 +338,7 @@ class GitApi(recipe_api.RecipeApi):
    remote_name = remote_name or 'origin'
    with self.m.context(cwd=dir_path):
      try:
-        self('rebase', '%s/master' % remote_name,
+        self('rebase', '%s/main' % remote_name,
             name="%s rebase" % name_prefix, **kwargs)
      except self.m.step.StepFailure:
        self('rebase', '--abort', name='%s rebase abort' % name_prefix,
@@ -396,7 +396,7 @@ class GitApi(recipe_api.RecipeApi):
    Args:
      * branch (str): new branch name, which must not yet exist.
      * name (str): step name.
-      * upstream (str): to origin/master.
+      * upstream (str): to origin/main.
      * kwargs: Forwarded to '__call__'.
    """
    env = self.m.context.env

--- a/recipes/recipe_modules/git/examples/full.expected/basic.json
+++ b/recipes/recipe_modules/git/examples/full.expected/basic.json
@@ -16,7 +16,7 @@
      "git",
      "fetch",
      "origin",
-      "master",
+      "main",
      "--recurse-submodules",
      "--progress"
    ],
@@ -193,7 +193,7 @@
    "cmd": [
      "git",
      "rebase",
-      "origin/master"
+      "origin/main"
    ],
    "cwd": "[START_DIR]/src",
    "infra_step": true,

--- a/recipes/recipe_modules/git/examples/full.expected/basic_branch.json
+++ b/recipes/recipe_modules/git/examples/full.expected/basic_branch.json
@@ -193,7 +193,7 @@
    "cmd": [
      "git",
      "rebase",
-      "origin/master"
+      "origin/main"
    ],
    "cwd": "[START_DIR]/src",
    "infra_step": true,

--- a/recipes/recipe_modules/git/examples/full.expected/basic_file_name.json
+++ b/recipes/recipe_modules/git/examples/full.expected/basic_file_name.json
@@ -16,7 +16,7 @@
      "git",
      "fetch",
      "origin",
-      "master",
+      "main",
      "--recurse-submodules",
      "--progress"
    ],
@@ -195,7 +195,7 @@
    "cmd": [
      "git",
      "rebase",
-      "origin/master"
+      "origin/main"
    ],
    "cwd": "[START_DIR]/src",
    "infra_step": true,

--- a/recipes/recipe_modules/git/examples/full.expected/basic_hash.json
+++ b/recipes/recipe_modules/git/examples/full.expected/basic_hash.json
@@ -192,7 +192,7 @@
    "cmd": [
      "git",
      "rebase",
-      "origin/master"
+      "origin/main"
    ],
    "cwd": "[START_DIR]/src",
    "infra_step": true,

--- a/recipes/recipe_modules/git/examples/full.expected/basic_ref.json
+++ b/recipes/recipe_modules/git/examples/full.expected/basic_ref.json
@@ -193,7 +193,7 @@
    "cmd": [
      "git",
      "rebase",
-      "origin/master"
+      "origin/main"
    ],
    "cwd": "[START_DIR]/src",
    "infra_step": true,

--- a/recipes/recipe_modules/git/examples/full.expected/basic_submodule_update_force.json
+++ b/recipes/recipe_modules/git/examples/full.expected/basic_submodule_update_force.json
@@ -16,7 +16,7 @@
      "git",
      "fetch",
      "origin",
-      "master",
+      "main",
      "--recurse-submodules",
      "--progress"
    ],
@@ -194,7 +194,7 @@
    "cmd": [
      "git",
      "rebase",
-      "origin/master"
+      "origin/main"
    ],
    "cwd": "[START_DIR]/src",
    "infra_step": true,

--- a/recipes/recipe_modules/git/examples/full.expected/basic_tags.json
+++ b/recipes/recipe_modules/git/examples/full.expected/basic_tags.json
@@ -16,7 +16,7 @@
      "git",
      "fetch",
      "origin",
-      "master",
+      "main",
      "--recurse-submodules",
      "--progress",
      "--tags"
@@ -194,7 +194,7 @@
    "cmd": [
      "git",
      "rebase",
-      "origin/master"
+      "origin/main"
    ],
    "cwd": "[START_DIR]/src",
    "infra_step": true,

--- a/recipes/recipe_modules/git/examples/full.expected/can_fail_build.json
+++ b/recipes/recipe_modules/git/examples/full.expected/can_fail_build.json
@@ -16,7 +16,7 @@
      "git",
      "fetch",
      "origin",
-      "master",
+      "main",
      "--recurse-submodules",
      "--progress"
    ],

--- a/recipes/recipe_modules/git/examples/full.expected/cannot_fail_build.json
+++ b/recipes/recipe_modules/git/examples/full.expected/cannot_fail_build.json
@@ -16,7 +16,7 @@
      "git",
      "fetch",
      "origin",
-      "master",
+      "main",
      "--recurse-submodules",
      "--progress"
    ],
@@ -196,7 +196,7 @@
    "cmd": [
      "git",
      "rebase",
-      "origin/master"
+      "origin/main"
    ],
    "cwd": "[START_DIR]/src",
    "infra_step": true,

--- a/recipes/recipe_modules/git/examples/full.expected/cat-file_test.json
+++ b/recipes/recipe_modules/git/examples/full.expected/cat-file_test.json
@@ -193,7 +193,7 @@
    "cmd": [
      "git",
      "rebase",
-      "origin/master"
+      "origin/main"
    ],
    "cwd": "[START_DIR]/src",
    "infra_step": true,

--- a/recipes/recipe_modules/git/examples/full.expected/count-objects_delta.json
+++ b/recipes/recipe_modules/git/examples/full.expected/count-objects_delta.json
@@ -37,7 +37,7 @@
      "git",
      "fetch",
      "origin",
-      "master",
+      "main",
      "--recurse-submodules",
      "--progress"
    ],
@@ -266,7 +266,7 @@
    "cmd": [
      "git",
      "rebase",
-      "origin/master"
+      "origin/main"
    ],
    "cwd": "[START_DIR]/src",
    "infra_step": true,

--- a/recipes/recipe_modules/git/examples/full.expected/count-objects_failed.json
+++ b/recipes/recipe_modules/git/examples/full.expected/count-objects_failed.json
@@ -16,7 +16,7 @@
      "git",
      "fetch",
      "origin",
-      "master",
+      "main",
      "--recurse-submodules",
      "--progress"
    ],
@@ -196,7 +196,7 @@
    "cmd": [
      "git",
      "rebase",
-      "origin/master"
+      "origin/main"
    ],
    "cwd": "[START_DIR]/src",
    "infra_step": true,

--- a/recipes/recipe_modules/git/examples/full.expected/count-objects_with_bad_output.json
+++ b/recipes/recipe_modules/git/examples/full.expected/count-objects_with_bad_output.json
@@ -16,7 +16,7 @@
      "git",
      "fetch",
      "origin",
-      "master",
+      "main",
      "--recurse-submodules",
      "--progress"
    ],
@@ -198,7 +198,7 @@
    "cmd": [
      "git",
      "rebase",
-      "origin/master"
+      "origin/main"
    ],
    "cwd": "[START_DIR]/src",
    "infra_step": true,

--- a/recipes/recipe_modules/git/examples/full.expected/count-objects_with_bad_output_fails_build.json
+++ b/recipes/recipe_modules/git/examples/full.expected/count-objects_with_bad_output_fails_build.json
@@ -16,7 +16,7 @@
      "git",
      "fetch",
      "origin",
-      "master",
+      "main",
      "--recurse-submodules",
      "--progress"
    ],

--- a/recipes/recipe_modules/git/examples/full.expected/curl_trace_file.json
+++ b/recipes/recipe_modules/git/examples/full.expected/curl_trace_file.json
@@ -194,7 +194,7 @@
    "cmd": [
      "git",
      "rebase",
-      "origin/master"
+      "origin/main"
    ],
    "cwd": "[START_DIR]/src",
    "infra_step": true,

--- a/recipes/recipe_modules/git/examples/full.expected/git-cache-checkout.json
+++ b/recipes/recipe_modules/git/examples/full.expected/git-cache-checkout.json
@@ -64,7 +64,7 @@
      "git",
      "fetch",
      "origin",
-      "master",
+      "main",
      "--recurse-submodules",
      "--progress"
    ],
@@ -241,7 +241,7 @@
    "cmd": [
      "git",
      "rebase",
-      "origin/master"
+      "origin/main"
    ],
    "cwd": "[START_DIR]/src",
    "infra_step": true,

--- a/recipes/recipe_modules/git/examples/full.expected/platform_win.json
+++ b/recipes/recipe_modules/git/examples/full.expected/platform_win.json
@@ -16,7 +16,7 @@
      "git",
      "fetch",
      "origin",
-      "master",
+      "main",
      "--recurse-submodules",
      "--progress"
    ],
@@ -193,7 +193,7 @@
    "cmd": [
      "git",
      "rebase",
-      "origin/master"
+      "origin/main"
    ],
    "cwd": "[START_DIR]\\src",
    "infra_step": true,

--- a/recipes/recipe_modules/git/examples/full.expected/rebase_failed.json
+++ b/recipes/recipe_modules/git/examples/full.expected/rebase_failed.json
@@ -16,7 +16,7 @@
      "git",
      "fetch",
      "origin",
-      "master",
+      "main",
      "--recurse-submodules",
      "--progress"
    ],
@@ -193,7 +193,7 @@
    "cmd": [
      "git",
      "rebase",
-      "origin/master"
+      "origin/main"
    ],
    "cwd": "[START_DIR]/src",
    "infra_step": true,

--- a/recipes/recipe_modules/git/examples/full.expected/remote_not_origin.json
+++ b/recipes/recipe_modules/git/examples/full.expected/remote_not_origin.json
@@ -18,7 +18,7 @@
      "git",
      "fetch",
      "not_origin",
-      "master",
+      "main",
      "--recurse-submodules",
      "--progress"
    ],
@@ -195,7 +195,7 @@
    "cmd": [
      "git",
      "rebase",
-      "not_origin/master"
+      "not_origin/main"
    ],
    "cwd": "[START_DIR]/src",
    "infra_step": true,

--- a/recipes/recipe_modules/git/examples/full.expected/set_got_revision.json
+++ b/recipes/recipe_modules/git/examples/full.expected/set_got_revision.json
@@ -16,7 +16,7 @@
      "git",
      "fetch",
      "origin",
-      "master",
+      "main",
      "--recurse-submodules",
      "--progress"
    ],
@@ -194,7 +194,7 @@
    "cmd": [
      "git",
      "rebase",
-      "origin/master"
+      "origin/main"
    ],
    "cwd": "[START_DIR]/src",
    "infra_step": true,