Skip to content

Refine git commit message generation logic to handle multiple repos #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Refine git commit message generation logic to handle multiple repos #75

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25bbc7c
Refine git commit message generation logic to handle multiple reposit…
strawberrymelonpanda Jun 1, 2025
1f5e011
Merge pull request #1 from strawberrymelonpanda/strawberrymelonpanda-…
strawberrymelonpanda Jun 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 35 additions & 35 deletions src/git.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,44 +21,44 @@ export class Git {
vscode.window.showErrorMessage('can`t use on non git dir');
return;
}
const repo = git.repositories[0];

try {
let diff = await repo.diff(true);

if (!diff || diff.trim() === '') {
// use unstaged change
diff = await repo.diff(false);
for (const repo of git.repositories) {
try {
let diff = await repo.diff(true);

if (!diff || diff.trim() === '') {
vscode.window.showWarningMessage('git diff is empty');
return;
}
vscode.window.showWarningMessage('git staged change is empty, using unstaged change');
}

const prompt = this.app.prompts.replaceOnePlaceholders(this.app.prompts.CREATE_GIT_DIFF_COMMIT, "diff", diff);
vscode.window.withProgress({
location: vscode.ProgressLocation.SourceControl,
title: 'llama.vscode is generating a commit message...',
cancellable: false
}, async (progress) => {
try {
// TODO stream output the commit message, need for llamaServer with stream output support
const completion = await this.app.llamaServer.getChatCompletion(prompt)
const commitMessage = completion?.choices[0]?.message.content

if (commitMessage) {
repo.inputBox.value = commitMessage;
} else {
vscode.window.showErrorMessage('unexpected error for generating commit message is empty');
// use unstaged change
diff = await repo.diff(false);
if (!diff || diff.trim() === '') {
vscode.window.showWarningMessage('git diff is empty');
continue;
}
} catch (error) {
vscode.window.showErrorMessage(`errors in generateCommitMessage: ${error instanceof Error ? error.message : String(error)}`);
vscode.window.showWarningMessage('git staged change is empty, using unstaged change');
}
progress.report({ increment: 100 });
});
} catch (error) {
vscode.window.showErrorMessage(`errors in generateCommitMessage: ${error instanceof Error ? error.message : String(error)}`);

const prompt = this.app.prompts.replaceOnePlaceholders(this.app.prompts.CREATE_GIT_DIFF_COMMIT, "diff", diff);
vscode.window.withProgress({
location: vscode.ProgressLocation.SourceControl,
title: 'llama.vscode is generating a commit message...',
cancellable: false
}, async (progress) => {
try {
// TODO stream output the commit message, need for llamaServer with stream output support
const completion = await this.app.llamaServer.getChatCompletion(prompt)
const commitMessage = completion?.choices[0]?.message.content

if (commitMessage) {
repo.inputBox.value = commitMessage;
} else {
vscode.window.showErrorMessage('unexpected error for generating commit message is empty');
}
} catch (error) {
vscode.window.showErrorMessage(`errors in generateCommitMessage: ${error instanceof Error ? error.message : String(error)}`);
}
progress.report({ increment: 100 });
});
} catch (error) {
vscode.window.showErrorMessage(`errors in generateCommitMessage: ${error instanceof Error ? error.message : String(error)}`);
}
}
}
}