git-chopstick-core 0.1.1 → 0.1.3

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

package/dist/git/stash.js

@@ -0,0 +1,204 @@
+import { GitError as DugiteError } from './exec.js';
+import { git, GitError } from './core.js';
+import { StashedChangesLoadStates, } from '../models/stash-entry.js';
+import { parseRawLogWithNumstat } from './log.js';
+import { stageFiles } from './update-index.js';
+import { createLogParser } from './git-delimiter-parser.js';
+import { coerceToString } from './coerce-to-string.js';
+export const DesktopStashEntryMarker = '!!GitHub_Desktop';
+/**
+ * RegEx for determining if a stash entry is created by Desktop
+ *
+ * This is done by looking for a magic string with the following
+ * format: `!!GitHub_Desktop<branch>`
+ */
+const desktopStashEntryMessageRe = /!!GitHub_Desktop<(.+)>$/;
+/**
+ * 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 async function getStashes(repository) {
+    const { formatArgs, parse } = createLogParser({
+        name: '%gD',
+        stashSha: '%H',
+        message: '%gs',
+        tree: '%T',
+        parents: '%P',
+    });
+    const result = await git(['log', '-g', ...formatArgs, 'refs/stash', '--'], repository.path, 'getStashEntries', { successExitCodes: new Set([0, 128]) });
+    // There's no refs/stashes reflog in the repository or it's not
+    // even a repository. In either case we don't care
+    if (result.exitCode === 128) {
+        return { desktopEntries: [], stashEntryCount: 0 };
+    }
+    const desktopEntries = [];
+    const files = { kind: StashedChangesLoadStates.NotLoaded };
+    const entries = parse(result.stdout);
+    for (const { name, message, stashSha, tree, parents } of entries) {
+        const branchName = extractBranchFromMessage(message);
+        if (branchName !== null) {
+            desktopEntries.push({
+                name,
+                stashSha,
+                branchName,
+                tree,
+                parents: parents.length > 0 ? parents.split(' ') : [],
+                files,
+            });
+        }
+    }
+    return { desktopEntries, stashEntryCount: entries.length - 1 };
+}
+/**
+ * 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 async function moveStashEntry(repository, { stashSha, parents, tree }, branchName) {
+    const message = `On ${branchName}: ${createDesktopStashMessage(branchName)}`;
+    const parentArgs = parents.flatMap(p => ['-p', p]);
+    const { stdout: commitId } = await git(['commit-tree', ...parentArgs, '-m', message, '--no-gpg-sign', tree], repository.path, 'moveStashEntryToBranch');
+    await git(['stash', 'store', '-m', message, commitId.trim()], repository.path, 'moveStashEntryToBranch');
+    await dropDesktopStashEntry(repository, stashSha);
+}
+/**
+ * Returns the last Desktop created stash entry for the given branch
+ */
+export async function getLastDesktopStashEntryForBranch(repository, branch) {
+    const stash = await getStashes(repository);
+    const branchName = typeof branch === 'string' ? branch : branch.name;
+    // Since stash objects are returned in a LIFO manner, the first
+    // entry found is guaranteed to be the last entry created
+    return (stash.desktopEntries.find(stash => stash.branchName === branchName) || null);
+}
+/** Creates a stash entry message that indicates the entry was created by Desktop */
+export function createDesktopStashMessage(branchName) {
+    return `${DesktopStashEntryMarker}<${branchName}>`;
+}
+/**
+ * Stash the working directory changes for the current branch
+ */
+export async function createDesktopStashEntry(repository, branch, untrackedFilesToStage, selectedFiles) {
+    // We must ensure that no untracked files are present before stashing
+    // See https://github.com/desktop/desktop/pull/8085
+    // First ensure that all changes in file are selected
+    // (in case the user has not explicitly checked the checkboxes for the untracked files)
+    const fullySelectedUntrackedFiles = untrackedFilesToStage
+        .filter(f => (selectedFiles ? selectedFiles.includes(f.path) : true))
+        .map(x => x.withIncludeAll(true));
+    await stageFiles(repository, fullySelectedUntrackedFiles);
+    const branchName = typeof branch === 'string' ? branch : branch.name;
+    const message = createDesktopStashMessage(branchName);
+    const args = ['stash', 'push', '-m', message];
+    if (selectedFiles) {
+        args.push(...selectedFiles);
+    }
+    const result = await git(args, repository.path, 'createStashEntry').catch(e => {
+        // Note: 2024: Here be dragons. As I converted this code to get rid of the
+        // successExitCode use I got curious about the assumptions made in the
+        // following logic. It assumes that as long as the exit code for `git
+        // stash push` is 1 and there are no lines beginning with "error: " then
+        // a stash was created. That didn't hold up to a quick read of the stash
+        // code. For example, running git stash push in an unborn repository will
+        // get you an exit code of 1 but no stash was created:
+        //
+        // % git stash push -m foo ; echo $?
+        // You do not have the initial commit yet
+        // 1
+        //
+        // I'm not going to mess with this now but I felt the need to document
+        // my findings should I or any other brave soul choose to tackle this in
+        // the future.
+        if (e instanceof GitError && e.result.exitCode === 1) {
+            // search for any line starting with `error:` -  /m here to ensure this is
+            // applied to each line, without needing to split the text
+            const errorPrefixRe = /^error: /m;
+            const matches = errorPrefixRe.exec(coerceToString(e.result.stderr));
+            if (matches !== null && matches.length > 0) {
+                // rethrow, because these messages should prevent the stash from being created
+                return Promise.reject(e);
+            }
+            // if no error messages were emitted by Git, we should log but continue because
+            // a valid stash was created and this should not interfere with the checkout
+            console.info(`[createDesktopStashEntry] a stash was created successfully but exit code ${result.exitCode} reported. stderr: ${result.stderr}`);
+            return e.result;
+        }
+        return Promise.reject(e);
+    });
+    // Stash doesn't consider it an error that there aren't any local changes to save.
+    if (result.stdout === 'No local changes to save\n') {
+        return false;
+    }
+    return true;
+}
+async function getStashEntryMatchingSha(repository, sha) {
+    const stash = await getStashes(repository);
+    return stash.desktopEntries.find(e => e.stashSha === sha) || null;
+}
+/**
+ * Removes the given stash entry if it exists
+ *
+ * @param stashSha the SHA that identifies the stash entry
+ */
+export async function dropDesktopStashEntry(repository, stashSha) {
+    const entryToDelete = await getStashEntryMatchingSha(repository, stashSha);
+    if (entryToDelete !== null) {
+        const args = ['stash', 'drop', entryToDelete.name];
+        await git(args, repository.path, 'dropStashEntry');
+    }
+}
+/**
+ * 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 async function popStashEntry(repository, stashSha) {
+    // ignoring these git errors for now, this will change when we start
+    // implementing the stash conflict flow
+    const expectedErrors = new Set([DugiteError.MergeConflicts]);
+    const stashToPop = await getStashEntryMatchingSha(repository, stashSha);
+    if (stashToPop !== null) {
+        const args = ['stash', 'pop', '--quiet', `${stashToPop.name}`];
+        await git(args, repository.path, 'popStashEntry', {
+            expectedErrors,
+        }).catch(e => {
+            // popping a stashes that create conflicts in the working directory
+            // report an exit code of `1` and are not dropped after being applied.
+            // so, we check for this case and drop them manually unless there's
+            // anything in stderr as that could have prevented the stash from being
+            // popped. Not the greatest approach but stash isn't very communicative
+            if (e instanceof GitError &&
+                e.result.exitCode === 1 &&
+                e.result.stderr.length === 0) {
+                console.info(`[popStashEntry] a stash was popped successfully but exit code ${e.result.exitCode} reported.`);
+                // bye bye
+                return dropDesktopStashEntry(repository, stashSha);
+            }
+            return Promise.reject(e);
+        });
+    }
+}
+function extractBranchFromMessage(message) {
+    const match = desktopStashEntryMessageRe.exec(message);
+    return match === null || match[1].length === 0 ? null : match[1];
+}
+/** Get the files that were changed in the given stash commit */
+export async function getStashedFiles(repository, stashSha) {
+    const args = [
+        'stash',
+        'show',
+        stashSha,
+        '--raw',
+        '--numstat',
+        '-z',
+        '--format=format:',
+        '--no-show-signature',
+        '--',
+    ];
+    const { stdout } = await git(args, repository.path, 'getStashedFiles');
+    return parseRawLogWithNumstat(stdout, stashSha, `${stashSha}^`).files;
+}
+//# sourceMappingURL=stash.js.map

