@gitkraken/core-gitlens 0.6.0 → 0.7.0

package/dist/git-cli/providers/patch.js

@@ -1,309 +1,208 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
+import { getScopedLogger } from "../../utils/logger.scoped.js";
+import { getSettledValue } from "../../utils/promise.js";
+import { debug } from "../../utils/decorators/log.js";
+import __decorate from "../../_virtual/@oxc-project+runtime/helpers/esm/decorate.js";
+import { ApplyPatchCommitError, CherryPickError, SigningError } from "../../git/errors.js";
+import { RunError } from "../../utils/env/node/exec.js";
+import { GitError, classifySigningError, gitConfigsLog } from "../exec/git.js";
+import _usingCtx from "../../_virtual/@oxc-project+runtime/helpers/esm/usingCtx.js";
+//#region ../git-cli/src/providers/patch.ts
+var PatchGitSubProvider = class {
+	context;
+	git;
+	cache;
+	provider;
+	constructor(context, git, cache, provider) {
+		this.context = context;
+		this.git = git;
+		this.cache = cache;
+		this.provider = provider;
+	}
+	async apply(repoPath, patch, options) {
+		const args = ["apply", "--whitespace=warn"];
+		if (options?.threeWay) args.push("--3way");
+		await this.git.run({
+			cwd: repoPath,
+			stdin: patch
+		}, ...args);
+	}
+	async applyUnreachableCommitForPatch(repoPath, rev, options) {
+		const scope = getScopedLogger();
+		if (options?.stash) {
+			if (await this.provider.status?.hasWorkingChanges(repoPath)) try {
+				await this.provider.stash.saveStash(repoPath, void 0, void 0, { includeUntracked: true });
+			} catch (ex) {
+				scope?.error(ex);
+				throw new ApplyPatchCommitError({ reason: "stashFailed" }, ex);
+			}
+		}
+		let targetPath = repoPath;
+		const currentBranch = await this.provider.branches.getBranch(repoPath);
+		const branchExists = options?.branchName == null || currentBranch?.name === options.branchName || (await this.provider.branches.getBranches(repoPath, { filter: (b) => b.name === options.branchName }))?.values?.length > 0;
+		const shouldCreate = options?.branchName != null && !branchExists && options.createBranchIfNeeded;
+		if (options?.createWorktreePath != null) {
+			if (options?.branchName === null || options.branchName === currentBranch?.name) throw new ApplyPatchCommitError({ reason: "createWorktreeFailed" });
+			try {
+				const worktree = await this.provider.worktrees?.createWorktreeWithResult(repoPath, options.createWorktreePath, {
+					commitish: options?.branchName != null && branchExists ? options.branchName : currentBranch?.name,
+					createBranch: shouldCreate ? options.branchName : void 0
+				});
+				if (worktree == null) throw new ApplyPatchCommitError({ reason: "createWorktreeFailed" });
+				targetPath = worktree.path;
+			} catch (ex) {
+				scope?.error(ex);
+				throw new ApplyPatchCommitError({ reason: "createWorktreeFailed" }, ex);
+			}
+		}
+		if (options?.branchName != null && currentBranch?.name !== options.branchName) {
+			const checkoutRef = shouldCreate ? currentBranch?.ref ?? "HEAD" : options.branchName;
+			try {
+				await this.provider.ops?.checkout(targetPath, checkoutRef, { createBranch: shouldCreate ? options.branchName : void 0 });
+			} catch (ex) {
+				scope?.error(ex);
+				throw new ApplyPatchCommitError({
+					reason: "checkoutFailed",
+					branch: options.branchName
+				}, ex);
+			}
+		}
+		try {
+			if ((await this.provider.ops?.cherryPick(targetPath, [rev], { noCommit: true }))?.conflicted) throw new ApplyPatchCommitError({ reason: "appliedWithConflicts" });
+		} catch (ex) {
+			if (ex instanceof ApplyPatchCommitError) throw ex;
+			scope?.error(ex);
+			if (CherryPickError.is(ex, "wouldOverwriteChanges")) throw new ApplyPatchCommitError({ reason: "wouldOverwriteChanges" }, ex);
+			throw new ApplyPatchCommitError({ reason: "applyFailed" }, ex);
+		}
+	}
+	async createUnreachableCommitForPatch(repoPath, base, message, patch, options) {
+		try {
+			var _usingCtx$1 = _usingCtx();
+			const { env } = _usingCtx$1.a(await this.provider.staging.createTemporaryIndex(repoPath, "ref", base));
+			const sha = await this.createUnreachableCommitForPatchCore(env, repoPath, base, message, patch, void 0, options);
+			return await this.provider.commits.getCommit(repoPath, sha);
+		} catch (_) {
+			_usingCtx$1.e = _;
+		} finally {
+			await _usingCtx$1.d();
+		}
+	}
+	async createUnreachableCommitsFromPatches(repoPath, base, patches, options) {
+		try {
+			var _usingCtx3 = _usingCtx();
+			const { env } = _usingCtx3.a(base ? await this.provider.staging.createTemporaryIndex(repoPath, "ref", base) : await this.provider.staging.createTemporaryIndex(repoPath, "empty"));
+			const shas = [];
+			for (const { message, patch, author } of patches) {
+				const sha = await this.createUnreachableCommitForPatchCore(env, repoPath, base, message, patch, author, options);
+				shas.push(sha);
+				base = sha;
+			}
+			return shas;
+		} catch (_) {
+			_usingCtx3.e = _;
+		} finally {
+			await _usingCtx3.d();
+		}
+	}
+	async createUnreachableCommitForPatchCore(env, repoPath, base, message, patch, author, options) {
+		const scope = getScopedLogger();
+		if (!patch.endsWith("\n")) patch += "\n";
+		let shouldSign = options?.sign;
+		let _signingFormat = "gpg";
+		try {
+			const [signingConfigResult, applyResult] = await Promise.allSettled([this.provider.config.getSigningConfig?.(repoPath), this.git.run({
+				cwd: repoPath,
+				configs: gitConfigsLog,
+				env,
+				stdin: patch
+			}, "apply", "--cached", "-")]);
+			if (applyResult.status === "rejected") throw applyResult.reason;
+			const signingConfig = getSettledValue(signingConfigResult);
+			shouldSign ??= signingConfig?.enabled ?? false;
+			_signingFormat = signingConfig?.format ?? "gpg";
+			let result = await this.git.run({
+				cwd: repoPath,
+				env
+			}, "write-tree");
+			const tree = result.stdout.trim();
+			let finalEnv = env;
+			if (author) finalEnv = {
+				...env,
+				GIT_AUTHOR_NAME: author.name,
+				GIT_AUTHOR_EMAIL: author.email || ""
+			};
+			const args = ["commit-tree", tree];
+			if (base) args.push("-p", base);
+			if (shouldSign) args.push("-S");
+			args.push("-m", message);
+			result = await this.git.run({
+				cwd: repoPath,
+				env: finalEnv
+			}, ...args);
+			const sha = result.stdout.trim();
+			if (shouldSign) this.context.hooks?.commits?.onSigned?.(_signingFormat, options?.source);
+			return sha;
+		} catch (ex) {
+			scope?.error(ex);
+			if (shouldSign && ex instanceof Error) {
+				const reason = classifySigningError(ex);
+				if (reason != null) {
+					const signingError = new SigningError({
+						reason,
+						gitCommand: {
+							repoPath,
+							args: ["commit-tree"]
+						}
+					}, ex);
+					this.context.hooks?.commits?.onSigningFailed?.(reason, _signingFormat, options?.source);
+					throw signingError;
+				}
+			}
+			throw ex;
+		}
+	}
+	async createEmptyInitialCommit(repoPath) {
+		const emptyTree = await this.git.run({
+			cwd: repoPath,
+			stdin: ""
+		}, "hash-object", "-t", "tree", "--stdin");
+		const result = await this.git.run({ cwd: repoPath }, "commit-tree", emptyTree.stdout.trim(), "-m", "temp");
+		await this.git.run({ cwd: repoPath }, "update-ref", "refs/heads/main", result.stdout.trim());
+		await this.git.run({ cwd: repoPath }, "symbolic-ref", "HEAD", "refs/heads/main");
+		return result.stdout.trim();
+	}
+	async validatePatch(repoPath, contents) {
+		try {
+			await this.git.run({
+				cwd: repoPath,
+				configs: gitConfigsLog,
+				stdin: contents
+			}, "apply", "--check", "-");
+			return true;
+		} catch (ex) {
+			if (ex instanceof RunError || ex instanceof GitError) {
+				if ((ex.stderr ?? "").includes("No valid patches in input")) return false;
+				return true;
+			}
+			return false;
+		}
+	}
 };
