git-chopstick-core 0.1.1 → 0.1.2

package/dist/git/submodule.js

@@ -0,0 +1,153 @@
+import { git } from './core.js';
+import { pathExists } from '../lib/path-exists.js';
+import { executionOptionsWithProgress } from '../lib/progress/index.js';
+import { envForRemoteOperation, getFallbackUrlForProxyResolve, } from './environment.js';
+import { AuthenticationErrors } from './authentication.js';
+import { join, resolve } from 'path';
+import { readFile } from 'fs/promises';
+/**
+ * Update submodules after a git operation.
+ *
+ * @param repository - The repository in which to update submodules
+ * @param remote - The remote for environment setup (can be null)
+ * @param progressCallback - An optional function which will be invoked
+ *                           with information about the current progress
+ *                           of the submodule update operation.
+ * @param progressKind - The kind of progress event ('checkout', 'pull', etc.)
+ * @param title - The title to use for progress reporting
+ * @param targetOrRemote - The target (for checkout) or remote name (for pull)
+ * @param allowFileProtocol - Whether to allow file:// protocol for submodules
+ */
+export async function updateSubmodulesAfterOperation(repository, remote, progressCallback, progressKind, title, targetOrRemote, allowFileProtocol) {
+    const opts = {
+        env: await envForRemoteOperation(getFallbackUrlForProxyResolve(repository, remote)),
+        expectedErrors: AuthenticationErrors,
+    };
+    const args = [
+        ...(allowFileProtocol ? ['-c', 'protocol.file.allow=always'] : []),
+        'submodule',
+        'update',
+        '--init',
+        '--recursive',
+    ];
+    if (!progressCallback) {
+        await git(args, repository.path, 'updateSubmodules', opts);
+        return;
+    }
+    // Initial progress
+    progressCallback({
+        kind: progressKind,
+        title,
+        description: 'Updating submodules',
+        value: 0,
+        // Add the target or remote field based on the progress kind
+        ...(progressKind === 'checkout'
+            ? { target: targetOrRemote }
+            : { remote: targetOrRemote }),
+    });
+    let submoduleEventCount = 0;
+    const progressOpts = await executionOptionsWithProgress({ ...opts, trackLFSProgress: true }, {
+        parse(line) {
+            if (line.match(/^Submodule path (.)+?: checked out /) ||
+                line.startsWith('Cloning into ')) {
+                submoduleEventCount += 1;
+            }
+            return {
+                kind: 'context',
+                text: `Updating submodules: ${line}`,
+                // Math taken from https://math.stackexchange.com/a/2323106
+                // We do this to fake a progress that slows down as we process more
+                // events, as we don't know how many submodules there are upfront, or
+                // what does git have to do with them (cloning, just checking them
+                // out...)
+                percent: 1 - Math.exp(-submoduleEventCount * 0.25),
+            };
+        },
+    }, progress => {
+        const description = progress.kind === 'progress' ? progress.details.text : progress.text;
+        const value = progress.percent;
+        progressCallback({
+            kind: progressKind,
+            title,
+            description,
+            value,
+            ...(progressKind === 'checkout'
+                ? { target: targetOrRemote }
+                : { remote: targetOrRemote }),
+        });
+    });
+    await git(args, repository.path, 'updateSubmodules', progressOpts);
+    // Final progress
+    progressCallback({
+        kind: progressKind,
+        title,
+        description: 'Submodules updated',
+        value: 1,
+        ...(progressKind === 'checkout'
+            ? { target: targetOrRemote }
+            : { remote: targetOrRemote }),
+    });
+}
+export async function listSubmodules(repository) {
+    const [submodulesFile, submodulesDir] = await Promise.all([
+        pathExists(join(repository.path, '.gitmodules')),
+        pathExists(join(repository.path, '.git', 'modules')),
+    ]);
+    if (!submodulesFile && !submodulesDir) {
+        // repo path + .gitmodules and + .git/modules covers the vast majority of
+        // "normal" repositories but if we're in a linked worktree the modules
+        // directory is actually in the git common dir so we'll also check for the
+        // existence of the modules directory there as well before giving up on the
+        // existence of submodules in this repo. We're reading the commondir file
+        // ourselves here instead of calling out to git to avoid the cost of
+        // spawning a process on Windows
+        const commonDirPath = join(repository.resolvedGitDir, 'commondir');
+        const commonDir = await readFile(commonDirPath, 'utf8')
+            .then(content => content.replace(/\r?\n$/, ''))
+            .then(p => (p ? resolve(repository.resolvedGitDir, p) : null))
+            .catch(() => null);
+        if (!commonDir || !(await pathExists(join(commonDir, 'modules')))) {
+            console.info('No submodules found. Skipping "git submodule status"');
+            return [];
+        }
+    }
+    // We don't recurse when listing submodules here because we don't have a good
+    // story about managing these currently. So for now we're only listing
+    // changes to the top-level submodules to be consistent with `git status`
+    const { stdout, exitCode } = await git(['submodule', 'status', '--'], repository.path, 'listSubmodules', { successExitCodes: new Set([0, 128]) });
+    if (exitCode === 128) {
+        // unable to parse submodules in repository, giving up
+        return [];
+    }
+    const submodules = new Array();
+    // entries are of the format:
+    //  1eaabe34fc6f486367a176207420378f587d3b48 git (v2.16.0-rc0)
+    //
+    // first character:
+    //   - " " if no change
+    //   - "-" if the submodule is not initialized
+    //   - "+" if the currently checked out submodule commit does not match the SHA-1 found in the index of the containing repository
+    //   - "U" if the submodule has merge conflicts
+    //
+    // then the 40-character SHA represents the current commit
+    //
+    // then the path to the submodule
+    //
+    // then the output of `git describe` for the submodule in braces
+    // we're not leveraging this in the app, so go and read the docs
+    // about it if you want to learn more:
+    //
+    // https://git-scm.com/docs/git-describe
+    const statusRe = /^.([^ ]+) (.+) \((.+?)\)$/gm;
+    for (const [, sha, path, describe] of stdout.matchAll(statusRe)) {
+        submodules.push({ path, url: '', describe, sha, status: { commitChanged: false, modifiedChanges: false, untrackedChanges: false } });
+    }
+    return submodules;
+}
+export async function resetSubmodulePaths(repository, paths) {
+    if (paths.length === 0) {
+        return;
+    }
+    await git(['submodule', 'update', '--recursive', '--force', '--', ...paths], repository.path, 'updateSubmodule');
+}
+//# sourceMappingURL=submodule.js.map

