feat: implement custom getBoundariesInclInitial for forcePush, using only existing commits 🔥🔥🔥

Signed-off-by: Kipras Melnikovas <kipras@kipras.org>

Author: kiprasmel

branchSequencer.ts

@@ -20,7 +20,9 @@ export type SimpleBranchAndCommit = {
 	branchEndFullName: string;
 	// branchExistsYet: boolean; // TODO
 };
-export type GetBoundariesInclInitial = (ctx: GetBranchesCtx) => SimpleBranchAndCommit[];
+export type GetBoundariesInclInitial = (
+	ctx: GetBranchesCtx //
+) => SimpleBranchAndCommit[] | Promise<SimpleBranchAndCommit[]>;
 
 const defautlGetBoundariesInclInitial: GetBoundariesInclInitial = ({
 	pathToStackedRebaseDirInsideDotGit, //
@@ -116,6 +118,9 @@ export type BranchSequencerArgsBase = {
 	repo: Git.Repository;
 	rootLevelCommandName: string;
 	gitCmd: string;
+	//
+	initialBranch: Git.Reference;
+	currentBranch: Git.Reference;
 };
 export type BranchSequencerArgs = BranchSequencerArgsBase & {
 	// callbackBeforeBegin?: CallbackAfterDone; // TODO
@@ -144,7 +149,7 @@ export const branchSequencer: BranchSequencer = async ({
 }) => {
 	const execSyncInRepo = createExecSyncInRepo(repo);
 
-	const branchesAndCommits: SimpleBranchAndCommit[] = getBoundariesInclInitial({
+	const branchesAndCommits: SimpleBranchAndCommit[] = await getBoundariesInclInitial({
 		pathToStackedRebaseDirInsideDotGit,
 		pathToStackedRebaseTodoFile,
 		repo,

forcePush.ts

@@ -2,9 +2,11 @@
 
 // import fs from "fs";
 
+import { getWantedCommitsWithBranchBoundariesOurCustomImpl } from "./git-stacked-rebase";
 import {
 	branchSequencer, //
 	BranchSequencerBase,
+	SimpleBranchAndCommit,
 	// getBackupPathOfPreviousStackedRebase,
 } from "./branchSequencer";
 
@@ -38,4 +40,19 @@ export const forcePush: BranchSequencerBase = (argsBase) =>
 			execSyncInRepo(`${argsBase.gitCmd} push --force`);
 		},
 		delayMsBetweenCheckouts: 0,
+		getBoundariesInclInitial: () =>
+			getWantedCommitsWithBranchBoundariesOurCustomImpl(
+				argsBase.repo, //
+				argsBase.initialBranch,
+				argsBase.currentBranch
+			).then((boundaries) =>
+				boundaries
+					.filter((b) => !!b.branchEnd)
+					.map(
+						(boundary): SimpleBranchAndCommit => ({
+							branchEndFullName: boundary.branchEnd!.name(), // TS ok because of the filter
+							commitSHA: boundary.commit.sha(),
+						})
+					)
+			),
 	});

git-stacked-rebase.ts

@@ -289,6 +289,19 @@ export const gitStackedRebase = async (
 
 		const checkIsRegularRebaseStillInProgress = (): boolean => fs.existsSync(pathToRegularRebaseDirInsideDotGit);
 
+		fs.mkdirSync(pathToStackedRebaseDirInsideDotGit, { recursive: true });
+
+		const initialBranch: Git.Reference | void = await Git.Branch.lookup(
+			repo, //
+			nameOfInitialBranch,
+			Git.Branch.BRANCH.ALL
+		);
+		if (!initialBranch) {
+			throw new Error("initialBranch lookup failed");
+		}
+
+		const currentBranch: Git.Reference = await repo.getCurrentBranch();
+
 		if (fs.existsSync(path.join(pathToStackedRebaseDirInsideDotGit, filenames.willNeedToApply))) {
 			_markThatNeedsToApply(pathToStackedRebaseDirInsideDotGit);
 		}
@@ -300,6 +313,8 @@ export const gitStackedRebase = async (
 				pathToStackedRebaseDirInsideDotGit, //
 				rootLevelCommandName: "--apply",
 				gitCmd: options.gitCmd,
+				initialBranch,
+				currentBranch,
 			});
 		}
 
@@ -327,6 +342,8 @@ export const gitStackedRebase = async (
 				gitCmd: options.gitCmd,
 				autoApplyIfNeeded: configValues.autoApplyIfNeeded,
 				config,
+				initialBranch,
+				currentBranch,
 			});
 
 			return;
@@ -340,6 +357,8 @@ export const gitStackedRebase = async (
 			gitCmd: options.gitCmd,
 			autoApplyIfNeeded: configValues.autoApplyIfNeeded,
 			config,
+			initialBranch,
+			currentBranch,
 		});
 
 		if (neededToApply && !userAllowedToApplyAndWeApplied) {
@@ -357,6 +376,8 @@ export const gitStackedRebase = async (
 				pathToStackedRebaseDirInsideDotGit,
 				rootLevelCommandName: "--push --force",
 				gitCmd: options.gitCmd,
+				initialBranch,
+				currentBranch,
 			});
 		}
 
@@ -371,6 +392,8 @@ export const gitStackedRebase = async (
 					actionInsideEachCheckedOutBranch: ({ execSyncInRepo: execS }) => (execS(toExec), void 0),
 					pathToStackedRebaseDirInsideDotGit,
 					pathToStackedRebaseTodoFile,
+					initialBranch,
+					currentBranch,
 				});
 			} else {
 				/**
@@ -382,15 +405,6 @@ export const gitStackedRebase = async (
 			}
 		}
 
-		fs.mkdirSync(pathToStackedRebaseDirInsideDotGit, { recursive: true });
-
-		const initialBranch: Git.Reference | void = await Git.Branch.lookup(
-			repo, //
-			nameOfInitialBranch,
-			Git.Branch.BRANCH.ALL
-		);
-		const currentBranch: Git.Reference = await repo.getCurrentBranch();
-
 		const wasRegularRebaseInProgress: boolean = checkIsRegularRebaseStillInProgress();
 		// const
 
@@ -905,6 +919,8 @@ mv -f "${preparedRegularRebaseTodoFile}" "${pathToRegularRebaseTodoFile}"
 					gitCmd: options.gitCmd,
 					autoApplyIfNeeded: configValues.autoApplyIfNeeded,
 					config,
+					initialBranch,
+					currentBranch,
 				});
 			}
 		}
@@ -1082,7 +1098,7 @@ type CommitAndBranchBoundary = {
 	branchEnd: Git.Reference | null;
 };
 
-async function getWantedCommitsWithBranchBoundariesOurCustomImpl(
+export async function getWantedCommitsWithBranchBoundariesOurCustomImpl(
 	repo: Git.Repository, //
 	/** beginningBranch */
 	bb: Git.Reference,