-var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
-    if (value !== null && value !== void 0) {
-        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
-        var dispose, inner;
-        if (async) {
-            if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
-            dispose = value[Symbol.asyncDispose];
-        }
-        if (dispose === void 0) {
-            if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
-            dispose = value[Symbol.dispose];
-            if (async) inner = dispose;
-        }
-        if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
-        if (inner) dispose = function() { try { inner.call(this); } catch (e) { return Promise.reject(e); } };
-        env.stack.push({ value: value, dispose: dispose, async: async });
-    }
-    else if (async) {
-        env.stack.push({ async: true });
-    }
-    return value;
-};
-var __disposeResources = (this && this.__disposeResources) || (function (SuppressedError) {
-    return function (env) {
-        function fail(e) {
-            env.error = env.hasError ? new SuppressedError(e, env.error, "An error was suppressed during disposal.") : e;
-            env.hasError = true;
-        }
-        var r, s = 0;
-        function next() {
-            while (r = env.stack.pop()) {
-                try {
-                    if (!r.async && s === 1) return s = 0, env.stack.push(r), Promise.resolve().then(next);
-                    if (r.dispose) {
-                        var result = r.dispose.call(r.value);
-                        if (r.async) return s |= 2, Promise.resolve(result).then(next, function(e) { fail(e); return next(); });
-                    }
-                    else s |= 1;
-                }
-                catch (e) {
-                    fail(e);
-                }
-            }
-            if (s === 1) return env.hasError ? Promise.reject(env.error) : Promise.resolve();
-            if (env.hasError) throw env.error;
-        }
-        return next();
-    };
-})(typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
-    var e = new Error(message);
-    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
-});
-import { ApplyPatchCommitError, CherryPickError, SigningError } from '../../git/errors.js';
-import { debug } from '../../utils/decorators/log.js';
-import { getScopedLogger } from '../../utils/logger.scoped.js';
-import { getSettledValue } from '../../utils/promise.js';
-import { RunError } from '../exec/exec.errors.js';
-import { classifySigningError, gitConfigsLog, GitError } from '../exec/git.js';
-export class PatchGitSubProvider {
-    context;
-    git;
-    cache;
-    provider;
-    constructor(context, git, cache, provider) {
-        this.context = context;
-        this.git = git;
-        this.cache = cache;
-        this.provider = provider;
-    }
-    async apply(repoPath, patch, options) {
-        const args = ['apply', '--whitespace=warn'];
-        if (options?.threeWay) {
-            args.push('--3way');
-        }
-        await this.git.run({ cwd: repoPath, stdin: patch }, ...args);
-    }
-    async applyUnreachableCommitForPatch(repoPath, rev, options) {
-        const scope = getScopedLogger();
-        if (options?.stash) {
-            // Stash any changes first
-            const hasChanges = await this.provider.status?.hasWorkingChanges(repoPath);
-            if (hasChanges) {
-                try {
-                    await this.provider.stash.saveStash(repoPath, undefined, undefined, {
-                        includeUntracked: true,
-                    });
-                }
-                catch (ex) {
-                    scope?.error(ex);
-                    throw new ApplyPatchCommitError({ reason: 'stashFailed' }, ex);
-                }
-            }
-        }
-        let targetPath = repoPath;
-        const currentBranch = await this.provider.branches.getBranch(repoPath);
-        const branchExists = options?.branchName == null ||
-            currentBranch?.name === options.branchName ||
-            (await this.provider.branches.getBranches(repoPath, { filter: b => b.name === options.branchName }))?.values
-                ?.length > 0;
-        const shouldCreate = options?.branchName != null && !branchExists && options.createBranchIfNeeded;
-        if (options?.createWorktreePath != null) {
-            if (options?.branchName === null || options.branchName === currentBranch?.name) {
-                throw new ApplyPatchCommitError({ reason: 'createWorktreeFailed' });
-            }
-            try {
-                const worktree = await this.provider.worktrees?.createWorktreeWithResult(repoPath, options.createWorktreePath, {
-                    commitish: options?.branchName != null && branchExists ? options.branchName : currentBranch?.name,
-                    createBranch: shouldCreate ? options.branchName : undefined,
-                });
-                if (worktree == null) {
-                    throw new ApplyPatchCommitError({ reason: 'createWorktreeFailed' });
-                }
-                targetPath = worktree.path;
-            }
-            catch (ex) {
-                scope?.error(ex);
-                throw new ApplyPatchCommitError({ reason: 'createWorktreeFailed' }, ex);
-            }
-        }
-        if (options?.branchName != null && currentBranch?.name !== options.branchName) {
-            const checkoutRef = shouldCreate ? (currentBranch?.ref ?? 'HEAD') : options.branchName;
-            try {
-                await this.provider.ops?.checkout(targetPath, checkoutRef, {
-                    createBranch: shouldCreate ? options.branchName : undefined,
-                });
-            }
-            catch (ex) {
-                scope?.error(ex);
-                throw new ApplyPatchCommitError({ reason: 'checkoutFailed', branch: options.branchName }, ex);
-            }
-        }
-        // Apply the patch using a cherry pick without committing
-        try {
-            const result = await this.provider.ops?.cherryPick(targetPath, [rev], { noCommit: true });
-            if (result?.conflicted) {
-                throw new ApplyPatchCommitError({ reason: 'appliedWithConflicts' });
-            }
-        }
-        catch (ex) {
-            if (ex instanceof ApplyPatchCommitError)
-                throw ex;
-            scope?.error(ex);
-            if (CherryPickError.is(ex, 'wouldOverwriteChanges')) {
-                throw new ApplyPatchCommitError({ reason: 'wouldOverwriteChanges' }, ex);
-            }
-            throw new ApplyPatchCommitError({ reason: 'applyFailed' }, ex);
-        }
-    }
-    async createUnreachableCommitForPatch(repoPath, base, message, patch, options) {
-        const env_1 = { stack: [], error: void 0, hasError: false };
-        try {
-            // Create a temporary index file from the base ref
-            const disposableIndex = __addDisposableResource(env_1, await this.provider.staging.createTemporaryIndex(repoPath, 'ref', base), true);
-            const { env } = disposableIndex;
-            const sha = await this.createUnreachableCommitForPatchCore(env, repoPath, base, message, patch, undefined, options);
-            // await is needed for the disposableIndex to be disposed properly after
-            return await this.provider.commits.getCommit(repoPath, sha);
-        }
-        catch (e_1) {
-            env_1.error = e_1;
-            env_1.hasError = true;
-        }
-        finally {
-            const result_1 = __disposeResources(env_1);
-            if (result_1)
-                await result_1;
-        }
-    }
-    async createUnreachableCommitsFromPatches(repoPath, base, patches, options) {
-        const env_2 = { stack: [], error: void 0, hasError: false };
-        try {
-            // Create a temporary index file - use empty index if no base (orphan commits)
-            const disposableIndex = __addDisposableResource(env_2, base
-                ? await this.provider.staging.createTemporaryIndex(repoPath, 'ref', base)
-                : await this.provider.staging.createTemporaryIndex(repoPath, 'empty'), true);
-            const { env } = disposableIndex;
-            const shas = [];
-            for (const { message, patch, author } of patches) {
-                const sha = await this.createUnreachableCommitForPatchCore(env, repoPath, base, message, patch, author, options);
-                shas.push(sha);
-                base = sha;
-            }
-            return shas;
-        }
-        catch (e_2) {
-            env_2.error = e_2;
-            env_2.hasError = true;
-        }
-        finally {
-            const result_2 = __disposeResources(env_2);
-            if (result_2)
-                await result_2;
-        }
-    }
-    async createUnreachableCommitForPatchCore(env, repoPath, base, message, patch, author, options) {
-        const scope = getScopedLogger();
-        if (!patch.endsWith('\n')) {
-            patch += '\n';
-        }
-        let shouldSign = options?.sign;
-        let _signingFormat = 'gpg';
-        try {
-            const [signingConfigResult, applyResult] = await Promise.allSettled([
-                this.provider.config.getSigningConfig?.(repoPath),
-                // Apply the patch to our temp index, without touching the working directory
-                this.git.run({ cwd: repoPath, configs: gitConfigsLog, env: env, stdin: patch }, 'apply', '--cached', '-'),
-            ]);
-            if (applyResult.status === 'rejected')
-                throw applyResult.reason;
-            // Check if we should sign
-            const signingConfig = getSettledValue(signingConfigResult);
-            shouldSign ??= signingConfig?.enabled ?? false;
-            _signingFormat = signingConfig?.format ?? 'gpg';
-            // Create a new tree from our patched index
-            let result = await this.git.run({ cwd: repoPath, env: env }, 'write-tree');
-            const tree = result.stdout.trim();
-            // Set the author if provided
-            let finalEnv = env;
-            if (author) {
-                finalEnv = { ...env, GIT_AUTHOR_NAME: author.name, GIT_AUTHOR_EMAIL: author.email || '' };
-            }
-            // Create new commit from the tree
-            const args = ['commit-tree', tree];
-            if (base) {
-                args.push('-p', base);
-            }
-            // Add signing flag if enabled
-            if (shouldSign) {
-                args.push('-S');
-            }
-            args.push('-m', message);
-            // Create new commit from the tree
-            result = await this.git.run({ cwd: repoPath, env: finalEnv }, ...args);
-            const sha = result.stdout.trim();
-            if (shouldSign) {
-                this.context.hooks?.commits?.onSigned?.(_signingFormat, options?.source);
-            }
-            return sha;
-        }
-        catch (ex) {
-            scope?.error(ex);
-            // Handle signing-specific errors
-            if (shouldSign && ex instanceof Error) {
-                const reason = classifySigningError(ex);
-                if (reason != null) {
-                    const gitCommand = { repoPath: repoPath, args: ['commit-tree'] };
-                    const signingError = new SigningError({ reason: reason, gitCommand: gitCommand }, ex);
-                    this.context.hooks?.commits?.onSigningFailed?.(reason, _signingFormat, options?.source);
-                    throw signingError;
-                }
-            }
-            throw ex;
-        }
-    }
-    async createEmptyInitialCommit(repoPath) {
-        const emptyTree = await this.git.run({ cwd: repoPath, stdin: '' }, 'hash-object', '-t', 'tree', '--stdin');
-        const result = await this.git.run({ cwd: repoPath }, 'commit-tree', emptyTree.stdout.trim(), '-m', 'temp');
-        // create refs/heads/main and point to it
-        await this.git.run({ cwd: repoPath }, 'update-ref', 'refs/heads/main', result.stdout.trim());
-        // point HEAD to the branch
-        await this.git.run({ cwd: repoPath }, 'symbolic-ref', 'HEAD', 'refs/heads/main');
-        return result.stdout.trim();
-    }
-    async validatePatch(repoPath, contents) {
-        try {
-            await this.git.run({ cwd: repoPath, configs: gitConfigsLog, stdin: contents }, 'apply', '--check', '-');
-            return true;
-        }
-        catch (ex) {
-            if (ex instanceof RunError || ex instanceof GitError) {
-                if ((ex.stderr ?? '').includes('No valid patches in input')) {
-                    return false;
-                }
-                // Other git errors mean the patch had content but couldn't apply cleanly
-                return true;
-            }
-            return false;
-        }
-    }
-}
-__decorate([
-    debug()
-], PatchGitSubProvider.prototype, "apply", null);
-__decorate([
-    debug()
-], PatchGitSubProvider.prototype, "applyUnreachableCommitForPatch", null);
-__decorate([
-    debug({
-        args: (repoPath, base, _message, _patch) => ({
-            repoPath: repoPath,
-            base: base,
-            message: '<message>',
-            patch: '<patch>',
-        }),
-    })
-], PatchGitSubProvider.prototype, "createUnreachableCommitForPatch", null);
-__decorate([
-    debug({ args: (repoPath, base, patches) => ({ repoPath: repoPath, base: base, patches: patches.length }) })
-], PatchGitSubProvider.prototype, "createUnreachableCommitsFromPatches", null);
-__decorate([
-    debug({ args: repoPath => ({ repoPath: repoPath }) })
-], PatchGitSubProvider.prototype, "validatePatch", null);
+__decorate([debug()], PatchGitSubProvider.prototype, "apply", null);
+__decorate([debug()], PatchGitSubProvider.prototype, "applyUnreachableCommitForPatch", null);
+__decorate([debug({ args: (repoPath, base, _message, _patch) => ({
+	repoPath,
+	base,
+	message: "<message>",
+	patch: "<patch>"
+}) })], PatchGitSubProvider.prototype, "createUnreachableCommitForPatch", null);
+__decorate([debug({ args: (repoPath, base, patches) => ({
+	repoPath,
+	base,
+	patches: patches.length
+}) })], PatchGitSubProvider.prototype, "createUnreachableCommitsFromPatches", null);
+__decorate([debug({ args: (repoPath) => ({ repoPath }) })], PatchGitSubProvider.prototype, "validatePatch", null);
+//#endregion
+export { PatchGitSubProvider };
+
 //# sourceMappingURL=patch.js.map