package/dist/git/stash.js.map

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

package/dist/git/status.d.ts

@@ -0,0 +1,39 @@
+import { WorkingDirectoryStatus } from '../models/status.js';
+import { Repository } from '../models/repository.js';
+import { IAheadBehind } from '../models/branch.js';
+import { RebaseInternalState } from '../models/rebase.js';
+/** The encapsulation of the result from 'git status' */
+export interface IStatusResult {
+    /** The name of the current branch */
+    readonly currentBranch?: string;
+    /** The name of the current upstream branch */
+    readonly currentUpstreamBranch?: string;
+    /** The SHA of the tip commit of the current branch */
+    readonly currentTip?: string;
+    /** How many commits ahead and behind
+     *  the `currentBranch` is compared to the `currentUpstreamBranch`
+     */
+    readonly branchAheadBehind?: IAheadBehind;
+    /** true if the repository exists at the given location */
+    readonly exists: boolean;
+    /** true if repository is in a conflicted state */
+    readonly mergeHeadFound: boolean;
+    /** true merge --squash operation started */
+    readonly squashMsgFound: boolean;
+    /** details about the rebase operation, if found */
+    readonly rebaseInternalState: RebaseInternalState | null;
+    /** true if repository is in cherry pick state */
+    readonly isCherryPickingHeadFound: boolean;
+    /** the absolute path to the repository's working directory */
+    readonly workingDirectory: WorkingDirectoryStatus;
+    /** whether conflicting files present on repository */
+    readonly doConflictedFilesExist: boolean;
+}
+/**
+ *  Retrieve the status for a given repository,
+ *  and fail gracefully if the location is not a Git repository
+ */
+export declare function getStatus(repository: Repository): Promise<IStatusResult | null>;
+export declare function getStatus(repository: Repository, includeUntracked: boolean): Promise<IStatusResult | null>;
+export declare function getStatus(repository: Repository, includeUntracked: boolean, rejectOnError: true): Promise<IStatusResult>;
+export declare function getStatus(repository: Repository, includeUntracked: boolean, rejectOnError: false): Promise<IStatusResult | null>;

