Retire the ProjectOptions class

Now that pretty much all the project-specific options that `PatchSeries`
needs are part of `IConfig`, let's just move the remaining bits that
that are needed to submit a patch series from `ProjectOptions` into the
`PatchSeries` class itself.

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

Author: dscho

lib/patch-series.ts

@@ -9,7 +9,6 @@ import { md2text } from "./markdown-renderer.js";
 import { IPatchSeriesMetadata } from "./patch-series-metadata.js";
 import { PatchSeriesOptions } from "./patch-series-options.js";
 import { IConfig } from "./project-config.js";
-import { ProjectOptions } from "./project-options.js";
 import { getPullRequestKeyFromURL } from "./pullRequestKey.js";
 
 export interface ILogger {
@@ -138,19 +137,33 @@ export class PatchSeries {
             throw new Error(`Cannot find base branch ${basedOn}`);
         }
 
-        const project = await ProjectOptions.get(config, workDir, headCommit, cc, baseCommit, basedOn);
         if (rangeDiff) {
             options.rangeDiff = rangeDiff;
         }
 
+        cc.push(...config.project.cc);
+        // Hard-code a check for gitgitgadget/git whether this is a Git GUI PR
+        // and hence needs the Git GUI maintainer to be Cc:ed
+        if (
+            `${config.repo.owner}/${config.repo.name}` === "gitgitgadget/git" &&
+            (await revParse(`${baseCommit}:git-gui.sh`, workDir)) !== undefined
+        ) {
+            // Git GUI
+            cc.push("Johannes Sixt <[email protected]>");
+        }
+
         return new PatchSeries(
             config,
             notes,
             options,
-            project,
             metadata,
             rangeDiffRanges,
             patchCount,
+            cc,
+            workDir,
+            headCommit,
+            baseCommit,
+            basedOn,
             coverLetter,
             senderName,
         );
@@ -525,9 +538,13 @@ export class PatchSeries {
     public readonly config: IConfig;
     public readonly notes: GitNotes;
     public readonly options: PatchSeriesOptions;
-    public readonly project: ProjectOptions;
     public readonly metadata: IPatchSeriesMetadata;
     public readonly rangeDiff: IRangeDiff | undefined;
+    public readonly cc: string[];
+    public readonly workDir: string;
+    public readonly headCommit: string;
+    public readonly baseCommit: string;
+    public readonly basedOn?: string;
     public readonly coverLetter?: string;
     public readonly senderName?: string;
     public readonly patchCount: number;
@@ -536,19 +553,27 @@ export class PatchSeries {
         config: IConfig,
         notes: GitNotes,
         options: PatchSeriesOptions,
-        project: ProjectOptions,
         metadata: IPatchSeriesMetadata,
         rangeDiff: IRangeDiff | undefined,
         patchCount: number,
+        cc: string[],
+        workDir: string,
+        headCommit: string,
+        baseCommit: string,
+        basedOn?: string,
         coverLetter?: string,
         senderName?: string,
     ) {
         this.config = config;
         this.notes = notes;
         this.options = options;
-        this.project = project;
         this.metadata = metadata;
         this.rangeDiff = rangeDiff;
+        this.cc = cc;
+        this.workDir = workDir;
+        this.headCommit = headCommit;
+        this.baseCommit = baseCommit;
+        this.basedOn = basedOn;
         this.coverLetter = coverLetter;
         this.senderName = senderName;
         this.patchCount = patchCount;
@@ -570,9 +595,9 @@ export class PatchSeries {
     ): Promise<IPatchSeriesMetadata | undefined> {
         let globalOptions: IGitGitGadgetOptions | undefined;
         if (this.options.dryRun) {
-            logger.log(`Dry-run ${this.project.headCommit} v${this.metadata.iteration}`);
+            logger.log(`Dry-run ${this.headCommit} v${this.metadata.iteration}`);
         } else {
-            logger.log(`Submitting ${this.project.headCommit} v${this.metadata.iteration}`);
+            logger.log(`Submitting ${this.headCommit} v${this.metadata.iteration}`);
             globalOptions = await this.notes.get<IGitGitGadgetOptions>("");
         }
 
@@ -582,7 +607,7 @@ export class PatchSeries {
         PatchSeries.cleanUpHeaders(mails);
 
         const ident = await git(["var", "GIT_AUTHOR_IDENT"], {
-            workDir: this.project.workDir,
+            workDir: this.workDir,
         });
         const match = ident.match(/.*>/);
         const thisAuthor = match && match[0];
@@ -638,7 +663,7 @@ export class PatchSeries {
         const tagMessage = PatchSeries.generateTagMessage(
             mails[0],
             mails.length > 1,
-            this.project.midUrlPrefix,
+            this.config.project.urlPrefix,
             this.metadata.referencesMessageIds,
         );
         const prKey = getPullRequestKeyFromURL(this.metadata.pullRequestURL);
@@ -701,7 +726,7 @@ export class PatchSeries {
                         this.rangeDiff.previousRange,
                         this.rangeDiff.currentRange,
                     ],
-                    { workDir: this.project.workDir },
+                    { workDir: this.workDir },
                 );
                 // split the range-diff and prefix with a space
                 footers.push(
@@ -794,7 +819,7 @@ export class PatchSeries {
                     globalOptions.activeMessageIDs[mid] = originalCommit;
                 }
 
-                if (originalCommit && (await commitExists(originalCommit, this.project.workDir))) {
+                if (originalCommit && (await commitExists(originalCommit, this.workDir))) {
                     await this.notes.appendCommitNote(originalCommit, mid);
                 }
             }
@@ -840,8 +865,8 @@ export class PatchSeries {
     }
 
     protected async generateMBox(): Promise<string> {
-        const mergeBase = await git(["merge-base", this.project.baseCommit, this.project.headCommit], {
-            workDir: this.project.workDir,
+        const mergeBase = await git(["merge-base", this.baseCommit, this.headCommit], {
+            workDir: this.workDir,
         });
         const args = [
             "format-patch",
@@ -851,9 +876,9 @@ export class PatchSeries {
             "--add-header=Fcc: Sent",
             "--base",
             mergeBase,
-            this.project.to,
+            `--to=${this.config.project.to}`,
         ].concat(PatchSeries.generateSingletonHeaders());
-        this.project.cc.map((email) => {
+        this.cc.map((email) => {
             args.push("--cc=" + PatchSeries.encodeSender(email));
         });
         if (this.metadata.referencesMessageIds) {
@@ -867,17 +892,17 @@ export class PatchSeries {
         }
         if (this.patchCount > 1) {
             if (!this.coverLetter) {
-                throw new Error(`Branch ${this.project.headCommit} needs a description`);
+                throw new Error(`Branch ${this.headCommit} needs a description`);
             }
             args.push("--cover-letter");
         }
         if (this.options.patience) {
             args.push("--patience");
         }
 
-        args.push(`${this.project.baseCommit}..${this.project.headCommit}`);
+        args.push(`${this.baseCommit}..${this.headCommit}`);
 
-        return await git(args, { workDir: this.project.workDir });
+        return await git(args, { workDir: this.workDir });
     }
 
     protected async generateTagObject(tagName: string, tagMessage: string): Promise<void> {
@@ -887,10 +912,10 @@ export class PatchSeries {
         }
         args.push(tagName);
         args.push(this.metadata.headCommit);
-        await git(args, { stdin: tagMessage, workDir: this.project.workDir });
+        await git(args, { stdin: tagMessage, workDir: this.workDir });
     }
 
     protected async sendMBox(mbox: string): Promise<void> {
-        await git(["send-mbox"], { stdin: mbox, workDir: this.project.workDir });
+        await git(["send-mbox"], { stdin: mbox, workDir: this.workDir });
     }
 }

lib/project-options.ts

@@ -3,7 +3,6 @@ import { fileURLToPath } from "url";
 import { git } from "../lib/git.js";
 import { GitNotes } from "../lib/git-notes.js";
 import { PatchSeries } from "../lib/patch-series.js";
-import { ProjectOptions } from "../lib/project-options.js";
 import { testCreateRepo, testConfig } from "./test-lib.js";
 
 jest.setTimeout(60000);
@@ -94,21 +93,8 @@ class PatchSeriesTest extends PatchSeries {
             headLabel: "",
             iteration: 1,
         };
-        class ProjectOptionsTest extends ProjectOptions {
-            public constructor() {
-                super("", "", "", [], "", "", "");
-            }
-        }
-
-        const x = new PatchSeriesTest(
-            testConfig,
-            new GitNotes(),
-            {},
-            new ProjectOptionsTest(),
-            prMeta,
-            undefined,
-            1,
-        );
+
+        const x = new PatchSeriesTest(testConfig, new GitNotes(), {}, prMeta, undefined, 1, [], "", "", "");
 
         x.insertCcAndFromLines(mails, thisAuthor, senderName);