Skip to content

Commit 99bea89

Browse files
authored
Merge branch 'master' into asynchronous-git-cmds
2 parents bb70741 + 14a4e9a commit 99bea89

36 files changed

+3035
-1060
lines changed

jupyterlab_git/git.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -651,11 +651,11 @@ async def reset_to_commit(self, commit_id, top_repo_path):
651651
return {"code": code, "command": " ".join(cmd), "message": error}
652652
return {"code": code}
653653

654-
async def checkout_new_branch(self, branchname, current_path):
654+
async def checkout_new_branch(self, branchname, startpoint, current_path):
655655
"""
656656
Execute git checkout <make-branch> command & return the result.
657657
"""
658-
cmd = ["git", "checkout", "-b", branchname]
658+
cmd = ["git", "checkout", "-b", branchname, startpoint]
659659
code, my_output, my_error = await execute(
660660
cmd, cwd=os.path.join(self.root_dir, current_path),
661661
)

jupyterlab_git/handlers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ async def post(self):
321321
if data["checkout_branch"]:
322322
if data["new_check"]:
323323
body = await self.git.checkout_new_branch(
324-
data["branchname"], top_repo_path
324+
data["branchname"], data["startpoint"], top_repo_path
325325
)
326326
else:
327327
body = await self.git.checkout_branch(data["branchname"], top_repo_path)

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@
5858
"@jupyterlab/services": "^4.1.0",
5959
"@jupyterlab/terminal": "^1.1.0",
6060
"@jupyterlab/ui-components": "^1.1.0",
61+
"@material-ui/core": "^4.8.2",
62+
"@material-ui/icons": "^4.5.1",
6163
"@phosphor/widgets": "^1.8.0",
6264
"diff-match-patch": "^1.0.4",
6365
"nbdime": "~5.0.1",

src/components/BranchHeader.tsx

Lines changed: 0 additions & 213 deletions
This file was deleted.

0 commit comments

Comments
 (0)