Fixes line history blaming with ranges

gitkraken · Apr 17, 2019 · 6c4995d · 6c4995d
1 parent be07f24
commit 6c4995d
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 39 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ### Fixed
 
+- Fixes issues with the _Line History_ view sometimes showing a duplicate and out of order commit
 - Fixes the broken _Open File_ command on the root node of the _File History_ and _Line History_ views
 
 ## [9.6.0] - 2019-04-08

diff --git a/src/views/nodes/lineHistoryNode.ts b/src/views/nodes/lineHistoryNode.ts
@@ -29,6 +29,51 @@ export class LineHistoryNode extends SubscribeableViewNode {
             CommitFileNodeDisplayAs.CommitLabel |
             (this.view.config.avatars ? CommitFileNodeDisplayAs.Gravatar : CommitFileNodeDisplayAs.StatusIcon);
 
+        if (this.uri.sha === undefined) {
+            // Check for any uncommitted changes in the range
+            const blame = await Container.git.getBlameForRange(this.uri, this.selection);
+            if (blame !== undefined) {
+                for (const commit of blame.commits.values()) {
+                    if (!commit.isUncommitted) continue;
+
+                    const file: GitFile = {
+                        fileName: commit.fileName,
+                        indexStatus: '?',
+                        originalFileName: commit.originalFileName,
+                        repoPath: this.uri.repoPath!,
+                        status: 'M',
+                        workingTreeStatus: '?'
+                    };
+
+                    const uncommitted = new GitLogCommit(
+                        GitCommitType.File,
+                        this.uri.repoPath!,
+                        commit.sha,
+                        'You',
+                        commit.email,
+                        commit.date,
+                        // TODO: Add committed date to blame?
+                        commit.date,
+                        commit.message,
+                        commit.fileName,
+                        [file],
+                        'M',
+                        commit.originalFileName,
+                        commit.previousSha,
+                        commit.originalFileName || commit.fileName
+                    );
+
+                    children.splice(
+                        0,
+                        0,
+                        new CommitFileNode(this.view, this, file, uncommitted, displayAs, this.selection)
+                    );
+
+                    break;
+                }
+            }
+        }
+
         const log = await Container.git.getLogForFile(this.uri.repoPath, this.uri.fsPath, {
             ref: this.uri.sha,
             range: this.selection
@@ -45,45 +90,6 @@ export class LineHistoryNode extends SubscribeableViewNode {
             );
         }
 
-        const blame = await Container.git.getBlameForLine(this.uri, this.selection.active.line);
-        if (blame !== undefined) {
-            let first = children[0] as CommitFileNode | undefined;
-            if (first !== undefined && !(first instanceof CommitFileNode)) {
-                first = children[1] as CommitFileNode | undefined;
-            }
-
-            if (first === undefined || first.commit.sha !== blame.commit.sha) {
-                const file: GitFile = {
-                    fileName: blame.commit.fileName,
-                    indexStatus: '?',
-                    originalFileName: blame.commit.originalFileName,
-                    repoPath: this.uri.repoPath!,
-                    status: 'M',
-                    workingTreeStatus: '?'
-                };
-
-                const commit = new GitLogCommit(
-                    GitCommitType.File,
-                    this.uri.repoPath!,
-                    blame.commit.sha,
-                    'You',
-                    blame.commit.email,
-                    blame.commit.date,
-                    // TODO: Add committed date to blame?
-                    blame.commit.date,
-                    blame.commit.message,
-                    blame.commit.fileName,
-                    [file],
-                    'M',
-                    blame.commit.originalFileName,
-                    blame.commit.previousSha,
-                    blame.commit.originalFileName || blame.commit.fileName
-                );
-
-                children.splice(0, 0, new CommitFileNode(this.view, this, file, commit, displayAs, this.selection));
-            }
-        }
-
         if (children.length === 0) return [new MessageNode(this.view, this, 'No line history could be found.')];
         return children;
     }