git-chopstick-core 0.1.1 → 0.1.2

package/dist/git/cherry-pick.js

@@ -0,0 +1,371 @@
+import { GitError } from './exec.js';
+import { AppFileStatusKind, } from '../models/status.js';
+import { git, } from './core.js';
+import { getStatus } from './status.js';
+import { stageFiles } from './update-index.js';
+import { getCommitsInRange, revRange } from './rev-list.js';
+import { merge } from '../lib/merge.js';
+import { round } from '../lib/round.js';
+import byline from 'byline';
+import { stageManualConflictResolution } from './stage.js';
+import { getCommit } from './index.js';
+import { join } from 'path';
+import { readFile } from 'fs/promises';
+import { pathExists } from '../lib/path-exists.js';
+/** The app-specific results from attempting to cherry pick commits*/
+export var CherryPickResult;
+(function (CherryPickResult) {
+    /**
+     * Git completed the cherry pick without reporting any errors, and the caller can
+     * signal success to the user.
+     */
+    CherryPickResult["CompletedWithoutError"] = "CompletedWithoutError";
+    /**
+     * The cherry pick encountered conflicts while attempting to cherry pick and
+     * need to be resolved before the user can continue.
+     */
+    CherryPickResult["ConflictsEncountered"] = "ConflictsEncountered";
+    /**
+     * The cherry pick was not able to continue as tracked files were not staged in
+     * the index.
+     */
+    CherryPickResult["OutstandingFilesNotStaged"] = "OutstandingFilesNotStaged";
+    /**
+     * The cherry pick was not attempted:
+     * - it could not check the status of the repository.
+     * - there was an invalid revision range provided.
+     * - there were uncommitted changes present.
+     * - there were errors in checkout the target branch
+     */
+    CherryPickResult["UnableToStart"] = "UnableToStart";
+    /**
+     * An unexpected error as part of the cherry pick flow was caught and handled.
+     *
+     * Check the logs to find the relevant Git details.
+     */
+    CherryPickResult["Error"] = "Error";
+})(CherryPickResult || (CherryPickResult = {}));
+/**
+ * A parser to read and emit cherry pick progress from Git `stdout`.
+ *
+ * Each successful cherry picked commit outputs a set of lines similar to the
+ * following example:
+ *    [branchName commitSha] commitSummary
+ *      Date: timestamp
+ *      1 file changed, 1 insertion(+)
+ *      create mode 100644 filename
+ */
+class GitCherryPickParser {
+    commits;
+    count;
+    constructor(commits, count = 0) {
+        this.commits = commits;
+        this.count = count;
+    }
+    parse(line) {
+        const cherryPickRe = /^\[(.*\s.*)\]/;
+        const match = cherryPickRe.exec(line);
+        if (match === null) {
+            // Skip lines that don't represent the first line of a successfully picked
+            // commit. -- i.e. timestamp, files changed, conflicts, etc..
+            return null;
+        }
+        this.count++;
+        return {
+            kind: 'multiCommitOperation',
+            value: round(this.count / this.commits.length, 2),
+            position: this.count,
+            totalCommitCount: this.commits.length,
+            currentCommitSummary: this.commits[this.count - 1]?.summary ?? '',
+        };
+    }
+}
+/**
+ * This method merges `baseOptions` with a call back method that obtains a
+ * `ICherryPickProgress` instance from `stdout` parsing.
+ *
+ * @param baseOptions - contains git execution options other than the
+ * progressCallBack such as expectedErrors
+ * @param commits - used by the parser to form `ICherryPickProgress` instance
+ * @param progressCallback - the callback method that accepts an
+ * `ICherryPickProgress` instance created by the parser
+ */
+function configureOptionsWithCallBack(baseOptions, commits, progressCallback, cherryPickedCount = 0) {
+    return merge(baseOptions, {
+        processCallback: (process) => {
+            if (process.stdout === null) {
+                return;
+            }
+            const parser = new GitCherryPickParser(commits, cherryPickedCount);
+            byline(process.stdout).on('data', (line) => {
+                const progress = parser.parse(line);
+                if (progress != null) {
+                    progressCallback(progress);
+                }
+            });
+        },
+    });
+}
+/**
+ * A function to initiate cherry picking in the app.
+ *
+ * @param commits - array of commits to cherry-pick
+ * For a cherry-pick operation, it does not matter what order the commits
+ * appear. But, it is best practice to send them in ascending order to prevent
+ * conflicts. First one on the array is first to be cherry-picked.
+ */
+export async function cherryPick(repository, commits, progressCallback) {
+    if (commits.length === 0) {
+        return CherryPickResult.UnableToStart;
+    }
+    let baseOptions = {
+        expectedErrors: new Set([
+            GitError.MergeConflicts,
+            GitError.ConflictModifyDeletedInBranch,
+        ]),
+    };
+    if (progressCallback !== undefined) {
+        baseOptions = await configureOptionsWithCallBack(baseOptions, commits, progressCallback);
+    }
+    // --empty=keep follows pattern of making sure someone cherry
+    //  picked commit summaries appear in target branch history even tho they may
+    //  be empty. This flag also results in the ability to cherry pick empty
+    //  commits (thus, --allow-empty is not required.)
+    //
+    // -m 1 makes it so a merge commit always takes the first parent's history
+    //  (the branch you are cherry-picking from) for the commit. It also means
+    //  there could be multiple empty commits. I.E. If user does a range that
+    //  includes commits from that merge.
+    const result = await git(['cherry-pick', ...commits.map(c => c.sha), '--empty=keep', '-m 1'], repository.path, 'cherry-pick', baseOptions);
+    return parseCherryPickResult(result);
+}
+function parseCherryPickResult(result) {
+    if (result.exitCode === 0) {
+        return CherryPickResult.CompletedWithoutError;
+    }
+    switch (result.gitError) {
+        case GitError.ConflictModifyDeletedInBranch:
+        case GitError.MergeConflicts:
+            return CherryPickResult.ConflictsEncountered;
+        case GitError.UnresolvedConflicts:
+            return CherryPickResult.OutstandingFilesNotStaged;
+        default:
+            throw new Error(`Unhandled result found: '${JSON.stringify(result)}'`);
+    }
+}
+/**
+ * Inspect the `.git/sequencer` folder and convert the current cherry pick
+ * state into am `ICherryPickProgress` instance as well as return an array of
+ * remaining commits queued for cherry picking.
+ *  - Progress instance required to display progress to user.
+ *  - Commits required to track progress after a conflict has been resolved.
+ *
+ * This is required when Desktop is not responsible for initiating the cherry
+ * pick and when continuing a cherry pick after conflicts are resolved:
+ *
+ * It returns null if it cannot parse an ongoing cherry pick. This happens when,
+ *  - There isn't a cherry pick in progress (expected null outcome).
+ *  - Runs into errors parsing cherry pick files. This is expected if cherry
+ *    pick is aborted or finished during parsing. It could also occur if cherry
+ *    pick sequencer files are corrupted.
+ */
+export async function getCherryPickSnapshot(repository) {
+    if (!isCherryPickHeadFound(repository)) {
+        // If there no cherry pick head, there is no cherry pick in progress.
+        return null;
+    }
+    // Abort safety sha is stored in.git/sequencer/abort-safety. It is the sha of
+    // the last cherry-picked commit in the operation or the head of target branch
+    // if no commits have been cherry-picked yet.
+    let abortSafetySha = '';
+    // The head sha is stored in .git/sequencer/head. It is the sha of target
+    // branch before the cherry-pick operation occurred.
+    let headSha = '';
+    // Each line of .git/sequencer/todo holds a sha of a commit lined up to be
+    // cherry-picked. These shas are in historical order starting oldest commit as
+    // the first line and newest as the last line.
+    const remainingCommits = [];
+    // Try block included as files may throw an error if it cannot locate
+    // the sequencer files. This is possible if cherry pick is continued
+    // or aborted at the same time.
+    try {
+        abortSafetySha = (await readFile(join(repository.resolvedGitDir, 'sequencer', 'abort-safety'), 'utf8')).trim();
+        if (abortSafetySha === '') {
+            // Technically possible if someone continued or aborted the cherry pick at
+            // the same time
+            return null;
+        }
+        headSha = (await readFile(join(repository.resolvedGitDir, 'sequencer', 'head'), 'utf8')).trim();
+        if (headSha === '') {
+            // Technically possible if someone continued or aborted the cherry pick at
+            // the same time
+            return null;
+        }
+        const remainingPicks = (await readFile(join(repository.resolvedGitDir, 'sequencer', 'todo'), 'utf8')).trim();
+        if (remainingPicks === '') {
+            // Technically possible if someone continued or aborted the cherry pick at
+            // the same time
+            return null;
+        }
+        // Each line is of the format: `pick shortSha commitSummary`
+        remainingPicks.split('\n').forEach(line => {
+            line = line.replace(/^pick /, '');
+            if (line.trim().includes(' ')) {
+                const sha = line.substr(0, line.indexOf(' '));
+                const commit = {
+                    sha,
+                    summary: line.substr(sha.length + 1),
+                };
+                remainingCommits.push(commit);
+            }
+        });
+        if (remainingCommits.length === 0) {
+            // This should only be possible with corrupt sequencer files.
+            return null;
+        }
+    }
+    catch {
+        // could not parse sequencer files
+        if (!isCherryPickHeadFound(repository)) {
+            // We redo this check just because a user technically could end the
+            // cherry-pick by the time we got here.
+            return null;
+        }
+        // If cherry-pick is in progress, then there was only one commit cherry-picked
+        // thus sequencer files were not used.
+        const cherryPickHeadSha = (await readFile(join(repository.resolvedGitDir, 'CHERRY_PICK_HEAD'), 'utf8')).trim();
+        const commit = await getCommit(repository, cherryPickHeadSha);
+        if (commit === null) {
+            return null;
+        }
+        return {
+            sha: commit.sha,
+            parentCount: 1,
+            progress: {
+                kind: 'multiCommitOperation',
+                value: 1,
+                position: 1,
+                totalCommitCount: 1,
+                currentCommitSummary: commit.summary,
+            },
+            remainingCommits: [],
+            commits: [{ sha: commit.sha, summary: commit.summary }],
+            targetBranchUndoSha: headSha,
+            cherryPickedCount: 0,
+        };
+    }
+    // To get all the commits for the cherry-pick operation, we need to get the
+    // ones already cherry-picked. If abortSafetySha is headSha; none have been
+    // cherry-picked yet.
+    const commitsCherryPicked = abortSafetySha !== headSha
+        ? await getCommitsInRange(repository, revRange(headSha, abortSafetySha))
+        : [];
+    if (commitsCherryPicked === null) {
+        // This should only be possible with corrupt sequencer files resulting in a
+        // bad revision range.
+        return null;
+    }
+    const commits = [...commitsCherryPicked, ...remainingCommits];
+    const position = commitsCherryPicked.length + 1;
+    const sha = remainingCommits[0]?.sha ?? '';
+    return {
+        sha,
+        parentCount: commits.length,
+        progress: {
+            kind: 'multiCommitOperation',
+            value: round(position / commits.length, 2),
+            position,
+            totalCommitCount: commits.length,
+            currentCommitSummary: remainingCommits[0].summary ?? '',
+        },
+        remainingCommits,
+        commits,
+        targetBranchUndoSha: headSha,
+        cherryPickedCount: commitsCherryPicked.length,
+    };
+}
+/**
+ * Proceed with the current cherry pick operation and report back on whether it completed
+ *
+ * It is expected that the index has staged files which are cleanly cherry
+ * picked onto the base branch, and the remaining unstaged files are those which
+ * need manual resolution or were changed by the user to address inline
+ * conflicts.
+ *
+ * @param files - The working directory of files. These are the files that are
+ * detected to have changes that we want to stage for the cherry pick.
+ */
+export async function continueCherryPick(repository, files, manualResolutions = new Map(), progressCallback) {
+    // only stage files related to cherry pick
+    const trackedFiles = files.filter(f => {
+        return f.status.kind !== AppFileStatusKind.Untracked;
+    });
+    // apply conflict resolutions
+    for (const [path, resolution] of manualResolutions) {
+        const file = files.find(f => f.path === path);
+        if (file === undefined) {
+            console.error(`[continueCherryPick] couldn't find file ${path} even though there's a manual resolution for it`);
+            continue;
+        }
+        await stageManualConflictResolution(repository, file, resolution);
+    }
+    const otherFiles = trackedFiles.filter(f => !manualResolutions.has(f.path));
+    await stageFiles(repository, otherFiles);
+    const status = await getStatus(repository, false);
+    if (status == null) {
+        console.warn(`[continueCherryPick] unable to get status after staging changes,
+        skipping any other steps`);
+        return CherryPickResult.UnableToStart;
+    }
+    // make sure cherry pick is still in progress to continue
+    if (await !isCherryPickHeadFound(repository)) {
+        return CherryPickResult.UnableToStart;
+    }
+    let options = {
+        expectedErrors: new Set([
+            GitError.MergeConflicts,
+            GitError.ConflictModifyDeletedInBranch,
+            GitError.UnresolvedConflicts,
+        ]),
+        env: {
+            // if we don't provide editor, we can't detect git errors
+            GIT_EDITOR: ':',
+        },
+    };
+    if (progressCallback !== undefined) {
+        const snapshot = await getCherryPickSnapshot(repository);
+        if (snapshot === null) {
+            console.warn(`[continueCherryPick] unable to get cherry-pick status, skipping other steps`);
+            return CherryPickResult.UnableToStart;
+        }
+        options = configureOptionsWithCallBack(options, snapshot.commits, progressCallback, snapshot.cherryPickedCount);
+    }
+    const trackedFilesAfter = status.workingDirectory.files.filter(f => f.status.kind !== AppFileStatusKind.Untracked);
+    if (trackedFilesAfter.length === 0) {
+        console.warn(`[cherryPick] no tracked changes to commit, continuing cherry-pick but skipping this commit`);
+        // This commits the empty commit so that the cherry picked commit still
+        // shows up in the target branches history.
+        const result = await git(['commit', '--allow-empty'], repository.path, 'continueCherryPickSkipCurrentCommit', options);
+        return parseCherryPickResult(result);
+    }
+    const result = await git(['cherry-pick', '--continue'], repository.path, 'continueCherryPick', options);
+    return parseCherryPickResult(result);
+}
+/** Abandon the current cherry pick operation */
+export async function abortCherryPick(repository) {
+    await git(['cherry-pick', '--abort'], repository.path, 'abortCherryPick');
+}
+/**
+ * Check if the `.git/CHERRY_PICK_HEAD` file exists
+ */
+export async function isCherryPickHeadFound(repository) {
+    try {
+        return pathExists(join(repository.resolvedGitDir, 'CHERRY_PICK_HEAD'));
+    }
+    catch (err) {
+        console.warn(`[cherryPick] a problem was encountered reading .git/CHERRY_PICK_HEAD,
+       so it is unsafe to continue cherry-picking`, err);
+        return false;
+    }
+}
+//# sourceMappingURL=cherry-pick.js.map

