This repository was archived by the owner on Jun 28, 2026. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 37
Expand file tree
/
Copy pathgit-actions.ts
More file actions
420 lines (384 loc) · 11.5 KB
/
Copy pathgit-actions.ts
File metadata and controls
420 lines (384 loc) · 11.5 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
import simpleGit, { GitError, SimpleGit, SimpleGitOptions } from "simple-git";
import * as vscode from "vscode";
import { Logger, LogLevel } from "../infrastructure/logger/logger";
export interface GitDiffResult {
file: string;
diff: string | null;
error: string | null;
}
export interface BranchInfo {
current: string;
upstream?: string;
remote?: string;
}
export class GitActions {
private readonly git: SimpleGit;
private readonly rootPath: string;
private readonly logger: Logger;
constructor(rootPath?: string) {
this.rootPath = rootPath || this.getWorkspaceRoot();
const options: Partial<SimpleGitOptions> = {
binary: "git",
maxConcurrentProcesses: 6,
trimmed: false,
baseDir: this.rootPath,
};
this.git = simpleGit(options);
this.logger = Logger.initialize("GitActions", {
minLevel: LogLevel.DEBUG,
enableConsole: true,
enableFile: true,
enableTelemetry: true,
});
}
/**
* Get the workspace root path
*/
private getWorkspaceRoot(): string {
const workspaceFolders = vscode.workspace.workspaceFolders;
if (!workspaceFolders) {
throw new Error("No workspace folder is open");
}
return workspaceFolders[0].uri.fsPath;
}
/**
* Get staged differences summary for commit message generation
*/
async getStagedDifferenceSummary(): Promise<string> {
try {
const stagedDiffSummary = await this.git.diffSummary("--staged");
const fileDifferencePromises = stagedDiffSummary.files.map(
async (file) => {
try {
let fileDiff;
if (file.file.includes("_deleted_")) {
fileDiff = "File deleted";
} else {
fileDiff = await this.git.diff(["--staged", file.file]);
}
return { file: file.file, diff: fileDiff, error: null };
} catch (error: any) {
if (
error instanceof GitError &&
error.message.includes(
"unknown revision or path not in the working tree",
)
) {
try {
const fileContent = await this.git.catFile([
"-p",
`:0:${file.file}`,
]);
return {
file: file.file,
diff: `New file: ${file.file}\n${fileContent}`,
error: null,
};
} catch (catError: any) {
return {
file: file.file,
diff: null,
error: `Error getting content for new file: ${catError.message}`,
};
}
} else {
return { file: file.file, diff: null, error: error.message };
}
}
},
);
const fileDiffs = await Promise.all(fileDifferencePromises);
let differenceSummary = "";
fileDiffs.forEach(({ file, diff, error }) => {
if (error) {
this.logger.error(`Error processing ${file}: ${error}`);
} else if (diff) {
differenceSummary += `\nFile: ${file}\n${diff}\n`;
}
});
return differenceSummary;
} catch (error: any) {
this.logger.error("Error getting staged differences:", error);
throw error;
}
}
/**
* Get the current branch information including upstream tracking
*/
async getCurrentBranchInfo(): Promise<BranchInfo> {
try {
const currentBranch = await this.git.branch();
const branchInfo: BranchInfo = {
current: currentBranch.current,
};
// Try to get upstream tracking branch
try {
const upstreamBranch = await this.git.raw([
"rev-parse",
"--abbrev-ref",
`${currentBranch.current}@{upstream}`,
]);
branchInfo.upstream = upstreamBranch.trim();
} catch {
// No upstream branch set
}
// Try to get remote tracking branch
try {
const remoteBranch = await this.git.raw([
"for-each-ref",
"--format=%(upstream:short)",
`refs/heads/${currentBranch.current}`,
]);
branchInfo.remote = remoteBranch.trim();
} catch {
// No remote branch
}
return branchInfo;
} catch (error: any) {
this.logger.error("Error getting branch info:", error);
throw error;
}
}
/**
* Get the base branch from which the current branch was created
*/
async getBaseBranch(): Promise<string> {
try {
// First try to get the merge base with common default branches
const defaultBranches = ["main", "master", "develop", "dev"];
for (const defaultBranch of defaultBranches) {
try {
// Check if the branch exists
await this.git.raw(["rev-parse", "--verify", defaultBranch]);
// Get merge base
const mergeBase = await this.git.raw([
"merge-base",
"HEAD",
defaultBranch,
]);
// If merge base exists and is not the same as current HEAD
const currentHead = await this.git.raw(["rev-parse", "HEAD"]);
if (mergeBase.trim() !== currentHead.trim()) {
return defaultBranch;
}
} catch {
// Branch doesn't exist or no merge base, continue to next
continue;
}
}
// If no default branch found, try to find the branch this was created from
try {
const branchInfo = await this.getCurrentBranchInfo();
if (branchInfo.upstream) {
return branchInfo.upstream.split("/").pop() || "main";
}
} catch {
// Fallback to main
}
// Final fallback
return "main";
} catch (error: any) {
this.logger.error("Error getting base branch:", error);
return "main";
}
}
/**
* Get PR differences against the base branch
*/
async getPRDifferenceSummary(targetBranch?: string): Promise<string> {
try {
const baseBranch = targetBranch || (await this.getBaseBranch());
// Get the merge base between current branch and base branch
const mergeBase = await this.git.raw(["merge-base", "HEAD", baseBranch]);
// Get diff from merge base to current HEAD
const diffSummary = await this.git.diffSummary([
mergeBase.trim(),
"HEAD",
]);
const fileDifferencePromises = diffSummary.files.map(async (file) => {
try {
let fileDiff;
if (file.file.includes("_deleted_")) {
fileDiff = "File deleted";
} else {
fileDiff = await this.git.diff([
mergeBase.trim(),
"HEAD",
"--",
file.file,
]);
}
return { file: file.file, diff: fileDiff, error: null };
} catch (error: any) {
return {
file: file.file,
diff: null,
error: `Error getting diff for ${file.file}: ${error.message}`,
};
}
});
const fileDiffs = await Promise.all(fileDifferencePromises);
let differenceSummary = `Comparing against base branch: ${baseBranch}\n`;
differenceSummary += `Merge base: ${mergeBase.trim()}\n\n`;
fileDiffs.forEach(({ file, diff, error }) => {
if (error) {
this.logger.error(`Error processing ${file}: ${error}`);
} else if (diff) {
differenceSummary += `\nFile: ${file}\n${diff}\n`;
}
});
return differenceSummary;
} catch (error: any) {
this.logger.error("Error getting PR differences:", error);
throw error;
}
}
/**
* Get list of available branches
*/
async getAvailableBranches(): Promise<string[]> {
try {
const branches = await this.git.branch(["-a"]);
const branchNames = branches.all
.filter((branch) => !branch.startsWith("remotes/origin/HEAD"))
.map((branch) => branch.replace("remotes/origin/", ""));
// Deduplicate since local and remote branches map to the same name
return [...new Set(branchNames)];
} catch (error: any) {
this.logger.error("Error getting available branches:", error);
throw error;
}
}
/**
* Get commit history between two branches
*/
async getCommitHistory(
baseBranch: string,
targetBranch = "HEAD",
): Promise<string[]> {
try {
const log = await this.git.log({
from: baseBranch,
to: targetBranch,
});
return log.all.map(
(commit) => `${commit.hash.substring(0, 7)}: ${commit.message}`,
);
} catch (error: any) {
this.logger.error("Error getting commit history:", error);
throw error;
}
}
/**
* Get repository status
*/
async getRepositoryStatus(): Promise<any> {
try {
return await this.git.status();
} catch (error: any) {
this.logger.error("Error getting repository status:", error);
throw error;
}
}
/**
* Check if repository is clean (no uncommitted changes)
*/
async isRepositoryClean(): Promise<boolean> {
try {
const status = await this.getRepositoryStatus();
return status.files.length === 0;
} catch (error: any) {
this.logger.error("Error checking repository status:", error);
return false;
}
}
/**
* Get file content at specific commit
*/
async getFileAtCommit(filePath: string, commitHash: string): Promise<string> {
try {
return await this.git.raw(["show", `${commitHash}:${filePath}`]);
} catch (error: any) {
this.logger.error(
`Error getting file ${filePath} at commit ${commitHash}:`,
error,
);
throw error;
}
}
/**
* Get list of modified files between two commits
*/
async getModifiedFiles(
baseBranch: string,
targetBranch = "HEAD",
): Promise<string[]> {
try {
// Use merge-base to only show files changed on the target branch
// relative to where it diverged from the base branch.
// Without this, `git diff --name-only baseBranch targetBranch` would
// include files changed on the base branch after the fork point.
const mergeBase = await this.git.raw([
"merge-base",
targetBranch,
baseBranch,
]);
const diff = await this.git.raw([
"diff",
"--name-only",
mergeBase.trim(),
targetBranch,
]);
return diff.trim().split("\n").filter(Boolean);
} catch (error: any) {
this.logger.error("Error getting modified files:", error);
throw error;
}
}
/**
* Get detailed diff statistics
*/
async getDiffStats(
baseBranch: string,
targetBranch = "HEAD",
): Promise<string> {
try {
const mergeBase = await this.git.raw([
"merge-base",
targetBranch,
baseBranch,
]);
return await this.git.raw([
"diff",
"--stat",
mergeBase.trim(),
targetBranch,
]);
} catch (error: any) {
this.logger.error("Error getting diff stats:", error);
throw error;
}
}
/**
* Check if branch exists
*/
async branchExists(branchName: string): Promise<boolean> {
try {
await this.git.raw(["rev-parse", "--verify", branchName]);
return true;
} catch {
return false;
}
}
/**
* Get remote URL
*/
async getRemoteUrl(remoteName = "origin"): Promise<string> {
try {
return await this.git.raw(["remote", "get-url", remoteName]);
} catch (error: any) {
this.logger.error(`Error getting remote URL for ${remoteName}:`, error);
throw error;
}
}
}