package/dist/git-cli/providers/patch.js.map

@@ -1 +1 @@
-{"version":3,"file":"patch.js","sourceRoot":"","sources":["../../../src/git-cli/providers/patch.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"patch.js","names":[],"sources":["../../../../git-cli/src/providers/patch.ts"],"sourcesContent":["import type { Cache } from '@gitlens/git/cache.js';\nimport type { GitServiceContext } from '@gitlens/git/context.js';\nimport type { GitCommandContext } from '@gitlens/git/errors.js';\nimport { ApplyPatchCommitError, CherryPickError, SigningError } from '@gitlens/git/errors.js';\nimport type { GitCommit, GitCommitIdentityShape } from '@gitlens/git/models/commit.js';\nimport type { SigningFormat } from '@gitlens/git/models/signature.js';\nimport type { GitPatchSubProvider } from '@gitlens/git/providers/patch.js';\nimport { debug } from '@gitlens/utils/decorators/log.js';\nimport { getScopedLogger } from '@gitlens/utils/logger.scoped.js';\nimport { getSettledValue } from '@gitlens/utils/promise.js';\nimport type { CliGitProviderInternal } from '../cliGitProvider.js';\nimport { RunError } from '../exec/exec.errors.js';\nimport type { Git } from '../exec/git.js';\nimport { classifySigningError, gitConfigsLog, GitError } from '../exec/git.js';\n\nexport class PatchGitSubProvider implements GitPatchSubProvider {\n\tconstructor(\n\t\tprivate readonly context: GitServiceContext,\n\t\tprivate readonly git: Git,\n\t\tprivate readonly cache: Cache,\n\t\tprivate readonly provider: CliGitProviderInternal,\n\t) {}\n\n\t@debug()\n\tasync apply(repoPath: string, patch: string, options?: { threeWay?: boolean }): Promise<void> {\n\t\tconst args = ['apply', '--whitespace=warn'];\n\t\tif (options?.threeWay) {\n\t\t\targs.push('--3way');\n\t\t}\n\t\tawait this.git.run({ cwd: repoPath, stdin: patch }, ...args);\n\t}\n\n\t@debug()\n\tasync applyUnreachableCommitForPatch(\n\t\trepoPath: string,\n\t\trev: string,\n\t\toptions?: {\n\t\t\tbranchName?: string;\n\t\t\tcreateBranchIfNeeded?: boolean;\n\t\t\tcreateWorktreePath?: string;\n\t\t\tstash?: boolean;\n\t\t},\n\t): Promise<void> {\n\t\tconst scope = getScopedLogger();\n\n\t\tif (options?.stash) {\n\t\t\t// Stash any changes first\n\t\t\tconst hasChanges = await this.provider.status?.hasWorkingChanges(repoPath);\n\t\t\tif (hasChanges) {\n\t\t\t\ttry {\n\t\t\t\t\tawait this.provider.stash.saveStash(repoPath, undefined, undefined, {\n\t\t\t\t\t\tincludeUntracked: true,\n\t\t\t\t\t});\n\t\t\t\t} catch (ex) {\n\t\t\t\t\tscope?.error(ex);\n\t\t\t\t\tthrow new ApplyPatchCommitError({ reason: 'stashFailed' }, ex as Error);\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\n\t\tlet targetPath = repoPath;\n\t\tconst currentBranch = await this.provider.branches.getBranch(repoPath);\n\t\tconst branchExists =\n\t\t\toptions?.branchName == null ||\n\t\t\tcurrentBranch?.name === options.branchName ||\n\t\t\t(await this.provider.branches.getBranches(repoPath, { filter: b => b.name === options.branchName }))?.values\n\t\t\t\t?.length > 0;\n\t\tconst shouldCreate = options?.branchName != null && !branchExists && options.createBranchIfNeeded;\n\n\t\tif (options?.createWorktreePath != null) {\n\t\t\tif (options?.branchName === null || options.branchName === currentBranch?.name) {\n\t\t\t\tthrow new ApplyPatchCommitError({ reason: 'createWorktreeFailed' });\n\t\t\t}\n\n\t\t\ttry {\n\t\t\t\tconst worktree = await this.provider.worktrees?.createWorktreeWithResult(\n\t\t\t\t\trepoPath,\n\t\t\t\t\toptions.createWorktreePath,\n\t\t\t\t\t{\n\t\t\t\t\t\tcommitish:\n\t\t\t\t\t\t\toptions?.branchName != null && branchExists ? options.branchName : currentBranch?.name,\n\t\t\t\t\t\tcreateBranch: shouldCreate ? options.branchName : undefined,\n\t\t\t\t\t},\n\t\t\t\t);\n\t\t\t\tif (worktree == null) {\n\t\t\t\t\tthrow new ApplyPatchCommitError({ reason: 'createWorktreeFailed' });\n\t\t\t\t}\n\n\t\t\t\ttargetPath = worktree.path;\n\t\t\t} catch (ex) {\n\t\t\t\tscope?.error(ex);\n\t\t\t\tthrow new ApplyPatchCommitError({ reason: 'createWorktreeFailed' }, ex as Error);\n\t\t\t}\n\t\t}\n\n\t\tif (options?.branchName != null && currentBranch?.name !== options.branchName) {\n\t\t\tconst checkoutRef = shouldCreate ? (currentBranch?.ref ?? 'HEAD') : options.branchName;\n\t\t\ttry {\n\t\t\t\tawait this.provider.ops?.checkout(targetPath, checkoutRef, {\n\t\t\t\t\tcreateBranch: shouldCreate ? options.branchName : undefined,\n\t\t\t\t});\n\t\t\t} catch (ex) {\n\t\t\t\tscope?.error(ex);\n\t\t\t\tthrow new ApplyPatchCommitError({ reason: 'checkoutFailed', branch: options.branchName }, ex as Error);\n\t\t\t}\n\t\t}\n\n\t\t// Apply the patch using a cherry pick without committing\n\t\ttry {\n\t\t\tconst result = await this.provider.ops?.cherryPick(targetPath, [rev], { noCommit: true });\n\t\t\tif (result?.conflicted) {\n\t\t\t\tthrow new ApplyPatchCommitError({ reason: 'appliedWithConflicts' });\n\t\t\t}\n\t\t} catch (ex) {\n\t\t\tif (ex instanceof ApplyPatchCommitError) throw ex;\n\n\t\t\tscope?.error(ex);\n\n\t\t\tif (CherryPickError.is(ex, 'wouldOverwriteChanges')) {\n\t\t\t\tthrow new ApplyPatchCommitError({ reason: 'wouldOverwriteChanges' }, ex);\n\t\t\t}\n\n\t\t\tthrow new ApplyPatchCommitError({ reason: 'applyFailed' }, ex as Error);\n\t\t}\n\t}\n\n\t@debug({\n\t\targs: (repoPath, base, _message, _patch) => ({\n\t\t\trepoPath: repoPath,\n\t\t\tbase: base,\n\t\t\tmessage: '<message>',\n\t\t\tpatch: '<patch>',\n\t\t}),\n\t})\n\tasync createUnreachableCommitForPatch(\n\t\trepoPath: string,\n\t\tbase: string,\n\t\tmessage: string,\n\t\tpatch: string,\n\t\toptions?: { sign?: boolean; source?: unknown },\n\t): Promise<GitCommit | undefined> {\n\t\t// Create a temporary index file from the base ref\n\t\tawait using disposableIndex = await this.provider.staging.createTemporaryIndex(repoPath, 'ref', base);\n\t\tconst { env } = disposableIndex;\n\n\t\tconst sha = await this.createUnreachableCommitForPatchCore(\n\t\t\tenv,\n\t\t\trepoPath,\n\t\t\tbase,\n\t\t\tmessage,\n\t\t\tpatch,\n\t\t\tundefined,\n\t\t\toptions,\n\t\t);\n\t\t// await is needed for the disposableIndex to be disposed properly after\n\t\treturn await this.provider.commits.getCommit(repoPath, sha);\n\t}\n\n\t@debug({ args: (repoPath, base, patches) => ({ repoPath: repoPath, base: base, patches: patches.length }) })\n\tasync createUnreachableCommitsFromPatches(\n\t\trepoPath: string,\n\t\tbase: string | undefined,\n\t\tpatches: { message: string; patch: string; author?: GitCommitIdentityShape }[],\n\t\toptions?: { sign?: boolean; source?: unknown },\n\t): Promise<string[]> {\n\t\t// Create a temporary index file - use empty index if no base (orphan commits)\n\t\tawait using disposableIndex = base\n\t\t\t? await this.provider.staging.createTemporaryIndex(repoPath, 'ref', base)\n\t\t\t: await this.provider.staging.createTemporaryIndex(repoPath, 'empty');\n\t\tconst { env } = disposableIndex;\n\n\t\tconst shas: string[] = [];\n\n\t\tfor (const { message, patch, author } of patches) {\n\t\t\tconst sha = await this.createUnreachableCommitForPatchCore(\n\t\t\t\tenv,\n\t\t\t\trepoPath,\n\t\t\t\tbase,\n\t\t\t\tmessage,\n\t\t\t\tpatch,\n\t\t\t\tauthor,\n\t\t\t\toptions,\n\t\t\t);\n\t\t\tshas.push(sha);\n\t\t\tbase = sha;\n\t\t}\n\n\t\treturn shas;\n\t}\n\n\tprivate async createUnreachableCommitForPatchCore(\n\t\tenv: Record<string, string>,\n\t\trepoPath: string,\n\t\tbase: string | undefined,\n\t\tmessage: string,\n\t\tpatch: string,\n\t\tauthor?: GitCommitIdentityShape,\n\t\toptions?: { sign?: boolean; source?: unknown },\n\t): Promise<string> {\n\t\tconst scope = getScopedLogger();\n\n\t\tif (!patch.endsWith('\\n')) {\n\t\t\tpatch += '\\n';\n\t\t}\n\n\t\tlet shouldSign = options?.sign;\n\t\tlet _signingFormat: SigningFormat = 'gpg';\n\n\t\ttry {\n\t\t\tconst [signingConfigResult, applyResult] = await Promise.allSettled([\n\t\t\t\tthis.provider.config.getSigningConfig?.(repoPath),\n\t\t\t\t// Apply the patch to our temp index, without touching the working directory\n\t\t\t\tthis.git.run(\n\t\t\t\t\t{ cwd: repoPath, configs: gitConfigsLog, env: env, stdin: patch },\n\t\t\t\t\t'apply',\n\t\t\t\t\t'--cached',\n\t\t\t\t\t'-',\n\t\t\t\t),\n\t\t\t]);\n\t\t\tif (applyResult.status === 'rejected') throw applyResult.reason;\n\n\t\t\t// Check if we should sign\n\t\t\tconst signingConfig = getSettledValue(signingConfigResult);\n\t\t\tshouldSign ??= signingConfig?.enabled ?? false;\n\t\t\t_signingFormat = signingConfig?.format ?? 'gpg';\n\n\t\t\t// Create a new tree from our patched index\n\t\t\tlet result = await this.git.run({ cwd: repoPath, env: env }, 'write-tree');\n\t\t\tconst tree = result.stdout.trim();\n\n\t\t\t// Set the author if provided\n\t\t\tlet finalEnv = env;\n\t\t\tif (author) {\n\t\t\t\tfinalEnv = { ...env, GIT_AUTHOR_NAME: author.name, GIT_AUTHOR_EMAIL: author.email || '' };\n\t\t\t}\n\n\t\t\t// Create new commit from the tree\n\t\t\tconst args = ['commit-tree', tree];\n\t\t\tif (base) {\n\t\t\t\targs.push('-p', base);\n\t\t\t}\n\n\t\t\t// Add signing flag if enabled\n\t\t\tif (shouldSign) {\n\t\t\t\targs.push('-S');\n\t\t\t}\n\n\t\t\targs.push('-m', message);\n\n\t\t\t// Create new commit from the tree\n\t\t\tresult = await this.git.run({ cwd: repoPath, env: finalEnv }, ...args);\n\t\t\tconst sha = result.stdout.trim();\n\n\t\t\tif (shouldSign) {\n\t\t\t\tthis.context.hooks?.commits?.onSigned?.(_signingFormat, options?.source);\n\t\t\t}\n\n\t\t\treturn sha;\n\t\t} catch (ex) {\n\t\t\tscope?.error(ex);\n\n\t\t\t// Handle signing-specific errors\n\t\t\tif (shouldSign && ex instanceof Error) {\n\t\t\t\tconst reason = classifySigningError(ex);\n\t\t\t\tif (reason != null) {\n\t\t\t\t\tconst gitCommand: GitCommandContext = { repoPath: repoPath, args: ['commit-tree'] };\n\t\t\t\t\tconst signingError = new SigningError({ reason: reason, gitCommand: gitCommand }, ex);\n\t\t\t\t\tthis.context.hooks?.commits?.onSigningFailed?.(reason, _signingFormat, options?.source);\n\t\t\t\t\tthrow signingError;\n\t\t\t\t}\n\t\t\t}\n\n\t\t\tthrow ex;\n\t\t}\n\t}\n\n\tasync createEmptyInitialCommit(repoPath: string): Promise<string> {\n\t\tconst emptyTree = await this.git.run({ cwd: repoPath, stdin: '' }, 'hash-object', '-t', 'tree', '--stdin');\n\t\tconst result = await this.git.run({ cwd: repoPath }, 'commit-tree', emptyTree.stdout.trim(), '-m', 'temp');\n\t\t// create refs/heads/main and point to it\n\t\tawait this.git.run({ cwd: repoPath }, 'update-ref', 'refs/heads/main', result.stdout.trim());\n\t\t// point HEAD to the branch\n\t\tawait this.git.run({ cwd: repoPath }, 'symbolic-ref', 'HEAD', 'refs/heads/main');\n\t\treturn result.stdout.trim();\n\t}\n\n\t@debug({ args: repoPath => ({ repoPath: repoPath }) })\n\tasync validatePatch(repoPath: string | undefined, contents: string): Promise<boolean> {\n\t\ttry {\n\t\t\tawait this.git.run({ cwd: repoPath, configs: gitConfigsLog, stdin: contents }, 'apply', '--check', '-');\n\t\t\treturn true;\n\t\t} catch (ex) {\n\t\t\tif (ex instanceof RunError || ex instanceof GitError) {\n\t\t\t\tif ((ex.stderr ?? '').includes('No valid patches in input')) {\n\t\t\t\t\treturn false;\n\t\t\t\t}\n\n\t\t\t\t// Other git errors mean the patch had content but couldn't apply cleanly\n\t\t\t\treturn true;\n\t\t\t}\n\n\t\t\treturn false;\n\t\t}\n\t}\n}\n"],"mappings":";;;;;;;;;AAeA,IAAa,sBAAb,MAAgE;CAE7C;CACA;CACA;CACA;CAJlB,YACC,SACA,KACA,OACA,UACC;EAJgB,KAAA,UAAA;EACA,KAAA,MAAA;EACA,KAAA,QAAA;EACA,KAAA,WAAA;CACf;CAEH,MACM,MAAM,UAAkB,OAAe,SAAiD;EAC7F,MAAM,OAAO,CAAC,SAAS,mBAAmB;EAC1C,IAAI,SAAS,UACZ,KAAK,KAAK,QAAQ;EAEnB,MAAM,KAAK,IAAI,IAAI;GAAE,KAAK;GAAU,OAAO;EAAM,GAAG,GAAG,IAAI;CAC5D;CAEA,MACM,+BACL,UACA,KACA,SAMgB;EAChB,MAAM,QAAQ,gBAAgB;EAE9B,IAAI,SAAS,OAGR;OAAA,MADqB,KAAK,SAAS,QAAQ,kBAAkB,QAAQ,GAExE,IAAI;IACH,MAAM,KAAK,SAAS,MAAM,UAAU,UAAU,KAAA,GAAW,KAAA,GAAW,EACnE,kBAAkB,KACnB,CAAC;GACF,SAAS,IAAI;IACZ,OAAO,MAAM,EAAE;IACf,MAAM,IAAI,sBAAsB,EAAE,QAAQ,cAAc,GAAG,EAAW;GACvE;;EAIF,IAAI,aAAa;EACjB,MAAM,gBAAgB,MAAM,KAAK,SAAS,SAAS,UAAU,QAAQ;EACrE,MAAM,eACL,SAAS,cAAc,QACvB,eAAe,SAAS,QAAQ,eAC/B,MAAM,KAAK,SAAS,SAAS,YAAY,UAAU,EAAE,SAAQ,MAAK,EAAE,SAAS,QAAQ,WAAW,CAAC,EAAA,EAAI,QACnG,SAAS;EACb,MAAM,eAAe,SAAS,cAAc,QAAQ,CAAC,gBAAgB,QAAQ;EAE7E,IAAI,SAAS,sBAAsB,MAAM;GACxC,IAAI,SAAS,eAAe,QAAQ,QAAQ,eAAe,eAAe,MACzE,MAAM,IAAI,sBAAsB,EAAE,QAAQ,uBAAuB,CAAC;GAGnE,IAAI;IACH,MAAM,WAAW,MAAM,KAAK,SAAS,WAAW,yBAC/C,UACA,QAAQ,oBACR;KACC,WACC,SAAS,cAAc,QAAQ,eAAe,QAAQ,aAAa,eAAe;KACnF,cAAc,eAAe,QAAQ,aAAa,KAAA;IACnD,CACD;IACA,IAAI,YAAY,MACf,MAAM,IAAI,sBAAsB,EAAE,QAAQ,uBAAuB,CAAC;IAGnE,aAAa,SAAS;GACvB,SAAS,IAAI;IACZ,OAAO,MAAM,EAAE;IACf,MAAM,IAAI,sBAAsB,EAAE,QAAQ,uBAAuB,GAAG,EAAW;GAChF;EACD;EAEA,IAAI,SAAS,cAAc,QAAQ,eAAe,SAAS,QAAQ,YAAY;GAC9E,MAAM,cAAc,eAAgB,eAAe,OAAO,SAAU,QAAQ;GAC5E,IAAI;IACH,MAAM,KAAK,SAAS,KAAK,SAAS,YAAY,aAAa,EAC1D,cAAc,eAAe,QAAQ,aAAa,KAAA,EACnD,CAAC;GACF,SAAS,IAAI;IACZ,OAAO,MAAM,EAAE;IACf,MAAM,IAAI,sBAAsB;KAAE,QAAQ;KAAkB,QAAQ,QAAQ;IAAW,GAAG,EAAW;GACtG;EACD;EAGA,IAAI;GAEH,KAAI,MADiB,KAAK,SAAS,KAAK,WAAW,YAAY,CAAC,GAAG,GAAG,EAAE,UAAU,KAAK,CAAC,EAAA,EAC5E,YACX,MAAM,IAAI,sBAAsB,EAAE,QAAQ,uBAAuB,CAAC;EAEpE,SAAS,IAAI;GACZ,IAAI,cAAc,uBAAuB,MAAM;GAE/C,OAAO,MAAM,EAAE;GAEf,IAAI,gBAAgB,GAAG,IAAI,uBAAuB,GACjD,MAAM,IAAI,sBAAsB,EAAE,QAAQ,wBAAwB,GAAG,EAAE;GAGxE,MAAM,IAAI,sBAAsB,EAAE,QAAQ,cAAc,GAAG,EAAW;EACvE;CACD;CAEA,MAQM,gCACL,UACA,MACA,SACA,OACA,SACiC;;;GAGjC,MAAM,EAAE,QAAA,YAAA,EADsB,MAAM,KAAK,SAAS,QAAQ,qBAAqB,UAAU,OAAO,IAAI,CACtE;GAE9B,MAAM,MAAM,MAAM,KAAK,oCACtB,KACA,UACA,MACA,SACA,OACA,KAAA,GACA,OACD;GAEA,OAAO,MAAM,KAAK,SAAS,QAAQ,UAAU,UAAU,GAAG;;;;;;CAC3D;CAEA,MACM,oCACL,UACA,MACA,SACA,SACoB;;;GAKpB,MAAM,EAAE,QAAA,WAAA,EAHsB,OAC3B,MAAM,KAAK,SAAS,QAAQ,qBAAqB,UAAU,OAAO,IAAI,IACtE,MAAM,KAAK,SAAS,QAAQ,qBAAqB,UAAU,OAAO,CACvC;GAE9B,MAAM,OAAiB,CAAC;GAExB,KAAK,MAAM,EAAE,SAAS,OAAO,YAAY,SAAS;IACjD,MAAM,MAAM,MAAM,KAAK,oCACtB,KACA,UACA,MACA,SACA,OACA,QACA,OACD;IACA,KAAK,KAAK,GAAG;IACb,OAAO;GACR;GAEA,OAAO;;;;;;CACR;CAEA,MAAc,oCACb,KACA,UACA,MACA,SACA,OACA,QACA,SACkB;EAClB,MAAM,QAAQ,gBAAgB;EAE9B,IAAI,CAAC,MAAM,SAAS,IAAI,GACvB,SAAS;EAGV,IAAI,aAAa,SAAS;EAC1B,IAAI,iBAAgC;EAEpC,IAAI;GACH,MAAM,CAAC,qBAAqB,eAAe,MAAM,QAAQ,WAAW,CACnE,KAAK,SAAS,OAAO,mBAAmB,QAAQ,GAEhD,KAAK,IAAI,IACR;IAAE,KAAK;IAAU,SAAS;IAAoB;IAAK,OAAO;GAAM,GAChE,SACA,YACA,GACD,CACD,CAAC;GACD,IAAI,YAAY,WAAW,YAAY,MAAM,YAAY;GAGzD,MAAM,gBAAgB,gBAAgB,mBAAmB;GACzD,eAAe,eAAe,WAAW;GACzC,iBAAiB,eAAe,UAAU;GAG1C,IAAI,SAAS,MAAM,KAAK,IAAI,IAAI;IAAE,KAAK;IAAe;GAAI,GAAG,YAAY;GACzE,MAAM,OAAO,OAAO,OAAO,KAAK;GAGhC,IAAI,WAAW;GACf,IAAI,QACH,WAAW;IAAE,GAAG;IAAK,iBAAiB,OAAO;IAAM,kBAAkB,OAAO,SAAS;GAAG;GAIzF,MAAM,OAAO,CAAC,eAAe,IAAI;GACjC,IAAI,MACH,KAAK,KAAK,MAAM,IAAI;GAIrB,IAAI,YACH,KAAK,KAAK,IAAI;GAGf,KAAK,KAAK,MAAM,OAAO;GAGvB,SAAS,MAAM,KAAK,IAAI,IAAI;IAAE,KAAK;IAAU,KAAK;GAAS,GAAG,GAAG,IAAI;GACrE,MAAM,MAAM,OAAO,OAAO,KAAK;GAE/B,IAAI,YACH,KAAK,QAAQ,OAAO,SAAS,WAAW,gBAAgB,SAAS,MAAM;GAGxE,OAAO;EACR,SAAS,IAAI;GACZ,OAAO,MAAM,EAAE;GAGf,IAAI,cAAc,cAAc,OAAO;IACtC,MAAM,SAAS,qBAAqB,EAAE;IACtC,IAAI,UAAU,MAAM;KAEnB,MAAM,eAAe,IAAI,aAAa;MAAU;MAAQ,YAAY;OADlB;OAAU,MAAM,CAAC,aAAa;MACH;KAAE,GAAG,EAAE;KACpF,KAAK,QAAQ,OAAO,SAAS,kBAAkB,QAAQ,gBAAgB,SAAS,MAAM;KACtF,MAAM;IACP;GACD;GAEA,MAAM;EACP;CACD;CAEA,MAAM,yBAAyB,UAAmC;EACjE,MAAM,YAAY,MAAM,KAAK,IAAI,IAAI;GAAE,KAAK;GAAU,OAAO;EAAG,GAAG,eAAe,MAAM,QAAQ,SAAS;EACzG,MAAM,SAAS,MAAM,KAAK,IAAI,IAAI,EAAE,KAAK,SAAS,GAAG,eAAe,UAAU,OAAO,KAAK,GAAG,MAAM,MAAM;EAEzG,MAAM,KAAK,IAAI,IAAI,EAAE,KAAK,SAAS,GAAG,cAAc,mBAAmB,OAAO,OAAO,KAAK,CAAC;EAE3F,MAAM,KAAK,IAAI,IAAI,EAAE,KAAK,SAAS,GAAG,gBAAgB,QAAQ,iBAAiB;EAC/E,OAAO,OAAO,OAAO,KAAK;CAC3B;CAEA,MACM,cAAc,UAA8B,UAAoC;EACrF,IAAI;GACH,MAAM,KAAK,IAAI,IAAI;IAAE,KAAK;IAAU,SAAS;IAAe,OAAO;GAAS,GAAG,SAAS,WAAW,GAAG;GACtG,OAAO;EACR,SAAS,IAAI;GACZ,IAAI,cAAc,YAAY,cAAc,UAAU;IACrD,KAAK,GAAG,UAAU,GAAA,CAAI,SAAS,2BAA2B,GACzD,OAAO;IAIR,OAAO;GACR;GAEA,OAAO;EACR;CACD;AACD;AAzRE,WAAA,CAAA,MAAM,CAAA,GAAA,oBAAA,WAAA,SAAA,IAAA;AASN,WAAA,CAAA,MAAM,CAAA,GAAA,oBAAA,WAAA,kCAAA,IAAA;AA8FN,WAAA,CAAA,MAAM,EACN,OAAO,UAAU,MAAM,UAAU,YAAY;CAClC;CACJ;CACN,SAAS;CACT,OAAO;AACR,GACD,CAAC,CAAA,GAAA,oBAAA,WAAA,mCAAA,IAAA;AAyBA,WAAA,CAAA,MAAM,EAAE,OAAO,UAAU,MAAM,aAAa;CAAY;CAAgB;CAAM,SAAS,QAAQ;AAAO,GAAG,CAAC,CAAA,GAAA,oBAAA,WAAA,uCAAA,IAAA;AAgI1G,WAAA,CAAA,MAAM,EAAE,OAAM,cAAa,EAAY,SAAS,GAAG,CAAC,CAAA,GAAA,oBAAA,WAAA,iBAAA,IAAA"}

package/dist/git-cli/providers/pausedOperations.d.ts

@@ -1,31 +1,33 @@
-import type { Cache } from '../../git/cache.js';
-import type { GitServiceContext } from '../../git/context.js';
-import type { GitPausedOperationStatus } from '../../git/models/pausedOperationStatus.js';
-import type { GitPausedOperationsSubProvider } from '../../git/providers/pausedOperations.js';
-import type { CliGitProviderInternal } from '../cliGitProvider.js';
-import type { Git } from '../exec/git.js';
+import { GitPausedOperationStatus } from "../../git/models/pausedOperationStatus.js";
+import { GitServiceContext } from "../../git/context.js";
+import { Cache } from "../../git/cache.js";
+import { GitPausedOperationsSubProvider } from "../../git/providers/pausedOperations.js";
+import { Git } from "../exec/git.js";
+import { CliGitProviderInternal } from "../cliGitProvider.js";
+//#region ../git-cli/src/providers/pausedOperations.d.ts
 export declare class PausedOperationsGitSubProvider implements GitPausedOperationsSubProvider {
-    private readonly context;
-    private readonly git;
-    private readonly cache;
-    private readonly provider;
-    constructor(context: GitServiceContext, git: Git, cache: Cache, provider: CliGitProviderInternal);
-    getPausedOperationStatus(repoPath: string, options?: {
-        force?: boolean;
-    }, cancellation?: AbortSignal): Promise<GitPausedOperationStatus | undefined>;
-    /** Memoized per repo by sha — forced status re-reads on FS noise (every file save while resolving
-     *  conflicts) would otherwise re-spawn `git log` for an unchanging commit. */
-    private readonly _commitMessageCache;
-    private getCommitMessage;
-    private readDotGitFile;
-    abortPausedOperation(repoPath: string, options?: {
-        quit?: boolean;
-    }): Promise<void>;
-    continuePausedOperation(repoPath: string, options?: {
-        allowEmpty?: boolean;
-        skip?: boolean;
-        messageEditor?: string;
-        editorEnv?: Record<string, string>;
-    }): Promise<void>;
+  private readonly context;
+  private readonly git;
+  private readonly cache;
+  private readonly provider;
+  constructor(context: GitServiceContext, git: Git, cache: Cache, provider: CliGitProviderInternal);
+  getPausedOperationStatus(repoPath: string, options?: {
+    force?: boolean;
+  }, cancellation?: AbortSignal): Promise<GitPausedOperationStatus | undefined>;
+  /** Memoized per repo by sha — forced status re-reads on FS noise (every file save while resolving
+   *  conflicts) would otherwise re-spawn `git log` for an unchanging commit. */
+  private readonly _commitMessageCache;
+  private getCommitMessage;
+  private readDotGitFile;
+  abortPausedOperation(repoPath: string, options?: {
+    quit?: boolean;
+  }): Promise<void>;
+  continuePausedOperation(repoPath: string, options?: {
+    allowEmpty?: boolean;
+    skip?: boolean;
+    messageEditor?: string;
+    editorEnv?: Record<string, string>;
+  }): Promise<void>;
 }
+//#endregion
 //# sourceMappingURL=pausedOperations.d.ts.map