Merge pull request #561 from ianhi/fix_add_all_

Fix add_all_untracked and add_all_unstaged

Author: telamonian

jupyterlab_git/git.py

@@ -589,18 +589,22 @@ async def add_all_unstaged(self, top_repo_path):
 
         if code != 0:
             return {"code": code, "command": " ".join(cmd), "message": error}
-        return {"result": code}
+        return {"code": code}
 
     async def add_all_untracked(self, top_repo_path):
         """
-        Execute git add all untracked command & return the result.
+        Find all untracked files, execute git add & return the result.
         """
-        cmd = ["echo", "a\n*\nq\n", "|", "git", "add", "-i"]
-        code, _, error = await execute(cmd, cwd=top_repo_path)
+        status = await self.status(top_repo_path)
+        if status["code"] != 0:
+            return status
 
-        if code != 0:
-            return {"code": code, "command": " ".join(cmd), "message": error}
-        return {"code": code}
+        untracked = []
+        for f in status["files"]:
+            if f["x"]=="?" and f["y"]=="?":
+                untracked.append(f["from"].strip('"'))
+
+        return await self.add(untracked, top_repo_path)
 
     async def reset(self, filename, top_repo_path):
         """

src/model.ts

@@ -266,6 +266,8 @@ export class GitExtension implements IGitExtension {
         const data = await response.json();
         throw new ServerConnection.ResponseError(response, data.message);
       }
+
+      this.refreshStatus();
       return response.json();
     } catch (err) {
       throw new ServerConnection.NetworkError(err);
@@ -299,6 +301,7 @@ export class GitExtension implements IGitExtension {
         const data = await response.json();
         throw new ServerConnection.ResponseError(response, data.message);
       }
+
       this.refreshStatus();
       return response.json();
     } catch (err) {