git-chopstick-core 0.1.1 → 0.1.2

package/dist/models/diff/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/models/diff/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA;AAC9B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,qBAAqB,CAAA;AACnC,cAAc,YAAY,CAAA;AAC1B,cAAc,eAAe,CAAA;AAC7B,cAAc,iBAAiB,CAAA"}

package/dist/models/diff/raw-diff.d.ts

@@ -0,0 +1,32 @@
+import { DiffLine } from './diff-line.js';
+export declare enum DiffHunkExpansionType {
+    None = "None",
+    Up = "Up",
+    Down = "Down",
+    Both = "Both",
+    Short = "Short"
+}
+export declare class DiffHunk {
+    readonly header: DiffHunkHeader;
+    readonly lines: ReadonlyArray<DiffLine>;
+    readonly unifiedDiffStart: number;
+    readonly unifiedDiffEnd: number;
+    readonly expansionType: DiffHunkExpansionType;
+    constructor(header: DiffHunkHeader, lines: ReadonlyArray<DiffLine>, unifiedDiffStart: number, unifiedDiffEnd: number, expansionType: DiffHunkExpansionType);
+}
+export declare class DiffHunkHeader {
+    readonly oldStartLine: number;
+    readonly oldLineCount: number;
+    readonly newStartLine: number;
+    readonly newLineCount: number;
+    constructor(oldStartLine: number, oldLineCount: number, newStartLine: number, newLineCount: number);
+    toDiffLineRepresentation(): string;
+}
+export interface IRawDiff {
+    readonly header: string;
+    readonly contents: string;
+    readonly hunks: ReadonlyArray<DiffHunk>;
+    readonly isBinary: boolean;
+    readonly maxLineNumber: number;
+    readonly hasHiddenBidiChars: boolean;
+}

package/dist/models/diff/raw-diff.js

@@ -0,0 +1,38 @@
+export var DiffHunkExpansionType;
+(function (DiffHunkExpansionType) {
+    DiffHunkExpansionType["None"] = "None";
+    DiffHunkExpansionType["Up"] = "Up";
+    DiffHunkExpansionType["Down"] = "Down";
+    DiffHunkExpansionType["Both"] = "Both";
+    DiffHunkExpansionType["Short"] = "Short";
+})(DiffHunkExpansionType || (DiffHunkExpansionType = {}));
+export class DiffHunk {
+    header;
+    lines;
+    unifiedDiffStart;
+    unifiedDiffEnd;
+    expansionType;
+    constructor(header, lines, unifiedDiffStart, unifiedDiffEnd, expansionType) {
+        this.header = header;
+        this.lines = lines;
+        this.unifiedDiffStart = unifiedDiffStart;
+        this.unifiedDiffEnd = unifiedDiffEnd;
+        this.expansionType = expansionType;
+    }
+}
+export class DiffHunkHeader {
+    oldStartLine;
+    oldLineCount;
+    newStartLine;
+    newLineCount;
+    constructor(oldStartLine, oldLineCount, newStartLine, newLineCount) {
+        this.oldStartLine = oldStartLine;
+        this.oldLineCount = oldLineCount;
+        this.newStartLine = newStartLine;
+        this.newLineCount = newLineCount;
+    }
+    toDiffLineRepresentation() {
+        return `@@ -${this.oldStartLine},${this.oldLineCount} +${this.newStartLine},${this.newLineCount} @@`;
+    }
+}
+//# sourceMappingURL=raw-diff.js.map

