git-chopstick-core 0.1.0 → 0.1.2

package/dist/git/interpret-trailers.js

@@ -0,0 +1,130 @@
+import { git } from './core.js';
+import { getConfigValue } from './config.js';
+/**
+ * Gets a value indicating whether the trailer token is
+ * Co-Authored-By. Does not validate the token value.
+ */
+export function isCoAuthoredByTrailer(trailer) {
+    return trailer.token.toLowerCase() === 'co-authored-by';
+}
+/**
+ * Parse a string containing only unfolded trailers produced by
+ * git-interpret-trailers --only-input --only-trailers --unfold or
+ * a derivative such as git log --format="%(trailers:only,unfold)"
+ *
+ * @param trailers   A string containing one well formed trailer per
+ *                   line
+ *
+ * @param separators A string containing all characters to use when
+ *                   attempting to find the separator between token
+ *                   and value in a trailer. See the configuration
+ *                   option trailer.separators for more information
+ *
+ *                   Also see getTrailerSeparatorCharacters.
+ */
+export function parseRawUnfoldedTrailers(trailers, separators) {
+    const lines = trailers.split('\n');
+    const parsedTrailers = new Array();
+    for (const line of lines) {
+        const trailer = parseSingleUnfoldedTrailer(line, separators);
+        if (trailer) {
+            parsedTrailers.push(trailer);
+        }
+    }
+    return parsedTrailers;
+}
+export function parseSingleUnfoldedTrailer(line, separators) {
+    for (const separator of separators) {
+        const ix = line.indexOf(separator);
+        if (ix > 0) {
+            return {
+                token: line.substring(0, ix).trim(),
+                value: line.substring(ix + 1).trim(),
+            };
+        }
+    }
+    return null;
+}
+/**
+ * Get a string containing the characters that may be used in this repository
+ * separate tokens from values in commit message trailers. If no specific
+ * trailer separator is configured the default separator (:) will be returned.
+ */
+export async function getTrailerSeparatorCharacters(repository) {
+    return (await getConfigValue(repository, 'trailer.separators')) || ':';
+}
+/**
+ * Extract commit message trailers from a commit message.
+ *
+ * The trailers returned here are unfolded, i.e. they've had their
+ * whitespace continuation removed and are all on one line. See the
+ * documentation for --unfold in the help for `git interpret-trailers`
+ *
+ * @param repository    The repository in which to run the interpret-
+ *                      trailers command. Although not intuitive this
+ *                      does matter as there are configuration options
+ *                      available for the format, position, etc of commit
+ *                      message trailers. See the manpage for
+ *                      git-interpret-trailers for more information.
+ *
+ * @param commitMessage A commit message from where to attempt to extract
+ *                      commit message trailers.
+ *
+ * @returns An array of zero or more parsed trailers
+ */
+export async function parseTrailers(repository, commitMessage) {
+    const result = await git(['interpret-trailers', '--parse'], repository.path, 'parseTrailers', {
+        stdin: commitMessage,
+    });
+    const trailers = result.stdout;
+    if (trailers.length === 0) {
+        return [];
+    }
+    const separators = await getTrailerSeparatorCharacters(repository);
+    return parseRawUnfoldedTrailers(result.stdout, separators);
+}
+/**
+ * Merge one or more commit message trailers into a commit message.
+ *
+ * If no trailers are given this method will simply try to ensure that
+ * any trailers that happen to be part of the raw message are formatted
+ * in accordance with the configuration options set for trailers in
+ * the given repository.
+ *
+ * Note that configuration may be set so that duplicate trailers are
+ * kept or discarded.
+ *
+ * @param repository    The repository in which to run the interpret-
+ *                      trailers command. Although not intuitive this
+ *                      does matter as there are configuration options
+ *                      available for the format, position, etc of commit
+ *                      message trailers. See the manpage for
+ *                      git-interpret-trailers for more information.
+ *
+ * @param commitMessage A commit message with or without existing commit
+ *                      message trailers into which to merge the trailers
+ *                      given in the trailers parameter
+ *
+ * @param trailers      Zero or more trailers to merge into the commit message
+ *
+ * @returns             A commit message string where the provided trailers (if)
+ *                      any have been merged into the commit message using the
+ *                      configuration settings for trailers in the provided
+ *                      repository.
+ */
+export async function mergeTrailers(repository, commitMessage, trailers, unfold = false) {
+    const args = ['interpret-trailers'];
+    // See https://github.com/git/git/blob/ebf3c04b262aa/Documentation/git-interpret-trailers.txt#L129-L132
+    args.push('--no-divider');
+    if (unfold) {
+        args.push('--unfold');
+    }
+    for (const trailer of trailers) {
+        args.push('--trailer', `${trailer.token}=${trailer.value}`);
+    }
+    const result = await git(args, repository.path, 'mergeTrailers', {
+        stdin: commitMessage,
+    });
+    return result.stdout;
+}
+//# sourceMappingURL=interpret-trailers.js.map