package/dist/git/cherry-pick.js.map

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

package/dist/git/clean.d.ts

@@ -0,0 +1,5 @@
+import { Repository } from '../models/repository.js';
+/**
+ * Clean untracked files from the repository.
+ */
+export declare function cleanUntrackedFiles(repository: Repository): Promise<void>;

package/dist/git/clean.js

@@ -0,0 +1,8 @@
+import { git } from './core.js';
+/**
+ * Clean untracked files from the repository.
+ */
+export async function cleanUntrackedFiles(repository) {
+    await git(['clean', '-d', '--force'], repository.path, 'cleanUntrackedFiles');
+}
+//# sourceMappingURL=clean.js.map

package/dist/git/clean.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"clean.js","sourceRoot":"","sources":["../../src/git/clean.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAA;AAG/B;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,UAAsB;IAC9D,MAAM,GAAG,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,SAAS,CAAC,EAAE,UAAU,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAA;AAC/E,CAAC"}

package/dist/git/clone.d.ts

@@ -0,0 +1,22 @@
+import { ICloneProgress } from '../models/progress.js';
+import { CloneOptions } from '../models/clone-options.js';
+/**
+ * Clones a repository from a given url into to the specified path.
+ *
+ * @param url     - The remote repository URL to clone from
+ *
+ * @param path    - The destination path for the cloned repository. If the
+ *                  path does not exist it will be created. Cloning into an
+ *                  existing directory is only allowed if the directory is
+ *                  empty.
+ *
+ * @param options  - Options specific to the clone operation, see the
+ *                   documentation for CloneOptions for more details.
+ *
+ * @param progressCallback - An optional function which will be invoked
+ *                           with information about the current progress
+ *                           of the clone operation. When provided this enables
+ *                           the '--progress' command line flag for
+ *                           'git clone'.
+ */
+export declare function clone(url: string, path: string, options: CloneOptions, login: string | null, progressCallback?: (progress: ICloneProgress) => void): Promise<void>;

