git-chopstick-core 0.1.1 → 0.1.3

package/dist/git/rebase.js

@@ -0,0 +1,415 @@
+import { GitError } from './exec.js';
+import byline from 'byline';
+import { AppFileStatusKind, } from '../models/status.js';
+import { merge } from '../lib/merge.js';
+import { formatRebaseValue } from '../lib/rebase.js';
+import { git, gitRebaseArguments, } from './core.js';
+import { stageManualConflictResolution } from './stage.js';
+import { stageFiles } from './update-index.js';
+import { getStatus } from './status.js';
+import { getCommitsBetweenCommits } from './rev-list.js';
+import { join } from 'path';
+import { readFile } from 'fs/promises';
+import { pathExists } from '../lib/path-exists.js';
+/** The app-specific results from attempting to rebase a repository */
+export var RebaseResult;
+(function (RebaseResult) {
+    /**
+     * Git completed the rebase without reporting any errors, and the caller can
+     * signal success to the user.
+     */
+    RebaseResult["CompletedWithoutError"] = "CompletedWithoutError";
+    /**
+     * Git completed the rebase without reporting any errors, but the branch was
+     * already up to date and there was nothing to do.
+     */
+    RebaseResult["AlreadyUpToDate"] = "AlreadyUpToDate";
+    /**
+     * The rebase encountered conflicts while attempting to rebase, and these
+     * need to be resolved by the user before the rebase can continue.
+     */
+    RebaseResult["ConflictsEncountered"] = "ConflictsEncountered";
+    /**
+     * The rebase was not able to continue as tracked files were not staged in
+     * the index.
+     */
+    RebaseResult["OutstandingFilesNotStaged"] = "OutstandingFilesNotStaged";
+    /**
+     * The rebase was not attempted because it could not check the status of the
+     * repository. The caller needs to confirm the repository is in a usable
+     * state.
+     */
+    RebaseResult["Aborted"] = "Aborted";
+    /**
+     * An unexpected error as part of the rebase flow was caught and handled.
+     *
+     * Check the logs to find the relevant Git details.
+     */
+    RebaseResult["Error"] = "Error";
+})(RebaseResult || (RebaseResult = {}));
+/**
+ * Check the `.git/REBASE_HEAD` file exists in a repository to confirm
+ * a rebase operation is underway.
+ */
+function isRebaseHeadSet(repository) {
+    const path = join(repository.resolvedGitDir, 'REBASE_HEAD');
+    return pathExists(path);
+}
+/**
+ * Get the internal state about the rebase being performed on a repository. This
+ * information is required to help Desktop display information to the user
+ * about the current action as well as the options available.
+ *
+ * Returns `null` if no rebase is detected, or if the expected information
+ * cannot be found in the repository.
+ */
+export async function getRebaseInternalState(repository) {
+    const isRebase = await isRebaseHeadSet(repository);
+    if (!isRebase) {
+        return null;
+    }
+    let originalBranchTip = null;
+    let targetBranch = null;
+    let baseBranchTip = null;
+    try {
+        originalBranchTip = await readFile(join(repository.resolvedGitDir, 'rebase-merge', 'orig-head'), 'utf8');
+        originalBranchTip = originalBranchTip.trim();
+        targetBranch = await readFile(join(repository.resolvedGitDir, 'rebase-merge', 'head-name'), 'utf8');
+        if (targetBranch.startsWith('refs/heads/')) {
+            targetBranch = targetBranch.substring(11).trim();
+        }
+        baseBranchTip = await readFile(join(repository.resolvedGitDir, 'rebase-merge', 'onto'), 'utf8');
+        baseBranchTip = baseBranchTip.trim();
+    }
+    catch { }
+    if (originalBranchTip != null &&
+        targetBranch != null &&
+        baseBranchTip != null) {
+        return { originalBranchTip, targetBranch, baseBranchTip };
+    }
+    // unable to resolve the rebase state of this repository
+    return null;
+}
+/**
+ * Inspect the `.git/rebase-merge` folder and convert the current rebase state
+ * into data that can be provided to the rebase flow to update the application
+ * state.
+ *
+ * This is required when Desktop is not responsible for initiating the rebase:
+ *
+ *   - when a rebase outside Desktop encounters conflicts
+ *   - when a `git pull --rebase` was run and encounters conflicts
+ *
+ */
+export async function getRebaseSnapshot(repository) {
+    const rebaseHead = await isRebaseHeadSet(repository);
+    if (!rebaseHead) {
+        return null;
+    }
+    let next = -1;
+    let last = -1;
+    let originalBranchTip = null;
+    let baseBranchTip = null;
+    // if the repository is in the middle of a rebase `.git/rebase-merge` will
+    // contain all the patches of commits that are being rebased into
+    // auto-incrementing files, e.g. `0001`, `0002`, `0003`, etc ...
+    try {
+        // this contains the patch number that was recently applied to the repository
+        const nextText = await readFile(join(repository.resolvedGitDir, 'rebase-merge', 'msgnum'), 'utf8');
+        next = parseInt(nextText, 10);
+        if (isNaN(next)) {
+            console.warn(`[getCurrentProgress] found '${nextText}' in .git/rebase-merge/msgnum which could not be parsed to a valid number`);
+            next = -1;
+        }
+        // this contains the total number of patches to be applied to the repository
+        const lastText = await readFile(join(repository.resolvedGitDir, 'rebase-merge', 'end'), 'utf8');
+        last = parseInt(lastText, 10);
+        if (isNaN(last)) {
+            console.warn(`[getCurrentProgress] found '${lastText}' in .git/rebase-merge/last which could not be parsed to a valid number`);
+            last = -1;
+        }
+        originalBranchTip = await readFile(join(repository.resolvedGitDir, 'rebase-merge', 'orig-head'), 'utf8');
+        originalBranchTip = originalBranchTip.trim();
+        baseBranchTip = await readFile(join(repository.resolvedGitDir, 'rebase-merge', 'onto'), 'utf8');
+        baseBranchTip = baseBranchTip.trim();
+    }
+    catch { }
+    if (next > 0 &&
+        last > 0 &&
+        originalBranchTip !== null &&
+        baseBranchTip !== null) {
+        const percentage = next / last;
+        const value = formatRebaseValue(percentage);
+        const commits = await getCommitsBetweenCommits(repository, baseBranchTip, originalBranchTip);
+        if (commits === null || commits.length === 0) {
+            return null;
+        }
+        // this number starts from 1, but our array of commits starts from 0
+        const nextCommitIndex = next - 1;
+        const hasValidCommit = commits.length > 0 &&
+            nextCommitIndex >= 0 &&
+            nextCommitIndex < commits.length;
+        const currentCommitSummary = hasValidCommit
+            ? commits[nextCommitIndex].summary
+            : '';
+        return {
+            progress: {
+                kind: 'multiCommitOperation',
+                value,
+                position: next,
+                totalCommitCount: last,
+                currentCommitSummary,
+            },
+            commits,
+        };
+    }
+    return null;
+}
+/**
+ * Attempt to read the `.git/REBASE_HEAD` file inside a repository to confirm
+ * the rebase is still active.
+ */
+async function readRebaseHead(repository) {
+    try {
+        const rebaseHead = join(repository.resolvedGitDir, 'REBASE_HEAD');
+        const rebaseCurrentCommitOutput = await readFile(rebaseHead, 'utf8');
+        return rebaseCurrentCommitOutput.trim();
+    }
+    catch (err) {
+        console.warn('[rebase] a problem was encountered reading .git/REBASE_HEAD, so it is unsafe to continue rebasing', err);
+        return null;
+    }
+}
+/** Regex for identifying when rebase applied each commit onto the base branch */
+const rebasingRe = /^Rebasing \((\d+)\/(\d+)\)$/;
+/**
+ * A parser to read and emit rebase progress from Git `stderr`
+ */
+class GitRebaseParser {
+    commits;
+    constructor(commits) {
+        this.commits = commits;
+    }
+    parse(line) {
+        const match = rebasingRe.exec(line);
+        if (match === null || match.length !== 3) {
+            // Git will sometimes emit other output (for example, when it tries to
+            // resolve conflicts) and this does not match the expected output
+            return null;
+        }
+        const rebasedCommitCount = parseInt(match[1], 10);
+        const totalCommitCount = parseInt(match[2], 10);
+        if (isNaN(rebasedCommitCount) || isNaN(totalCommitCount)) {
+            return null;
+        }
+        const currentCommitSummary = this.commits[rebasedCommitCount - 1]?.summary ?? '';
+        const progress = rebasedCommitCount / totalCommitCount;
+        const value = formatRebaseValue(progress);
+        return {
+            kind: 'multiCommitOperation',
+            value,
+            position: rebasedCommitCount,
+            totalCommitCount: totalCommitCount,
+            currentCommitSummary,
+        };
+    }
+}
+function configureOptionsForRebase(options, progress) {
+    if (progress === undefined) {
+        return options;
+    }
+    const { commits, progressCallback } = progress;
+    return merge(options, {
+        processCallback: (process) => {
+            // If Node.js encounters a synchronous runtime error while spawning
+            // `stderr` will be undefined and the error will be emitted asynchronously
+            if (process.stderr === null) {
+                return;
+            }
+            const parser = new GitRebaseParser(commits);
+            byline(process.stderr).on('data', (line) => {
+                const progress = parser.parse(line);
+                if (progress != null) {
+                    progressCallback(progress);
+                }
+            });
+        },
+    });
+}
+/**
+ * A stub function to use for initiating rebase in the app.
+ *
+ * If the rebase fails, the repository will be in an indeterminate state where
+ * the rebase is stuck.
+ *
+ * If the rebase completes without error, `featureBranch` will be checked out
+ * and it will probably have a different commit history.
+ *
+ * @param baseBranch the ref to start the rebase from
+ * @param targetBranch the ref to rebase onto `baseBranch`
+ */
+export async function rebase(repository, baseBranch, targetBranch, progressCallback) {
+    const baseOptions = {
+        expectedErrors: new Set([GitError.RebaseConflicts]),
+    };
+    let options = baseOptions;
+    if (progressCallback !== undefined) {
+        const commits = await getCommitsBetweenCommits(repository, baseBranch.tip.sha, targetBranch.tip.sha);
+        if (commits === null) {
+            // BadRevision can be raised here if git rev-list is unable to resolve a
+            // ref to a commit ID, so we need to signal to the caller that this rebase
+            // is not possible to perform
+            console.warn('Unable to rebase these branches because one or both of the refs do not exist in the repository');
+            return RebaseResult.Error;
+        }
+        options = configureOptionsForRebase(baseOptions, {
+            commits,
+            progressCallback,
+        });
+    }
+    const result = await git([...gitRebaseArguments(), 'rebase', baseBranch.name, targetBranch.name], repository.path, 'rebase', options);
+    return parseRebaseResult(result);
+}
+/** Abandon the current rebase operation */
+export async function abortRebase(repository) {
+    await git(['rebase', '--abort'], repository.path, 'abortRebase');
+}
+function parseRebaseResult(result) {
+    if (result.exitCode === 0) {
+        if (result.stdout.trim().match(/^Current branch [^ ]+ is up to date.$/i)) {
+            return RebaseResult.AlreadyUpToDate;
+        }
+        return RebaseResult.CompletedWithoutError;
+    }
+    if (result.gitError === GitError.RebaseConflicts) {
+        return RebaseResult.ConflictsEncountered;
+    }
+    if (result.gitError === GitError.UnresolvedConflicts) {
+        return RebaseResult.OutstandingFilesNotStaged;
+    }
+    throw new Error(`Unhandled result found: '${JSON.stringify(result)}'`);
+}
+/**
+ * Proceed with the current rebase operation and report back on whether it completed
+ *
+ * It is expected that the index has staged files which are cleanly rebased onto
+ * the base branch, and the remaining unstaged files are those which need manual
+ * resolution or were changed by the user to address inline conflicts.
+ *
+ */
+export async function continueRebase(repository, files, manualResolutions = new Map(), opts) {
+    const trackedFiles = files.filter(f => {
+        return f.status.kind !== AppFileStatusKind.Untracked;
+    });
+    // apply conflict resolutions
+    for (const [path, resolution] of manualResolutions) {
+        const file = files.find(f => f.path === path);
+        if (file !== undefined) {
+            await stageManualConflictResolution(repository, file, resolution);
+        }
+        else {
+            console.error(`[continueRebase] couldn't find file ${path} even though there's a manual resolution for it`);
+        }
+    }
+    const otherFiles = trackedFiles.filter(f => !manualResolutions.has(f.path));
+    await stageFiles(repository, otherFiles);
+    const status = await getStatus(repository, false);
+    if (status == null) {
+        console.warn(`[continueRebase] unable to get status after staging changes, skipping any other steps`);
+        return RebaseResult.Aborted;
+    }
+    const rebaseCurrentCommit = await readRebaseHead(repository);
+    if (rebaseCurrentCommit === null) {
+        return RebaseResult.Aborted;
+    }
+    const trackedFilesAfter = status.workingDirectory.files.filter(f => f.status.kind !== AppFileStatusKind.Untracked);
+    const baseOptions = {
+        expectedErrors: new Set([
+            GitError.RebaseConflicts,
+            GitError.UnresolvedConflicts,
+        ]),
+        env: {
+            GIT_EDITOR: opts?.gitEditor ?? ':',
+        },
+    };
+    let options = baseOptions;
+    if (opts?.progressCallback) {
+        const snapshot = await getRebaseSnapshot(repository);
+        if (snapshot === null) {
+            console.warn(`[continueRebase] unable to get rebase status, skipping any other steps`);
+            return RebaseResult.Aborted;
+        }
+        options = configureOptionsForRebase(baseOptions, {
+            commits: snapshot.commits,
+            progressCallback: opts.progressCallback,
+        });
+    }
+    options = {
+        ...options,
+        onTerminalOutputAvailable: opts?.onTerminalOutputAvailable,
+        onHookFailure: opts?.onHookFailure,
+        onHookProgress: opts?.onHookProgress,
+    };
+    if (trackedFilesAfter.length === 0) {
+        console.warn(`[rebase] no tracked changes to commit for ${rebaseCurrentCommit}, continuing rebase but skipping this commit`);
+        const result = await git(['rebase', '--skip', ...(opts?.noVerify ? ['--no-verify'] : [])], repository.path, 'continueRebaseSkipCurrentCommit', options);
+        return parseRebaseResult(result);
+    }
+    const result = await git(['rebase', '--continue', ...(opts?.noVerify ? ['--no-verify'] : [])], repository.path, 'continueRebase', options);
+    return parseRebaseResult(result);
+}
+/**
+ * Method for initiating interactive rebase in the app.
+ *
+ * In order to modify the interactive todo list during interactive rebase, we
+ * create a temporary todo list of our own. Pass that file's path into our
+ * interactive rebase and using the sequence.editor to cat replace the
+ * interactive todo list with the contents of our generated one.
+ *
+ * @param pathOfGeneratedTodo path to generated todo list for interactive rebase
+ * @param lastRetainedCommitRef the commit before the earliest commit to be
+ * changed during the interactive rebase or null if commit is root (first commit
+ * in history) of branch
+ */
+export async function rebaseInteractive(repository, pathOfGeneratedTodo, lastRetainedCommitRef, opts) {
+    const baseOptions = {
+        expectedErrors: new Set([GitError.RebaseConflicts]),
+        env: {
+            GIT_SEQUENCE_EDITOR: undefined,
+            GIT_EDITOR: opts?.gitEditor ?? ':',
+        },
+    };
+    let options = baseOptions;
+    const { progressCallback, commits } = opts ?? {};
+    if (progressCallback) {
+        if (!commits) {
+            console.warn(`Unable to interactively rebase if no commits`);
+            return RebaseResult.Error;
+        }
+        options = configureOptionsForRebase(baseOptions, {
+            commits,
+            progressCallback,
+        });
+    }
+    options = {
+        ...options,
+        onHookProgress: opts?.onHookProgress,
+        onHookFailure: opts?.onHookFailure,
+        onTerminalOutputAvailable: opts?.onTerminalOutputAvailable,
+    };
+    /* If the commit is the first commit in the branch, we cannot reference it
+    using the sha thus if lastRetainedCommitRef is null (we couldn't define it),
+    we must use the --root flag */
+    const ref = lastRetainedCommitRef == null ? '--root' : lastRetainedCommitRef;
+    const result = await git([
+        '-c',
+        // This replaces interactive todo with contents of file at pathOfGeneratedTodo
+        `sequence.editor=cat "${pathOfGeneratedTodo}" >`,
+        'rebase',
+        ...(opts?.noVerify ? ['--no-verify'] : []),
+        '-i',
+        ref,
+    ], repository.path, opts?.action ?? 'Interactive rebase', options);
+    return parseRebaseResult(result);
+}
+//# sourceMappingURL=rebase.js.map

