Initial implementation of discard (git checkout) functionality

Author: neuroKip

src/GitHub.Api/Git/GitClient.cs

@@ -69,7 +69,12 @@ ITask<string> Add(IList<string> files,
 
         ITask<string> AddAll(IOutputProcessor<string> processor = null);
 
-        ITask<string> Remove(IList<string> files,
+		ITask<string> Discard( IList<string> files,
+			IOutputProcessor<string> processor = null );
+
+		ITask<string> DiscardAll( IOutputProcessor<string> processor = null );
+
+		ITask<string> Remove(IList<string> files,
             IOutputProcessor<string> processor = null);
 
         ITask<string> AddAndCommit(IList<string> files, string message, string body,
@@ -365,7 +370,38 @@ public ITask<string> Add(IList<string> files,
             return last;
         }
 
-        public ITask<string> Remove(IList<string> files,
+        public ITask<string> Discard( IList<string> files,
+			IOutputProcessor<string> processor = null )
+		{
+			Logger.Trace("Checkout Files");
+
+			GitCheckoutTask last = null;
+			foreach( var batch in files.Spool( 5000 ) )
+			{
+				var current = new GitCheckoutTask( batch, cancellationToken, processor ).Configure( processManager );
+				if( last == null )
+				{
+					last = current;
+				}
+				else
+				{
+					last.Then( current );
+					last = current;
+				}
+			}
+
+			return last;
+		}
+
+		public ITask<string> DiscardAll( IOutputProcessor<string> processor = null )
+		{
+			Logger.Trace( "Checkout all files" );
+
+			return new GitCheckoutTask( cancellationToken, processor )
+				.Configure( processManager );
+		}
+
+		public ITask<string> Remove(IList<string> files,
             IOutputProcessor<string> processor = null)
         {
             Logger.Trace("Remove");

src/GitHub.Api/Git/IRepository.cs

@@ -18,6 +18,7 @@ public interface IRepository : IEquatable<IRepository>
         ITask Revert(string changeset);
         ITask RequestLock(string file);
         ITask ReleaseLock(string file, bool force);
+		ITask CheckoutFiles( List<string> files );
 
         void CheckLogChangedEvent(CacheUpdateEvent gitLogCacheUpdateEvent);
         void CheckStatusChangedEvent(CacheUpdateEvent cacheUpdateEvent);

src/GitHub.Api/Git/Repository.cs

@@ -112,6 +112,11 @@ public ITask ReleaseLock(string file, bool force)
             return repositoryManager.UnlockFile(file, force);
         }
 
+		public ITask CheckoutFiles( List<string> files )
+		{
+			return repositoryManager.CheckoutFiles( files );
+		}
+
         public void CheckLogChangedEvent(CacheUpdateEvent cacheUpdateEvent)
         {
             var managedCache = cacheContainer.GitLogCache;
@@ -834,4 +839,4 @@ public string UpdatedTimeString
             private set { updatedTimeString = value; }
         }
     }
-}
+}

src/GitHub.Api/Git/RepositoryManager.cs

@@ -35,6 +35,7 @@ public interface IRepositoryManager : IDisposable
         ITask CreateBranch(string branch, string baseBranch);
         ITask LockFile(string file);
         ITask UnlockFile(string file, bool force);
+		ITask CheckoutFiles(List<string> files);
         void UpdateGitLog();
         void UpdateGitStatus();
         void UpdateGitAheadBehindStatus();
@@ -284,6 +285,14 @@ public void UpdateGitStatus()
             }).Start();
         }
 
