git-chopstick-core 0.1.1 → 0.1.3

package/dist/git/log.js

@@ -0,0 +1,258 @@
+import { git } from './core.js';
+import { CommittedFileChange, AppFileStatusKind, } from '../models/status.js';
+import { Commit } from '../models/commit.js';
+import { CommitIdentity } from '../models/commit-identity.js';
+import { parseRawUnfoldedTrailers } from './interpret-trailers.js';
+import { createLogParser } from './git-delimiter-parser.js';
+import { forceUnwrap } from '../lib/fatal-error.js';
+import assert from 'assert';
+// File mode 160000 is used by git specifically for submodules:
+// https://github.com/git/git/blob/v2.37.3/cache.h#L62-L69
+const SubmoduleFileMode = '160000';
+function mapSubmoduleStatusFileModes(status, srcMode, dstMode) {
+    return srcMode === SubmoduleFileMode &&
+        dstMode === SubmoduleFileMode &&
+        status === 'M'
+        ? {
+            commitChanged: true,
+            untrackedChanges: false,
+            modifiedChanges: false,
+        }
+        : (srcMode === SubmoduleFileMode && status === 'D') ||
+            (dstMode === SubmoduleFileMode && status === 'A')
+            ? {
+                commitChanged: false,
+                untrackedChanges: false,
+                modifiedChanges: false,
+            }
+            : undefined;
+}
+/**
+ * Map the raw status text from Git to an app-friendly value
+ * shamelessly borrowed from GitHub Desktop (Windows)
+ */
+function mapStatus(rawStatus, oldPath, srcMode, dstMode) {
+    const status = rawStatus.trim();
+    const submoduleStatus = mapSubmoduleStatusFileModes(status, srcMode, dstMode);
+    if (status === 'M') {
+        return { kind: AppFileStatusKind.Modified, submoduleStatus };
+    } // modified
+    if (status === 'A') {
+        return { kind: AppFileStatusKind.New, submoduleStatus };
+    } // added
+    if (status === '?') {
+        return { kind: AppFileStatusKind.Untracked, submoduleStatus };
+    } // untracked
+    if (status === 'D') {
+        return { kind: AppFileStatusKind.Deleted, submoduleStatus };
+    } // deleted
+    if (status === 'R' && oldPath != null) {
+        return {
+            kind: AppFileStatusKind.Renamed,
+            oldPath,
+            submoduleStatus,
+            renameIncludesModifications: false,
+        };
+    } // renamed
+    if (status === 'C' && oldPath != null) {
+        return {
+            kind: AppFileStatusKind.Copied,
+            oldPath,
+            submoduleStatus,
+            renameIncludesModifications: false,
+        };
+    } // copied
+    // git log -M --name-status will return a RXXX - where XXX is a percentage
+    if (status.match(/R[0-9]+/) && oldPath != null) {
+        return {
+            kind: AppFileStatusKind.Renamed,
+            oldPath,
+            submoduleStatus,
+            renameIncludesModifications: status !== 'R100',
+        };
+    }
+    // git log -C --name-status will return a CXXX - where XXX is a percentage
+    if (status.match(/C[0-9]+/) && oldPath != null) {
+        return {
+            kind: AppFileStatusKind.Copied,
+            oldPath,
+            submoduleStatus,
+            renameIncludesModifications: false,
+        };
+    }
+    return { kind: AppFileStatusKind.Modified, submoduleStatus };
+}
+const isCopyOrRename = (status) => status.kind === AppFileStatusKind.Copied ||
+    status.kind === AppFileStatusKind.Renamed;
+/**
+ * Get the repository's commits using `revisionRange` and limited to `limit`
+ */
+export async function getCommits(repository, revisionRange, limit, skip, additionalArgs = []) {
+    const { formatArgs, parse } = createLogParser({
+        sha: '%H', // SHA
+        shortSha: '%h', // short SHA
+        summary: '%s', // summary
+        body: '%b', // body
+        // author identity string, matching format of GIT_AUTHOR_IDENT.
+        //   author name <author email> <author date>
+        // author date format dependent on --date arg, should be raw
+        author: '%an <%ae> %ad',
+        committer: '%cn <%ce> %cd',
+        parents: '%P', // parent SHAs,
+        trailers: '%(trailers:unfold,only)',
+        refs: '%D',
+    });
+    const args = ['log'];
+    if (revisionRange !== undefined) {
+        args.push(revisionRange);
+    }
+    args.push('--date=raw');
+    if (limit !== undefined) {
+        args.push(`--max-count=${limit}`);
+    }
+    if (skip !== undefined) {
+        args.push(`--skip=${skip}`);
+    }
+    args.push(...formatArgs, '--no-show-signature', '--no-color', ...additionalArgs, '--');
+    const result = await git(args, repository.path, 'getCommits', {
+        successExitCodes: new Set([0, 128]),
+        encoding: 'buffer',
+    });
+    // if the repository has an unborn HEAD, return an empty history of commits
+    if (result.exitCode === 128) {
+        return new Array();
+    }
+    const parsed = parse(result.stdout);
+    return parsed.map(commit => {
+        // Ref is of the format: (HEAD -> master, tag: some-tag-name, tag: some-other-tag,with-a-comma, origin/master, origin/HEAD)
+        // Refs are comma separated, but some like tags can also contain commas in the name, so we split on the pattern ", " and then
+        // check each ref for the tag prefix. We used to use the regex /tag: ([^\s,]+)/g)`, but will clip a tag with a comma short.
+        const tags = commit.refs
+            .toString()
+            .split(', ')
+            .flatMap(ref => (ref.startsWith('tag: ') ? ref.substring(5) : []));
+        return new Commit(commit.sha.toString(), commit.shortSha.toString(), commit.summary.subarray(0, 100 * 1024).toString(), commit.body.subarray(0, 100 * 1024).toString(), CommitIdentity.parseIdentity(commit.author.toString()), CommitIdentity.parseIdentity(commit.committer.toString()), commit.parents.length > 0 ? commit.parents.toString().split(' ') : [], 
+        // We know for sure that the trailer separator will be ':' since we got
+        // them from %(trailers:unfold) above, see `git help log`:
+        //
+        //   "key_value_separator=<SEP>: specify a separator inserted between
+        //    trailer lines. When this option is not given each trailer key-value
+        //    pair is separated by ": ". Otherwise it shares the same semantics as
+        //    separator=<SEP> above."
+        parseRawUnfoldedTrailers(commit.trailers.toString(), ':'), tags);
+    });
+}
+/** Get the files that were changed in the given commit. */
+export async function getChangedFiles(repository, sha) {
+    // opt-in for rename detection (-M) and copies detection (-C)
+    // this is equivalent to the user configuring 'diff.renames' to 'copies'
+    // NOTE: order here matters - doing -M before -C means copies aren't detected
+    const args = [
+        'log',
+        sha,
+        '-C',
+        '-M',
+        '-m',
+        '-1',
+        '--no-show-signature',
+        '--first-parent',
+        '--raw',
+        '--format=format:',
+        '--numstat',
+        '-z',
+        '--',
+    ];
+    const { stdout } = await git(args, repository.path, 'getChangesFiles');
+    return parseRawLogWithNumstat(stdout, sha, `${sha}^`);
+}
+/**
+ * Parses output of diff flags -z --raw --numstat.
+ *
+ * Given the -z flag the new lines are separated by \0 character (left them as
+ * new lines below for ease of reading)
+ *
+ * For modified, added, deleted, untracked:
+ *    100644 100644 5716ca5 db3c77d M
+ *    file_one_path
+ *    :100644 100644 0835e4f 28096ea M
+ *    file_two_path
+ *    1    0       file_one_path
+ *    1    0       file_two_path
+ *
+ * For copied or renamed:
+ *    100644 100644 5716ca5 db3c77d M
+ *    file_one_original_path
+ *    file_one_new_path
+ *    :100644 100644 0835e4f 28096ea M
+ *    file_two_original_path
+ *    file_two_new_path
+ *    1    0
+ *    file_one_original_path
+ *    file_one_new_path
+ *    1    0
+ *    file_two_original_path
+ *    file_two_new_path
+ */
+export function parseRawLogWithNumstat(stdout, sha, parentCommitish) {
+    const files = new Array();
+    let linesAdded = 0;
+    let linesDeleted = 0;
+    let numStatCount = 0;
+    const lines = stdout.split('\0');
+    for (let i = 0; i < lines.length - 1; i++) {
+        const line = lines[i];
+        if (line.startsWith(':')) {
+            const lineComponents = line.split(' ');
+            const srcMode = forceUnwrap('Invalid log output (srcMode)', lineComponents[0]?.replace(':', ''));
+            const dstMode = forceUnwrap('Invalid log output (dstMode)', lineComponents[1]);
+            const status = forceUnwrap('Invalid log output (status)', lineComponents.at(-1));
+            const oldPath = /^R|C/.test(status)
+                ? forceUnwrap('Missing old path', lines.at(++i))
+                : undefined;
+            const path = forceUnwrap('Missing path', lines.at(++i));
+            files.push(new CommittedFileChange(path, mapStatus(status, oldPath, srcMode, dstMode), sha, parentCommitish));
+        }
+        else {
+            const match = /^(\d+|-)\t(\d+|-)\t/.exec(line);
+            const [, added, deleted] = forceUnwrap('Invalid numstat line', match);
+            linesAdded += added === '-' ? 0 : parseInt(added, 10);
+            linesDeleted += deleted === '-' ? 0 : parseInt(deleted, 10);
+            // If this entry denotes a rename or copy the old and new paths are on
+            // two separate fields (separated by \0). Otherwise they're on the same
+            // line as the added and deleted lines.
+            if (isCopyOrRename(files[numStatCount].status)) {
+                i += 2;
+            }
+            numStatCount++;
+        }
+    }
+    return { files, linesAdded, linesDeleted };
+}
+/** Get the commit for the given ref. */
+export async function getCommit(repository, ref) {
+    const commits = await getCommits(repository, ref, 1);
+    if (commits.length < 1) {
+        return null;
+    }
+    return commits[0];
+}
+/** Get the author identity for the given shas */
+export async function getAuthors(repository, shas) {
+    if (shas.length === 0) {
+        return [];
+    }
+    const { stdout } = await git([
+        'log',
+        '--format=format:%an <%ae> %ad',
+        '--no-walk=unsorted',
+        '--date=raw',
+        '-z',
+        '--stdin',
+    ], repository.path, 'getAuthors', { stdin: shas.join('\n') });
+    const authors = stdout.split('\0').map(CommitIdentity.parseIdentity);
+    // This can happen if there are duplicate shas in the input, git log will only
+    // return the author once for each sha.
+    assert.equal(authors.length, shas.length, 'Commit to author mismatch');
+    return authors;
+}
+//# sourceMappingURL=log.js.map

