Overhauls uri handling

Fixes #220 - Open revision results in empty file
Fixes SO many bugs

Author: eamodio

CHANGELOG.md

@@ -9,6 +9,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 - Adds progress indicator to the `Show Stashed Changes` command (`gitlens.showQuickStashList`)
 - Adds progress indicator to the `Apply Stashed Changes` command (`gitlens.stashApply`)
 
+### Changed
+- Overhauls the internal way GitLens deals with Uris and revisions should be far more robust and lead to many fewer edge-case issues
+
+### Fixed
+- Fixes [#220](https://github.com/eamodio/vscode-gitlens/issues/220) - Open Revision quick pick results in empty file
+- Fixes so, SO, many bugs through the refactor/overhaul of GitLens' Uri handling
+
 ## [6.3.0] - 2017-11-30
 ### Added
 - Adds support for files with staged changes

src/annotations/annotations.ts

@@ -49,7 +49,7 @@ export class Annotations {
                 annotationType = FileAnnotationType.Gutter;
             }
 
-            const uri = GitService.toGitContentUri(commit.previousSha, commit.previousUri.fsPath, commit.repoPath);
+            const uri = GitUri.toRevisionUri(commit.previousSha, commit.previousUri.fsPath, commit.repoPath);
             const line = window.activeTextEditor!.selection.active.line;
 
             commandBar += `[\`${GlyphChars.SquareWithTopShadow}\`](${OpenFileRevisionCommand.getMarkdownCommandArgs(uri, annotationType || FileAnnotationType.Gutter, line)} "Blame Previous Revision") `;

src/commands/closeUnchangedFiles.ts

@@ -33,7 +33,7 @@ export class CloseUnchangedFilesCommand extends ActiveEditorCommand {
                 const status = await this.git.getStatusForRepo(repoPath);
                 if (status === undefined) return window.showWarningMessage(`Unable to close unchanged files`);
 
-                args.uris = status.files.map(f => f.Uri);
+                args.uris = status.files.map(f => f.uri);
             }
 
             if (args.uris.length === 0) return commands.executeCommand(BuiltInCommands.CloseAllEditors);

src/commands/common.ts

@@ -297,7 +297,7 @@ export async function openEditor(uri: Uri, options?: TextDocumentShowOptions): P
         };
 
         if (uri instanceof GitUri) {
-            uri = Uri.file(uri.fsPath);
+            uri = uri.fileUri(false);
         }
 
         const document = await workspace.openTextDocument(uri);

src/commands/diffWith.ts

@@ -2,7 +2,7 @@
 import { commands, Range, TextDocumentShowOptions, TextEditor, Uri, window } from 'vscode';
 import { ActiveEditorCommand, Commands } from './common';
 import { BuiltInCommands, GlyphChars } from '../constants';
-import { GitCommit, GitService } from '../gitService';
+import { GitCommit, GitService, GitUri } from '../gitService';
 import { Logger } from '../logger';
 import * as path from 'path';
 