package/dist/git/status.js

@@ -0,0 +1,293 @@
+import { getFilesWithConflictMarkers } from './diff-check.js';
+import { WorkingDirectoryStatus, WorkingDirectoryFileChange, GitStatusEntry, AppFileStatusKind, UnmergedEntrySummary, } from '../models/status.js';
+import { parsePorcelainStatus, mapStatus, isStatusHeader, isStatusEntry, } from '../lib/status-parser.js';
+import { DiffSelectionType, DiffSelection } from '../models/diff/index.js';
+import { fatalError } from '../lib/fatal-error.js';
+import { isMergeHeadSet, isSquashMsgSet } from './merge.js';
+import { getBinaryPaths } from './diff.js';
+import { getRebaseInternalState } from './rebase.js';
+import { isCherryPickHeadFound } from './cherry-pick.js';
+import { git } from './index.js';
+function parseConflictedState(entry, path, conflictDetails) {
+    switch (entry.action) {
+        case UnmergedEntrySummary.BothAdded: {
+            const isBinary = conflictDetails.binaryFilePaths.includes(path);
+            if (!isBinary) {
+                return {
+                    kind: AppFileStatusKind.Conflicted,
+                    entry,
+                    conflictMarkerCount: conflictDetails.conflictCountsByPath.get(path) || 0,
+                };
+            }
+            else {
+                return {
+                    kind: AppFileStatusKind.Conflicted,
+                    entry,
+                };
+            }
+        }
+        case UnmergedEntrySummary.BothModified: {
+            const isBinary = conflictDetails.binaryFilePaths.includes(path);
+            if (!isBinary) {
+                return {
+                    kind: AppFileStatusKind.Conflicted,
+                    entry,
+                    conflictMarkerCount: conflictDetails.conflictCountsByPath.get(path) || 0,
+                };
+            }
+            else {
+                return {
+                    kind: AppFileStatusKind.Conflicted,
+                    entry,
+                };
+            }
+        }
+        default:
+            return {
+                kind: AppFileStatusKind.Conflicted,
+                entry,
+            };
+    }
+}
+function convertToAppStatus(path, entry, conflictDetails, oldPath) {
+    if (entry.kind === 'ordinary') {
+        switch (entry.type) {
+            case 'added':
+                return {
+                    kind: AppFileStatusKind.New,
+                    submoduleStatus: entry.submoduleStatus,
+                };
+            case 'modified':
+                return {
+                    kind: AppFileStatusKind.Modified,
+                    submoduleStatus: entry.submoduleStatus,
+                };
+            case 'deleted':
+                return {
+                    kind: AppFileStatusKind.Deleted,
+                    submoduleStatus: entry.submoduleStatus,
+                };
+        }
+    }
+    else if (entry.kind === 'copied' && oldPath != null) {
+        return {
+            kind: AppFileStatusKind.Copied,
+            oldPath,
+            submoduleStatus: entry.submoduleStatus,
+            renameIncludesModifications: false,
+        };
+    }
+    else if (entry.kind === 'renamed' && oldPath != null) {
+        return {
+            kind: AppFileStatusKind.Renamed,
+            oldPath,
+            submoduleStatus: entry.submoduleStatus,
+            renameIncludesModifications: entry.workingTree === GitStatusEntry.Modified ||
+                (entry.renameOrCopyScore !== undefined &&
+                    entry.renameOrCopyScore < 100),
+        };
+    }
+    else if (entry.kind === 'untracked') {
+        return {
+            kind: AppFileStatusKind.Untracked,
+            submoduleStatus: entry.submoduleStatus,
+        };
+    }
+    else if (entry.kind === 'conflicted') {
+        return parseConflictedState(entry, path, conflictDetails);
+    }
+    return fatalError(`Unknown file status ${status}`);
+}
+// List of known conflicted index entries for a file, extracted from mapStatus
+// inside `app/src/lib/status-parser.ts` for convenience
+const conflictStatusCodes = ['DD', 'AU', 'UD', 'UA', 'DU', 'AA', 'UU'];
+export async function getStatus(repository, includeUntracked = true, rejectOnError = false) {
+    const args = [
+        '--no-optional-locks',
+        'status',
+        ...(includeUntracked ? ['--untracked-files=all'] : []),
+        '--branch',
+        '--porcelain=2',
+        '-z',
+    ];
+    const { stdout, exitCode } = await git(args, repository.path, 'getStatus', {
+        successExitCodes: new Set(rejectOnError ? [0] : [0, 128]),
+        encoding: 'buffer',
+    });
+    if (exitCode === 128) {
+        console.debug(`'git status' returned 128 for '${repository.path}' and is likely missing its .git directory`);
+        return null;
+    }
+    const parsed = parsePorcelainStatus(stdout);
+    const headers = parsed.filter(isStatusHeader);
+    const entries = parsed.filter(isStatusEntry);
+    const mergeHeadFound = await isMergeHeadSet(repository);
+    const conflictedFilesInIndex = entries.filter(e => conflictStatusCodes.includes(e.statusCode));
+    const rebaseInternalState = await getRebaseInternalState(repository);
+    const conflictDetails = await getConflictDetails(repository, mergeHeadFound, conflictedFilesInIndex, rebaseInternalState);
+    // Map of files keyed on their paths.
+    const files = entries.reduce((files, entry) => buildStatusMap(files, entry, conflictDetails), new Map());
+    const { currentBranch, currentUpstreamBranch, currentTip, branchAheadBehind, } = headers.reduce(parseStatusHeader, {
+        currentBranch: undefined,
+        currentUpstreamBranch: undefined,
+        currentTip: undefined,
+        branchAheadBehind: undefined,
+        match: null,
+    });
+    const workingDirectory = WorkingDirectoryStatus.fromFiles([...files.values()]);
+    const isCherryPickingHeadFound = await isCherryPickHeadFound(repository);
+    const squashMsgFound = await isSquashMsgSet(repository);
+    return {
+        currentBranch,
+        currentTip,
+        currentUpstreamBranch,
+        branchAheadBehind,
+        exists: true,
+        mergeHeadFound,
+        rebaseInternalState,
+        workingDirectory,
+        isCherryPickingHeadFound,
+        squashMsgFound,
+        doConflictedFilesExist: conflictedFilesInIndex.length > 0,
+    };
+}
+/**
+ *
+ * Update map of working directory changes with a file status entry.
+ * Reducer(ish).
+ *
+ * (Map is used here to maintain insertion order.)
+ */
+function buildStatusMap(files, entry, conflictDetails) {
+    const status = mapStatus(entry.statusCode, entry.submoduleStatusCode, entry.renameOrCopyScore);
+    if (status.kind === 'ordinary') {
+        // when a file is added in the index but then removed in the working
+        // directory, the file won't be part of the commit, so we can skip
+        // displaying this entry in the changes list
+        if (status.index === GitStatusEntry.Added &&
+            status.workingTree === GitStatusEntry.Deleted) {
+            return files;
+        }
+    }
+    if (status.kind === 'untracked') {
+        // when a delete has been staged, but an untracked file exists with the
+        // same path, we should ensure that we only draw one entry in the
+        // changes list - see if an entry already exists for this path and
+        // remove it if found
+        files.delete(entry.path);
+    }
+    // for now we just poke at the existing summary
+    const appStatus = convertToAppStatus(entry.path, status, conflictDetails, entry.oldPath);
+    const initialSelectionType = appStatus.kind === AppFileStatusKind.Modified &&
+        appStatus.submoduleStatus !== undefined &&
+        !appStatus.submoduleStatus.commitChanged
+        ? DiffSelectionType.None
+        : DiffSelectionType.All;
+    const selection = DiffSelection.fromInitialSelection(initialSelectionType);
+    files.set(entry.path, new WorkingDirectoryFileChange(entry.path, appStatus, selection));
+    return files;
+}
+/**
+ * Update status header based on the current header entry.
+ * Reducer.
+ */
+function parseStatusHeader(results, header) {
+    let { currentBranch, currentUpstreamBranch, currentTip, branchAheadBehind, match, } = results;
+    const value = header.value;
+    // This intentionally does not match branch.oid initial
+    if ((match = value.match(/^branch\.oid ([a-f0-9]+)$/))) {
+        currentTip = match[1];
+    }
+    else if ((match = value.match(/^branch.head (.*)/))) {
+        if (match[1] !== '(detached)') {
+            currentBranch = match[1];
+        }
+    }
+    else if ((match = value.match(/^branch.upstream (.*)/))) {
+        currentUpstreamBranch = match[1];
+    }
+    else if ((match = value.match(/^branch.ab \+(\d+) -(\d+)$/))) {
+        const ahead = parseInt(match[1], 10);
+        const behind = parseInt(match[2], 10);
+        if (!isNaN(ahead) && !isNaN(behind)) {
+            branchAheadBehind = { ahead, behind };
+        }
+    }
+    return {
+        currentBranch,
+        currentUpstreamBranch,
+        currentTip,
+        branchAheadBehind,
+        match,
+    };
+}
+async function getMergeConflictDetails(repository, conflictedFilesInIndex) {
+    const conflictCountsByPath = await getFilesWithConflictMarkers(repository.path);
+    const binaryFilePaths = await getBinaryPaths(repository, 'MERGE_HEAD', conflictedFilesInIndex);
+    return {
+        conflictCountsByPath,
+        binaryFilePaths,
+    };
+}
+async function getRebaseConflictDetails(repository, conflictedFilesInIndex) {
+    const conflictCountsByPath = await getFilesWithConflictMarkers(repository.path);
+    const binaryFilePaths = await getBinaryPaths(repository, 'REBASE_HEAD', conflictedFilesInIndex);
+    return {
+        conflictCountsByPath,
+        binaryFilePaths,
+    };
+}
+/**
+ * We need to do these operations to detect conflicts that were the result
+ * of popping a stash into the index
+ */
+async function getWorkingDirectoryConflictDetails(repository, conflictedFilesInIndex) {
+    const conflictCountsByPath = await getFilesWithConflictMarkers(repository.path);
+    let binaryFilePaths = [];
+    try {
+        // its totally fine if HEAD doesn't exist, which throws an error
+        binaryFilePaths = await getBinaryPaths(repository, 'HEAD', conflictedFilesInIndex);
+    }
+    catch (error) { }
+    return {
+        conflictCountsByPath,
+        binaryFilePaths,
+    };
+}
+/**
+ * gets the conflicted files count and binary file paths in a given repository.
+ * for computing an `IStatusResult`.
+ *
+ * @param repository to get details from
+ * @param mergeHeadFound whether a merge conflict has been detected
+ * @param conflictedFilesInIndex all files marked as being conflicted in the
+ *                               index. Used to check for files using the binary
+ *                               merge driver and whether it looks like a stash
+ *                               has introduced conflicts
+ * @param rebaseInternalState details about the current rebase operation (if
+ * found)
+ */
+async function getConflictDetails(repository, mergeHeadFound, conflictedFilesInIndex, rebaseInternalState) {
+    try {
+        if (mergeHeadFound) {
+            return await getMergeConflictDetails(repository, conflictedFilesInIndex);
+        }
+        if (rebaseInternalState !== null) {
+            return await getRebaseConflictDetails(repository, conflictedFilesInIndex);
+        }
+        // If there's conflicted files in the index but we don't have a merge head
+        // or a rebase internal state, then we're likely in a situation where a
+        // stash has introduced conflicts
+        if (conflictedFilesInIndex.length > 0) {
+            return await getWorkingDirectoryConflictDetails(repository, conflictedFilesInIndex);
+        }
+    }
+    catch (error) {
+        console.error('Unexpected error from git operations in getConflictDetails', error);
+    }
+    return {
+        conflictCountsByPath: new Map(),
+        binaryFilePaths: new Array(),
+    };
+}
+//# sourceMappingURL=status.js.map