package/dist/models/diff/raw-diff.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"raw-diff.js","sourceRoot":"","sources":["../../../src/models/diff/raw-diff.ts"],"names":[],"mappings":"AAEA,MAAM,CAAN,IAAY,qBAMX;AAND,WAAY,qBAAqB;IAC/B,sCAAa,CAAA;IACb,kCAAS,CAAA;IACT,sCAAa,CAAA;IACb,sCAAa,CAAA;IACb,wCAAe,CAAA;AACjB,CAAC,EANW,qBAAqB,KAArB,qBAAqB,QAMhC;AAED,MAAM,OAAO,QAAQ;IAED;IACA;IACA;IACA;IACA;IALlB,YACkB,MAAsB,EACtB,KAA8B,EAC9B,gBAAwB,EACxB,cAAsB,EACtB,aAAoC;QAJpC,WAAM,GAAN,MAAM,CAAgB;QACtB,UAAK,GAAL,KAAK,CAAyB;QAC9B,qBAAgB,GAAhB,gBAAgB,CAAQ;QACxB,mBAAc,GAAd,cAAc,CAAQ;QACtB,kBAAa,GAAb,aAAa,CAAuB;IACnD,CAAC;CACL;AAED,MAAM,OAAO,cAAc;IAEP;IACA;IACA;IACA;IAJlB,YACkB,YAAoB,EACpB,YAAoB,EACpB,YAAoB,EACpB,YAAoB;QAHpB,iBAAY,GAAZ,YAAY,CAAQ;QACpB,iBAAY,GAAZ,YAAY,CAAQ;QACpB,iBAAY,GAAZ,YAAY,CAAQ;QACpB,iBAAY,GAAZ,YAAY,CAAQ;IACnC,CAAC;IAEG,wBAAwB;QAC7B,OAAO,OAAO,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,YAAY,KAAK,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,YAAY,KAAK,CAAA;IACtG,CAAC;CACF"}

package/dist/models/git-author.d.ts

@@ -0,0 +1,7 @@
+export declare class GitAuthor {
+    readonly name: string;
+    readonly email: string;
+    static parse(value: string): GitAuthor | null;
+    constructor(name: string, email: string);
+    toString(): string;
+}

package/dist/models/git-author.js

@@ -0,0 +1,18 @@
+export class GitAuthor {
+    name;
+    email;
+    static parse(value) {
+        const m = value.match(/^(.*?)\s*<(.+?)>\s*$/);
+        if (!m)
+            return null;
+        return new GitAuthor(m[1], m[2]);
+    }
+    constructor(name, email) {
+        this.name = name;
+        this.email = email;
+    }
+    toString() {
+        return `${this.name} <${this.email}>`;
+    }
+}
+//# sourceMappingURL=git-author.js.map

package/dist/models/git-author.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"git-author.js","sourceRoot":"","sources":["../../src/models/git-author.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,SAAS;IAQF;IACA;IARX,MAAM,CAAC,KAAK,CAAC,KAAa;QAC/B,MAAM,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAA;QAC7C,IAAI,CAAC,CAAC;YAAE,OAAO,IAAI,CAAA;QACnB,OAAO,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAClC,CAAC;IAED,YACkB,IAAY,EACZ,KAAa;QADb,SAAI,GAAJ,IAAI,CAAQ;QACZ,UAAK,GAAL,KAAK,CAAQ;IAC5B,CAAC;IAEG,QAAQ;QACb,OAAO,GAAG,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,KAAK,GAAG,CAAA;IACvC,CAAC;CACF"}

package/dist/models/index.d.ts

@@ -0,0 +1,21 @@
+export * from './branch.js';
+export * from './cherry-pick.js';
+export * from './clone-options.js';
+export * from './commit.js';
+export * from './commit-identity.js';
+export * from './git-author.js';
+export * from './manual-conflict-resolution.js';
+export * from './merge.js';
+export * from './multi-commit-operation.js';
+export * from './progress.js';
+export * from './remote.js';
+export * from './repository.js';
+export * from './stash-entry.js';
+export * from './worktree.js';
+export * from './diff/index.js';
+export { ComputedAction } from './computed-action.js';
+export type { RebaseInternalState, RebaseProgressOptions } from './rebase.js';
+export { AppFileStatusKind, CommittedFileChange, WorkingDirectoryFileChange, WorkingDirectoryStatus, FileChange, isConflictedFileStatus, isConflictWithMarkers, GitStatusEntry, UnmergedEntrySummary, } from './status.js';
+export type { AppFileStatus } from './status.js';
+export type { SubmoduleStatus } from './status.js';
+export type { SubmoduleEntry } from './submodule.js';

package/dist/models/index.js

