ckaczor/vscode-gitlens
1
0
Fork 0
mirror of https://github.com/ckaczor/vscode-gitlens.git synced 2026-02-13 19:48:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

Reworks git command error handling

Browse Source 
Switches to use the new diffWith command
This commit is contained in:
Eric Amodio
2017-09-11 00:39:52 -04:00
parent d420d82ab2
commit 4102bdd471
14 changed files with 230 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/commands/diffWithRevision.ts
View File

@@ -8,8 +8,9 @@ import { Messages } from '../messages';
import { CommandQuickPickItem, FileHistoryQuickPick } from '../quickPicks';
export interface DiffWithRevisionCommandArgs {
line?: number;
maxCount?: number;
line?: number;
showOptions?: TextDocumentShowOptions;
}
@@ -52,17 +53,17 @@ export class DiffWithRevisionCommand extends ActiveEditorCommand {
uri: gitUri as Uri
},
rhs: {
sha: 'HEAD',
sha: '',
uri: gitUri as Uri
},
line: args.line,
showOptions: args.showOptions
};
await commands.executeCommand(Commands.DiffWith, diffArgs);
return await commands.executeCommand(Commands.DiffWith, diffArgs);
}
catch (ex) {
Logger.error(ex, 'DiffWithRevisionCommand', 'getVersionedFile');
return window.showErrorMessage(`Unable to open history compare. See output channel for more details`);
Logger.error(ex, 'DiffWithRevisionCommand');
return window.showErrorMessage(`Unable to open compare. See output channel for more details`);
}
}
}