Adds support for blame & log on compare files

Allows for deep navigation through git history
This commit is contained in:
Eric Amodio
2016-12-04 00:41:42 -05:00
parent 1a208b8691
commit 72ef5e2902
17 changed files with 136 additions and 63 deletions

View File

@@ -21,7 +21,7 @@ export default class DiffLineWithPreviousCommand extends EditorCommand {
line = line || editor.selection.active.line;
if (!commit || GitProvider.isUncommitted(commit.sha)) {
const gitUri = GitUri.fromUri(uri);
const gitUri = GitUri.fromUri(uri, this.git);
const blameline = line - gitUri.offset;
if (blameline < 0) return undefined;

View File

@@ -21,7 +21,7 @@ export default class DiffLineWithWorkingCommand extends EditorCommand {
line = line || editor.selection.active.line;
if (!commit || GitProvider.isUncommitted(commit.sha)) {
const gitUri = GitUri.fromUri(uri);
const gitUri = GitUri.fromUri(uri, this.git);
const blameline = line - gitUri.offset;
if (blameline < 0) return undefined;

View File

@@ -29,7 +29,7 @@ export default class DiffWithPreviousCommand extends EditorCommand {
}
if (!commit || rangeOrLine instanceof Range) {
const gitUri = GitUri.fromUri(uri);
const gitUri = GitUri.fromUri(uri, this.git);
try {
const log = await this.git.getLogForFile(gitUri.fsPath, gitUri.sha, gitUri.repoPath, <Range>rangeOrLine);

View File

@@ -23,7 +23,7 @@ export default class DiffWithWorkingCommand extends EditorCommand {
line = line || editor.selection.active.line;
if (!commit || GitProvider.isUncommitted(commit.sha)) {
const gitUri = GitUri.fromUri(uri);
const gitUri = GitUri.fromUri(uri, this.git);
try {
const log = await this.git.getLogForFile(gitUri.fsPath, gitUri.sha, gitUri.repoPath);
@@ -37,7 +37,7 @@ export default class DiffWithWorkingCommand extends EditorCommand {
}
}
const gitUri = GitUri.fromUri(uri);
const gitUri = GitUri.fromUri(uri, this.git);
try {
const compare = await this.git.getVersionedFile(commit.uri.fsPath, commit.repoPath, commit.sha);

View File

@@ -20,7 +20,7 @@ export default class ShowBlameHistoryCommand extends EditorCommand {
position = editor.document.validateRange(new Range(0, 0, 0, 1000000)).start;
}
const gitUri = GitUri.fromUri(uri);
const gitUri = GitUri.fromUri(uri, this.git);
try {
const locations = await this.git.getBlameLocations(gitUri.fsPath, range, gitUri.sha, gitUri.repoPath, sha, line);

View File

@@ -19,7 +19,7 @@ export default class ShowFileHistoryCommand extends EditorCommand {
position = editor.document.validateRange(new Range(0, 0, 0, 1000000)).start;
}
const gitUri = GitUri.fromUri(uri);
const gitUri = GitUri.fromUri(uri, this.git);
try {
const locations = await this.git.getLogLocations(gitUri.fsPath, gitUri.sha, gitUri.repoPath, sha, line);

View File

@@ -19,7 +19,7 @@ export default class ShowQuickFileHistoryCommand extends EditorCommand {
uri = editor.document.uri;
}
const gitUri = GitUri.fromUri(uri);
const gitUri = GitUri.fromUri(uri, this.git);
try {
const log = await this.git.getLogForFile(gitUri.fsPath, gitUri.sha, gitUri.repoPath);

View File

@@ -23,7 +23,7 @@ export default class ShowQuickRepoHistoryCommand extends Command {
try {
let repoPath: string;
if (uri instanceof Uri) {
const gitUri = GitUri.fromUri(uri);
const gitUri = GitUri.fromUri(uri, this.git);
repoPath = gitUri.repoPath;
if (!repoPath) {