@@ -0,0 +1,20 @@
+export * from './branch.js';
+export * from './cherry-pick.js';
+export * from './clone-options.js';
+export * from './commit.js';
+export * from './commit-identity.js';
+export * from './git-author.js';
+export * from './manual-conflict-resolution.js';
+export * from './merge.js';
+export * from './multi-commit-operation.js';
+export * from './progress.js';
+export * from './remote.js';
+export * from './repository.js';
+export * from './stash-entry.js';
+export * from './worktree.js';
+export * from './diff/index.js';
+// computed-action and rebase both export ComputedAction — use explicit exports
+export { ComputedAction } from './computed-action.js';
+// status and submodule both export SubmoduleStatus — use explicit exports
+export { AppFileStatusKind, CommittedFileChange, WorkingDirectoryFileChange, WorkingDirectoryStatus, FileChange, isConflictedFileStatus, isConflictWithMarkers, GitStatusEntry, UnmergedEntrySummary, } from './status.js';
+//# sourceMappingURL=index.js.map

package/dist/models/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/models/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA;AAC3B,cAAc,kBAAkB,CAAA;AAChC,cAAc,oBAAoB,CAAA;AAClC,cAAc,aAAa,CAAA;AAC3B,cAAc,sBAAsB,CAAA;AACpC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,iCAAiC,CAAA;AAC/C,cAAc,YAAY,CAAA;AAC1B,cAAc,6BAA6B,CAAA;AAC3C,cAAc,eAAe,CAAA;AAC7B,cAAc,aAAa,CAAA;AAC3B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,kBAAkB,CAAA;AAChC,cAAc,eAAe,CAAA;AAC7B,cAAc,iBAAiB,CAAA;AAE/B,+EAA+E;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAGrD,0EAA0E;AAC1E,OAAO,EACL,iBAAiB,EACjB,mBAAmB,EACnB,0BAA0B,EAC1B,sBAAsB,EACtB,UAAU,EACV,sBAAsB,EACtB,qBAAqB,EACrB,cAAc,EACd,oBAAoB,GACrB,MAAM,aAAa,CAAA"}

package/dist/models/manual-conflict-resolution.d.ts

@@ -0,0 +1,4 @@
+export declare enum ManualConflictResolution {
+    theirs = "theirs",
+    ours = "ours"
+}

package/dist/models/manual-conflict-resolution.js

@@ -0,0 +1,6 @@
+export var ManualConflictResolution;
+(function (ManualConflictResolution) {
+    ManualConflictResolution["theirs"] = "theirs";
+    ManualConflictResolution["ours"] = "ours";
+})(ManualConflictResolution || (ManualConflictResolution = {}));
+//# sourceMappingURL=manual-conflict-resolution.js.map

package/dist/models/manual-conflict-resolution.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"manual-conflict-resolution.js","sourceRoot":"","sources":["../../src/models/manual-conflict-resolution.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,wBAGX;AAHD,WAAY,wBAAwB;IAClC,6CAAiB,CAAA;IACjB,yCAAa,CAAA;AACf,CAAC,EAHW,wBAAwB,KAAxB,wBAAwB,QAGnC"}

package/dist/models/merge.d.ts

@@ -0,0 +1,6 @@
+export type MergeTreeResult = {
+    readonly sha: string;
+    readonly tree: string;
+    readonly conflicted: boolean;
+    readonly mergeBase: string;
+};

package/dist/models/merge.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=merge.js.map

package/dist/models/merge.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../src/models/merge.ts"],"names":[],"mappings":""}

package/dist/models/multi-commit-operation.d.ts

@@ -0,0 +1,6 @@
+export declare enum MultiCommitOperationKind {
+    Squash = "Squash",
+    Reorder = "Reorder",
+    CherryPick = "CherryPick",
+    Amend = "Amend"
+}

package/dist/models/multi-commit-operation.js

@@ -0,0 +1,8 @@
+export var MultiCommitOperationKind;
+(function (MultiCommitOperationKind) {
+    MultiCommitOperationKind["Squash"] = "Squash";
+    MultiCommitOperationKind["Reorder"] = "Reorder";
+    MultiCommitOperationKind["CherryPick"] = "CherryPick";
+    MultiCommitOperationKind["Amend"] = "Amend";
+})(MultiCommitOperationKind || (MultiCommitOperationKind = {}));
+//# sourceMappingURL=multi-commit-operation.js.map

