@ryanatkn/gro 0.168.0 → 0.169.1

package/src/lib/test.task.ts

@@ -4,7 +4,7 @@ import {spawn_cli} from '@ryanatkn/gro/cli.js';
 import {Task_Error, type Task} from './task.ts';
 import {find_cli} from './cli.ts';
 import {has_dep} from './package_json.ts';
-import {serialize_args, to_forwarded_args} from './args.ts';
+import {serialize_args, to_implicit_forwarded_args} from './args.ts';
 import {VITEST_CLI} from './constants.ts';
 import {paths} from './paths.ts';
 
@@ -46,7 +46,7 @@ export const task: Task<Args> = {
 		if (t) {
 			vitest_args.push('-t', t);
 		}
-		vitest_args.push(...serialize_args(to_forwarded_args(VITEST_CLI)));
+		vitest_args.push(...serialize_args(to_implicit_forwarded_args(VITEST_CLI)));
 
 		const spawned = await spawn_cli(VITEST_CLI, vitest_args);
 		if (!spawned?.ok) {

package/src/lib/upgrade.task.ts

@@ -1,10 +1,10 @@
 import {spawn} from '@ryanatkn/belt/process.js';
 import {z} from 'zod';
 import {rmSync} from 'node:fs';
+import {Git_Origin, git_pull} from '@ryanatkn/belt/git.js';
 
 import {Task_Error, type Task} from './task.ts';
 import {extract_deps, load_package_json, type Package_Json_Dep} from './package_json.ts';
-import {Git_Origin, git_pull} from './git.ts';
 import {spawn_cli} from './cli.ts';
 import {serialize_args, to_forwarded_args} from './args.ts';
 import {NODE_MODULES_DIRNAME} from './constants.ts';

package/src/lib/watch_dir.ts

@@ -2,10 +2,9 @@ import {watch, type ChokidarOptions, type FSWatcher, type Matcher} from 'chokida
 import {relative} from 'node:path';
 import {statSync} from 'node:fs';
 import {create_deferred, type Deferred} from '@ryanatkn/belt/async.js';
+import type {Path_Filter} from '@ryanatkn/belt/path.js';
 import {EMPTY_OBJECT} from '@ryanatkn/belt/object.js';
 
-import type {Path_Filter} from './path.ts';
-
 const TMP_FILE_PATTERN = /\.tmp\./;
 
 // TODO pretty hacky

package/dist/git.d.ts

@@ -1,81 +0,0 @@
-import type { SpawnOptions } from 'node:child_process';
-import { z } from 'zod';
-import type { Flavored } from '@ryanatkn/belt/types.js';
-export declare const Git_Origin: z.ZodString;
-export type Git_Origin = Flavored<string, 'Git_Origin'>;
-export declare const Git_Branch: z.ZodString;
-export type Git_Branch = Flavored<string, 'Git_Branch'>;
-/**
- * Returns the current git branch name or throws if something goes wrong.
- */
-export declare const git_current_branch_name: (options?: SpawnOptions) => Promise<Git_Branch>;
-/**
- * @returns a boolean indicating if the remote git branch exists
- */
-export declare const git_remote_branch_exists: (origin?: Git_Origin, branch?: Git_Branch, options?: SpawnOptions) => Promise<boolean>;
-/**
- * @returns a boolean indicating if the local git branch exists
- */
-export declare const git_local_branch_exists: (branch: Git_Branch, options?: SpawnOptions) => Promise<boolean>;
-/**
- * TODO make this return an enum and separate the text into a different function
- * @returns an error message if the git workspace has any unstaged or uncommitted changes, or `null` if it's clean
- */
-export declare const git_check_clean_workspace: (options?: SpawnOptions) => Promise<string | null>;
-/**
- * TODO make this return an enum and separate the text into a different function
- * @returns an error message if the git workspace has any unstaged stages, or `null` if it's clean
- */
-export declare const git_check_fully_staged_workspace: (options?: SpawnOptions) => Promise<string | null>;
-/**
- * Calls `git fetch` and throws if anything goes wrong.
- */
-export declare const git_fetch: (origin?: Git_Origin, branch?: Git_Branch, options?: SpawnOptions) => Promise<void>;
-/**
- * Calls `git checkout` and throws if anything goes wrong.
- * @returns the previous branch name, if it changed
- */
-export declare const git_checkout: (branch: Git_Branch, options?: SpawnOptions) => Promise<Git_Branch | null>;
-/**
- * Calls `git pull` and throws if anything goes wrong.
- */
-export declare const git_pull: (origin?: Git_Origin, branch?: Git_Branch, options?: SpawnOptions) => Promise<void>;
-/**
- * Calls `git push` and throws if anything goes wrong.
- */
-export declare const git_push: (origin: Git_Origin, branch?: Git_Branch, options?: SpawnOptions, set_upstream?: boolean) => Promise<void>;
-/**
- * Calls `git push` and throws if anything goes wrong.
- */
-export declare const git_push_to_create: (origin?: Git_Origin, branch?: Git_Branch, options?: SpawnOptions) => Promise<void>;
-/**
- * Deletes a branch locally and throws if anything goes wrong.
- */
-export declare const git_delete_local_branch: (branch: Git_Branch, options?: SpawnOptions) => Promise<void>;
-/**
- * Deletes a branch remotely and throws if anything goes wrong.
- */
-export declare const git_delete_remote_branch: (origin: Git_Origin, branch: Git_Branch, options?: SpawnOptions) => Promise<void>;
-/**
- * Resets the `target` branch back to its first commit both locally and remotely.
- */
-export declare const git_reset_branch_to_first_commit: (origin: Git_Origin, branch: Git_Branch, options?: SpawnOptions) => Promise<void>;
-/**
- * Returns the branch's latest commit hash or throws if something goes wrong.
- */
-export declare const git_current_commit_hash: (branch?: string, options?: SpawnOptions) => Promise<string | null>;
-/**
- * Returns the hash of the current branch's first commit or throws if something goes wrong.
- */
-export declare const git_current_branch_first_commit_hash: (options?: SpawnOptions) => Promise<string>;
-/**
- * Returns the global git config setting for `pull.rebase`.
- * Gro is currently written to expect `true`,
- * but the restriction could be loosened with additional work.
- */
-export declare const git_check_setting_pull_rebase: (options?: SpawnOptions) => Promise<boolean>;
-/**
- * Clones a branch locally to another directory and updates the origin to match the source.
- */
-export declare const git_clone_locally: (origin: Git_Origin, branch: Git_Branch, source_dir: string, target_dir: string, options?: SpawnOptions) => Promise<void>;
-//# sourceMappingURL=git.d.ts.map

package/dist/git.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"git.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/git.ts"],"names":[],"mappings":"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"}