package/dist/git/log.js.map

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

package/dist/git/merge-tree.d.ts

@@ -0,0 +1,13 @@
+import { Branch } from '../models/branch.js';
+import { ComputedAction } from '../models/computed-action.js';
+import { Repository } from '../models/repository.js';
+type MergeTreeResult = {
+    kind: ComputedAction.Clean;
+} | {
+    kind: ComputedAction.Conflicts;
+    conflictedFiles: number;
+} | {
+    kind: ComputedAction.Invalid;
+};
+export declare function determineMergeability(repository: Repository, ours: Branch, theirs: Branch): Promise<MergeTreeResult>;
+export {};

package/dist/git/merge-tree.js

@@ -0,0 +1,24 @@
+import { ComputedAction } from '../models/computed-action.js';
+import { git, isGitError } from './core.js';
+import { GitError } from './exec.js';
+export async function determineMergeability(repository, ours, theirs) {
+    return git([
+        'merge-tree',
+        '--write-tree',
+        '--name-only',
+        '--no-messages',
+        '-z',
+        ours.tip.sha,
+        theirs.tip.sha,
+    ], repository.path, 'determineMergeability', { successExitCodes: new Set([0, 1]) })
+        .then(({ stdout }) => {
+        const conflictedFiles = (stdout.match(/\0/g)?.length ?? 0) - 1;
+        return conflictedFiles > 0
+            ? { kind: ComputedAction.Conflicts, conflictedFiles }
+            : { kind: ComputedAction.Clean };
+    })
+        .catch(e => isGitError(e, GitError.CannotMergeUnrelatedHistories)
+        ? Promise.resolve({ kind: ComputedAction.Invalid })
+        : Promise.reject(e));
+}
+//# sourceMappingURL=merge-tree.js.map

