@procedures/git 0.2.3 → 0.4.0

package/dist/procedures/git/porcelain.js

@@ -0,0 +1,66 @@
+/**
+ * The status letters of git, and a parser of `git status --porcelain=v1 -z`.
+ *
+ * With `-z`, git writes each path as it is: no quotes. A rename or a copy gives its new path in
+ * the entry, and its old path in the next field.
+ */
+import { zFields } from "./run.js";
+/** The status letters of a path with a conflict (git status, "Short Format"). */
+const UNMERGED = new Set(["DD", "AU", "UD", "UA", "DU", "AA", "UU"]);
+/** This function gives the status of one entry from its two status letters (index, then work tree). */
+export function classifyStatus(xy) {
+    if (xy === "??")
+        return { status: "untracked", staged: false };
+    if (xy === "!!")
+        return { status: "ignored", staged: false };
+    if (UNMERGED.has(xy))
+        return { status: "modified", staged: false };
+    const index = xy[0];
+    const worktree = xy[1];
+    if (index === "A")
+        return { status: "added", staged: true };
+    if (index === "D")
+        return { status: "deleted", staged: true };
+    if (index === "R")
+        return { status: "renamed", staged: true };
+    if (index === "C")
+        return { status: "copied", staged: true };
+    if (index === "M" || index === "T")
+        return { status: "modified", staged: true };
+    if (worktree === "D")
+        return { status: "deleted", staged: false };
+    if (worktree === "A")
+        return { status: "added", staged: false };
+    if (worktree === "R")
+        return { status: "renamed", staged: false };
+    return { status: "modified", staged: false };
+}
+/**
+ * This function reads the output of `git status --porcelain=v1 -z`. Each entry has its status
+ * letters, its exact path, and for a rename or a copy the old path in `from`. It skips the
+ * branch line of `--branch`.
+ *
+ * @example
+ * ```ts
+ * const output = await git(["status", "--porcelain=v1", "-z", "--untracked-files=all", "--", "notes"]);
+ * const untracked = parsePorcelainV1(output).filter((entry) => entry.status === "untracked");
+ * ```
+ */
+export function parsePorcelainV1(output) {
+    const fields = zFields(output);
+    const entries = [];
+    for (let i = 0; i < fields.length; i++) {
+        const field = fields[i];
+        // "XY path": two letters, a space, then the path. "## branch" is the line of --branch.
+        if (field.length < 4 || field[2] !== " " || field.startsWith("## "))
+            continue;
+        const xy = field.slice(0, 2);
+        const entry = { xy, path: field.slice(3), ...classifyStatus(xy) };
+        // A rename or a copy, in the index or in the work tree, gives its old path in the next field
+        if (!UNMERGED.has(xy) && /[RC]/.test(xy))
+            entry.from = fields[++i] ?? "";
+        entries.push(entry);
+    }
+    return entries;
+}
+//# sourceMappingURL=porcelain.js.map

package/dist/procedures/git/porcelain.js.map

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