package/dist/git/status.js.map

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

package/dist/git/submodule.d.ts

@@ -0,0 +1,20 @@
+import { Repository } from '../models/repository.js';
+import { SubmoduleEntry } from '../models/submodule.js';
+import { IRemote } from '../models/remote.js';
+import { Progress } from '../models/progress.js';
+/**
+ * Update submodules after a git operation.
+ *
+ * @param repository - The repository in which to update submodules
+ * @param remote - The remote for environment setup (can be null)
+ * @param progressCallback - An optional function which will be invoked
+ *                           with information about the current progress
+ *                           of the submodule update operation.
+ * @param progressKind - The kind of progress event ('checkout', 'pull', etc.)
+ * @param title - The title to use for progress reporting
+ * @param targetOrRemote - The target (for checkout) or remote name (for pull)
+ * @param allowFileProtocol - Whether to allow file:// protocol for submodules
+ */
+export declare function updateSubmodulesAfterOperation<T extends Progress>(repository: Repository, remote: IRemote | null, progressCallback: ((progress: T) => void) | undefined, progressKind: T['kind'], title: string, targetOrRemote: string, allowFileProtocol: boolean): Promise<void>;
+export declare function listSubmodules(repository: Repository): Promise<ReadonlyArray<SubmoduleEntry>>;
+export declare function resetSubmodulePaths(repository: Repository, paths: ReadonlyArray<string>): Promise<void>;