Closes #599 - adds (un)stage directory support

Limits stage/unstage to working tree folders
Adds stage/unstage to the folder's inline toolbar
Adds recognition for Tony Brix's contribution

Author: eamodio

CHANGELOG.md

@@ -11,6 +11,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 - Adds favoriting of repositories and branches in the _Repositories_ view to allow for better (user-customized) sorting
 - Adds _Set as Default_ and _Unset as Default_ commands to remotes in the _Repositories_ view to specify the default remote selection when using the _Open \* in Remote_ commands — closes [#504](https://github.com/eamodio/vscode-gitlens/issues/504)
 - Adds the ability to turn on file annotations (blame, heatmap, and recent changes) via user-defined modes — closes [#542](https://github.com/eamodio/vscode-gitlens/issues/542)
+- Adds the ability to stage and unstage files by folders in the _Repositories_ view — closes [#599](https://github.com/eamodio/vscode-gitlens/issues/599) thanks to [PR #600](https://github.com/eamodio/vscode-gitlens/pull/600) by Tony Brix ([@UziTech](https://github.com/UziTech))
+  - Adds _Stage All Changes_ and _Unstage All Changes_ commands to folders in the _Repositories_ view
 
 ## [9.2.4] - 2018-12-26
 

README.md

@@ -896,6 +896,7 @@ Add [`"gitlens.insiders": true`](#general-settings- 'Jump to GitLens settings')
 A big thanks to the people that have contributed to this project:
 
 - Loris Bettazza ([@Pustur](https://github.com/Pustur)) — [contributions](https://github.com/eamodio/vscode-gitlens/commits?author=Pustur)
+- Tony Brix ([@UziTech](https://github.com/UziTech)) — [contributions](https://github.com/eamodio/vscode-gitlens/commits?author=UziTech)
 - Amanda Cameron ([@AmandaCameron](https://github.com/AmandaCameron)) — [contributions](https://github.com/eamodio/vscode-gitlens/commits?author=AmandaCameron)
 - Brett Cannon ([@brettcannon](https://github.com/brettcannon)) — [contributions](https://github.com/eamodio/vscode-gitlens/commits?author=brettcannon)
 - Ash Clarke ([@ashclarke](https://github.com/ashclarke)) — [contributions](https://github.com/eamodio/vscode-gitlens/commits?author=ashclarke)

package.json

@@ -4453,23 +4453,33 @@
                     "group": "8_gitlens"
                 },
                 {
-                    "command": "gitlens.views.expandNode",
-                    "when": "view =~ /^gitlens\\.views\\./ && viewItem =~ /gitlens:(compare|folder|results|search|status:files)\\b/",
-                    "group": "8_gitlens@1"
+                    "command": "gitlens.views.stageDirectory",
+                    "when": "viewItem =~ /gitlens:folder\\b.*?\\+working\\b.*?/",
+                    "group": "inline@1"
+                },
+                {
+                    "command": "gitlens.views.unstageDirectory",
+                    "when": "viewItem =~ /gitlens:folder\\b.*?\\+working\\b.*?/",
+                    "group": "inline@2"
                 },
                 {
                     "command": "gitlens.views.stageDirectory",
-                    "when": "view =~ /^gitlens\\.views\\./ && viewItem =~ /gitlens:folder\\b/",
-                    "group": "7_gitlens@1"
+                    "when": "viewItem =~ /gitlens:folder\\b.*?\\+working\\b.*?/",
+                    "group": "1_gitlens@1"
                 },
                 {
                     "command": "gitlens.views.unstageDirectory",
-                    "when": "view =~ /^gitlens\\.views\\./ && viewItem =~ /gitlens:folder\\b/",
-                    "group": "7_gitlens@2"
+                    "when": "viewItem =~ /gitlens:folder\\b.*?\\+working\\b.*?/",
+                    "group": "1_gitlens@2"
+                },
+                {
+                    "command": "gitlens.views.expandNode",
+                    "when": "viewItem =~ /gitlens:(compare|folder|results|search|status:files)\\b/",
+                    "group": "8_gitlens@1"
                 },
                 {
                     "command": "gitlens.views.refreshNode",
-                    "when": "view =~ /^gitlens\\.views\\./ && viewItem =~ /gitlens:(?!file\\b)/",
+                    "when": "viewItem =~ /gitlens:(?!file\\b)/",
                     "group": "9_gitlens@1"
                 }
             ]

src/git/git.ts

@@ -315,8 +315,8 @@ export class Git {
 
     // Git commands
 
-    static add(repoPath: string | undefined, fileName: string) {
-        return git<string>({ cwd: repoPath }, 'add', '-A', '--', fileName);
+    static add(repoPath: string | undefined, pathspec: string) {
+        return git<string>({ cwd: repoPath }, 'add', '-A', '--', pathspec);
     }
 
     static apply(repoPath: string | undefined, patch: string, options: { allowConflicts?: boolean } = {}) {

src/views/nodes/folderNode.ts

@@ -23,6 +23,7 @@ export class FolderNode extends ViewNode<ViewWithFiles> {
         public readonly repoPath: string,
         public readonly folderName: string,
         public readonly root: Arrays.IHierarchicalItem<FileNode>,
+        private readonly containsWorkingFiles?: boolean,
         public readonly relativePath?: string
     ) {
         super(GitUri.fromRepoPath(repoPath), view, parent);
@@ -43,7 +44,15 @@ export class FolderNode extends ViewNode<ViewWithFiles> {
             for (const folder of Objects.values(this.root.children)) {
                 if (folder.value === undefined) {
                     children.push(
-                        new FolderNode(this.view, this, this.repoPath, folder.name, folder, folder.relativePath)
+                        new FolderNode(
+                            this.view,
+                            this,
+                            this.repoPath,
+                            folder.name,
+                            folder,
+                            this.containsWorkingFiles,
+                            folder.relativePath
+                        )
                     );
                     continue;
                 }
@@ -72,6 +81,9 @@ export class FolderNode extends ViewNode<ViewWithFiles> {
         // TODO: Change this to expanded once https://github.com/Microsoft/vscode/issues/30918 is fixed
         const item = new TreeItem(this.label, TreeItemCollapsibleState.Collapsed);
         item.contextValue = ResourceType.Folder;
+        if (this.containsWorkingFiles) {
+            item.contextValue += `+working`;
+        }
         item.iconPath = ThemeIcon.Folder;
         item.tooltip = this.label;
         return item;

src/views/nodes/statusFilesNode.ts

@@ -98,7 +98,7 @@ export class StatusFilesNode extends ViewNode<RepositoriesView> {
                 this.view.config.files.compact
             );
 
-            const root = new FolderNode(this.view, this, repoPath, '', hierarchy);
+            const root = new FolderNode(this.view, this, repoPath, '', hierarchy, true);
             children = (await root.getChildren()) as FileNode[];
         }
         else {

src/views/viewCommands.ts

@@ -98,10 +98,10 @@ export class ViewCommands implements Disposable {
         commands.registerCommand('gitlens.views.applyChanges', this.applyChanges, this);
         commands.registerCommand('gitlens.views.checkout', this.checkout, this);
 
-        commands.registerCommand('gitlens.views.stageFile', this.stageFile, this);
         commands.registerCommand('gitlens.views.stageDirectory', this.stageDirectory, this);
-        commands.registerCommand('gitlens.views.unstageFile', this.unstageFile, this);
+        commands.registerCommand('gitlens.views.stageFile', this.stageFile, this);
         commands.registerCommand('gitlens.views.unstageDirectory', this.unstageDirectory, this);
+        commands.registerCommand('gitlens.views.unstageFile', this.unstageFile, this);
 
         commands.registerCommand('gitlens.views.compareAncestryWithWorking', this.compareAncestryWithWorking, this);
         commands.registerCommand('gitlens.views.compareWithHead', this.compareWithHead, this);
@@ -471,24 +471,28 @@ export class ViewCommands implements Disposable {
         if (!(node instanceof FolderNode) || !node.relativePath) return;
 
         void (await Container.git.stageDirectory(node.repoPath, node.relativePath));
+        void node.triggerChange();
     }
 
     private async stageFile(node: CommitFileNode | StatusFileNode) {
         if (!(node instanceof CommitFileNode) && !(node instanceof StatusFileNode)) return;
 
         void (await Container.git.stageFile(node.repoPath, node.file.fileName));
+        void node.triggerChange();
     }
 
     private async unstageDirectory(node: FolderNode) {
         if (!(node instanceof FolderNode) || !node.relativePath) return;
 
         void (await Container.git.unStageDirectory(node.repoPath, node.relativePath));
+        void node.triggerChange();
     }
 
     private async unstageFile(node: CommitFileNode | StatusFileNode) {
         if (!(node instanceof CommitFileNode) && !(node instanceof StatusFileNode)) return;
 
         void (await Container.git.unStageFile(node.repoPath, node.file.fileName));
+        void node.triggerChange();
     }
 
     private star(node: BranchNode | RepositoryNode) {