development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-05 19:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Git - improve code that gets commit count (#201907)

Browse source
This commit is contained in:
Ladislau Szomoru 2024-01-05 21:55:05 +01:00 committed by GitHub
parent b2809a8d3e
commit bff3ef7651
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
extensions/git/src/git.ts
View file

@ -2622,7 +2622,13 @@ export class Repository {
}
async getCommitCount(range: string): Promise<{ ahead: number; behind: number }> {
const result = await this.exec(['rev-list', '--count', '--left-right', range]);
const args = ['rev-list', '--count', '--left-right', range];
if (isWindows) {
args.splice(0, 0, '-c', 'core.longpaths=true');
}
const result = await this.exec(args);
const [ahead, behind] = result.stdout.trim().split('\t');
return { ahead: Number(ahead) || 0, behind: Number(behind) || 0 };

10
extensions/git/src/historyProvider.ts
View file

@ -186,8 +186,14 @@ export class GitHistoryProvider implements SourceControlHistoryProvider, FileDec
return undefined;
}
const commitCount = await this.repository.getCommitCount(`${refId1}...${refId2}`);
return { id: ancestor, ahead: commitCount.ahead, behind: commitCount.behind };
try {
const commitCount = await this.repository.getCommitCount(`${refId1}...${refId2}`);
return { id: ancestor, ahead: commitCount.ahead, behind: commitCount.behind };
} catch (err) {
this.logger.error(`Failed to get ahead/behind for '${refId1}...${refId2}': ${err.message}`);
}
return undefined;
}
provideFileDecoration(uri: Uri): FileDecoration | undefined {