Functionality to revert and delete

Author: StanleyGoldman

src/GitHub.Api/Application/ApplicationManagerBase.cs

@@ -128,7 +128,7 @@ public void RestartRepository()
         {
             if (Environment.RepositoryPath != null)
             {
-                repositoryManager = Unity.RepositoryManager.CreateInstance(Platform, TaskManager, GitClient, Environment.RepositoryPath);
+                repositoryManager = Unity.RepositoryManager.CreateInstance(Platform, TaskManager, GitClient, ProcessManager, Environment.RepositoryPath);
                 repositoryManager.Initialize();
                 Environment.Repository.Initialize(repositoryManager);
                 repositoryManager.Start();

src/GitHub.Api/Git/IRepository.cs

@@ -19,6 +19,7 @@ public interface IRepository : IEquatable<IRepository>
         ITask RequestLock(string file);
         ITask ReleaseLock(string file, bool force);
         ITask DiscardChanges(List<string> files);
+        ITask DeleteFiles(List<string> list);
 
         void CheckLogChangedEvent(CacheUpdateEvent gitLogCacheUpdateEvent);
         void CheckStatusChangedEvent(CacheUpdateEvent cacheUpdateEvent);

src/GitHub.Api/Git/Repository.cs

@@ -117,6 +117,11 @@ public ITask DiscardChanges(List<string> files)
             return repositoryManager.CheckoutFiles(files);
         }
 
+        public ITask DeleteFiles(List<string> list)
+        {
+            return repositoryManager.DeleteFiles(list);
+        }
+
         public void CheckLogChangedEvent(CacheUpdateEvent cacheUpdateEvent)
         {
             var managedCache = cacheContainer.GitLogCache;

src/GitHub.Api/Git/RepositoryManager.cs

@@ -36,6 +36,7 @@ public interface IRepositoryManager : IDisposable
         ITask LockFile(string file);
         ITask UnlockFile(string file, bool force);
         ITask CheckoutFiles(List<string> files);
+        ITask DeleteFiles(List<string> list);
         void UpdateGitLog();
         void UpdateGitStatus();
         void UpdateGitAheadBehindStatus();
@@ -97,6 +98,7 @@ class RepositoryManager : IRepositoryManager
     {
         private readonly IGitConfig config;
         private readonly IGitClient gitClient;
+        private readonly IProcessManager processManager;
         private readonly IRepositoryPathConfiguration repositoryPaths;
         private readonly IRepositoryWatcher watcher;
 
@@ -113,18 +115,19 @@ class RepositoryManager : IRepositoryManager
 
         public RepositoryManager(IGitConfig gitConfig,
             IRepositoryWatcher repositoryWatcher, IGitClient gitClient,
+            IProcessManager processManager,
             IRepositoryPathConfiguration repositoryPaths)
         {
             this.repositoryPaths = repositoryPaths;
             this.gitClient = gitClient;
+            this.processManager = processManager;
             this.watcher = repositoryWatcher;
             this.config = gitConfig;
 
             SetupWatcher();
         }
 
-        public static RepositoryManager CreateInstance(IPlatform platform, ITaskManager taskManager,
-            IGitClient gitClient, NPath repositoryRoot)
+        public static RepositoryManager CreateInstance(IPlatform platform, ITaskManager taskManager, IGitClient gitClient, IProcessManager processManager, NPath repositoryRoot)
         {
             var repositoryPathConfiguration = new RepositoryPathConfiguration(repositoryRoot);
             string filePath = repositoryPathConfiguration.DotGitConfig;
@@ -133,7 +136,7 @@ public static RepositoryManager CreateInstance(IPlatform platform, ITaskManager
             var repositoryWatcher = new RepositoryWatcher(platform, repositoryPathConfiguration, taskManager.Token);
 
             return new RepositoryManager(gitConfig, repositoryWatcher,
-                gitClient, repositoryPathConfiguration);
+                gitClient, processManager, repositoryPathConfiguration);
         }
 
         public void Initialize()
@@ -293,6 +296,21 @@ public ITask CheckoutFiles(List<string> files)
             return discard.Finally(() => IsBusy = false);
         }
 
+        public ITask DeleteFiles(List<string> list)
+        {
+            ITask<List<string>> task = new DeleteFilesExecTask(list.ToArray(), CancellationToken.None)
+                .Configure(processManager);
+
+            task = HookupHandlers(task, true, true);
+
+            var @finally = task.Finally((b, exception, arg3) => {
+                Logger.Trace("Delete Files success:{0} output: {1}", b, arg3 != null ? string.Join(",", arg3.ToArray()) : "[NULL]");
+            });
+
+            return @finally
+                .Start();
+        }
+
         public void UpdateGitAheadBehindStatus()
         {
             ConfigBranch? configBranch;

src/GitHub.Api/GitHub.Api.csproj

@@ -147,6 +147,7 @@
     <Compile Include="Tasks\TaskCanceledExceptions.cs" />
     <Compile Include="Tasks\TaskExtensions.cs" />
     <Compile Include="Tasks\TaskManager.cs" />
+    <Compile Include="Platform\DeleteFilesExecTask.cs" />
     <Compile Include="Platform\FindExecTask.cs" />
     <Compile Include="Helpers\Progress.cs" />
     <Compile Include="Metrics\IMetricsService.cs" />

src/GitHub.Api/Platform/DeleteFilesExecTask.cs

@@ -0,0 +1,31 @@
+using System.Collections.Generic;
+using System.Threading;
+
+namespace GitHub.Unity
+{
+    class DeleteFilesExecTask : ProcessTask<List<string>>
+    {
+        private readonly string arguments;
+
+        public DeleteFilesExecTask(string[] files, CancellationToken token)
+            : base(token, new SimpleListOutputProcessor())
+        {
+            Name = DefaultEnvironment.OnWindows ? "cmd" : "rm";
+
+            var fileString = string.Join(" ", files);
+            if (DefaultEnvironment.OnWindows)
+            {
+                arguments = $"/c \"del {fileString}\"";
+            }
+            else
+            {
+                arguments = fileString;
+            }
+
+        }
+
+        public override string ProcessName { get { return Name; } }
+        public override string ProcessArguments { get { return arguments; } }
+        public override TaskAffinity Affinity { get { return TaskAffinity.Concurrent; } }
+    }
+}

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

@@ -23,6 +23,9 @@ class ChangesView : Subview
         [NonSerialized] private bool currentLocksHasUpdate;
         [NonSerialized] private bool isBusy;
 
+        [NonSerialized] private GUIContent revertGuiContent;
+        [NonSerialized] private GUIContent deleteGuiContent;
+
         [SerializeField] private string commitBody = "";
         [SerializeField] private string commitMessage = "";
         [SerializeField] private string currentBranch = "[unknown]";
@@ -143,7 +146,10 @@ private void OnTreeGUI(Rect rect)
                 var treeRenderRect = treeChanges.Render(rect, treeScroll, 
                     node => { }, 
                     node => { },
-                    node => { });
+                    node => {
+                        var menu = CreateContextMenu(node);
+                        menu.ShowAsContext();
+                    });
 
                 if (treeChanges.RequiresRepaint)
                     Redraw();
@@ -152,6 +158,51 @@ private void OnTreeGUI(Rect rect)
             }
         }
 