package/dist/git/rebase.js.map

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

package/dist/git/reflog.d.ts

@@ -0,0 +1,14 @@
+import { Repository } from '../models/repository.js';
+/**
+ * Get the `limit` most recently checked out branches.
+ */
+export declare function getRecentBranches(repository: Repository, limit: number): Promise<ReadonlyArray<string>>;
+/**
+ * Gets the distinct list of branches that have been checked out after a specific date
+ * Returns a map keyed on branch names
+ *
+ * @param repository the repository who's reflog you want to check
+ * @param afterDate filters checkouts so that only those occurring on or after this date are returned
+ * @returns map of branch name -> checkout date
+ */
+export declare function getBranchCheckouts(repository: Repository, afterDate: Date): Promise<Map<string, Date>>;

package/dist/git/reflog.js

@@ -0,0 +1,88 @@
+import { git } from './core.js';
+/**
+ * Get the `limit` most recently checked out branches.
+ */
+export async function getRecentBranches(repository, limit) {
+    // "git reflog show" is just an alias for "git log -g --abbrev-commit --pretty=oneline"
+    // but by using log we can give it a max number which should prevent us from balling out
+    // of control when there's ginormous reflogs around (as in e.g. github/github).
+    const regex = new RegExp(/.*? (renamed|checkout)(?:: moving from|\s*) (?:refs\/heads\/|\s*)(.*?) to (?:refs\/heads\/|\s*)(.*?)$/i);
+    const result = await git([
+        'log',
+        '-g',
+        '--no-abbrev-commit',
+        '--pretty=oneline',
+        'HEAD',
+        '-n',
+        '2500',
+        '--',
+    ], repository.path, 'getRecentBranches', { successExitCodes: new Set([0, 128]) });
+    if (result.exitCode === 128) {
+        // error code 128 is returned if the branch is unborn
+        return [];
+    }
+    const lines = result.stdout.split('\n');
+    const names = new Set();
+    const excludedNames = new Set();
+    for (const line of lines) {
+        const result = regex.exec(line);
+        if (result && result.length === 4) {
+            const operationType = result[1];
+            const excludeBranchName = result[2];
+            const branchName = result[3];
+            if (operationType === 'renamed') {
+                // exclude intermediate-state renaming branch from recent branches
+                excludedNames.add(excludeBranchName);
+            }
+            if (!excludedNames.has(branchName)) {
+                names.add(branchName);
+            }
+        }
+        if (names.size === limit) {
+            break;
+        }
+    }
+    return [...names];
+}
+const noCommitsOnBranchRe = new RegExp("fatal: your current branch '.*' does not have any commits yet");
+/**
+ * Gets the distinct list of branches that have been checked out after a specific date
+ * Returns a map keyed on branch names
+ *
+ * @param repository the repository who's reflog you want to check
+ * @param afterDate filters checkouts so that only those occurring on or after this date are returned
+ * @returns map of branch name -> checkout date
+ */
+export async function getBranchCheckouts(repository, afterDate) {
+    //regexr.com/46n1v
+    const regex = new RegExp(/^[a-z0-9]{40}\sHEAD@{(.*)}\scheckout: moving from\s.*\sto\s(.*)$/);
+    const result = await git([
+        'reflog',
+        '--date=iso',
+        `--after="${afterDate.toISOString()}"`,
+        '--pretty=%H %gd %gs',
+        `--grep-reflog=checkout: moving from .* to .*$`,
+        '--',
+    ], repository.path, 'getCheckoutsAfterDate', { successExitCodes: new Set([0, 128]) });
+    const checkouts = new Map();
+    // edge case where orphaned branch is created but Git raises error when
+    // reading the reflog on this new branch as it has no commits
+    //
+    // see https://github.com/desktop/desktop/issues/7983 for more information
+    if (result.exitCode === 128 && noCommitsOnBranchRe.test(result.stderr)) {
+        return checkouts;
+    }
+    const lines = result.stdout.split('\n');
+    for (const line of lines) {
+        const parsedLine = regex.exec(line);
+        if (parsedLine === null || parsedLine.length !== 3) {
+            continue;
+        }
+        const [, timestamp, branchName] = parsedLine;
+        if (!checkouts.has(branchName)) {
+            checkouts.set(branchName, new Date(timestamp));
+        }
+    }
+    return checkouts;
+}
+//# sourceMappingURL=reflog.js.map