package/dist/git/clone.js

@@ -0,0 +1,58 @@
+import { git } from './core.js';
+import { CloneProgressParser, executionOptionsWithProgress } from '../lib/progress/index.js';
+import { getDefaultBranch } from '../lib/helpers/default-branch.js';
+import { envForRemoteOperation } from './environment.js';
+/**
+ * Clones a repository from a given url into to the specified path.
+ *
+ * @param url     - The remote repository URL to clone from
+ *
+ * @param path    - The destination path for the cloned repository. If the
+ *                  path does not exist it will be created. Cloning into an
+ *                  existing directory is only allowed if the directory is
+ *                  empty.
+ *
+ * @param options  - Options specific to the clone operation, see the
+ *                   documentation for CloneOptions for more details.
+ *
+ * @param progressCallback - An optional function which will be invoked
+ *                           with information about the current progress
+ *                           of the clone operation. When provided this enables
+ *                           the '--progress' command line flag for
+ *                           'git clone'.
+ */
+export async function clone(url, path, options, login, progressCallback) {
+    const env = {
+        ...(await envForRemoteOperation(url)),
+        GIT_CLONE_PROTECTION_ACTIVE: 'false',
+    };
+    const remoteUrl = login
+        ? url.replace(/^((?:https|http|git+ssh|git|ssh|file)?:\/\/)/i, '$1' + login + '@')
+        : url;
+    const defaultBranch = options.defaultBranch ?? (await getDefaultBranch());
+    const args = [
+        '-c',
+        `init.defaultBranch=${defaultBranch}`,
+        'clone',
+        '--recursive',
+    ];
+    let opts = { env };
+    if (progressCallback) {
+        args.push('--progress');
+        const title = `Cloning into ${path}`;
+        const kind = 'clone';
+        opts = await executionOptionsWithProgress({ ...opts, trackLFSProgress: true }, new CloneProgressParser(), progress => {
+            const description = progress.kind === 'progress' ? progress.details.text : progress.text;
+            const value = progress.percent;
+            progressCallback({ kind, title, description, value });
+        });
+        // Initial progress
+        progressCallback({ kind, title, value: 0 });
+    }
+    if (options.branch) {
+        args.push('-b', options.branch);
+    }
+    args.push('--', remoteUrl, path);
+    await git(args, __dirname, 'clone', opts);
+}
+//# sourceMappingURL=clone.js.map

