refactor: extract rewritten-list reading logic into apply.ts

...because completely related to the logic of "doesNeedToApply",
"markThatNeedsToApply", "markThatApplied", etc.

thought about extracting the above utils into a separate, "rewrittenList.ts" file,
but it doesn't make sense to separate the utils out from "apply" itself,

because if we have the "rewrittenList.ts" file, then it'd sound
reasonable to move the "reduce-path"'s "combineRewrittenLists" there as well,
but it doesnt, because the apply logic is not related to the
parsing/combinning logic.

Signed-off-by: Kipras Melnikovas <[email protected]>

Author: kiprasmel

apply.ts

@@ -8,13 +8,15 @@ import { noop } from "./util/noop";
 
 import { filenames } from "./filenames";
 import { configKeys } from "./configKeys";
+// eslint-disable-next-line import/no-cycle
 import {
 	BranchSequencerBase, //
 	branchSequencer,
 	ActionInsideEachCheckedOutBranch,
 	CallbackAfterDone,
 	BranchSequencerArgsBase,
 } from "./branchSequencer";
+import { combineRewrittenLists } from "./reducePath";
 
 export const apply: BranchSequencerBase = (args) =>
 	branchSequencer({
@@ -156,6 +158,46 @@ const doesNeedToApply = (pathToStackedRebaseDirInsideDotGit: string): boolean =>
 	return needsToApplyPart2;
 };
 
+export function readRewrittenListNotAppliedOrAppliedOrError(
+	repoPath: string
+): {
+	pathOfRewrittenList: string;
+	pathOfRewrittenListApplied: string;
+	rewrittenListRaw: string;
+	/**
+	 * you probably want these:
+	 */
+	combinedRewrittenList: string;
+	combinedRewrittenListLines: string[];
+} {
+	const pathOfRewrittenList: string = path.join(repoPath, "stacked-rebase", filenames.rewrittenList);
+	const pathOfRewrittenListApplied: string = path.join(repoPath, "stacked-rebase", filenames.applied);
+
+	/**
+	 * not combined yet
+	 */
+	let rewrittenListRaw: string;
+	if (fs.existsSync(pathOfRewrittenList)) {
+		rewrittenListRaw = fs.readFileSync(pathOfRewrittenList, { encoding: "utf-8" });
+	} else if (fs.existsSync(pathOfRewrittenListApplied)) {
+		rewrittenListRaw = fs.readFileSync(pathOfRewrittenListApplied, { encoding: "utf-8" });
+	} else {
+		throw new Error(
+			`rewritten-list not found neither in ${pathOfRewrittenList}, nor in ${pathOfRewrittenListApplied}`
+		);
+	}
+
+	const { combinedRewrittenList } = combineRewrittenLists(rewrittenListRaw);
+
+	return {
+		pathOfRewrittenList,
+		pathOfRewrittenListApplied,
+		rewrittenListRaw,
+		combinedRewrittenList,
+		combinedRewrittenListLines: combinedRewrittenList.split("\n").filter((line) => !!line),
+	};
+}
+
 export async function applyIfNeedsToApply({
 	repo,
 	pathToStackedRebaseTodoFile,

parse-todo-of-stacked-rebase/parseNewGoodCommands.ts

@@ -1,14 +1,13 @@
 /* eslint-disable indent */
 
-import fs from "fs";
-import path from "path";
 import assert from "assert";
 
 import Git from "nodegit";
 import { array } from "nice-comment";
 
 import { filenames } from "../filenames";
-import { combineRewrittenLists } from "../reduce-path";
+// eslint-disable-next-line import/no-cycle
+import { readRewrittenListNotAppliedOrAppliedOrError } from "../apply";
 
 import { parseTodoOfStackedRebase } from "./parseTodoOfStackedRebase";
 import { GoodCommand, stackedRebaseCommands } from "./validator";
@@ -21,29 +20,14 @@ export function parseNewGoodCommands(
 
 	logGoodCmds(oldGoodCommands);
 
-	const pathOfRewrittenList: string = path.join(repo.path(), "stacked-rebase", filenames.rewrittenList);
-	const pathOfRewrittenListApplied: string = path.join(repo.path(), "stacked-rebase", filenames.applied);
-	let rewrittenList: string;
-	if (fs.existsSync(pathOfRewrittenList)) {
-		rewrittenList = fs.readFileSync(pathOfRewrittenList, { encoding: "utf-8" });
-	} else if (fs.existsSync(pathOfRewrittenListApplied)) {
-		rewrittenList = fs.readFileSync(pathOfRewrittenListApplied, { encoding: "utf-8" });
-	} else {
-		throw new Error(
-			`rewritten-list not found neither in ${pathOfRewrittenList}, nor in ${pathOfRewrittenListApplied}`
-		);
-	}
-	const { combinedRewrittenList } = combineRewrittenLists(rewrittenList);
-	const rewrittenListLines: string[] = combinedRewrittenList.split("\n").filter((line) => !!line);
-
-	console.log({ rewrittenListLines });
+	const { combinedRewrittenListLines } = readRewrittenListNotAppliedOrAppliedOrError(repo.path());
 
 	const newCommits: { newSHA: string; oldSHAs: string[] }[] = [];
 
 	type OldCommit = { oldSHA: string; newSHA: string; changed: boolean };
 	const oldCommits: OldCommit[] = [];
 
-	rewrittenListLines.map((line) => {
+	combinedRewrittenListLines.map((line) => {
 		const fromToSHA = line.split(" ");
 		assert(
 			fromToSHA.length === 2,