package/dist/git.js

@@ -1,218 +0,0 @@
-import { spawn, spawn_out } from '@ryanatkn/belt/process.js';
-import { z } from 'zod';
-import { existsSync } from 'node:fs';
-import { to_file_path } from "./path.js";
-// TODO maybe extract to `util-git`
-export const Git_Origin = z.string();
-export const Git_Branch = z.string();
-/**
- * Returns the current git branch name or throws if something goes wrong.
- */
-export const git_current_branch_name = async (options) => {
-    const { stdout } = await spawn_out('git', ['rev-parse', '--abbrev-ref', 'HEAD'], options);
-    if (!stdout)
-        throw Error('git_current_branch_name failed');
-    const branch_name = stdout.trim();
-    return branch_name;
-};
-/**
- * @returns a boolean indicating if the remote git branch exists
- */
-export const git_remote_branch_exists = async (origin = 'origin', branch, options) => {
-    const final_branch = branch ?? (await git_current_branch_name(options));
-    if (options?.cwd && !existsSync(to_file_path(options.cwd))) {
-        return false;
-    }
-    const result = await spawn('git', ['ls-remote', '--exit-code', '--heads', origin, 'refs/heads/' + final_branch], options);
-    if (result.ok) {
-        return true;
-    }
-    else if (result.code === 2) {
-        return false;
-    }
-    else {
-        throw Error(`git_remote_branch_exists failed for origin '${origin}' and branch '${final_branch}' with code ${result.code}`);
-    }
-};
-/**
- * @returns a boolean indicating if the local git branch exists
- */
-export const git_local_branch_exists = async (branch, options) => {
-    if (options?.cwd && !existsSync(to_file_path(options.cwd))) {
-        return false;
-    }
-    const result = await spawn('git', ['show-ref', '--quiet', 'refs/heads/' + branch], options);
-    return result.ok;
-};
-/**
- * TODO make this return an enum and separate the text into a different function
- * @returns an error message if the git workspace has any unstaged or uncommitted changes, or `null` if it's clean
- */
-export const git_check_clean_workspace = async (options) => {
-    const unstaged_result = await spawn('git', ['diff', '--exit-code', '--quiet'], options);
-    if (!unstaged_result.ok) {
-        return 'git has unstaged changes';
-    }
-    const staged_result = await spawn('git', ['diff', '--exit-code', '--cached', '--quiet'], options);
-    if (!staged_result.ok) {
-        return 'git has staged but uncommitted changes';
-    }
-    const status_result = await spawn_out('git', ['status', '--porcelain'], options);
-    if (status_result.stdout?.length) {
-        return 'git has untracked files';
-    }
-    return null;
-};
-/**
- * TODO make this return an enum and separate the text into a different function
- * @returns an error message if the git workspace has any unstaged stages, or `null` if it's clean
- */
-export const git_check_fully_staged_workspace = async (options) => {
-    const unstaged_result = await spawn('git', ['diff', '--exit-code', '--quiet'], options);
-    if (!unstaged_result.ok) {
-        return 'git has unstaged changes';
-    }
-    const status_result = await spawn_out('git', ['status', '--porcelain'], options);
-    if (status_result.stdout?.includes('??')) {
-        return 'git has untracked files';
-    }
-    return null;
-};
-/**
- * Calls `git fetch` and throws if anything goes wrong.
- */
-export const git_fetch = async (origin = 'origin', branch, options) => {
-    const args = ['fetch', origin];
-    if (branch)
-        args.push(branch);
-    const result = await spawn('git', args, options);
-    if (!result.ok) {
-        throw Error(`git_fetch failed for origin '${origin}' and branch '${branch}' with code ${result.code}`);
-    }
-};
-/**
- * Calls `git checkout` and throws if anything goes wrong.
- * @returns the previous branch name, if it changed
- */
-export const git_checkout = async (branch, options) => {
-    const current_branch = await git_current_branch_name(options);
-    if (branch === current_branch) {
-        return null;
-    }
-    const result = await spawn('git', ['checkout', branch], options);
-    if (!result.ok) {
-        throw Error(`git_checkout failed for branch '${branch}' with code ${result.code}`);
-    }
-    return current_branch;
-};
-/**
- * Calls `git pull` and throws if anything goes wrong.
- */
-export const git_pull = async (origin = 'origin', branch, options) => {
-    const args = ['pull', origin];
-    if (branch)
-        args.push(branch);
-    const result = await spawn('git', args, options);
-    if (!result.ok) {
-        throw Error(`git_pull failed for branch '${branch}' with code ${result.code}`);
-    }
-};
-/**
- * Calls `git push` and throws if anything goes wrong.
- */
-export const git_push = async (origin, branch, options, set_upstream = false) => {
-    const final_branch = branch ?? (await git_current_branch_name(options));
-    const args = ['push', origin, final_branch];
-    if (set_upstream)
-        args.push('-u');
-    const result = await spawn('git', args, options);
-    if (!result.ok) {
-        throw Error(`git_push failed for branch '${final_branch}' with code ${result.code}`);
-    }
-};
-/**
- * Calls `git push` and throws if anything goes wrong.
- */
-export const git_push_to_create = async (origin = 'origin', branch, options) => {
-    const final_branch = branch ?? (await git_current_branch_name(options));
-    const push_args = ['push'];
-    if (await git_remote_branch_exists(origin, final_branch, options)) {
-        push_args.push(origin);
-    }
-    else {
-        push_args.push('-u', origin);
-    }
-    push_args.push(final_branch);
-    const result = await spawn('git', push_args, options);
-    if (!result.ok) {
-        throw Error(`git_push failed for branch '${final_branch}' with code ${result.code}`);
-    }
-};
-/**
- * Deletes a branch locally and throws if anything goes wrong.
- */
-export const git_delete_local_branch = async (branch, options) => {
-    const result = await spawn('git', ['branch', '-D', branch], options);
-    if (!result.ok) {
-        throw Error(`git_delete_local_branch failed for branch '${branch}' with code ${result.code}`);
-    }
-};
-/**
- * Deletes a branch remotely and throws if anything goes wrong.
- */
-export const git_delete_remote_branch = async (origin, branch, options) => {
-    const result = await spawn('git', ['push', origin, ':' + branch], options);
-    if (!result.ok) {
-        throw Error(`git_delete_remote_branch failed for branch '${branch}' with code ${result.code}`);
-    }
-};
-/**
- * Resets the `target` branch back to its first commit both locally and remotely.
- */
-export const git_reset_branch_to_first_commit = async (origin, branch, options) => {
-    const previous_branch = await git_checkout(branch, options);
-    const first_commit_hash = await git_current_branch_first_commit_hash(options);
-    await spawn('git', ['reset', '--hard', first_commit_hash], options);
-    await spawn('git', ['push', origin, branch, '--force'], options);
-    if (previous_branch) {
-        await git_checkout(previous_branch, options);
-    }
-};
-/**
- * Returns the branch's latest commit hash or throws if something goes wrong.
- */
-export const git_current_commit_hash = async (branch, options) => {
-    const final_branch = branch ?? (await git_current_branch_name(options));
-    const { stdout } = await spawn_out('git', ['show-ref', '-s', final_branch], options);
-    if (!stdout)
-        return null; // TODO hack for CI
-    return stdout.split('\n')[0].trim();
-};
-/**
- * Returns the hash of the current branch's first commit or throws if something goes wrong.
- */
-export const git_current_branch_first_commit_hash = async (options) => {
-    const { stdout } = await spawn_out('git', ['rev-list', '--max-parents=0', '--abbrev-commit', 'HEAD'], options);
-    if (!stdout)
-        throw Error('git_current_branch_first_commit_hash failed');
-    return stdout.trim();
-};
-/**
- * Returns the global git config setting for `pull.rebase`.
- * Gro is currently written to expect `true`,
- * but the restriction could be loosened with additional work.
- */
-export const git_check_setting_pull_rebase = async (options) => {
-    const value = await spawn_out('git', ['config', '--global', 'pull.rebase'], options);
-    return value.stdout?.trim() === 'true';
-};
-/**
- * Clones a branch locally to another directory and updates the origin to match the source.
- */
-export const git_clone_locally = async (origin, branch, source_dir, target_dir, options) => {
-    await spawn('git', ['clone', '-b', branch, '--single-branch', source_dir, target_dir], options);
-    const origin_url = (await spawn_out('git', ['remote', 'get-url', origin], { ...options, cwd: source_dir })).stdout?.trim();
-    if (!origin_url)
-        throw Error('Failed to get the origin url with git in ' + source_dir);
-    await spawn('git', ['remote', 'set-url', origin, origin_url], { ...options, cwd: target_dir });
-};