package/dist/git/merge-tree.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-tree.js","sourceRoot":"","sources":["../../src/git/merge-tree.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAE7D,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AAOpC,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,UAAsB,EACtB,IAAY,EACZ,MAAc;IAEd,OAAO,GAAG,CACR;QACE,YAAY;QACZ,cAAc;QACd,aAAa;QACb,eAAe;QACf,IAAI;QACJ,IAAI,CAAC,GAAG,CAAC,GAAG;QACZ,MAAM,CAAC,GAAG,CAAC,GAAG;KACf,EACD,UAAU,CAAC,IAAI,EACf,uBAAuB,EACvB,EAAE,gBAAgB,EAAE,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CACtC;SACE,IAAI,CAAkB,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE;QACpC,MAAM,eAAe,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,CAAA;QAC9D,OAAO,eAAe,GAAG,CAAC;YACxB,CAAC,CAAC,EAAE,IAAI,EAAE,cAAc,CAAC,SAAS,EAAE,eAAe,EAAE;YACrD,CAAC,CAAC,EAAE,IAAI,EAAE,cAAc,CAAC,KAAK,EAAE,CAAA;IACpC,CAAC,CAAC;SACD,KAAK,CAAkB,CAAC,CAAC,EAAE,CAC1B,UAAU,CAAC,CAAC,EAAE,QAAQ,CAAC,6BAA6B,CAAC;QACnD,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,cAAc,CAAC,OAAO,EAAE,CAAC;QACnD,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CACtB,CAAA;AACL,CAAC"}