package/dist/git/reflog.js.map

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

package/dist/git/refs.d.ts

@@ -0,0 +1,26 @@
+import { Repository } from '../models/repository.js';
+/**
+ * Format a local branch in the ref syntax, ensuring situations when the branch
+ * is ambiguous are handled.
+ *
+ * Examples:
+ *  - main -> refs/heads/main
+ *  - heads/Microsoft/main -> refs/heads/Microsoft/main
+ *
+ * @param branch The local branch name
+ */
+export declare function formatAsLocalRef(name: string): string;
+/**
+ * Read a symbolic ref from the repository.
+ *
+ * Symbolic refs are used to point to other refs, similar to how symlinks work
+ * for files. Because refs can be removed easily from a Git repository,
+ * symbolic refs should only be used when absolutely necessary.
+ *
+ * @param repository The repository to lookup
+ * @param ref The symbolic ref to resolve
+ *
+ * @returns the canonical ref, if found, or `null` if `ref` cannot be found or
+ *          is not a symbolic ref
+ */
+export declare function getSymbolicRef(repository: Repository, ref: string): Promise<string | null>;

package/dist/git/refs.js

@@ -0,0 +1,53 @@
+import { git } from './core.js';
+/**
+ * Format a local branch in the ref syntax, ensuring situations when the branch
+ * is ambiguous are handled.
+ *
+ * Examples:
+ *  - main -> refs/heads/main
+ *  - heads/Microsoft/main -> refs/heads/Microsoft/main
+ *
+ * @param branch The local branch name
+ */
+export function formatAsLocalRef(name) {
+    if (name.startsWith('heads/')) {
+        // In some cases, Git will report this name explicitly to distinguish from
+        // a remote ref with the same name - this ensures we format it correctly.
+        return `refs/${name}`;
+    }
+    else if (!name.startsWith('refs/heads/')) {
+        // By default Git will drop the heads prefix unless absolutely necessary
+        // - include this to ensure the ref is fully qualified.
+        return `refs/heads/${name}`;
+    }
+    else {
+        return name;
+    }
+}
+/**
+ * Read a symbolic ref from the repository.
+ *
+ * Symbolic refs are used to point to other refs, similar to how symlinks work
+ * for files. Because refs can be removed easily from a Git repository,
+ * symbolic refs should only be used when absolutely necessary.
+ *
+ * @param repository The repository to lookup
+ * @param ref The symbolic ref to resolve
+ *
+ * @returns the canonical ref, if found, or `null` if `ref` cannot be found or
+ *          is not a symbolic ref
+ */
+export async function getSymbolicRef(repository, ref) {
+    const result = await git(['symbolic-ref', '-q', ref], repository.path, 'getSymbolicRef', {
+        //  - 1 is the exit code that Git throws in quiet mode when the ref is not a
+        //    symbolic ref
+        //  - 128 is the generic error code that Git returns when it can't find
+        //    something
+        successExitCodes: new Set([0, 1, 128]),
+    });
+    if (result.exitCode === 1 || result.exitCode === 128) {
+        return null;
+    }
+    return result.stdout.trim();
+}
+//# sourceMappingURL=refs.js.map