package/dist/git/clone.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"clone.js","sourceRoot":"","sources":["../../src/git/clone.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAA8B,MAAM,WAAW,CAAA;AAG3D,OAAO,EAAE,mBAAmB,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAA;AAC5F,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAA;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAA;AAExD;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,CAAC,KAAK,UAAU,KAAK,CACzB,GAAW,EACX,IAAY,EACZ,OAAqB,EACrB,KAAoB,EACpB,gBAAqD;IAErD,MAAM,GAAG,GAAG;QACV,GAAG,CAAC,MAAM,qBAAqB,CAAC,GAAG,CAAC,CAAC;QACrC,2BAA2B,EAAE,OAAO;KACrC,CAAA;IAED,MAAM,SAAS,GAAG,KAAK;QACrB,CAAC,CAAC,GAAG,CAAC,OAAO,CACT,+CAA+C,EAC/C,IAAI,GAAG,KAAK,GAAG,GAAG,CACnB;QACH,CAAC,CAAC,GAAG,CAAA;IAEP,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,IAAI,CAAC,MAAM,gBAAgB,EAAE,CAAC,CAAA;IAEzE,MAAM,IAAI,GAAG;QACX,IAAI;QACJ,sBAAsB,aAAa,EAAE;QACrC,OAAO;QACP,aAAa;KACd,CAAA;IAED,IAAI,IAAI,GAA+B,EAAE,GAAG,EAAE,CAAA;IAE9C,IAAI,gBAAgB,EAAE,CAAC;QACrB,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;QAEvB,MAAM,KAAK,GAAG,gBAAgB,IAAI,EAAE,CAAA;QACpC,MAAM,IAAI,GAAG,OAAO,CAAA;QAEpB,IAAI,GAAG,MAAM,4BAA4B,CACvC,EAAE,GAAG,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,EACnC,IAAI,mBAAmB,EAAE,EACzB,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,OAAO,CAAA;YAE9B,gBAAgB,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAA;QACvD,CAAC,CACF,CAAA;QAED,mBAAmB;QACnB,gBAAgB,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAA;IAC7C,CAAC;IAED,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAA;IACjC,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,CAAA;IAEhC,MAAM,GAAG,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,CAAC,CAAA;AAC3C,CAAC"}