+        private GenericMenu CreateContextMenu(ChangesTreeNode node)
+        {
+            var genericMenu = new GenericMenu();
+            var canRevert = false;
+            var canDelete = false;
+
+            if (!node.isFolder)
+            {
+                canRevert = node.GitFileStatus == GitFileStatus.Added
+                    || node.GitFileStatus == GitFileStatus.Modified
+                    || node.GitFileStatus == GitFileStatus.Deleted
+                    || node.GitFileStatus == GitFileStatus.Renamed;
+
+                canDelete = node.GitFileStatus == GitFileStatus.Untracked;
+            }
+
+            if (canRevert)
+            {
+                if (revertGuiContent == null)
+                {
+                    revertGuiContent = new GUIContent("Revert");
+                }
+
+                genericMenu.AddItem(revertGuiContent, false, () => {
+                    Repository.DiscardChanges(new List<string> { node.Path })
+                        .Start();
+                });
+            }
+
+            if (canDelete)
+            {
+                if (deleteGuiContent == null)
+                {
+                    deleteGuiContent = new GUIContent("Delete");
+                }
+
+                genericMenu.AddItem(deleteGuiContent, false, () => {
+                    Repository.DeleteFiles(new List<string> { node.Path })
+                              .Start();
+                });
+            }
+
+            return genericMenu;
+        }
+
         private void RepositoryOnStatusEntriesChanged(CacheUpdateEvent cacheUpdateEvent)
         {
             if (!lastStatusEntriesChangedEvent.Equals(cacheUpdateEvent))

src/tests/IntegrationTests/BaseGitEnvironmentTest.cs

@@ -14,8 +14,7 @@ protected IEnvironment Initialize(NPath repoPath, NPath environmentPath = null,
         {
             InitializePlatform(repoPath, environmentPath, enableEnvironmentTrace);
 
-            var repositoryManager =
-                GitHub.Unity.RepositoryManager.CreateInstance(Platform, TaskManager, GitClient, repoPath);
+            var repositoryManager = GitHub.Unity.RepositoryManager.CreateInstance(Platform, TaskManager, GitClient, ProcessManager, repoPath);
             onRepositoryManagerCreated?.Invoke(repositoryManager);
 
             RepositoryManager = repositoryManager;