IConfig: remove no longer needed project.branch

Ever since 6d397b0 (Remove support for the CLI mode, 2023-12-31), there
is no way the `ProjectOptions` are constructed without a `baseCommit`.
Therefore it is always provided.

And since `baseCommit` is always provided, the `ProjectOptions.get()`
function no longer needs `upstreamBranch`: It only used it in a "is this
rebased?" check that apparently hasn't been called anymore, ever.

So that leaves just one last user of that `upstreamBranch` attribute,
but that's a test that wants to mocj a `prMeta` from a `ProjectOptions`
instance, something that only the CLI mode used to do, but no remaining
production code. That test can easily replace that
`options2.upstreamBranch` with a sensible, hard-coded string.

And since that's gone, we can also remove the `project.branch` attribute
because nothing uses it anymore.

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho

lib/project-config.ts

@@ -1,6 +1,5 @@
 export type projectInfo = {
     to: string; // email to send patches to
-    branch: string; // upstream branch a PR must be based on
     cc: string[]; // emails to always be copied on patches
     urlPrefix: string; // url to 'listserv' of mail (should it be in mailrepo?)
 };

lib/project-options.ts

@@ -1,4 +1,4 @@
-import { commitExists, git, revParse } from "./git.js";
+import { commitExists, revParse } from "./git.js";
 import { IConfig, projectInfo } from "./project-config.js";
 
 // For now, only the Git, Cygwin and BusyBox projects are supported
@@ -12,14 +12,12 @@ export class ProjectOptions {
         basedOn?: string,
         publishToRemote?: string,
     ): Promise<ProjectOptions> {
-        let upstreamBranch: string;
         let to: string;
         let midUrlPrefix = " Message-ID: ";
 
         if (Object.prototype.hasOwnProperty.call(config, "project")) {
             const project = config.project as projectInfo;
             to = `--to=${project.to}`;
-            upstreamBranch = project.branch;
             midUrlPrefix = project.urlPrefix;
             for (const user of project.cc) {
                 cc.push(user);
@@ -28,61 +26,31 @@ export class ProjectOptions {
             // Git GUI
             to = "[email protected]";
             cc.push("Johannes Sixt <[email protected]>");
-            upstreamBranch = "git-gui/master";
         } else if ((await revParse(`${baseCommit}:git.c`, workDir)) !== undefined) {
             // Git
             to = "[email protected]";
             // Do *not* Cc: Junio Hamano by default
-            upstreamBranch = "upstream/seen";
-            if (await git(["rev-list", branchName + ".." + upstreamBranch], { workDir })) {
-                upstreamBranch = "upstream/next";
-            }
-            if (await git(["rev-list", branchName + ".." + upstreamBranch], { workDir })) {
-                upstreamBranch = "upstream/master";
-            }
             midUrlPrefix = "https://lore.kernel.org/git/";
         } else if ((await revParse(`${baseCommit}:winsup`, workDir)) !== undefined) {
             // Cygwin
             to = "[email protected]";
-            upstreamBranch = "cygwin/master";
             midUrlPrefix = "https://www.mail-archive.com/[email protected]&q=";
         } else if ((await revParse(`${baseCommit}:include/busybox.h`, workDir)) !== undefined) {
             // BusyBox
             to = "[email protected]";
-            upstreamBranch = "busybox/master";
             midUrlPrefix = "https://www.mail-archive.com/[email protected]&q=";
         } else if (await commitExists("7ccd18012de2e6c47e5", workDir)) {
             // We're running in the test suite!
             to = "[email protected]";
-            upstreamBranch = "master";
             midUrlPrefix = "https://dummy.com/?mid=";
         } else {
             throw new Error("Unrecognized project");
         }
 
-        if (basedOn) {
-            upstreamBranch = basedOn;
-        }
-
-        if (!baseCommit && (await git(["rev-list", branchName + ".." + upstreamBranch], { workDir }))) {
-            throw new Error(`Branch ${branchName} is not rebased to ${upstreamBranch}`);
-        }
-
-        return new ProjectOptions(
-            branchName,
-            baseCommit,
-            basedOn,
-            publishToRemote,
-            to,
-            cc,
-            midUrlPrefix,
-            workDir,
-            baseCommit,
-        );
+        return new ProjectOptions(branchName, basedOn, publishToRemote, to, cc, midUrlPrefix, workDir, baseCommit);
     }
 
     public readonly branchName: string;
-    public readonly upstreamBranch: string;
     public readonly baseCommit: string;
     public readonly basedOn?: string;
     public readonly publishToRemote?: string;
@@ -94,7 +62,6 @@ export class ProjectOptions {
 
     protected constructor(
         branchName: string,
-        upstreamBranch: string,
         basedOn: string | undefined,
         publishToRemote: string | undefined,
         to: string,
@@ -104,7 +71,6 @@ export class ProjectOptions {
         baseCommit: string,
     ) {
         this.branchName = branchName;
-        this.upstreamBranch = upstreamBranch;
 
         this.baseCommit = baseCommit;
 

tests/patch-series.test.ts

@@ -96,7 +96,7 @@ class PatchSeriesTest extends PatchSeries {
         };
         class ProjectOptionsTest extends ProjectOptions {
             public constructor() {
-                super("", "", "", "", "", [], "", "", "");
+                super("", "", "", "", [], "", "", "");
             }
         }
 

tests/project-options.test.ts

@@ -39,7 +39,7 @@ test("project options", async () => {
         public static async test(): Promise<void> {
             const prMeta = {
                 baseCommit: options2.baseCommit,
-                baseLabel: options2.upstreamBranch,
+                baseLabel: "upstream/main",
                 headCommit: options2.branchName,
                 headLabel: options2.branchName,
                 iteration: 1,