mirror of
https://github.com/ckaczor/vscode-gitlens.git
synced 2026-01-14 10:03:15 -05:00
74 lines
3.5 KiB
TypeScript
74 lines
3.5 KiB
TypeScript
'use strict';
|
|
import { Iterables } from '../system';
|
|
import { commands, Range, TextEditor, TextEditorEdit, Uri, window } from 'vscode';
|
|
import { Commands, EditorCommand } from './commands';
|
|
import { BuiltInCommands } from '../constants';
|
|
import GitProvider, { GitCommit, GitUri } from '../gitProvider';
|
|
import { Logger } from '../logger';
|
|
import * as moment from 'moment';
|
|
import * as path from 'path';
|
|
|
|
export class DiffWithPreviousCommand extends EditorCommand {
|
|
|
|
constructor(private git: GitProvider) {
|
|
super(Commands.DiffWithPrevious);
|
|
}
|
|
|
|
async execute(editor: TextEditor): Promise<any>;
|
|
async execute(editor: TextEditor, edit: TextEditorEdit, uri: Uri): Promise<any>;
|
|
async execute(editor: TextEditor, edit: TextEditorEdit, uri: Uri, commit: GitCommit, range?: Range): Promise<any>;
|
|
async execute(editor: TextEditor, edit: TextEditorEdit, uri: Uri, commit: GitCommit, line?: number): Promise<any>;
|
|
async execute(editor: TextEditor, edit?: TextEditorEdit, uri?: Uri, commit?: GitCommit, rangeOrLine?: Range | number): Promise<any> {
|
|
if (!(uri instanceof Uri)) {
|
|
if (!editor.document) return undefined;
|
|
uri = editor.document.uri;
|
|
}
|
|
|
|
let line = editor.selection.active.line;
|
|
if (typeof rangeOrLine === 'number') {
|
|
line = rangeOrLine || line;
|
|
rangeOrLine = undefined;
|
|
}
|
|
|
|
if (!commit || rangeOrLine instanceof Range) {
|
|
const gitUri = GitUri.fromUri(uri, this.git);
|
|
|
|
try {
|
|
if (!gitUri.sha) {
|
|
// If the file is uncommitted, treat it as a DiffWithWorking
|
|
if (await this.git.isFileUncommitted(gitUri.fsPath, gitUri.repoPath)) {
|
|
return commands.executeCommand(Commands.DiffWithWorking, uri);
|
|
}
|
|
}
|
|
|
|
const sha = (commit && commit.sha) || gitUri.sha;
|
|
|
|
const log = await this.git.getLogForFile(gitUri.fsPath, undefined, gitUri.repoPath, rangeOrLine as Range, sha ? undefined : 2);
|
|
if (!log) return window.showWarningMessage(`Unable to open diff. File is probably not under source control`);
|
|
|
|
commit = (sha && log.commits.get(sha)) || Iterables.first(log.commits.values());
|
|
}
|
|
catch (ex) {
|
|
Logger.error('[GitLens.DiffWithPreviousCommand]', `getLogForFile(${gitUri.fsPath})`, ex);
|
|
return window.showErrorMessage(`Unable to open diff. See output channel for more details`);
|
|
}
|
|
}
|
|
|
|
if (!commit.previousSha) {
|
|
return window.showInformationMessage(`Commit ${commit.sha} (${commit.author}, ${moment(commit.date).fromNow()}) has no previous commit`);
|
|
}
|
|
|
|
try {
|
|
const [rhs, lhs] = await Promise.all([
|
|
this.git.getVersionedFile(commit.uri.fsPath, commit.repoPath, commit.sha),
|
|
this.git.getVersionedFile(commit.previousUri.fsPath, commit.repoPath, commit.previousSha)
|
|
]);
|
|
await commands.executeCommand(BuiltInCommands.Diff, Uri.file(lhs), Uri.file(rhs), `${path.basename(commit.previousUri.fsPath)} (${commit.previousSha}) ↔ ${path.basename(commit.uri.fsPath)} (${commit.sha})`);
|
|
return await commands.executeCommand(BuiltInCommands.RevealLine, { lineNumber: line, at: 'center' });
|
|
}
|
|
catch (ex) {
|
|
Logger.error('[GitLens.DiffWithPreviousCommand]', 'getVersionedFile', ex);
|
|
return window.showErrorMessage(`Unable to open diff. See output channel for more details`);
|
|
}
|
|
}
|
|
} |