package/dist/git/coerce-to-buffer.d.ts

@@ -0,0 +1 @@
+export declare const coerceToBuffer: (value: string | Buffer, encoding?: BufferEncoding) => Buffer<ArrayBufferLike>;

package/dist/git/coerce-to-buffer.js

@@ -0,0 +1,2 @@
+export const coerceToBuffer = (value, encoding = 'utf8') => (Buffer.isBuffer(value) ? value : Buffer.from(value, encoding));
+//# sourceMappingURL=coerce-to-buffer.js.map

package/dist/git/coerce-to-buffer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"coerce-to-buffer.js","sourceRoot":"","sources":["../../src/git/coerce-to-buffer.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,KAAsB,EACtB,WAA2B,MAAM,EACjC,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAA"}

package/dist/git/coerce-to-string.d.ts

@@ -0,0 +1 @@
+export declare const coerceToString: (value: string | Buffer, encoding?: BufferEncoding) => string;

package/dist/git/coerce-to-string.js

@@ -0,0 +1,2 @@
+export const coerceToString = (value, encoding = 'utf8') => (Buffer.isBuffer(value) ? value.toString(encoding) : value);
+//# sourceMappingURL=coerce-to-string.js.map

package/dist/git/coerce-to-string.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"coerce-to-string.js","sourceRoot":"","sources":["../../src/git/coerce-to-string.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,KAAsB,EACtB,WAA2B,MAAM,EACjC,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA"}

