Merge pull request #709 from atom/mkt-just-cant-palette-these-errors

Show Git errors when running commands from command palette

Author: Michelle Tilley

lib/controllers/status-bar-tile-controller.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
+import {GitError} from '../git-shell-out-strategy';
 import ObserveModelDecorator from '../decorators/observe-model';
 import {BranchPropType, RemotePropType} from '../prop-types';
 import BranchView from '../views/branch-view';
@@ -149,7 +150,6 @@ export default class StatusBarTileController extends React.Component {
           <PushPullMenuView
             onMarkSpecialClick={this.handleOpenGitTimingsView}
             workspace={this.props.workspace}
-            notificationManager={this.props.notificationManager}
             inProgress={this.state.inProgress}
             push={this.push}
             pull={this.pull}
@@ -186,25 +186,89 @@ export default class StatusBarTileController extends React.Component {
     });
   }
 
+  async attemptGitOperation(operation, errorTransform = message => ({message})) {
+    const operationPromise = operation();
+    try {
+      return await operationPromise;
+    } catch (error) {
+      if (!(error instanceof GitError)) { throw error; }
+      const {message, description} = errorTransform(error.stdErr);
+      this.props.notificationManager.addError(
+        message || 'Cannot complete remote interaction',
+        {description, dismissable: true},
+      );
+      return null;
+    }
+  }
+
   @autobind
   checkout(branchName, options) {
     return this.setInProgressWhile(() => this.props.repository.checkout(branchName, options));
   }
 
   @autobind
-  async push(options) {
+  async push({force, setUpstream}) {
+    await this.attemptGitOperation(
+      () => this.doPush({force, setUpstream}),
+      description => {
+        if (/rejected[\s\S]*failed to push/.test(description)) {
+          return {
+            message: 'Push rejected',
+            description: 'The tip of your current branch is behind its remote counterpart.' +
+              ' Try pulling before pushing again. Or, to force push, hold `cmd` or `ctrl` while clicking.',
+          };
+        }
+
+        return {message: 'Unable to push', description: `<pre>${description}</pre>`};
+      },
+    );
+  }
+
+  async doPush(options) {
     await this.setInProgressWhile(() => {
       return this.props.repository.push(this.props.currentBranch.getName(), options);
     }, {push: true});
   }
 
   @autobind
   async pull() {
+    await this.attemptGitOperation(
+      () => this.doPull(),
+      description => {
+        if (/error: Your local changes to the following files would be overwritten by merge/.test(description)) {
+          const lines = description.split('\n');
+          const files = lines.slice(3, lines.length - 3).map(l => `\`${l.trim()}\``).join('<br>');
+          return {
+            message: 'Pull aborted',
+            description: 'Local changes to the following would be overwritten by merge:<br>' + files +
+              '<br>Please commit your changes or stash them before you merge.',
+          };
+        }
+
+        return {message: 'Unable to pull', description: `<pre>${description}</pre>`};
+      },
+    );
+
+  }
+
+  async doPull() {
     await this.setInProgressWhile(() => this.props.repository.pull(this.props.currentBranch.getName()), {pull: true});
   }
 
   @autobind
   async fetch() {
+    await this.attemptGitOperation(
+      () => this.doFetch(),
+      description => {
+        return {
+          message: 'Unable to fetch',
+          description: `<pre>${description}</pre>`,
+        };
+      },
+    );
+  }
+
+  async doFetch() {
     await this.setInProgressWhile(() => this.props.repository.fetch(this.props.currentBranch.getName()), {fetch: true});
   }
 }

lib/views/push-pull-menu-view.js

@@ -2,12 +2,10 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {autobind} from 'core-decorators';
 
-import {GitError} from '../git-shell-out-strategy';
 import {BranchPropType, RemotePropType} from '../prop-types';
 
 export default class PushPullMenuView extends React.Component {
   static propTypes = {
-    notificationManager: PropTypes.object.isRequired,
     currentBranch: BranchPropType.isRequired,
     currentRemote: RemotePropType.isRequired,
     inProgress: PropTypes.bool,
@@ -120,69 +118,18 @@ export default class PushPullMenuView extends React.Component {
     }
   }
 
-  async attemptGitOperation(operation, errorTransform = message => ({message})) {
-    const operationPromise = operation();
-    try {
-      return await operationPromise;
-    } catch (error) {
-      if (!(error instanceof GitError)) { throw error; }
-      const {message, description} = errorTransform(error.stdErr);
-      this.props.notificationManager.addError(
-        message || 'Cannot complete remote interaction',
-        {description, dismissable: true},
-      );
-      return null;
-    }
-  }
-
   @autobind
-  async fetch() {
-    await this.attemptGitOperation(
-      () => this.props.fetch(),
-      description => {
-        return {
-          message: 'Unable to fetch',
-          description: `<pre>${description}</pre>`,
-        };
-      },
-    );
+  fetch() {
+    return this.props.fetch();
   }
 
   @autobind
-  async pull() {
-    await this.attemptGitOperation(
-      () => this.props.pull(),
-      description => {
-        if (/error: Your local changes to the following files would be overwritten by merge/.test(description)) {
-          const lines = description.split('\n');
-          const files = lines.slice(3, lines.length - 3).map(l => `\`${l.trim()}\``).join('<br>');
-          return {
-            message: 'Pull aborted',
-            description: 'Local changes to the following would be overwritten by merge:<br>' + files +
-              '<br>Please commit your changes or stash them before you merge.',
-          };
-        }
-
-        return {message: 'Unable to pull', description: `<pre>${description}</pre>`};
-      },
-    );
+  pull() {
+    return this.props.pull();
   }
 
   @autobind
-  async push() {
-    await this.attemptGitOperation(
-      () => this.props.push({force: this.state.force, setUpstream: !this.props.currentRemote.isPresent()}),
-      description => {
-        if (/rejected[\s\S]*failed to push/.test(description)) {
-          return {
-            message: 'Push rejected',
-            description: 'The tip of your current branch is behind its remote counterpart.' +
-              ' Try pulling before pushing again. Or, to force push, hold `cmd` while clicking.',
-          };
-        }
-
-        return {message: 'Unable to push', description: `<pre>${description}</pre>`};
-      },
-    );
+  push() {
+    return this.props.push({force: this.state.force, setUpstream: !this.props.currentRemote.isPresent()});
   }
 }