renovate 40.26.3 → 40.27.1

package/dist/modules/platform/types.d.ts

@@ -239,5 +239,6 @@ export interface PlatformScm {
     checkoutBranch(branchName: string): Promise<LongCommitSha>;
     mergeToLocal(branchName: string): Promise<void>;
     mergeAndPush(branchName: string): Promise<void>;
+    syncForkWithUpstream?(baseBranch: string): Promise<void>;
 }
 export {};

package/dist/modules/platform/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../lib/modules/platform/types.ts"],"names":[],"mappings":"","sourcesContent":["import type { MergeStrategy } from '../../config/types';\nimport type { BranchStatus, HostRule, VulnerabilityAlert } from '../../types';\nimport type { CommitFilesConfig, LongCommitSha } from '../../util/git/types';\n\ntype VulnerabilityKey = string;\ntype VulnerabilityRangeKey = string;\ntype VulnerabilityPatch = string;\nexport type AggregatedVulnerabilities = Record<\n  VulnerabilityKey,\n  Record<VulnerabilityRangeKey, VulnerabilityPatch | null>\n>;\n\nexport interface PlatformParams {\n  endpoint?: string;\n  token?: string;\n  username?: string;\n  password?: string;\n  gitAuthor?: string;\n}\n\nexport interface PlatformResult {\n  endpoint: string;\n  renovateUsername?: string;\n  token?: string;\n  gitAuthor?: string;\n  /*\n   * return these only if _additional_ rules/hosts are required\n   */\n  hostRules?: HostRule[];\n}\n\nexport interface RepoResult {\n  defaultBranch: string;\n  isFork: boolean;\n  repoFingerprint: string;\n}\n\nexport type GitUrlOption = 'default' | 'ssh' | 'endpoint';\n\nexport interface RepoParams {\n  repository: string;\n  endpoint?: string;\n  gitUrl?: GitUrlOption;\n  forkCreation?: boolean;\n  forkOrg?: string;\n  forkToken?: string;\n  forkProcessing?: 'enabled' | 'disabled';\n  renovateUsername?: string;\n  cloneSubmodules?: boolean;\n  cloneSubmodulesFilter?: string[];\n  ignorePrAuthor?: boolean;\n  bbUseDevelopmentBranch?: boolean;\n  includeMirrors?: boolean;\n}\n\nexport interface PrDebugData {\n  createdInVer: string;\n  updatedInVer: string;\n  targetBranch: string;\n  labels?: string[];\n}\n\nexport interface PrBodyStruct {\n  hash: string;\n  rawConfigHash?: string;\n  rebaseRequested?: boolean;\n  debugData?: PrDebugData;\n}\n\n/**\n *\n */\nexport interface Pr {\n  bodyStruct?: PrBodyStruct;\n  sourceBranch: string;\n  cannotMergeReason?: string; // for reflecting platform policies which may prevent merging\n  createdAt?: string;\n  closedAt?: string;\n  hasAssignees?: boolean;\n  labels?: string[];\n  number: number;\n  reviewers?: string[];\n  sha?: LongCommitSha;\n  sourceRepo?: string;\n  state: string;\n  targetBranch?: string;\n  title: string;\n  isDraft?: boolean;\n}\n\n/**\n * TODO: Proper typing\n */\nexport interface Issue {\n  body?: string;\n  number?: number;\n  state?: string;\n  title?: string;\n}\nexport interface PlatformPrOptions {\n  autoApprove?: boolean;\n  automergeStrategy?: MergeStrategy;\n  azureWorkItemId?: number;\n  bbUseDefaultReviewers?: boolean;\n  bbAutoResolvePrTasks?: boolean;\n  gitLabIgnoreApprovals?: boolean;\n  usePlatformAutomerge?: boolean;\n  forkModeDisallowMaintainerEdits?: boolean;\n}\n\nexport interface CreatePRConfig {\n  sourceBranch: string;\n  targetBranch: string;\n  prTitle: string;\n  prBody: string;\n  labels?: string[] | null;\n  platformPrOptions?: PlatformPrOptions;\n  draftPR?: boolean;\n  milestone?: number;\n}\nexport interface UpdatePrConfig {\n  number: number;\n  platformPrOptions?: PlatformPrOptions;\n  prTitle: string;\n  prBody?: string;\n  state?: 'open' | 'closed';\n  targetBranch?: string;\n\n  /**\n   * This field allows for label management and is designed to\n   * accommodate the different label update methods on various platforms.\n   *\n   * - For Gitea, labels are updated by replacing the entire labels array.\n   * - In the case of GitHub and GitLab, specific endpoints exist\n   *   for adding and removing labels.\n   */\n  labels?: string[] | null;\n\n  /**\n   * Specifies an array of labels to be added.\n   * @see {@link labels}\n   */\n  addLabels?: string[] | null;\n\n  /**\n   * Specifies an array of labels to be removed.\n   * @see {@link labels}\n   */\n  removeLabels?: string[] | null;\n}\nexport interface ReattemptPlatformAutomergeConfig {\n  number: number;\n  platformPrOptions?: PlatformPrOptions;\n}\nexport interface EnsureIssueConfig {\n  title: string;\n  reuseTitle?: string;\n  body: string;\n  labels?: string[];\n  once?: boolean;\n  shouldReOpen?: boolean;\n  confidential?: boolean;\n}\nexport interface BranchStatusConfig {\n  branchName: string;\n  context: string;\n  description: string;\n  state: BranchStatus;\n  url?: string;\n}\nexport interface FindPRConfig {\n  branchName: string;\n  prTitle?: string | null;\n  state?: 'open' | 'closed' | '!open' | 'all';\n  refreshCache?: boolean;\n  targetBranch?: string | null;\n  includeOtherAuthors?: boolean;\n}\nexport interface MergePRConfig {\n  branchName?: string;\n  id: number;\n  strategy?: MergeStrategy;\n}\nexport interface EnsureCommentConfig {\n  number: number;\n  topic: string | null;\n  content: string;\n}\n\nexport interface EnsureCommentRemovalConfigByTopic {\n  type: 'by-topic';\n  number: number;\n  topic: string;\n}\nexport interface EnsureCommentRemovalConfigByContent {\n  type: 'by-content';\n  number: number;\n  content: string;\n}\nexport type EnsureCommentRemovalConfig =\n  | EnsureCommentRemovalConfigByTopic\n  | EnsureCommentRemovalConfigByContent;\n\nexport type EnsureIssueResult = 'updated' | 'created';\n\nexport type RepoSortMethod =\n  | 'alpha'\n  | 'created'\n  | 'updated'\n  | 'size'\n  | 'id'\n  | null;\n\nexport type SortMethod = 'asc' | 'desc' | null;\nexport interface AutodiscoverConfig {\n  topics?: string[];\n  sort?: RepoSortMethod;\n  order?: SortMethod;\n  includeMirrors?: boolean;\n  namespaces?: string[];\n  projects?: string[];\n}\n\nexport interface Platform {\n  findIssue(title: string): Promise<Issue | null>;\n  getIssueList(): Promise<Issue[]>;\n  getIssue?(number: number, memCache?: boolean): Promise<Issue | null>;\n  getVulnerabilityAlerts?(): Promise<VulnerabilityAlert[]>;\n  getRawFile(\n    fileName: string,\n    repoName?: string,\n    branchOrTag?: string,\n  ): Promise<string | null>;\n  getJsonFile(\n    fileName: string,\n    repoName?: string,\n    branchOrTag?: string,\n  ): Promise<any>;\n  initRepo(config: RepoParams): Promise<RepoResult>;\n  getPrList(): Promise<Pr[]>;\n  ensureIssueClosing(title: string): Promise<void>;\n  ensureIssue(\n    issueConfig: EnsureIssueConfig,\n  ): Promise<EnsureIssueResult | null>;\n  massageMarkdown(prBody: string): string;\n  updatePr(prConfig: UpdatePrConfig): Promise<void>;\n  mergePr(config: MergePRConfig): Promise<boolean>;\n  addReviewers(number: number, reviewers: string[]): Promise<void>;\n  addAssignees(number: number, assignees: string[]): Promise<void>;\n  createPr(prConfig: CreatePRConfig): Promise<Pr | null>;\n  getRepos(config?: AutodiscoverConfig): Promise<string[]>;\n  getBranchForceRebase?(branchName: string): Promise<boolean>;\n  deleteLabel(number: number, label: string): Promise<void>;\n  addLabel?(number: number, label: string): Promise<void>;\n  setBranchStatus(branchStatusConfig: BranchStatusConfig): Promise<void>;\n  getBranchStatusCheck(\n    branchName: string,\n    // TODO: can be undefined or null ? #22198\n    context: string | null | undefined,\n  ): Promise<BranchStatus | null>;\n  ensureCommentRemoval(\n    ensureCommentRemoval:\n      | EnsureCommentRemovalConfigByTopic\n      | EnsureCommentRemovalConfigByContent,\n  ): Promise<void>;\n  ensureComment(ensureComment: EnsureCommentConfig): Promise<boolean>;\n  getPr(number: number): Promise<Pr | null>;\n  findPr(findPRConfig: FindPRConfig): Promise<Pr | null>;\n  refreshPr?(number: number): Promise<void>;\n  reattemptPlatformAutomerge?(\n    prConfig: ReattemptPlatformAutomergeConfig,\n  ): Promise<void>;\n  getBranchStatus(\n    branchName: string,\n    internalChecksAsSuccess: boolean,\n  ): Promise<BranchStatus>;\n  getBranchPr(branchName: string, targetBranch?: string): Promise<Pr | null>;\n  tryReuseAutoclosedPr?(pr: Pr): Promise<Pr | null>;\n  initPlatform(config: PlatformParams): Promise<PlatformResult>;\n  filterUnavailableUsers?(users: string[]): Promise<string[]>;\n  commitFiles?(config: CommitFilesConfig): Promise<LongCommitSha | null>;\n  expandGroupMembers?(reviewersOrAssignees: string[]): Promise<string[]>;\n\n  maxBodyLength(): number;\n  labelCharLimit?(): number;\n}\n\nexport interface PlatformScm {\n  isBranchBehindBase(branchName: string, baseBranch: string): Promise<boolean>;\n  isBranchModified(branchName: string, baseBranch: string): Promise<boolean>;\n  isBranchConflicted(baseBranch: string, branch: string): Promise<boolean>;\n  branchExists(branchName: string): Promise<boolean>;\n  getBranchCommit(branchName: string): Promise<LongCommitSha | null>;\n  deleteBranch(branchName: string): Promise<void>;\n  commitAndPush(commitConfig: CommitFilesConfig): Promise<LongCommitSha | null>;\n  getFileList(): Promise<string[]>;\n  checkoutBranch(branchName: string): Promise<LongCommitSha>;\n  mergeToLocal(branchName: string): Promise<void>;\n  mergeAndPush(branchName: string): Promise<void>;\n}\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../lib/modules/platform/types.ts"],"names":[],"mappings":"","sourcesContent":["import type { MergeStrategy } from '../../config/types';\nimport type { BranchStatus, HostRule, VulnerabilityAlert } from '../../types';\nimport type { CommitFilesConfig, LongCommitSha } from '../../util/git/types';\n\ntype VulnerabilityKey = string;\ntype VulnerabilityRangeKey = string;\ntype VulnerabilityPatch = string;\nexport type AggregatedVulnerabilities = Record<\n  VulnerabilityKey,\n  Record<VulnerabilityRangeKey, VulnerabilityPatch | null>\n>;\n\nexport interface PlatformParams {\n  endpoint?: string;\n  token?: string;\n  username?: string;\n  password?: string;\n  gitAuthor?: string;\n}\n\nexport interface PlatformResult {\n  endpoint: string;\n  renovateUsername?: string;\n  token?: string;\n  gitAuthor?: string;\n  /*\n   * return these only if _additional_ rules/hosts are required\n   */\n  hostRules?: HostRule[];\n}\n\nexport interface RepoResult {\n  defaultBranch: string;\n  isFork: boolean;\n  repoFingerprint: string;\n}\n\nexport type GitUrlOption = 'default' | 'ssh' | 'endpoint';\n\nexport interface RepoParams {\n  repository: string;\n  endpoint?: string;\n  gitUrl?: GitUrlOption;\n  forkCreation?: boolean;\n  forkOrg?: string;\n  forkToken?: string;\n  forkProcessing?: 'enabled' | 'disabled';\n  renovateUsername?: string;\n  cloneSubmodules?: boolean;\n  cloneSubmodulesFilter?: string[];\n  ignorePrAuthor?: boolean;\n  bbUseDevelopmentBranch?: boolean;\n  includeMirrors?: boolean;\n}\n\nexport interface PrDebugData {\n  createdInVer: string;\n  updatedInVer: string;\n  targetBranch: string;\n  labels?: string[];\n}\n\nexport interface PrBodyStruct {\n  hash: string;\n  rawConfigHash?: string;\n  rebaseRequested?: boolean;\n  debugData?: PrDebugData;\n}\n\n/**\n *\n */\nexport interface Pr {\n  bodyStruct?: PrBodyStruct;\n  sourceBranch: string;\n  cannotMergeReason?: string; // for reflecting platform policies which may prevent merging\n  createdAt?: string;\n  closedAt?: string;\n  hasAssignees?: boolean;\n  labels?: string[];\n  number: number;\n  reviewers?: string[];\n  sha?: LongCommitSha;\n  sourceRepo?: string;\n  state: string;\n  targetBranch?: string;\n  title: string;\n  isDraft?: boolean;\n}\n\n/**\n * TODO: Proper typing\n */\nexport interface Issue {\n  body?: string;\n  number?: number;\n  state?: string;\n  title?: string;\n}\nexport interface PlatformPrOptions {\n  autoApprove?: boolean;\n  automergeStrategy?: MergeStrategy;\n  azureWorkItemId?: number;\n  bbUseDefaultReviewers?: boolean;\n  bbAutoResolvePrTasks?: boolean;\n  gitLabIgnoreApprovals?: boolean;\n  usePlatformAutomerge?: boolean;\n  forkModeDisallowMaintainerEdits?: boolean;\n}\n\nexport interface CreatePRConfig {\n  sourceBranch: string;\n  targetBranch: string;\n  prTitle: string;\n  prBody: string;\n  labels?: string[] | null;\n  platformPrOptions?: PlatformPrOptions;\n  draftPR?: boolean;\n  milestone?: number;\n}\nexport interface UpdatePrConfig {\n  number: number;\n  platformPrOptions?: PlatformPrOptions;\n  prTitle: string;\n  prBody?: string;\n  state?: 'open' | 'closed';\n  targetBranch?: string;\n\n  /**\n   * This field allows for label management and is designed to\n   * accommodate the different label update methods on various platforms.\n   *\n   * - For Gitea, labels are updated by replacing the entire labels array.\n   * - In the case of GitHub and GitLab, specific endpoints exist\n   *   for adding and removing labels.\n   */\n  labels?: string[] | null;\n\n  /**\n   * Specifies an array of labels to be added.\n   * @see {@link labels}\n   */\n  addLabels?: string[] | null;\n\n  /**\n   * Specifies an array of labels to be removed.\n   * @see {@link labels}\n   */\n  removeLabels?: string[] | null;\n}\nexport interface ReattemptPlatformAutomergeConfig {\n  number: number;\n  platformPrOptions?: PlatformPrOptions;\n}\nexport interface EnsureIssueConfig {\n  title: string;\n  reuseTitle?: string;\n  body: string;\n  labels?: string[];\n  once?: boolean;\n  shouldReOpen?: boolean;\n  confidential?: boolean;\n}\nexport interface BranchStatusConfig {\n  branchName: string;\n  context: string;\n  description: string;\n  state: BranchStatus;\n  url?: string;\n}\nexport interface FindPRConfig {\n  branchName: string;\n  prTitle?: string | null;\n  state?: 'open' | 'closed' | '!open' | 'all';\n  refreshCache?: boolean;\n  targetBranch?: string | null;\n  includeOtherAuthors?: boolean;\n}\nexport interface MergePRConfig {\n  branchName?: string;\n  id: number;\n  strategy?: MergeStrategy;\n}\nexport interface EnsureCommentConfig {\n  number: number;\n  topic: string | null;\n  content: string;\n}\n\nexport interface EnsureCommentRemovalConfigByTopic {\n  type: 'by-topic';\n  number: number;\n  topic: string;\n}\nexport interface EnsureCommentRemovalConfigByContent {\n  type: 'by-content';\n  number: number;\n  content: string;\n}\nexport type EnsureCommentRemovalConfig =\n  | EnsureCommentRemovalConfigByTopic\n  | EnsureCommentRemovalConfigByContent;\n\nexport type EnsureIssueResult = 'updated' | 'created';\n\nexport type RepoSortMethod =\n  | 'alpha'\n  | 'created'\n  | 'updated'\n  | 'size'\n  | 'id'\n  | null;\n\nexport type SortMethod = 'asc' | 'desc' | null;\nexport interface AutodiscoverConfig {\n  topics?: string[];\n  sort?: RepoSortMethod;\n  order?: SortMethod;\n  includeMirrors?: boolean;\n  namespaces?: string[];\n  projects?: string[];\n}\n\nexport interface Platform {\n  findIssue(title: string): Promise<Issue | null>;\n  getIssueList(): Promise<Issue[]>;\n  getIssue?(number: number, memCache?: boolean): Promise<Issue | null>;\n  getVulnerabilityAlerts?(): Promise<VulnerabilityAlert[]>;\n  getRawFile(\n    fileName: string,\n    repoName?: string,\n    branchOrTag?: string,\n  ): Promise<string | null>;\n  getJsonFile(\n    fileName: string,\n    repoName?: string,\n    branchOrTag?: string,\n  ): Promise<any>;\n  initRepo(config: RepoParams): Promise<RepoResult>;\n  getPrList(): Promise<Pr[]>;\n  ensureIssueClosing(title: string): Promise<void>;\n  ensureIssue(\n    issueConfig: EnsureIssueConfig,\n  ): Promise<EnsureIssueResult | null>;\n  massageMarkdown(prBody: string): string;\n  updatePr(prConfig: UpdatePrConfig): Promise<void>;\n  mergePr(config: MergePRConfig): Promise<boolean>;\n  addReviewers(number: number, reviewers: string[]): Promise<void>;\n  addAssignees(number: number, assignees: string[]): Promise<void>;\n  createPr(prConfig: CreatePRConfig): Promise<Pr | null>;\n  getRepos(config?: AutodiscoverConfig): Promise<string[]>;\n  getBranchForceRebase?(branchName: string): Promise<boolean>;\n  deleteLabel(number: number, label: string): Promise<void>;\n  addLabel?(number: number, label: string): Promise<void>;\n  setBranchStatus(branchStatusConfig: BranchStatusConfig): Promise<void>;\n  getBranchStatusCheck(\n    branchName: string,\n    // TODO: can be undefined or null ? #22198\n    context: string | null | undefined,\n  ): Promise<BranchStatus | null>;\n  ensureCommentRemoval(\n    ensureCommentRemoval:\n      | EnsureCommentRemovalConfigByTopic\n      | EnsureCommentRemovalConfigByContent,\n  ): Promise<void>;\n  ensureComment(ensureComment: EnsureCommentConfig): Promise<boolean>;\n  getPr(number: number): Promise<Pr | null>;\n  findPr(findPRConfig: FindPRConfig): Promise<Pr | null>;\n  refreshPr?(number: number): Promise<void>;\n  reattemptPlatformAutomerge?(\n    prConfig: ReattemptPlatformAutomergeConfig,\n  ): Promise<void>;\n  getBranchStatus(\n    branchName: string,\n    internalChecksAsSuccess: boolean,\n  ): Promise<BranchStatus>;\n  getBranchPr(branchName: string, targetBranch?: string): Promise<Pr | null>;\n  tryReuseAutoclosedPr?(pr: Pr): Promise<Pr | null>;\n  initPlatform(config: PlatformParams): Promise<PlatformResult>;\n  filterUnavailableUsers?(users: string[]): Promise<string[]>;\n  commitFiles?(config: CommitFilesConfig): Promise<LongCommitSha | null>;\n  expandGroupMembers?(reviewersOrAssignees: string[]): Promise<string[]>;\n\n  maxBodyLength(): number;\n  labelCharLimit?(): number;\n}\n\nexport interface PlatformScm {\n  isBranchBehindBase(branchName: string, baseBranch: string): Promise<boolean>;\n  isBranchModified(branchName: string, baseBranch: string): Promise<boolean>;\n  isBranchConflicted(baseBranch: string, branch: string): Promise<boolean>;\n  branchExists(branchName: string): Promise<boolean>;\n  getBranchCommit(branchName: string): Promise<LongCommitSha | null>;\n  deleteBranch(branchName: string): Promise<void>;\n  commitAndPush(commitConfig: CommitFilesConfig): Promise<LongCommitSha | null>;\n  getFileList(): Promise<string[]>;\n  checkoutBranch(branchName: string): Promise<LongCommitSha>;\n  mergeToLocal(branchName: string): Promise<void>;\n  mergeAndPush(branchName: string): Promise<void>;\n  syncForkWithUpstream?(baseBranch: string): Promise<void>;\n}\n"]}

package/dist/util/git/index.d.ts

@@ -21,6 +21,9 @@ export declare function branchExists(branchName: string): boolean;
 export declare function getBranchCommit(branchName: string): LongCommitSha | null;
 export declare function getCommitMessages(): Promise<string[]>;
 export declare function checkoutBranch(branchName: string): Promise<LongCommitSha>;
+export declare function checkoutBranchFromRemote(branchName: string, remoteName: string): Promise<LongCommitSha>;
+export declare function resetHardFromRemote(remoteAndBranch: string): Promise<void>;
+export declare function forcePushToRemote(branchName: string, remote: string): Promise<void>;
 export declare function getFileList(): Promise<string[]>;
 export declare function getBranchList(): string[];
 export declare function isBranchBehindBase(branchName: string, baseBranch: string): Promise<boolean>;
@@ -113,3 +116,19 @@ export declare function clearRenovateRefs(): Promise<void>;
  *
  */
 export declare function listCommitTree(commitSha: LongCommitSha): Promise<TreeItem[]>;
+/**
+ * Synchronize a forked branch with its upstream counterpart.
+ *
+ * syncForkWithUpstream updates the fork's branch, to match the corresponding branch in the upstream repository.
+ * The steps are:
+ * 1. Check if the branch exists locally.
+ * 2. If the branch exists locally: checkout the local branch.
+ * 3. If the branch does _not_ exist locally: checkout the upstream branch.
+ * 4. Reset the local branch to match the upstream branch.
+ * 5. Force push the (updated) local branch to the origin repository.
+ *
+ * @param {string} branchName - The name of the branch to synchronize.
+ * @returns {Promise<LongCommitSha>} - A promise that resolves to True if the synchronization is successful, or `false` if an error occurs.
+ */
+export declare function syncForkWithUpstream(branchName: string): Promise<LongCommitSha>;
+export declare function getRemotes(): Promise<string[]>;

package/dist/util/git/index.js

@@ -18,6 +18,9 @@ exports.branchExists = branchExists;
 exports.getBranchCommit = getBranchCommit;
 exports.getCommitMessages = getCommitMessages;
 exports.checkoutBranch = checkoutBranch;
+exports.checkoutBranchFromRemote = checkoutBranchFromRemote;
+exports.resetHardFromRemote = resetHardFromRemote;
+exports.forcePushToRemote = forcePushToRemote;
 exports.getFileList = getFileList;
 exports.getBranchList = getBranchList;
 exports.isBranchBehindBase = isBranchBehindBase;
@@ -39,6 +42,8 @@ exports.getUrl = getUrl;
 exports.pushCommitToRenovateRef = pushCommitToRenovateRef;
 exports.clearRenovateRefs = clearRenovateRefs;
 exports.listCommitTree = listCommitTree;
+exports.syncForkWithUpstream = syncForkWithUpstream;
+exports.getRemotes = getRemotes;
 const tslib_1 = require("tslib");
 const node_url_1 = tslib_1.__importDefault(require("node:url"));
 const promises_1 = require("timers/promises");
@@ -182,9 +187,10 @@ async function validateGitVersion() {
     logger_1.logger.debug(`Found valid git version: ${version}`);
     return true;
 }
-async function fetchBranchCommits() {
+async function fetchBranchCommits(preferUpstream = true) {
     config.branchCommits = {};
-    const opts = ['ls-remote', '--heads', config.url];
+    const url = preferUpstream && config.upstreamUrl ? config.upstreamUrl : config.url;
+    const opts = ['ls-remote', '--heads', url];
     if (config.extraCloneOpts) {
         Object.entries(config.extraCloneOpts).forEach((e) => 
         // TODO: types (#22198)
@@ -455,6 +461,21 @@ async function syncGit() {
             (await getDefaultBranch(git));
     /* v8 ignore next -- TODO: add test */
     delete (0, repository_1.getCache)()?.semanticCommits;
+    // If upstreamUrl is set then the bot is running in fork mode
+    // The "upstream" remote is the original repository which was forked from
+    if (config.upstreamUrl) {
+        logger_1.logger.debug(`Bringing default branch up-to-date with upstream, to get latest config`);
+        // Add remote if it does not exist
+        const remotes = await git.getRemotes(true);
+        if (!remotes.some((remote) => remote.name === 'upstream')) {
+            logger_1.logger.debug("Adding remote 'upstream'");
+            await git.addRemote('upstream', config.upstreamUrl);
+        }
+        await syncForkWithUpstream(config.currentBranch);
+        await fetchBranchCommits(false);
+    }
+    config.currentBranchSha = (await git.revparse('HEAD')).trim();
+    logger_1.logger.debug(`Current branch SHA: ${config.currentBranchSha}`);
 }
 async function getRepoStatus(path) {
     if (is_1.default.string(path)) {
@@ -503,7 +524,7 @@ async function checkoutBranch(branchName) {
         config.currentBranchSha = (await git.raw(['rev-parse', 'HEAD'])).trim();
         const latestCommitDate = (await git.log({ n: 1 }))?.latest?.date;
         if (latestCommitDate) {
-            logger_1.logger.debug({ branchName, latestCommitDate }, 'latest commit');
+            logger_1.logger.debug({ branchName, latestCommitDate, sha: config.currentBranchSha }, 'latest commit');
         }
         await git.reset(simple_git_1.ResetMode.HARD);
         return config.currentBranchSha;
@@ -521,6 +542,50 @@ async function checkoutBranch(branchName) {
         throw err;
     }
 }
+async function checkoutBranchFromRemote(branchName, remoteName) {
+    logger_1.logger.debug(`Checking out branch ${branchName} from remote ${remoteName}`);
+    await syncGit();
+    try {
+        await gitRetry(() => git.checkoutBranch(branchName, `${remoteName}/${branchName}`));
+        config.currentBranch = branchName;
+        config.currentBranchSha = (await git.revparse('HEAD')).trim();
+        logger_1.logger.debug(`Checked out branch ${branchName} from remote ${remoteName}`);
+        config.branchCommits[branchName] = config.currentBranchSha;
+        return config.currentBranchSha;
+    }
+    catch (err) {
+        const errChecked = (0, error_1.checkForPlatformFailure)(err);
+        /* v8 ignore next 3 -- hard to test */
+        if (errChecked) {
+            throw errChecked;
+        }
+        if (err.message?.includes('fatal: ambiguous argument')) {
+            logger_1.logger.warn({ err }, 'Failed to checkout branch');
+            throw new Error(error_messages_1.TEMPORARY_ERROR);
+        }
+        throw err;
+    }
+}
+async function resetHardFromRemote(remoteAndBranch) {
+    try {
+        const resetLog = await git.reset(['--hard', remoteAndBranch]);
+        logger_1.logger.debug({ resetLog }, 'git reset log');
+    }
+    catch (err) {
+        logger_1.logger.error({ err }, 'Error during git reset --hard');
+        throw err;
+    }
+}
+async function forcePushToRemote(branchName, remote) {
+    try {
+        const pushLog = await git.push([remote, branchName, '--force']);
+        logger_1.logger.debug({ pushLog }, 'git push log');
+    }
+    catch (err) {
+        logger_1.logger.error({ err }, 'Error during git push --force');
+        throw err;
+    }
+}
 async function getFileList() {
     await syncGit();
     const branch = config.currentBranch;
@@ -1186,4 +1251,50 @@ async function listCommitTree(commitSha) {
     }
     return result;
 }
+async function localBranchExists(branchName) {
+    await syncGit();
+    const localBranches = await git.branchLocal();
+    return localBranches.all.includes(branchName);
+}
+/**
+ * Synchronize a forked branch with its upstream counterpart.
+ *
+ * syncForkWithUpstream updates the fork's branch, to match the corresponding branch in the upstream repository.
+ * The steps are:
+ * 1. Check if the branch exists locally.
+ * 2. If the branch exists locally: checkout the local branch.
+ * 3. If the branch does _not_ exist locally: checkout the upstream branch.
+ * 4. Reset the local branch to match the upstream branch.
+ * 5. Force push the (updated) local branch to the origin repository.
+ *
+ * @param {string} branchName - The name of the branch to synchronize.
+ * @returns {Promise<LongCommitSha>} - A promise that resolves to True if the synchronization is successful, or `false` if an error occurs.
+ */
+async function syncForkWithUpstream(branchName) {
+    const remotes = await getRemotes();
+    if (!remotes.some((r) => r === 'upstream')) {
+        throw new Error('No remote named "upstream" exists, cannot sync fork');
+    }
+    try {
+        await git.fetch(['upstream']);
+        if (await localBranchExists(branchName)) {
+            await checkoutBranch(branchName);
+        }
+        else {
+            await checkoutBranchFromRemote(branchName, `upstream`);
+        }
+        await resetHardFromRemote(`upstream/${branchName}`);
+        await forcePushToRemote(branchName, 'origin');
+        // Get long Git SHA
+        return (await git.revparse([branchName]));
+    }
+    catch (err) {
+        logger_1.logger.error({ err }, 'Error synchronizing fork');
+        throw new Error(error_messages_1.UNKNOWN_ERROR);
+    }
+}
+async function getRemotes() {
+    const remotes = await git.getRemotes();
+    return remotes.map((remote) => remote.name);
+}
 //# sourceMappingURL=index.js.map