package/dist/git/interpret-trailers.js.map

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

package/dist/git/lfs.d.ts

@@ -0,0 +1,25 @@
+import { Repository } from '../models/repository.js';
+/** Install the global LFS filters. */
+export declare function installGlobalLFSFilters(force: boolean): Promise<void>;
+/** Install LFS hooks in the repository. */
+export declare function installLFSHooks(repository: Repository, force: boolean): Promise<void>;
+/** Is the repository configured to track any paths with LFS? */
+export declare function isUsingLFS(repository: Repository): Promise<boolean>;
+/**
+ * Check if a provided file path is being tracked by Git LFS
+ *
+ * This uses the Git plumbing to read the .gitattributes file
+ * for any LFS-related rules that are set for the file
+ *
+ * @param repository repository with
+ * @param path relative file path in the repository
+ */
+export declare function isTrackedByLFS(repository: Repository, path: string): Promise<boolean>;
+/**
+ * Query a Git repository and filter the set of provided relative paths to see
+ * which are not covered by the current Git LFS configuration.
+ *
+ * @param repository
+ * @param filePaths List of relative paths in the repository
+ */
+export declare function filesNotTrackedByLFS(repository: Repository, filePaths: ReadonlyArray<string>): Promise<ReadonlyArray<string>>;

package/dist/git/lfs.js

@@ -0,0 +1,73 @@
+import { git } from './core.js';
+/** Install the global LFS filters. */
+export async function installGlobalLFSFilters(force) {
+    const args = ['lfs', 'install', '--skip-repo'];
+    if (force) {
+        args.push('--force');
+    }
+    await git(args, __dirname, 'installGlobalLFSFilter');
+}
+/** Install LFS hooks in the repository. */
+export async function installLFSHooks(repository, force) {
+    const args = ['lfs', 'install'];
+    if (force) {
+        args.push('--force');
+    }
+    await git(args, repository.path, 'installLFSHooks');
+}
+/** Is the repository configured to track any paths with LFS? */
+export async function isUsingLFS(repository) {
+    const env = {
+        GIT_LFS_TRACK_NO_INSTALL_HOOKS: '1',
+    };
+    const result = await git(['lfs', 'track'], repository.path, 'isUsingLFS', {
+        env,
+    });
+    return result.stdout.length > 0;
+}
+/**
+ * Check if a provided file path is being tracked by Git LFS
+ *
+ * This uses the Git plumbing to read the .gitattributes file
+ * for any LFS-related rules that are set for the file
+ *
+ * @param repository repository with
+ * @param path relative file path in the repository
+ */
+export async function isTrackedByLFS(repository, path) {
+    const { stdout } = await git(['check-attr', 'filter', path], repository.path, 'checkAttrForLFS');
+    // "git check-attr -a" will output every filter it can find in .gitattributes
+    // and it looks like this:
+    //
+    // README.md: diff: lfs
+    // README.md: merge: lfs
+    // README.md: text: unset
+    // README.md: filter: lfs
+    //
+    // To verify git-lfs this test will just focus on that last row, "filter",
+    // and the value associated with it. If nothing is found in .gitattributes
+    // the output will look like this
+    //
+    // README.md: filter: unspecified
+    const lfsFilterRegex = /: filter: lfs/;
+    const match = lfsFilterRegex.exec(stdout);
+    return match !== null;
+}
+/**
+ * Query a Git repository and filter the set of provided relative paths to see
+ * which are not covered by the current Git LFS configuration.
+ *
+ * @param repository
+ * @param filePaths List of relative paths in the repository
+ */
+export async function filesNotTrackedByLFS(repository, filePaths) {
+    const filesNotTrackedByGitLFS = new Array();
+    for (const file of filePaths) {
+        const isTracked = await isTrackedByLFS(repository, file);
+        if (!isTracked) {
+            filesNotTrackedByGitLFS.push(file);
+        }
+    }
+    return filesNotTrackedByGitLFS;
+}
+//# sourceMappingURL=lfs.js.map

