Merge pull request #236 from github-for-unity/enhancements/git-addall-refactor

Refactor for Git Add/AddAll functionality

Author: StanleyGoldman

src/GitHub.Api/Git/IRepository.cs

@@ -10,6 +10,8 @@ interface IRepository : IEquatable<IRepository>
     {
         void Initialize(IRepositoryManager repositoryManager);
         void Refresh();
+        ITask CommitAllFiles(string message, string body);
+        ITask CommitFiles(List<string> files, string message, string body);
         ITask SetupRemote(string remoteName, string remoteUrl);
         ITask<List<GitLogEntry>> Log();
         ITask Pull();

src/GitHub.Api/Git/Repository.cs

@@ -87,6 +87,16 @@ public ITask<List<GitLogEntry>> Log()
             return repositoryManager.Log();
         }
 
+        public ITask CommitAllFiles(string message, string body)
+        {
+            return repositoryManager.CommitAllFiles(message, body);
+        }
+
+        public ITask CommitFiles(List<string> files, string message, string body)
+        {
+            return repositoryManager.CommitFiles(files, message, body);
+        }
+
         public ITask Pull()
         {
             return repositoryManager.Pull(CurrentRemote.Value.Name, CurrentBranch?.Name);

src/GitHub.Api/Git/RepositoryManager.cs

@@ -28,6 +28,7 @@ interface IRepositoryManager : IDisposable
         void Start();
         void Stop();
         void Refresh();
+        ITask CommitAllFiles(string message, string body);
         ITask CommitFiles(List<string> files, string message, string body);
         ITask<List<GitLogEntry>> Log();
         ITask Fetch(string remote);
@@ -192,6 +193,15 @@ public void Refresh()
             UpdateGitStatus();
         }
 
+        public ITask CommitAllFiles(string message, string body)
+        {
+            var add = GitClient.AddAll();
+            add.OnStart += t => IsBusy = true;
+            return add
+                .Then(GitClient.Commit(message, body))
+                .Finally(() => IsBusy = false);
+        }
+
         public ITask CommitFiles(List<string> files, string message, string body)
         {
             var add = GitClient.Add(files);

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

@@ -192,22 +192,20 @@ private void Commit()
             var files = Enumerable.Range(0, tree.Entries.Count)
                 .Where(i => tree.CommitTargets[i].All)
                 .Select(i => tree.Entries[i].Path)
-                .ToArray();
+                .ToList();
 
-            ITask<string> addTask;
+            ITask addTask;
 
-            if (files.Length == tree.Entries.Count)
+            if (files.Count == tree.Entries.Count)
             {
-                addTask = GitClient.AddAll();
+                addTask = Repository.CommitAllFiles(commitMessage, commitBody);
             }
             else
             {
-                addTask = GitClient.Add(files);
+                addTask = Repository.CommitFiles(files, commitMessage, commitBody);
             }
 
             addTask
-                .Then(GitClient.Commit(commitMessage, commitBody))
-                .Then(GitClient.Status())
                 .FinallyInUI((b, exception) => 
                     {
                         commitMessage = "";

src/tests/IntegrationTests/Events/RepositoryManagerTests.cs

@@ -129,6 +129,73 @@ await RepositoryManager
             repositoryManagerListener.DidNotReceive().OnLocksUpdated(Args.EnumerableGitLock);
         }
 
+        [Test, Category("TimeSensitive")]
+        public async Task ShouldAddAndCommitAllFiles()
+        {
+            await Initialize(TestRepoMasterCleanSynchronized);
+
+            var repositoryManagerListener = Substitute.For<IRepositoryManagerListener>();
+            repositoryManagerListener.AttachListener(RepositoryManager, repositoryManagerEvents);
+
+            var expectedAfterChanges = new GitStatus {
+                Behind = 1,
+                LocalBranch = "master",
+                RemoteBranch = "origin/master",
+                Entries =
+                    new List<GitStatusEntry> {
+                        new GitStatusEntry("Assets\\TestDocument.txt",
+                            TestRepoMasterCleanSynchronized.Combine("Assets", "TestDocument.txt"),
+                            "Assets\\TestDocument.txt", GitFileStatus.Modified),
+                        new GitStatusEntry("foobar.txt", TestRepoMasterCleanSynchronized.Combine("foobar.txt"),
+                            "foobar.txt", GitFileStatus.Untracked)
+                    }
+            };
+
+            var result = new GitStatus();
+            RepositoryManager.OnStatusUpdated += status => { result = status; };
+
+            var foobarTxt = TestRepoMasterCleanSynchronized.Combine("foobar.txt");
+            foobarTxt.WriteAllText("foobar");
+
+            var testDocumentTxt = TestRepoMasterCleanSynchronized.Combine("Assets", "TestDocument.txt");
+            testDocumentTxt.WriteAllText("foobar");
+            await TaskManager.Wait();
+            WaitForNotBusy(repositoryManagerEvents, 1);
+            RepositoryManager.WaitForEvents();
+            WaitForNotBusy(repositoryManagerEvents, 1);
+
+            repositoryManagerListener.Received().OnStatusUpdate(Args.GitStatus);
+            repositoryManagerListener.DidNotReceive().OnActiveBranchChanged(Arg.Any<ConfigBranch?>());
+            repositoryManagerListener.DidNotReceive().OnActiveRemoteChanged(Arg.Any<ConfigRemote?>());
+            repositoryManagerListener.DidNotReceive().OnHeadChanged();
+            repositoryManagerListener.DidNotReceive().OnLocalBranchListChanged();
+            repositoryManagerListener.DidNotReceive().OnRemoteBranchListChanged();
+            repositoryManagerListener.ReceivedWithAnyArgs().OnIsBusyChanged(Args.Bool);
+            repositoryManagerListener.DidNotReceive().OnLocksUpdated(Args.EnumerableGitLock);
+
+            result.AssertEqual(expectedAfterChanges);
+
+            repositoryManagerListener.ClearReceivedCalls();
+            repositoryManagerEvents.Reset();
+
+            await RepositoryManager
+                .CommitAllFiles("IntegrationTest Commit", string.Empty)
+                .StartAsAsync();
+
+            await TaskManager.Wait();
+            RepositoryManager.WaitForEvents();
+            WaitForNotBusy(repositoryManagerEvents, 1);
+
+            repositoryManagerListener.DidNotReceive().OnStatusUpdate(Args.GitStatus);
+            repositoryManagerListener.DidNotReceive().OnActiveBranchChanged(Arg.Any<ConfigBranch?>());
+            repositoryManagerListener.DidNotReceive().OnActiveRemoteChanged(Arg.Any<ConfigRemote?>());
+            repositoryManagerListener.DidNotReceive().OnHeadChanged();
+            repositoryManagerListener.DidNotReceive().OnLocalBranchListChanged();
+            repositoryManagerListener.DidNotReceive().OnRemoteBranchListChanged();
+            repositoryManagerListener.Received(2).OnIsBusyChanged(Args.Bool);
+            repositoryManagerListener.DidNotReceive().OnLocksUpdated(Args.EnumerableGitLock);
+        }
+
         [Test, Category("TimeSensitive")]
         public async Task ShouldDetectBranchChange()
         {