package/dist/git/merge.d.ts

@@ -0,0 +1,50 @@
+import { HookCallbackOptions } from './core.js';
+import { Repository } from '../models/repository.js';
+export declare enum MergeResult {
+    /** The merge completed successfully */
+    Success = 0,
+    /**
+     * The merge was a noop since the current branch
+     * was already up to date with the target branch.
+     */
+    AlreadyUpToDate = 1,
+    /**
+     * The merge failed, likely due to conflicts.
+     */
+    Failed = 2
+}
+export type MergeOptions = {
+    /** Whether to perform a squash merge */
+    readonly squash?: boolean;
+    /** Whether to bypass pre-merge and post-merge hooks */
+    readonly noVerify?: boolean;
+} & HookCallbackOptions;
+/** Merge the named branch into the current branch. */
+export declare function merge(repository: Repository, branch: string, options?: MergeOptions): Promise<MergeResult>;
+/**
+ * Find the base commit between two commit-ish identifiers
+ *
+ * @returns the commit id of the merge base, or null if the two commit-ish
+ *          identifiers do not have a common base
+ */
+export declare function getMergeBase(repository: Repository, firstCommitish: string, secondCommitish: string): Promise<string | null>;
+/**
+ * Abort a mid-flight (conflicted) merge
+ *
+ * @param repository where to abort the merge
+ */
+export declare function abortMerge(repository: Repository): Promise<void>;
+/**
+ * Check the `.git/MERGE_HEAD` file exists in a repository to confirm
+ * that it is in a conflicted state.
+ */
+export declare function isMergeHeadSet(repository: Repository): Promise<boolean>;
+/**
+ * Check the `.git/SQUASH_MSG` file exists in a repository
+ * This would indicate we did a merge --squash and have not committed.. indicating
+ * we have detected a conflict.
+ *
+ * Note: If we abort the merge, this doesn't get cleared automatically which
+ * could lead to this being erroneously available in a non merge --squashing scenario.
+ */
+export declare function isSquashMsgSet(repository: Repository): Promise<boolean>;