package/dist/models/multi-commit-operation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"multi-commit-operation.js","sourceRoot":"","sources":["../../src/models/multi-commit-operation.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,wBAKX;AALD,WAAY,wBAAwB;IAClC,6CAAiB,CAAA;IACjB,+CAAmB,CAAA;IACnB,qDAAyB,CAAA;IACzB,2CAAe,CAAA;AACjB,CAAC,EALW,wBAAwB,KAAxB,wBAAwB,QAKnC"}

package/dist/models/progress.d.ts

@@ -0,0 +1,41 @@
+interface IProgress {
+    readonly value: number;
+    readonly title?: string;
+    readonly description?: string;
+}
+export interface IGenericProgress extends IProgress {
+    kind: 'generic';
+}
+export interface ICheckoutProgress extends IProgress {
+    kind: 'checkout';
+    readonly target: string;
+    readonly description: string;
+}
+export interface IFetchProgress extends IProgress {
+    kind: 'fetch';
+    readonly remote: string;
+}
+export interface IPullProgress extends IProgress {
+    kind: 'pull';
+    readonly remote: string;
+}
+export interface IPushProgress extends IProgress {
+    kind: 'push';
+    readonly remote: string;
+    readonly branch: string;
+}
+export interface ICloneProgress extends IProgress {
+    kind: 'clone';
+}
+export interface IRevertProgress extends IProgress {
+    kind: 'revert';
+}
+export interface IMultiCommitOperationProgress extends IProgress {
+    readonly kind: 'multiCommitOperation';
+    readonly currentCommitSummary: string;
+    readonly position: number;
+    readonly totalCommitCount: number;
+}
+export type Progress = IGenericProgress | ICheckoutProgress | IFetchProgress | IPullProgress | IPushProgress | IRevertProgress | IMultiCommitOperationProgress;
+export declare function clampProgress<T extends Progress>(minimum: number, maximum: number, progressCallback: (progress: T) => void): (progress: T) => void;
+export {};

package/dist/models/progress.js

@@ -0,0 +1,7 @@
+export function clampProgress(minimum, maximum, progressCallback) {
+    return (progress) => progressCallback({
+        ...progress,
+        value: minimum + progress.value * (maximum - minimum),
+    });
+}
+//# sourceMappingURL=progress.js.map

package/dist/models/progress.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"progress.js","sourceRoot":"","sources":["../../src/models/progress.ts"],"names":[],"mappings":"AAwDA,MAAM,UAAU,aAAa,CAC3B,OAAe,EACf,OAAe,EACf,gBAAuC;IAEvC,OAAO,CAAC,QAAW,EAAE,EAAE,CACrB,gBAAgB,CAAC;QACf,GAAG,QAAQ;QACX,KAAK,EAAE,OAAO,GAAG,QAAQ,CAAC,KAAK,GAAG,CAAC,OAAO,GAAG,OAAO,CAAC;KACtD,CAAC,CAAA;AACN,CAAC"}

package/dist/models/rebase.d.ts

@@ -0,0 +1,17 @@
+import { IMultiCommitOperationProgress } from './progress.js';
+import { CommitOneLine } from './commit.js';
+export type RebaseInternalState = {
+    readonly targetBranch: string;
+    readonly baseBranchTip: string;
+    readonly originalBranchTip: string;
+};
+export type RebaseProgressOptions = {
+    commits: ReadonlyArray<CommitOneLine>;
+    progressCallback: (progress: IMultiCommitOperationProgress) => void;
+};
+export declare enum ComputedAction {
+    Clean = "Clean",
+    Conflicts = "Conflicts",
+    Invalid = "Invalid",
+    Loading = "Loading"
+}

package/dist/models/rebase.js

@@ -0,0 +1,8 @@
+export var ComputedAction;
+(function (ComputedAction) {
+    ComputedAction["Clean"] = "Clean";
+    ComputedAction["Conflicts"] = "Conflicts";
+    ComputedAction["Invalid"] = "Invalid";
+    ComputedAction["Loading"] = "Loading";
+})(ComputedAction || (ComputedAction = {}));
+//# sourceMappingURL=rebase.js.map

