Adds "Incoming Activity" node to repos view - #735

Replaces "recent incoming changes" node

Author: eamodio

CHANGELOG.md

@@ -6,6 +6,19 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ## [Unreleased]
 
+## Added
+
+- Adds a new experimental _Incoming Activity_ node to each repository in the _Repositories_ view (enabled via `"gitlens.insiders": true`) — closes [#735](https://github.com/eamodio/vscode-gitlens/issues/735)
+  - **Incoming Activity** — lists the recent incoming activity (merges and pulls) to your local repository
+    - Provides the activity command, branch (if available), and date
+      - A context menu provides access to the _Refresh_ command
+      - Each activity expands to list the commits added by the command
+        - An inline toolbar provides quick access to the _Compare with HEAD_ (`alt-click` for _Compare with Working Tree_), _Copy Commit ID to Clipboard_ (`alt-click` for _Copy Commit Message to Clipboard_), and _Open Commit on Remote_ (if available) commands
+        - A context menu provides access to more common revision (commit) commands
+        - Each revision (commit) expands to list its set of changed files, complete with status indicators for adds, changes, renames, and deletes
+          - An inline toolbar provides quick access to the _Open File_, _Copy Commit ID to Clipboard_ (`alt-click` for _Copy Commit Message to Clipboard_), and _Open File on Remote_ (if available) commands
+          - A context menu provides access to more common file revision commands
+
 ## Fixed
 
 - Fixes issues with the _Show More Actions_ button on the _Details_ hover not working with renamed files

README.md

@@ -316,6 +316,17 @@ The repositories view provides the following features,
         - An inline toolbar provides quick access to the _Open File_, _Copy Commit ID to Clipboard_ (`alt-click` for _Copy Commit Message to Clipboard_), and _Open File on Remote_ (if available) commands
         - A context menu provides access to more common file revision commands
 
+- **Incoming Activity** — lists the recent incoming activity (merges and pulls) to your local repository (experimental, enabled via `"gitlens.insiders": true`)
+
+  - Provides the activity command, branch (if available), and date
+    - A context menu provides access to the _Refresh_ command
+    - Each activity expands to list the commits added by the command
+      - An inline toolbar provides quick access to the _Compare with HEAD_ (`alt-click` for _Compare with Working Tree_), _Copy Commit ID to Clipboard_ (`alt-click` for _Copy Commit Message to Clipboard_), and _Open Commit on Remote_ (if available) commands
+      - A context menu provides access to more common revision (commit) commands
+      - Each revision (commit) expands to list its set of changed files, complete with status indicators for adds, changes, renames, and deletes
+        - An inline toolbar provides quick access to the _Open File_, _Copy Commit ID to Clipboard_ (`alt-click` for _Copy Commit Message to Clipboard_), and _Open File on Remote_ (if available) commands
+        - A context menu provides access to more common file revision commands
+
 - **Remotes** — lists the remotes in the repository
 
   - Provides the name of each remote, an indicator of the direction of the remote (fetch, push, both), remote service (if applicable), and repository path

images/dark/icon-merge.svg

@@ -806,8 +806,14 @@ export class Git {
         return git<string>({ cwd: repoPath }, ...params, ref1, ref2);
     }
 
-    static reflog(repoPath: string, { branch, since }: { branch?: string; since?: string } = {}): Promise<string> {
+    static reflog(
+        repoPath: string,
+        { all, branch, since }: { all?: boolean; branch?: string; since?: string } = {}
+    ): Promise<string> {
         const params = ['log', '-g', `--format=${GitReflogParser.defaultFormat}`, '--date=unix'];
+        if (all) {
+            params.push('--all');
+        }
         if (branch) {
             params.push(branch);
         }

images/light/icon-merge.svg

@@ -95,6 +95,7 @@ export enum GitRepoSearchBy {
 }
 
 const emptyPromise: Promise<GitBlame | GitDiff | GitLog | undefined> = Promise.resolve(undefined);
+const reflogCommands = ['merge', 'pull'];
 
 export class GitService implements Disposable {
     private _onDidChangeRepositories = new EventEmitter<void>();
@@ -1955,17 +1956,24 @@ export class GitService implements Disposable {
     }
 
     @log()
-    async getRecentIncomingChanges(
+    async getIncomingActivity(
         repoPath: string,
-        options: { branch?: string; since?: string } = {}
+        { maxCount, ...options }: { all?: boolean; branch?: string; maxCount?: number; since?: string } = {}
     ): Promise<GitReflog | undefined> {
         const cc = Logger.getCorrelationContext();
 
         try {
             const data = await Git.reflog(repoPath, options);
             if (data === undefined) return undefined;
 
-            return GitReflogParser.parseRecentIncomingChanges(data, repoPath);
+            const reflog = GitReflogParser.parse(
+                data,
+                repoPath,
+                reflogCommands,
+                maxCount == null ? Container.config.advanced.maxListItems || 0 : maxCount
+            );
+
+            return reflog;
         }
         catch (ex) {
             Logger.error(ex, cc);

src/git/git.ts

@@ -1,19 +1,31 @@
 'use strict';
 import { Dates, memoize } from '../../system';
-import { CommitFormatting } from '../git';
+import { CommitFormatting, Git } from '../git';
 import { DateStyle } from '../../config';
 
-export class GitReflog {
-    previousRef: string | undefined;
+export interface GitReflog {
+    readonly repoPath: string;
+    readonly records: GitReflogRecord[];
+
+    readonly count: number;
+    readonly maxCount: number | undefined;
+    readonly truncated: boolean;
+}
+
+export class GitReflogRecord {
+    private _previousSha: string | undefined;
 
     constructor(
         public readonly repoPath: string,
-        public readonly ref: string,
+        public readonly sha: string,
+        private _selector: string,
         public readonly date: Date,
-        public readonly command: string
+        public readonly command: string,
+        public readonly commandArgs: string | undefined,
+        public readonly details: string | undefined
     ) {}
 
-    @memoize<GitReflog['formatDate']>(format => (format == null ? 'MMMM Do, YYYY h:mma' : format))
+    @memoize<GitReflogRecord['formatDate']>(format => (format == null ? 'MMMM Do, YYYY h:mma' : format))
     formatDate(format?: string | null) {
         if (format == null) {
             format = 'MMMM Do, YYYY h:mma';
@@ -32,6 +44,48 @@ export class GitReflog {
             : this.formatDateFromNow();
     }
 
+    @memoize()
+    get HEAD() {
+        if (this._selector == null || this._selector.length === 0) return '';
+
+        if (this._selector.startsWith('refs/heads')) {
+            return this._selector.substr(11);
+        }
+
+        if (this._selector.startsWith('refs/remotes')) {
+            return this._selector.substr(13);
+        }
+
+        return this._selector;
+    }
+
+    get previousSha() {
+        return this._previousSha;
+    }
+
+    @memoize()
+    get previousShortSha() {
+        return Git.shortenSha(this._previousSha);
+    }
+
+    get selector() {
+        return this._selector;
+    }
+
+    @memoize()
+    get shortSha() {
+        return Git.shortenSha(this.sha);
+    }
+
+    update(previousSha?: string, selector?: string) {
+        if (previousSha !== undefined) {
+            this._previousSha = previousSha;
+        }
+        if (selector !== undefined) {
+            this._selector = selector;
+        }
+    }
+
     @memoize()
     private get dateFormatter(): Dates.DateFormatter {
         return Dates.getFormatter(this.date);

src/git/gitService.ts

@@ -1,9 +1,10 @@
 'use strict';
 import { debug } from '../../system';
-import { GitReflog } from '../models/reflog';
+import { GitReflog, GitReflogRecord } from '../models/reflog';
 
-const incomingCommands = ['merge', 'pull'];
-const reflogRegex = /^<r>(.+)<d>(?:.+?)@{(.+)}<s>(\w*).*$/gm;
+const reflogRegex = /^<r>(.+)<d>(.+?)@{(.+)}<s>(\w*)(.*?)(?::(.*))?$/gm;
+// const reflogRegex = /^<r>(.+)<d>(.+?)@{(.+)}<s>(\w*)(.*?)(?::(.*))?<n>(.*)$/gm;
+const reflogHEADRegex = /.*?\/?HEAD$/;
 
 // Using %x00 codes because some shells seem to try to expand things if not
 const lb = '%x3c'; // `%x${'<'.charCodeAt(0).toString(16)}`;
@@ -14,49 +15,108 @@ export class GitReflogParser {
         `${lb}r${rb}%H`, // ref
         `${lb}d${rb}%gD`, // reflog selector (with UNIX timestamp)
         `${lb}s${rb}%gs` // reflog subject
+        // `${lb}n${rb}%D` // ref names
     ].join('');
 
     @debug({ args: false })
-    static parseRecentIncomingChanges(data: string, repoPath: string): GitReflog | undefined {
+    static parse(data: string, repoPath: string, commands: string[], maxCount: number): GitReflog | undefined {
         if (!data) return undefined;
 
-        let reflog: GitReflog | undefined;
+        const records: GitReflogRecord[] = [];
 
-        let match: RegExpExecArray | null;
+        let sha;
+        let selector;
         let date;
-        let ref;
         let command;
+        let commandArgs;
+        let details;
+
+        let head;
+        let headDate;
+        let headSha;
+
+        let count = 0;
+        let recordDate;
+        let record: GitReflogRecord | undefined;
+        let truncated = false;
 
+        let match: RegExpExecArray | null;
         do {
             match = reflogRegex.exec(data);
             if (match == null) break;
 
-            [, ref, date, command] = match;
+            [, sha, selector, date, command, commandArgs, details] = match;
+
+            if (record !== undefined) {
+                // If the next record has the same sha as the previous, use it if it is not pointing to just HEAD and the previous is
+                if (
+                    sha === record.sha &&
+                    (date !== recordDate || !reflogHEADRegex.test(record.selector) || reflogHEADRegex.test(selector))
+                ) {
+                    continue;
+                }
+
+                if (sha !== record.sha) {
+                    if (
+                        head != null &&
+                        headDate === recordDate &&
+                        headSha == record.sha &&
+                        reflogHEADRegex.test(record.selector)
+                    ) {
+                        record.update(sha, head);
+                    }
+                    else {
+                        record.update(sha);
+                    }
+
+                    records.push(record);
+                    record = undefined;
+                    recordDate = undefined;
+
+                    count++;
+                    if (maxCount !== 0 && count >= maxCount) {
+                        truncated = true;
+                        break;
+                    }
+                }
+            }
 
-            // If we don't have a reflog, or are still at the same ref with a proper command, save it
-            if (
-                (reflog === undefined || (reflog !== undefined && ref === reflog.ref)) &&
-                incomingCommands.includes(command)
-            ) {
-                reflog = new GitReflog(
+            if (command === 'HEAD') {
+                head = selector;
+                headDate = date;
+                headSha = sha;
+
+                continue;
+            }
+
+            if (commands.includes(command)) {
+                record = new GitReflogRecord(
                     repoPath,
                     // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869
-                    ` ${ref}`.substr(1),
-                    new Date((date! as any) * 1000),
+                    ` ${sha}`.substr(1),
+                    // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869
+                    ` ${selector}`.substr(1),
+                    new Date(Number(date) * 1000),
                     // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869
-                    ` ${command}`.substr(1)
+                    ` ${command}`.substr(1),
+                    // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869
+                    commandArgs == null || commandArgs.length === 0 ? undefined : commandArgs.substr(1),
+                    // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869
+                    details == null || details.length === 0 ? undefined : details.substr(1)
                 );
-            }
-            else if (reflog !== undefined && ref !== reflog.ref) {
-                reflog.previousRef = ref;
-
-                break;
+                recordDate = date;
             }
         } while (match != null);
 
         // Ensure the regex state is reset
         reflogRegex.lastIndex = 0;
 
-        return reflog;
+        return {
+            repoPath: repoPath,
+            records: records,
+            count: count,
+            maxCount: maxCount,
+            truncated: truncated
+        };
     }
 }

src/git/models/reflog.ts

@@ -6,20 +6,21 @@ export * from './nodes/branchNode';
 export * from './nodes/branchTrackingStatusNode';
 export * from './nodes/commitFileNode';
 export * from './nodes/commitNode';
+export * from './nodes/compareNode';
+export * from './nodes/compareResultsNode';
 export * from './nodes/contributorNode';
 export * from './nodes/contributorsNode';
 export * from './nodes/fileHistoryNode';
 export * from './nodes/fileHistoryTrackerNode';
 export * from './nodes/folderNode';
 export * from './nodes/lineHistoryNode';
 export * from './nodes/lineHistoryTrackerNode';
-export * from './nodes/recentIncomingChangesNode';
+export * from './nodes/reflogNode';
+export * from './nodes/reflogRecordNode';
 export * from './nodes/remoteNode';
 export * from './nodes/remotesNode';
 export * from './nodes/repositoriesNode';
 export * from './nodes/repositoryNode';
-export * from './nodes/compareResultsNode';
-export * from './nodes/compareNode';
 export * from './nodes/resultsCommitsNode';
 export * from './nodes/resultsFileNode';
 export * from './nodes/resultsFilesNode';