+		public ITask CheckoutFiles( List<string> files )
+		{
+			var discard = GitClient.Discard(files);
+			discard.OnStart += t => IsBusy = true;
+
+			return discard.Finally(() => IsBusy = false);
+		}
+
         public void UpdateGitAheadBehindStatus()
         {
             ConfigBranch? configBranch;

src/GitHub.Api/Git/Tasks/GitCheckoutTask.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+
+namespace GitHub.Unity
+{
+	class GitCheckoutTask : ProcessTask<string>
+	{
+		private const string TaskName = "git checkout";
+		private readonly string arguments;
+
+		public GitCheckoutTask( IEnumerable<string> files, CancellationToken token,
+			IOutputProcessor<string> processor = null ) : base(token, processor ?? new SimpleOutputProcessor())
+		{
+			Guard.ArgumentNotNull( files, "files" );
+			Name = TaskName;
+
+			arguments = "checkout ";
+			arguments += " -- ";
+
+			foreach( var file in files )
+			{
+				arguments += " \"" + file.ToNPath().ToString( SlashMode.Forward ) + "\"";
+			}
+		}
+
+		public GitCheckoutTask( CancellationToken token,
+			IOutputProcessor<string> processor = null ) : base( token, processor ?? new SimpleOutputProcessor() )
+		{
+			arguments = "checkout -- .";
+		}
+
+		public override string ProcessArguments { get { return arguments; } }
+		public override TaskAffinity Affinity { get { return TaskAffinity.Exclusive; } }
+	}
+}

src/GitHub.Api/GitHub.Api.csproj

@@ -100,6 +100,7 @@
     <Compile Include="Application\Organization.cs" />
     <Compile Include="Cache\CacheInterfaces.cs" />
     <Compile Include="Extensions\ListExtensions.cs" />
+    <Compile Include="Git\Tasks\GitCheckoutTask.cs" />
     <Compile Include="Git\GitAheadBehindStatus.cs" />
     <Compile Include="Git\Tasks\GitAheadBehindStatusTask.cs" />
     <Compile Include="Git\Tasks\GitLfsVersionTask.cs" />

src/tests/IntegrationTests/Events/RepositoryManagerTests.cs

@@ -755,5 +755,64 @@ public async Task ShouldDetectGitFetch()
                 EndTest(logger);
             }
         }
+
+
+
+		[Test]
+		public async Task ShouldCheckoutFiles()
+		{
+			await Initialize( TestRepoMasterCleanSynchronized );
+
+			var repositoryManagerListener = Substitute.For<IRepositoryManagerListener>();
+			repositoryManagerListener.AttachListener( RepositoryManager, repositoryManagerEvents );
+
+			var expected = new GitStatus
+			{
+				Behind = 1,
+				LocalBranch = "master",
+				RemoteBranch = "origin/master",
+				Entries =
+					new List<GitStatusEntry> {
+						new GitStatusEntry("foobar.txt", TestRepoMasterCleanSynchronized.Combine("foobar.txt"),
+							"foobar.txt", GitFileStatus.None)
+					}
+			};
+
+			var result = new GitStatus();
+			Environment.Repository.OnStatusUpdated += status => { result = status; };
+
+			var foobarTxt = TestRepoMasterCleanSynchronized.Combine( "foobar.txt" );
+			foobarTxt.WriteAllText( "foobar" );
+
+			await TaskManager.Wait();
+			RepositoryManager.WaitForEvents();
+			WaitForNotBusy( repositoryManagerEvents, 1 );
+
+			repositoryManagerListener.Received().OnStatusUpdate( Args.GitStatus );
+			repositoryManagerListener.DidNotReceive().OnActiveBranchChanged( Arg.Any<ConfigBranch?>() );
+			repositoryManagerListener.DidNotReceive().OnActiveRemoteChanged( Arg.Any<ConfigRemote?>() );
+			repositoryManagerListener.DidNotReceive().OnLocalBranchListChanged();
+			repositoryManagerListener.DidNotReceive().OnRemoteBranchListChanged();
+			repositoryManagerListener.Received().OnIsBusyChanged( Args.Bool );
+			repositoryManagerListener.DidNotReceive().OnLocksUpdated( Args.EnumerableGitLock );
+
+			await RepositoryManager.CheckoutFiles( new List<string>() { "foobar.txt" } )
+				.StartAsAsync();
+
+			await TaskManager.Wait();
+			RepositoryManager.WaitForEvents();
+			WaitForNotBusy( repositoryManagerEvents, 1 );
+			repositoryManagerEvents.OnStatusUpdate.WaitOne( TimeSpan.FromSeconds( 1 ) );
+
+			repositoryManagerListener.Received().OnStatusUpdate( Args.GitStatus );
+			repositoryManagerListener.DidNotReceive().OnActiveBranchChanged( Arg.Any<ConfigBranch?>() );
+			repositoryManagerListener.DidNotReceive().OnActiveRemoteChanged( Arg.Any<ConfigRemote?>() );
+			repositoryManagerListener.DidNotReceive().OnLocalBranchListChanged();
+			repositoryManagerListener.DidNotReceive().OnRemoteBranchListChanged();
+			repositoryManagerListener.Received().OnIsBusyChanged( Args.Bool );
+			repositoryManagerListener.DidNotReceive().OnLocksUpdated( Args.EnumerableGitLock );
+
+			result.AssertEqual( expected );
+		}
     }
 }