git timetravel -- show author names

Author: williamstein

src/packages/frontend/frame-editors/time-travel-editor/actions.ts

@@ -77,7 +77,7 @@ export class TimeTravelActions extends CodeEditorActions<TimeTravelState> {
   syncdoc?: SyncDoc;
   private first_load: boolean = true;
   ambient_actions?: CodeEditorActions;
-  private gitTimestampToHash: { [t: number]: string } = {};
+  private gitLog: { [t: number]: { hash: string; name: string } } = {};
 
   _init2(): void {
     const { head, tail } = path_split(this.path);
@@ -450,18 +450,25 @@ export class TimeTravelActions extends CodeEditorActions<TimeTravelState> {
     try {
       const { stdout } = await this.gitCommand([
         "log",
-        `--format="%at %H"`,
+        `--format="%at %H %an <%ae>"`,
         "--",
       ]);
-      this.gitTimestampToHash = {};
+      this.gitLog = {};
       const versions: Date[] = [];
       for (const x of stdout.split("\n")) {
-        const [t0, h] = x.slice(1, -1).split(" ");
-        if (!x || !t0 || !h) {
+        const y = x.slice(1, -1);
+        const i = y.indexOf(" ");
+        if (i == -1) continue;
+        const t0 = y.slice(0, i);
+        const j = y.indexOf(" ", i + 1);
+        if (j == -1) continue;
+        const hash = y.slice(i + 1, j).trim();
+        const name = y.slice(j + 1).trim();
+        if (!x || !t0 || !hash) {
           continue;
         }
         const t = parseInt(t0) * 1000;
-        this.gitTimestampToHash[t] = h.trim();
+        this.gitLog[t] = { hash, name };
         versions.push(new Date(t));
       }
       versions.reverse();
@@ -479,7 +486,7 @@ export class TimeTravelActions extends CodeEditorActions<TimeTravelState> {
   };
 
   private gitShow = async (version: Date): Promise<string | undefined> => {
-    const h = this.gitTimestampToHash[version.valueOf()];
+    const h = this.gitLog[version.valueOf()]?.hash;
     if (h == null) {
       return;
     }
@@ -497,6 +504,26 @@ export class TimeTravelActions extends CodeEditorActions<TimeTravelState> {
     }
   };
 
+  gitNames = (version0: number, version1: number): string[] => {
+    const versions = this.store.get("git_versions");
+    if (versions == null) {
+      return [];
+    }
+    const v0 = versions.get(version0)?.valueOf();
+    const v1 = versions.get(version1)?.valueOf();
+    if (v0 == null || v1 == null) {
+      return [];
+    }
+    const names: string[] = [];
+    for (const t in this.gitLog) {
+      const t0 = parseInt(t);
+      if (t0 >= v0 && t0 <= v1) {
+        names.push(this.gitLog[t].name);
+      }
+    }
+    return names;
+  };
+
   gitDoc = async (version: Date): Promise<ViewDocument | undefined> => {
     const str = await this.gitShow(version);
     if (str == null) {

src/packages/frontend/frame-editors/time-travel-editor/authors.tsx

@@ -3,7 +3,7 @@
  *  License: MS-RSL – see LICENSE.md for details
  */
 
-import { Tooltip } from "antd";
+import { Popover, Tooltip } from "antd";
 const { User } = require("../../users");
 import { Loading, r_join } from "../../components";
 import { TimeTravelActions } from "./actions";
@@ -20,7 +20,39 @@ interface Props {
   version1: number;
 }
 
-export function Authors(props: Props) {
+export function GitAuthors({ actions, version0, version1 }: Props) {
+  const names = actions.gitNames(version0, version1);
+  const data: { [person: string]: { emails: Set<string>; count: number } } = {};
+  const people: string[] = [];
+  for (const name of names) {
+    const i = name.lastIndexOf("<");
+    const email = name.slice(i + 1, -1).trim();
+    const person = name.slice(0, i).trim();
+    people.push(person);
+    if (data[person] == null) {
+      data[person] = { emails: new Set([email]), count: 1 };
+    } else {
+      data[person].emails.add(email);
+      data[person].count += 1;
+    }
+  }
+  const w = Array.from(new Set(people));
+  w.sort();
+  const v: JSX.Element[] = [];
+  for (const person of w) {
+    v.push(
+      <Popover
+        title={<>{data[person].count} Commits</>}
+        content={Array.from(data[person].emails).join(", ")}
+      >
+        {person} ({data[person].count})
+      </Popover>,
+    );
+  }
+  return <span>{r_join(v)}</span>;
+}
+
+export function TimeTravelAuthors({ actions, version0, version1 }: Props) {
   const userMap = useTypedRedux("users", "user_map");
 
   const renderUser = (account_id: string) => {
@@ -69,7 +101,7 @@ export function Authors(props: Props) {
   const renderAuthor = (account_id: string) => {
     if (userMap != null && userMap.has(account_id)) {
       return renderUser(account_id);
-    } else if (account_id == props.actions.project_id) {
+    } else if (account_id == actions.project_id) {
       return renderProject();
     } else if (isEncodedNumUUID(account_id)) {
       return renderComputeServer(decodeUUIDtoNum(account_id));
@@ -83,10 +115,7 @@ export function Authors(props: Props) {
       return <Loading />;
     }
     const v: JSX.Element[] = [];
-    for (const account_id of props.actions.get_account_ids(
-      props.version0,
-      props.version1,
-    )) {
+    for (const account_id of actions.get_account_ids(version0, version1)) {
       v.push(renderAuthor(account_id));
     }
     if (v.length == 0) return renderUnknown();

src/packages/frontend/frame-editors/time-travel-editor/time-travel.tsx

@@ -16,7 +16,7 @@ import { NavigationButtons } from "./navigation-buttons";
 import { NavigationSlider } from "./navigation-slider";
 import { RangeSlider } from "./range-slider";
 import { Version, VersionRange } from "./version";
-import { Authors } from "./authors";
+import { GitAuthors, TimeTravelAuthors } from "./authors";
 import { LoadFullHistory } from "./load-full-history";
 import { OpenFile } from "./open-file";
 import { RevertFile } from "./revert-file";
@@ -247,13 +247,12 @@ export function TimeTravel(props: Props) {
     if (version0 == null || version1 == null) {
       return;
     }
-    return (
-      <Authors
-        actions={props.actions}
-        version0={version0}
-        version1={version1}
-      />
-    );
+    const opts = { actions: props.actions, version0, version1 };
+    if (gitMode) {
+      return <GitAuthors {...opts} />;
+    } else {
+      return <TimeTravelAuthors {...opts} />;
+    }
   };
 
   const renderLoadFullHistory = () => {