package/dist/models/rebase.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rebase.js","sourceRoot":"","sources":["../../src/models/rebase.ts"],"names":[],"mappings":"AAcA,MAAM,CAAN,IAAY,cAKX;AALD,WAAY,cAAc;IACxB,iCAAe,CAAA;IACf,yCAAuB,CAAA;IACvB,qCAAmB,CAAA;IACnB,qCAAmB,CAAA;AACrB,CAAC,EALW,cAAc,KAAd,cAAc,QAKzB"}

package/dist/models/remote.d.ts

@@ -0,0 +1,5 @@
+export interface IRemote {
+    readonly name: string;
+    readonly url: string;
+}
+export declare function remoteEquals(x: IRemote | null, y: IRemote | null): boolean;

package/dist/models/remote.js

@@ -0,0 +1,8 @@
+export function remoteEquals(x, y) {
+    if (x === y)
+        return true;
+    if (x === null || y === null)
+        return false;
+    return x.name === y.name && x.url === y.url;
+}
+//# sourceMappingURL=remote.js.map

package/dist/models/remote.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"remote.js","sourceRoot":"","sources":["../../src/models/remote.ts"],"names":[],"mappings":"AAKA,MAAM,UAAU,YAAY,CAAC,CAAiB,EAAE,CAAiB;IAC/D,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,IAAI,CAAA;IACxB,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,IAAI;QAAE,OAAO,KAAK,CAAA;IAC1C,OAAO,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,CAAA;AAC7C,CAAC"}

package/dist/models/repository.d.ts

@@ -0,0 +1,7 @@
+export declare class Repository {
+    readonly path: string;
+    readonly id: number;
+    readonly name: string;
+    constructor(path: string, id: number);
+    get resolvedGitDir(): string;
+}

package/dist/models/repository.js

@@ -0,0 +1,15 @@
+import * as Path from 'path';
+export class Repository {
+    path;
+    id;
+    name;
+    constructor(path, id) {
+        this.path = path;
+        this.id = id;
+        this.name = Path.basename(path);
+    }
+    get resolvedGitDir() {
+        return Path.join(this.path, '.git');
+    }
+}
+//# sourceMappingURL=repository.js.map

package/dist/models/repository.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"repository.js","sourceRoot":"","sources":["../../src/models/repository.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAA;AAE5B,MAAM,OAAO,UAAU;IAIH;IACA;IAJF,IAAI,CAAQ;IAE5B,YACkB,IAAY,EACZ,EAAU;QADV,SAAI,GAAJ,IAAI,CAAQ;QACZ,OAAE,GAAF,EAAE,CAAQ;QAE1B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;IACjC,CAAC;IAED,IAAW,cAAc;QACvB,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IACrC,CAAC;CACF"}

package/dist/models/stash-entry.d.ts

@@ -0,0 +1,20 @@
+import { CommittedFileChange } from './status.js';
+export interface IStashEntry {
+    readonly name: string;
+    readonly branchName: string;
+    readonly stashSha: string;
+    readonly files: StashedFileChanges;
+    readonly tree: string;
+    readonly parents: ReadonlyArray<string>;
+}
+export declare enum StashedChangesLoadStates {
+    NotLoaded = "NotLoaded",
+    Loading = "Loading",
+    Loaded = "Loaded"
+}
+export type StashedFileChanges = {
+    readonly kind: StashedChangesLoadStates.NotLoaded | StashedChangesLoadStates.Loading;
+} | {
+    readonly kind: StashedChangesLoadStates.Loaded;
+    readonly files: ReadonlyArray<CommittedFileChange>;
+};

package/dist/models/stash-entry.js

@@ -0,0 +1,7 @@
+export var StashedChangesLoadStates;
+(function (StashedChangesLoadStates) {
+    StashedChangesLoadStates["NotLoaded"] = "NotLoaded";
+    StashedChangesLoadStates["Loading"] = "Loading";
+    StashedChangesLoadStates["Loaded"] = "Loaded";
+})(StashedChangesLoadStates || (StashedChangesLoadStates = {}));
+//# sourceMappingURL=stash-entry.js.map

