Improve context menu of commits

Author: pvigier

src/renderer/components/app.tsx

@@ -178,7 +178,7 @@ export class App extends React.PureComponent<{}, AppState> {
     });
   }
 
-  openInputDialog(label: string, button: string, onSubmit: (value: string) => void, defaultValue?: string) {
+  openInputDialog(label: string, button: string, onSubmit: (value: string) => void, defaultValue = '') {
     const element = <InputDialog label={label} 
       button={button} 
       defaultValue={defaultValue} 

src/renderer/components/commit-item.tsx

@@ -1,15 +1,15 @@
-import { remote, clipboard } from 'electron';
 import * as React from 'react';
 import * as Git from 'nodegit';
 import { ReferenceBadge } from './reference-badge';
 import { InputDialogHandler } from './input-dialog';
 import { RepoState, Stash } from '../helpers/repo-state';
 import { createStashContextMenu } from '../helpers/stash-context-menu';
+import { createCommitContextMenu } from '../helpers/commit-context-menu';
 
 export interface CommitItemProps { 
   repo: RepoState;
   commit: Git.Commit;
-  head: string;
+  head: string | null;
   references: string[];
   selected: boolean;
   color: string;
@@ -34,37 +34,10 @@ export class CommitItem extends React.PureComponent<CommitItemProps, {}> {
     event.preventDefault();
     let menu: Electron.Menu;
     if (!this.props.stash) {
-      const template: Electron.MenuItemConstructorOptions[] = [
-        {
-          label: 'Create branch here',
-          click: () => this.props.onCreateBranch(this.props.commit)
-        },
-        {
-          label: 'Reset to this commit',
-          submenu: [
-            {
-              label: 'Soft',
-              click: () => this.props.repo.reset(this.props.commit, Git.Reset.TYPE.SOFT)
-            },
-            {
-              label: 'Mixed',
-              click: () => this.props.repo.reset(this.props.commit, Git.Reset.TYPE.MIXED)
-            },
-            {
-              label: 'Hard',
-              click: () => this.props.repo.reset(this.props.commit, Git.Reset.TYPE.HARD)
-            }
-          ]
-        },
-        {
-          type: 'separator'
-        },
-        {
-          label: 'Copy commit sha to clipboard',
-          click: () => clipboard.writeText(this.props.commit.sha())
-        },
-      ];
-      menu = remote.Menu.buildFromTemplate(template);
+      menu = createCommitContextMenu(this.props.repo, 
+        this.props.commit, 
+        this.props.onCreateBranch, 
+        this.props.onOpenInputDialog);
     } else {
       menu = createStashContextMenu(this.props.repo, this.props.stash.index);
     }

src/renderer/components/commit-list.tsx

@@ -137,7 +137,7 @@ export class CommitList extends React.PureComponent<CommitListProps, CommitListS
         <CommitItem 
           repo={this.props.repo} 
           commit={commit} 
-          head={this.props.repo.head!}
+          head={this.props.repo.head}
           references={this.props.repo.shaToReferences.get(commitSha) || []}
           selected={this.props.selectedCommit !== null && this.props.selectedCommit.sha() === commit.sha()} 
           onCommitSelect={this.props.onCommitSelect} 

src/renderer/components/input-dialog.tsx

@@ -4,7 +4,7 @@ import { makeModal } from './make-modal';
 export type InputDialogHandler = (label: string, button: string, onSubmit: (value: string) => void, defaultValue?: string) => void;
 
 export class InputFormProps {
-  defaultValue?: string;
+  defaultValue = '';
   label: string;
   button: string;
   onSubmit: (value: string) => void;
@@ -19,7 +19,7 @@ class InputForm extends React.PureComponent<InputFormProps, InputFormState> {
   constructor(props: InputFormProps) {
     super(props);
     this.state = {
-      value: this.props.defaultValue || '',
+      value: this.props.defaultValue,
     }
     this.handleValueChange = this.handleValueChange.bind(this);
     this.handleSubmit = this.handleSubmit.bind(this);

src/renderer/helpers/commit-context-menu.ts

@@ -0,0 +1,66 @@
+import * as Git from 'nodegit';
+import { remote, clipboard } from 'electron';
+import { RepoState, removeReferencePrefix } from './repo-state';
+import { InputDialogHandler } from '../components/input-dialog';
+
+export function createCommitContextMenu(repo: RepoState, 
+  commit: Git.Commit, 
+  onCreateBranch: (commit: Git.Commit) => void,
+  onOpenInputDialog: InputDialogHandler) {
+  function openCreateTagDialog() {
+    onOpenInputDialog('Name', 'Create tag', (value) => repo.createTag(value, commit));
+  }
+
+  const template: Electron.MenuItemConstructorOptions[] = [
+    {
+      label: 'Create branch here',
+      click: () => onCreateBranch(commit)
+    },
+    {
+      label: 'Cherrypick commit',
+      click: () => repo.cherrypick(commit)
+    },
+  ];
+  if (repo.head) {
+    template.push(
+      {
+        label: `Reset ${removeReferencePrefix(repo.head)} to this commit`,
+        submenu: [
+          {
+            label: 'Soft',
+            click: () => repo.reset(commit, Git.Reset.TYPE.SOFT)
+          },
+          {
+            label: 'Mixed',
+            click: () => repo.reset(commit, Git.Reset.TYPE.MIXED)
+          },
+          {
+            label: 'Hard',
+            click: () => repo.reset(commit, Git.Reset.TYPE.HARD)
+          }
+        ]
+      }
+    );
+  }
+  template.push(
+    {
+      label: 'Revert commit',
+      click: () => repo.revert(commit)
+    },
+    {
+      type: 'separator'
+    },
+    {
+      label: 'Copy commit sha to clipboard',
+      click: () => clipboard.writeText(commit.sha())
+    },
+    {
+      type: 'separator'
+    },
+    {
+      label: 'Create tag here',
+      click: openCreateTagDialog
+    }
+  );
+  return remote.Menu.buildFromTemplate(template);
+}

src/renderer/helpers/repo-state.ts

@@ -421,6 +421,24 @@ export class RepoState {
     }
   }
 
+  async cherrypick(commit: Git.Commit) {
+    try {
+      await Git.Cherrypick.cherrypick(this.repo, commit, new Git.CheckoutOptions());
+      await this.commit(commit.message());
+    } catch (e) {
+      this.onNotification(`Unable to cherrypick: ${e.message}`, NotificationType.Error);
+    }
+  }
+
+  async revert(commit: Git.Commit) {
+    try {
+      await Git.Revert.revert(this.repo, commit, null);
+      await this.commit(`Revert "${commit.message()}"`);
+    } catch (e) {
+      this.onNotification(`Unable to cherrypick: ${e.message}`, NotificationType.Error);
+    }
+  }
+
   // Reference operations
 
   async getReferenceCommits() {
@@ -448,6 +466,15 @@ export class RepoState {
     }
   }
 
+  async createTag(name: string, commit: Git.Commit, message = '') {
+    try {
+      const object = await Git.Object.lookup(this.repo, commit.id(), Git.Object.TYPE.COMMIT);
+      await Git.Tag.createLightweight(this.repo, name, object, 0);
+    } catch (e) {
+      this.onNotification(`Unable to create tag ${name}: ${e.message}`, NotificationType.Error);
+    }
+  }
+
   async removeReference(name: string) {
     try {
       await Git.Reference.remove(this.repo, name);