TEMP

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

Author: kiprasmel

.vscode/launch.json

@@ -0,0 +1,26 @@
+{
+	// Use IntelliSense to learn about possible attributes.
+	// Hover to view descriptions of existing attributes.
+	// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+	"version": "0.2.0",
+	"configurations": [
+		{
+			"name": "ts-node",
+			"type": "node",
+			"request": "launch",
+			"args": [
+				"${relativeFile}" //
+			],
+			"runtimeArgs": [
+				"-r", //
+				"ts-node/register"
+			],
+			"cwd": "${workspaceRoot}",
+			"protocol": "inspector",
+			"internalConsoleOptions": "openOnSessionStart",
+			"env": {
+				"DEBUG": "gsr:*"
+			}
+		}
+	]
+}

git-stacked-rebase.ts

@@ -202,6 +202,7 @@ export const gitStackedRebase = async (
 			autoApplyIfNeeded: configValues.autoApplyIfNeeded,
 			config,
 		});
+		console.log({ neededToApply, userAllowedToApplyAndWeApplied });
 
 		if (neededToApply && !userAllowedToApplyAndWeApplied) {
 			return;

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

@@ -45,8 +45,14 @@ export function parseNewGoodCommands(
 		const last = newCommits.length - 1;
 
 		if (newCommits.length && newSHA === newCommits[last].newSHA) {
+			/**
+			 * accumulating - if multiple commits got molded into 1
+			 */
 			newCommits[last].oldSHAs.push(oldSHA);
 		} else {
+			/**
+			 * initializing a new commit
+			 */
 			newCommits.push({
 				newSHA,
 				oldSHAs: [oldSHA],

test/experiment.spec.ts

@@ -31,7 +31,10 @@ export async function testCase() {
 	} = await setupRepo();
 
 	const config: Git.Config = await repo.config();
-	config.setBool(configKeys.autoApplyIfNeeded, Git.Config.MAP.FALSE);
+
+	await config.setBool(configKeys.autoApplyIfNeeded, Git.Config.MAP.FALSE);
+	await config.setString("user.email", "tester@test.com");
+	await config.setString("user.name", "tester");
 
 	const commitOidsInInitial: Git.Oid[] = [];
 	const initialBranch: Git.Reference = await appendCommitsTo(commitOidsInInitial, 3, repo, sig);
@@ -46,7 +49,10 @@ export async function testCase() {
 
 	const execSyncInRepo = createExecSyncInRepo(repo);
 
-	execSyncInRepo("read");
+	// const read = () => execSyncInRepo("read");
+	const read = () => void 0;
+
+	read();
 
 	const commitOidsInLatestStacked: Git.Oid[] = [];
 	await appendCommitsTo(commitOidsInLatestStacked, 12, repo, sig);
@@ -75,12 +81,12 @@ export async function testCase() {
 
 			log("finished editor");
 
-			execSyncInRepo("read");
+			read();
 		},
 	});
 
 	log("looking up branches to make sure they were created successfully");
-	execSyncInRepo("read");
+	read();
 	for (const [newPartial] of newPartialBranches) {
 		/**
 		 * will throw if branch does not exist
@@ -93,7 +99,7 @@ export async function testCase() {
 	 *
 	 */
 	log("launching 2nd rebase to change command of nth commit");
-	execSyncInRepo("read");
+	read();
 
 	const nthCommit2ndRebase = 5;
 
@@ -120,7 +126,7 @@ export async function testCase() {
 	execSyncInRepo(`${defaultGitCmd} rebase --continue`);
 
 	execSyncInRepo(`${defaultGitCmd} status`);
-	execSyncInRepo("read");
+	read();
 
 	/**
 	 * now some partial branches will be "gone" from the POV of the latestBranch<->initialBranch.
@@ -136,7 +142,7 @@ export async function testCase() {
 	 */
 
 	log("attempting early 3rd rebase to --apply");
-	execSyncInRepo("read");
+	read();
 
 	await gitStackedRebase(initialBranch.shorthand(), {
 		gitDir: dir,