package/dist/path.d.ts

@@ -1,17 +0,0 @@
-import { type URL } from 'node:url';
-import type { Flavored } from '@ryanatkn/belt/types.js';
-/**
- * An absolute path on the filesystem. Named "id" to be consistent with Rollup.
- */
-export type Path_Id = Flavored<string, 'Path_Id'>;
-export interface Path_Info {
-    id: Path_Id;
-    is_directory: boolean;
-}
-export interface Resolved_Path extends Path_Info {
-    path: string;
-}
-export type Path_Filter = (path: string, is_directory: boolean) => boolean;
-export type File_Filter = (path: string) => boolean;
-export declare const to_file_path: (path_or_url: string | URL) => string;
-//# sourceMappingURL=path.d.ts.map

package/dist/path.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"path.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/path.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,GAAG,EAAC,MAAM,UAAU,CAAC;AACjD,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,yBAAyB,CAAC;AAEtD;;GAEG;AACH,MAAM,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;AAElD,MAAM,WAAW,SAAS;IACzB,EAAE,EAAE,OAAO,CAAC;IACZ,YAAY,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,aAAc,SAAQ,SAAS;IAC/C,IAAI,EAAE,MAAM,CAAC;CACb;AAED,MAAM,MAAM,WAAW,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,KAAK,OAAO,CAAC;AAE3E,MAAM,MAAM,WAAW,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;AAEpD,eAAO,MAAM,YAAY,GAAI,aAAa,MAAM,GAAG,GAAG,KAAG,MACuB,CAAC"}

