Functionality to revert changes for a folder

Author: StanleyGoldman

src/GitHub.Api/Git/IRepository.cs

@@ -18,8 +18,7 @@ public interface IRepository : IEquatable<IRepository>
         ITask Revert(string changeset);
         ITask RequestLock(string file);
         ITask ReleaseLock(string file, bool force);
-        ITask DiscardChanges(List<GitStatusEntry> files);
-
+        ITask DiscardChanges(GitStatusEntry[] discardEntries);
         void CheckLogChangedEvent(CacheUpdateEvent gitLogCacheUpdateEvent);
         void CheckStatusChangedEvent(CacheUpdateEvent cacheUpdateEvent);
         void CheckStatusEntriesChangedEvent(CacheUpdateEvent cacheUpdateEvent);

src/GitHub.Api/Git/Repository.cs

@@ -112,9 +112,9 @@ public ITask ReleaseLock(string file, bool force)
             return repositoryManager.UnlockFile(file, force);
         }
 
-        public ITask DiscardChanges(List<GitStatusEntry> files)
+        public ITask DiscardChanges(GitStatusEntry[] gitStatusEntry)
         {
-            return repositoryManager.DiscardChanges(files);
+            return repositoryManager.DiscardChanges(gitStatusEntry);
         }
 
         public void CheckLogChangedEvent(CacheUpdateEvent cacheUpdateEvent)

src/GitHub.Api/Git/RepositoryManager.cs

@@ -17,6 +17,7 @@ public interface IRepositoryManager : IDisposable
         event Action<List<GitLogEntry>> GitLogUpdated;
         event Action<Dictionary<string, ConfigBranch>> LocalBranchesUpdated;
         event Action<Dictionary<string, ConfigRemote>, Dictionary<string, Dictionary<string, ConfigBranch>>> RemoteBranchesUpdated;
+        event Action<GitAheadBehindStatus> GitAheadBehindStatusUpdated;
 
         void Initialize();
         void Start();
@@ -35,7 +36,7 @@ public interface IRepositoryManager : IDisposable
         ITask CreateBranch(string branch, string baseBranch);
         ITask LockFile(string file);
         ITask UnlockFile(string file, bool force);
-        ITask DiscardChanges(List<GitStatusEntry> files);
+        ITask DiscardChanges(GitStatusEntry[] gitStatusEntries);
         void UpdateGitLog();
         void UpdateGitStatus();
         void UpdateGitAheadBehindStatus();
@@ -45,7 +46,6 @@ public interface IRepositoryManager : IDisposable
         IGitConfig Config { get; }
         IGitClient GitClient { get; }
         bool IsBusy { get; }
-        event Action<GitAheadBehindStatus> GitAheadBehindStatusUpdated;
     }
 
     interface IRepositoryPathConfiguration
@@ -292,56 +292,55 @@ public void UpdateGitStatus()
             task.Start();
         }
 
