Merge pull request #518 from kgryte/refactor-branch-dropdown

Refactor branch menu
jupyterlab · Feb 14, 2020 · 14a4e9a · 14a4e9a
2 parents 576c444 + f75c2a6
commit 14a4e9a
Show file tree

Hide file tree

Showing 36 changed files with 3,036 additions and 1,060 deletions.
diff --git a/jupyterlab_git/git.py b/jupyterlab_git/git.py
@@ -606,12 +606,13 @@ def reset_to_commit(self, commit_id, top_repo_path):
         )
         return my_output
 
-    def checkout_new_branch(self, branchname, current_path):
+    def checkout_new_branch(self, branchname, startpoint, current_path):
         """
         Execute git checkout <make-branch> command & return the result.
         """
+        cmd = ["git", "checkout", "-b", branchname, startpoint]
         p = Popen(
-            ["git", "checkout", "-b", branchname],
+            cmd,
             stdout=PIPE,
             stderr=PIPE,
             cwd=os.path.join(self.root_dir, current_path),

diff --git a/jupyterlab_git/handlers.py b/jupyterlab_git/handlers.py
@@ -320,7 +320,7 @@ def post(self):
         if data["checkout_branch"]:
             if data["new_check"]:
                 my_output = self.git.checkout_new_branch(
-                    data["branchname"], top_repo_path
+                    data["branchname"], data["startpoint"], top_repo_path
                 )
             else:
                 my_output = self.git.checkout_branch(data["branchname"], top_repo_path)

diff --git a/package.json b/package.json
@@ -58,6 +58,8 @@
     "@jupyterlab/services": "^4.1.0",
     "@jupyterlab/terminal": "^1.1.0",
     "@jupyterlab/ui-components": "^1.1.0",
+    "@material-ui/core": "^4.8.2",
+    "@material-ui/icons": "^4.5.1",
     "@phosphor/widgets": "^1.8.0",
     "diff-match-patch": "^1.0.4",
     "nbdime": "~5.0.1",

diff --git a/src/components/BranchHeader.tsx b/src/components/BranchHeader.tsx