git-chopstick-core 0.1.1 → 0.1.2

package/README.md

@@ -1,62 +1,354 @@
 # git-chopstick-core
 
-A standalone Git backend library extracted from [GitHub Desktop](https://github.com/desktop/desktop). Provides TypeScript-first wrappers around the Git CLI for repository operations.
+A standalone Git backend library extracted from [GitHub Desktop](https://github.com/desktop/desktop). Provides TypeScript-first wrappers around the Git CLI for repository operations — no native bindings, no Electron dependencies, just `child_process.spawn('git', ...)`.
 
 ## Features
 
-- **60+ Git command wrappers** — status, diff, log, branch, commit, merge, rebase, stash, worktree, fetch, push, pull, cherry-pick, and more
-- **Full dugite replacement** — `exec.ts` uses direct `child_process.spawn('git', ...)` instead of the dugite npm package
+- **45+ Git command wrappers** — every major operation: status, diff, log, branch (CRUD), commit, merge, rebase, stash, worktree, fetch, push, pull, cherry-pick, revert, tag, clone, init, clean, config, submodule, LFS, and more
+- **Full dugite replacement** — direct `child_process.spawn('git', ...)` with 50+ typed error codes
 - **Pure CLI-based** — works with the user's installed Git, no native bindings
-- **TypeScript-first** — complete type definitions for all Git models and operations
-- **Zero Electron dependencies** — can be used in Node.js or Bun
+- **TypeScript-first** — complete type definitions for all models and operations (`strict: true`)
+- **Zero Electron dependencies** — works in Node.js ≥18 or Bun
+- **Barrel exports** — import everything from a single entry point
 
-## Usage
+## Installation
 
-### As a local dependency
+```bash
+npm install git-chopstick-core
+# or via file path for local development:
+npm install file:../path/to/git-chopstick-core
+```
+
+> **Note:** Not yet published on npm. Use a `file:` dependency or git URL.
+
+## Quick Start
+
+```typescript
+import { Repository, getStatus, GitError } from 'git-chopstick-core'
+
+const repo = new Repository('/path/to/repo', 1)
+
+try {
+  const status = await getStatus(repo)
+  console.log(`🌿 ${status.currentBranch}`)
+  console.log(`📝 ${status.workingDirectory.files.length} changed files`)
+} catch (e) {
+  if (e instanceof GitError) {
+    console.error(`Git error: ${e.message}`)
+  }
+}
+```
+
+## Usage Examples
+
+### Repository Status
 
 ```typescript
-import { Repository } from 'git-chopstick-core/src/models/repository.js'
-import { getStatus } from 'git-chopstick-core/src/git/status.js'
+import { Repository, getStatus } from 'git-chopstick-core'
 
 const repo = new Repository('/path/to/repo', 1)
 const status = await getStatus(repo)
 
-console.log(`Branch: ${status.currentBranch}`)
-console.log(`Changed files: ${status.workingDirectory.files.length}`)
+if (!status) {
+  console.log('Not a git repository')
+  process.exit(1)
+}
+
+console.log(`Branch: ${status.currentBranch ?? '(detached)'}`)
+console.log(`Upstream: ${status.currentUpstreamBranch ?? 'none'}`)
+
+if (status.branchAheadBehind) {
+  console.log(`Ahead: ${status.branchAheadBehind.ahead}`)
+  console.log(`Behind: ${status.branchAheadBehind.behind}`)
+}
+
+// Working directory changes
+for (const file of status.workingDirectory.files) {
+  console.log(`${file.status.kind}: ${file.path}`)
+}
+
+// Conflict detection
+if (status.doConflictedFilesExist) {
+  console.log('⚠️  Merge conflicts detected')
+}
+if (status.rebaseInternalState) {
+  console.log(`🔄 Rebase onto ${status.rebaseInternalState.targetBranch}`)
+}
 ```
 
-Install via `file:` dependency in your `package.json`:
-```json
-{
-  "dependencies": {
-    "git-chopstick-core": "file:../path/to/git-core"
-  }
+### Create a Commit
+
+```typescript
+import { Repository, getStatus, createCommit } from 'git-chopstick-core'
+
+const repo = new Repository('/path/to/repo', 1)
+const status = await getStatus(repo)
+
+// Stage and commit all tracked files
+const files = status!.workingDirectory.files
+const sha = await createCommit(repo, 'feat: add new feature', files)
+console.log(`Committed: ${sha}`)
+```
+
+### Branch Operations
+
+```typescript
+import {
+  Repository, Branch, BranchType, createBranch,
+  deleteLocalBranch, renameBranch, getBranches
+} from 'git-chopstick-core'
+
+const repo = new Repository('/path/to/repo', 1)
+
+// Create a branch
+await createBranch(repo, 'feature/new-feature', 'main')
+
+// List all branches
+const branches = await getBranches(repo)
+for (const branch of branches) {
+  const icon = branch.type === BranchType.Local ? '🌿' : '🌐'
+  console.log(`${icon} ${branch.name}`)
 }
+
+// Rename
+await renameBranch(repo, branches[0], 'feature/renamed')
+
+// Delete
+await deleteLocalBranch(repo, 'feature/old-branch')
 ```
 
-### From within this repo
+### Merge
 
-```bash
-npx tsx examples/get-status.ts /path/to/repo
+```typescript
+import {
+  Repository, merge, MergeResult,
+  abortMerge, getMergeBase, isMergeHeadSet
+} from 'git-chopstick-core'
+
+const repo = new Repository('/path/to/repo', 1)
+
+const result = await merge(repo, 'feature/new-feature')
+
+switch (result) {
+  case MergeResult.Success:
+    console.log('✓ Merge successful')
+    break
+  case MergeResult.AlreadyUpToDate:
+    console.log('✓ Already up to date')
+    break
+  case MergeResult.Failed:
+    console.log('✗ Merge failed — resolve conflicts')
+    break
+}
 ```
 
+### Push & Pull
+
+```typescript
+import {
+  Repository, push, pull, getRemotes, getStatus
+} from 'git-chopstick-core'
+
+const repo = new Repository('/path/to/repo', 1)
+const [remote] = await getRemotes(repo)
+const status = await getStatus(repo)
+
+// Push current branch
+await push(repo, remote, status!.currentBranch!, null, null)
+
+// Pull from remote
+await pull(repo, remote)
+```
+
+### Error Handling
+
+```typescript
+import {
+  Repository, merge, GitError, GitErrorCodes
+} from 'git-chopstick-core'
+
+const repo = new Repository('/path/to/repo', 1)
+
+try {
+  await merge(repo, 'other-branch')
+} catch (e) {
+  if (e instanceof GitError) {
+    // e.result.gitError is the error code enum
+    switch (e.result.gitError) {
+      case GitErrorCodes.MergeConflicts:
+        console.error('Conflicts need resolution')
+        break
+      case GitErrorCodes.RebaseConflicts:
+        console.error('Rebase conflicts')
+        break
+      case GitErrorCodes.PushNotFastForward:
+        console.error('Push rejected — pull first')
+        break
+      case GitErrorCodes.HTTPSAuthenticationFailed:
+      case GitErrorCodes.SSHAuthenticationFailed:
+        console.error('Authentication failed')
+        break
+      default:
+        console.error(`Git error: ${e.result.gitErrorDescription}`)
+    }
+  }
+}
+```
+
+## API Reference
+
+### Git Operations (`src/git/`)
+
+| Module | Key Exports | Description |
+|--------|-------------|-------------|
+| `add` | `addConflictedFile` | Stage a resolved conflicted file |
+| `apply` | `applyPatchToIndex`, `checkPatch`, `discardChangesFromSelection` | Apply patches to the index |
+| `branch` | `createBranch`, `renameBranch`, `deleteLocalBranch`, `deleteRemoteBranch`, `getBranchNames`, `getBranchesPointedAt`, `getMergedBranches` | Branch CRUD |
+| `checkout` | `checkoutBranch`, `checkoutCommit`, `checkoutPaths`, `checkoutConflictedFile` | Checkout branches/commits/files |
+| `checkout-index` | `checkoutIndex` | Checkout files from the index |
+| `cherry-pick` | `cherryPick`, `continueCherryPick`, `abortCherryPick`, `getCherryPickSnapshot` | Cherry-pick commits |
+| `clean` | `cleanUntrackedFiles` | Remove untracked files |
+| `clone` | `clone` | Clone a repository |
+| `commit` | `createCommit`, `createMergeCommit` | Create commits |
+| `config` | `getConfigValue`, `getGlobalConfigValue`, `getBooleanConfigValue` | Read git config |
+| `diff` | `getWorkingDirectoryDiff`, `getCommitDiff`, `getBranchMergeBaseDiff`, `getCommitRangeDiff`, `getBinaryPaths` | Diff rendering |
+| `diff-index` | `getIndexChanges` | Compare index with tree |
+| `fetch` | `fetch`, `fetchRefspec`, `fastForwardBranches` | Fetch from remotes |
+| `for-each-ref` | `getBranches`, `getBranchesDifferingFromUpstream` | List refs |
+| `format-patch` | `formatPatch` | Generate patch files |
+| `gitignore` | `readGitIgnoreAtRoot`, `saveGitIgnore`, `appendIgnoreRule`, `escapeGitSpecialCharacters` | Manage .gitignore |
+| `init` | `initGitRepository` | Initialize a repo |
+| `interpret-trailers` | `parseRawUnfoldedTrailers`, `isCoAuthoredByTrailer`, `getTrailerSeparatorCharacters` | Git trailer parsing |
+| `lfs` | `installGlobalLFSFilters`, `isUsingLFS`, `isTrackedByLFS`, `filesNotTrackedByLFS` | Git LFS support |
+| `log` | `getCommits`, `getCommit`, `getChangedFiles`, `getAuthors` | Commit history |
+| `merge` | `merge`, `getMergeBase`, `abortMerge` | Merge branches |
+| `merge-tree` | `determineMergeability` | Test mergeability without merging |
+| `pull` | `pull` | Pull from remote |
+| `push` | `push` | Push to remote |
+| `rebase` | `rebase`, `continueRebase`, `abortRebase`, `rebaseInteractive`, `getRebaseInternalState`, `getRebaseSnapshot` | Rebase operations |
+| `reflog` | `getRecentBranches`, `getBranchCheckouts` | Reflog inspection |
+| `refs` | `formatAsLocalRef`, `getSymbolicRef` | Ref manipulation |
+| `remote` | `getRemotes`, `addRemote`, `removeRemote` | Remote management |
+| `reorder` | `reorder` | Interactive rebase reordering |
+| `reset` | `reset`, `resetPaths`, `unstageAll` | Reset operations |
+| `revert` | `revertCommit` | Revert a commit |
+| `rev-list` | `getAheadBehind`, `getBranchAheadBehind`, `revRange`, `revSymmetricDifference` | Commit range queries |
+| `rev-parse` | `getRepositoryType`, `getUpstreamRefForRef`, `getCurrentUpstreamRef` | Rev parsing |
+| `rm` | `removeConflictedFile` | Remove files |
+| `squash` | `squash` | Interactive rebase squashing |
+| `stage` | `stageManualConflictResolution`, `stageResolvedConflictFiles` | Stage conflict resolutions |
+| `stash` | `getStashes`, `createDesktopStashEntry`, `popStashEntry`, `getStashedFiles`, `dropDesktopStashEntry` | Stash management |
+| `status` | `getStatus` | Repository status |
+| `submodule` | `updateSubmodulesAfterOperation`, `listSubmodules`, `resetSubmodulePaths` | Submodule operations |
+| `tag` | `createTag`, `deleteTag`, `getAllTags` | Tag management |
+| `update-index` | `stageFiles` | Stage files |
+| `update-ref` | `updateRef`, `deleteRef` | Ref updates |
+| `var` | `getAuthorIdentity` | Git var queries |
+| `worktree` | `listWorktrees`, `addWorktree`, `removeWorktree`, `pruneWorktrees`, `getWorktreeCheckedOutBranches` | Worktree management |
+| `worktree-include` | `addWorktreeWithIncludes`, `readWorktreeIncludePatterns` | Worktree with file includes |
+
+### Domain Models (`src/models/`)
+
+| Export | Type | Description |
+|--------|------|-------------|
+| `Repository` | class | Represents a git repository |
+| `Commit` | class | A single commit (sha, summary, body, author, etc.) |
+| `CommitIdentity` | class | Author/committer identity |
+| `Branch` | class | Branch with upstream tracking info |
+| `BranchType` | enum | `Local` or `Remote` |
+| `AppFileStatusKind` | enum | `New`, `Modified`, `Deleted`, `Renamed`, `Copied`, `Conflicted`, `Untracked` |
+| `FileChange` | class | Base file change model |
+| `WorkingDirectoryFileChange` | class | Uncommitted file change with diff selection |
+| `CommittedFileChange` | class | File change from a commit |
+| `WorkingDirectoryStatus` | class | Container for working directory changes |
+| `DiffSelection` / `DiffSelectionType` | class/enum | Partial file staging |
+| `ComputedAction` | enum | `Clean`, `Conflicts`, `Invalid`, `Loading` |
+| `ManualConflictResolution` | enum | `theirs` / `ours` |
+| `MergeResult` / `RebaseResult` / `CherryPickResult` | enum | Operation outcomes |
+
+### Core Types
+
+| Export | Description |
+|--------|-------------|
+| `GitError` (class) | Thrown when a git command fails — catch this |
+| `GitErrorCodes` (enum) | Error code constants — `MergeConflicts`, `PushNotFastForward`, `SSHAuthenticationFailed`, etc. (50+ codes) |
+| `IGitResult` | Full command result with `gitError`, `gitErrorDescription`, `path` |
+| `IGitExecutionOptions` | Options for `git()` function |
+
+## Known Limitations
+
+This library is extracted directly from [GitHub Desktop](https://github.com/desktop/desktop), a mature Electron application. Some subsystems that depend on GitHub Desktop's specific runtime environment have been extracted as **stubs** — they compile and type-check correctly but don't provide real functionality:
+
+### 🟡 Progress Reporting (`src/lib/progress/`)
+
+The progress parsers (`CheckoutProgressParser`, `FetchProgressParser`, `PullProgressParser`, `PushProgressParser`, `CloneProgressParser`, `RevertProgressParser`) are **stubbed**. Their `parse()` methods always return `null`, and `executionOptionsWithProgress` passes options through unchanged. This means:
+
+- Progress callbacks for clone, fetch, push, pull, and checkout will fire the initial `0%` callback but **never receive updates**
+- Long-running operations will complete correctly but without intermediate progress reporting
+
+### 🟡 Git Hook Interception (`src/lib/hooks/`)
+
+`withHooksEnv` is a **stub** that calls through without configuring any hook environment. The `interceptHooks` option for `git()` and operation functions (e.g., `createCommit`, `push`, `pull`) will **not fire** `onHookProgress` or `onHookFailure` callbacks. Git hooks will still run normally on their own — the library just can't intercept them.
+
+### 🟡 Git LFS Trampoline (`src/lib/trampoline/`)
+
+`withTrampolineEnv` is a **stub** that calls through without setting up the Git LFS trampoline environment. Git LFS operations may not work correctly as a result.
+
+### 🟡 No Tests
+
+There are no unit or integration tests yet. While the code is a faithful extraction of the stable GitHub Desktop codebase, there are no automated tests to verify the extraction.
+
+### 🟡 Not Published on npm
+
+The library is currently available only via git URL or `file:` dependency. No npm release has been published.
+
+---
+
 ## Architecture
 
-The library is structured into three layers:
+```
+src/
+├── index.ts           ← Public API entry (barrel)
+├── git/               ← 46 files: one per git subcommand
+│   ├── exec.ts        ← Core dugite replacement: spawns git, parses errors
+│   ├── core.ts        ← Higher-level git() wrapper with hooks, progress, env
+│   └── index.ts       ← Git barrel (re-exports all git modules)
+├── models/            ← 17+ files: domain types
+│   ├── repository.ts
+│   ├── commit.ts
+│   ├── status.ts
+│   ├── diff/          ← Diff types (DiffLine, DiffHunk, IDiff, IRawDiff, etc.)
+│   └── index.ts       ← Models barrel
+└── lib/               ← Utilities: parsers, progress reporting, hooks, fs helpers
+    ├── diff-parser.ts  ← Full diff parser (text/binary/image)
+    ├── status-parser.ts ← Porcelain v2 status parser
+    ├── progress/       ← 🟡 Progress parsers (stubbed — see Limitations)
+    ├── hooks/          ← 🟡 Git hook env (stubbed — see Limitations)
+    └── trampoline/     ← 🟡 Git LFS trampoline (stubbed — see Limitations)
+```
+
+## Development
 
-| Layer | Directory | Purpose |
-|-------|-----------|---------|
-| **Git commands** | `src/git/` | 61 files wrapping individual `git` subcommands — `status.ts`, `log.ts`, `diff.ts`, `branch.ts`, `merge.ts`, etc. |
-| **Domain models** | `src/models/` | 19 type definition files — `Commit`, `Branch`, `Repository`, `IStatusResult`, diff types, etc. |
-| **Utilities** | `src/lib/` | 25 files — diff parser, status parser, progress reporting stubs, trampoline, hooks, etc. |
+```bash
+# Type-check
+npm run typecheck
+
+# Build (compile TypeScript → dist/)
+npm run build
+
+# Clean rebuild
+rm -rf dist && npm run build
+
+# Run examples (uses tsx for source-level execution)
+npx tsx examples/get-status.ts /path/to/repo
+npx tsx examples/branch-operations.ts /path/to/repo
+npx tsx examples/create-commit.ts /path/to/repo
+```
 
-### Key file: `src/git/exec.ts`
+### Consumption Notes
 
-This is the core dugite replacement (~250 lines). It implements:
-- `exec()` — spawns `git` via `child_process.spawn`, returns `{ stdout, stderr, exitCode }`
-- `spawnGit()` — stream-based variant for long-running operations
-- `GitError` enum — 50+ typed Git error codes
-- `parseError()` — maps stderr output to typed errors
+- **Source-level consumption** (recommended for TypeScript projects): Import from `'git-chopstick-core'` — the `exports` field in `package.json` points to TypeScript source. This works with `moduleResolution: "bundler"` in `tsconfig.json`.
+- **Compiled consumption**: Run `npm run build` first, then the compiled output in `dist/` can be imported directly by Node.js ESM.
 
 ## Dependencies
 

package/dist/git/add.d.ts

@@ -0,0 +1,9 @@
+import { Repository } from '../models/repository.js';
+import { WorkingDirectoryFileChange } from '../models/status.js';
+/**
+ * Add a conflicted file to the index.
+ *
+ * Typically done after having resolved conflicts either manually
+ * or through checkout --theirs/--ours.
+ */
+export declare function addConflictedFile(repository: Repository, file: WorkingDirectoryFileChange): Promise<void>;

package/dist/git/add.js

@@ -0,0 +1,11 @@
+import { git } from './core.js';
+/**
+ * Add a conflicted file to the index.
+ *
+ * Typically done after having resolved conflicts either manually
+ * or through checkout --theirs/--ours.
+ */
+export async function addConflictedFile(repository, file) {
+    await git(['add', '--', file.path], repository.path, 'addConflictedFile');
+}
+//# sourceMappingURL=add.js.map

package/dist/git/add.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add.js","sourceRoot":"","sources":["../../src/git/add.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAA;AAI/B;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,UAAsB,EACtB,IAAgC;IAEhC,MAAM,GAAG,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,UAAU,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAA;AAC3E,CAAC"}

package/dist/git/apply.d.ts

@@ -0,0 +1,33 @@
+import { WorkingDirectoryFileChange } from '../models/status.js';
+import { ITextDiff, DiffSelection } from '../models/diff/index.js';
+import { Repository } from '../models/repository.js';
+export declare function applyPatchToIndex(repository: Repository, file: WorkingDirectoryFileChange): Promise<void>;
+/**
+ * Test a patch to see if it will apply cleanly.
+ *
+ * @param workTree work tree (which should be checked out to a specific commit)
+ * @param patch a Git patch (or patch series) to try applying
+ * @returns whether the patch applies cleanly
+ *
+ * See `formatPatch` to generate a patch series from existing Git commits
+ */
+export declare function checkPatch(workTree: {
+    path: string;
+}, patch: string): Promise<boolean>;
+/**
+ * Discards the local changes for the specified file based on the passed diff
+ * and a selection of lines from it.
+ *
+ * When passed an empty selection, this method won't do anything. When passed a
+ * full selection, all changes from the file will be discarded.
+ *
+ * @param repository The repository in which to update the working directory
+ *                   with information from the index
+ *
+ * @param filePath   The relative path in the working directory of the file to use
+ *
+ * @param diff       The diff containing the file local changes
+ *
+ * @param selection  The selection of changes from the diff to discard
+ */
+export declare function discardChangesFromSelection(repository: Repository, filePath: string, diff: ITextDiff, selection: DiffSelection): Promise<void>;

package/dist/git/apply.js

@@ -0,0 +1,103 @@
+import { GitError as DugiteError } from './exec.js';
+import { git } from './core.js';
+import { WorkingDirectoryFileChange, AppFileStatusKind, } from '../models/status.js';
+import { DiffType } from '../models/diff/index.js';
+import { getWorkingDirectoryDiff } from './diff.js';
+import { formatPatch, formatPatchToDiscardChanges } from '../lib/patch-formatter.js';
+import { assertNever } from '../lib/fatal-error.js';
+export async function applyPatchToIndex(repository, file) {
+    // If the file was a rename we have to recreate that rename since we've
+    // just blown away the index. Think of this block of weird looking commands
+    // as running `git mv`.
+    if (file.status.kind === AppFileStatusKind.Renamed) {
+        // Make sure the index knows of the removed file. We could use
+        // update-index --force-remove here but we're not since it's
+        // possible that someone staged a rename and then recreated the
+        // original file and we don't have any guarantees for in which order
+        // partial stages vs full-file stages happen. By using git add the
+        // worst that could happen is that we re-stage a file already staged
+        // by updateIndex.
+        await git(['add', '--update', '--', file.status.oldPath], repository.path, 'applyPatchToIndex');
+        // Figure out the blob oid of the removed file
+        // <mode> SP <type> SP <object> TAB <file>
+        const oldFile = await git(['ls-tree', 'HEAD', '--', file.status.oldPath], repository.path, 'applyPatchToIndex');
+        const [info] = oldFile.stdout.split('\t', 1);
+        const [mode, , oid] = info.split(' ', 3);
+        // Add the old file blob to the index under the new name
+        await git(['update-index', '--add', '--cacheinfo', mode, oid, file.path], repository.path, 'applyPatchToIndex');
+    }
+    const applyArgs = [
+        'apply',
+        '--cached',
+        '--unidiff-zero',
+        '--whitespace=nowarn',
+        '-',
+    ];
+    const diff = await getWorkingDirectoryDiff(repository, file);
+    if (diff.kind !== DiffType.Text && diff.kind !== DiffType.LargeText) {
+        const { kind } = diff;
+        switch (diff.kind) {
+            case DiffType.Binary:
+            case DiffType.Submodule:
+            case DiffType.Image:
+                throw new Error(`Can't create partial commit in binary file: ${file.path}`);
+            case DiffType.Unrenderable:
+                throw new Error(`File diff is too large to generate a partial commit: ${file.path}`);
+            default:
+                assertNever(diff, `Unknown diff kind: ${kind}`);
+        }
+    }
+    const patch = await formatPatch(repository, file, file.selection);
+    await git(applyArgs, repository.path, 'applyPatchToIndex', { stdin: patch });
+    return Promise.resolve();
+}
+/**
+ * Test a patch to see if it will apply cleanly.
+ *
+ * @param workTree work tree (which should be checked out to a specific commit)
+ * @param patch a Git patch (or patch series) to try applying
+ * @returns whether the patch applies cleanly
+ *
+ * See `formatPatch` to generate a patch series from existing Git commits
+ */
+export async function checkPatch(workTree, patch) {
+    const result = await git(['apply', '--check', '-'], workTree.path, 'checkPatch', {
+        stdin: patch,
+        encoding: 'utf8',
+        expectedErrors: new Set([DugiteError.PatchDoesNotApply]),
+    });
+    if (result.gitError === DugiteError.PatchDoesNotApply) {
+        // other errors will be thrown if encountered, so this is fine for now
+        return false;
+    }
+    return true;
+}
+/**
+ * Discards the local changes for the specified file based on the passed diff
+ * and a selection of lines from it.
+ *
+ * When passed an empty selection, this method won't do anything. When passed a
+ * full selection, all changes from the file will be discarded.
+ *
+ * @param repository The repository in which to update the working directory
+ *                   with information from the index
+ *
+ * @param filePath   The relative path in the working directory of the file to use
+ *
+ * @param diff       The diff containing the file local changes
+ *
+ * @param selection  The selection of changes from the diff to discard
+ */
+export async function discardChangesFromSelection(repository, filePath, diff, selection) {
+    const file = new WorkingDirectoryFileChange(filePath, { kind: AppFileStatusKind.Modified }, selection);
+    const patch = await formatPatchToDiscardChanges(repository, file);
+    if (patch === null || patch === '') {
+        // When the patch is null we don't need to apply it since it will be a noop.
+        return;
+    }
+    const args = ['apply', '--unidiff-zero', '--whitespace=nowarn', '-'];
+    await git(args, repository.path, 'discardChangesFromSelection', {
+        stdin: patch,
+    });
+}
+//# sourceMappingURL=apply.js.map

package/dist/git/apply.js.map

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

package/dist/git/authentication.d.ts

@@ -0,0 +1,5 @@
+import { GitError as DugiteError } from './exec.js';
+/** Get the environment for authenticating remote operations. */
+export declare function envForAuthentication(): Record<string, string | undefined>;
+/** The set of errors which fit under the "authentication failed" umbrella. */
+export declare const AuthenticationErrors: ReadonlySet<DugiteError>;

package/dist/git/authentication.js

@@ -0,0 +1,19 @@
+import { GitError as DugiteError } from './exec.js';
+/** Get the environment for authenticating remote operations. */
+export function envForAuthentication() {
+    return {
+        // supported since Git 2.3, this is used to ensure we never interactively prompt
+        // for credentials - even as a fallback
+        GIT_TERMINAL_PROMPT: '0',
+        // localStorage is not available in Node.js; fall back to process.env
+        GIT_TRACE: process.env.GIT_TRACE ?? '0',
+    };
+}
+/** The set of errors which fit under the "authentication failed" umbrella. */
+export const AuthenticationErrors = new Set([
+    DugiteError.HTTPSAuthenticationFailed,
+    DugiteError.SSHAuthenticationFailed,
+    DugiteError.HTTPSRepositoryNotFound,
+    DugiteError.SSHRepositoryNotFound,
+]);
+//# sourceMappingURL=authentication.js.map

package/dist/git/authentication.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"authentication.js","sourceRoot":"","sources":["../../src/git/authentication.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,IAAI,WAAW,EAAE,MAAM,WAAW,CAAA;AAEnD,gEAAgE;AAChE,MAAM,UAAU,oBAAoB;IAClC,OAAO;QACL,gFAAgF;QAChF,uCAAuC;QACvC,mBAAmB,EAAE,GAAG;QACxB,qEAAqE;QACrE,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,GAAG;KACxC,CAAA;AACH,CAAC;AAED,8EAA8E;AAC9E,MAAM,CAAC,MAAM,oBAAoB,GAA6B,IAAI,GAAG,CAAC;IACpE,WAAW,CAAC,yBAAyB;IACrC,WAAW,CAAC,uBAAuB;IACnC,WAAW,CAAC,uBAAuB;IACnC,WAAW,CAAC,qBAAqB;CAClC,CAAC,CAAA"}

package/dist/git/branch.d.ts

@@ -0,0 +1,43 @@
+import { Repository } from '../models/repository.js';
+import { Branch } from '../models/branch.js';
+import { IRemote } from '../models/remote.js';
+/**
+ * Create a new branch from the given start point.
+ *
+ * @param repository - The repository in which to create the new branch
+ * @param name       - The name of the new branch
+ * @param startPoint - A committish string that the new branch should be based
+ *                     on, or undefined if the branch should be created based
+ *                     off of the current state of HEAD
+ */
+export declare function createBranch(repository: Repository, name: string, startPoint: string | null, noTrack?: boolean): Promise<void>;
+export declare const getBranchNames: ({ path }: Repository) => Promise<string[]>;
+/** Rename the given branch to a new name. */
+export declare function renameBranch(repository: Repository, branch: Branch, newName: string, force?: boolean): Promise<void>;
+/**
+ * Delete the branch locally.
+ */
+export declare function deleteLocalBranch(repository: Repository, branchName: string): Promise<true>;
+/**
+ * Deletes a remote branch
+ *
+ * @param remoteName - the name of the remote to delete the branch from
+ * @param remoteBranchName - the name of the branch on the remote
+ */
+export declare function deleteRemoteBranch(repository: Repository, remote: IRemote, remoteBranchName: string): Promise<true>;
+/**
+ * Finds branches that have a tip equal to the given committish
+ *
+ * @param repository within which to execute the command
+ * @param commitish a sha, HEAD, etc that the branch(es) tip should be
+ * @returns list branch names. null if an error is encountered
+ */
+export declare function getBranchesPointedAt(repository: Repository, commitish: string): Promise<Array<string> | null>;
+/**
+ * Gets all branches that have been merged into the given branch
+ *
+ * @param repository The repository in which to search
+ * @param branchName The to be used as the base branch
+ * @returns map of branch canonical refs paired to its sha
+ */
+export declare function getMergedBranches(repository: Repository, branchName: string): Promise<Map<string, string>>;