package/dist/git/merge.js

@@ -0,0 +1,111 @@
+import { join } from 'path';
+import { git } from './core.js';
+import { GitError } from './exec.js';
+import { pathExists } from '../lib/path-exists.js';
+import { createMultiOperationTerminalOutputCallback } from './multi-operation-terminal-output.js';
+export var MergeResult;
+(function (MergeResult) {
+    /** The merge completed successfully */
+    MergeResult[MergeResult["Success"] = 0] = "Success";
+    /**
+     * The merge was a noop since the current branch
+     * was already up to date with the target branch.
+     */
+    MergeResult[MergeResult["AlreadyUpToDate"] = 1] = "AlreadyUpToDate";
+    /**
+     * The merge failed, likely due to conflicts.
+     */
+    MergeResult[MergeResult["Failed"] = 2] = "Failed";
+})(MergeResult || (MergeResult = {}));
+/** Merge the named branch into the current branch. */
+export async function merge(repository, branch, options) {
+    const onTerminalOutputAvailable = options?.onTerminalOutputAvailable
+        ? createMultiOperationTerminalOutputCallback(options?.onTerminalOutputAvailable)
+        : undefined;
+    const args = ['merge'];
+    if (options?.squash) {
+        args.push('--squash');
+    }
+    if (options?.noVerify) {
+        args.push('--no-verify');
+    }
+    args.push(branch);
+    const { exitCode, stdout } = await git(args, repository.path, 'merge', {
+        expectedErrors: new Set([GitError.MergeConflicts]),
+        interceptHooks: ['pre-merge-commit', 'post-merge', 'commit-msg'],
+        onHookProgress: options?.onHookProgress,
+        onHookFailure: options?.onHookFailure,
+        onTerminalOutputAvailable,
+    });
+    if (exitCode !== 0) {
+        return MergeResult.Failed;
+    }
+    if (options?.squash) {
+        const { exitCode } = await git(['commit', '--no-edit'], repository.path, 'createSquashMergeCommit', {
+            interceptHooks: [
+                'pre-merge-commit',
+                'prepare-commit-msg',
+                'commit-msg',
+                'post-commit',
+                'pre-auto-gc',
+            ],
+            onHookProgress: options?.onHookProgress,
+            onHookFailure: options?.onHookFailure,
+            onTerminalOutputAvailable,
+        });
+        if (exitCode !== 0) {
+            return MergeResult.Failed;
+        }
+    }
+    return stdout === noopMergeMessage
+        ? MergeResult.AlreadyUpToDate
+        : MergeResult.Success;
+}
+const noopMergeMessage = 'Already up to date.\n';
+/**
+ * Find the base commit between two commit-ish identifiers
+ *
+ * @returns the commit id of the merge base, or null if the two commit-ish
+ *          identifiers do not have a common base
+ */
+export async function getMergeBase(repository, firstCommitish, secondCommitish) {
+    const process = await git(['merge-base', firstCommitish, secondCommitish], repository.path, 'merge-base', {
+        // - 1 is returned if a common ancestor cannot be resolved
+        // - 128 is returned if a ref cannot be found
+        //   "warning: ignoring broken ref refs/remotes/origin/main."
+        successExitCodes: new Set([0, 1, 128]),
+    });
+    if (process.exitCode === 1 || process.exitCode === 128) {
+        return null;
+    }
+    return process.stdout.trim();
+}
+/**
+ * Abort a mid-flight (conflicted) merge
+ *
+ * @param repository where to abort the merge
+ */
+export async function abortMerge(repository) {
+    await git(['merge', '--abort'], repository.path, 'abortMerge');
+}
+/**
+ * Check the `.git/MERGE_HEAD` file exists in a repository to confirm
+ * that it is in a conflicted state.
+ */
+export async function isMergeHeadSet(repository) {
+    const path = join(repository.resolvedGitDir, 'MERGE_HEAD');
+    return await pathExists(path);
+}
+/**
+ * Check the `.git/SQUASH_MSG` file exists in a repository
+ * This would indicate we did a merge --squash and have not committed.. indicating
+ * we have detected a conflict.
+ *
+ * Note: If we abort the merge, this doesn't get cleared automatically which
+ * could lead to this being erroneously available in a non merge --squashing scenario.
+ */
+export async function isSquashMsgSet(repository) {
+    const path = join(repository.resolvedGitDir, 'SQUASH_MSG');
+    return await pathExists(path);
+}
+//# sourceMappingURL=merge.js.map

