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

Switches to use the new diffWith command

Browse Source
This commit is contained in:
Eric Amodio
2017-09-09 15:48:44 -04:00
parent a50f04c569
commit 9d83fbcacb
3 changed files with 36 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/commands/diffWithBranch.ts
View File

@@ -1,7 +1,8 @@
'use strict'; 'use strict';
import { commands, Range, TextDocumentShowOptions, TextEditor, Uri, window } from 'vscode'; import { commands, TextDocumentShowOptions, TextEditor, Uri, window } from 'vscode';
import { ActiveEditorCommand, Commands, getCommandUri } from './common'; import { ActiveEditorCommand, Commands, getCommandUri } from './common';
import { BuiltInCommands, GlyphChars } from '../constants'; import { GlyphChars } from '../constants';
import { DiffWithCommandArgs } from './diffWith';
import { GitService, GitUri } from '../gitService'; import { GitService, GitUri } from '../gitService';
import { Logger } from '../logger'; import { Logger } from '../logger';
import { Messages } from '../messages'; import { Messages } from '../messages';
@@ -43,20 +44,21 @@ export class DiffWithBranchCommand extends ActiveEditorCommand {
if (branch === undefined) return undefined; if (branch === undefined) return undefined;
try { try {
const compare = await this.git.getVersionedFile(gitUri.repoPath, gitUri.fsPath, branch); const diffArgs: DiffWithCommandArgs = {
repoPath: gitUri.repoPath,
if (args.line !== undefined && args.line !== 0) { lhs: {
if (args.showOptions === undefined) { sha: pick.branch.remote ? `remotes/${branch}` : branch,
args.showOptions = {}; uri: gitUri as Uri,
} title: `${path.basename(gitUri.fsPath)} (${branch})`
args.showOptions.selection = new Range(args.line, 0, args.line, 0); },
} rhs: {
sha: 'HEAD',
await commands.executeCommand(BuiltInCommands.Diff, uri: gitUri as Uri
Uri.file(compare), },
gitUri.fileUri(), line: args.line,
`${path.basename(gitUri.fsPath)} (${branch}) ${GlyphChars.ArrowLeftRight} ${path.basename(gitUri.fsPath)}`, showOptions: args.showOptions
args.showOptions); };
await commands.executeCommand(Commands.DiffWith, diffArgs);
} }
catch (ex) { catch (ex) {
Logger.error(ex, 'DiffWithBranchCommand', 'getVersionedFile'); Logger.error(ex, 'DiffWithBranchCommand', 'getVersionedFile');

33
src/commands/diffWithRevision.ts
View File

@@ -1,12 +1,11 @@
'use strict'; 'use strict';
import { commands, Range, TextDocumentShowOptions, TextEditor, Uri, window } from 'vscode'; import { commands, TextDocumentShowOptions, TextEditor, Uri, window } from 'vscode';
import { ActiveEditorCommand, Commands, getCommandUri } from './common'; import { ActiveEditorCommand, Commands, getCommandUri } from './common';
import { BuiltInCommands, GlyphChars } from '../constants'; import { DiffWithCommandArgs } from './diffWith';
import { GitService, GitUri } from '../gitService'; import { GitService, GitUri } from '../gitService';
import { Logger } from '../logger'; import { Logger } from '../logger';
import { Messages } from '../messages'; import { Messages } from '../messages';
import { CommandQuickPickItem, FileHistoryQuickPick } from '../quickPicks'; import { CommandQuickPickItem, FileHistoryQuickPick } from '../quickPicks';
import * as path from 'path';
export interface DiffWithRevisionCommandArgs { export interface DiffWithRevisionCommandArgs {
line?: number; line?: number;
@@ -46,20 +45,20 @@ export class DiffWithRevisionCommand extends ActiveEditorCommand {
if (pick instanceof CommandQuickPickItem) return pick.execute(); if (pick instanceof CommandQuickPickItem) return pick.execute();
const compare = await this.git.getVersionedFile(gitUri.repoPath, gitUri.fsPath, pick.commit.sha); const diffArgs: DiffWithCommandArgs = {
repoPath: gitUri.repoPath,
if (args.line !== undefined && args.line !== 0) { lhs: {
if (args.showOptions === undefined) { sha: pick.commit.sha,
args.showOptions = {}; uri: gitUri as Uri
} },
args.showOptions.selection = new Range(args.line, 0, args.line, 0); rhs: {
} sha: 'HEAD',
uri: gitUri as Uri
await commands.executeCommand(BuiltInCommands.Diff, },
Uri.file(compare), line: args.line,
gitUri.fileUri(), showOptions: args.showOptions
`${path.basename(gitUri.fsPath)} (${pick.commit.shortSha}) ${GlyphChars.ArrowLeftRight} ${path.basename(gitUri.fsPath)}`, };
args.showOptions); await commands.executeCommand(Commands.DiffWith, diffArgs);
} }
catch (ex) { catch (ex) {
Logger.error(ex, 'DiffWithRevisionCommand', 'getVersionedFile'); Logger.error(ex, 'DiffWithRevisionCommand', 'getVersionedFile');

3
src/git/git.ts
View File

@@ -99,7 +99,8 @@ export class Git {
static async getVersionedFile(repoPath: string | undefined, fileName: string, branchOrSha: string) { static async getVersionedFile(repoPath: string | undefined, fileName: string, branchOrSha: string) {
const data = await Git.show(repoPath, fileName, branchOrSha, 'binary'); const data = await Git.show(repoPath, fileName, branchOrSha, 'binary');
const suffix = Git.isSha(branchOrSha) ? Git.shortenSha(branchOrSha) : branchOrSha; // TODO: Sanitize the filename
const suffix = Git.isSha(branchOrSha) ? Git.shortenSha(branchOrSha) : branchOrSha.replace(/\\/g, '_').replace(/\//g, '_');
const ext = path.extname(fileName); const ext = path.extname(fileName);
return new Promise<string>((resolve, reject) => { return new Promise<string>((resolve, reject) => {
tmp.file({ prefix: `${path.basename(fileName, ext)}-${suffix}__`, postfix: ext }, tmp.file({ prefix: `${path.basename(fileName, ext)}-${suffix}__`, postfix: ext },