package/dist/models/stash-entry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"stash-entry.js","sourceRoot":"","sources":["../../src/models/stash-entry.ts"],"names":[],"mappings":"AAWA,MAAM,CAAN,IAAY,wBAIX;AAJD,WAAY,wBAAwB;IAClC,mDAAuB,CAAA;IACvB,+CAAmB,CAAA;IACnB,6CAAiB,CAAA;AACnB,CAAC,EAJW,wBAAwB,KAAxB,wBAAwB,QAInC"}

package/dist/models/status.d.ts

@@ -0,0 +1,166 @@
+import { DiffSelection } from './diff/index.js';
+export declare enum GitStatusEntry {
+    Modified = "M",
+    Added = "A",
+    Deleted = "D",
+    Renamed = "R",
+    Copied = "C",
+    Unchanged = ".",
+    Untracked = "?",
+    Ignored = "!",
+    UpdatedButUnmerged = "U"
+}
+export declare enum AppFileStatusKind {
+    New = "New",
+    Modified = "Modified",
+    Deleted = "Deleted",
+    Copied = "Copied",
+    Renamed = "Renamed",
+    Conflicted = "Conflicted",
+    Untracked = "Untracked"
+}
+export type PlainFileStatus = {
+    kind: AppFileStatusKind.New | AppFileStatusKind.Modified | AppFileStatusKind.Deleted;
+    submoduleStatus?: SubmoduleStatus;
+};
+export type CopiedOrRenamedFileStatus = {
+    kind: AppFileStatusKind.Copied | AppFileStatusKind.Renamed;
+    oldPath: string;
+    renameIncludesModifications: boolean;
+    submoduleStatus?: SubmoduleStatus;
+};
+export type ConflictsWithMarkers = {
+    kind: AppFileStatusKind.Conflicted;
+    entry: TextConflictEntry;
+    conflictMarkerCount: number;
+    submoduleStatus?: SubmoduleStatus;
+};
+export type ManualConflict = {
+    kind: AppFileStatusKind.Conflicted;
+    entry: ManualConflictEntry;
+    submoduleStatus?: SubmoduleStatus;
+};
+export type ConflictedFileStatus = ConflictsWithMarkers | ManualConflict;
+export declare function isConflictedFileStatus(appFileStatus: AppFileStatus): appFileStatus is ConflictedFileStatus;
+export declare function isConflictWithMarkers(conflictedFileStatus: ConflictedFileStatus): conflictedFileStatus is ConflictsWithMarkers;
+export type UntrackedFileStatus = {
+    kind: AppFileStatusKind.Untracked;
+    submoduleStatus?: SubmoduleStatus;
+};
+export type AppFileStatus = PlainFileStatus | CopiedOrRenamedFileStatus | ConflictedFileStatus | UntrackedFileStatus;
+export type SubmoduleStatus = {
+    readonly commitChanged: boolean;
+    readonly modifiedChanges: boolean;
+    readonly untrackedChanges: boolean;
+};
+type OrdinaryEntry = {
+    readonly kind: 'ordinary';
+    readonly type: 'added' | 'modified' | 'deleted';
+    readonly index?: GitStatusEntry;
+    readonly workingTree?: GitStatusEntry;
+    readonly submoduleStatus?: SubmoduleStatus;
+};
+type RenamedOrCopiedEntry = {
+    readonly kind: 'renamed' | 'copied';
+    readonly index?: GitStatusEntry;
+    readonly workingTree?: GitStatusEntry;
+    readonly submoduleStatus?: SubmoduleStatus;
+    readonly renameOrCopyScore?: number;
+};
+export declare enum UnmergedEntrySummary {
+    AddedByUs = "added-by-us",
+    DeletedByUs = "deleted-by-us",
+    AddedByThem = "added-by-them",
+    DeletedByThem = "deleted-by-them",
+    BothDeleted = "both-deleted",
+    BothAdded = "both-added",
+    BothModified = "both-modified"
+}
+type TextConflictDetails = {
+    readonly action: UnmergedEntrySummary.BothAdded;
+    readonly us: GitStatusEntry.Added;
+    readonly them: GitStatusEntry.Added;
+} | {
+    readonly action: UnmergedEntrySummary.BothModified;
+    readonly us: GitStatusEntry.UpdatedButUnmerged;
+    readonly them: GitStatusEntry.UpdatedButUnmerged;
+};
+type TextConflictEntry = {
+    readonly kind: 'conflicted';
+    readonly submoduleStatus?: SubmoduleStatus;
+} & TextConflictDetails;
+type ManualConflictDetails = {
+    readonly submoduleStatus?: SubmoduleStatus;
+} & ({
+    readonly action: UnmergedEntrySummary.BothAdded;
+    readonly us: GitStatusEntry.Added;
+    readonly them: GitStatusEntry.Added;
+} | {
+    readonly action: UnmergedEntrySummary.BothModified;
+    readonly us: GitStatusEntry.UpdatedButUnmerged;
+    readonly them: GitStatusEntry.UpdatedButUnmerged;
+} | {
+    readonly action: UnmergedEntrySummary.AddedByUs;
+    readonly us: GitStatusEntry.Added;
+    readonly them: GitStatusEntry.UpdatedButUnmerged;
+} | {
+    readonly action: UnmergedEntrySummary.DeletedByThem;
+    readonly us: GitStatusEntry.UpdatedButUnmerged;
+    readonly them: GitStatusEntry.Deleted;
+} | {
+    readonly action: UnmergedEntrySummary.AddedByThem;
+    readonly us: GitStatusEntry.UpdatedButUnmerged;
+    readonly them: GitStatusEntry.Added;
+} | {
+    readonly action: UnmergedEntrySummary.DeletedByUs;
+    readonly us: GitStatusEntry.Deleted;
+    readonly them: GitStatusEntry.UpdatedButUnmerged;
+} | {
+    readonly action: UnmergedEntrySummary.BothDeleted;
+    readonly us: GitStatusEntry.Deleted;
+    readonly them: GitStatusEntry.Deleted;
+});
+type ManualConflictEntry = {
+    readonly kind: 'conflicted';
+    readonly submoduleStatus?: SubmoduleStatus;
+} & ManualConflictDetails;
+export type UnmergedEntry = TextConflictEntry | ManualConflictEntry;
+type UntrackedEntry = {
+    readonly kind: 'untracked';
+    readonly submoduleStatus?: SubmoduleStatus;
+};
+export type FileEntry = OrdinaryEntry | RenamedOrCopiedEntry | UnmergedEntry | UntrackedEntry;
+export declare class FileChange {
+    readonly path: string;
+    readonly status: AppFileStatus;
+    readonly id: string;
+    constructor(path: string, status: AppFileStatus);
+    isDeleted(): boolean;
+    isNew(): boolean;
+    isModified(): boolean;
+    isUntracked(): boolean;
+}
+export declare class WorkingDirectoryFileChange extends FileChange {
+    readonly selection: DiffSelection;
+    constructor(path: string, status: AppFileStatus, selection: DiffSelection);
+    withIncludeAll(include: boolean): WorkingDirectoryFileChange;
+    withSelection(selection: DiffSelection): WorkingDirectoryFileChange;
+    isIncludedInCommit(): boolean;
+    isExcludedFromCommit(): boolean;
+}
+export declare class CommittedFileChange extends FileChange {
+    readonly commitish: string;
+    readonly parentCommitish: string;
+    constructor(path: string, status: AppFileStatus, commitish: string, parentCommitish: string);
+}
+export declare class WorkingDirectoryStatus {
+    readonly files: ReadonlyArray<WorkingDirectoryFileChange>;
+    readonly includeAll: boolean | null;
+    static fromFiles(files: ReadonlyArray<WorkingDirectoryFileChange>): WorkingDirectoryStatus;
+    private readonly fileIxById;
+    private constructor();
+    withIncludeAllFiles(includeAll: boolean): WorkingDirectoryStatus;
+    findFileWithID(id: string): WorkingDirectoryFileChange | null;
+    findFileIndexByID(id: string): number;
+}
+export {};