package/dist/git/lfs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"lfs.js","sourceRoot":"","sources":["../../src/git/lfs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAA;AAG/B,sCAAsC;AACtC,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,KAAc;IAC1D,MAAM,IAAI,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,aAAa,CAAC,CAAA;IAC9C,IAAI,KAAK,EAAE,CAAC;QACV,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IACtB,CAAC;IAED,MAAM,GAAG,CAAC,IAAI,EAAE,SAAS,EAAE,wBAAwB,CAAC,CAAA;AACtD,CAAC;AAED,2CAA2C;AAC3C,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,UAAsB,EACtB,KAAc;IAEd,MAAM,IAAI,GAAG,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;IAC/B,IAAI,KAAK,EAAE,CAAC;QACV,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IACtB,CAAC;IAED,MAAM,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAA;AACrD,CAAC;AAED,gEAAgE;AAChE,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,UAAsB;IACrD,MAAM,GAAG,GAAG;QACV,8BAA8B,EAAE,GAAG;KACpC,CAAA;IACD,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE,UAAU,CAAC,IAAI,EAAE,YAAY,EAAE;QACxE,GAAG;KACJ,CAAC,CAAA;IACF,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAA;AACjC,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,UAAsB,EACtB,IAAY;IAEZ,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,CAC1B,CAAC,YAAY,EAAE,QAAQ,EAAE,IAAI,CAAC,EAC9B,UAAU,CAAC,IAAI,EACf,iBAAiB,CAClB,CAAA;IAED,6EAA6E;IAC7E,0BAA0B;IAC1B,EAAE;IACF,uBAAuB;IACvB,wBAAwB;IACxB,yBAAyB;IACzB,yBAAyB;IACzB,EAAE;IACF,0EAA0E;IAC1E,0EAA0E;IAC1E,iCAAiC;IACjC,EAAE;IACF,iCAAiC;IAEjC,MAAM,cAAc,GAAG,eAAe,CAAA;IAEtC,MAAM,KAAK,GAAG,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAEzC,OAAO,KAAK,KAAK,IAAI,CAAA;AACvB,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,UAAsB,EACtB,SAAgC;IAEhC,MAAM,uBAAuB,GAAG,IAAI,KAAK,EAAU,CAAA;IAEnD,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;QAC7B,MAAM,SAAS,GAAG,MAAM,cAAc,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;QAExD,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACpC,CAAC;IACH,CAAC;IAED,OAAO,uBAAuB,CAAA;AAChC,CAAC"}

package/dist/git/log.d.ts

@@ -0,0 +1,56 @@
+import { CommittedFileChange } from '../models/status.js';
+import { Repository } from '../models/repository.js';
+import { Commit } from '../models/commit.js';
+import { CommitIdentity } from '../models/commit-identity.js';
+/**
+ * Get the repository's commits using `revisionRange` and limited to `limit`
+ */
+export declare function getCommits(repository: Repository, revisionRange?: string, limit?: number, skip?: number, additionalArgs?: ReadonlyArray<string>): Promise<ReadonlyArray<Commit>>;
+/** This interface contains information of a changeset. */
+export interface IChangesetData {
+    /** Files changed in the changeset. */
+    readonly files: ReadonlyArray<CommittedFileChange>;
+    /** Number of lines added in the changeset. */
+    readonly linesAdded: number;
+    /** Number of lines deleted in the changeset. */
+    readonly linesDeleted: number;
+}
+/** Get the files that were changed in the given commit. */
+export declare function getChangedFiles(repository: Repository, sha: string): Promise<IChangesetData>;
+/**
+ * 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 declare function parseRawLogWithNumstat(stdout: string, sha: string, parentCommitish: string): {
+    files: CommittedFileChange[];
+    linesAdded: number;
+    linesDeleted: number;
+};
+/** Get the commit for the given ref. */
+export declare function getCommit(repository: Repository, ref: string): Promise<Commit | null>;
+/** Get the author identity for the given shas */
+export declare function getAuthors(repository: Repository, shas: string[]): Promise<CommitIdentity[]>;

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>;