package/dist/git/merge.js.map

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

package/dist/git/multi-operation-terminal-output.d.ts

@@ -0,0 +1,20 @@
+import { TerminalOutputCallback } from './core.js';
+/**
+ * Creates a callback that aggregates terminal output from multiple Git
+ * operations into a single stream.
+ *
+ * This function is useful when running multiple Git operations sequentially
+ * where you want to present a unified terminal output view. It buffers output
+ * from all operations and forwards them to upstream subscribers when requested.
+ *
+ * The callback maintains an internal buffer (default 256KB) and subscribes to
+ * each Git operation's terminal output. When an upstream consumer requests the
+ * output, it receives all previously buffered chunks followed by any new chunks
+ * as they arrive.
+ *
+ * @param onTerminalOutputAvailable - The user provided callback which will
+ *                                    receive the aggregated terminal output.
+ * @returns A callback that can be passed to individual Git operations as the
+ *          onTerminalOutputAvailable callback to capture their terminal output
+ */
+export declare const createMultiOperationTerminalOutputCallback: (onTerminalOutputAvailable: TerminalOutputCallback, capacity?: number) => TerminalOutputCallback;

package/dist/git/multi-operation-terminal-output.js

@@ -0,0 +1,56 @@
+import noop from '../lib/noop.js';
+import { pushTerminalChunk } from './push-terminal-chunk.js';
+/**
+ * Creates a callback that aggregates terminal output from multiple Git
+ * operations into a single stream.
+ *
+ * This function is useful when running multiple Git operations sequentially
+ * where you want to present a unified terminal output view. It buffers output
+ * from all operations and forwards them to upstream subscribers when requested.
+ *
+ * The callback maintains an internal buffer (default 256KB) and subscribes to
+ * each Git operation's terminal output. When an upstream consumer requests the
+ * output, it receives all previously buffered chunks followed by any new chunks
+ * as they arrive.
+ *
+ * @param onTerminalOutputAvailable - The user provided callback which will
+ *                                    receive the aggregated terminal output.
+ * @returns A callback that can be passed to individual Git operations as the
+ *          onTerminalOutputAvailable callback to capture their terminal output
+ */
+export const createMultiOperationTerminalOutputCallback = (onTerminalOutputAvailable, capacity = 256 * 1024) => {
+    let outputStarted = false;
+    const chunks = [];
+    const upstreamSubscribers = new Set();
+    const push = (chunk) => {
+        if (!outputStarted) {
+            onTerminalOutputAvailable(function (cb) {
+                upstreamSubscribers.add(cb);
+                chunks.forEach(c => cb(c));
+                return { unsubscribe: () => upstreamSubscribers.delete(cb) };
+            });
+            outputStarted = true;
+        }
+        pushTerminalChunk(chunks, capacity, chunk);
+        upstreamSubscribers.forEach(cb => cb(chunk));
+    };
+    // Called by each Git operation when terminal output is available. We'll
+    // subscribe immediately to capture output from all operations and then
+    // forward it to upstream callbacks if/when requested.
+    const cb = function (subscribe) {
+        subscribe(c => {
+            if (Array.isArray(c)) {
+                chunks.forEach(push);
+            }
+            else {
+                push(c);
+            }
+        });
+        // We can't unsubscribe because the user might request terminal output in
+        // the future and we need to buffer the output from all operations to
+        // ensure we can present the entire output.
+        return { unsubscribe: noop };
+    };
+    return cb;
+};
+//# sourceMappingURL=multi-operation-terminal-output.js.map

