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

Fixes #55 - adds fallback for previous git versions

Browse Source 
Reverts git version requirement to >= 2.2.0
This commit is contained in:
Eric Amodio
2017-03-27 10:56:58 -04:00
parent 758d331e69
commit 46ff70e969
5 changed files with 64 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/git/git.ts
View File

@@ -109,6 +109,11 @@ export class Git {
return [ fileName, repoPath ];
}
static validateVersion(major: number, minor: number): boolean {
const [gitMajor, gitMinor] = git.version.split('.');
return (parseInt(gitMajor, 10) >= major && parseInt(gitMinor, 10) >= minor);
}
// Git commands
static blame(repoPath: string, fileName: string, sha?: string, startLine?: number, endLine?: number) {
@@ -230,15 +235,17 @@ export class Git {
return gitCommand(repoPath, ...params);
}
static status(repoPath: string): Promise<string> {
const params = ['status', '--porcelain=v2', '--branch'];
static status(repoPath: string, porcelainVersion: number = 1): Promise<string> {
const porcelain = porcelainVersion >= 2 ? `--porcelain=v${porcelainVersion}` : '--porcelain';
const params = ['status', porcelain, '--branch'];
return gitCommand(repoPath, ...params);
}
static status_file(repoPath: string, fileName: string): Promise<string> {
static status_file(repoPath: string, fileName: string, porcelainVersion: number = 1): Promise<string> {
const [file, root] = Git.splitPath(fileName, repoPath);
const params = ['status', '--porcelain=v2', file];
const porcelain = porcelainVersion >= 2 ? `--porcelain=v${porcelainVersion}` : '--porcelain';
const params = ['status', porcelain, file];
return gitCommand(root, ...params);
}
}

43
src/git/parsers/statusParser.ts
View File

@@ -8,9 +8,12 @@ interface IFileStatusEntry {
originalFileName: string;
}
const aheadStatusV1Regex = /(?:ahead ([0-9]+))/;
const behindStatusV1Regex = /(?:behind ([0-9]+))/;
export class GitStatusParser {
static parse(data: string, repoPath: string): IGitStatus {
static parse(data: string, repoPath: string, porcelainVersion: number): IGitStatus {
if (!data) return undefined;
const lines = data.split('\n').filter(_ => !!_);
@@ -25,6 +28,42 @@ export class GitStatusParser {
files: []
} as IGitStatus;
if (porcelainVersion >= 2) {
this._parseV2(lines, repoPath, status);
}
else {
this._parseV1(lines, repoPath, status);
}
return status;
}
private static _parseV1(lines: string[], repoPath: string, status: IGitStatus) {
let position = -1;
while (++position < lines.length) {
const line = lines[position];
// Header
if (line.startsWith('##')) {
const lineParts = line.split(' ');
[status.branch, status.upstream] = lineParts[1].split('...');
if (lineParts.length > 2) {
const upstreamStatus = lineParts.slice(2).join(' ');
const aheadStatus = aheadStatusV1Regex.exec(upstreamStatus);
status.state.ahead = +aheadStatus[1] || 0;
const behindStatus = behindStatusV1Regex.exec(upstreamStatus);
status.state.behind = +behindStatus[1] || 0;
}
}
else {
const entry = this._parseFileEntry(line.substring(0, 2), line.substring(3));
status.files.push(new GitStatusFile(repoPath, entry.status, entry.staged, entry.fileName, entry.originalFileName));
}
}
}
private static _parseV2(lines: string[], repoPath: string, status: IGitStatus) {
let position = -1;
while (++position < lines.length) {
const line = lines[position];
@@ -71,8 +110,6 @@ export class GitStatusParser {
}
}
}
return status;
}
private static _parseFileEntry(rawStatus: string, fileName: string, originalFileName?: string): IFileStatusEntry {