-        public ITask DiscardChanges(List<GitStatusEntry> files)
+        public ITask DiscardChanges(GitStatusEntry[] gitStatusEntries)
         {
-            var itemsToDelete = files
-                .Where(entry => entry.status == GitFileStatus.Added
-                    || entry.status == GitFileStatus.Untracked)
-                .Select(entry => entry.path)
-                .ToArray();
+            Guard.ArgumentNotNullOrEmpty(gitStatusEntries, "gitStatusEntries");
+
+            var itemsToDelete = new List<string>();
+            var itemsToRevert = new List<string>();
+
+            foreach (var gitStatusEntry in gitStatusEntries)
+            {
+                if (gitStatusEntry.status == GitFileStatus.Added || gitStatusEntry.status == GitFileStatus.Untracked)
+                {
+                    itemsToDelete.Add(gitStatusEntry.path);
+                }
+                else
+                {
+                    itemsToRevert.Add(gitStatusEntry.path);
+                }
+            }
 
             ActionTask deleteItemsTask = null;
             if (itemsToDelete.Any())
             {
                 deleteItemsTask = new ActionTask(CancellationToken.None, () => {
-                    for (var index = 0; index < itemsToDelete.Length; index++)
+                    foreach (var itemToDelete in itemsToDelete)
                     {
-                        var itemToDelete = itemsToDelete[index];
                         fileSystem.FileDelete(itemToDelete);
                     }
                 });
             }
 
-            var itemsToRevert = files
-                .Where(entry => entry.status == GitFileStatus.Modified
-                    || entry.status == GitFileStatus.Deleted
-                    || entry.status == GitFileStatus.Renamed)
-                .Select(entry => entry.path)
-                .ToArray();
-
             ITask<string> gitDiscardTask = null;
             if (itemsToRevert.Any())
             {
                 gitDiscardTask = GitClient.Discard(itemsToRevert);
             }
 
             ITask task;
-            if(deleteItemsTask != null && gitDiscardTask != null)
+            if (deleteItemsTask != null && gitDiscardTask != null)
             {
                 task = deleteItemsTask.Then(gitDiscardTask);
             }
             else if (deleteItemsTask != null)
             {
                 task = deleteItemsTask;
             }
-            else if (gitDiscardTask != null)
+            else //if (gitDiscardTask != null)
             {
                 task = gitDiscardTask;
             }
-            else
-            {
-                throw new NotImplementedException();
-            }
 
             return HookupHandlers(task, true, true);
         }

src/GitHub.Api/UI/TreeBase.cs

@@ -290,6 +290,33 @@ private void ToggleChildrenChecked(int idx, TNode node, bool isChecked)
             }
         }
 
+        public List<TNode> GetLeafNodes(TNode parentNode)
+        {
+            var index = Nodes.IndexOf(parentNode);
+            return GetLeafNodes(parentNode, index);
+        }
+
+        private List<TNode> GetLeafNodes(TNode node, int idx)
+        {
+            var results = new List<TNode>();
+            for (var i = idx + 1; i < Nodes.Count && node.Level < Nodes[i].Level; i++)
+            {
+                var childNode = Nodes[i];
+                if (childNode.IsFolder)
+                {
+                    var leafNodes = GetLeafNodes(childNode, i);
+                    results.AddRange(leafNodes);
+                }
+                else
+                {
+                    results.Add(childNode);
+                }
+            }
+
+            return results;
+        }
+
+
         private void ToggleParentFoldersChecked(int idx, TNode node, bool isChecked)
         {
             while (true)

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ChangesView.cs

@@ -160,29 +160,29 @@ private void OnTreeGUI(Rect rect)
         private GenericMenu CreateContextMenu(ChangesTreeNode node)
         {
             var genericMenu = new GenericMenu();
-            var canDiscard = false;
 
-            if (!node.isFolder)
+            if (discardGuiContent == null)
             {
-                canDiscard = node.GitFileStatus == GitFileStatus.Added
-                    || node.GitFileStatus == GitFileStatus.Modified
-                    || node.GitFileStatus == GitFileStatus.Deleted
-                    || node.GitFileStatus == GitFileStatus.Renamed
-                    || node.GitFileStatus == GitFileStatus.Untracked;
+                discardGuiContent = new GUIContent("Discard");
             }
 
-            if (canDiscard)
-            {
-                if (discardGuiContent == null)
+            genericMenu.AddItem(discardGuiContent, false, () => {
+                GitStatusEntry[] discardEntries;
+                if (node.isFolder)
+                {
+                    discardEntries = treeChanges
+                        .GetLeafNodes(node)
+                        .Select(treeNode => treeNode.GitStatusEntry)
+                        .ToArray();
+                }
+                else
                 {
-                    discardGuiContent = new GUIContent("Discard");
+                    discardEntries = new [] { node.GitStatusEntry };
                 }
 
-                genericMenu.AddItem(discardGuiContent, false, () => {
-                    Repository.DiscardChanges(new List<GitStatusEntry> { node.GitStatusEntry })
-                        .Start();
-                });
-            }
+                Repository.DiscardChanges(discardEntries)
+                          .Start();
+            });
 
             return genericMenu;
         }