Commit with keyboard action

keymaps/git.cson

@@ -2,6 +2,10 @@
   'ctrl-9': 'github:toggle-git-panel'
   'ctrl-(': 'github:toggle-git-panel-focus' # ctrl-shift-9
 
+'.github-Panel':
+  'cmd-enter': 'github:commit'
+  'ctrl-enter': 'github:commit'
+
 '.github-StagingView':
   'left': 'github:focus-diff-view'
   'tab': 'core:focus-next'

lib/controllers/commit-view-controller.js

@@ -37,20 +37,14 @@ export default class CommitViewController {
   }
 
   render() {
-    let message = this.regularCommitMessage;
-    if (this.props.isAmending) {
-      message = this.amendingCommitMessage;
-      if (!message.length && this.props.lastCommit) {
-        message = this.props.lastCommit.message;
-      }
-    } else if (!message.length && this.props.mergeMessage) {
-      message = this.props.mergeMessage;
-    }
+    const message = this.getCommitMessage();
+
     return (
       <CommitView
         ref="commitView"
         stagedChangesExist={this.props.stagedChangesExist}
         mergeConflictsExist={this.props.mergeConflictsExist}
+        prepareToCommit={this.props.prepareToCommit}
         commit={this.commit}
         setAmending={this.props.setAmending}
         abortMerge={this.props.abortMerge}
@@ -74,6 +68,19 @@ export default class CommitViewController {
     etch.update(this);
   }
 
+  getCommitMessage() {
+    let message = this.regularCommitMessage;
+    if (this.props.isAmending) {
+      message = this.amendingCommitMessage;
+      if (!message.length && this.props.lastCommit) {
+        message = this.props.lastCommit.message;
+      }
+    } else if (!message.length && this.props.mergeMessage) {
+      message = this.props.mergeMessage;
+    }
+    return message;
+  }
+
   handleMessageChange(newMessage) {
     if (this.props.isAmending) {
       this.amendingCommitMessage = newMessage;

lib/controllers/git-controller.js

@@ -70,6 +70,7 @@ export default class GitController extends React.Component {
     this.toggleGitPanelFocus = this.toggleGitPanelFocus.bind(this);
     this.focusFilePatchView = this.focusFilePatchView.bind(this);
     this.focusGitPanel = this.focusGitPanel.bind(this);
+    this.ensureGitPanel = this.ensureGitPanel.bind(this);
 
     this.subscriptions = new CompositeDisposable();
     this.subscriptions.add(
@@ -142,6 +143,7 @@ export default class GitController extends React.Component {
             didDiveIntoMergeConflictPath={this.diveIntoMergeConflictFileForPath}
             didChangeAmending={this.didChangeAmending}
             focusFilePatchView={this.focusFilePatchView}
+            ensureGitPanel={this.ensureGitPanel}
           />
         </EtchWrapper>
       </Panel>
@@ -257,6 +259,18 @@ export default class GitController extends React.Component {
     return this.gitPanelController.getWrappedComponent().isFocused();
   }
 
+  // Ensure that the Git panel is visible. Returns a Promise that resolves to `true` if the panel was initially
+  // hidden or `false` if it was already shown.
+  ensureGitPanel() {
+    if (!this.state.gitPanelActive) {
+      return new Promise((resolve, reject) => {
+        this.setState({gitPanelActive: true}, () => resolve(true));
+      });
+    }
+
+    return Promise.resolve(false);
+  }
+
   focusFilePatchView() {
     this.filePatchController.getWrappedComponent().focus();
   }

lib/controllers/git-panel-controller.js

@@ -14,6 +14,7 @@ export default class GitPanelController {
 
     this.unstageFilePatch = this.unstageFilePatch.bind(this);
     this.attemptFileStageOperation = this.attemptFileStageOperation.bind(this);
+    this.prepareToCommit = this.prepareToCommit.bind(this);
     this.commit = this.commit.bind(this);
     this.setAmending = this.setAmending.bind(this);
     this.checkout = this.checkout.bind(this);
@@ -44,6 +45,7 @@ export default class GitPanelController {
         stageFilePatch={this.stageFilePatch}
         unstageFilePatch={this.unstageFilePatch}
         attemptFileStageOperation={this.attemptFileStageOperation}
+        prepareToCommit={this.prepareToCommit}
         commit={this.commit}
         setAmending={this.setAmending}
         isAmending={this.props.isAmending}
@@ -172,6 +174,10 @@ export default class GitPanelController {
     }
   }
 
+  async prepareToCommit() {
+    return !await this.props.ensureGitPanel();
+  }
+
   async commit(message) {
     try {
       await this.getActiveRepository().commit(message, {amend: this.props.isAmending});

lib/views/commit-view.js

@@ -12,11 +12,10 @@ export default class CommitView {
   constructor(props) {
     this.props = props;
 
-    this.commit = this.commit.bind(this);
-    this.abortMerge = this.abortMerge.bind(this);
     this.handleAmendBoxClick = this.handleAmendBoxClick.bind(this);
     this.commit = this.commit.bind(this);
     this.abortMerge = this.abortMerge.bind(this);
+
     etch.initialize(this);
 
     this.editor = this.refs.editor;
@@ -26,7 +25,7 @@ export default class CommitView {
     this.subscriptions = new CompositeDisposable(
       this.editor.onDidChange(() => this.props.onChangeMessage && this.props.onChangeMessage(this.editor.getText())),
       this.editor.onDidChangeCursorPosition(() => { etch.update(this); }),
-      props.commandRegistry.add(this.element, {'github:commit': this.commit}),
+      props.commandRegistry.add('atom-workspace', {'github:commit': this.commit}),
     );
 
     const grammar = atom.grammars.grammarForScopeName(COMMIT_GRAMMAR_SCOPE);
@@ -115,9 +114,11 @@ export default class CommitView {
     this.props.setAmending(this.refs.amend.checked);
   }
 
-  commit() {
-    if (this.isCommitButtonEnabled()) {
+  async commit() {
+    if (await this.props.prepareToCommit() && this.isCommitButtonEnabled()) {
       this.props.commit(this.editor.getText());
+    } else {
+      this.focus();
     }
   }
 

lib/views/git-panel-view.js

@@ -68,6 +68,7 @@ export default class GitPanelView {
             ref="commitViewController"
             stagedChangesExist={this.props.stagedChanges.length > 0}
             mergeConflictsExist={this.props.mergeConflicts.length > 0}
+            prepareToCommit={this.props.prepareToCommit}
             commit={this.props.commit}
             amending={this.props.amending}
             setAmending={this.props.setAmending}

test/controllers/git-controller.test.js

@@ -18,6 +18,7 @@ describe('GitController', () => {
     workspace = atomEnv.workspace;
     commandRegistry = atomEnv.commands;
     notificationManager = atomEnv.notifications;
+
     app = (
       <GitController
         workspace={workspace}
@@ -321,6 +322,30 @@ describe('GitController', () => {
     });
   });
 
+  describe('ensureGitPanel()', () => {
+    let wrapper;
+
+    beforeEach(async () => {
+      const workdirPath = await cloneRepository('multiple-commits');
+      const repository = await buildRepository(workdirPath);
+
+      app = React.cloneElement(app, {repository});
+      wrapper = shallow(app);
+    });
+
+    it('opens the Git panel when it is initially closed', async () => {
+      assert.isFalse(wrapper.find('Panel').prop('visible'));
+      assert.isTrue(await wrapper.instance().ensureGitPanel());
+    });
+
+    it('does nothing when the Git panel is already open', async () => {
+      wrapper.instance().toggleGitPanel();
+      assert.isTrue(wrapper.find('Panel').prop('visible'));
+      assert.isFalse(await wrapper.instance().ensureGitPanel());
+      assert.isTrue(wrapper.find('Panel').prop('visible'));
+    });
+  });
+
   it('correctly updates state when switching repos', async () => {
     const workdirPath1 = await cloneRepository('three-files');
     const repository1 = await buildRepository(workdirPath1);