commit 6e3f23c51890dcf462d3a5d664c7ad30d6139409
author Mike Frysinger <vapier@chromium.org> Wed Feb 17 14:06:19 2021 -0500
committer Commit Bot <commit-bot@chromium.org> Wed Feb 17 21:12:47 2021 +0000
tree a01c357bb5f45cc2746946a16e2e6693aeae37cc
parent a791ff39f51660cae6b891eb9e2f6dccb6a1cb2f

create_manifest_snapshot: switch default from master to main

This aligns with the defaults in our manifest itself.

BUG=chromium:1126855
TEST=CQ passes

Change-Id: If4ddabecd6e48fa75ae2f6a2ee35c67504bb22e2
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2701112
Reviewed-by: Dhanya Ganesh <dhanyaganesh@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>

scripts/create_manifest_snapshot.py

diff --git a/scripts/create_manifest_snapshot.py b/scripts/create_manifest_snapshot.py
index f3b340a..89885db 100644
--- a/scripts/create_manifest_snapshot.py
+++ b/scripts/create_manifest_snapshot.py
@@ -61,8 +61,8 @@
 
 def _NeedsSnapshot(repo_root, project):
   """Test if project's revision is reachable from its upstream ref."""
-  # Some projects don't have an upstream set. Try 'master' anyway.
-  branch = _GetUpstreamBranch(project) or 'master'
+  # Some projects don't have an upstream set. Try 'main' anyway.
+  branch = _GetUpstreamBranch(project) or 'main'
   upstream_ref = 'refs/remotes/%s/%s' % (project.Remote().GitName(), branch)
   project_path = os.path.join(repo_root, project.Path())
   try:
@@ -86,9 +86,9 @@
   """
   ref = base_ref
 
-  # If the project upstream is a non-master branch, append it to the ref.
+  # If the project upstream is a non-main branch, append it to the ref.
   branch = _GetUpstreamBranch(project)
-  if branch and branch != 'master':
+  if branch and branch != 'main':
     ref = '%s/%s' % (ref, branch)
 
   if ref in used_refs:

scripts/create_manifest_snapshot_unittest.py

diff --git a/scripts/create_manifest_snapshot_unittest.py b/scripts/create_manifest_snapshot_unittest.py
index 0e785b3..bb2fc69 100644
--- a/scripts/create_manifest_snapshot_unittest.py
+++ b/scripts/create_manifest_snapshot_unittest.py
@@ -32,7 +32,7 @@
   <default remote="origin"/>
   <project name="project/a" revision="f01dab1e"/>
   <project name="project/b" revision="cafe1234" upstream="short"/>
-  <project name="project/c" revision="deadbeef" upstream="refs/heads/master"/>
+  <project name="project/c" revision="deadbeef" upstream="refs/heads/main"/>
   <project name="dupe" revision="d1" upstream="dupe"/>
   <project name="dupe" revision="d2" upstream="dupe"/>
 </manifest>
@@ -78,7 +78,7 @@
   def testGetUpstreamBranchFullUpstream(self):
     """Test _GetUpstreamBranch with full upstream ref."""
     branch = create_manifest_snapshot._GetUpstreamBranch(self.project_c)
-    self.assertEqual(branch, 'master')
+    self.assertEqual(branch, 'main')
 
   def testNeedsSnapshotReachable(self):
     """Test _NeedsSnapshot with revision reachable from upstream."""
@@ -86,7 +86,7 @@
     result = create_manifest_snapshot._NeedsSnapshot('root', self.project_c)
     self.assertFalse(result)
     self.mock_is_reachable.assert_called_with(
-        'root/project/c', 'deadbeef', 'refs/remotes/origin/master')
+        'root/project/c', 'deadbeef', 'refs/remotes/origin/main')
 
   def testNeedsSnapshotUnreachable(self):
     """Test _NeedsSnapshot with revision reachable from upstream."""
@@ -100,7 +100,7 @@
     """Test _NeedsSnapshot with no project upstream."""
     create_manifest_snapshot._NeedsSnapshot('root', self.project_a)
     self.mock_is_reachable.assert_called_with(
-        'root/project/a', 'f01dab1e', 'refs/remotes/origin/master')
+        'root/project/a', 'f01dab1e', 'refs/remotes/origin/main')
 
   def testNeedsSnapshotIsReachableFailure(self):
     """Test _NeedsSnapshot with no project upstream."""
@@ -108,8 +108,8 @@
     result = create_manifest_snapshot._NeedsSnapshot('root', self.project_a)
     self.assertTrue(result)
 
-  def testMakeUniqueRefMaster(self):
-    """Test _MakeUniqueRef with upstream master."""
+  def testMakeUniqueRefMain(self):
+    """Test _MakeUniqueRef with upstream main."""
     used = set()
     ref1 = create_manifest_snapshot._MakeUniqueRef(self.project_c, 'base', used)
     ref2 = create_manifest_snapshot._MakeUniqueRef(self.project_c, 'base', used)
@@ -118,8 +118,8 @@
     self.assertEqual(ref2, 'base/1')
     self.assertEqual(ref3, 'base/2')
 
-  def testMakeUniqueRefNonMaster(self):
-    """Test _MakeUniqueRef with non-master upstream."""
+  def testMakeUniqueRefNonMain(self):
+    """Test _MakeUniqueRef with non-main upstream."""
     used = set()
     ref1 = create_manifest_snapshot._MakeUniqueRef(self.project_b, 'base', used)
     ref2 = create_manifest_snapshot._MakeUniqueRef(self.project_b, 'base', used)