Browse Source

Stops repo log from limiting to a single sha

Gets log reverse to work
main
Eric Amodio 7 years ago
parent
commit
f499bffbc6
2 changed files with 5 additions and 3 deletions
  1. +4
    -2
      src/git/git.ts
  2. +1
    -1
      src/gitProvider.ts

+ 4
- 2
src/git/git.ts View File

@ -154,11 +154,13 @@ export default class Git {
const [file, root]: [string, string] = Git.splitPath(Git.normalizePath(fileName), repoPath);
const params = [...DefaultLogParams, `--follow`];
if (maxCount) {
if (maxCount && !reverse) {
params.push(`-n${maxCount}`);
}
if (sha) {
if (reverse) {
params.push(`--reverse`);
params.push(`--ancestry-path`);
params.push(`${sha}..HEAD`);
}
else {
@ -192,7 +194,7 @@ export default class Git {
params.push(`-n${maxCount}`);
}
if (sha) {
params.push(`${sha}^!`);
params.push(sha);
}
return gitCommand(repoPath, ...params);
}

+ 1
- 1
src/gitProvider.ts View File

@ -506,7 +506,7 @@ export class GitProvider extends Disposable {
}
getLogForFile(fileName: string, sha?: string, repoPath?: string, range?: Range, maxCount?: number, reverse: boolean = false): Promise<IGitLog | undefined> {
Logger.log(`getLogForFile('${fileName}', ${sha}, '${repoPath}', ${range && `[${range.start.line}, ${range.end.line}]`}, ${maxCount})`);
Logger.log(`getLogForFile('${fileName}', ${sha}, '${repoPath}', ${range && `[${range.start.line}, ${range.end.line}]`}, ${maxCount}, ${reverse})`);
fileName = Git.normalizePath(fileName);
const useCaching = this.UseGitCaching && !sha && !range && !maxCount;

Loading…
Cancel
Save