package/dist/git/commit.d.ts

@@ -0,0 +1,25 @@
+import { HookCallbackOptions } from './core.js';
+import { Repository } from '../models/repository.js';
+import { WorkingDirectoryFileChange } from '../models/status.js';
+import { ManualConflictResolution } from '../models/manual-conflict-resolution.js';
+/**
+ * @param repository repository to execute merge in
+ * @param message commit message
+ * @param files files to commit
+ * @returns the commit SHA
+ */
+export declare function createCommit(repository: Repository, message: string, files: ReadonlyArray<WorkingDirectoryFileChange>, options?: {
+    amend?: boolean;
+    noVerify?: boolean;
+    signOff?: boolean;
+    allowEmpty?: boolean;
+} & HookCallbackOptions): Promise<string>;
+/**
+ * Creates a commit to finish an in-progress merge
+ * assumes that all conflicts have already been resolved
+ * *Warning:* Does _not_ clear staged files before it commits!
+ *
+ * @param repository repository to execute merge in
+ * @param files files to commit
+ */
+export declare function createMergeCommit(repository: Repository, files: ReadonlyArray<WorkingDirectoryFileChange>, manualResolutions?: ReadonlyMap<string, ManualConflictResolution>): Promise<string>;

package/dist/git/commit.js

@@ -0,0 +1,99 @@
+import { git, parseCommitSHA } from './core.js';
+import { stageFiles } from './update-index.js';
+import { unstageAll } from './reset.js';
+import { stageManualConflictResolution } from './stage.js';
+/**
+ * @param repository repository to execute merge in
+ * @param message commit message
+ * @param files files to commit
+ * @returns the commit SHA
+ */
+export async function createCommit(repository, message, files, options) {
+    // Clear the staging area, our diffs reflect the difference between the
+    // working directory and the last commit (if any) so our commits should
+    // do the same thing.
+    await unstageAll(repository);
+    await stageFiles(repository, files);
+    const args = ['-F', '-'];
+    if (options?.amend) {
+        args.push('--amend');
+    }
+    if (options?.noVerify) {
+        args.push('--no-verify');
+    }
+    if (options?.signOff) {
+        args.push('--signoff');
+    }
+    if (options?.allowEmpty) {
+        args.push('--allow-empty');
+    }
+    const result = await git(['commit', ...args], repository.path, 'createCommit', {
+        stdin: message,
+        // https://git-scm.com/docs/githooks/2.46.1
+        interceptHooks: [
+            'pre-commit',
+            'prepare-commit-msg',
+            'commit-msg',
+            'post-commit',
+            ...(options?.amend ? ['post-rewrite'] : []),
+            'pre-auto-gc',
+        ],
+        onHookProgress: options?.onHookProgress,
+        onHookFailure: options?.onHookFailure,
+        onTerminalOutputAvailable: options?.onTerminalOutputAvailable,
+    });
+    return parseCommitSHA(result);
+}
+/**
+ * Creates a commit to finish an in-progress merge
+ * assumes that all conflicts have already been resolved
+ * *Warning:* Does _not_ clear staged files before it commits!
+ *
+ * @param repository repository to execute merge in
+ * @param files files to commit
+ */
+export async function createMergeCommit(repository, files, manualResolutions = new Map()) {
+    // apply manual conflict resolutions
+    for (const [path, resolution] of manualResolutions) {
+        const file = files.find(f => f.path === path);
+        if (file !== undefined) {
+            await stageManualConflictResolution(repository, file, resolution);
+        }
+        else {
+            console.error(`couldn't find file ${path} even though there's a manual resolution for it`);
+        }
+    }
+    const otherFiles = files.filter(f => !manualResolutions.has(f.path));
+    await stageFiles(repository, otherFiles);
+    const result = await git([
+        'commit',
+        // no-edit here ensures the app does not accidentally invoke the user's editor
+        '--no-edit',
+        // By default Git merge commits do not contain any commentary (which
+        // are lines prefixed with `#`). This works because the Git CLI will
+        // prompt the user to edit the file in `.git/COMMIT_MSG` before
+        // committing, and then it will run `--cleanup=strip`.
+        //
+        // This clashes with our use of `--no-edit` above as Git will now change
+        // it's behavior to invoke `--cleanup=whitespace` as it did not ask
+        // the user to edit the COMMIT_MSG as part of creating a commit.
+        //
+        // From the docs on git-commit (https://git-scm.com/docs/git-commit) I'll
+        // quote the relevant section:
+        // --cleanup=<mode>
+        //     strip
+        //        Strip leading and trailing empty lines, trailing whitespace,
+        //        commentary and collapse consecutive empty lines.
+        //     whitespace
+        //        Same as `strip` except #commentary is not removed.
+        //     default
+        //        Same as `strip` if the message is to be edited. Otherwise `whitespace`.
+        //
+        // We should emulate the behavior in this situation because we don't
+        // let the user view or change the commit message before making the
+        // commit.
+        '--cleanup=strip',
+    ], repository.path, 'createMergeCommit');
+    return parseCommitSHA(result);
+}
+//# sourceMappingURL=commit.js.map

package/dist/git/commit.js.map

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