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

Optimizes diff with previous command

Browse Source
This commit is contained in:
Eric Amodio
2017-06-25 13:19:42 -04:00
parent f553980146
commit 191a158b3b
6 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/git/git.ts
View File

@@ -235,16 +235,16 @@ export class Git {
return gitCommand({ cwd: repoPath }, ...params);
}
static log_file(repoPath: string, fileName: string, sha?: string, maxCount?: number, reverse: boolean = false, startLine?: number, endLine?: number) {
static log_file(repoPath: string, fileName: string, sha?: string, options: { maxCount?: number, reverse?: boolean, startLine?: number, endLine?: number, skipMerges?: boolean } = { reverse: false, skipMerges: false }) {
const [file, root] = Git.splitPath(fileName, repoPath);
const params = [...defaultLogParams, `--follow`];
if (maxCount && !reverse) {
params.push(`-n${maxCount}`);
if (options.maxCount && !options.reverse) {
params.push(`-n${options.maxCount}`);
}
// If we are looking for a specific sha don't exclude merge commits
if (!sha || maxCount! > 2) {
if (options.skipMerges || !sha || options.maxCount! > 2) {
params.push(`--no-merges`);
}
else {
@@ -252,7 +252,7 @@ export class Git {
}
if (sha) {
if (reverse) {
if (options.reverse) {
params.push(`--reverse`);
params.push(`--ancestry-path`);
params.push(`${sha}..HEAD`);
@@ -262,8 +262,8 @@ export class Git {
}
}
if (startLine != null && endLine != null) {
params.push(`-L ${startLine},${endLine}:${file}`);
if (options.startLine != null && options.endLine != null) {
params.push(`-L ${options.startLine},${options.endLine}:${file}`);
}
params.push(`--`);