Project Management

lib/controllers/git-tab-controller.js

@@ -51,6 +51,7 @@ export default class GitTabController extends React.Component {
     openFiles: PropTypes.func.isRequired,
     openInitializeDialog: PropTypes.func.isRequired,
     controllerRef: RefHolderPropType,
+    changeProjectWorkingDirectory: PropTypes.func.isRequired,
   };
 
   constructor(props, context) {
@@ -119,6 +120,7 @@ export default class GitTabController extends React.Component {
         openFiles={this.props.openFiles}
         discardWorkDirChangesForPaths={this.props.discardWorkDirChangesForPaths}
         undoLastDiscard={this.props.undoLastDiscard}
+        changeProjectWorkingDirectory={this.props.changeProjectWorkingDirectory}
 
         attemptFileStageOperation={this.attemptFileStageOperation}
         attemptStageAllOperation={this.attemptStageAllOperation}

lib/controllers/github-tab-controller.js

@@ -8,6 +8,7 @@ import GitHubTabView from '../views/github-tab-view';
 
 export default class GitHubTabController extends React.Component {
   static propTypes = {
+    project: PropTypes.object.isRequired,
     workspace: PropTypes.object.isRequired,
     repository: PropTypes.object.isRequired,
     remoteOperationObserver: OperationStateObserverPropType.isRequired,
@@ -21,6 +22,8 @@ export default class GitHubTabController extends React.Component {
     aheadCount: PropTypes.number,
     pushInProgress: PropTypes.bool.isRequired,
     isLoading: PropTypes.bool.isRequired,
+
+    changeProjectWorkingDirectory: PropTypes.func.isRequired,
   }
 
   render() {
@@ -37,6 +40,7 @@ export default class GitHubTabController extends React.Component {
 
     return (
       <GitHubTabView
+        project={this.props.project}
         workspace={this.props.workspace}
         remoteOperationObserver={this.props.remoteOperationObserver}
         loginModel={this.props.loginModel}
@@ -54,6 +58,7 @@ export default class GitHubTabController extends React.Component {
 
         handlePushBranch={this.handlePushBranch}
         handleRemoteSelect={this.handleRemoteSelect}
+        changeProjectWorkingDirectory={this.props.changeProjectWorkingDirectory}
       />
     );
   }

lib/controllers/root-controller.js

@@ -65,6 +65,7 @@ export default class RootController extends React.Component {
     clone: PropTypes.func.isRequired,
 
     // Control
+    changeProjectWorkingDirectory: PropTypes.func.isRequired,
     startOpen: PropTypes.bool,
     startRevealed: PropTypes.bool,
   }
@@ -284,6 +285,7 @@ export default class RootController extends React.Component {
               discardWorkDirChangesForPaths={this.discardWorkDirChangesForPaths}
               undoLastDiscard={this.undoLastDiscard}
               refreshResolutionProgress={this.refreshResolutionProgress}
+              changeProjectWorkingDirectory={this.props.changeProjectWorkingDirectory}
             />
           )}
         </PaneItem>
@@ -296,7 +298,9 @@ export default class RootController extends React.Component {
               ref={itemHolder.setter}
               repository={this.props.repository}
               loginModel={this.props.loginModel}
+              project={this.props.project}
               workspace={this.props.workspace}
+              changeProjectWorkingDirectory={this.props.changeProjectWorkingDirectory}
             />
           )}
         </PaneItem>

lib/github-package.js

@@ -175,9 +175,21 @@ export default class GithubPackage {
       return !!event.target.closest('.github-FilePatchListView').querySelector('.is-selected');
     };
 
+    const handleActivePaneChange = item => {
+      const activeRepository = this.getActiveRepository();
+      const activeRepositoryPath = activeRepository ? activeRepository.getWorkingDirectoryPath() : null;
+      this.scheduleActiveContextUpdate({activeRepositoryPath}, {item});
+    };
+
+    const handleProjectPathsChange = projectPaths => {
+      const activeRepository = this.getActiveRepository();
+      const activeRepositoryPath = activeRepository ? activeRepository.getWorkingDirectoryPath() : null;
+      this.scheduleActiveContextUpdate({activeRepositoryPath}, {projectPaths});
+    };
+
     this.subscriptions.add(
-      this.project.onDidChangePaths(this.scheduleActiveContextUpdate),
-      this.workspace.getCenter().onDidChangeActivePaneItem(this.scheduleActiveContextUpdate),
+      this.project.onDidChangePaths(handleProjectPathsChange),
+      this.workspace.getCenter().onDidStopChangingActivePaneItem(handleActivePaneChange),
       this.styleCalculator.startWatching(
         'github-package-styles',
         ['editor.fontSize', 'editor.fontFamily', 'editor.lineHeight', 'editor.tabLength'],
@@ -269,6 +281,10 @@ export default class GithubPackage {
       }));
     }
 
+    const changeProjectWorkingDirectory = projectWorkingDirectory => {
+      this.scheduleActiveContextUpdate({activeRepositoryPath: projectWorkingDirectory});
+    };
+
     this.renderFn(
       <RootController
         ref={c => { this.controller = c; }}
@@ -294,6 +310,7 @@ export default class GithubPackage {
         startOpen={this.startOpen}
         startRevealed={this.startRevealed}
         removeFilePatchItem={this.removeFilePatchItem}
+        changeProjectWorkingDirectory={changeProjectWorkingDirectory}
       />, this.element, callback,
     );
   }
@@ -486,25 +503,30 @@ export default class GithubPackage {
     return this.switchboard;
   }
 
-  async scheduleActiveContextUpdate(savedState = {}) {
+  /**
+   * Extras can be responses from subscribing to events
+   * For example, in `handleProjectPathsChange` extras contains the projectPaths changes,
+   * and in `handleActivePaneChange` extras contains the item changes.
+   */
+  async scheduleActiveContextUpdate(savedState = {}, extras = null) {
     this.switchboard.didScheduleActiveContextUpdate();
-    await this.activeContextQueue.push(this.updateActiveContext.bind(this, savedState), {parallel: false});
+    await this.activeContextQueue.push(this.updateActiveContext.bind(this, savedState, extras), {parallel: false});
   }
 
   /**
    * Derive the git working directory context that should be used for the package's git operations based on the current
    * state of the Atom workspace. In priority, this prefers:
    *
+   * - The preferred git working directory set by the user (This is also the working directory that was active when the
+   *   package was last serialized).
    * - A git working directory that contains the active pane item in the workspace's center.
    * - A git working directory corresponding to a single Project.
-   * - When initially activating the package, the working directory that was active when the package was last
-   *   serialized.
    * - The current context, unchanged, which may be a `NullWorkdirContext`.
    *
    * First updates the pool of resident contexts to match all git working directories that correspond to open
    * projects and pane items.
    */
-  async getNextContext(savedState) {
+  async getNextContext(savedState, extras) {
     const workdirs = new Set(
       await Promise.all(
         this.project.getPaths().map(async projectPath => {
@@ -530,39 +552,40 @@ export default class GithubPackage {
       return {itemPath, itemWorkdir};
     };
 
-    const active = await fromPaneItem(this.workspace.getCenter().getActivePaneItem());
-
     this.contextPool.set(workdirs, savedState);
 
+    if (savedState.activeRepositoryPath) {
+      // Preferred git directory (the preferred directory or the last serialized directory).
+      return this.contextPool.getContext(savedState.activeRepositoryPath);
+    }
+
+    const active = await fromPaneItem(this.workspace.getCenter().getActivePaneItem());
+
     if (active.itemPath) {
       // Prefer an active item
       return this.contextPool.getContext(active.itemWorkdir || active.itemPath);
     }
 
-    if (this.project.getPaths().length === 1) {
+    const projectPaths = this.project.getPaths();
+
+    if (projectPaths.length === 1) {
       // Single project
-      const projectPath = this.project.getPaths()[0];
+      const projectPath = projectPaths[0];
       const activeWorkingDir = await this.workdirCache.find(projectPath);
       return this.contextPool.getContext(activeWorkingDir || projectPath);
     }
 
-    if (this.project.getPaths().length === 0 && !this.activeContext.getRepository().isUndetermined()) {
+    if (projectPaths.length === 0 && !this.activeContext.getRepository().isUndetermined()) {
       // No projects. Revert to the absent context unless we've guessed that more projects are on the way.
       return WorkdirContext.absent({pipelineManager: this.pipelineManager});
     }
 
-    // Restore models from saved state. Will return a NullWorkdirContext if this path is not presently
-    // resident in the pool.
-    const savedWorkingDir = savedState.activeRepositoryPath;
-    if (savedWorkingDir) {
-      return this.contextPool.getContext(savedWorkingDir);
-    }
-
     return this.activeContext;
   }
 
-  setActiveContext(nextActiveContext) {
-    if (nextActiveContext !== this.activeContext) {
+  setActiveContext(nextActiveContext, extras) {
+    // Always update rendering when paths change.
+    if (nextActiveContext !== this.activeContext || (extras && extras.projectPaths)) {
       if (this.activeContext === this.guessedContext) {
         this.guessedContext.destroy();
         this.guessedContext = null;
@@ -577,15 +600,15 @@ export default class GithubPackage {
     }
   }
 
-  async updateActiveContext(savedState = {}) {
+  async updateActiveContext(savedState = {}, extras = null) {
     if (this.workspace.isDestroyed()) {
       return;
     }
 
     this.switchboard.didBeginActiveContextUpdate();
 
-    const nextActiveContext = await this.getNextContext(savedState);
-    this.setActiveContext(nextActiveContext);
+    const nextActiveContext = await this.getNextContext(savedState, extras);
+    this.setActiveContext(nextActiveContext, extras);
   }
 
   async refreshAtomGitRepository(workdir) {

lib/views/git-tab-view.js

@@ -4,6 +4,7 @@ import cx from 'classnames';
 import {CompositeDisposable} from 'atom';
 
 import StagingView from './staging-view';
+import HeaderView from './header-view';
 import CommitController from '../controllers/commit-controller';
 import RecentCommitsController from '../controllers/recent-commits-controller';
 import RefHolder from '../models/ref-holder';
@@ -60,6 +61,7 @@ export default class GitTabView extends React.Component {
     attemptFileStageOperation: PropTypes.func.isRequired,
     discardWorkDirChangesForPaths: PropTypes.func.isRequired,
     openFiles: PropTypes.func.isRequired,
+    changeProjectWorkingDirectory: PropTypes.func.isRequired,
   };
 
   constructor(props, context) {
@@ -141,6 +143,11 @@ export default class GitTabView extends React.Component {
           className={cx('github-Git', {'is-loading': isLoading})}
           tabIndex="-1"
           ref={this.props.refRoot.setter}>
+          <HeaderView
+            handleProjectSelect={e => this.props.changeProjectWorkingDirectory(e.target.value)}
+            currentProject={this.props.workingDirectoryPath}
+            projectPaths={this.props.project.getPaths()}
+          />
           <StagingView
             ref={this.props.refStagingView.setter}
             commands={this.props.commands}

lib/views/github-tab-view.js

@@ -7,10 +7,12 @@ import {
 } from '../prop-types';
 import LoadingView from './loading-view';
 import RemoteSelectorView from './remote-selector-view';
+import HeaderView from './header-view';
 import RemoteContainer from '../containers/remote-container';
 
 export default class GitHubTabView extends React.Component {
   static propTypes = {
+    project: PropTypes.object.isRequired,
     workspace: PropTypes.object.isRequired,
     remoteOperationObserver: OperationStateObserverPropType.isRequired,
     loginModel: GithubLoginModelPropType.isRequired,
@@ -28,11 +30,17 @@ export default class GitHubTabView extends React.Component {
 
     handlePushBranch: PropTypes.func.isRequired,
     handleRemoteSelect: PropTypes.func.isRequired,
+    changeProjectWorkingDirectory: PropTypes.func.isRequired,
   }
 
   render() {
     return (
       <div className="github-GitHub" ref={this.props.rootHolder.setter}>
+        <HeaderView
+          handleProjectSelect={e => this.props.changeProjectWorkingDirectory(e.target.value)}
+          currentProject={this.props.workingDirectory}
+          projectPaths={this.props.project.getPaths()}
+        />
         <div className="github-GitHub-content">
           {this.renderRemote()}
         </div>

lib/views/header-view.js

@@ -0,0 +1,32 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import path from 'path';
+
+export default class HeaderView extends React.Component {
+  static propTypes = {
+    currentProject: PropTypes.string,
+    projectPaths: PropTypes.arrayOf(PropTypes.string),
+
+    handleProjectSelect: PropTypes.func.isRequired,
+  }
+
+  render() {
+    return (
+      <header className="github-Project">
+        <select className="github-Project-path input-select"
+          value={this.props.currentProject}
+          onChange={this.props.handleProjectSelect}>
+          {this.renderProjects()}
+        </select>
+      </header>
+    );
+  }
+
+  renderProjects = () => {
+    const projects = [];
+    for (const projectPath of this.props.projectPaths) {
+      projects.push(<option key={projectPath} value={projectPath}>{path.basename(projectPath)}</option>);
+    }
+    return projects;
+  };
+}

styles/project.less

@@ -0,0 +1,13 @@
+@import "variables";
+
+.github-Project {
+  display: flex;
+  align-items: center;
+  padding: @component-padding/2 @component-padding;
+  border-bottom: 1px solid @base-border-color;
+
+  &-path {
+    flex: 1;
+  }
+
+}