worktree-add 2.0.3 → 2.0.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md
CHANGED
|
@@ -20,8 +20,8 @@ Running `worktree-add <branch>` from inside a repo:
|
|
|
20
20
|
- or creates a tracking branch from `origin/<branch>`
|
|
21
21
|
- or creates a new branch from the current `HEAD` (only when the branch does not exist on `origin/`, or when you pass `--offline` and `origin/` can’t be reached)
|
|
22
22
|
7. Copies untracked / ignored files into the new worktree, skipping heavy stuff
|
|
23
|
-
(`node_modules`, `dist`, `.next`, caches, virtualenvs, etc.)
|
|
24
|
-
|
|
23
|
+
(`node_modules`, `dist`, `.next`, caches, virtualenvs, etc.).
|
|
24
|
+
- It also skips any directory that has its own `.git` (a nested clone or linked worktree, such as third-party sources under an ignored directory), so a worktree doesn't carry full copies of other repositories. Each skipped directory is named on stderr, for example `Skipping sources/codex (nested git repository).`
|
|
25
25
|
8. Detects your package manager and installs dependencies with lockfile‑safe flags
|
|
26
26
|
(`npm ci`, `pnpm install --frozen-lockfile`, `yarn install --immutable`, etc.).
|
|
27
27
|
9. If the project uses Next.js and supports it, runs `next typegen`.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"untracked-file-copy.d.ts","sourceRoot":"","sources":["../../src/worktree/untracked-file-copy.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"untracked-file-copy.d.ts","sourceRoot":"","sources":["../../src/worktree/untracked-file-copy.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AA4CtE,wBAAsB,kBAAkB,CACtC,QAAQ,EAAE,MAAM,EAChB,oBAAoB,EAAE,MAAM,EAC5B,OAAO,CAAC,EAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,YAAY,CAAA;CAAE,GACpD,OAAO,CAAC,IAAI,CAAC,CA+Ff"}
|
|
@@ -5,19 +5,43 @@ import { git } from "../git/git.js";
|
|
|
5
5
|
import { fallbackStatusLogger } from "../output/create-status-logger.js";
|
|
6
6
|
import { isGeneratedPath } from "./is-generated-path.js";
|
|
7
7
|
const hasErrorCode = (error, ...codes) => error instanceof Error && "code" in error && codes.includes(String(error.code));
|
|
8
|
-
//
|
|
9
|
-
function
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
8
|
+
// Git collapses a valid nested repo into one entry but lists the files of one with a broken `.git` individually.
|
|
9
|
+
function createNestedRepositoryFinder(repoRoot) {
|
|
10
|
+
const hasGitEntry = new Map();
|
|
11
|
+
async function containsGitEntry(directory) {
|
|
12
|
+
const known = hasGitEntry.get(directory);
|
|
13
|
+
if (known !== undefined) {
|
|
14
|
+
return known;
|
|
15
|
+
}
|
|
16
|
+
const found = await fs
|
|
17
|
+
.lstat(path.join(repoRoot, directory, ".git"))
|
|
18
|
+
.then(() => true)
|
|
19
|
+
.catch((error) => {
|
|
20
|
+
if (hasErrorCode(error, "ENOENT")) {
|
|
21
|
+
return false;
|
|
22
|
+
}
|
|
23
|
+
throw error;
|
|
24
|
+
});
|
|
25
|
+
hasGitEntry.set(directory, found);
|
|
26
|
+
return found;
|
|
15
27
|
}
|
|
16
|
-
return
|
|
28
|
+
return async (relativePath) => {
|
|
29
|
+
const segments = relativePath.split("/").filter(Boolean);
|
|
30
|
+
const directorySegments = relativePath.endsWith("/") ? segments : segments.slice(0, -1);
|
|
31
|
+
for (let depth = 1; depth <= directorySegments.length; depth += 1) {
|
|
32
|
+
const directory = directorySegments.slice(0, depth).join("/");
|
|
33
|
+
if (await containsGitEntry(directory)) {
|
|
34
|
+
return directory;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
return undefined;
|
|
38
|
+
};
|
|
17
39
|
}
|
|
18
40
|
export async function copyUntrackedFiles(repoRoot, destinationDirectory, options) {
|
|
19
41
|
const logger = options?.logger ?? fallbackStatusLogger;
|
|
20
42
|
const dryRun = options?.dryRun ?? false;
|
|
43
|
+
const findNestedRepository = createNestedRepositoryFinder(repoRoot);
|
|
44
|
+
const skippedNestedRepositories = new Set();
|
|
21
45
|
const untrackedEntries = new Set();
|
|
22
46
|
// Combine untracked-not-ignored (`--others`) and untracked-ignored (`--others --ignored`) entries.
|
|
23
47
|
// These sets should be disjoint, but we dedupe defensively.
|
|
@@ -47,6 +71,14 @@ export async function copyUntrackedFiles(repoRoot, destinationDirectory, options
|
|
|
47
71
|
if (isGeneratedPath(relativePath)) {
|
|
48
72
|
continue;
|
|
49
73
|
}
|
|
74
|
+
const nestedRepository = await findNestedRepository(relativePath);
|
|
75
|
+
if (nestedRepository !== undefined) {
|
|
76
|
+
if (!skippedNestedRepositories.has(nestedRepository)) {
|
|
77
|
+
skippedNestedRepositories.add(nestedRepository);
|
|
78
|
+
logger.warn(`Skipping ${nestedRepository} (nested git repository).`);
|
|
79
|
+
}
|
|
80
|
+
continue;
|
|
81
|
+
}
|
|
50
82
|
const sourcePath = resolvedSourcePath;
|
|
51
83
|
const destinationPath = path.join(destinationDirectory, relativePath);
|
|
52
84
|
const destinationExists = await fs
|
|
@@ -74,14 +106,6 @@ export async function copyUntrackedFiles(repoRoot, destinationDirectory, options
|
|
|
74
106
|
force: false,
|
|
75
107
|
mode: constants.COPYFILE_EXCL,
|
|
76
108
|
verbatimSymlinks: true,
|
|
77
|
-
filter: async (source) => {
|
|
78
|
-
const uncopyableFile = describeUncopyableFile(await fs.lstat(source));
|
|
79
|
-
if (uncopyableFile === undefined) {
|
|
80
|
-
return true;
|
|
81
|
-
}
|
|
82
|
-
logger.detail(`Skipped ${path.relative(repoRoot, source)} (${uncopyableFile}).`);
|
|
83
|
-
return false;
|
|
84
|
-
},
|
|
85
109
|
});
|
|
86
110
|
}
|
|
87
111
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"untracked-file-copy.js","sourceRoot":"","sources":["../../src/worktree/untracked-file-copy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"untracked-file-copy.js","sourceRoot":"","sources":["../../src/worktree/untracked-file-copy.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED