Rework GithubPackage model and promise management

keymaps/git.cson

@@ -1,6 +1,6 @@
 '.workspace':
-  'ctrl-9': 'github:toggle-git-panel'
-  'ctrl-(': 'github:toggle-git-panel-focus' # ctrl-shift-9
+  'ctrl-9': 'github:toggle-git-tab'
+  'ctrl-(': 'github:toggle-git-tab-focus' # ctrl-shift-9
 
 '.github-Panel':
   'cmd-enter': 'github:commit'

lib/controllers/commit-view-controller.js

@@ -71,8 +71,8 @@ export default class CommitViewController {
     let message = this.regularCommitMessage;
     if (this.props.isAmending) {
       message = this.amendingCommitMessage;
-      if (!message.length && this.props.lastCommit) {
-        message = this.props.lastCommit.message;
+      if (!message.length && this.props.lastCommit.isPresent()) {
+        message = this.props.lastCommit.getMessage();
       }
     } else if (!message.length && this.props.mergeMessage) {
       message = this.props.mergeMessage;

lib/controllers/file-patch-controller.js

@@ -10,7 +10,8 @@ import FilePatchView from '../views/file-patch-view';
 
 export default class FilePatchController extends React.Component {
   static propTypes = {
-    repository: PropTypes.object,
+    activeWorkingDirectory: PropTypes.string,
+    repository: PropTypes.object.isRequired,
     commandRegistry: PropTypes.object.isRequired,
     filePatch: PropTypes.object.isRequired,
     stagingStatus: PropTypes.oneOf(['unstaged', 'staged']).isRequired,
@@ -223,6 +224,13 @@ export default class FilePatchController extends React.Component {
     return this.props.repository.hasDiscardHistory(this.props.filePatch.getPath());
   }
 
+  /**
+   * Used to detect the context when this PaneItem is active
+   */
+  getWorkingDirectory() {
+    return this.props.activeWorkingDirectory;
+  }
+
   destroy() {
     this.emitter.emit('did-destroy');
   }

lib/controllers/git-tab-controller.js

@@ -6,6 +6,8 @@ import etch from 'etch';
 
 import GitTabView from '../views/git-tab-view';
 import ModelObserver from '../models/model-observer';
+import {nullBranch} from '../models/branch';
+import {nullCommit} from '../models/commit';
 import {autobind} from 'core-decorators';
 import yubikiri from 'yubikiri';
 
@@ -18,7 +20,7 @@ export default class GitTabController {
       fetchData: this.fetchRepositoryData,
       didUpdate: () => {
         this.refreshResolutionProgress(false, false);
-        return etch.update(this);
+        return this.update();
       },
     });
     this.repositoryObserver.setActiveModel(props.repository);
@@ -32,11 +34,11 @@ export default class GitTabController {
   }
 
   render() {
-    const modelData = this.repositoryObserver.getActiveModelData() || {fetchInProgress: true};
+    const modelData = this.repositoryObserver.getActiveModelData() || this.defaultRepositoryData();
     const hasUndoHistory = this.props.repository ? this.hasUndoHistory() : false;
     return (
       <GitTabView
-        ref="gitPanel"
+        ref="gitTab"
         {...modelData}
         repository={this.props.repository}
         resolutionProgress={this.props.resolutionProgress}
@@ -133,9 +135,25 @@ export default class GitTabController {
         const isMerging = await query.isMerging;
         return isMerging ? repository.getMergeMessage() : null;
       },
+      fetchInProgress: Promise.resolve(false),
     });
   }
 
+  defaultRepositoryData() {
+    return {
+      lastCommit: nullCommit,
+      isMerging: false,
+      isRebasing: false,
+      currentBranch: nullBranch,
+      unstagedChanges: [],
+      stagedChanges: [],
+      mergeConflicts: [],
+      workingDirectoryPath: this.props.repository.getWorkingDirectoryPath(),
+      mergeMessage: null,
+      fetchInProgress: true,
+    };
+  }
+
   fetchStagedChanges(repository) {
     if (this.props.isAmending) {
       return repository.getStagedChangesSinceParentCommit();
@@ -190,7 +208,7 @@ export default class GitTabController {
 
     this.stagingOperationInProgress = true;
 
-    const fileListUpdatePromise = this.refs.gitPanel.refs.stagingView.getNextListUpdatePromise();
+    const fileListUpdatePromise = this.refs.gitTab.refs.stagingView.getNextListUpdatePromise();
     let stageOperationPromise;
     if (stageStatus === 'staged') {
       stageOperationPromise = this.unstageFiles(filePaths);
@@ -233,7 +251,7 @@ export default class GitTabController {
 
   @autobind
   async prepareToCommit() {
-    return !await this.props.ensureGitPanel();
+    return !await this.props.ensureGitTab();
   }
 
   @autobind
@@ -275,6 +293,8 @@ export default class GitTabController {
           `Cannot abort because ${e.path} is both dirty and staged.`,
           {dismissable: true},
         );
+      } else {
+        throw e;
       }
     }
     return etch.update(this);
@@ -308,20 +328,20 @@ export default class GitTabController {
   }
 
   focus() {
-    this.refs.gitPanel.focus();
+    this.refs.gitTab.focus();
   }
 
   focusAndSelectStagingItem(filePath, stagingStatus) {
-    return this.refs.gitPanel.focusAndSelectStagingItem(filePath, stagingStatus);
+    return this.refs.gitTab.focusAndSelectStagingItem(filePath, stagingStatus);
   }
 
   isFocused() {
-    return this.refs.gitPanel.isFocused();
+    return this.refs.gitTab.isFocused();
   }
 
   @autobind
   quietlySelectItem(filePath, stagingStatus) {
-    return this.refs.gitPanel.quitelySelectItem(filePath, stagingStatus);
+    return this.refs.gitTab.quitelySelectItem(filePath, stagingStatus);
   }
 
   @autobind

lib/controllers/github-tab-controller.js

@@ -4,7 +4,6 @@ import {autobind} from 'core-decorators';
 import yubikiri from 'yubikiri';
 
 import RemotePrController from './remote-pr-controller';
-import Repository from '../models/repository';
 import GithubLoginModel from '../models/github-login-model';
 import ObserveModel from '../views/observe-model';
 import {RemotePropType} from '../prop-types';
@@ -27,9 +26,9 @@ class RemoteSelector extends React.Component {
         </p>
         <ul>
           {remotes.map(remote => (
-            <li key={remote.name}>
+            <li key={remote.getName()}>
               <a href="#" onClick={e => selectRemote(e, remote)}>
-                {remote.name} ({remote.info.owner}/{remote.info.name})
+                {remote.getName()} ({remote.getOwner()}/{remote.getRepo()})
               </a>
             </li>
           ))}
@@ -51,12 +50,9 @@ export default class GithubTabController extends React.Component {
 
   fetchModelData(repo) {
     return yubikiri({
-      remotes: repo.getRemotes().then(remotes => {
-        return remotes.map(({name, url}) => ({name, url, info: Repository.githubInfoFromRemote(url)}))
-          .filter(remote => remote.info.githubRepo);
-      }),
+      remotes: repo.getRemotes().then(remotes => remotes.filter(remote => remote.isGithubRepo())),
       currentBranch: repo.getCurrentBranch(),
-      selectedRemote: repo.getConfig('atomGithub.currentRemote'),
+      selectedRemoteName: repo.getConfig('atomGithub.currentRemote'),
     });
   }
 
@@ -75,15 +71,15 @@ export default class GithubTabController extends React.Component {
   }
 
   renderWithData({remotes, currentBranch, selectedRemote}) {
-    if (!this.props.repository || !remotes) {
+    if (!this.props.repository.isPresent() || !remotes) {
       return null;
     }
 
-    if (!currentBranch || currentBranch.isDetached) {
+    if (!currentBranch.isPresent() || currentBranch.isDetached()) {
       return null;
     }
 
-    let remote = remotes.find(r => r.name === selectedRemote);
+    let remote = remotes.find(r => r.getName() === selectedRemote);
     let manyRemotesAvailable = false;
     if (!remote && remotes.length === 1) {
       remote = remotes[0];
@@ -100,13 +96,13 @@ export default class GithubTabController extends React.Component {
               host="https://api.github.com"
               loginModel={this.loginModel}
               remote={remote}
-              currentBranchName={currentBranch.name}
+              currentBranchName={currentBranch.getName()}
             />
           }
           {!remote && manyRemotesAvailable &&
             <RemoteSelector
               remotes={remotes}
-              currentBranchName={currentBranch.name}
+              currentBranchName={currentBranch.getName()}
               selectRemote={this.handleRemoteSelect}
             />
           }
@@ -147,6 +143,6 @@ export default class GithubTabController extends React.Component {
   @autobind
   handleRemoteSelect(e, remote) {
     e.preventDefault();
-    this.props.repository.setConfig('atomGithub.currentRemote', remote.name);
+    this.props.repository.setConfig('atomGithub.currentRemote', remote.getName());
   }
 }

lib/controllers/pr-info-controller.js

@@ -24,7 +24,7 @@ export default class PrInfoController extends React.Component {
   shouldComponentUpdate(nextProps) {
     return (
       nextProps.token !== this.props.token ||
-      nextProps.hsot !== this.props.host ||
+      nextProps.host !== this.props.host ||
       nextProps.currentBranchName !== this.props.currentBranchName ||
       nextProps.onLogin !== this.props.onLogin ||
       nextProps.remote !== this.props.remote
@@ -39,8 +39,8 @@ export default class PrInfoController extends React.Component {
     }
 
     const route = new PrInfoByBranchRoute({
-      repoOwner: this.props.remote.info.owner,
-      repoName: this.props.remote.info.name,
+      repoOwner: this.props.remote.getOwner(),
+      repoName: this.props.remote.getName(),
       branchName: this.props.currentBranchName,
     });
 

lib/controllers/remote-pr-controller.js

@@ -7,6 +7,7 @@ import {RemotePropType} from '../prop-types';
 import ObserveModelDecorator from '../decorators/observe-model';
 import GithubLoginView from '../views/github-login-view';
 import {UNAUTHENTICATED} from '../models/github-login-model';
+import {nullRemote} from '../models/remote';
 import PrInfoController from './pr-info-controller';
 
 @ObserveModelDecorator({
@@ -31,6 +32,7 @@ export default class RemotePrController extends React.Component {
 
   static defaultProps = {
     host: 'https://api.github.com',
+    remote: nullRemote,
     token: null,
   }
 

lib/controllers/repository-conflict-controller.js

@@ -25,16 +25,15 @@ export default class RepositoryConflictController extends React.Component {
   static propTypes = {
     workspace: PropTypes.object.isRequired,
     commandRegistry: PropTypes.object.isRequired,
-    resolutionProgress: PropTypes.object,
-    repository: PropTypes.object,
-    workingDirectoryPath: PropTypes.string,
+    resolutionProgress: PropTypes.object.isRequired,
+    repository: PropTypes.object.isRequired,
     mergeConflictPaths: PropTypes.arrayOf(PropTypes.string),
     isRebasing: PropTypes.bool,
     refreshResolutionProgress: PropTypes.func,
   };
 
   static defaultProps = {
-    resolutionProgress: ResolutionProgress.empty(),
+    resolutionProgress: new ResolutionProgress(),
     mergeConflictPaths: [],
     isRebasing: false,
     refreshResolutionProgress: () => {},
@@ -76,14 +75,13 @@ export default class RepositoryConflictController extends React.Component {
 
   getConflictingEditors() {
     if (
-      !this.props.workingDirectoryPath ||
       this.props.mergeConflictPaths.length === 0 ||
       this.state.openEditors.length === 0
     ) {
       return [];
     }
 
-    const commonBasePath = this.props.workingDirectoryPath;
+    const commonBasePath = this.props.repository.getWorkingDirectoryPath();
     const fullMergeConflictPaths = new Set(
       this.props.mergeConflictPaths.map(relativePath => path.join(commonBasePath, relativePath)),
     );