ckaczor/vscode-gitlens
1
0
Fork 0
mirror of https://github.com/ckaczor/vscode-gitlens.git synced 2026-01-14 10:03:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Reworks branch parsing to include tracking info

Browse Source 
Reworks current branch retrieval for better performance
This commit is contained in:
Eric Amodio
2017-09-04 01:32:43 -04:00
parent 2bba14260f
commit 5a2bd02402
5 changed files with 77 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/git/git.ts
View File

@@ -10,6 +10,7 @@ import * as iconv from 'iconv-lite';
export { IGit };
export * from './models/models';
export * from './parsers/blameParser';
export * from './parsers/branchParser';
export * from './parsers/diffParser';
export * from './parsers/logParser';
export * from './parsers/stashParser';
@@ -33,10 +34,11 @@ const GitWarnings = [
/no such path/,
/does not have any commits/,
/Path \'.*?\' does not exist in/,
/Path \'.*?\' exists on disk, but not in/
/Path \'.*?\' exists on disk, but not in/,
/no upstream configured for branch/
];
async function gitCommand(options: { cwd: string, encoding?: string }, ...args: any[]) {
async function gitCommand(options: { cwd: string, encoding?: string, onError?: (ex: Error) => string | undefined }, ...args: any[]) {
try {
// Fixes https://github.com/eamodio/vscode-gitlens/issues/73
// See https://stackoverflow.com/questions/4144417/how-to-handle-asian-characters-in-file-names-in-git-on-os-x
@@ -50,6 +52,11 @@ async function gitCommand(options: { cwd: string, encoding?: string }, ...args:
return iconv.decode(Buffer.from(s, 'binary'), opts.encoding);
}
catch (ex) {
if (options.onError !== undefined) {
const result = options.onError(ex);
if (result !== undefined) return result;
}
const msg = ex && ex.toString();
if (msg) {
for (const warning of GitWarnings) {
@@ -168,15 +175,27 @@ export class Git {
return gitCommand({ cwd: root }, ...params, `--`, file);
}
static branch(repoPath: string, all: boolean) {
const params = [`branch`];
if (all) {
static branch(repoPath: string, options: { all: boolean } = { all: false }) {
const params = [`branch`, `-vv`];
if (options.all) {
params.push(`-a`);
}
return gitCommand({ cwd: repoPath }, ...params);
}
static branch_current(repoPath: string) {
const params = [`rev-parse`, `--abbrev-ref`, `--symbolic-full-name`, `@`, `@{u}`];
const onError = (ex: Error) => {
if (/no upstream configured for branch/.test(ex && ex.toString())) {
return ex.message.split('\n')[0];
}
return undefined;
};
return gitCommand({ cwd: repoPath, onError: onError }, ...params);
}
static checkout(repoPath: string, fileName: string, sha: string) {
const [file, root] = Git.splitPath(fileName, repoPath);