IConfig: rename the attribute defining the upstream-repo's org

We've settled on the nomenclature `upstream-repo` to refer to the
original repository of the project, as opposed to the `pr-repo` which is
a fork that exists exclusively to let GitGitGadget handle PRs in (and to
store its global state in the Git notes). So let's call the owner of the
`upstream-repo` the `upstreamOwner`, not the `baseOwner`.

Besides, with GitHub's naming conventions referring to the branch a PR
targets as the "base", it is a bit confusing to have `baseOwner` to
refer to anything except the owner of the repository in which the PR
lives.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

Author: dscho

lib/ci-helper.ts

@@ -101,7 +101,7 @@ export class CIHelper {
 
         // get the access tokens via the inputs of the GitHub Action
         this.setAccessToken(this.config.repo.owner, core.getInput("pr-repo-token"));
-        this.setAccessToken(this.config.repo.baseOwner, core.getInput("upstream-repo-token"));
+        this.setAccessToken(this.config.repo.upstreamOwner, core.getInput("upstream-repo-token"));
         if (this.config.repo.testOwner) {
             this.setAccessToken(this.config.repo.testOwner, core.getInput("test-repo-token"));
         }
@@ -128,7 +128,7 @@ export class CIHelper {
             ["remote.origin.url", `https://github.com/${this.config.repo.owner}/${this.config.repo.name}`],
             ["remote.origin.promisor", "true"],
             ["remote.origin.partialCloneFilter", "blob:none"],
-            ["remote.upstream.url", `https://github.com/${this.config.repo.baseOwner}/${this.config.repo.name}`],
+            ["remote.upstream.url", `https://github.com/${this.config.repo.upstreamOwner}/${this.config.repo.name}`],
             ["remote.upstream.promisor", "true"],
             ["remote.upstream.partialCloneFilter", "blob:none"],
         ]) {
@@ -411,7 +411,7 @@ export class CIHelper {
                 mailMeta.originalCommit,
                 upstreamCommit,
                 this.config.repo.owner,
-                this.config.repo.baseOwner,
+                this.config.repo.upstreamOwner,
             );
         }
 
@@ -654,7 +654,7 @@ export class CIHelper {
 
                 // Add comment on GitHub
                 const comment = `This patch series was integrated into ${branch} via https://github.com/${
-                    this.config.repo.baseOwner
+                    this.config.repo.upstreamOwner
                 }/${this.config.repo.name}/commit/${mergeCommit}.`;
                 const url = await this.github.addPRComment(prKey, comment);
                 console.log(`Added comment ${url.id} about ${branch}: ${url.url}`);

lib/gitgitgadget-config.ts

@@ -4,7 +4,7 @@ const defaultConfig: IConfig = {
     repo: {
         name: "git",
         owner: "gitgitgadget",
-        baseOwner: "git",
+        upstreamOwner: "git",
         testOwner: "dscho",
         owners: ["gitgitgadget", "git", "dscho"],
         branches: ["maint", "seen"],

lib/project-config.ts

@@ -12,7 +12,7 @@ export interface IConfig {
     repo: {
         name: string; // name of the repo
         owner: string; // owner of repo holding the notes (tracking data)
-        baseOwner: string; // owner of upstream ("base") repo
+        upstreamOwner: string; // owner of upstream ("base") repo
         testOwner?: string; // owner of the test repo (if any)
         owners: string[]; // owners of clones being monitored (PR checking)
         branches: string[]; // remote branches to fetch - just use trackingBranches?
@@ -88,8 +88,8 @@ export async function getExternalConfig(file: string): Promise<IConfig> {
         throw new Error(`Invalid 'owner' ${newConfig.repo.owner} in ${filePath}`);
     }
 
-    if (!newConfig.repo.baseOwner.match(/^[a-z\d](?:[a-z\d]|-(?=[a-z\d])){0,38}$/i)) {
-        throw new Error(`Invalid 'baseOwner' ${newConfig.repo.baseOwner} in ${filePath}`);
+    if (!newConfig.repo.upstreamOwner.match(/^[a-z\d](?:[a-z\d]|-(?=[a-z\d])){0,38}$/i)) {
+        throw new Error(`Invalid 'upstreamOwner' ${newConfig.repo.upstreamOwner} in ${filePath}`);
     }
 
     return newConfig;

script/misc-helper.ts

@@ -200,7 +200,7 @@ const commandOptions = commander.opts<ICommanderOptions>();
                 originalCommit,
                 gitGitCommit,
                 config.repo.owner,
-                config.repo.baseOwner,
+                config.repo.upstreamOwner,
             );
             console.log(`Created check with id ${id}`);
         });

tests-config/ci-helper.test.ts

@@ -16,7 +16,7 @@ const testConfig: IConfig = {
     repo: {
         name: "telescope",
         owner: "webb",
-        baseOwner: "galileo",
+        upstreamOwner: "galileo",
         owners: ["webb", "galileo"],
         branches: ["maint"],
         closingBranches: ["maint", "main"],
@@ -172,7 +172,7 @@ async function setupRepos(instance: string):
     await gggLocal.git([ "config", `url.${gggRemote.workDir}.insteadOf`, url ]);
     // pretend there are two remotes
     await gggLocal.git([ "config", `url.${gggRemote.workDir}.insteadOf`,
-        `https://github.com/${config.repo.baseOwner}/${config.repo.name}` ]);
+        `https://github.com/${config.repo.upstreamOwner}/${config.repo.name}` ]);
 
     // set needed config
     await worktree.git([ "config", "--add", "gitgitgadget.workDir", gggLocal.workDir, ]);