package/dist/git/refs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"refs.js","sourceRoot":"","sources":["../../src/git/refs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAA;AAG/B;;;;;;;;;GASG;AACH,MAAM,UAAU,gBAAgB,CAAC,IAAY;IAC3C,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC9B,0EAA0E;QAC1E,yEAAyE;QACzE,OAAO,QAAQ,IAAI,EAAE,CAAA;IACvB,CAAC;SAAM,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;QAC3C,wEAAwE;QACxE,uDAAuD;QACvD,OAAO,cAAc,IAAI,EAAE,CAAA;IAC7B,CAAC;SAAM,CAAC;QACN,OAAO,IAAI,CAAA;IACb,CAAC;AACH,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,UAAsB,EACtB,GAAW;IAEX,MAAM,MAAM,GAAG,MAAM,GAAG,CACtB,CAAC,cAAc,EAAE,IAAI,EAAE,GAAG,CAAC,EAC3B,UAAU,CAAC,IAAI,EACf,gBAAgB,EAChB;QACE,4EAA4E;QAC5E,kBAAkB;QAClB,uEAAuE;QACvE,eAAe;QACf,gBAAgB,EAAE,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;KACvC,CACF,CAAA;IAED,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC,IAAI,MAAM,CAAC,QAAQ,KAAK,GAAG,EAAE,CAAC;QACrD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAA;AAC7B,CAAC"}