package/dist/git/multi-operation-terminal-output.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"multi-operation-terminal-output.js","sourceRoot":"","sources":["../../src/git/multi-operation-terminal-output.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,gBAAgB,CAAA;AAMjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAE5D;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,CAAC,MAAM,0CAA0C,GAAG,CACxD,yBAAiD,EACjD,QAAQ,GAAG,GAAG,GAAG,IAAI,EACG,EAAE;IAC1B,IAAI,aAAa,GAAG,KAAK,CAAA;IACzB,MAAM,MAAM,GAAa,EAAE,CAAA;IAC3B,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAAmC,CAAA;IAEtE,MAAM,IAAI,GAAG,CAAC,KAAsB,EAAE,EAAE;QACtC,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,yBAAyB,CAAC,UAAU,EAAE;gBACpC,mBAAmB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;gBAC3B,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;gBAC1B,OAAO,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,mBAAmB,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAA;YAC9D,CAAC,CAAC,CAAA;YACF,aAAa,GAAG,IAAI,CAAA;QACtB,CAAC;QAED,iBAAiB,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAA;QAC1C,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAA;IAC9C,CAAC,CAAA;IAED,wEAAwE;IACxE,uEAAuE;IACvE,sDAAsD;IACtD,MAAM,EAAE,GAAG,UAAU,SAAiC;QACpD,SAAS,CAAC,CAAC,CAAC,EAAE;YACZ,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;gBACrB,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;YACtB,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,CAAC,CAAC,CAAA;YACT,CAAC;QACH,CAAC,CAAC,CAAA;QAEF,yEAAyE;QACzE,qEAAqE;QACrE,2CAA2C;QAC3C,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,CAAA;IAC9B,CAAC,CAAA;IAED,OAAO,EAAE,CAAA;AACX,CAAC,CAAA"}

package/dist/git/pull.d.ts

@@ -0,0 +1,24 @@
+import { HookProgress, TerminalOutput, TerminalOutputCallback } from './core.js';
+import { Repository } from '../models/repository.js';
+import { IPullProgress } from '../models/progress.js';
+import { IRemote } from '../models/remote.js';
+/**
+ * Pull from the specified remote.
+ *
+ * @param repository - The repository in which the pull should take place
+ *
+ * @param remote     - The name of the remote that should be pulled from
+ *
+ * @param progressCallback - An optional function which will be invoked
+ *                           with information about the current progress
+ *                           of the pull operation. When provided this enables
+ *                           the '--progress' command line flag for
+ *                           'git pull'.
+ */
+export declare function pull(repository: Repository, remote: IRemote, options?: {
+    progressCallback?: (progress: IPullProgress) => void;
+    onHookProgress?: (progress: HookProgress) => void;
+    onHookFailure?: (hookName: string, terminalOutput: TerminalOutput) => Promise<'abort' | 'ignore'>;
+    onTerminalOutputAvailable?: TerminalOutputCallback;
+    noVerify?: boolean;
+}): Promise<void>;