@gitkraken/core-gitlens 0.1.0 → 0.2.0
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/CHANGELOG.md +22 -1
- package/dist/git/cache.d.ts +21 -5
- package/dist/git/cache.d.ts.map +1 -1
- package/dist/git/cache.js +102 -6
- package/dist/git/cache.js.map +1 -1
- package/dist/git/context.d.ts +11 -2
- package/dist/git/context.d.ts.map +1 -1
- package/dist/git/context.js.map +1 -1
- package/dist/git/models/branch.d.ts +1 -0
- package/dist/git/models/branch.d.ts.map +1 -1
- package/dist/git/models/branch.js.map +1 -1
- package/dist/git/models/commit.d.ts +1 -9
- package/dist/git/models/commit.d.ts.map +1 -1
- package/dist/git/models/commit.js +4 -9
- package/dist/git/models/commit.js.map +1 -1
- package/dist/git/models/graph.d.ts +2 -4
- package/dist/git/models/graph.d.ts.map +1 -1
- package/dist/git/models/repository.d.ts +12 -3
- package/dist/git/models/repository.d.ts.map +1 -1
- package/dist/git/models/repository.js +25 -4
- package/dist/git/models/repository.js.map +1 -1
- package/dist/git/models/worktree.d.ts +1 -1
- package/dist/git/models/worktree.d.ts.map +1 -1
- package/dist/git/models/worktree.js +2 -2
- package/dist/git/models/worktree.js.map +1 -1
- package/dist/git/parsers/diffParser.d.ts +0 -1
- package/dist/git/parsers/diffParser.d.ts.map +1 -1
- package/dist/git/parsers/diffParser.js +22 -61
- package/dist/git/parsers/diffParser.js.map +1 -1
- package/dist/git/providers/branches.d.ts +3 -0
- package/dist/git/providers/branches.d.ts.map +1 -1
- package/dist/git/providers/commits.d.ts +6 -0
- package/dist/git/providers/commits.d.ts.map +1 -1
- package/dist/git/providers/config.d.ts +2 -0
- package/dist/git/providers/config.d.ts.map +1 -1
- package/dist/git/providers/diff.d.ts +2 -0
- package/dist/git/providers/diff.d.ts.map +1 -1
- package/dist/git/providers/operations.d.ts +6 -0
- package/dist/git/providers/operations.d.ts.map +1 -1
- package/dist/git/providers/revision.d.ts +1 -1
- package/dist/git/providers/revision.d.ts.map +1 -1
- package/dist/git/providers/staging.d.ts +2 -0
- package/dist/git/providers/staging.d.ts.map +1 -1
- package/dist/git/utils/sorting.d.ts +6 -0
- package/dist/git/utils/sorting.d.ts.map +1 -1
- package/dist/git/utils/sorting.js +19 -0
- package/dist/git/utils/sorting.js.map +1 -1
- package/dist/git-cli/cliGitProvider.js +1 -1
- package/dist/git-cli/cliGitProvider.js.map +1 -1
- package/dist/git-cli/exec/git.d.ts +29 -4
- package/dist/git-cli/exec/git.d.ts.map +1 -1
- package/dist/git-cli/exec/git.js +70 -9
- package/dist/git-cli/exec/git.js.map +1 -1
- package/dist/git-cli/exec/gitQueue.d.ts +12 -4
- package/dist/git-cli/exec/gitQueue.d.ts.map +1 -1
- package/dist/git-cli/exec/gitQueue.js +49 -12
- package/dist/git-cli/exec/gitQueue.js.map +1 -1
- package/dist/git-cli/parsers/logParser.d.ts +1 -0
- package/dist/git-cli/parsers/logParser.d.ts.map +1 -1
- package/dist/git-cli/parsers/logParser.js +4 -0
- package/dist/git-cli/parsers/logParser.js.map +1 -1
- package/dist/git-cli/providers/blame.js +1 -1
- package/dist/git-cli/providers/blame.js.map +1 -1
- package/dist/git-cli/providers/branches.d.ts +2 -0
- package/dist/git-cli/providers/branches.d.ts.map +1 -1
- package/dist/git-cli/providers/branches.js +176 -123
- package/dist/git-cli/providers/branches.js.map +1 -1
- package/dist/git-cli/providers/commits.d.ts +4 -0
- package/dist/git-cli/providers/commits.d.ts.map +1 -1
- package/dist/git-cli/providers/commits.js +58 -17
- package/dist/git-cli/providers/commits.js.map +1 -1
- package/dist/git-cli/providers/config.d.ts.map +1 -1
- package/dist/git-cli/providers/config.js +9 -9
- package/dist/git-cli/providers/config.js.map +1 -1
- package/dist/git-cli/providers/contributors.d.ts.map +1 -1
- package/dist/git-cli/providers/contributors.js +7 -4
- package/dist/git-cli/providers/contributors.js.map +1 -1
- package/dist/git-cli/providers/diff.d.ts +2 -0
- package/dist/git-cli/providers/diff.d.ts.map +1 -1
- package/dist/git-cli/providers/diff.js +89 -19
- package/dist/git-cli/providers/diff.js.map +1 -1
- package/dist/git-cli/providers/graph.d.ts.map +1 -1
- package/dist/git-cli/providers/graph.js +43 -27
- package/dist/git-cli/providers/graph.js.map +1 -1
- package/dist/git-cli/providers/operations.d.ts +17 -0
- package/dist/git-cli/providers/operations.d.ts.map +1 -1
- package/dist/git-cli/providers/operations.js +47 -14
- package/dist/git-cli/providers/operations.js.map +1 -1
- package/dist/git-cli/providers/patch.d.ts.map +1 -1
- package/dist/git-cli/providers/patch.js +15 -30
- package/dist/git-cli/providers/patch.js.map +1 -1
- package/dist/git-cli/providers/pausedOperations.js +6 -6
- package/dist/git-cli/providers/pausedOperations.js.map +1 -1
- package/dist/git-cli/providers/refs.d.ts.map +1 -1
- package/dist/git-cli/providers/refs.js +26 -7
- package/dist/git-cli/providers/refs.js.map +1 -1
- package/dist/git-cli/providers/remotes.js +4 -4
- package/dist/git-cli/providers/remotes.js.map +1 -1
- package/dist/git-cli/providers/revision.d.ts +1 -1
- package/dist/git-cli/providers/revision.d.ts.map +1 -1
- package/dist/git-cli/providers/revision.js +15 -11
- package/dist/git-cli/providers/revision.js.map +1 -1
- package/dist/git-cli/providers/staging.d.ts +2 -0
- package/dist/git-cli/providers/staging.d.ts.map +1 -1
- package/dist/git-cli/providers/staging.js +20 -8
- package/dist/git-cli/providers/staging.js.map +1 -1
- package/dist/git-cli/providers/stash.d.ts +0 -8
- package/dist/git-cli/providers/stash.d.ts.map +1 -1
- package/dist/git-cli/providers/stash.js +63 -119
- package/dist/git-cli/providers/stash.js.map +1 -1
- package/dist/git-cli/providers/status.js +6 -6
- package/dist/git-cli/providers/status.js.map +1 -1
- package/dist/git-cli/providers/tags.js +4 -4
- package/dist/git-cli/providers/tags.js.map +1 -1
- package/dist/git-cli/providers/worktrees.js +3 -3
- package/dist/git-cli/providers/worktrees.js.map +1 -1
- package/dist/plus/ai/constants.d.ts +2 -1
- package/dist/plus/ai/constants.d.ts.map +1 -1
- package/dist/plus/ai/constants.js +7 -0
- package/dist/plus/ai/constants.js.map +1 -1
- package/dist/plus/ai/models/model.d.ts +1 -1
- package/dist/plus/ai/models/model.d.ts.map +1 -1
- package/dist/plus/ai/models/model.js.map +1 -1
- package/dist/plus/ai/models/promptTemplates.d.ts +19 -2
- package/dist/plus/ai/models/promptTemplates.d.ts.map +1 -1
- package/dist/plus/ai/models/results.d.ts +28 -0
- package/dist/plus/ai/models/results.d.ts.map +1 -1
- package/dist/plus/ai/prompts.d.ts +3 -0
- package/dist/plus/ai/prompts.d.ts.map +1 -1
- package/dist/plus/ai/prompts.js +126 -0
- package/dist/plus/ai/prompts.js.map +1 -1
- package/dist/plus/ai/utils/ai.utils.d.ts.map +1 -1
- package/dist/plus/ai/utils/ai.utils.js +2 -0
- package/dist/plus/ai/utils/ai.utils.js.map +1 -1
- package/dist/plus/ai/utils/results.utils.d.ts +3 -0
- package/dist/plus/ai/utils/results.utils.d.ts.map +1 -1
- package/dist/plus/ai/utils/results.utils.js +75 -0
- package/dist/plus/ai/utils/results.utils.js.map +1 -1
- package/dist/plus/ai/utils/truncation.utils.d.ts +1 -1
- package/dist/plus/ai/utils/truncation.utils.d.ts.map +1 -1
- package/dist/plus/ai/utils/truncation.utils.js.map +1 -1
- package/dist/plus/git-github/providers/github/branches.d.ts.map +1 -1
- package/dist/plus/git-github/providers/github/branches.js +16 -1
- package/dist/plus/git-github/providers/github/branches.js.map +1 -1
- package/dist/plus/git-github/providers/github/diff.d.ts +2 -0
- package/dist/plus/git-github/providers/github/diff.d.ts.map +1 -1
- package/dist/plus/git-github/providers/github/diff.js.map +1 -1
- package/dist/utils/decorators/log.js +1 -1
- package/dist/utils/decorators/log.js.map +1 -1
- package/dist/utils/decorators/sequentialize.d.ts.map +1 -1
- package/dist/utils/decorators/sequentialize.js +4 -2
- package/dist/utils/decorators/sequentialize.js.map +1 -1
- package/dist/utils/env/node/base64.js.map +1 -1
- package/dist/utils/env/node/exec.js.map +1 -1
- package/dist/utils/formatter.d.ts.map +1 -1
- package/dist/utils/formatter.js +4 -10
- package/dist/utils/formatter.js.map +1 -1
- package/dist/utils/iterable.js.map +1 -1
- package/dist/utils/lruMap.d.ts +40 -0
- package/dist/utils/lruMap.d.ts.map +1 -0
- package/dist/utils/lruMap.js +81 -0
- package/dist/utils/lruMap.js.map +1 -0
- package/dist/utils/version.d.ts +14 -0
- package/dist/utils/version.d.ts.map +1 -1
- package/dist/utils/version.js +48 -0
- package/dist/utils/version.js.map +1 -1
- package/package.json +1 -1
- package/src/git/cache.ts +179 -13
- package/src/git/context.ts +11 -2
- package/src/git/models/branch.ts +1 -0
- package/src/git/models/commit.ts +1 -17
- package/src/git/models/graph.ts +2 -4
- package/src/git/models/repository.ts +26 -6
- package/src/git/models/worktree.ts +2 -2
- package/src/git/parsers/diffParser.ts +7 -44
- package/src/git/providers/branches.ts +3 -0
- package/src/git/providers/commits.ts +7 -0
- package/src/git/providers/config.ts +2 -0
- package/src/git/providers/diff.ts +8 -2
- package/src/git/providers/operations.ts +10 -3
- package/src/git/providers/revision.ts +5 -1
- package/src/git/providers/staging.ts +2 -0
- package/src/git/utils/sorting.ts +21 -0
- package/src/git-cli/cliGitProvider.ts +1 -1
- package/src/git-cli/exec/git.ts +70 -18
- package/src/git-cli/exec/gitQueue.ts +57 -13
- package/src/git-cli/parsers/logParser.ts +5 -1
- package/src/git-cli/providers/blame.ts +1 -1
- package/src/git-cli/providers/branches.ts +207 -133
- package/src/git-cli/providers/commits.ts +71 -18
- package/src/git-cli/providers/config.ts +9 -14
- package/src/git-cli/providers/contributors.ts +7 -12
- package/src/git-cli/providers/diff.ts +100 -19
- package/src/git-cli/providers/graph.ts +47 -27
- package/src/git-cli/providers/operations.ts +77 -18
- package/src/git-cli/providers/patch.ts +15 -37
- package/src/git-cli/providers/pausedOperations.ts +6 -6
- package/src/git-cli/providers/refs.ts +27 -8
- package/src/git-cli/providers/remotes.ts +4 -4
- package/src/git-cli/providers/revision.ts +20 -13
- package/src/git-cli/providers/staging.ts +18 -8
- package/src/git-cli/providers/stash.ts +67 -134
- package/src/git-cli/providers/status.ts +6 -6
- package/src/git-cli/providers/tags.ts +4 -4
- package/src/git-cli/providers/worktrees.ts +3 -3
- package/src/plus/ai/constants.ts +8 -0
- package/src/plus/ai/models/model.ts +1 -0
- package/src/plus/ai/models/promptTemplates.ts +29 -0
- package/src/plus/ai/models/results.ts +30 -0
- package/src/plus/ai/prompts.ts +129 -0
- package/src/plus/ai/utils/ai.utils.ts +2 -0
- package/src/plus/ai/utils/results.utils.ts +99 -0
- package/src/plus/ai/utils/truncation.utils.ts +3 -1
- package/src/plus/git-github/providers/github/branches.ts +17 -5
- package/src/plus/git-github/providers/github/diff.ts +8 -2
- package/src/utils/decorators/log.ts +1 -1
- package/src/utils/decorators/sequentialize.ts +8 -6
- package/src/utils/env/node/base64.ts +1 -1
- package/src/utils/env/node/exec.ts +2 -2
- package/src/utils/formatter.ts +4 -11
- package/src/utils/iterable.ts +1 -1
- package/src/utils/lruMap.ts +87 -0
- package/src/utils/version.ts +48 -0
|
@@ -40,10 +40,22 @@ export class DiffGitSubProvider {
|
|
|
40
40
|
}
|
|
41
41
|
}
|
|
42
42
|
try {
|
|
43
|
-
const result = await this.git.
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
43
|
+
const result = await this.git.run({ cwd: repoPath, configs: gitConfigsDiff }, 'diff', '--shortstat', '--no-ext-diff', ...args, '--', ...(options?.uris?.map(p => this.provider.getRelativePath(p, repoPath)) ?? []));
|
|
44
|
+
const stat = result.stdout ? parseGitDiffShortStat(result.stdout) : undefined;
|
|
45
|
+
// Merge in untracked files when the comparison involves the working tree.
|
|
46
|
+
// Skip when a pathspec filter is active — mixing a path-filtered diff count with an
|
|
47
|
+
// unfiltered untracked count would silently produce wrong totals.
|
|
48
|
+
if (options?.includeUntracked && !options.uris?.length && isWorkingTreeComparison(to, from)) {
|
|
49
|
+
const untracked = (await this.provider.status?.getUntrackedFiles?.(repoPath)) ?? [];
|
|
50
|
+
if (untracked.length) {
|
|
51
|
+
return {
|
|
52
|
+
files: (stat?.files ?? 0) + untracked.length,
|
|
53
|
+
additions: stat?.additions ?? 0,
|
|
54
|
+
deletions: stat?.deletions ?? 0,
|
|
55
|
+
};
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
return stat;
|
|
47
59
|
}
|
|
48
60
|
catch (ex) {
|
|
49
61
|
const msg = ex?.toString() ?? '';
|
|
@@ -73,7 +85,7 @@ export class DiffGitSubProvider {
|
|
|
73
85
|
}
|
|
74
86
|
let result;
|
|
75
87
|
try {
|
|
76
|
-
result = await this.git.
|
|
88
|
+
result = await this.git.run({ cwd: repoPath, configs: gitConfigsDiff, errors: 'throw', env: options?.index?.env }, 'diff', ...args, args.includes('--') ? undefined : '--');
|
|
77
89
|
}
|
|
78
90
|
catch (ex) {
|
|
79
91
|
scope?.error(ex);
|
|
@@ -89,7 +101,7 @@ export class DiffGitSubProvider {
|
|
|
89
101
|
return parseGitDiff(diff.contents);
|
|
90
102
|
}
|
|
91
103
|
async getDiffFiles(repoPath, contents, _cancellation) {
|
|
92
|
-
const result = await this.git.
|
|
104
|
+
const result = await this.git.run({ cwd: repoPath, configs: gitConfigsLog, stdin: contents }, 'apply', '--numstat', '--summary', '-z', '-');
|
|
93
105
|
if (!result.stdout)
|
|
94
106
|
return undefined;
|
|
95
107
|
const files = parseGitApplyFiles(result.stdout, repoPath);
|
|
@@ -103,10 +115,31 @@ export class DiffGitSubProvider {
|
|
|
103
115
|
const configs = options?.renameLimit != null
|
|
104
116
|
? [...gitConfigsDiff, '-c', `diff.renameLimit=${options.renameLimit}`]
|
|
105
117
|
: gitConfigsDiff;
|
|
106
|
-
const result = await this.git.
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
118
|
+
const result = await this.git.run({ cwd: repoPath, configs: configs }, 'diff', '--numstat', '--summary', `-M${similarityThreshold == null ? '' : `${similarityThreshold}%`}`, '--no-ext-diff', '-z', options?.filters?.length ? `--diff-filter=${options.filters.join('')}` : undefined, ref1OrRange ? ref1OrRange : undefined, ref2 ? ref2 : undefined, '--', options?.path ? options.path : undefined);
|
|
119
|
+
const files = result.stdout ? (parseGitDiffNumStatFiles(result.stdout, repoPath) ?? []) : [];
|
|
120
|
+
// Merge in untracked files when the comparison involves the working tree.
|
|
121
|
+
// Skip when `filters` excludes additions (untracked entries are semantically 'A'/added),
|
|
122
|
+
// or when `path` is a non-exact pathspec we can't reliably match against the untracked list.
|
|
123
|
+
if (options?.includeUntracked &&
|
|
124
|
+
ref2 == null &&
|
|
125
|
+
typeof ref1OrRange === 'string' &&
|
|
126
|
+
!isRevisionRange(ref1OrRange) &&
|
|
127
|
+
!isUncommittedStaged(ref1OrRange) &&
|
|
128
|
+
filtersAllowUntracked(options.filters) &&
|
|
129
|
+
!isNonExactPathspec(options.path)) {
|
|
130
|
+
const untracked = (await this.provider.status?.getUntrackedFiles?.(repoPath)) ?? [];
|
|
131
|
+
if (untracked.length) {
|
|
132
|
+
const seen = new Set(files.map(f => f.path));
|
|
133
|
+
for (const file of untracked) {
|
|
134
|
+
if (seen.has(file.path))
|
|
135
|
+
continue;
|
|
136
|
+
if (options.path && options.path !== file.path)
|
|
137
|
+
continue;
|
|
138
|
+
files.push(file);
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
return files.length ? files : undefined;
|
|
110
143
|
}
|
|
111
144
|
catch (_ex) {
|
|
112
145
|
return undefined;
|
|
@@ -150,7 +183,7 @@ export class DiffGitSubProvider {
|
|
|
150
183
|
}
|
|
151
184
|
// Follow file history and specify the file path
|
|
152
185
|
args.push('--follow', '--', relativePath);
|
|
153
|
-
const result = await this.git.
|
|
186
|
+
const result = await this.git.run({ cwd: repoPath, configs: gitConfigsLog }, ...args);
|
|
154
187
|
let currentSha;
|
|
155
188
|
let currentPath;
|
|
156
189
|
if (skip === 0) {
|
|
@@ -346,7 +379,7 @@ export class DiffGitSubProvider {
|
|
|
346
379
|
args.push(`--${ordering}-order`);
|
|
347
380
|
}
|
|
348
381
|
args.push('--follow', rev, '--', relativePath);
|
|
349
|
-
const result = await this.git.
|
|
382
|
+
const result = await this.git.run({
|
|
350
383
|
cwd: repoPath,
|
|
351
384
|
configs: gitConfigsLog,
|
|
352
385
|
caching: { cache: this.cache.gitResults, options: { accessTTL: 5 * 60 * 1000 } },
|
|
@@ -443,7 +476,7 @@ export class DiffGitSubProvider {
|
|
|
443
476
|
args.push(`-L${range.startLine},${range.endLine}:${relativePath}`);
|
|
444
477
|
let result;
|
|
445
478
|
try {
|
|
446
|
-
result = await this.git.
|
|
479
|
+
result = await this.git.run({ cwd: repoPath, configs: gitConfigsLog }, ...args);
|
|
447
480
|
}
|
|
448
481
|
catch (ex) {
|
|
449
482
|
if (rev && !isUncommittedStaged(rev))
|
|
@@ -466,7 +499,7 @@ export class DiffGitSubProvider {
|
|
|
466
499
|
active: range.active,
|
|
467
500
|
};
|
|
468
501
|
args.splice(index, 1, `-L${range.startLine},${range.endLine}:${relativePath}`);
|
|
469
|
-
result = await this.git.
|
|
502
|
+
result = await this.git.run({ cwd: repoPath, configs: gitConfigsLog }, ...args);
|
|
470
503
|
}
|
|
471
504
|
let currentRange;
|
|
472
505
|
let previousSha;
|
|
@@ -541,7 +574,7 @@ export class DiffGitSubProvider {
|
|
|
541
574
|
params.push(isUncommittedStaged(ref2) ? '--staged' : ref2);
|
|
542
575
|
}
|
|
543
576
|
try {
|
|
544
|
-
return await this.git.
|
|
577
|
+
return await this.git.run({ cwd: repoPath, configs: gitConfigsDiff, encoding: options?.encoding }, ...params, '--', fileName);
|
|
545
578
|
}
|
|
546
579
|
catch (ex) {
|
|
547
580
|
const match = GitErrors.badRevision.exec(ex.message);
|
|
@@ -569,7 +602,7 @@ export class DiffGitSubProvider {
|
|
|
569
602
|
}
|
|
570
603
|
params.push('--no-index');
|
|
571
604
|
try {
|
|
572
|
-
const result = await this.git.
|
|
605
|
+
const result = await this.git.run({
|
|
573
606
|
cwd: repoPath,
|
|
574
607
|
configs: gitConfigsDiff,
|
|
575
608
|
encoding: options?.encoding,
|
|
@@ -640,7 +673,7 @@ export class DiffGitSubProvider {
|
|
|
640
673
|
throw new Error('No diff tool found');
|
|
641
674
|
scope?.debug(`Using tool=${tool}`);
|
|
642
675
|
}
|
|
643
|
-
await this.git.
|
|
676
|
+
await this.git.run({ cwd: root }, 'difftool', '--no-prompt', `--tool=${tool}`, options?.staged ? '--staged' : undefined, options?.ref1 ? options.ref1 : undefined, options?.ref2 ? options.ref2 : undefined, '--', relativePath);
|
|
644
677
|
}
|
|
645
678
|
catch (ex) {
|
|
646
679
|
const msg = ex?.toString() ?? '';
|
|
@@ -661,7 +694,7 @@ export class DiffGitSubProvider {
|
|
|
661
694
|
throw new Error('No diff tool found');
|
|
662
695
|
scope?.debug(`Using tool=${tool}`);
|
|
663
696
|
}
|
|
664
|
-
await this.git.
|
|
697
|
+
await this.git.run({ cwd: repoPath }, 'difftool', '--dir-diff', `--tool=${tool}`, ref1, ref2);
|
|
665
698
|
}
|
|
666
699
|
catch (ex) {
|
|
667
700
|
const msg = ex?.toString() ?? '';
|
|
@@ -715,6 +748,43 @@ __decorate([
|
|
|
715
748
|
__decorate([
|
|
716
749
|
debug()
|
|
717
750
|
], DiffGitSubProvider.prototype, "openDirectoryCompare", null);
|
|
751
|
+
// Returns true when no --diff-filter is active or when it includes additions ('A' or '*').
|
|
752
|
+
// Untracked files are semantically "added" — if a caller restricts filters to e.g. ['M'],
|
|
753
|
+
// honor that and omit untracked.
|
|
754
|
+
function filtersAllowUntracked(filters) {
|
|
755
|
+
if (!filters?.length)
|
|
756
|
+
return true;
|
|
757
|
+
return filters.includes('A') || filters.includes('*');
|
|
758
|
+
}
|
|
759
|
+
// Returns true when the path is a git pathspec we can't match with simple equality
|
|
760
|
+
// (directory prefix, glob, or magic pathspec). In that case, skip the untracked merge
|
|
761
|
+
// rather than risk excluding legitimate matches or including wrong ones.
|
|
762
|
+
function isNonExactPathspec(path) {
|
|
763
|
+
if (!path)
|
|
764
|
+
return false;
|
|
765
|
+
return path.endsWith('/') || /[*?[\]]|^:/.test(path);
|
|
766
|
+
}
|
|
767
|
+
// Returns true when the `git diff` invocation shape includes the working tree
|
|
768
|
+
// (i.e. `git diff`, `git diff HEAD`, or `git diff <ref>` with no `from`), and
|
|
769
|
+
// therefore untracked files are a meaningful addition to the result.
|
|
770
|
+
function isWorkingTreeComparison(to, from) {
|
|
771
|
+
if (to == null)
|
|
772
|
+
return true;
|
|
773
|
+
if (isRevisionRange(to) || isUncommittedStaged(to))
|
|
774
|
+
return false;
|
|
775
|
+
// `to === uncommitted` always targets the working tree (`prepareToFromDiffArgs` sets
|
|
776
|
+
// `from = 'HEAD'` when omitted, or diffs against the caller-supplied `from`).
|
|
777
|
+
if (isUncommitted(to))
|
|
778
|
+
return true;
|
|
779
|
+
// `git diff <from>` — `to === ''` means the caller explicitly asked for working tree vs `from`
|
|
780
|
+
if (to === '')
|
|
781
|
+
return from == null || !isUncommittedStaged(from);
|
|
782
|
+
// `getChangedFilesCount` uses `prepareToFromDiffArgs`, which translates `to` (with no `from`)
|
|
783
|
+
// to `${to}^ ${to}` UNLESS `to` is HEAD or empty.
|
|
784
|
+
if (to.toUpperCase() === 'HEAD' && from == null)
|
|
785
|
+
return true;
|
|
786
|
+
return false;
|
|
787
|
+
}
|
|
718
788
|
function prepareToFromDiffArgs(to, from, args, notation) {
|
|
719
789
|
if (to === uncommitted) {
|
|
720
790
|
if (from != null) {
|
|
@@ -773,7 +843,7 @@ function createRevisionUri(provider, repoPath, relativePath, sha) {
|
|
|
773
843
|
export async function findPathStatusChanged(git, repoPath, pathspec, rev, options) {
|
|
774
844
|
const parser = getShaAndFileSummaryLogParser();
|
|
775
845
|
const ordering = options?.ordering;
|
|
776
|
-
const result = await git.
|
|
846
|
+
const result = await git.run({ cwd: repoPath, configs: gitConfigsLog }, 'log', ...parser.arguments, ordering ? `--${ordering}-order` : undefined, '--no-walk', `--diff-filter=${options?.filters?.length ? options.filters.join('') : 'RCD'}`, rev,
|
|
777
847
|
// Note: --no-walk constrains to the exact commit (no ancestor search). Pathspec is omitted
|
|
778
848
|
// because git suppresses rename detection with pathspecs (shows D instead of R, losing the destination path).
|
|
779
849
|
'--');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diff.js","sourceRoot":"","sources":["../../src/providers/diff.ts"],"names":[],"mappings":";;;;;;AAYA,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAC5G,OAAO,EACN,kBAAkB,EAClB,YAAY,EACZ,wBAAwB,EACxB,qBAAqB,EACrB,gBAAgB,GAChB,MAAM,oCAAoC,CAAC;AAS5C,OAAO,EACN,qBAAqB,EACrB,eAAe,EACf,aAAa,EACb,mBAAmB,GACnB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,iCAAiC,EAAE,MAAM,oCAAoC,CAAC;AACvF,OAAO,EAAE,KAAK,EAAE,MAAM,kCAAkC,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAElE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAI1D,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEpF,OAAO,EAAE,2BAA2B,EAAE,6BAA6B,EAAE,MAAM,yBAAyB,CAAC;AAErG,MAAM,OAAO,kBAAkB;IAEZ;IACA;IACA;IACA;IAJlB,YACkB,OAA0B,EAC1B,GAAQ,EACR,KAAY,EACZ,QAAgC;QAHhC,YAAO,GAAP,OAAO,CAAmB;QAC1B,QAAG,GAAH,GAAG,CAAK;QACR,UAAK,GAAL,KAAK,CAAO;QACZ,aAAQ,GAAR,QAAQ,CAAwB;IAC/C,CAAC;IAGE,AAAN,KAAK,CAAC,oBAAoB,CACzB,QAAgB,EAChB,EAAW,EACX,IAAa,EACb,OAAqC,EACrC,aAA2B;QAE3B,MAAM,KAAK,GAAG,eAAe,EAAE,CAAC;QAEhC,MAAM,IAAI,GAAa,EAAE,CAAC;QAC1B,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC;YAChB,qHAAqH;YACrH,IAAI,eAAe,CAAC,EAAE,CAAC,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;gBACzC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACf,CAAC;iBAAM,CAAC;gBACP,qBAAqB,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;YACvC,CAAC;QACF,CAAC;QAED,IAAI,CAAC;YACJ,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CACjC,EAAE,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAE,cAAc,EAAE,EAC1C,MAAM,EACN,aAAa,EACb,eAAe,EACf,GAAG,IAAI,EACP,IAAI,EACJ,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC,CAC9E,CAAC;YACF,IAAI,CAAC,MAAM,CAAC,MAAM;gBAAE,OAAO,SAAS,CAAC;YAErC,OAAO,qBAAqB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC7C,CAAC;QAAC,OAAO,EAAE,EAAE,CAAC;YACb,MAAM,GAAG,GAAW,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;YACzC,IAAI,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;gBACrC,OAAO,SAAS,CAAC;YAClB,CAAC;YAED,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;YACjB,MAAM,EAAE,CAAC;QACV,CAAC;IACF,CAAC;IAGK,AAAN,KAAK,CAAC,OAAO,CACZ,QAAgB,EAChB,EAAU,EACV,IAAa,EACb,OAKC,EACD,aAA2B;QAE3B,MAAM,KAAK,GAAG,eAAe,EAAE,CAAC;QAChC,MAAM,IAAI,GAAG,CAAC,KAAK,OAAO,EAAE,OAAO,IAAI,CAAC,EAAE,CAAC,CAAC;QAE5C,IAAI,EAAE,IAAI,IAAI,IAAI,eAAe,CAAC,EAAE,CAAC,EAAE,CAAC;YACvC,MAAM,KAAK,GAAG,qBAAqB,CAAC,EAAE,CAAC,CAAC;YACxC,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;gBACnB,EAAE,GAAG,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC;gBACvB,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;gBAClB,OAAO,GAAG,EAAE,GAAG,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC;YACpD,CAAC;QACF,CAAC;QAED,IAAI,GAAG,qBAAqB,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;QAEhE,IAAI,KAA8B,CAAC;QACnC,IAAI,OAAO,EAAE,IAAI,EAAE,CAAC;YACnB,KAAK,GAAG,IAAI,GAAG,CAAS,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;YAC3F,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,KAAK,CAAC,CAAC;QAC3B,CAAC;QAED,IAAI,MAAM,CAAC;QACX,IAAI,CAAC;YACJ,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAC3B,EAAE,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,EACrF,MAAM,EACN,GAAG,IAAI,EACP,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CACtC,CAAC;QACH,CAAC;QAAC,OAAO,EAAE,EAAE,CAAC;YACb,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;YACjB,OAAO,SAAS,CAAC;QAClB,CAAC;QAED,MAAM,IAAI,GAAY,EAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;QACnG,OAAO,IAAI,CAAC;IACb,CAAC;IAGK,AAAN,KAAK,CAAC,aAAa,CAClB,QAAgB,EAChB,EAAU,EACV,IAAa,EACb,OAIC,EACD,YAA0B;QAE1B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;QAC3E,IAAI,CAAC,IAAI,EAAE,QAAQ;YAAE,OAAO,SAAS,CAAC;QAEtC,OAAO,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACpC,CAAC;IAGK,AAAN,KAAK,CAAC,YAAY,CACjB,QAAgB,EAChB,QAAgB,EAChB,aAA2B;QAE3B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CACjC,EAAE,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,QAAQ,EAAE,EAC1D,OAAO,EACP,WAAW,EACX,WAAW,EACX,IAAI,EACJ,GAAG,CACH,CAAC;QACF,IAAI,CAAC,MAAM,CAAC,MAAM;YAAE,OAAO,SAAS,CAAC;QAErC,MAAM,KAAK,GAAG,kBAAkB,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAC1D,OAAO;YACN,KAAK,EAAE,KAAK;SACZ,CAAC;IACH,CAAC;IAGK,AAAN,KAAK,CAAC,aAAa,CAClB,QAAgB,EAChB,WAAsC,EACtC,IAAa,EACb,OAA0G;QAE1G,IAAI,CAAC;YACJ,MAAM,mBAAmB,GAAG,OAAO,EAAE,mBAAmB,CAAC;YACzD,MAAM,OAAO,GACZ,OAAO,EAAE,WAAW,IAAI,IAAI;gBAC3B,CAAC,CAAC,CAAC,GAAG,cAAc,EAAE,IAAI,EAAE,oBAAoB,OAAO,CAAC,WAAW,EAAE,CAAC;gBACtE,CAAC,CAAC,cAAc,CAAC;YACnB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CACjC,EAAE,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,EACnC,MAAM,EACN,WAAW,EACX,WAAW,EACX,KAAK,mBAAmB,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,mBAAmB,GAAG,EAAE,EACnE,eAAe,EACf,IAAI,EACJ,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,iBAAiB,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,EAClF,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,EACrC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,EACvB,IAAI,EACJ,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CACxC,CAAC;YACF,IAAI,CAAC,MAAM,CAAC,MAAM;gBAAE,OAAO,SAAS,CAAC;YAErC,OAAO,wBAAwB,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAC1D,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACd,OAAO,SAAS,CAAC;QAClB,CAAC;IACF,CAAC;IAGK,AAAN,KAAK,CAAC,WAAW,CAAC,QAAiB;QAClC,OAAO,CACN,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE,cAAc,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;YAC3F,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE,WAAW,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAChF,CAAC;IACH,CAAC;IAGK,AAAN,KAAK,CAAC,qBAAqB,CAC1B,QAAgB,EAChB,SAAuB,EACvB,GAAuB,EACvB,OAAe,CAAC,EAChB,OAA+D,EAC/D,aAA2B;QAE3B,iDAAiD;QACjD,IAAI,CAAC,GAAG;YAAE,OAAO,SAAS,CAAC;QAE3B,MAAM,KAAK,GAAG,eAAe,EAAE,CAAC;QAEhC,IAAI,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QAEtE,IAAI,mBAAmB,CAAC,GAAG,CAAC,EAAE,CAAC;YAC9B,OAAO;gBACN,OAAO,EAAE,iBAAiB,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,CAAC;gBACtE,IAAI,EAAE,iBAAiB,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,SAAS,CAAC;aACzE,CAAC;QACH,CAAC;aAAM,IAAI,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC;YAC/B,OAAO,SAAS,CAAC;QAClB,CAAC;QAED,IAAI,CAAC;YACJ,MAAM,MAAM,GAAG,6BAA6B,EAAE,CAAC;YAC/C,MAAM,IAAI,GAAG,CAAC,KAAK,EAAE,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;YAE1C,MAAM,QAAQ,GAAG,OAAO,EAAE,QAAQ,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC;YAC5E,IAAI,QAAQ,EAAE,CAAC;gBACd,IAAI,CAAC,IAAI,CAAC,KAAK,QAAQ,QAAQ,CAAC,CAAC;YAClC,CAAC;YAED,IAAI,CAAC,IAAI;YACR,qFAAqF;YACrF,WAAW,CACX,CAAC;YAEF,IAAI,GAAG,KAAK,gBAAgB,EAAE,CAAC;gBAC9B,IAAI,CAAC,IAAI;gBACR,kFAAkF;gBAClF,iBAAiB;gBACjB,wCAAwC;gBACxC,GAAG,GAAG,QAAQ,CACd,CAAC;YACH,CAAC;YAED,gDAAgD;YAChD,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC;YAE1C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC;YAEvF,IAAI,UAAU,CAAC;YACf,IAAI,WAAW,CAAC;YAEhB,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;gBAChB,UAAU,GAAG,GAAG,CAAC;gBACjB,WAAW,GAAG,YAAY,CAAC;YAC5B,CAAC;iBAAM,CAAC;gBACP,IAAI,EAAE,CAAC;YACR,CAAC;YAED,IAAI,OAAO,CAAC;YACZ,IAAI,QAAQ,CAAC;YAEb,IAAI,IAAI,CAAC;YACT,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;gBAClD,MAAM,IAAI,GAAG,YAAY,CAAC;gBAC1B,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC;gBAC1E,wCAAwC;gBACxC,IAAI,IAAI,EAAE,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;oBAC9C,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC;gBAC1B,CAAC;gBAED,IAAI,IAAI,GAAG,CAAC,EAAE,CAAC;oBACd,IAAI,EAAE,CAAC;oBACP,SAAS;gBACV,CAAC;gBAED,IAAI,UAAU,IAAI,IAAI,EAAE,CAAC;oBACxB,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC;oBACxB,WAAW,GAAG,IAAI,EAAE,IAAI,IAAI,YAAY,CAAC;gBAC1C,CAAC;qBAAM,IAAI,OAAO,IAAI,IAAI,EAAE,CAAC;oBAC5B,oCAAoC;oBAEpC,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC;oBACrB,QAAQ,GAAG,IAAI,EAAE,IAAI,IAAI,YAAY,CAAC;oBAEtC,MAAM;gBACP,CAAC;YACF,CAAC;YAED,IAAI,UAAU,IAAI,IAAI,IAAI,WAAW,IAAI,IAAI,EAAE,CAAC;gBAC/C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,gBAAgB,EAAE,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;gBACtF,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;oBACpB,IAAI,MAAM,CAAC,WAAW,IAAI,IAAI,EAAE,CAAC;wBAChC,UAAU,GAAG,iBAAiB,CAAC;wBAC/B,WAAW,GAAG,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,IAAI,CAAC;wBACjD,OAAO,GAAG,EAAE,CAAC;wBACb,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC;oBACxB,CAAC;yBAAM,CAAC;wBACP,OAAO,SAAS,CAAC;oBAClB,CAAC;gBACF,CAAC;qBAAM,CAAC;oBACP,OAAO,SAAS,CAAC;gBAClB,CAAC;YACF,CAAC;YAED,IAAI,OAAO,IAAI,IAAI,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;gBACzC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,gBAAgB,EAAE,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;gBACtF,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;oBACpB,IAAI,MAAM,CAAC,WAAW,IAAI,IAAI,EAAE,CAAC;wBAChC,OAAO,GAAG,iBAAiB,CAAC;wBAC5B,QAAQ,GAAG,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,IAAI,CAAC;oBAC/C,CAAC;yBAAM,CAAC;wBACP,OAAO,GAAG,EAAE,CAAC;wBACb,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC;oBACxB,CAAC;gBACF,CAAC;qBAAM,CAAC;oBACP,OAAO,GAAG,EAAE,CAAC;oBACb,QAAQ,GAAG,YAAY,CAAC;gBACzB,CAAC;YACF,CAAC;YAED,OAAO;gBACN,OAAO,EAAE,iBAAiB,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,UAAU,IAAI,SAAS,CAAC;gBACzF,IAAI,EAAE,iBAAiB,CACtB,IAAI,CAAC,QAAQ,EACb,QAAQ,EACR,QAAQ,IAAI,WAAW,EACvB,CAAC,OAAO,IAAI,gBAAgB,CAAC,IAAI,SAAS,CAC1C;aACD,CAAC;QACH,CAAC;QAAC,OAAO,EAAE,EAAE,CAAC;YACb,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;YACjB,MAAM,EAAE,CAAC;QACV,CAAC;IACF,CAAC;IAGK,AAAN,KAAK,CAAC,yBAAyB,CAC9B,QAAgB,EAChB,SAAuB,EACvB,GAAuB,EACvB,OAAe,CAAC,EAChB,OAAiB,EACjB,OAA+D,EAC/D,aAA2B;QAE3B,IAAI,GAAG,KAAK,gBAAgB;YAAE,OAAO,SAAS,CAAC;QAE/C,MAAM,KAAK,GAAG,eAAe,EAAE,CAAC;QAEhC,IAAI,GAAG,KAAK,WAAW,EAAE,CAAC;YACzB,GAAG,GAAG,SAAS,CAAC;QACjB,CAAC;QAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;WAgCG;QAEH,IAAI,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QACtE,IAAI,QAAQ,GAAG,CAAC,CAAC;QAEjB,IAAI,IAAI,GAAuB,EAAE,CAAC;QAClC,IAAI,CAAC,GAAG,EAAE,CAAC;YACV,IAAI,GAAG,CAAC,CAAC,EAAE,EAAE,YAAY,CAAC,CAAC,CAAC;YAE5B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,gBAAgB,EAAE,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;YACnF,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;gBACpB,IAAI,MAAM,CAAC,WAAW,IAAI,IAAI,EAAE,CAAC;oBAChC,IAAI,CAAC,IAAI,CAAC,CAAC,iBAAiB,EAAE,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;gBACpE,CAAC;gBAED,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;gBACxD,IAAI,MAAM,CAAC,iBAAiB,IAAI,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;oBAClD,IAAI,IAAI,KAAK,CAAC,IAAI,MAAM,CAAC,WAAW,IAAI,IAAI,EAAE,CAAC;wBAC9C,iFAAiF;wBACjF,QAAQ,EAAE,CAAC;oBACZ,CAAC;gBACF,CAAC;YACF,CAAC;iBAAM,CAAC;gBACP,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC;gBAClC,IAAI,CAAC,OAAO,EAAE,CAAC;oBACd,iFAAiF;oBACjF,QAAQ,EAAE,CAAC;gBACZ,CAAC;YACF,CAAC;QACF,CAAC;aAAM,IAAI,mBAAmB,CAAC,GAAG,CAAC,EAAE,CAAC;YACrC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,gBAAgB,EAAE,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;YACnF,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;gBACpB,IAAI,GAAG;oBACN,CAAC,iBAAiB,EAAE,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,IAAI,CAAC;oBACvD,CAAC,MAAM,EAAE,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,IAAI,CAAC;iBAC5C,CAAC;YACH,CAAC;iBAAM,CAAC;gBACP,0EAA0E;gBAC1E,IAAI,GAAG,CAAC,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC;gBAChC,IAAI,IAAI,GAAG,CAAC,EAAE,CAAC;oBACd,IAAI,EAAE,CAAC;gBACR,CAAC;YACF,CAAC;QACF,CAAC;QAED,IAAI,UAAU,CAAC;QACf,IAAI,WAAW,CAAC;QAEhB,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,IAAI,EAAE,CAAC;YACP,OAAO,IAAI,CAAC,MAAM,IAAI,IAAI,GAAG,CAAC,EAAE,CAAC;gBAChC,IAAI,EAAE,CAAC;gBACP,CAAC,GAAG,EAAE,YAAY,CAAC,GAAG,IAAI,CAAC,KAAK,EAAG,CAAC;YACrC,CAAC;YAED,IAAI,GAAG,KAAK,MAAM,EAAE,CAAC;gBACpB,UAAU,GAAG,GAAG,CAAC;gBACjB,WAAW,GAAG,YAAY,CAAC;gBAE3B,QAAQ,EAAE,CAAC;gBACX,OAAO,IAAI,CAAC,MAAM,IAAI,QAAQ,GAAG,CAAC,EAAE,CAAC;oBACpC,QAAQ,EAAE,CAAC;oBACX,CAAC,GAAG,EAAE,YAAY,CAAC,GAAG,IAAI,CAAC,KAAK,EAAG,CAAC;gBACrC,CAAC;gBAED,IAAI,QAAQ,GAAG,CAAC,EAAE,CAAC;oBAClB,IAAI,IAAI,QAAQ,CAAC;gBAClB,CAAC;gBAED,IAAI,GAAG,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;oBAClC,OAAO;wBACN,OAAO,EAAE,iBAAiB,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,UAAU,CAAC;wBAC5E,QAAQ,EAAE,iBAAiB,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,CAAC;qBACvE,CAAC;gBACH,CAAC;YACF,CAAC;QACF,CAAC;QAED,IAAI,CAAC;YACJ,MAAM,MAAM,GAAG,6BAA6B,EAAE,CAAC;YAC/C,MAAM,IAAI,GAAG,CAAC,KAAK,EAAE,GAAG,MAAM,CAAC,SAAS,EAAE,KAAK,IAAI,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,oDAAoD;YAEhH,MAAM,QAAQ,GAAG,OAAO,EAAE,QAAQ,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC;YAC5E,IAAI,QAAQ,EAAE,CAAC;gBACd,IAAI,CAAC,IAAI,CAAC,KAAK,QAAQ,QAAQ,CAAC,CAAC;YAClC,CAAC;YAED,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,GAAI,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC;YAEhD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CACjC;gBACC,GAAG,EAAE,QAAQ;gBACb,OAAO,EAAE,aAAa;gBACtB,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI,EAAE,EAAE;aAChF,EACD,GAAG,IAAI,CACP,CAAC;YAEF,IAAI,WAAW,CAAC;YAChB,IAAI,YAAY,CAAC;YACjB,IAAI,IAAI,CAAC;YAET,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;gBAClD,MAAM,IAAI,GAAG,YAAY,CAAC;gBAC1B,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC;gBAC1E,wCAAwC;gBACxC,IAAI,IAAI,EAAE,YAAY,IAAI,IAAI,CAAC,YAAY,KAAK,YAAY,EAAE,CAAC;oBAC9D,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;gBAClC,CAAC;gBAED,IAAI,IAAI,GAAG,CAAC,EAAE,CAAC;oBACd,IAAI,EAAE,CAAC;oBACP,SAAS;gBACV,CAAC;gBAED,IAAI,UAAU,IAAI,IAAI,EAAE,CAAC;oBACxB,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC;oBACxB,WAAW,GAAG,IAAI,EAAE,IAAI,IAAI,YAAY,CAAC;gBAC1C,CAAC;qBAAM,IAAI,WAAW,IAAI,IAAI,EAAE,CAAC;oBAChC,IAAI,MAAM,CAAC,GAAG,KAAK,GAAG;wBAAE,SAAS;oBAEjC,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC;oBACzB,YAAY,GAAG,IAAI,EAAE,IAAI,IAAI,YAAY,CAAC;oBAE1C,MAAM;gBACP,CAAC;YACF,CAAC;YAED,IAAI,UAAU,IAAI,IAAI,IAAI,WAAW,IAAI,IAAI;gBAAE,OAAO,SAAS,CAAC;YAEhE,OAAO;gBACN,OAAO,EAAE,iBAAiB,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,UAAU,IAAI,SAAS,CAAC;gBACzF,QAAQ,EAAE,iBAAiB,CAC1B,IAAI,CAAC,QAAQ,EACb,QAAQ,EACR,YAAY,IAAI,WAAW,EAC3B,WAAW,IAAI,gBAAgB,CAC/B;aACD,CAAC;QACH,CAAC;QAAC,OAAO,EAAE,EAAE,CAAC;YACb,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;YACjB,MAAM,EAAE,CAAC;QACV,CAAC;IACF,CAAC;IAGK,AAAN,KAAK,CAAC,iCAAiC,CACtC,QAAgB,EAChB,SAAuB,EACvB,GAAuB,EACvB,KAAgB,EAChB,OAAuF,EACvF,aAA2B;QAE3B,IAAI,GAAG,KAAK,gBAAgB;YAAE,OAAO,SAAS,CAAC;QAE/C,MAAM,KAAK,GAAG,eAAe,EAAE,CAAC;QAEhC,IAAI,GAAG,KAAK,WAAW,EAAE,CAAC;YACzB,GAAG,GAAG,SAAS,CAAC;QACjB,CAAC;QAED,IAAI,UAAU,CAAC;QACf,IAAI,WAAW,CAAC;QAChB,IAAI,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QACtE,MAAM,YAAY,GAAG,OAAO,EAAE,YAAY,IAAI,IAAI,CAAC;QAEnD,+FAA+F;QAC/F,IAAI,CAAC,GAAG,EAAE,CAAC;YACV,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,gBAAgB,EAAE,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;YACnF,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;gBACpB,IAAI,MAAM,CAAC,WAAW,IAAI,IAAI,EAAE,CAAC;oBAChC,IAAI,MAAM,CAAC,iBAAiB,IAAI,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;wBACvD,OAAO;4BACN,OAAO,EAAE,iBAAiB,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,SAAS,CAAC;4BAC5E,QAAQ,EAAE,iBAAiB,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,iBAAiB,CAAC;4BACrF,KAAK,EAAE,KAAK;yBACZ,CAAC;oBACH,CAAC;oBAED,UAAU,GAAG,iBAAiB,CAAC;oBAC/B,WAAW,GAAG,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,IAAI,CAAC;oBACjD,IAAI,MAAM,CAAC,YAAY,IAAI,IAAI,EAAE,CAAC;wBACjC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;oBACpC,CAAC;oBACD,GAAG,GAAG,iBAAiB,CAAC;gBACzB,CAAC;qBAAM,IAAI,MAAM,CAAC,iBAAiB,IAAI,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;oBAC9D,UAAU,GAAG,EAAE,CAAC;oBAChB,WAAW,GAAG,YAAY,CAAC;oBAC3B,GAAG,GAAG,EAAE,CAAC;gBACV,CAAC;YACF,CAAC;QACF,CAAC;aAAM,IAAI,CAAC,YAAY,EAAE,CAAC;YAC1B,UAAU,GAAG,GAAG,CAAC;YACjB,WAAW,GAAG,YAAY,CAAC;QAC5B,CAAC;QAED,IAAI,CAAC;YACJ,MAAM,MAAM,GAAG,2BAA2B,EAAE,CAAC;YAC7C,MAAM,IAAI,GAAG,CAAC,KAAK,EAAE,GAAG,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC,oDAAoD;YAEtG,MAAM,QAAQ,GAAG,OAAO,EAAE,QAAQ,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC;YAC5E,IAAI,QAAQ,EAAE,CAAC;gBACd,IAAI,CAAC,IAAI,CAAC,KAAK,QAAQ,QAAQ,CAAC,CAAC;YAClC,CAAC;YAED,IAAI,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,EAAE,CAAC;gBACtC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAChB,CAAC;YAED,IAAI,CAAC,IAAI,CAAC,KAAK,KAAK,CAAC,SAAS,IAAI,KAAK,CAAC,OAAO,IAAI,YAAY,EAAE,CAAC,CAAC;YAEnE,IAAI,MAAiB,CAAC;YACtB,IAAI,CAAC;gBACJ,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC;YAClF,CAAC;YAAC,OAAO,EAAE,EAAE,CAAC;gBACb,IAAI,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC;oBAAE,MAAM,EAAE,CAAC;gBAE/C,sDAAsD;gBACtD,MAAM,KAAK,GAAG,SAAS,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;gBACpE,IAAI,KAAK,IAAI,IAAI;oBAAE,MAAM,EAAE,CAAC;gBAE5B,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBACpC,IAAI,KAAK,CAAC,IAAI,CAAC;oBAAE,MAAM,EAAE,CAAC;gBAE1B,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;gBACtD,IAAI,KAAK,KAAK,CAAC,CAAC;oBAAE,MAAM,EAAE,CAAC;gBAE3B,KAAK,GAAG;oBACP,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC;oBAC1C,cAAc,EAAE,KAAK,CAAC,cAAc;oBACpC,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC;oBACtC,YAAY,EAAE,KAAK,CAAC,YAAY;oBAChC,MAAM,EAAE,KAAK,CAAC,MAAM;iBACpB,CAAC;gBAEF,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,EAAE,KAAK,KAAK,CAAC,SAAS,IAAI,KAAK,CAAC,OAAO,IAAI,YAAY,EAAE,CAAC,CAAC;gBAC/E,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC;YAClF,CAAC;YAED,IAAI,YAAY,CAAC;YACjB,IAAI,WAAW,CAAC;YAChB,IAAI,YAAY,CAAC;YACjB,IAAI,IAAI,CAAC;YAET,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;gBAClD,MAAM,IAAI,GAAG,YAAY,CAAC;gBAC1B,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC;gBAC1E,uHAAuH;gBACvH,IAAI,IAAI,IAAI,IAAI,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBAC/C,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;oBACvB,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC;gBAC1B,CAAC;gBACD,wCAAwC;gBACxC,IAAI,IAAI,EAAE,YAAY,IAAI,IAAI,CAAC,YAAY,KAAK,YAAY,EAAE,CAAC;oBAC9D,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;gBAClC,CAAC;gBAED,IAAI,UAAU,IAAI,IAAI,EAAE,CAAC;oBACxB,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC;oBACxB,WAAW,GAAG,IAAI,EAAE,IAAI,IAAI,YAAY,CAAC;oBACzC,YAAY;wBACX,IAAI,EAAE,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE,cAAc,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;gBAC1F,CAAC;qBAAM,IAAI,WAAW,IAAI,IAAI,EAAE,CAAC;oBAChC,IAAI,MAAM,CAAC,GAAG,KAAK,GAAG;wBAAE,SAAS;oBAEjC,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC;oBACzB,YAAY,GAAG,IAAI,EAAE,IAAI,IAAI,YAAY,CAAC;oBAE1C,MAAM;gBACP,CAAC;YACF,CAAC;YAED,IAAI,UAAU,IAAI,IAAI,IAAI,WAAW,IAAI,IAAI;gBAAE,OAAO,SAAS,CAAC;YAEhE,qFAAqF;YACrF,qFAAqF;YACrF,mDAAmD;YACnD,IAAI,WAAW,IAAI,IAAI,IAAI,UAAU,EAAE,CAAC;gBACvC,WAAW;oBACV,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,GAAG,UAAU,GAAG,CAAC,CAAC,IAAI,gBAAgB,CAAC;YAC/F,CAAC;YAED,OAAO;gBACN,OAAO,EAAE,iBAAiB,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,UAAU,IAAI,SAAS,CAAC;gBACzF,QAAQ,EAAE,iBAAiB,CAC1B,IAAI,CAAC,QAAQ,EACb,QAAQ,EACR,YAAY,IAAI,WAAW,EAC3B,WAAW,IAAI,gBAAgB,CAC/B;gBACD,KAAK,EAAE,YAAY,IAAI,KAAK;aAC5B,CAAC;QACH,CAAC;QAAC,OAAO,EAAE,EAAE,CAAC;YACb,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;YACjB,MAAM,EAAE,CAAC;QACV,CAAC;IACF,CAAC;IAED,gEAAgE;IAChE,KAAK,CAAC,IAAI,CACT,QAAgB,EAChB,QAAgB,EAChB,IAAa,EACb,IAAa,EACb,OAMC;QAED,MAAM,MAAM,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,WAAW,CAAC,CAAC;QAEtD,IAAI,OAAO,EAAE,cAAc,IAAI,IAAI,EAAE,CAAC;YACrC,MAAM,CAAC,IAAI,CAAC,KAAK,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC;QAC5C,CAAC;QAED,IAAI,OAAO,EAAE,OAAO,EAAE,CAAC;YACtB,MAAM,CAAC,IAAI,CAAC,KAAK,OAAO,CAAC,mBAAmB,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,mBAAmB,GAAG,EAAE,CAAC,CAAC;QAClG,CAAC;QAED,IAAI,OAAO,EAAE,OAAO,IAAI,IAAI,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC9D,MAAM,CAAC,IAAI,CAAC,iBAAiB,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QAC1D,CAAC;QAED,IAAI,IAAI,EAAE,CAAC;YACV,yGAAyG;YACzG,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC1B,IAAI,GAAG,OAAO,CAAC;YAChB,CAAC;YACD,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAC5D,CAAC;QACD,IAAI,IAAI,EAAE,CAAC;YACV,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAC5D,CAAC;QAED,IAAI,CAAC;YACJ,OAAO,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CACzB,EAAE,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,EACvE,GAAG,MAAM,EACT,IAAI,EACJ,QAAQ,CACR,CAAC;QACH,CAAC;QAAC,OAAO,EAAE,EAAE,CAAC;YACb,MAAM,KAAK,GAAG,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;YACrD,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBACpB,MAAM,CAAC,EAAE,GAAG,CAAC,GAAG,KAAK,CAAC;gBAEtB,mHAAmH;gBACnH,IAAI,GAAG,KAAK,IAAI,IAAI,GAAG,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;oBACxC,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;gBAC9D,CAAC;YACF,CAAC;YAED,MAAM,EAAE,CAAC;QACV,CAAC;IACF,CAAC;IAED,yFAAyF;IACzF,KAAK,CAAC,YAAY,CACjB,QAAgB,EAChB,QAAgB,EAChB,GAAW,EACX,QAAgB,EAChB,OAA+F;QAE/F,MAAM,MAAM,GAAG;YACd,MAAM;YACN,KAAK,OAAO,EAAE,mBAAmB,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,mBAAmB,GAAG,EAAE;YACpF,eAAe;YACf,KAAK;YACL,WAAW;SACX,CAAC;QAEF,IAAI,OAAO,EAAE,OAAO,IAAI,IAAI,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC9D,MAAM,CAAC,IAAI,CAAC,iBAAiB,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QAC1D,CAAC;QAED,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAE1B,IAAI,CAAC;YACJ,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CACjC;gBACC,GAAG,EAAE,QAAQ;gBACb,OAAO,EAAE,cAAc;gBACvB,QAAQ,EAAE,OAAO,EAAE,QAAQ;gBAC3B,KAAK,EAAE,QAAQ;aACf,EACD,GAAG,MAAM,EACT,IAAI,EACJ,QAAQ;YACR,6BAA6B;YAC7B,GAAG,CACH,CAAC;YACF,OAAO,MAAM,CAAC,MAAM,CAAC;QACtB,CAAC;QAAC,OAAO,EAAE,EAAE,CAAC;YACb,IAAI,EAAE,YAAY,QAAQ,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;gBACzC,OAAO,EAAE,CAAC,MAAM,CAAC;YAClB,CAAC;YAED,MAAM,KAAK,GAAG,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;YACrD,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBACpB,MAAM,CAAC,EAAE,UAAU,CAAC,GAAG,KAAK,CAAC;gBAE7B,mHAAmH;gBACnH,IAAI,UAAU,KAAK,GAAG,IAAI,UAAU,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;oBACrD,OAAO,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;gBAC1E,CAAC;YACF,CAAC;YAED,MAAM,EAAE,CAAC;QACV,CAAC;IACF,CAAC;IAED,kEAAkE;IAElE,cAAc,CACb,QAAgB,EAChB,QAAgB,EAChB,IAAwB,EACxB,IAAa,EACb,OAA+B;QAE/B,MAAM,QAAQ,GAAG,GAAG,aAAa,CAAC,QAAQ,CAAC,IAAI,IAAI,IAAI,EAAE,IAAI,IAAI,IAAI,EAAE,EAAE,CAAC;QAC1E,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CACjC,QAAQ,EACR,QAAQ,EACR,GAAG,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,EACtE,EAAE,QAAQ,EAAE,IAAI,GAAG,EAAE,EAAE,CACvB,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAC/B,QAAgB,EAChB,QAAgB,EAChB,IAAwB,EACxB,IAAwB,EACxB,OAA0C;QAE1C,sFAAsF;QACtF,8FAA8F;QAC9F,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE;YAC9D,QAAQ,EAAE,OAAO,EAAE,QAAQ;YAC3B,OAAO,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;YACxB,cAAc,EAAE,CAAC;YACjB,OAAO,EAAE,IAAI;YACb,mBAAmB,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,mBAAmB;SACrE,CAAC,CAAC;QACH,OAAO,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACxC,CAAC;IAED,2FAA2F;IAE3F,sBAAsB,CACrB,QAAgB,EAChB,QAAgB,EAChB,GAAW,EACX,QAAgB,EAChB,OAA+B;QAE/B,MAAM,QAAQ,GAAG,GAAG,aAAa,CAAC,QAAQ,CAAC,IAAI,GAAG,KAAK,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC7E,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CACjC,QAAQ,EACR,QAAQ,EACR,GAAG,EAAE,CAAC,IAAI,CAAC,0BAA0B,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,OAAO,CAAC,EACjF,EAAE,QAAQ,EAAE,IAAI,GAAG,EAAE,EAAE,CACvB,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,0BAA0B,CACvC,QAAgB,EAChB,QAAgB,EAChB,GAAW,EACX,QAAgB,EAChB,OAA0C;QAE1C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE;YACvE,QAAQ,EAAE,OAAO,EAAE,QAAQ;YAC3B,OAAO,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;YACxB,mBAAmB,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,mBAAmB;SACrE,CAAC,CAAC;QACH,OAAO,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;IAED,yFAAyF;IAEnF,AAAN,KAAK,CAAC,qBAAqB,CAC1B,QAAgB,EAChB,QAAgB,EAChB,GAAuB,EACvB,OAA0F;QAE1F,OAAO,qBAAqB,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;IAC1E,CAAC;IAGK,AAAN,KAAK,CAAC,YAAY,CACjB,QAAgB,EAChB,SAAuB,EACvB,OAA2E;QAE3E,MAAM,KAAK,GAAG,eAAe,EAAE,CAAC;QAChC,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC,GAAG,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAC,CAAC;QAEtE,IAAI,CAAC;YACJ,IAAI,IAAI,GAAG,OAAO,EAAE,IAAI,CAAC;YACzB,IAAI,CAAC,IAAI,EAAE,CAAC;gBACX,MAAM,KAAK,GAAG,eAAe,EAAE,CAAC;gBAEhC,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;gBACpC,IAAI,IAAI,IAAI,IAAI;oBAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;gBAExD,KAAK,EAAE,KAAK,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC;YACpC,CAAC;YAED,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAClB,EAAE,GAAG,EAAE,IAAI,EAAE,EACb,UAAU,EACV,aAAa,EACb,UAAU,IAAI,EAAE,EAChB,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,EACxC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,EACxC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,EACxC,IAAI,EACJ,YAAY,CACZ,CAAC;QACH,CAAC;QAAC,OAAO,EAAE,EAAE,CAAC;YACb,MAAM,GAAG,GAAW,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;YACzC,IAAI,GAAG,KAAK,oBAAoB,IAAI,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;gBAClE,MAAM,IAAI,KAAK,CACd,0GAA0G,EAC1G,EAAE,KAAK,EAAE,EAAE,EAAE,CACb,CAAC;YACH,CAAC;YAED,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;YACjB,MAAM,EAAE,CAAC;QACV,CAAC;IACF,CAAC;IAGK,AAAN,KAAK,CAAC,oBAAoB,CAAC,QAAgB,EAAE,IAAY,EAAE,IAAa,EAAE,IAAa;QACtF,MAAM,KAAK,GAAG,eAAe,EAAE,CAAC;QAEhC,IAAI,CAAC;YACJ,IAAI,CAAC,IAAI,EAAE,CAAC;gBACX,MAAM,KAAK,GAAG,eAAe,EAAE,CAAC;gBAEhC,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;gBACxC,IAAI,IAAI,IAAI,IAAI;oBAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;gBAExD,KAAK,EAAE,KAAK,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC;YACpC,CAAC;YAED,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAChG,CAAC;QAAC,OAAO,EAAE,EAAE,CAAC;YACb,MAAM,GAAG,GAAW,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;YACzC,IAAI,GAAG,KAAK,oBAAoB,IAAI,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;gBAClE,MAAM,IAAI,KAAK,CACd,oHAAoH,EACpH,EAAE,KAAK,EAAE,EAAE,EAAE,CACb,CAAC;YACH,CAAC;YAED,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;YACjB,MAAM,EAAE,CAAC;QACV,CAAC;IACF,CAAC;CACD;AAx6BM;IADL,KAAK,EAAE;8DA0CP;AAGK;IADL,KAAK,EAAE;iDAgDP;AAGK;IADL,KAAK,EAAE;uDAgBP;AAGK;IADL,KAAK,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;sDAoBrD;AAGK;IADL,KAAK,EAAE;uDAiCP;AAGK;IADL,KAAK,EAAE;qDAMP;AAGK;IADL,KAAK,EAAE;+DA0IP;AAGK;IADL,KAAK,EAAE;mEAiMP;AAGK;IADL,KAAK,EAAE;2EAwJP;AAyHD;IADC,KAAK,EAAE;wDAeP;AAuBD;IADC,KAAK,EAAE;gEAeP;AAmBK;IADL,KAAK,EAAE;+DAQP;AAGK;IADL,KAAK,EAAE;sDA2CP;AAGK;IADL,KAAK,EAAE;8DA2BP;AAEF,SAAS,qBAAqB,CAC7B,EAAU,EACV,IAAwB,EACxB,IAAc,EACd,QAAmC;IAEnC,IAAI,EAAE,KAAK,WAAW,EAAE,CAAC;QACxB,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;YAClB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjB,CAAC;aAAM,CAAC;YACP,4BAA4B;YAC5B,IAAI,GAAG,MAAM,CAAC;QACf,CAAC;IACF,CAAC;SAAM,IAAI,EAAE,KAAK,iBAAiB,EAAE,CAAC;QACrC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACtB,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;YAClB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjB,CAAC;aAAM,CAAC;YACP,0BAA0B;YAC1B,IAAI,GAAG,MAAM,CAAC;QACf,CAAC;IACF,CAAC;SAAM,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;QACzB,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,WAAW,EAAE,KAAK,MAAM,EAAE,CAAC;YAC9C,IAAI,GAAG,MAAM,CAAC;YACd,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjB,CAAC;aAAM,CAAC;YACP,IAAI,GAAG,GAAG,EAAE,GAAG,CAAC;YAChB,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACrB,CAAC;IACF,CAAC;SAAM,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;QACtB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjB,CAAC;SAAM,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;QAC7B,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,GAAG,QAAQ,GAAG,EAAE,EAAE,CAAC,CAAC;IACtC,CAAC;SAAM,CAAC;QACP,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACrB,CAAC;IACD,OAAO,IAAI,CAAC;AACb,CAAC;AAED,SAAS,iBAAiB,CACzB,QAAgC,EAChC,QAAgB,EAChB,YAAoB,EACpB,GAAuB;IAEvB,OAAO;QACN,GAAG,EAAE,GAAG;YACP,CAAC,CAAC,OAAO,CAAC;gBACR,MAAM,EAAE,SAAS;gBACjB,SAAS,EAAE,iCAAiC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;gBAC9E,IAAI,EAAE,QAAQ,CAAC,cAAc,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,IAAI;aAC1D,CAAC;YACH,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,EAAE,QAAQ,CAAC;QAClD,IAAI,EAAE,YAAY;QAClB,GAAG,EAAE,GAAG;QACR,QAAQ,EAAE,QAAQ;KAClB,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAC1C,GAAQ,EACR,QAAgB,EAChB,QAAgB,EAChB,GAAuB,EACvB,OAA0F;IAE1F,MAAM,MAAM,GAAG,6BAA6B,EAAE,CAAC;IAE/C,MAAM,QAAQ,GAAG,OAAO,EAAE,QAAQ,CAAC;IAEnC,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,IAAI,CAC5B,EAAE,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAE,aAAa,EAAE,EACzC,KAAK,EACL,GAAG,MAAM,CAAC,SAAS,EACnB,QAAQ,CAAC,CAAC,CAAC,KAAK,QAAQ,QAAQ,CAAC,CAAC,CAAC,SAAS,EAC5C,WAAW,EACX,iBAAiB,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,EAC9E,GAAG;IACH,2FAA2F;IAC3F,8GAA8G;IAC9G,IAAI,CACJ,CAAC;IAEF,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;IAClD,IAAI,MAAM,IAAI,IAAI;QAAE,OAAO,SAAS,CAAC;IAErC,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,CAAC,YAAY,KAAK,QAAQ,CAAC,CAAC;IACxF,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;AACxC,CAAC"}
|
|
1
|
+
{"version":3,"file":"diff.js","sourceRoot":"","sources":["../../src/providers/diff.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graph.d.ts","sourceRoot":"","sources":["../../src/providers/graph.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAIjE,OAAO,KAAK,EACX,QAAQ,EAQR,iBAAiB,EACjB,MAAM,8BAA8B,CAAC;AACtC,OAAO,KAAK,EACX,cAAc,EACd,oBAAoB,EACpB,sBAAsB,EAEtB,qBAAqB,EACrB,MAAM,oCAAoC,CAAC;AAE5C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"graph.d.ts","sourceRoot":"","sources":["../../src/providers/graph.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAIjE,OAAO,KAAK,EACX,QAAQ,EAQR,iBAAiB,EACjB,MAAM,8BAA8B,CAAC;AACtC,OAAO,KAAK,EACX,cAAc,EACd,oBAAoB,EACpB,sBAAsB,EAEtB,qBAAqB,EACrB,MAAM,oCAAoC,CAAC;AAE5C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAGjE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAmB3E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AACnE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAe1C,qBAAa,mBAAoB,YAAW,mBAAmB;IAE7D,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAHR,OAAO,EAAE,iBAAiB,EAC1B,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,sBAAsB;IAI5C,QAAQ,CACb,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,OAAO,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE;YAAE,KAAK,CAAC,EAAE,OAAO,CAAA;SAAE,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,YAAY,CAAC,EAAE,iBAAiB,CAAA;KAAE,EAC7F,YAAY,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,QAAQ,CAAC;IAodb,WAAW,CACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,WAAW,EACnB,OAAO,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,aAAa,GAAG,MAAM,CAAA;KAAE,EACxE,YAAY,CAAC,EAAE,WAAW,GACxB,cAAc,CAAC,sBAAsB,EAAE,cAAc,EAAE,IAAI,CAAC;IAcxD,mBAAmB,CACzB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,oBAAoB,EAC5B,eAAe,EAAE,qBAAqB,EACtC,OAAO,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,EAC5B,YAAY,CAAC,EAAE,WAAW,GACxB,cAAc,CAAC,sBAAsB,EAAE,cAAc,EAAE,IAAI,CAAC;YAIhD,eAAe;CAqP9B"}
|
|
@@ -61,6 +61,7 @@ import { getBranchId, getBranchNameWithoutRemote, getRemoteNameFromBranchName, }
|
|
|
61
61
|
import { getChangedFilesCount } from '../../git/utils/commit.utils.js';
|
|
62
62
|
import { isUncommitted } from '../../git/utils/revision.utils.js';
|
|
63
63
|
import { getSearchQueryComparisonKey, parseSearchQueryGitCommand } from '../../git/utils/search.utils.js';
|
|
64
|
+
import { compareReachableRefs } from '../../git/utils/sorting.js';
|
|
64
65
|
import { getTagId } from '../../git/utils/tag.utils.js';
|
|
65
66
|
import { isUserMatch } from '../../git/utils/user.utils.js';
|
|
66
67
|
import { getWorktreeId, groupWorktreesByBranch } from '../../git/utils/worktree.utils.js';
|
|
@@ -97,9 +98,9 @@ export class GraphGitSubProvider {
|
|
|
97
98
|
const statsParser = getShaAndStatsLogParser();
|
|
98
99
|
const [shaResult, stashResult, branchesResult, remotesResult, currentUserResult, worktreesResult] = await Promise.allSettled([
|
|
99
100
|
!isUncommitted(rev, true)
|
|
100
|
-
? this.git.
|
|
101
|
+
? this.git.run({ cwd: repoPath, configs: gitConfigsLog }, 'log', ...shaParser.arguments, '-n1', rev ?? 'HEAD', '--')
|
|
101
102
|
: undefined,
|
|
102
|
-
this.provider.stash?.getStash(repoPath,
|
|
103
|
+
this.provider.stash?.getStash(repoPath, { includeFiles: false }, cancellation),
|
|
103
104
|
this.provider.branches.getBranches(repoPath, undefined, cancellation),
|
|
104
105
|
this.provider.remotes.getRemotes(repoPath, undefined, cancellation),
|
|
105
106
|
this.provider.config.getCurrentUser(repoPath),
|
|
@@ -134,7 +135,8 @@ export class GraphGitSubProvider {
|
|
|
134
135
|
const avatars = new Map();
|
|
135
136
|
const ids = new Set();
|
|
136
137
|
const reachableFromHEAD = new Set();
|
|
137
|
-
|
|
138
|
+
// Map<sha, Map<refKey, ref>> — inner map deduplicates refs during propagation
|
|
139
|
+
const reachableRefs = new Map();
|
|
138
140
|
const rowStats = new Map();
|
|
139
141
|
let pendingRowsStatsCount = 0;
|
|
140
142
|
let iterations = 0;
|
|
@@ -196,7 +198,6 @@ export class GraphGitSubProvider {
|
|
|
196
198
|
branchIdOfMainWorktree: branchIdOfMainWorktree,
|
|
197
199
|
stashes: gitStash?.stashes,
|
|
198
200
|
reachableFromHEAD: reachableFromHEAD,
|
|
199
|
-
reachableFromBranches: reachableFromBranches,
|
|
200
201
|
avatars: avatars,
|
|
201
202
|
}
|
|
202
203
|
: undefined;
|
|
@@ -303,32 +304,44 @@ export class GraphGitSubProvider {
|
|
|
303
304
|
reachableFromHEAD.add(parent);
|
|
304
305
|
}
|
|
305
306
|
}
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
307
|
+
// Seed reachability from all ref types on this commit
|
|
308
|
+
if (refHeads.length > 0 || refRemoteHeads.length > 0 || refTags.length > 0) {
|
|
309
|
+
let refs = reachableRefs.get(shaOrRemapped);
|
|
310
|
+
if (refs == null) {
|
|
311
|
+
refs = new Map();
|
|
312
|
+
reachableRefs.set(shaOrRemapped, refs);
|
|
311
313
|
}
|
|
312
|
-
for (const
|
|
313
|
-
|
|
314
|
+
for (const h of refHeads) {
|
|
315
|
+
const key = `b:${h.name}`;
|
|
316
|
+
refs.set(key, { refType: 'branch', name: h.name, remote: false, current: h.isCurrentHead });
|
|
317
|
+
}
|
|
318
|
+
for (const r of refRemoteHeads) {
|
|
319
|
+
const name = `${r.owner}/${r.name}`;
|
|
320
|
+
refs.set(`r:${name}`, { refType: 'branch', name: name, remote: true });
|
|
321
|
+
}
|
|
322
|
+
for (const t of refTags) {
|
|
323
|
+
refs.set(`t:${t.name}`, { refType: 'tag', name: t.name });
|
|
314
324
|
}
|
|
315
325
|
}
|
|
316
|
-
|
|
317
|
-
|
|
326
|
+
// Propagate reachability to parents
|
|
327
|
+
const currentRefs = reachableRefs.get(shaOrRemapped);
|
|
328
|
+
if (currentRefs != null && currentRefs.size > 0) {
|
|
318
329
|
for (parent of parents) {
|
|
319
|
-
let
|
|
320
|
-
if (
|
|
321
|
-
|
|
322
|
-
|
|
330
|
+
let parentRefs = reachableRefs.get(parent);
|
|
331
|
+
if (parentRefs == null) {
|
|
332
|
+
parentRefs = new Map();
|
|
333
|
+
reachableRefs.set(parent, parentRefs);
|
|
323
334
|
}
|
|
324
|
-
for (const
|
|
325
|
-
|
|
335
|
+
for (const [key, ref] of currentRefs) {
|
|
336
|
+
if (!parentRefs.has(key)) {
|
|
337
|
+
parentRefs.set(key, ref);
|
|
338
|
+
}
|
|
326
339
|
}
|
|
327
340
|
}
|
|
328
341
|
}
|
|
329
342
|
stash = gitStash?.stashes.get(shaOrRemapped);
|
|
330
343
|
if (stash != null) {
|
|
331
|
-
const
|
|
344
|
+
const refs = reachableRefs.get(shaOrRemapped);
|
|
332
345
|
const row = {
|
|
333
346
|
sha: shaOrRemapped,
|
|
334
347
|
// Always only return the first parent for stashes, as it is a Git implementation for the index and untracked files
|
|
@@ -342,7 +355,9 @@ export class GraphGitSubProvider {
|
|
|
342
355
|
heads: refHeads,
|
|
343
356
|
remotes: refRemoteHeads,
|
|
344
357
|
tags: refTags,
|
|
345
|
-
|
|
358
|
+
reachability: refs?.size
|
|
359
|
+
? { partial: true, refs: [...refs.values()].sort(compareReachableRefs) }
|
|
360
|
+
: undefined,
|
|
346
361
|
isCurrentUser: true,
|
|
347
362
|
};
|
|
348
363
|
rowProcessor?.processRow(row, graphCtx);
|
|
@@ -357,7 +372,7 @@ export class GraphGitSubProvider {
|
|
|
357
372
|
}
|
|
358
373
|
else {
|
|
359
374
|
isCurrentUser = isUserMatch(currentUser, commit.author, commit.authorEmail);
|
|
360
|
-
const
|
|
375
|
+
const refs = reachableRefs.get(shaOrRemapped);
|
|
361
376
|
const row = {
|
|
362
377
|
sha: shaOrRemapped,
|
|
363
378
|
parents: onlyFollowFirstParent ? parents.slice(0, 1) : parents,
|
|
@@ -370,7 +385,9 @@ export class GraphGitSubProvider {
|
|
|
370
385
|
heads: refHeads,
|
|
371
386
|
remotes: refRemoteHeads,
|
|
372
387
|
tags: refTags,
|
|
373
|
-
|
|
388
|
+
reachability: refs?.size
|
|
389
|
+
? { partial: true, refs: [...refs.values()].sort(compareReachableRefs) }
|
|
390
|
+
: undefined,
|
|
374
391
|
isCurrentUser: isCurrentUser || undefined,
|
|
375
392
|
};
|
|
376
393
|
rowProcessor?.processRow(row, graphCtx);
|
|
@@ -397,12 +414,12 @@ export class GraphGitSubProvider {
|
|
|
397
414
|
args.push(`-n${total - startTotal}`, `--skip=${startTotal}`);
|
|
398
415
|
}
|
|
399
416
|
args.push(`--${ordering}-order`, '--all');
|
|
400
|
-
const statsResult = await this.git.
|
|
417
|
+
const statsResult = await this.git.run({ cwd: repoPath, configs: gitConfigsLog, stdin: stdin }, 'log', stdin ? '--stdin' : undefined, ...args, '--');
|
|
401
418
|
if (statsResult.stdout) {
|
|
402
419
|
let statShaOrRemapped;
|
|
403
420
|
for (const stat of statsParser.parse(statsResult.stdout)) {
|
|
404
421
|
statShaOrRemapped = remappedIds.get(stat.sha) ?? stat.sha;
|
|
405
|
-
//
|
|
422
|
+
// Don't overwrite stats already populated for this sha
|
|
406
423
|
if (rowStats.has(statShaOrRemapped))
|
|
407
424
|
continue;
|
|
408
425
|
rowStats.set(statShaOrRemapped, stat.stats);
|
|
@@ -431,7 +448,6 @@ export class GraphGitSubProvider {
|
|
|
431
448
|
worktrees: worktrees,
|
|
432
449
|
worktreesByBranch: worktreesByBranch,
|
|
433
450
|
reachableFromHEAD: reachableFromHEAD,
|
|
434
|
-
reachableFromBranches: reachableFromBranches,
|
|
435
451
|
rows: rows,
|
|
436
452
|
id: sha ?? rev,
|
|
437
453
|
rowsStats: rowStats,
|
|
@@ -496,7 +512,7 @@ export class GraphGitSubProvider {
|
|
|
496
512
|
else if (!filters.refs) {
|
|
497
513
|
// Don't include stashes when using ref: filter, as they would add unrelated commits
|
|
498
514
|
// There *HAS* to be a better way to get git log to return stashes, but this is the best we've found
|
|
499
|
-
({ stdin, stashes, remappedIds } = convertStashesToStdin(await this.provider.stash?.getStash(repoPath,
|
|
515
|
+
({ stdin, stashes, remappedIds } = convertStashesToStdin(await this.provider.stash?.getStash(repoPath, { includeFiles: false }, cancellation)));
|
|
500
516
|
}
|
|
501
517
|
else {
|
|
502
518
|
remappedIds = new Map();
|