put is_current_branch field back; fixed all jest tests

Author: telamonian

babel.config.js

@@ -1,4 +1,5 @@
 module.exports = {
+  "sourceMap": "inline",
   presets: [
     [
       '@babel/preset-env',

jest.config.js

@@ -3,6 +3,7 @@ var tsConfig = require ('./tsconfig.json');
 var tsOptions = tsConfig["compilerOptions"];
 // Need as the test folder is not visible from the src folder
 tsOptions["rootDir"] = null;
+tsOptions["inlineSourceMap"] = true;
 
 module.exports = {
   automock: false,

jupyterlab_git/git.py

@@ -398,15 +398,18 @@ def branch_heads(self, current_path):
             try:
                 for name,commit_sha,upstream_name,is_current_branch in (line.split('\t') for line in output.decode("utf-8").splitlines()):
                     # Format reference : https://git-scm.com/docs/git-for-each-ref#_field_names
+                    is_current_branch = bool(is_current_branch.strip())
+
                     branch = {
+                        "is_current_branch": is_current_branch,
                         "is_remote_branch": False,
                         "name": name,
                         "upstream": upstream_name if upstream_name else None,
                         "top_commit": commit_sha,
                         "tag": None,
                     }
                     results.append(branch)
-                    if is_current_branch.strip():
+                    if is_current_branch:
                         current_branch = branch
 
                 # Remote branch is seleted use 'git branch -a' as fallback machanism
@@ -415,6 +418,7 @@ def branch_heads(self, current_path):
                 # when the remote branch is seleted, VS Code git does the same thing.
                 if not current_branch and self.get_current_branch(current_path) == "HEAD":
                     branch = {
+                        "is_current_branch": True,
                         "is_remote_branch": False,
                         "name": self._get_detached_head_name(current_path),
                         "upstream": None,
@@ -458,6 +462,7 @@ def branch_remotes(self, current_path):
                 for name,commit_sha in (line.split('\t') for line in output.decode("utf-8").splitlines()):
                     # Format reference : https://git-scm.com/docs/git-for-each-ref#_field_names
                     results.append({
+                        "is_current_branch": False,
                         "is_remote_branch": True,
                         "name": name,
                         "upstream": None,

jupyterlab_git/tests/test_branch.py

@@ -423,34 +423,39 @@ def test_branch_success(mock_subproc_popen):
         'code': 0,
         'branches': [
             {
+                'is_current_branch': True,
                 'is_remote_branch': False,
                 'name': 'feature-foo',
                 'upstream': 'origin/feature-foo',
                 'top_commit': 'abcdefghijklmnopqrstuvwxyz01234567890123',
                 'tag': None,
             },
             {
+                'is_current_branch': False,
                 'is_remote_branch': False,
                 'name': 'master',
                 'upstream': 'origin/master',
                 'top_commit': 'abcdefghijklmnopqrstuvwxyz01234567890123',
                 'tag': None,
             },
             {
+                'is_current_branch': False,
                 'is_remote_branch': False,
                 'name': 'feature-bar',
                 'upstream': None,
                 'top_commit': '01234567899999abcdefghijklmnopqrstuvwxyz',
                 'tag': None
             },
             {
+                'is_current_branch': False,
                 'is_remote_branch': True,
                 'name': 'origin/feature-foo',
                 'upstream': None,
                 'top_commit': 'abcdefghijklmnopqrstuvwxyz01234567890123',
                 'tag': None,
             },
             {
+                'is_current_branch': False,
                 'is_remote_branch': True,
                 'name': 'origin/master',
                 'upstream': None,
@@ -459,6 +464,7 @@ def test_branch_success(mock_subproc_popen):
             }
         ],
         'current_branch': {
+            'is_current_branch': True,
             'is_remote_branch': False,
             'name': 'feature-foo',
             'upstream': 'origin/feature-foo',
@@ -563,20 +569,23 @@ def test_branch_success_detached_head(mock_subproc_popen):
         'code': 0,
         'branches': [
             {
+                'is_current_branch': False,
                 'is_remote_branch': False,
                 'name': 'master',
                 'upstream': 'origin/master',
                 'top_commit': 'abcdefghijklmnopqrstuvwxyz01234567890123',
                 'tag': None,
             },
             {
+                'is_current_branch': True,
                 'is_remote_branch': False,
                 'name': '(HEAD detached at origin/feature-foo)',
                 'upstream': None,
                 'top_commit': None,
                 'tag': None,
             },
             {
+                'is_current_branch': False,
                 'is_remote_branch': True,
                 'name': 'origin/feature-foo',
                 'upstream': None,
@@ -585,6 +594,7 @@ def test_branch_success_detached_head(mock_subproc_popen):
             }
         ],
         'current_branch': {
+            'is_current_branch': True,
             'is_remote_branch': False,
             'name': '(HEAD detached at origin/feature-foo)',
             'upstream': None,

src/components/PastCommitNode.tsx

@@ -88,7 +88,7 @@ export class PastCommitNode extends React.Component<
         <div className={branchesStyle}>
           {this.getBranchesForCommit().map((branch, id) => (
             <React.Fragment key={id}>
-              {branch.name === this.props.model.currentBranch.name && (
+              {branch.is_current_branch && (
                 <span className={classes(branchStyle, workingBranchStyle)}>
                   working
                 </span>

src/model.ts

@@ -454,8 +454,10 @@ export class GitExtension implements IGitExtension, IDisposable {
       this._branches = response.branches;
       this._currentBranch = response.current_branch;
 
-      // set up the marker obj for this particular repo/branch
-      this._setMarker(this.pathRepository, this._currentBranch.name);
+      if (this._currentBranch) {
+        // set up the marker obj for the current (valid) repo/branch combination
+        this._setMarker(this.pathRepository, this._currentBranch.name);
+      }
     } else {
       this._branches = [];
       this._currentBranch = null;

src/tokens.ts

@@ -313,6 +313,7 @@ export namespace Git {
    * Branch description interface
    */
   export interface IBranch {
+    is_current_branch: boolean;
     is_remote_branch: boolean;
     name: string;
     upstream: string;

tests/GitExtension.spec.tsx

@@ -21,6 +21,14 @@ describe('IGitExtension', () => {
     jest.restoreAllMocks();
 
     mockResponses = {
+      '/git/branch': {
+        body: request =>
+          JSON.stringify({
+            code: 0,
+            branches: [],
+            current_branch: null
+          })
+      },
       '/git/show_top_level': {
         body: request =>
           JSON.stringify({
@@ -33,6 +41,13 @@ describe('IGitExtension', () => {
           JSON.stringify({
             server_root: fakeRoot
           })
+      },
+      '/git/status': {
+        body: () =>
+          JSON.stringify({
+            code: 0,
+            files: []
+          })
       }
     };
 

tests/test-components/FileList.spec.tsx

@@ -15,7 +15,8 @@ describe('FileList', () => {
     renderMime: null,
     stagedFiles: [],
     unstagedFiles: [],
-    untrackedFiles: []
+    untrackedFiles: [],
+    settings: null
   };
 
   describe('#commitAllStagedFiles()', () => {