ProjectOptions: baseCommit is actually mandatory

Back in the days when I tried to maintain a Command-Line Interface in
GitGitGadget to replace my `mail-patch-series.sh` script (still
available at https://github.com/dscho/mail-patch-series, it was the
predecessor of GitGitGadget that worked on local repositories instead of
Pull Requests), there was not necessarily a `baseCommit` to work with:
local branches can have an upstream branch (configured via `git branch
--set-upstream-to=<remote>/<branch>`).

But I removed support for this way to call GitGitGadget in 6d397b0
(Remove support for the CLI mode, 2023-12-31), so now there always is a
`baseCommit`.

Let's make it mandatory, so that it can eventually take on the role of
the `upstreamBranch` (which we can then remove).

Since optional parameters must come after non-optional ones, this
unfortunately requires a reordering of the (positional) parameters of
the `ProjectOptions.get()` function.

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

Author: dscho

lib/patch-series.ts

@@ -140,7 +140,7 @@ export class PatchSeries {
 
         const publishToRemote: string | undefined = undefined;
 
-        const project = await ProjectOptions.get(config, workDir, headCommit, cc, basedOn, publishToRemote, baseCommit);
+        const project = await ProjectOptions.get(config, workDir, headCommit, cc, baseCommit, basedOn, publishToRemote);
         if (rangeDiff) {
             options.rangeDiff = rangeDiff;
         }

lib/project-options.ts

@@ -8,9 +8,9 @@ export class ProjectOptions {
         workDir: string,
         branchName: string,
         cc: string[],
+        baseCommit: string,
         basedOn?: string,
         publishToRemote?: string,
-        baseCommit?: string,
     ): Promise<ProjectOptions> {
         let upstreamBranch: string;
         let to: string;
@@ -70,7 +70,7 @@ export class ProjectOptions {
 
         return new ProjectOptions(
             branchName,
-            upstreamBranch,
+            baseCommit,
             basedOn,
             publishToRemote,
             to,
@@ -101,12 +101,12 @@ export class ProjectOptions {
         cc: string[],
         midUrlPrefix: string,
         workDir: string,
-        baseCommit?: string,
+        baseCommit: string,
     ) {
         this.branchName = branchName;
         this.upstreamBranch = upstreamBranch;
 
-        this.baseCommit = baseCommit || upstreamBranch;
+        this.baseCommit = baseCommit;
 
         this.basedOn = basedOn;
         this.publishToRemote = publishToRemote;

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

@@ -28,9 +28,9 @@ test("project options", async () => {
         repo.workDir,
         "test-project-options",
         ["Nguyễn Thái Ngọc Duy <[email protected]>"],
+        "test-project-options^",
         undefined,
         undefined,
-        "test-project-options^",
     );
     expect(options2.workDir).not.toBeUndefined();
     expect(options2.midUrlPrefix).toEqual("https://dummy.com/?mid=");