git-chopstick-core 0.1.1 → 0.1.2

package/dist/git/rev-parse.js

@@ -0,0 +1,65 @@
+import { git } from './core.js';
+import { directoryExists } from '../lib/directory-exists.js';
+import { resolve } from 'path';
+/**
+ * Attempts to fulfill the work of isGitRepository and isBareRepository while
+ * requiring only one Git process to be spawned.
+ *
+ * Returns 'bare', 'regular', or 'missing' if the repository couldn't be
+ * found.
+ */
+export async function getRepositoryType(path) {
+    if (!(await directoryExists(path))) {
+        return { kind: 'missing' };
+    }
+    try {
+        const result = await git(['rev-parse', '--is-bare-repository', '--show-cdup', '--git-dir'], path, 'getRepositoryType', { successExitCodes: new Set([0, 128]) });
+        if (result.exitCode === 0) {
+            // Bare repositories will not include gitdir so we handle that separately
+            if (result.stdout.startsWith('true\n')) {
+                return { kind: 'bare' };
+            }
+            // --is-bare-repository and --show-cdup each produce a single line but
+            // --git-dir could theoretically contain newlines so we parse the known
+            // fields first and treat the remainder as the git dir. We use [\s\S]*
+            // instead of .* for the git dir capture group because .* doesn't match
+            // newlines whereas [\s\S]* matches any character including newlines.
+            const match = result.stdout.match(/^(true|false)\n(.*)\n([\s\S]*)\n$/);
+            if (match) {
+                const [, isBare, cdup, gitDir] = match;
+                return isBare === 'true'
+                    ? { kind: 'bare' }
+                    : {
+                        kind: 'regular',
+                        topLevelWorkingDirectory: resolve(path, cdup),
+                        gitDir: resolve(path, gitDir),
+                    };
+            }
+        }
+        const unsafeMatch = /fatal: detected dubious ownership in repository at '(.+)'/.exec(result.stderr);
+        if (unsafeMatch) {
+            return { kind: 'unsafe', path: unsafeMatch[1] };
+        }
+        return { kind: 'missing' };
+    }
+    catch (err) {
+        if (err?.code === 'ENOENT') {
+            return { kind: 'missing' };
+        }
+        throw err;
+    }
+}
+export async function getUpstreamRefForRef(path, ref) {
+    const rev = (ref ?? '') + '@{upstream}';
+    const args = ['rev-parse', '--symbolic-full-name', rev];
+    const opts = { successExitCodes: new Set([0, 128]) };
+    const result = await git(args, path, 'getUpstreamRefForRef', opts);
+    return result.exitCode === 0 ? result.stdout.trim() : null;
+}
+export async function getUpstreamRemoteNameForRef(path, ref) {
+    const remoteRef = await getUpstreamRefForRef(path, ref);
+    return remoteRef?.match(/^refs\/remotes\/([^/]+)\//)?.[1] ?? null;
+}
+export const getCurrentUpstreamRef = (path) => getUpstreamRefForRef(path);
+export const getCurrentUpstreamRemoteName = (path) => getUpstreamRemoteNameForRef(path);
+//# sourceMappingURL=rev-parse.js.map

package/dist/git/rev-parse.js.map

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

package/dist/git/revert.d.ts

@@ -0,0 +1,12 @@
+import { Repository } from '../models/repository.js';
+import { Commit } from '../models/commit.js';
+import { IRevertProgress } from '../models/progress.js';
+import { IRemote } from '../models/remote.js';
+/**
+ * Creates a new commit that reverts the changes of a previous commit
+ *
+ * @param repository  - The repository to update
+ *
+ * @param commit         - The SHA of the commit to be reverted
+ */
+export declare function revertCommit(repository: Repository, commit: Commit, currentRemote: IRemote | null, progressCallback?: (progress: IRevertProgress) => void): Promise<void>;

package/dist/git/revert.js

@@ -0,0 +1,30 @@
+import { git } from './core.js';
+import { executionOptionsWithProgress } from '../lib/progress/from-process.js';
+import { RevertProgressParser } from '../lib/progress/revert.js';
+import { envForRemoteOperation, getFallbackUrlForProxyResolve, } from './environment.js';
+/**
+ * Creates a new commit that reverts the changes of a previous commit
+ *
+ * @param repository  - The repository to update
+ *
+ * @param commit         - The SHA of the commit to be reverted
+ */
+export async function revertCommit(repository, commit, currentRemote, progressCallback) {
+    const args = ['revert'];
+    if (commit.parentSHAs.length > 1) {
+        args.push('-m', '1');
+    }
+    args.push(commit.sha);
+    let opts = {};
+    if (progressCallback) {
+        const env = await envForRemoteOperation(getFallbackUrlForProxyResolve(repository, currentRemote));
+        opts = await executionOptionsWithProgress({ env, trackLFSProgress: true }, new RevertProgressParser(), progress => {
+            const description = progress.kind === 'progress' ? progress.details.text : progress.text;
+            const title = progress.kind === 'progress' ? progress.details.title : '';
+            const value = progress.percent;
+            progressCallback({ kind: 'revert', description, value, title });
+        });
+    }
+    await git(args, repository.path, 'revert', opts);
+}
+//# sourceMappingURL=revert.js.map

package/dist/git/revert.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"revert.js","sourceRoot":"","sources":["../../src/git/revert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAA8B,MAAM,WAAW,CAAA;AAM3D,OAAO,EAAE,4BAA4B,EAAE,MAAM,iCAAiC,CAAA;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAA;AAChE,OAAO,EACL,qBAAqB,EACrB,6BAA6B,GAC9B,MAAM,kBAAkB,CAAA;AAGzB;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,UAAsB,EACtB,MAAc,EACd,aAA6B,EAC7B,gBAAsD;IAEtD,MAAM,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAA;IACvB,IAAI,MAAM,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACjC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;IACtB,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;IAErB,IAAI,IAAI,GAA+B,EAAE,CAAA;IACzC,IAAI,gBAAgB,EAAE,CAAC;QACrB,MAAM,GAAG,GAAG,MAAM,qBAAqB,CACrC,6BAA6B,CAAC,UAAU,EAAE,aAAa,CAAC,CACzD,CAAA;QACD,IAAI,GAAG,MAAM,4BAA4B,CACvC,EAAE,GAAG,EAAE,gBAAgB,EAAE,IAAI,EAAE,EAC/B,IAAI,oBAAoB,EAAE,EAC1B,QAAQ,CAAC,EAAE;YACT,MAAM,WAAW,GACf,QAAQ,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAA;YACtE,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAA;YACxE,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAA;YAE9B,gBAAgB,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAA;QACjE,CAAC,CACF,CAAA;IACH,CAAC;IAED,MAAM,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAA;AAClD,CAAC"}

package/dist/git/rm.d.ts

@@ -0,0 +1,12 @@
+import { Repository } from '../models/repository.js';
+import { WorkingDirectoryFileChange } from '../models/status.js';
+/**
+ * Remove all files from the index
+ *
+ * @param repository the repository to update
+ */
+export declare function unstageAllFiles(repository: Repository): Promise<void>;
+/**
+ * Remove conflicted file from  working tree and index
+ */
+export declare function removeConflictedFile(repository: Repository, file: WorkingDirectoryFileChange): Promise<void>;

package/dist/git/rm.js

@@ -0,0 +1,22 @@
+import { git } from './core.js';
+/**
+ * Remove all files from the index
+ *
+ * @param repository the repository to update
+ */
+export async function unstageAllFiles(repository) {
+    await git(
+    // these flags are important:
+    // --cached to only remove files from the index
+    // -r       to recursively remove files, in case files are in folders
+    // -f       to ignore differences between working directory and index
+    //          which will block this
+    ['rm', '--cached', '-r', '-f', '.'], repository.path, 'unstageAllFiles');
+}
+/**
+ * Remove conflicted file from  working tree and index
+ */
+export async function removeConflictedFile(repository, file) {
+    await git(['rm', '--', file.path], repository.path, 'removeConflictedFile');
+}
+//# sourceMappingURL=rm.js.map

package/dist/git/rm.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rm.js","sourceRoot":"","sources":["../../src/git/rm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAA;AAI/B;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,UAAsB;IAC1D,MAAM,GAAG;IACP,6BAA6B;IAC7B,+CAA+C;IAC/C,qEAAqE;IACrE,qEAAqE;IACrE,iCAAiC;IACjC,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,EACnC,UAAU,CAAC,IAAI,EACf,iBAAiB,CAClB,CAAA;AACH,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,UAAsB,EACtB,IAAgC;IAEhC,MAAM,GAAG,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,UAAU,CAAC,IAAI,EAAE,sBAAsB,CAAC,CAAA;AAC7E,CAAC"}

package/dist/git/show.d.ts

@@ -0,0 +1,42 @@
+import { Repository } from '../models/repository.js';
+/**
+ * Retrieve the binary contents of a blob from the repository at a given
+ * reference, commit, or tree.
+ *
+ * Returns a promise that will produce a Buffer instance containing
+ * the binary contents of the blob or an error if the file doesn't
+ * exists in the given revision.
+ *
+ * @param repository - The repository from where to read the blob
+ *
+ * @param commitish  - A commit SHA or some other identifier that
+ *                     ultimately dereferences to a commit/tree.
+ *
+ * @param path       - The file path, relative to the repository
+ *                     root from where to read the blob contents
+ */
+export declare const getBlobContents: (repository: Repository, commitish: string, path: string) => Promise<Buffer<ArrayBufferLike>>;
+/**
+ * Retrieve some or all binary contents of a blob from the repository
+ * at a given reference, commit, or tree. This is almost identical
+ * to the getBlobContents method except that it supports only reading
+ * a maximum number of bytes.
+ *
+ * Returns a promise that will produce a Buffer instance containing
+ * the binary contents of the blob or an error if the file doesn't
+ * exists in the given revision.
+ *
+ * @param repository - The repository from where to read the blob
+ *
+ * @param commitish  - A commit SHA or some other identifier that
+ *                     ultimately dereferences to a commit/tree.
+ *
+ * @param path       - The file path, relative to the repository
+ *                     root from where to read the blob contents
+ *
+ * @param length     - The maximum number of bytes to read from
+ *                     the blob. Note that the number of bytes
+ *                     returned may always be less than this number.
+ */
+export declare function getPartialBlobContents(repository: Repository, commitish: string, path: string, length: number): Promise<Buffer | null>;
+export declare function getPartialBlobContentsCatchPathNotInRef(repository: Repository, commitish: string, path: string, length: number): Promise<Buffer | null>;

package/dist/git/show.js

@@ -0,0 +1,59 @@
+import { git, isMaxBufferExceededError } from './core.js';
+import { GitError } from './exec.js';
+import { coerceToBuffer } from './coerce-to-buffer.js';
+/**
+ * Retrieve the binary contents of a blob from the repository at a given
+ * reference, commit, or tree.
+ *
+ * Returns a promise that will produce a Buffer instance containing
+ * the binary contents of the blob or an error if the file doesn't
+ * exists in the given revision.
+ *
+ * @param repository - The repository from where to read the blob
+ *
+ * @param commitish  - A commit SHA or some other identifier that
+ *                     ultimately dereferences to a commit/tree.
+ *
+ * @param path       - The file path, relative to the repository
+ *                     root from where to read the blob contents
+ */
+export const getBlobContents = (repository, commitish, path) => git(['show', `${commitish}:${path}`], repository.path, 'getBlobContents', {
+    successExitCodes: new Set([0, 1]),
+    encoding: 'buffer',
+}).then(r => r.stdout);
+/**
+ * Retrieve some or all binary contents of a blob from the repository
+ * at a given reference, commit, or tree. This is almost identical
+ * to the getBlobContents method except that it supports only reading
+ * a maximum number of bytes.
+ *
+ * Returns a promise that will produce a Buffer instance containing
+ * the binary contents of the blob or an error if the file doesn't
+ * exists in the given revision.
+ *
+ * @param repository - The repository from where to read the blob
+ *
+ * @param commitish  - A commit SHA or some other identifier that
+ *                     ultimately dereferences to a commit/tree.
+ *
+ * @param path       - The file path, relative to the repository
+ *                     root from where to read the blob contents
+ *
+ * @param length     - The maximum number of bytes to read from
+ *                     the blob. Note that the number of bytes
+ *                     returned may always be less than this number.
+ */
+export async function getPartialBlobContents(repository, commitish, path, length) {
+    return getPartialBlobContentsCatchPathNotInRef(repository, commitish, path, length);
+}
+export async function getPartialBlobContentsCatchPathNotInRef(repository, commitish, path, length) {
+    const args = ['show', `${commitish}:${path}`];
+    return git(args, repository.path, 'getPartialBlobContentsCatchPathNotInRef', {
+        maxBuffer: length,
+        expectedErrors: new Set([GitError.PathExistsButNotInRef]),
+        encoding: 'buffer',
+    })
+        .then(r => r.gitError === GitError.PathExistsButNotInRef ? null : r.stdout)
+        .catch(e => isMaxBufferExceededError(e) ? coerceToBuffer(e.stdout) : Promise.reject(e));
+}
+//# sourceMappingURL=show.js.map

package/dist/git/show.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"show.js","sourceRoot":"","sources":["../../src/git/show.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAA;AAGzD,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAEtD;;;;;;;;;;;;;;;GAeG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,UAAsB,EACtB,SAAiB,EACjB,IAAY,EACZ,EAAE,CACF,GAAG,CAAC,CAAC,MAAM,EAAE,GAAG,SAAS,IAAI,IAAI,EAAE,CAAC,EAAE,UAAU,CAAC,IAAI,EAAE,iBAAiB,EAAE;IACxE,gBAAgB,EAAE,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACjC,QAAQ,EAAE,QAAQ;CACnB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;AAExB;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,UAAsB,EACtB,SAAiB,EACjB,IAAY,EACZ,MAAc;IAEd,OAAO,uCAAuC,CAC5C,UAAU,EACV,SAAS,EACT,IAAI,EACJ,MAAM,CACP,CAAA;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uCAAuC,CAC3D,UAAsB,EACtB,SAAiB,EACjB,IAAY,EACZ,MAAc;IAEd,MAAM,IAAI,GAAG,CAAC,MAAM,EAAE,GAAG,SAAS,IAAI,IAAI,EAAE,CAAC,CAAA;IAE7C,OAAO,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,yCAAyC,EAAE;QAC3E,SAAS,EAAE,MAAM;QACjB,cAAc,EAAE,IAAI,GAAG,CAAC,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAC;QACzD,QAAQ,EAAE,QAAQ;KACnB,CAAC;SACC,IAAI,CAAC,CAAC,CAAC,EAAE,CACR,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC,qBAAqB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAChE;SACA,KAAK,CAAC,CAAC,CAAC,EAAE,CACT,wBAAwB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAC3E,CAAA;AACL,CAAC"}

package/dist/git/spawn.d.ts

@@ -0,0 +1,18 @@
+import { IGitSpawnOptions } from './exec.js';
+type SpawnOptions = IGitSpawnOptions & {
+    /**
+     * Whether the command about to run is part of a background task or not.
+     * This affects error handling and UI such as credential prompts.
+     */
+    readonly isBackgroundTask?: boolean;
+};
+/**
+ * Spawn a Git process, deferring all processing work to the caller.
+ *
+ * @param args Array of strings to pass to the Git executable.
+ * @param path The path to execute the command from.
+ * @param name The name of the operation - for tracing purposes.
+ * @param successExitCodes An optional array of exit codes that indicate success.
+ */
+export declare const spawnGit: (args: string[], path: string, name: string, options?: SpawnOptions) => Promise<import("child_process").ChildProcess>;
+export {};

package/dist/git/spawn.js

@@ -0,0 +1,16 @@
+import { spawnGit as spawn } from './exec.js';
+import * as GitPerf from '../lib/git-perf.js';
+import { withTrampolineEnv } from '../lib/trampoline/trampoline-environment.js';
+/**
+ * Spawn a Git process, deferring all processing work to the caller.
+ *
+ * @param args Array of strings to pass to the Git executable.
+ * @param path The path to execute the command from.
+ * @param name The name of the operation - for tracing purposes.
+ * @param successExitCodes An optional array of exit codes that indicate success.
+ */
+export const spawnGit = (args, path, name, options) => withTrampolineEnv(trampolineEnv => GitPerf.measure(`${name}: git ${args.join(' ')}`, async () => spawn(args, path, {
+    ...options,
+    env: { ...options?.env, ...trampolineEnv },
+})), path, options?.isBackgroundTask ?? false, options?.env);
+//# sourceMappingURL=spawn.js.map

package/dist/git/spawn.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"spawn.js","sourceRoot":"","sources":["../../src/git/spawn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,IAAI,KAAK,EAAoB,MAAM,WAAW,CAAA;AAC/D,OAAO,KAAK,OAAO,MAAM,oBAAoB,CAAA;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAA;AAU/E;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,CACtB,IAAc,EACd,IAAY,EACZ,IAAY,EACZ,OAAsB,EACtB,EAAE,CACF,iBAAiB,CACf,aAAa,CAAC,EAAE,CACd,OAAO,CAAC,OAAO,CAAC,GAAG,IAAI,SAAS,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,KAAK,IAAI,EAAE,CAC3D,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE;IAChB,GAAG,OAAO;IACV,GAAG,EAAE,EAAE,GAAG,OAAO,EAAE,GAAG,EAAE,GAAG,aAAa,EAAE;CAC3C,CAAC,CACH,EACH,IAAI,EACJ,OAAO,EAAE,gBAAgB,IAAI,KAAK,EAClC,OAAO,EAAE,GAAG,CACb,CAAA"}

package/dist/git/squash.d.ts

@@ -0,0 +1,28 @@
+import { Commit } from '../models/commit.js';
+import { IMultiCommitOperationProgress } from '../models/progress.js';
+import { Repository } from '../models/repository.js';
+import { RebaseResult } from './rebase.js';
+/**
+ * Squashes provided commits by calling interactive rebase.
+ *
+ * Goal is to replay the commits in order from oldest to newest to reduce
+ * conflicts with toSquash commits placed in the log at the location of the
+ * squashOnto commit.
+ *
+ * Example: A user's history from oldest to newest is A, B, C, D, E and they
+ * want to squash A and E (toSquash) onto C. Our goal:  B, A-C-E, D. Thus,
+ * maintaining that A came before C and E came after C, placed in history at the
+ * the squashOnto of C.
+ *
+ * Also means if the last 2 commits in history are A, B, whether user squashes A
+ * onto B or B onto A. It will always perform based on log history, thus, B onto
+ * A.
+ *
+ * @param toSquash - commits to squash onto another commit and does not contain the squashOnto commit
+ * @param squashOnto  - commit to squash the `toSquash` commits onto
+ * @param lastRetainedCommitRef - sha of commit before commits in squash or null
+ * if commit to be squash is the root (first in history) of the branch
+ * @param commitMessage - the first line of the string provided will be the
+ * summary and rest the body (similar to commit implementation)
+ */
+export declare function squash(repository: Repository, toSquash: ReadonlyArray<Commit>, squashOnto: Commit, lastRetainedCommitRef: string | null, commitMessage: string, progressCallback?: (progress: IMultiCommitOperationProgress) => void): Promise<RebaseResult>;

package/dist/git/squash.js

@@ -0,0 +1,127 @@
+import { appendFile, rm, writeFile } from 'fs/promises';
+import { getCommits, revRange } from './index.js';
+import { MultiCommitOperationKind } from '../models/multi-commit-operation.js';
+import { getTempFilePath } from '../lib/file-system.js';
+import { rebaseInteractive, RebaseResult } from './rebase.js';
+/**
+ * Squashes provided commits by calling interactive rebase.
+ *
+ * Goal is to replay the commits in order from oldest to newest to reduce
+ * conflicts with toSquash commits placed in the log at the location of the
+ * squashOnto commit.
+ *
+ * Example: A user's history from oldest to newest is A, B, C, D, E and they
+ * want to squash A and E (toSquash) onto C. Our goal:  B, A-C-E, D. Thus,
+ * maintaining that A came before C and E came after C, placed in history at the
+ * the squashOnto of C.
+ *
+ * Also means if the last 2 commits in history are A, B, whether user squashes A
+ * onto B or B onto A. It will always perform based on log history, thus, B onto
+ * A.
+ *
+ * @param toSquash - commits to squash onto another commit and does not contain the squashOnto commit
+ * @param squashOnto  - commit to squash the `toSquash` commits onto
+ * @param lastRetainedCommitRef - sha of commit before commits in squash or null
+ * if commit to be squash is the root (first in history) of the branch
+ * @param commitMessage - the first line of the string provided will be the
+ * summary and rest the body (similar to commit implementation)
+ */
+export async function squash(repository, toSquash, squashOnto, lastRetainedCommitRef, commitMessage, progressCallback) {
+    let messagePath, todoPath;
+    let result;
+    try {
+        if (toSquash.length === 0) {
+            throw new Error('[squash] No commits provided to squash.');
+        }
+        const toSquashShas = new Set(toSquash.map(c => c.sha));
+        if (toSquashShas.has(squashOnto.sha)) {
+            throw new Error('[squash] The commits to squash cannot contain the commit to squash onto.');
+        }
+        const commits = await getCommits(repository, lastRetainedCommitRef === null
+            ? undefined
+            : revRange(lastRetainedCommitRef, 'HEAD'));
+        if (commits.length === 0) {
+            throw new Error('[squash] Could not find commits in log for last retained commit ref.');
+        }
+        todoPath = await getTempFilePath('squashTodo');
+        let foundSquashOntoCommitInLog = false;
+        const toReplayAtSquash = [];
+        const toReplayAfterSquash = [];
+        // Traversed in reverse so we do oldest to newest (replay commits)
+        for (let i = commits.length - 1; i >= 0; i--) {
+            const commit = commits[i];
+            if (toSquashShas.has(commit.sha)) {
+                // If it is toSquash commit and we have found the squashOnto commit, we
+                // can go ahead and squash them (as we will hold any picks till after)
+                if (foundSquashOntoCommitInLog) {
+                    await appendFile(todoPath, `squash ${commit.sha} ${commit.summary}\n`);
+                }
+                else {
+                    // However, if we have not found the squashOnto commit yet we want to
+                    // keep track of them in the order of the log. Thus, we use a new
+                    // `toReplayAtSquash` array and not trust that what was sent is in the
+                    // order of the log.
+                    toReplayAtSquash.push(commit);
+                }
+                continue;
+            }
+            // If it's the squashOnto commit, replay to the toSquash in the order they
+            // appeared on the log to reduce potential conflicts.
+            if (commit.sha === squashOnto.sha) {
+                foundSquashOntoCommitInLog = true;
+                toReplayAtSquash.push(commit);
+                for (let j = 0; j < toReplayAtSquash.length; j++) {
+                    const action = j === 0 ? 'pick' : 'squash';
+                    await appendFile(todoPath, `${action} ${toReplayAtSquash[j].sha} ${toReplayAtSquash[j].summary}\n`);
+                }
+                continue;
+            }
+            // We can't just replay a pick in case there is a commit from the toSquash
+            // commits further up in history that need to be replayed with the
+            // squashes. Thus, we will keep track of these and replay after traversing
+            // the remainder of the log.
+            if (foundSquashOntoCommitInLog) {
+                toReplayAfterSquash.push(commit);
+                continue;
+            }
+            // If it is not one toSquash nor the squashOnto and have not found the
+            // squashOnto commit, we simply record it is an unchanged pick (before the
+            // squash)
+            await appendFile(todoPath, `pick ${commit.sha} ${commit.summary}\n`);
+        }
+        if (toReplayAfterSquash.length > 0) {
+            for (let i = 0; i < toReplayAfterSquash.length; i++) {
+                await appendFile(todoPath, `pick ${toReplayAfterSquash[i].sha} ${toReplayAfterSquash[i].summary}\n`);
+            }
+        }
+        if (!foundSquashOntoCommitInLog) {
+            throw new Error('[squash] The commit to squash onto was not in the log. Continuing would result in dropping the commits in the toSquash array.');
+        }
+        if (commitMessage.trim() !== '') {
+            messagePath = await getTempFilePath('squashCommitMessage');
+            await writeFile(messagePath, commitMessage);
+        }
+        // if no commit message provided, accept default editor
+        const gitEditor = messagePath !== undefined ? `cat "${messagePath}" >` : undefined;
+        result = await rebaseInteractive(repository, todoPath, lastRetainedCommitRef, {
+            action: MultiCommitOperationKind.Squash,
+            gitEditor,
+            progressCallback,
+            commits: [...toSquash, squashOnto],
+        });
+    }
+    catch (e) {
+        console.error(e);
+        return RebaseResult.Error;
+    }
+    finally {
+        if (todoPath !== undefined) {
+            await rm(todoPath, { recursive: true, force: true });
+        }
+        if (messagePath !== undefined) {
+            await rm(messagePath, { recursive: true, force: true });
+        }
+    }
+    return result;
+}
+//# sourceMappingURL=squash.js.map

package/dist/git/squash.js.map

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

package/dist/git/stage.d.ts

@@ -0,0 +1,21 @@
+import { Repository } from '../models/repository.js';
+import { WorkingDirectoryFileChange } from '../models/status.js';
+import { ManualConflictResolution } from '../models/manual-conflict-resolution.js';
+/**
+ * Stages a file with the given manual resolution method. Useful for resolving binary conflicts at commit-time.
+ *
+ * @param repository
+ * @param file conflicted file to stage
+ * @param manualResolution method to resolve the conflict of file
+ * @returns true if successful, false if something went wrong
+ */
+export declare function stageManualConflictResolution(repository: Repository, file: WorkingDirectoryFileChange, manualResolution: ManualConflictResolution): Promise<void>;
+/**
+ * Stages all resolved conflict files before a checkout operation to prevent
+ * "error: you need to resolve your current index first" from git.
+ *
+ * Handles two kinds of resolved conflicts:
+ *  - Text conflicts resolved in an external editor (conflictMarkerCount === 0)
+ *  - Manual conflicts where the user chose ours/theirs in the Desktop UI
+ */
+export declare function stageResolvedConflictFiles(repository: Repository, files: ReadonlyArray<WorkingDirectoryFileChange>, manualResolutions: ReadonlyMap<string, ManualConflictResolution>): Promise<void>;

package/dist/git/stage.js

@@ -0,0 +1,72 @@
+import { isConflictedFileStatus, GitStatusEntry, isConflictWithMarkers, } from '../models/status.js';
+import { ManualConflictResolution } from '../models/manual-conflict-resolution.js';
+import { assertNever } from '../lib/fatal-error.js';
+import { removeConflictedFile } from './rm.js';
+import { checkoutConflictedFile } from './checkout.js';
+import { addConflictedFile } from './add.js';
+/**
+ * Stages a file with the given manual resolution method. Useful for resolving binary conflicts at commit-time.
+ *
+ * @param repository
+ * @param file conflicted file to stage
+ * @param manualResolution method to resolve the conflict of file
+ * @returns true if successful, false if something went wrong
+ */
+export async function stageManualConflictResolution(repository, file, manualResolution) {
+    const { status } = file;
+    // if somehow the file isn't in a conflicted state
+    if (!isConflictedFileStatus(status)) {
+        console.error(`tried to manually resolve unconflicted file (${file.path})`);
+        return;
+    }
+    if (isConflictWithMarkers(status) && status.conflictMarkerCount === 0) {
+        // If somehow the user used the Desktop UI to solve the conflict via ours/theirs
+        // but afterwards resolved manually the conflicts via an editor, used the manually
+        // resolved file.
+        return;
+    }
+    const chosen = manualResolution === ManualConflictResolution.theirs
+        ? status.entry.them
+        : status.entry.us;
+    const addedInBoth = status.entry.us === GitStatusEntry.Added &&
+        status.entry.them === GitStatusEntry.Added;
+    if (chosen === GitStatusEntry.UpdatedButUnmerged || addedInBoth) {
+        await checkoutConflictedFile(repository, file, manualResolution);
+    }
+    switch (chosen) {
+        case GitStatusEntry.Deleted:
+            return removeConflictedFile(repository, file);
+        case GitStatusEntry.Added:
+        case GitStatusEntry.UpdatedButUnmerged:
+            return addConflictedFile(repository, file);
+        default:
+            assertNever(chosen, 'unaccounted for git status entry possibility');
+    }
+}
+/**
+ * Stages all resolved conflict files before a checkout operation to prevent
+ * "error: you need to resolve your current index first" from git.
+ *
+ * Handles two kinds of resolved conflicts:
+ *  - Text conflicts resolved in an external editor (conflictMarkerCount === 0)
+ *  - Manual conflicts where the user chose ours/theirs in the Desktop UI
+ */
+export async function stageResolvedConflictFiles(repository, files, manualResolutions) {
+    for (const file of files) {
+        const { status } = file;
+        if (!isConflictedFileStatus(status)) {
+            continue;
+        }
+        const manualResolution = manualResolutions.get(file.path);
+        if (manualResolution !== undefined) {
+            // Binary/manual conflict resolved via Desktop UI — stage it
+            await stageManualConflictResolution(repository, file, manualResolution);
+        }
+        else if (isConflictWithMarkers(status) &&
+            status.conflictMarkerCount === 0) {
+            // Text conflict resolved in external editor — stage it
+            await addConflictedFile(repository, file);
+        }
+    }
+}
+//# sourceMappingURL=stage.js.map

package/dist/git/stage.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"stage.js","sourceRoot":"","sources":["../../src/git/stage.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,sBAAsB,EACtB,cAAc,EACd,qBAAqB,GACtB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,wBAAwB,EAAE,MAAM,yCAAyC,CAAA;AAClF,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAC9C,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAA;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAA;AAE5C;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,6BAA6B,CACjD,UAAsB,EACtB,IAAgC,EAChC,gBAA0C;IAE1C,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAA;IACvB,kDAAkD;IAClD,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,EAAE,CAAC;QACpC,OAAO,CAAC,KAAK,CAAC,gDAAgD,IAAI,CAAC,IAAI,GAAG,CAAC,CAAA;QAC3E,OAAM;IACR,CAAC;IAED,IAAI,qBAAqB,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,mBAAmB,KAAK,CAAC,EAAE,CAAC;QACtE,gFAAgF;QAChF,kFAAkF;QAClF,iBAAiB;QACjB,OAAM;IACR,CAAC;IAED,MAAM,MAAM,GACV,gBAAgB,KAAK,wBAAwB,CAAC,MAAM;QAClD,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI;QACnB,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAA;IAErB,MAAM,WAAW,GACf,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,cAAc,CAAC,KAAK;QACxC,MAAM,CAAC,KAAK,CAAC,IAAI,KAAK,cAAc,CAAC,KAAK,CAAA;IAE5C,IAAI,MAAM,KAAK,cAAc,CAAC,kBAAkB,IAAI,WAAW,EAAE,CAAC;QAChE,MAAM,sBAAsB,CAAC,UAAU,EAAE,IAAI,EAAE,gBAAgB,CAAC,CAAA;IAClE,CAAC;IAED,QAAQ,MAAM,EAAE,CAAC;QACf,KAAK,cAAc,CAAC,OAAO;YACzB,OAAO,oBAAoB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;QAC/C,KAAK,cAAc,CAAC,KAAK,CAAC;QAC1B,KAAK,cAAc,CAAC,kBAAkB;YACpC,OAAO,iBAAiB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;QAC5C;YACE,WAAW,CAAC,MAAM,EAAE,8CAA8C,CAAC,CAAA;IACvE,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,UAAsB,EACtB,KAAgD,EAChD,iBAAgE;IAEhE,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAA;QACvB,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,EAAE,CAAC;YACpC,SAAQ;QACV,CAAC;QAED,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAEzD,IAAI,gBAAgB,KAAK,SAAS,EAAE,CAAC;YACnC,4DAA4D;YAC5D,MAAM,6BAA6B,CAAC,UAAU,EAAE,IAAI,EAAE,gBAAgB,CAAC,CAAA;QACzE,CAAC;aAAM,IACL,qBAAqB,CAAC,MAAM,CAAC;YAC7B,MAAM,CAAC,mBAAmB,KAAK,CAAC,EAChC,CAAC;YACD,uDAAuD;YACvD,MAAM,iBAAiB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;QAC3C,CAAC;IACH,CAAC;AACH,CAAC"}

package/dist/git/stash.d.ts

@@ -0,0 +1,53 @@
+import { Repository } from '../models/repository.js';
+import { IStashEntry } from '../models/stash-entry.js';
+import { WorkingDirectoryFileChange, CommittedFileChange } from '../models/status.js';
+import { Branch } from '../models/branch.js';
+export declare const DesktopStashEntryMarker = "!!GitHub_Desktop";
+type StashResult = {
+    /** The stash entries created by Desktop */
+    readonly desktopEntries: ReadonlyArray<IStashEntry>;
+    /**
+     * The total amount of stash entries,
+     * i.e. stash entries created both by Desktop and outside of Desktop
+     */
+    readonly stashEntryCount: number;
+};
+/**
+ * Get the list of stash entries created by Desktop in the current repository
+ * using the default ordering of refs (which is LIFO ordering),
+ * as well as the total amount of stash entries.
+ */
+export declare function getStashes(repository: Repository): Promise<StashResult>;
+/**
+ * Moves a stash entry to a different branch by means of creating
+ * a new stash entry associated with the new branch and dropping the old
+ * stash entry.
+ */
+export declare function moveStashEntry(repository: Repository, { stashSha, parents, tree }: IStashEntry, branchName: string): Promise<void>;
+/**
+ * Returns the last Desktop created stash entry for the given branch
+ */
+export declare function getLastDesktopStashEntryForBranch(repository: Repository, branch: Branch | string): Promise<IStashEntry | null>;
+/** Creates a stash entry message that indicates the entry was created by Desktop */
+export declare function createDesktopStashMessage(branchName: string): string;
+/**
+ * Stash the working directory changes for the current branch
+ */
+export declare function createDesktopStashEntry(repository: Repository, branch: Branch | string, untrackedFilesToStage: ReadonlyArray<WorkingDirectoryFileChange>, selectedFiles: ReadonlyArray<string> | null): Promise<boolean>;
+/**
+ * Removes the given stash entry if it exists
+ *
+ * @param stashSha the SHA that identifies the stash entry
+ */
+export declare function dropDesktopStashEntry(repository: Repository, stashSha: string): Promise<void>;
+/**
+ * Pops the stash entry identified by matching `stashSha` to its commit hash.
+ *
+ * To see the commit hash of stash entry, run
+ * `git log -g refs/stash --pretty="%nentry: %gd%nsubject: %gs%nhash: %H%n"`
+ * in a repo with some stash entries.
+ */
+export declare function popStashEntry(repository: Repository, stashSha: string): Promise<void>;
+/** Get the files that were changed in the given stash commit */
+export declare function getStashedFiles(repository: Repository, stashSha: string): Promise<ReadonlyArray<CommittedFileChange>>;
+export {};