package/dist/git/submodule.js.map

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

package/dist/git/tag.d.ts

@@ -0,0 +1,32 @@
+import { Repository } from '../models/repository.js';
+import { IRemote } from '../models/remote.js';
+/**
+ * Create a new tag on the given target commit.
+ *
+ * @param repository        - The repository in which to create the new tag.
+ * @param name              - The name of the new tag.
+ * @param targetCommitSha   - The SHA of the commit where the new tag will live on.
+ */
+export declare function createTag(repository: Repository, name: string, targetCommitSha: string): Promise<void>;
+/**
+ * Delete a tag.
+ *
+ * @param repository        - The repository in which to create the new tag.
+ * @param name              - The name of the tag to delete.
+ */
+export declare function deleteTag(repository: Repository, name: string): Promise<void>;
+/**
+ * Gets all the local tags. Returns a Map with the tag name and the commit it points to.
+ *
+ * @param repository    The repository in which to get all the tags from.
+ */
+export declare function getAllTags(repository: Repository): Promise<Map<string, string>>;
+/**
+ * Fetches the tags that will get pushed to the remote repository (it does a network request).
+ *
+ * @param repository  - The repository in which to check for unpushed tags
+ * @param account     - The account to use when authenticating with the remote
+ * @param remote      - The remote to check for unpushed tags
+ * @param branchName  - The branch that will be used on the push command
+ */
+export declare function fetchTagsToPush(repository: Repository, remote: IRemote, branchName: string): Promise<ReadonlyArray<string>>;

package/dist/git/tag.js