package/dist/path.js

@@ -1,2 +0,0 @@
-import { fileURLToPath } from 'node:url';
-export const to_file_path = (path_or_url) => typeof path_or_url === 'string' ? path_or_url : fileURLToPath(path_or_url.href);

package/src/lib/git.ts

@@ -1,298 +0,0 @@
-import {spawn, spawn_out} from '@ryanatkn/belt/process.js';
-import type {SpawnOptions} from 'node:child_process';
-import {z} from 'zod';
-import {existsSync} from 'node:fs';
-import type {Flavored} from '@ryanatkn/belt/types.js';
-
-import {to_file_path} from './path.ts';
-
-// TODO maybe extract to `util-git`
-
-export const Git_Origin = z.string();
-export type Git_Origin = Flavored<string, 'Git_Origin'>;
-
-export const Git_Branch = z.string();
-export type Git_Branch = Flavored<string, 'Git_Branch'>;
-
-/**
- * Returns the current git branch name or throws if something goes wrong.
- */
-export const git_current_branch_name = async (options?: SpawnOptions): Promise<Git_Branch> => {
-	const {stdout} = await spawn_out('git', ['rev-parse', '--abbrev-ref', 'HEAD'], options);
-	if (!stdout) throw Error('git_current_branch_name failed');
-	const branch_name = stdout.trim() as Git_Branch;
-	return branch_name;
-};
-
-/**
- * @returns a boolean indicating if the remote git branch exists
- */
-export const git_remote_branch_exists = async (
-	origin: Git_Origin = 'origin' as Git_Origin,
-	branch?: Git_Branch,
-	options?: SpawnOptions,
-): Promise<boolean> => {
-	const final_branch = branch ?? (await git_current_branch_name(options));
-	if (options?.cwd && !existsSync(to_file_path(options.cwd))) {
-		return false;
-	}
-	const result = await spawn(
-		'git',
-		['ls-remote', '--exit-code', '--heads', origin, 'refs/heads/' + final_branch],
-		options,
-	);
-	if (result.ok) {
-		return true;
-	} else if (result.code === 2) {
-		return false;
-	} else {
-		throw Error(
-			`git_remote_branch_exists failed for origin '${origin}' and branch '${final_branch}' with code ${result.code}`,
-		);
-	}
-};
-
-/**
- * @returns a boolean indicating if the local git branch exists
- */
-export const git_local_branch_exists = async (
-	branch: Git_Branch,
-	options?: SpawnOptions,
-): Promise<boolean> => {
-	if (options?.cwd && !existsSync(to_file_path(options.cwd))) {
-		return false;
-	}
-	const result = await spawn('git', ['show-ref', '--quiet', 'refs/heads/' + branch], options);
-	return result.ok;
-};
-
-/**
- * TODO make this return an enum and separate the text into a different function
- * @returns an error message if the git workspace has any unstaged or uncommitted changes, or `null` if it's clean
- */
-export const git_check_clean_workspace = async (options?: SpawnOptions): Promise<string | null> => {
-	const unstaged_result = await spawn('git', ['diff', '--exit-code', '--quiet'], options);
-	if (!unstaged_result.ok) {
-		return 'git has unstaged changes';
-	}
-	const staged_result = await spawn('git', ['diff', '--exit-code', '--cached', '--quiet'], options);
-	if (!staged_result.ok) {
-		return 'git has staged but uncommitted changes';
-	}
-	const status_result = await spawn_out('git', ['status', '--porcelain'], options);
-	if (status_result.stdout?.length) {
-		return 'git has untracked files';
-	}
-	return null;
-};
-
-/**
- * TODO make this return an enum and separate the text into a different function
- * @returns an error message if the git workspace has any unstaged stages, or `null` if it's clean
- */
-export const git_check_fully_staged_workspace = async (
-	options?: SpawnOptions,
-): Promise<string | null> => {
-	const unstaged_result = await spawn('git', ['diff', '--exit-code', '--quiet'], options);
-	if (!unstaged_result.ok) {
-		return 'git has unstaged changes';
-	}
-	const status_result = await spawn_out('git', ['status', '--porcelain'], options);
-	if (status_result.stdout?.includes('??')) {
-		return 'git has untracked files';
-	}
-	return null;
-};
-
-/**
- * Calls `git fetch` and throws if anything goes wrong.
- */
-export const git_fetch = async (
-	origin: Git_Origin = 'origin' as Git_Origin,
-	branch?: Git_Branch,
-	options?: SpawnOptions,
-): Promise<void> => {
-	const args = ['fetch', origin];
-	if (branch) args.push(branch);
-	const result = await spawn('git', args, options);
-	if (!result.ok) {
-		throw Error(
-			`git_fetch failed for origin '${origin}' and branch '${branch}' with code ${result.code}`,
-		);
-	}
-};
-
-/**
- * Calls `git checkout` and throws if anything goes wrong.
- * @returns the previous branch name, if it changed
- */
-export const git_checkout = async (
-	branch: Git_Branch,
-	options?: SpawnOptions,
-): Promise<Git_Branch | null> => {
-	const current_branch = await git_current_branch_name(options);
-	if (branch === current_branch) {
-		return null;
-	}
-	const result = await spawn('git', ['checkout', branch], options);
-	if (!result.ok) {
-		throw Error(`git_checkout failed for branch '${branch}' with code ${result.code}`);
-	}
-	return current_branch;
-};
-
-/**
- * Calls `git pull` and throws if anything goes wrong.
- */
-export const git_pull = async (
-	origin: Git_Origin = 'origin' as Git_Origin,
-	branch?: Git_Branch,
-	options?: SpawnOptions,
-): Promise<void> => {
-	const args = ['pull', origin];
-	if (branch) args.push(branch);
-	const result = await spawn('git', args, options);
-	if (!result.ok) {
-		throw Error(`git_pull failed for branch '${branch}' with code ${result.code}`);
-	}
-};
-
-/**
- * Calls `git push` and throws if anything goes wrong.
- */
-export const git_push = async (
-	origin: Git_Origin,
-	branch?: Git_Branch,
-	options?: SpawnOptions,
-	set_upstream = false,
-): Promise<void> => {
-	const final_branch = branch ?? (await git_current_branch_name(options));
-	const args = ['push', origin, final_branch];
-	if (set_upstream) args.push('-u');
-	const result = await spawn('git', args, options);
-	if (!result.ok) {
-		throw Error(`git_push failed for branch '${final_branch}' with code ${result.code}`);
-	}
-};
-
-/**
- * Calls `git push` and throws if anything goes wrong.
- */
-export const git_push_to_create = async (
-	origin: Git_Origin = 'origin' as Git_Origin,
-	branch?: Git_Branch,
-	options?: SpawnOptions,
-): Promise<void> => {
-	const final_branch = branch ?? (await git_current_branch_name(options));
-	const push_args = ['push'];
-	if (await git_remote_branch_exists(origin, final_branch, options)) {
-		push_args.push(origin);
-	} else {
-		push_args.push('-u', origin);
-	}
-	push_args.push(final_branch);
-	const result = await spawn('git', push_args, options);
-	if (!result.ok) {
-		throw Error(`git_push failed for branch '${final_branch}' with code ${result.code}`);
-	}
-};
-
-/**
- * Deletes a branch locally and throws if anything goes wrong.
- */
-export const git_delete_local_branch = async (
-	branch: Git_Branch,
-	options?: SpawnOptions,
-): Promise<void> => {
-	const result = await spawn('git', ['branch', '-D', branch], options);
-	if (!result.ok) {
-		throw Error(`git_delete_local_branch failed for branch '${branch}' with code ${result.code}`);
-	}
-};
-
-/**
- * Deletes a branch remotely and throws if anything goes wrong.
- */
-export const git_delete_remote_branch = async (
-	origin: Git_Origin,
-	branch: Git_Branch,
-	options?: SpawnOptions,
-): Promise<void> => {
-	const result = await spawn('git', ['push', origin, ':' + branch], options);
-	if (!result.ok) {
-		throw Error(`git_delete_remote_branch failed for branch '${branch}' with code ${result.code}`);
-	}
-};
-
-/**
- * Resets the `target` branch back to its first commit both locally and remotely.
- */
-export const git_reset_branch_to_first_commit = async (
-	origin: Git_Origin,
-	branch: Git_Branch,
-	options?: SpawnOptions,
-): Promise<void> => {
-	const previous_branch = await git_checkout(branch, options);
-	const first_commit_hash = await git_current_branch_first_commit_hash(options);
-	await spawn('git', ['reset', '--hard', first_commit_hash], options);
-	await spawn('git', ['push', origin, branch, '--force'], options);
-	if (previous_branch) {
-		await git_checkout(previous_branch, options);
-	}
-};
-
-/**
- * Returns the branch's latest commit hash or throws if something goes wrong.
- */
-export const git_current_commit_hash = async (
-	branch?: string,
-	options?: SpawnOptions,
-): Promise<string | null> => {
-	const final_branch = branch ?? (await git_current_branch_name(options));
-	const {stdout} = await spawn_out('git', ['show-ref', '-s', final_branch], options);
-	if (!stdout) return null; // TODO hack for CI
-	return stdout.split('\n')[0].trim();
-};
-
-/**
- * Returns the hash of the current branch's first commit or throws if something goes wrong.
- */
-export const git_current_branch_first_commit_hash = async (
-	options?: SpawnOptions,
-): Promise<string> => {
-	const {stdout} = await spawn_out(
-		'git',
-		['rev-list', '--max-parents=0', '--abbrev-commit', 'HEAD'],
-		options,
-	);
-	if (!stdout) throw Error('git_current_branch_first_commit_hash failed');
-	return stdout.trim();
-};
-
-/**
- * Returns the global git config setting for `pull.rebase`.
- * Gro is currently written to expect `true`,
- * but the restriction could be loosened with additional work.
- */
-export const git_check_setting_pull_rebase = async (options?: SpawnOptions): Promise<boolean> => {
-	const value = await spawn_out('git', ['config', '--global', 'pull.rebase'], options);
-	return value.stdout?.trim() === 'true';
-};
-
-/**
- * Clones a branch locally to another directory and updates the origin to match the source.
- */
-export const git_clone_locally = async (
-	origin: Git_Origin,
-	branch: Git_Branch,
-	source_dir: string,
-	target_dir: string,
-	options?: SpawnOptions,
-): Promise<void> => {
-	await spawn('git', ['clone', '-b', branch, '--single-branch', source_dir, target_dir], options);
-	const origin_url = (
-		await spawn_out('git', ['remote', 'get-url', origin], {...options, cwd: source_dir})
-	).stdout?.trim();
-	if (!origin_url) throw Error('Failed to get the origin url with git in ' + source_dir);
-	await spawn('git', ['remote', 'set-url', origin, origin_url], {...options, cwd: target_dir});
-};