Add handler to delete a branch

Author: fcollonval

jupyterlab_git/git.py

@@ -497,6 +497,15 @@ async def branch(self, current_path):
             "current_branch": heads["current_branch"],
         }
 
+    async def branch_delete(self, current_path, branch):
+        """Execute 'git branch -D <branchname>'"""
+        cmd = ["git", "branch", "-D", branch]
+        code, _, error = await execute(
+            cmd, cwd=os.path.join(self.root_dir, current_path)
+        )
+        if code != 0:
+            return {"code": code, "command": " ".join(cmd), "message": error}
+
     async def branch_heads(self, current_path):
         """
         Execute 'git for-each-ref' command on refs/heads & return the result.

jupyterlab_git/handlers.py

@@ -234,6 +234,31 @@ async def post(self):
         self.finish(json.dumps(result))
 
 
+class GitBranchDeleteHandler(GitHandler):
+    """
+    Handler for 'git branch -D <branch>'
+    """
+
+    @web.authenticated
+    async def post(self):
+        """
+        POST request handler, delete branch in current repository.
+
+        Body: {
+            "current_path": Git repository path relatively to the server root,
+            "branch": Branch name to be deleted
+        }
+        """
+        data = self.get_json_body()
+        result = await self.git.delete_branch(data["current_path"], data["branch"])
+
+        if result["code"] != 0:
+            self.set_status(500)
+            self.finish(json.dumps(result))
+        else:
+            self.set_status(204)
+
+
 class GitAddHandler(GitHandler):
     """
     Handler for git add <filename>'.
@@ -747,6 +772,7 @@ def setup_handlers(web_app):
         ("/git/add_all_untracked", GitAddAllUntrackedHandler),
         ("/git/all_history", GitAllHistoryHandler),
         ("/git/branch", GitBranchHandler),
+        ("/git/branch_delete", GitBranchDeleteHandler),
         ("/git/changed_files", GitChangedFilesHandler),
         ("/git/checkout", GitCheckoutHandler),
         ("/git/clone", GitCloneHandler),