@@ -0,0 +1,101 @@
+import { git } from './core.js';
+import { envForRemoteOperation } from './environment.js';
+/**
+ * Create a new tag on the given target commit.
+ *
+ * @param repository        - The repository in which to create the new tag.
+ * @param name              - The name of the new tag.
+ * @param targetCommitSha   - The SHA of the commit where the new tag will live on.
+ */
+export async function createTag(repository, name, targetCommitSha) {
+    const args = ['tag', '-a', '-m', '', name, targetCommitSha];
+    await git(args, repository.path, 'createTag');
+}
+/**
+ * Delete a tag.
+ *
+ * @param repository        - The repository in which to create the new tag.
+ * @param name              - The name of the tag to delete.
+ */
+export async function deleteTag(repository, name) {
+    const args = ['tag', '-d', name];
+    await git(args, repository.path, 'deleteTag');
+}
+/**
+ * Gets all the local tags. Returns a Map with the tag name and the commit it points to.
+ *
+ * @param repository    The repository in which to get all the tags from.
+ */
+export async function getAllTags(repository) {
+    const args = ['show-ref', '--tags', '-d'];
+    const tags = await git(args, repository.path, 'getAllTags', {
+        successExitCodes: new Set([0, 1]), // when there are no tags, git exits with 1.
+    });
+    const tagsArray = tags.stdout
+        .split('\n')
+        .filter(line => line !== '')
+        .map(line => {
+        const [commitSha, rawTagName] = line.split(' ');
+        // Normalize tag names by removing the leading ref/tags/ and the trailing ^{}.
+        //
+        // git show-ref returns two entries for annotated tags:
+        // deadbeef refs/tags/annotated-tag
+        // de510b99 refs/tags/annotated-tag^{}
+        //
+        // The first entry sha correspond to the blob object of the annotation, while the second
+        // entry corresponds to the actual commit where the tag was created.
+        // By normalizing the tag name we can make sure that the commit sha gets stored in the returned
+        // Map of commits (since git will always print the entry with the commit sha at the end).
+        const tagName = rawTagName
+            .replace(/^refs\/tags\//, '')
+            .replace(/\^\{\}$/, '');
+        return [tagName, commitSha];
+    });
+    return new Map(tagsArray);
+}
+/**
+ * Fetches the tags that will get pushed to the remote repository (it does a network request).
+ *
+ * @param repository  - The repository in which to check for unpushed tags
+ * @param account     - The account to use when authenticating with the remote
+ * @param remote      - The remote to check for unpushed tags
+ * @param branchName  - The branch that will be used on the push command
+ */
+export async function fetchTagsToPush(repository, remote, branchName) {
+    const args = [
+        'push',
+        remote.name,
+        branchName,
+        '--follow-tags',
+        '--dry-run',
+        '--no-verify',
+        '--porcelain',
+    ];
+    const result = await git(args, repository.path, 'fetchTagsToPush', {
+        env: await envForRemoteOperation(remote.url),
+        successExitCodes: new Set([0, 1, 128]),
+    });
+    if (result.exitCode !== 0 && result.exitCode !== 1) {
+        // Only when the exit code of git is 0 or 1, its stdout is parseable.
+        // In other cases, we just rethrow the error so our memoization layer
+        // doesn't cache it indefinitely.
+        throw result.gitError;
+    }
+    const lines = result.stdout.split('\n');
+    let currentLine = 1;
+    const unpushedTags = [];
+    // the last line of this porcelain command is always 'Done'
+    while (currentLine < lines.length && lines[currentLine] !== 'Done') {
+        const line = lines[currentLine];
+        const parts = line.split('\t');
+        if (parts[0] === '*' && parts[2] === '[new tag]') {
+            const [tagName] = parts[1].split(':');
+            if (tagName !== undefined) {
+                unpushedTags.push(tagName.replace(/^refs\/tags\//, ''));
+            }
+        }
+        currentLine++;
+    }
+    return unpushedTags;
+}
+//# sourceMappingURL=tag.js.map

package/dist/git/tag.js.map

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

package/dist/git/update-index.d.ts

@@ -0,0 +1,11 @@
+import { Repository } from '../models/repository.js';
+import { WorkingDirectoryFileChange } from '../models/status.js';
+/**
+ * Stage all the given files by either staging the entire path or by applying
+ * a patch.
+ *
+ * Note that prior to stageFiles the index has been completely reset,
+ * the job of this function is to set up the index in such a way that it
+ * reflects what the user has selected in the app.
+ */
+export declare function stageFiles(repository: Repository, files: ReadonlyArray<WorkingDirectoryFileChange>): Promise<void>;

package/dist/git/update-index.js

@@ -0,0 +1,99 @@
+import { git } from './core.js';
+import { DiffSelectionType } from '../models/diff/index.js';
+import { applyPatchToIndex } from './apply.js';
+import { AppFileStatusKind, } from '../models/status.js';
+/**
+ * Updates the index with file contents from the working tree. This method
+ * is a noop when no paths are provided.
+ *
+ * @param paths   A list of paths which are to be updated with file contents and
+ *                status from the working directory.
+ *
+ * @param options See the IUpdateIndexOptions interface for more details.
+ */
+async function updateIndex(repository, paths, options = {}) {
+    if (paths.length === 0) {
+        return;
+    }
+    const args = ['update-index'];
+    if (options.add !== false) {
+        args.push('--add');
+    }
+    if (options.remove !== false || options.forceRemove === true) {
+        args.push('--remove');
+    }
+    if (options.forceRemove) {
+        args.push('--force-remove');
+    }
+    if (options.replace !== false) {
+        args.push('--replace');
+    }
+    args.push('-z', '--stdin');
+    await git(args, repository.path, 'updateIndex', {
+        stdin: paths.join('\0'),
+    });
+}
+/**
+ * Stage all the given files by either staging the entire path or by applying
+ * a patch.
+ *
+ * Note that prior to stageFiles the index has been completely reset,
+ * the job of this function is to set up the index in such a way that it
+ * reflects what the user has selected in the app.
+ */
+export async function stageFiles(repository, files) {
+    const normal = [];
+    const oldRenamed = [];
+    const partial = [];
+    const deletedFiles = [];
+    for (const file of files) {
+        if (file.selection.getSelectionType() === DiffSelectionType.All) {
+            normal.push(file.path);
+            if (file.status.kind === AppFileStatusKind.Renamed) {
+                oldRenamed.push(file.status.oldPath);
+            }
+            else if (file.status.kind === AppFileStatusKind.Deleted) {
+                deletedFiles.push(file.path);
+            }
+        }
+        else {
+            partial.push(file);
+        }
+    }
+    // Staging files happens in three steps.
+    //
+    // In the first step we run through all of the renamed files, or
+    // more specifically the source files (old) that were renamed and
+    // forcefully remove them from the index. We do this in order to handle
+    // the scenario where a file has been renamed and a new file has been
+    // created in its original position. Think of it like this
+    //
+    // $ touch foo && git add foo && git commit -m 'foo'
+    // $ git mv foo bar
+    // $ echo "I'm a new foo" > foo
+    //
+    // Now we have a file which is of type Renamed that has its path set
+    // to 'bar' and its oldPath set to 'foo'. But there's a new file called
+    // foo in the repository. So if the user selects the 'foo -> bar' change
+    // but not the new 'foo' file for inclusion in this commit we don't
+    // want to add the new 'foo', we just want to recreate the move in the
+    // index. We do this by forcefully removing the old path from the index
+    // and then later (in step 2) stage the new file.
+    await updateIndex(repository, oldRenamed, { forceRemove: true });
+    // In the second step we update the index to match
+    // the working directory in the case of new, modified, deleted,
+    // and copied files as well as the destination paths for renamed
+    // paths.
+    await updateIndex(repository, normal);
+    // This third step will only happen if we have files that have been marked
+    // for deletion. This covers us for files that were blown away in the last
+    // updateIndex call
+    await updateIndex(repository, deletedFiles, { forceRemove: true });
+    // Finally we run through all files that have partial selections.
+    // We don't care about renamed or not here since applyPatchToIndex
+    // has logic to support that scenario.
+    for (const file of partial) {
+        await applyPatchToIndex(repository, file);
+    }
+}
+//# sourceMappingURL=update-index.js.map

package/dist/git/update-index.js.map

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

package/dist/git/update-ref.d.ts

@@ -0,0 +1,23 @@
+import { Repository } from '../models/repository.js';
+/**
+ * Update the ref to a new value.
+ *
+ * @param repository - The repository in which the ref exists.
+ * @param ref        - The ref to update. Must be fully qualified
+ *                     (e.g., `refs/heads/NAME`).
+ * @param oldValue   - The value we expect the ref to have currently. If it
+ *                     doesn't match, the update will be aborted.
+ * @param newValue   - The new value for the ref.
+ * @param reason     - The reflog entry.
+ */
+export declare function updateRef(repository: Repository, ref: string, oldValue: string, newValue: string, reason: string): Promise<void>;
+/**
+ * Remove a ref.
+ *
+ * @param repository - The repository in which the ref exists.
+ * @param ref        - The ref to remove. Should be fully qualified, but may also be 'HEAD'.
+ * @param reason     - The reflog entry (optional). Note that this is only useful when
+ *                     deleting the HEAD reference as deleting any other reference will
+ *                     implicitly delete the reflog file for that reference as well.
+ */
+export declare function deleteRef(repository: Repository, ref: string, reason?: string): Promise<void>;

package/dist/git/update-ref.js

@@ -0,0 +1,32 @@
+import { git } from './core.js';
+/**
+ * Update the ref to a new value.
+ *
+ * @param repository - The repository in which the ref exists.
+ * @param ref        - The ref to update. Must be fully qualified
+ *                     (e.g., `refs/heads/NAME`).
+ * @param oldValue   - The value we expect the ref to have currently. If it
+ *                     doesn't match, the update will be aborted.
+ * @param newValue   - The new value for the ref.
+ * @param reason     - The reflog entry.
+ */
+export async function updateRef(repository, ref, oldValue, newValue, reason) {
+    await git(['update-ref', ref, newValue, oldValue, '-m', reason], repository.path, 'updateRef');
+}
+/**
+ * Remove a ref.
+ *
+ * @param repository - The repository in which the ref exists.
+ * @param ref        - The ref to remove. Should be fully qualified, but may also be 'HEAD'.
+ * @param reason     - The reflog entry (optional). Note that this is only useful when
+ *                     deleting the HEAD reference as deleting any other reference will
+ *                     implicitly delete the reflog file for that reference as well.
+ */
+export async function deleteRef(repository, ref, reason) {
+    const args = ['update-ref', '-d', ref];
+    if (reason !== undefined) {
+        args.push('-m', reason);
+    }
+    await git(args, repository.path, 'deleteRef');
+}
+//# sourceMappingURL=update-ref.js.map

package/dist/git/update-ref.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-ref.js","sourceRoot":"","sources":["../../src/git/update-ref.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAA;AAG/B;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,UAAsB,EACtB,GAAW,EACX,QAAgB,EAChB,QAAgB,EAChB,MAAc;IAEd,MAAM,GAAG,CACP,CAAC,YAAY,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,EACrD,UAAU,CAAC,IAAI,EACf,WAAW,CACZ,CAAA;AACH,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,UAAsB,EACtB,GAAW,EACX,MAAe;IAEf,MAAM,IAAI,GAAG,CAAC,YAAY,EAAE,IAAI,EAAE,GAAG,CAAC,CAAA;IAEtC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IACzB,CAAC;IAED,MAAM,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,WAAW,CAAC,CAAA;AAC/C,CAAC"}

package/dist/git/var.d.ts

@@ -0,0 +1,18 @@
+import { Repository } from '../models/repository.js';
+import { CommitIdentity } from '../models/commit-identity.js';
+/**
+ * Gets the author identity, ie the name and email which would
+ * have been used should a commit have been performed in this
+ * instance. This differs from what's stored in the user.name
+ * and user.email config variables in that it will match what
+ * Git itself will use in a commit even if there's no name or
+ * email configured. If no email or name is configured Git will
+ * attempt to come up with a suitable replacement using the
+ * signed-in system user and hostname.
+ *
+ * A null return value means that no name/and or email was set
+ * and the user.useconfigonly setting prevented Git from making
+ * up a user ident string. If this returns null any subsequent
+ * commits can be expected to fail as well.
+ */
+export declare function getAuthorIdentity(repository: Repository): Promise<CommitIdentity | null>;

package/dist/git/var.js

@@ -0,0 +1,33 @@
+import { git } from './core.js';
+import { CommitIdentity } from '../models/commit-identity.js';
+/**
+ * Gets the author identity, ie the name and email which would
+ * have been used should a commit have been performed in this
+ * instance. This differs from what's stored in the user.name
+ * and user.email config variables in that it will match what
+ * Git itself will use in a commit even if there's no name or
+ * email configured. If no email or name is configured Git will
+ * attempt to come up with a suitable replacement using the
+ * signed-in system user and hostname.
+ *
+ * A null return value means that no name/and or email was set
+ * and the user.useconfigonly setting prevented Git from making
+ * up a user ident string. If this returns null any subsequent
+ * commits can be expected to fail as well.
+ */
+export async function getAuthorIdentity(repository) {
+    const result = await git(['var', 'GIT_AUTHOR_IDENT'], repository.path, 'getAuthorIdentity', {
+        successExitCodes: new Set([0, 128]),
+    });
+    // If user.user.useconfigonly is set and no user.name or user.email
+    if (result.exitCode === 128) {
+        return null;
+    }
+    try {
+        return CommitIdentity.parseIdentity(result.stdout);
+    }
+    catch (err) {
+        return null;
+    }
+}
+//# sourceMappingURL=var.js.map

package/dist/git/var.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"var.js","sourceRoot":"","sources":["../../src/git/var.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAA;AAE/B,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAE7D;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,UAAsB;IAEtB,MAAM,MAAM,GAAG,MAAM,GAAG,CACtB,CAAC,KAAK,EAAE,kBAAkB,CAAC,EAC3B,UAAU,CAAC,IAAI,EACf,mBAAmB,EACnB;QACE,gBAAgB,EAAE,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;KACpC,CACF,CAAA;IAED,mEAAmE;IACnE,IAAI,MAAM,CAAC,QAAQ,KAAK,GAAG,EAAE,CAAC;QAC5B,OAAO,IAAI,CAAA;IACb,CAAC;IAED,IAAI,CAAC;QACH,OAAO,cAAc,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IACpD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,IAAI,CAAA;IACb,CAAC;AACH,CAAC"}

package/dist/git/worktree-include.d.ts

@@ -0,0 +1,42 @@
+import type { Repository } from '../models/repository.js';
+import { addWorktree } from './worktree.js';
+/**
+ * Reads the patterns from the `.worktreeinclude` file at the root of the
+ * given repository path.
+ *
+ * The file uses `.gitignore` syntax. Blank lines and lines starting with `#`
+ * are ignored.
+ *
+ * Returns an empty array if the file does not exist.
+ */
+export declare function readWorktreeIncludePatterns(repositoryPath: string): Promise<ReadonlyArray<string>>;
+/**
+ * Returns the list of gitignored files in `repositoryPath` that match any of
+ * the given patterns.
+ *
+ * Only files that are both gitignored **and** matched by a `.worktreeinclude`
+ * pattern are returned — tracked files are never included.
+ */
+export declare function getIgnoredFilesMatchingPatterns(repository: Repository, patterns: ReadonlyArray<string>): Promise<ReadonlyArray<string>>;
+/**
+ * Copies each file in `files` (relative paths) from `sourcePath` to
+ * `destinationPath`, preserving the directory structure.
+ *
+ * Files that cannot be copied (e.g. because they no longer exist at the
+ * source) are skipped silently — a failure to copy a single file never
+ * prevents the others from being copied.
+ */
+export declare function copyWorktreeIncludeFiles(sourcePath: string, destinationPath: string, files: ReadonlyArray<string>): Promise<void>;
+/**
+ * Creates a new git worktree and then copies any gitignored files listed in
+ * the `.worktreeinclude` file from the main worktree into the newly created
+ * worktree.
+ *
+ * The copy step is best-effort: failures are logged but do not prevent the
+ * worktree from being used.
+ *
+ * @param repository  The repository to create the worktree in.
+ * @param path        The absolute path where the new worktree should be created.
+ * @param options     Options forwarded to `addWorktree`.
+ */
+export declare function addWorktreeWithIncludes(repository: Repository, path: string, options?: Parameters<typeof addWorktree>[2]): Promise<void>;