package/dist/procedures/git/push.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"push.d.ts","sourceRoot":"","sources":["../../../src/procedures/git/push.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAiB,KAAK,UAAU,EAAE,MAAM,UAAU,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAElE;;GAEG;AACH,wBAAsB,OAAO,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,GAAE,UAAe,GAAG,OAAO,CAAC,aAAa,CAAC,CA4B/F"}
+{"version":3,"file":"push.d.ts","sourceRoot":"","sources":["../../../src/procedures/git/push.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAiB,KAAK,UAAU,EAAE,MAAM,UAAU,CAAC;AAE1D,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAElE;;GAEG;AACH,wBAAsB,OAAO,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,GAAE,UAAe,GAAG,OAAO,CAAC,aAAa,CAAC,CA6B/F"}

package/dist/procedures/git/push.js

@@ -5,6 +5,7 @@
  */
 import { gitArg } from "./args.js";
 import { git, GitError } from "./run.js";
+import { currentBranch } from "./refs.js";
 /**
  * Push to remote
  */
@@ -12,8 +13,9 @@ export async function gitPush(input, ctx = {}) {
     const { branch, force, setUpstream, cwd } = input;
     const remoteName = input.remote ?? "origin";
     const run = { cwd, signal: ctx.signal };
-    // Get current branch if not specified
-    const branchName = branch || (await git(["rev-parse", "--abbrev-ref", "HEAD"], run)).trim();
+    // The current branch if not specified. `git symbolic-ref` reads it in a repository without
+    // commits too, so git gives its own error there (roadmap R40).
+    const branchName = branch || (await currentBranch(run));
     // Count commits to push
     let commits = 0;
     try {

package/dist/procedures/git/push.js.map

@@ -1 +1 @@
-{"version":3,"file":"push.js","sourceRoot":"","sources":["../../../src/procedures/git/push.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAmB,MAAM,UAAU,CAAC;AAG1D;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,KAAmB,EAAE,GAAG,GAAe,EAAE;IACrE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC;IAClD,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,IAAI,QAAQ,CAAC;IAC5C,MAAM,GAAG,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC;IAExC,sCAAsC;IACtC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,WAAW,EAAE,cAAc,EAAE,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAE5F,wBAAwB;IACxB,IAAI,OAAO,GAAG,CAAC,CAAC;IAChB,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,UAAU,IAAI,UAAU,QAAQ,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QACpG,OAAO,GAAG,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,kCAAkC;QAClC,IAAI,CAAC,CAAC,KAAK,YAAY,QAAQ,CAAC;YAAE,MAAM,KAAK,CAAC;QAC9C,MAAM,KAAK,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,UAAU,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QACvE,OAAO,GAAG,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC;IAED,MAAM,IAAI,GAAa,CAAC,MAAM,CAAC,CAAC;IAChC,IAAI,WAAW;QAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjC,IAAI,KAAK;QAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAChC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC;IAEtE,MAAM,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAErB,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC;AAC7D,CAAC"}
+{"version":3,"file":"push.js","sourceRoot":"","sources":["../../../src/procedures/git/push.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAmB,MAAM,UAAU,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAG1C;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,KAAmB,EAAE,GAAG,GAAe,EAAE;IACrE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC;IAClD,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,IAAI,QAAQ,CAAC;IAC5C,MAAM,GAAG,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC;IAExC,2FAA2F;IAC3F,+DAA+D;IAC/D,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,MAAM,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC;IAExD,wBAAwB;IACxB,IAAI,OAAO,GAAG,CAAC,CAAC;IAChB,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,UAAU,IAAI,UAAU,QAAQ,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QACpG,OAAO,GAAG,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,kCAAkC;QAClC,IAAI,CAAC,CAAC,KAAK,YAAY,QAAQ,CAAC;YAAE,MAAM,KAAK,CAAC;QAC9C,MAAM,KAAK,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,UAAU,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QACvE,OAAO,GAAG,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC;IAED,MAAM,IAAI,GAAa,CAAC,MAAM,CAAC,CAAC;IAChC,IAAI,WAAW;QAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjC,IAAI,KAAK;QAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAChC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC;IAEtE,MAAM,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAErB,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC;AAC7D,CAAC"}

package/dist/procedures/git/rebase/abort.d.ts

@@ -0,0 +1,13 @@
+/**
+ * git.rebase.abort procedure
+ *
+ * Stop a rebase, and go back to the branch as it was before the rebase (roadmap R40). The
+ * resolutions of the conflicts are lost. Without a rebase, the call fails.
+ */
+import { type GitContext } from "../run.js";
+import type { GitRebaseAbortInput, GitRebaseAbortOutput } from "../../../types.js";
+/**
+ * Stop a rebase, and go back to the branch before it
+ */
+export declare function gitRebaseAbort(input: GitRebaseAbortInput, ctx?: GitContext): Promise<GitRebaseAbortOutput>;
+//# sourceMappingURL=abort.d.ts.map

package/dist/procedures/git/rebase/abort.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"abort.d.ts","sourceRoot":"","sources":["../../../../src/procedures/git/rebase/abort.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAO,KAAK,UAAU,EAAE,MAAM,WAAW,CAAC;AAEjD,OAAO,KAAK,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAEnF;;GAEG;AACH,wBAAsB,cAAc,CAAC,KAAK,EAAE,mBAAmB,EAAE,GAAG,GAAE,UAAe,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAIpH"}

package/dist/procedures/git/rebase/abort.js

@@ -0,0 +1,17 @@
+/**
+ * git.rebase.abort procedure
+ *
+ * Stop a rebase, and go back to the branch as it was before the rebase (roadmap R40). The
+ * resolutions of the conflicts are lost. Without a rebase, the call fails.
+ */
+import { git } from "../run.js";
+import { headHash } from "../refs.js";
+/**
+ * Stop a rebase, and go back to the branch before it
+ */
+export async function gitRebaseAbort(input, ctx = {}) {
+    const run = { cwd: input.cwd, signal: ctx.signal };
+    await git(["rebase", "--abort"], run);
+    return { aborted: true, hash: await headHash(run) };
+}
+//# sourceMappingURL=abort.js.map

package/dist/procedures/git/rebase/abort.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"abort.js","sourceRoot":"","sources":["../../../../src/procedures/git/rebase/abort.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,GAAG,EAAmB,MAAM,WAAW,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAGtC;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,KAA0B,EAAE,GAAG,GAAe,EAAE;IACnF,MAAM,GAAG,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC;IACnD,MAAM,GAAG,CAAC,CAAC,QAAQ,EAAE,SAAS,CAAC,EAAE,GAAG,CAAC,CAAC;IACtC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;AACtD,CAAC"}

package/dist/procedures/git/rebase/continue.d.ts

@@ -0,0 +1,13 @@
+/**
+ * git.rebase.continue procedure
+ *
+ * Continue a rebase after the conflicts are resolved and staged (roadmap R40). Git keeps the
+ * message of each commit: it does not start an editor. A next commit can stop on conflicts again.
+ */
+import { type GitContext } from "../run.js";
+import type { GitRebaseContinueInput, GitRebaseContinueOutput } from "../../../types.js";
+/**
+ * Continue a rebase after the conflicts are resolved
+ */
+export declare function gitRebaseContinue(input: GitRebaseContinueInput, ctx?: GitContext): Promise<GitRebaseContinueOutput>;
+//# sourceMappingURL=continue.d.ts.map

package/dist/procedures/git/rebase/continue.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"continue.d.ts","sourceRoot":"","sources":["../../../../src/procedures/git/rebase/continue.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,WAAW,CAAC;AAG5C,OAAO,KAAK,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAEzF;;GAEG;AACH,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,sBAAsB,EAAE,GAAG,GAAE,UAAe,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAS7H"}

package/dist/procedures/git/rebase/continue.js

@@ -0,0 +1,23 @@
+/**
+ * git.rebase.continue procedure
+ *
+ * Continue a rebase after the conflicts are resolved and staged (roadmap R40). Git keeps the
+ * message of each commit: it does not start an editor. A next commit can stop on conflicts again.
+ */
+import {} from "../run.js";
+import { conflictedFiles, headHash } from "../refs.js";
+import { rebaseStep } from "../rebase.js";
+/**
+ * Continue a rebase after the conflicts are resolved
+ */
+export async function gitRebaseContinue(input, ctx = {}) {
+    const run = { cwd: input.cwd, signal: ctx.signal };
+    // Files that still have conflicts: git refuses to continue, so the call gives them
+    const unresolved = await conflictedFiles(run);
+    if (unresolved.length > 0) {
+        return { hash: await headHash(run), completed: false, upToDate: false, conflict: true, conflicts: unresolved };
+    }
+    // A continued rebase changed the branch: upToDate is false
+    return rebaseStep(["rebase", "--continue"], "", run);
+}
+//# sourceMappingURL=continue.js.map

package/dist/procedures/git/rebase/continue.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"continue.js","sourceRoot":"","sources":["../../../../src/procedures/git/rebase/continue.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAmB,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,KAA6B,EAAE,GAAG,GAAe,EAAE;IACzF,MAAM,GAAG,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC;IACnD,mFAAmF;IACnF,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC,GAAG,CAAC,CAAC;IAC9C,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1B,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC,GAAG,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC;IACjH,CAAC;IACD,2DAA2D;IAC3D,OAAO,UAAU,CAAC,CAAC,QAAQ,EAAE,YAAY,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;AACvD,CAAC"}

package/dist/procedures/git/rebase.d.ts

@@ -0,0 +1,22 @@
+/**
+ * git.rebase procedure
+ *
+ * Rebase the current branch on another branch (roadmap R40). The rebase is never interactive,
+ * and git does not start an editor.
+ *
+ * A rebase that stops on conflicts is a result, not an error: `conflict` is true, and
+ * `conflicts` names the files. Then resolve them, stage them with git.add and call
+ * git.rebase.continue, or call git.rebase.abort.
+ */
+import { type GitContext, type GitRunOptions } from "./run.js";
+import type { GitRebaseInput, GitRebaseOutput } from "../../types.js";
+/**
+ * This function runs a step of a rebase (the start or `--continue`), and gives its result. A
+ * stop on conflicts gives `conflict: true`. Any other failure throws.
+ */
+export declare function rebaseStep(args: string[], before: string, run: GitRunOptions): Promise<GitRebaseOutput>;
+/**
+ * Rebase the current branch on another branch
+ */
+export declare function gitRebase(input: GitRebaseInput, ctx?: GitContext): Promise<GitRebaseOutput>;
+//# sourceMappingURL=rebase.d.ts.map

package/dist/procedures/git/rebase.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rebase.d.ts","sourceRoot":"","sources":["../../../src/procedures/git/rebase.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAGH,OAAO,EAAO,KAAK,UAAU,EAAE,KAAK,aAAa,EAAE,MAAM,UAAU,CAAC;AAEpE,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEtE;;;GAGG;AACH,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC,CAS7G;AAED;;GAEG;AACH,wBAAsB,SAAS,CAAC,KAAK,EAAE,cAAc,EAAE,GAAG,GAAE,UAAe,GAAG,OAAO,CAAC,eAAe,CAAC,CAarG"}

package/dist/procedures/git/rebase.js

@@ -0,0 +1,46 @@
+/**
+ * git.rebase procedure
+ *
+ * Rebase the current branch on another branch (roadmap R40). The rebase is never interactive,
+ * and git does not start an editor.
+ *
+ * A rebase that stops on conflicts is a result, not an error: `conflict` is true, and
+ * `conflicts` names the files. Then resolve them, stage them with git.add and call
+ * git.rebase.continue, or call git.rebase.abort.
+ */
+import { gitArg } from "./args.js";
+import { git } from "./run.js";
+import { commitOf, conflictedFiles, headHash, NO_EDITOR, stoppedOnConflict } from "./refs.js";
+/**
+ * This function runs a step of a rebase (the start or `--continue`), and gives its result. A
+ * stop on conflicts gives `conflict: true`. Any other failure throws.
+ */
+export async function rebaseStep(args, before, run) {
+    try {
+        await git(args, { ...run, env: NO_EDITOR });
+    }
+    catch (error) {
+        if (!stoppedOnConflict(error))
+            throw error;
+        return { hash: await headHash(run), completed: false, upToDate: false, conflict: true, conflicts: await conflictedFiles(run) };
+    }
+    const hash = await headHash(run);
+    return { hash, completed: true, upToDate: hash === before, conflict: false };
+}
+/**
+ * Rebase the current branch on another branch
+ */
+export async function gitRebase(input, ctx = {}) {
+    const { upstream, onto, branch, cwd } = input;
+    const run = { cwd, signal: ctx.signal };
+    // With a branch, git checks it out first: compare with that branch
+    const before = branch ? await commitOf(branch, run) : await headHash(run);
+    const args = ["rebase"];
+    if (onto)
+        args.push("--onto", gitArg("onto", onto));
+    args.push(gitArg("upstream", upstream));
+    if (branch)
+        args.push(gitArg("branch", branch));
+    return rebaseStep(args, before, run);
+}
+//# sourceMappingURL=rebase.js.map

package/dist/procedures/git/rebase.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rebase.js","sourceRoot":"","sources":["../../../src/procedures/git/rebase.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,GAAG,EAAuC,MAAM,UAAU,CAAC;AACpE,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,QAAQ,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAG9F;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,IAAc,EAAE,MAAc,EAAE,GAAkB;IACjF,IAAI,CAAC;QACH,MAAM,GAAG,CAAC,IAAI,EAAE,EAAE,GAAG,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,CAAC;IAC9C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC;YAAE,MAAM,KAAK,CAAC;QAC3C,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC,GAAG,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC;IACjI,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC;IACjC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,KAAK,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;AAC/E,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,KAAqB,EAAE,GAAG,GAAe,EAAE;IACzE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC;IAC9C,MAAM,GAAG,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC;IAExC,mEAAmE;IACnE,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC;IAE1E,MAAM,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;IACxB,IAAI,IAAI;QAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;IACpD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;IACxC,IAAI,MAAM;QAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;IAEhD,OAAO,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;AACvC,CAAC"}

package/dist/procedures/git/refs.d.ts

@@ -0,0 +1,31 @@
+/**
+ * Helpers of the git procedures of roadmap R40: the current branch, the hash of a ref, the
+ * files with conflicts, and the stop of a merge or a rebase on conflicts.
+ */
+import { type GitRunOptions } from "./run.js";
+/**
+ * The current branch, or "HEAD" when HEAD is detached.
+ *
+ * `git rev-parse --abbrev-ref HEAD` fails in a repository without commits (roadmap R33), because
+ * HEAD names a branch that does not exist yet. `git symbolic-ref` reads the name that HEAD
+ * holds, so it works there too. It fails only for a detached HEAD.
+ */
+export declare function currentBranch(run: GitRunOptions): Promise<string>;
+/** The hash of the commit of a ref (a tag gives its commit). It throws a `GitError` for an unknown ref. */
+export declare function commitOf(ref: string, run: GitRunOptions): Promise<string>;
+/** The hash of HEAD. */
+export declare function headHash(run: GitRunOptions): Promise<string>;
+/** The files that have conflicts, as `git diff --diff-filter=U` gives them. */
+export declare function conflictedFiles(run: GitRunOptions): Promise<string[]>;
+/**
+ * True when a failed merge or rebase stopped on conflicts. Git writes "CONFLICT (content): ..."
+ * to stdout, and "could not apply" to stderr. Any other failure (a working tree with changes, an
+ * unknown ref) is an error of the call.
+ */
+export declare function stoppedOnConflict(error: unknown): boolean;
+/**
+ * The environment of a merge or a rebase. Git does not start an editor for a message: it keeps
+ * the message that it made. `GIT_EDITOR` overrides `core.editor` and `EDITOR` of the machine.
+ */
+export declare const NO_EDITOR: Record<string, string>;
+//# sourceMappingURL=refs.d.ts.map

package/dist/procedures/git/refs.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"refs.d.ts","sourceRoot":"","sources":["../../../src/procedures/git/refs.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAA0B,KAAK,aAAa,EAAE,MAAM,UAAU,CAAC;AAEtE;;;;;;GAMG;AACH,wBAAsB,aAAa,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CASvE;AAED,2GAA2G;AAC3G,wBAAsB,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAE/E;AAED,wBAAwB;AACxB,wBAAsB,QAAQ,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAElE;AAED,+EAA+E;AAC/E,wBAAsB,eAAe,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAE3E;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAEzD;AAED;;;GAGG;AACH,eAAO,MAAM,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAA0B,CAAC"}

package/dist/procedures/git/refs.js

@@ -0,0 +1,52 @@
+/**
+ * Helpers of the git procedures of roadmap R40: the current branch, the hash of a ref, the
+ * files with conflicts, and the stop of a merge or a rebase on conflicts.
+ */
+import { gitArg } from "./args.js";
+import { git, GitError, zFields } from "./run.js";
+/**
+ * The current branch, or "HEAD" when HEAD is detached.
+ *
+ * `git rev-parse --abbrev-ref HEAD` fails in a repository without commits (roadmap R33), because
+ * HEAD names a branch that does not exist yet. `git symbolic-ref` reads the name that HEAD
+ * holds, so it works there too. It fails only for a detached HEAD.
+ */
+export async function currentBranch(run) {
+    try {
+        return (await git(["symbolic-ref", "--quiet", "--short", "HEAD"], run)).trim();
+    }
+    catch (error) {
+        if (!(error instanceof GitError))
+            throw error;
+        // A detached HEAD: exit 1 and no message. Outside a repository: exit 128, and that is an error.
+        if (error.exitCode === 1)
+            return "HEAD";
+        throw error;
+    }
+}
+/** The hash of the commit of a ref (a tag gives its commit). It throws a `GitError` for an unknown ref. */
+export async function commitOf(ref, run) {
+    return (await git(["rev-parse", "--verify", `${gitArg("ref", ref)}^{commit}`], run)).trim();
+}
+/** The hash of HEAD. */
+export async function headHash(run) {
+    return (await git(["rev-parse", "--verify", "HEAD"], run)).trim();
+}
+/** The files that have conflicts, as `git diff --diff-filter=U` gives them. */
+export async function conflictedFiles(run) {
+    return zFields(await git(["diff", "--name-only", "--diff-filter=U", "-z"], run));
+}
+/**
+ * True when a failed merge or rebase stopped on conflicts. Git writes "CONFLICT (content): ..."
+ * to stdout, and "could not apply" to stderr. Any other failure (a working tree with changes, an
+ * unknown ref) is an error of the call.
+ */
+export function stoppedOnConflict(error) {
+    return error instanceof GitError && /^CONFLICT \(|could not apply/im.test(`${error.stdout}\n${error.stderr}`);
+}
+/**
+ * The environment of a merge or a rebase. Git does not start an editor for a message: it keeps
+ * the message that it made. `GIT_EDITOR` overrides `core.editor` and `EDITOR` of the machine.
+ */
+export const NO_EDITOR = { GIT_EDITOR: "true" };
+//# sourceMappingURL=refs.js.map

package/dist/procedures/git/refs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"refs.js","sourceRoot":"","sources":["../../../src/procedures/git/refs.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAsB,MAAM,UAAU,CAAC;AAEtE;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,GAAkB;IACpD,IAAI,CAAC;QACH,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,cAAc,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IACjF,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,CAAC,KAAK,YAAY,QAAQ,CAAC;YAAE,MAAM,KAAK,CAAC;QAC9C,gGAAgG;QAChG,IAAI,KAAK,CAAC,QAAQ,KAAK,CAAC;YAAE,OAAO,MAAM,CAAC;QACxC,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED,2GAA2G;AAC3G,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,GAAW,EAAE,GAAkB;IAC5D,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,WAAW,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;AAC9F,CAAC;AAED,wBAAwB;AACxB,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,GAAkB;IAC/C,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,WAAW,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;AACpE,CAAC;AAED,+EAA+E;AAC/E,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,GAAkB;IACtD,OAAO,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,EAAE,aAAa,EAAE,iBAAiB,EAAE,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;AACnF,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAAC,KAAc;IAC9C,OAAO,KAAK,YAAY,QAAQ,IAAI,gCAAgC,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;AAChH,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,MAAM,SAAS,GAA2B,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC"}

package/dist/procedures/git/reset.d.ts

@@ -0,0 +1,13 @@
+/**
+ * git.reset procedure
+ *
+ * Move HEAD to a commit, and reset the index or the working tree (roadmap R40). The mode hard
+ * deletes the changes of the working tree that are not committed.
+ */
+import { type GitContext } from "./run.js";
+import type { GitResetInput, GitResetOutput } from "../../types.js";
+/**
+ * Move HEAD to a commit, and reset the index or the working tree
+ */
+export declare function gitReset(input: GitResetInput, ctx?: GitContext): Promise<GitResetOutput>;
+//# sourceMappingURL=reset.d.ts.map

package/dist/procedures/git/reset.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"reset.d.ts","sourceRoot":"","sources":["../../../src/procedures/git/reset.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAO,KAAK,UAAU,EAAE,MAAM,UAAU,CAAC;AAEhD,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEpE;;GAEG;AACH,wBAAsB,QAAQ,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,GAAE,UAAe,GAAG,OAAO,CAAC,cAAc,CAAC,CAkBlG"}

package/dist/procedures/git/reset.js

@@ -0,0 +1,31 @@
+/**
+ * git.reset procedure
+ *
+ * Move HEAD to a commit, and reset the index or the working tree (roadmap R40). The mode hard
+ * deletes the changes of the working tree that are not committed.
+ */
+import { gitArg } from "./args.js";
+import { git } from "./run.js";
+import { headHash } from "./refs.js";
+/**
+ * Move HEAD to a commit, and reset the index or the working tree
+ */
+export async function gitReset(input, ctx = {}) {
+    const ref = input.ref ?? "HEAD";
+    const mode = input.mode ?? "mixed";
+    const run = { cwd: input.cwd, signal: ctx.signal };
+    const args = ["reset", "--quiet"];
+    if (input.paths && input.paths.length > 0) {
+        // Git resets paths only in the index: HEAD and the working tree stay
+        if (mode !== "mixed") {
+            throw new Error(`git.reset: paths need the mode mixed, not ${mode}`);
+        }
+        args.push(gitArg("ref", ref), "--", ...input.paths);
+    }
+    else {
+        args.push(`--${mode}`, gitArg("ref", ref));
+    }
+    await git(args, run);
+    return { ref, mode, hash: await headHash(run) };
+}
+//# sourceMappingURL=reset.js.map

package/dist/procedures/git/reset.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"reset.js","sourceRoot":"","sources":["../../../src/procedures/git/reset.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,GAAG,EAAmB,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAGrC;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,KAAoB,EAAE,GAAG,GAAe,EAAE;IACvE,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,IAAI,MAAM,CAAC;IAChC,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,IAAI,OAAO,CAAC;IACnC,MAAM,GAAG,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC;IAEnD,MAAM,IAAI,GAAG,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAClC,IAAI,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1C,qEAAqE;QACrE,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,6CAA6C,IAAI,EAAE,CAAC,CAAC;QACvE,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;IACtD,CAAC;SAAM,CAAC;QACN,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,EAAE,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;IAC7C,CAAC;IACD,MAAM,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAErB,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;AAClD,CAAC"}

package/dist/procedures/git/restore.d.ts

@@ -0,0 +1,13 @@
+/**
+ * git.restore procedure
+ *
+ * Restore files of the working tree or the index (roadmap R40). A restore of the working tree
+ * deletes the changes of the files that are not committed.
+ */
+import { type GitContext } from "./run.js";
+import type { GitRestoreInput, GitRestoreOutput } from "../../types.js";
+/**
+ * Restore files of the working tree or the index
+ */
+export declare function gitRestore(input: GitRestoreInput, ctx?: GitContext): Promise<GitRestoreOutput>;
+//# sourceMappingURL=restore.d.ts.map

package/dist/procedures/git/restore.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"restore.d.ts","sourceRoot":"","sources":["../../../src/procedures/git/restore.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAO,KAAK,UAAU,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAExE;;GAEG;AACH,wBAAsB,UAAU,CAAC,KAAK,EAAE,eAAe,EAAE,GAAG,GAAE,UAAe,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAYxG"}

package/dist/procedures/git/restore.js

@@ -0,0 +1,26 @@
+/**
+ * git.restore procedure
+ *
+ * Restore files of the working tree or the index (roadmap R40). A restore of the working tree
+ * deletes the changes of the files that are not committed.
+ */
+import { gitArg } from "./args.js";
+import { git } from "./run.js";
+/**
+ * Restore files of the working tree or the index
+ */
+export async function gitRestore(input, ctx = {}) {
+    const { paths, source, staged, worktree, cwd } = input;
+    const args = ["restore"];
+    if (source)
+        args.push(`--source=${gitArg("source", source)}`);
+    if (staged)
+        args.push("--staged");
+    if (worktree)
+        args.push("--worktree");
+    // After "--", a path that starts with "-" stays a path
+    args.push("--", ...paths);
+    await git(args, { cwd, signal: ctx.signal });
+    return { restored: paths };
+}
+//# sourceMappingURL=restore.js.map

package/dist/procedures/git/restore.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"restore.js","sourceRoot":"","sources":["../../../src/procedures/git/restore.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,GAAG,EAAmB,MAAM,UAAU,CAAC;AAGhD;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,KAAsB,EAAE,GAAG,GAAe,EAAE;IAC3E,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC;IAEvD,MAAM,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC;IACzB,IAAI,MAAM;QAAE,IAAI,CAAC,IAAI,CAAC,YAAY,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IAC9D,IAAI,MAAM;QAAE,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAClC,IAAI,QAAQ;QAAE,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACtC,uDAAuD;IACvD,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,KAAK,CAAC,CAAC;IAC1B,MAAM,GAAG,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;IAE7C,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;AAC7B,CAAC"}

package/dist/procedures/git/revParse.d.ts

@@ -0,0 +1,13 @@
+/**
+ * git.revParse procedure
+ *
+ * Give the hash or the name of a ref (roadmap R40). With `--verify`, git gives exactly one value,
+ * or fails for an unknown ref.
+ */
+import { type GitContext } from "./run.js";
+import type { GitRevParseInput, GitRevParseOutput } from "../../types.js";
+/**
+ * Give the hash or the name of a ref
+ */
+export declare function gitRevParse(input: GitRevParseInput, ctx?: GitContext): Promise<GitRevParseOutput>;
+//# sourceMappingURL=revParse.d.ts.map

package/dist/procedures/git/revParse.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"revParse.d.ts","sourceRoot":"","sources":["../../../src/procedures/git/revParse.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAO,KAAK,UAAU,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAE1E;;GAEG;AACH,wBAAsB,WAAW,CAAC,KAAK,EAAE,gBAAgB,EAAE,GAAG,GAAE,UAAe,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAS3G"}

package/dist/procedures/git/revParse.js

@@ -0,0 +1,23 @@
+/**
+ * git.revParse procedure
+ *
+ * Give the hash or the name of a ref (roadmap R40). With `--verify`, git gives exactly one value,
+ * or fails for an unknown ref.
+ */
+import { gitArg } from "./args.js";
+import { git } from "./run.js";
+/**
+ * Give the hash or the name of a ref
+ */
+export async function gitRevParse(input, ctx = {}) {
+    const ref = input.ref ?? "HEAD";
+    const args = ["rev-parse", "--verify"];
+    if (input.abbrevRef)
+        args.push("--abbrev-ref");
+    else if (input.short)
+        args.push("--short");
+    args.push(gitArg("ref", ref));
+    const value = (await git(args, { cwd: input.cwd, signal: ctx.signal })).trim();
+    return { ref, value };
+}
+//# sourceMappingURL=revParse.js.map

package/dist/procedures/git/revParse.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"revParse.js","sourceRoot":"","sources":["../../../src/procedures/git/revParse.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,GAAG,EAAmB,MAAM,UAAU,CAAC;AAGhD;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,KAAuB,EAAE,GAAG,GAAe,EAAE;IAC7E,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,IAAI,MAAM,CAAC;IAChC,MAAM,IAAI,GAAG,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IACvC,IAAI,KAAK,CAAC,SAAS;QAAE,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;SAC1C,IAAI,KAAK,CAAC,KAAK;QAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC3C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;IAE9B,MAAM,KAAK,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAC/E,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC;AACxB,CAAC"}

package/dist/procedures/git/run.d.ts

@@ -13,6 +13,8 @@ export interface GitRunOptions extends GitContext {
     cwd?: string | undefined;
     /** Text to write to the stdin of git (for example a patch for `git apply`). */
     input?: string | undefined;
+    /** Environment variables to add for git (for example `GIT_EDITOR`). */
+    env?: Record<string, string> | undefined;
 }
 /** A git command that ended with an exit code other than 0. */
 export declare class GitError extends Error {

package/dist/procedures/git/run.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../../src/procedures/git/run.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,sEAAsE;AACtE,MAAM,WAAW,UAAU;IACzB,MAAM,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;CAClC;AAED,MAAM,WAAW,aAAc,SAAQ,UAAU;IAC/C,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,+EAA+E;IAC/E,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC5B;AAED,+DAA+D;AAC/D,qBAAa,QAAS,SAAQ,KAAK;IAE/B,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE;IAChC,QAAQ,CAAC,QAAQ,EAAE,MAAM;IACzB,QAAQ,CAAC,MAAM,EAAE,MAAM;IACvB,QAAQ,CAAC,MAAM,EAAE,MAAM;IAJzB,YACW,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EAIxB;CACF;AAED;;;GAGG;AACH,wBAAsB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,OAAO,GAAE,aAAkB,GAAG,OAAO,CAAC,MAAM,CAAC,CAuBtF;AAED,4EAA4E;AAC5E,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAIhD"}
+{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../../src/procedures/git/run.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,sEAAsE;AACtE,MAAM,WAAW,UAAU;IACzB,MAAM,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;CAClC;AAED,MAAM,WAAW,aAAc,SAAQ,UAAU;IAC/C,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,+EAA+E;IAC/E,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,uEAAuE;IACvE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC;CAC1C;AAED,+DAA+D;AAC/D,qBAAa,QAAS,SAAQ,KAAK;IAE/B,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE;IAChC,QAAQ,CAAC,QAAQ,EAAE,MAAM;IACzB,QAAQ,CAAC,MAAM,EAAE,MAAM;IACvB,QAAQ,CAAC,MAAM,EAAE,MAAM;IAJzB,YACW,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EAIxB;CACF;AAED;;;GAGG;AACH,wBAAsB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,OAAO,GAAE,aAAkB,GAAG,OAAO,CAAC,MAAM,CAAC,CAwBtF;AAED,4EAA4E;AAC5E,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAIhD"}

package/dist/procedures/git/run.js

@@ -32,6 +32,7 @@ export async function git(args, options = {}) {
         cwd: options.cwd,
         signal: options.signal,
         input: options.input,
+        env: options.env,
         maxOutputBytes: GIT_MAX_BUFFER,
     });
     if (result.aborted) {

package/dist/procedures/git/run.js.map

@@ -1 +1 @@
-{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../src/procedures/git/run.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAa3C,+DAA+D;AAC/D,MAAM,OAAO,QAAS,SAAQ,KAAK;IAEtB,IAAI;IACJ,QAAQ;IACR,MAAM;IACN,MAAM;IAJjB,YACW,IAAuB,EACvB,QAAgB,EAChB,MAAc,EACd,MAAc;QAEvB,KAAK,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,iBAAiB,QAAQ,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;oBAL9E,IAAI;wBACJ,QAAQ;sBACR,MAAM;sBACN,MAAM;QAGf,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC;IACzB,CAAC;CACF;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,GAAG,CAAC,IAAc,EAAE,OAAO,GAAkB,EAAE;IACnE,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,KAAK,EAAE;QACrC,IAAI;QACJ,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,cAAc,EAAE,cAAc;KAC/B,CAAC,CAAC;IACH,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACnB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC;QACtD,KAAK,CAAC,IAAI,GAAG,YAAY,CAAC;QAC1B,MAAM,KAAK,CAAC;IACd,CAAC;IACD,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CAAC,sBAAsB,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;IACxD,CAAC;IACD,IAAI,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,qBAAqB,IAAI,CAAC,CAAC,CAAC,mBAAmB,cAAc,QAAQ,CAAC,CAAC;IACzF,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACpB,MAAM,IAAI,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAC1E,CAAC;IACD,OAAO,MAAM,CAAC,MAAM,CAAC;AACvB,CAAC;AAED,4EAA4E;AAC5E,MAAM,UAAU,OAAO,CAAC,MAAc;IACpC,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAClC,IAAI,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE;QAAE,MAAM,CAAC,GAAG,EAAE,CAAC;IACvC,OAAO,MAAM,CAAC;AAChB,CAAC"}
+{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../src/procedures/git/run.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAe3C,+DAA+D;AAC/D,MAAM,OAAO,QAAS,SAAQ,KAAK;IAEtB,IAAI;IACJ,QAAQ;IACR,MAAM;IACN,MAAM;IAJjB,YACW,IAAuB,EACvB,QAAgB,EAChB,MAAc,EACd,MAAc;QAEvB,KAAK,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,iBAAiB,QAAQ,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;oBAL9E,IAAI;wBACJ,QAAQ;sBACR,MAAM;sBACN,MAAM;QAGf,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC;IACzB,CAAC;CACF;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,GAAG,CAAC,IAAc,EAAE,OAAO,GAAkB,EAAE;IACnE,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,KAAK,EAAE;QACrC,IAAI;QACJ,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,cAAc,EAAE,cAAc;KAC/B,CAAC,CAAC;IACH,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACnB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC;QACtD,KAAK,CAAC,IAAI,GAAG,YAAY,CAAC;QAC1B,MAAM,KAAK,CAAC;IACd,CAAC;IACD,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CAAC,sBAAsB,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;IACxD,CAAC;IACD,IAAI,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,qBAAqB,IAAI,CAAC,CAAC,CAAC,mBAAmB,cAAc,QAAQ,CAAC,CAAC;IACzF,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACpB,MAAM,IAAI,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAC1E,CAAC;IACD,OAAO,MAAM,CAAC,MAAM,CAAC;AACvB,CAAC;AAED,4EAA4E;AAC5E,MAAM,UAAU,OAAO,CAAC,MAAc;IACpC,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAClC,IAAI,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE;QAAE,MAAM,CAAC,GAAG,EAAE,CAAC;IACvC,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/dist/procedures/git/show.d.ts

@@ -0,0 +1,15 @@
+/**
+ * git.show procedure
+ *
+ * Show a commit, or a file at a commit (roadmap R40).
+ *
+ * The procedure first resolves the ref to its commit, so a tag gives its commit and not the text
+ * of the tag object. A merge commit gives its changes against its first parent.
+ */
+import { type GitContext } from "./run.js";
+import type { GitShowInput, GitShowOutput } from "../../types.js";
+/**
+ * Show a commit, or a file at a commit
+ */
+export declare function gitShow(input: GitShowInput, ctx?: GitContext): Promise<GitShowOutput>;
+//# sourceMappingURL=show.d.ts.map

package/dist/procedures/git/show.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"show.d.ts","sourceRoot":"","sources":["../../../src/procedures/git/show.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EAAO,KAAK,UAAU,EAAE,MAAM,UAAU,CAAC;AAEhD,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAKlE;;GAEG;AACH,wBAAsB,OAAO,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,GAAE,UAAe,GAAG,OAAO,CAAC,aAAa,CAAC,CAoC/F"}