Merge pull request #450 from telamonian/fix-switch-new-branch

fixes #386: turn off by default overly agressive disabling of create branch/switch branch

Author: fcollonval

schema/plugin.json

@@ -5,23 +5,29 @@
   "description": "jupyterlab-git settings.",
   "type": "object",
   "properties": {
+    "disableBranchWithChanges": {
+      "type": "boolean",
+      "title": "Disable branch with changes",
+      "description": "Disable all branch operations (new, switch) when there are changed/staged files",
+      "default": false
+    },
     "historyCount": {
       "type": "integer",
       "title": "History count",
       "description": "Number of (most recent) commits shown in the history log",
       "default": 25
     },
-    "simpleStaging": {
-      "type": "boolean",
-      "title": "Simple staging flag",
-      "description": "If true, use a simplified concept of staging. Only files with changes are shown (instead of showing staged/changed/untracked), and all files with changes will be automatically staged",
-      "default": false
-    },
     "refreshInterval": {
       "type": "integer",
       "title": "Refresh interval",
       "description": "Number of milliseconds between polling the file system for changes.",
       "default": 3000
+    },
+    "simpleStaging": {
+      "type": "boolean",
+      "title": "Simple staging flag",
+      "description": "If true, use a simplified concept of staging. Only files with changes are shown (instead of showing staged/changed/untracked), and all files with changes will be automatically staged",
+      "default": false
     }
   }
 }

src/components/BranchHeader.tsx

@@ -50,15 +50,23 @@ export class BranchHeader extends React.Component<
 
   /** Switch current working branch */
   async switchBranch(branchName: string) {
-    await this.props.model.checkout({ branchname: branchName });
+    const result = await this.props.model.checkout({ branchname: branchName });
+    if (result.code !== 0) {
+      showErrorMessage('Error switching branch', result.message);
+    }
+
     this.toggleSelect();
   }
 
   createNewBranch = async (branchName: string) => {
-    await this.props.model.checkout({
+    const result = await this.props.model.checkout({
       newBranch: true,
       branchname: branchName
     });
+    if (result.code !== 0) {
+      showErrorMessage('Error creating new branch', result.message);
+    }
+
     this.toggleNewBranchBox();
   };
 

src/components/GitPanel.tsx

@@ -27,7 +27,6 @@ export interface IGitSessionNodeState {
   stagedFiles: Git.IStatusFileResult[];
   unstagedFiles: Git.IStatusFileResult[];
   untrackedFiles: Git.IStatusFileResult[];
-  hasChangedFiles: boolean;
 
   isHistoryVisible: boolean;
 }
@@ -51,7 +50,6 @@ export class GitPanel extends React.Component<
       branches: [],
       currentBranch: '',
       upstreamBranch: '',
-      hasChangedFiles: false,
       pastCommits: [],
       stagedFiles: [],
       unstagedFiles: [],
@@ -114,19 +112,13 @@ export class GitPanel extends React.Component<
       let stagedFiles = new Array<Git.IStatusFileResult>();
       let unstagedFiles = new Array<Git.IStatusFileResult>();
       let untrackedFiles = new Array<Git.IStatusFileResult>();
-      let changedFiles = 0;
       let statusFiles = this.props.model.status;
       if (statusFiles.length > 0) {
         for (let i = 0; i < statusFiles.length; i++) {
           const file = statusFiles[i];
           const { x, y } = file;
           const stage = decodeStage(x, y);
 
-          // If file has been changed
-          if (x !== '?' && x !== '!') {
-            changedFiles++;
-          }
-
           // If file is untracked
           if (stage === 'untracked') {
             untrackedFiles.push(file);
@@ -141,8 +133,7 @@ export class GitPanel extends React.Component<
       this.setState({
         stagedFiles: stagedFiles,
         unstagedFiles: unstagedFiles,
-        untrackedFiles: untrackedFiles,
-        hasChangedFiles: changedFiles > 0
+        untrackedFiles: untrackedFiles
       });
     }
   };
@@ -206,10 +197,11 @@ export class GitPanel extends React.Component<
             upstreamBranch={this.state.upstreamBranch}
             stagedFiles={this.state.stagedFiles}
             data={this.state.branches}
-            // No uncommitted changed files, allow switching branches
-            // No committed files ever, disable switching branches
             disabled={
-              this.state.hasChangedFiles || this.state.pastCommits.length === 0
+              this.state.pastCommits.length === 0 ||
+              (this.props.settings.composite[
+                'disableBranchWithChanges'
+              ] as boolean)
             }
             toggleSidebar={this.toggleSidebar}
             sideBarExpanded={this.state.isHistoryVisible}

src/model.ts

@@ -601,19 +601,15 @@ export class GitExtension implements IGitExtension, IDisposable {
    * If a filename is provided, check the file out
    * If nothing is provided, check all files out
    */
-  async checkout(options?: Git.ICheckoutOptions): Promise<Response> {
+  async checkout(options?: Git.ICheckoutOptions): Promise<Git.ICheckoutResult> {
     await this.ready;
     const path = this.pathRepository;
 
     if (path === null) {
-      return Promise.resolve(
-        new Response(
-          JSON.stringify({
-            code: -1,
-            message: 'Not in a git repository.'
-          })
-        )
-      );
+      return Promise.resolve({
+        code: -1,
+        message: 'Not in a git repository.'
+      });
     }
 
     const body = {
@@ -650,7 +646,7 @@ export class GitExtension implements IGitExtension, IDisposable {
       } else {
         this.refreshStatus();
       }
-      return response;
+      return response.json();
     } catch (err) {
       throw new ServerConnection.NetworkError(err);
     }

src/tokens.ts

@@ -147,7 +147,7 @@ export interface IGitExtension {
    *
    * @param options Checkout options
    */
-  checkout(options?: Git.ICheckoutOptions): Promise<Response>;
+  checkout(options?: Git.ICheckoutOptions): Promise<Git.ICheckoutResult>;
 
   /**
    * Make request to commit all staged files in repository
@@ -300,9 +300,8 @@ export namespace Git {
     filename?: string;
   }
 
-  /** Interface for GitShowPrefix request result,
-   * has the prefix path of a directory in a repository,
-   * with respect to the root directory.
+  /** Interface for GitCheckout request result.
+   * For reporting errors in checkout
    */
   export interface ICheckoutResult {
     code: number;
@@ -322,7 +321,7 @@ export namespace Git {
   }
 
   /** Interface for GitBranch request result,
-   * has the result of changing the current working branch
+   * has the result of fetching info on all branches
    */
   export interface IBranchResult {
     code: number;