Merge pull request #392 from Kobzol/remove-master-dependency

Remove hardcoded dependency on master

Author: ehuss

guide/src/alt.md

@@ -24,6 +24,6 @@ You will need to specify `--by-commit` (or use a hash in the `--start` or `--end
 cargo bisect-rustc --alt --by-commit
 ```
 
-[`config.toml` docs]: https://github.com/rust-lang/rust/blob/master/config.example.toml
+[`config.toml` docs]: https://github.com/rust-lang/rust/blob/HEAD/config.example.toml
 [`ci/run.sh`]: https://github.com/rust-lang/rust/blob/c0b6ffaaea3ebdf5f7a58fc4cf7ee52c91077fb9/src/ci/run.sh#L99-L105
 [`ci.yml`]: https://github.com/rust-lang/rust/blob/HEAD/src/ci/github-actions/ci.yml

guide/src/boundaries.md

@@ -45,11 +45,11 @@ cargo bisect-rustc \
 
 There are several ways to determine the SHA-1 hash for a PR.
 
-- On the PR itself, you should see a message like "bors merged commit c50c62d into `rust-lang:master`".
+- On the PR itself, you should see a message like "bors merged commit c50c62d into `rust-lang:<default-branch>`".
   You can copy that hash to use as a boundary.
   If the PR was merged as part of a rollup, you will need to use the hash of the rollup instead.
   You'll need to look through the PR messages to see if the PR was mentioned from a rollup PR.
-- In the rust repo, run `git log --first-parent upstream/master` (where `upstream` is your origin name for `rust-lang/rust`).
+- In the rust repo, run `git log --first-parent upstream/HEAD` (where `upstream` is your origin name for `rust-lang/rust`).
   This will show all the top-level commits.
   You can then search for your PR.
 

guide/src/git-bisect.md

@@ -3,7 +3,7 @@
 There are some rare cases where you may need to build `rustc` with custom options, or otherwise work around issues with pre-built compilers not being available.
 For this you can use [`git bisect`] to build the compiler locally.
 
-It can be helpful to use the `--first-parent` option so that it only bisects the merge commits directly reachable on the master branch.
+It can be helpful to use the `--first-parent` option so that it only bisects the merge commits directly reachable on the default branch.
 Otherwise the bisecting may land on intermediate commits from within a PR which may not build or test correctly.
 
 To start the bisection, specifying the boundaries where the bisection will start:

src/bounds.rs

@@ -93,7 +93,7 @@ impl Bounds {
             }
             (Some(Bound::Commit(start)), None) => Bounds::Commits {
                 start,
-                end: args.access.repo().commit("origin/master")?.sha,
+                end: args.access.repo().commit("HEAD")?.sha,
             },
             (None, Some(Bound::Commit(end))) => Bounds::Commits {
                 start: EPOCH_COMMIT.to_string(),

src/git.rs

@@ -52,18 +52,19 @@ impl Deref for RustcRepo {
 fn lookup_rev<'rev>(repo: &'rev RustcRepo, rev: &str) -> anyhow::Result<Git2Commit<'rev>> {
     let revision = repo.revparse_single(rev)?;
 
-    // Find the merge-base between the revision and master.
-    // If revision is a normal commit contained in master, the merge-base will be the commit itself.
-    // If revision is a tag (e.g. a release version), the merge-base will contain the latest master
-    // commit contained in that tag.
-    let master_id = repo
-        .revparse_single(&format!("{}/master", repo.origin_remote))?
+    // Find the merge-base between the revision and the default branch.
+    // If revision is a normal commit contained in the default branch, the merge-base will be the
+    // commit itself.
+    // If revision is a tag (e.g. a release version), the merge-base will contain the latest
+    // default branch commit contained in that tag.
+    let default_branch_id = repo
+        .revparse_single(&format!("{}/HEAD", repo.origin_remote))?
         .id();
     let revision_id = revision
         .as_tag()
         .map_or_else(|| revision.id(), git2::Tag::target_id);
 
-    let common_base = repo.merge_base(master_id, revision_id)?;
+    let common_base = repo.merge_base(default_branch_id, revision_id)?;
 
     if let Ok(c) = repo.find_commit(common_base) {
         return Ok(c);
@@ -155,7 +156,7 @@ pub fn get_commits_between(first_commit: &str, last_commit: &str) -> anyhow::Res
             Some(author) if author == BORS_AUTHOR => Ok(()),
             Some(author) => bail!(
                 "Expected author {author} to be {BORS_AUTHOR} for {}.\n \
-                Make sure specified commits are on the master branch!",
+                Make sure specified commits are on the default branch!",
                 c.id()
             ),
             None => bail!("No author for {}", c.id()),

src/github.rs

@@ -224,16 +224,8 @@ impl ToUrl for CommitsUrl<'_> {
 
 impl ToUrl for CommitDetailsUrl<'_> {
     fn url(&self) -> String {
-        // "origin/master" is set as `sha` when there is no `--end=` definition
-        // specified on the command line.  We define the GitHub master branch
-        // HEAD commit as the end commit in this case
-        let reference = if self.sha == "origin/master" {
-            "master"
-        } else {
-            self.sha
-        };
-
-        format!("https://api.github.com/repos/{OWNER}/{REPO}/compare/master...{reference}")
+        let reference = self.sha;
+        format!("https://api.github.com/repos/{OWNER}/{REPO}/compare/HEAD...{reference}")
     }
 }
 

src/main.rs

@@ -1000,7 +1000,7 @@ impl Config {
             if c.committer.name != BORS_AUTHOR {
                 bail!(
                     "Expected author {} to be {BORS_AUTHOR} for {}.\n \
-                     Make sure specified commits are on the master branch \
+                     Make sure specified commits are on the default branch \
                      and refer to a bors merge commit!",
                     c.committer.name,
                     c.sha

src/repo_access.rs

@@ -12,7 +12,7 @@ pub(crate) trait RustRepositoryAccessor {
     }
 
     /// Looks up commit associated with `commit_ref`, which can be either a sha
-    /// or a more general reference like "origin/master".
+    /// or a more general reference like "origin/HEAD".
     /// If `commit_ref` is a commit forked from the "mainline" git history
     /// (e.g. a stable tag like `1.88.0`), returns the merge base of the given commit reference.
     fn commit(&self, commit_ref: &str) -> anyhow::Result<Commit>;
@@ -33,7 +33,7 @@ impl RustRepositoryAccessor for AccessViaLocalGit {
         git::get_commit(commit_ref)
     }
     fn commits(&self, start_sha: &str, end_sha: &str) -> anyhow::Result<Vec<Commit>> {
-        let end_sha = if end_sha == "origin/master" {
+        let end_sha = if end_sha == "HEAD" {
             "FETCH_HEAD"
         } else {
             end_sha