package/dist/git/remote.d.ts

@@ -0,0 +1,31 @@
+import { Repository } from '../models/repository.js';
+import { IRemote } from '../models/remote.js';
+/**
+ * List the remotes, sorted alphabetically by `name`, for a repository.
+ */
+export declare function getRemotes(repository: Repository): Promise<ReadonlyArray<IRemote>>;
+/**
+ * List the remotes, sorted alphabetically by `name`, for a repository path.
+ */
+export declare function getRemotesFromPath(path: string): Promise<ReadonlyArray<IRemote>>;
+export declare const memoizedGetRemotesFromPath: import("memoize-one").MemoizedFn<typeof getRemotesFromPath>;
+/** Add a new remote with the given URL. */
+export declare function addRemote(repository: Repository, name: string, url: string): Promise<IRemote>;
+/** Removes an existing remote, or silently errors if it doesn't exist */
+export declare function removeRemote(repository: Repository, name: string): Promise<void>;
+/** Changes the URL for the remote that matches the given name  */
+export declare function setRemoteURL(repository: Repository, name: string, url: string): Promise<true>;
+/**
+ * Get the URL for the remote that matches the given name.
+ *
+ * Returns null if the remote could not be found
+ */
+export declare function getRemoteURL(repository: Repository, name: string): Promise<string | null>;
+/**
+ * Update the HEAD ref of the remote, which is the default branch.
+ *
+ * @param isBackgroundTask Whether the fetch is being performed as a
+ *                         background task as opposed to being user initiated
+ */
+export declare function updateRemoteHEAD(repository: Repository, remote: IRemote, isBackgroundTask: boolean): Promise<void>;
+export declare function getRemoteHEAD(repository: Repository, remote: string): Promise<string | null>;