@@ -90,6 +90,15 @@ export class DiffWithCommand extends ActiveEditorCommand {
         if (args.repoPath === undefined || args.lhs === undefined || args.rhs === undefined) return undefined;
 
         try {
+            // If the shas aren't resolved (e.g. a2d24f^), resolve them
+            if (GitService.isResolveRequired(args.lhs.sha)) {
+                args.lhs.sha = await this.git.resolveReference(args.repoPath, args.lhs.sha, args.lhs.uri);
+            }
+
+            if (GitService.isResolveRequired(args.rhs.sha)) {
+                args.rhs.sha = await this.git.resolveReference(args.repoPath, args.rhs.sha, args.rhs.uri);
+            }
+
             const [lhs, rhs] = await Promise.all([
                 this.git.getVersionedFile(args.repoPath, args.lhs.uri.fsPath, args.lhs.sha),
                 this.git.getVersionedFile(args.repoPath, args.rhs.uri.fsPath, args.rhs.sha)
@@ -104,19 +113,26 @@ export class DiffWithCommand extends ActiveEditorCommand {
 
             let rhsPrefix = '';
             if (rhs === undefined) {
-                rhsPrefix = 'deleted in ';
+                rhsPrefix = GitService.isUncommitted(args.rhs.sha)
+                    ? ' (deleted)'
+                    : 'deleted in ';
             }
             else if (lhs === undefined || args.lhs.sha === GitService.deletedSha) {
                 rhsPrefix = 'added in ';
             }
 
-            if (args.lhs.title === undefined && lhs !== undefined && args.lhs.sha !== GitService.deletedSha) {
+            let lhsPrefix = '';
+            if (lhs === undefined && args.rhs.sha === '') {
+                lhsPrefix = 'deleted in ';
+            }
+
+            if (args.lhs.title === undefined && args.lhs.sha !== GitService.deletedSha && (lhs !== undefined || lhsPrefix !== '')) {
                 const suffix = GitService.shortenSha(args.lhs.sha) || '';
-                args.lhs.title = `${path.basename(args.lhs.uri.fsPath)}${suffix !== '' ? ` (${suffix})` : ''}`;
+                args.lhs.title = `${path.basename(args.lhs.uri.fsPath)}${suffix !== '' ? ` (${lhsPrefix}${suffix})` : ''}`;
             }
             if (args.rhs.title === undefined && args.rhs.sha !== GitService.deletedSha) {
                 const suffix = GitService.shortenSha(args.rhs.sha) || '';
-                args.rhs.title = `${path.basename(args.rhs.uri.fsPath)}${suffix !== '' ? ` (${rhsPrefix}${suffix})` : ''}`;
+                args.rhs.title = `${path.basename(args.rhs.uri.fsPath)}${suffix !== '' ? ` (${rhsPrefix}${suffix})` : rhsPrefix}`;
             }
 
             const title = (args.lhs.title !== undefined && args.rhs.title !== undefined)
@@ -125,10 +141,10 @@ export class DiffWithCommand extends ActiveEditorCommand {
 
             return await commands.executeCommand(BuiltInCommands.Diff,
                 lhs === undefined
-                    ? GitService.toGitContentUri(GitService.deletedSha, args.lhs.uri.fsPath, args.repoPath)
+                    ? GitUri.toRevisionUri(GitService.deletedSha, args.lhs.uri.fsPath, args.repoPath)
                     : Uri.file(lhs),
                 rhs === undefined
-                    ? GitService.toGitContentUri(GitService.deletedSha, args.rhs.uri.fsPath, args.repoPath)
+                    ? GitUri.toRevisionUri(GitService.deletedSha, args.rhs.uri.fsPath, args.repoPath)
                     : Uri.file(rhs),
                 title,
                 args.showOptions);

src/commands/diffWithPrevious.ts

@@ -4,7 +4,7 @@ import { commands, Range, TextDocumentShowOptions, TextEditor, Uri, window } fro
 import { ActiveEditorCommand, Commands, getCommandUri } from './common';
 import { DiffWithCommandArgs } from './diffWith';
 import { DiffWithWorkingCommandArgs } from './diffWithWorking';
-import { GitCommit, GitCommitType, GitService, GitUri } from '../gitService';
+import { GitCommit, GitService, GitUri } from '../gitService';
 import { Logger } from '../logger';
 import { Messages } from '../messages';
 
@@ -33,7 +33,7 @@ export class DiffWithPreviousCommand extends ActiveEditorCommand {
             args.line = editor === undefined ? 0 : editor.selection.active.line;
         }
 
-        if (args.commit === undefined || args.commit.type !== GitCommitType.File || args.range !== undefined) {
+        if (args.commit === undefined || !args.commit.isFile || args.range !== undefined) {
             const gitUri = await GitUri.fromUri(uri, this.git);
 
             try {

src/commands/externalDiff.ts

@@ -105,11 +105,11 @@ export class ExternalDiffCommand extends Command {
 
                 for (const file of status.files) {
                     if (file.indexStatus === 'M') {
-                        args.files.push(new ExternalDiffFile(file.Uri, true));
+                        args.files.push(new ExternalDiffFile(file.uri, true));
                     }
 
                     if (file.workTreeStatus === 'M') {
-                        args.files.push(new ExternalDiffFile(file.Uri, false));
+                        args.files.push(new ExternalDiffFile(file.uri, false));
                     }
                 }
             }

src/commands/openChangedFiles.ts

@@ -32,7 +32,7 @@ export class OpenChangedFilesCommand extends ActiveEditorCommand {
                 if (status === undefined) return window.showWarningMessage(`Unable to open changed files`);
 
                 args.uris = Arrays.filterMap(status.files,
-                    f => f.status !== 'D' ? f.Uri : undefined);
+                    f => f.status !== 'D' ? f.uri : undefined);
             }
 
             for (const uri of args.uris) {

src/commands/openCommitInRemote.ts

@@ -1,7 +1,7 @@
 'use strict';
 import { commands, TextEditor, Uri, window } from 'vscode';
 import { ActiveEditorCommand, CommandContext, Commands, getCommandUri, isCommandViewContextWithCommit } from './common';
-import { GitBlameCommit, GitService, GitUri } from '../gitService';
+import { GitService, GitUri } from '../gitService';
 import { Logger } from '../logger';
 import { Messages } from '../messages';
 import { OpenInRemoteCommandArgs } from './openInRemote';
@@ -56,7 +56,12 @@ export class OpenCommitInRemoteCommand extends ActiveEditorCommand {
                 let commit = blame.commit;
                 // If the line is uncommitted, find the previous commit
                 if (commit.isUncommitted) {
-                    commit = new GitBlameCommit(commit.repoPath, commit.previousSha!, commit.previousFileName!, commit.author, commit.date, commit.message, []);
+                    commit = commit.with({
+                        sha: commit.previousSha,
+                        fileName: commit.previousFileName,
+                        previousSha: null,
+                        previousFileName: null
+                    });
                 }
 
                 args.sha = commit.sha;

src/commands/showCommitSearch.ts

@@ -139,7 +139,7 @@ export class ShowCommitSearchCommand extends ActiveEditorCachedCommand {
             if (pick instanceof CommandQuickPickItem) return pick.execute();
 
             return commands.executeCommand(Commands.ShowQuickCommitDetails,
-                new GitUri(pick.commit.uri, pick.commit),
+                pick.commit.toGitUri(),
                 {
                     sha: pick.commit.sha,
                     commit: pick.commit,