Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Commit 46a2230

Browse files
shanashana
authored
Merge pull request #533 from github-for-unity/enhancements/gitcheckout
Functionality to discard changes
2 parents 2e27a09 + cb72dd9 commit 46a2230

File tree

11 files changed

+258
-69
lines changed

11 files changed

+258
-69
lines changed

‎src/GitHub.Api/Application/ApplicationManagerBase.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public void RestartRepository()
128128
{
129129
if (Environment.RepositoryPath != null)
130130
{
131-
repositoryManager = Unity.RepositoryManager.CreateInstance(Platform, TaskManager, GitClient, Environment.RepositoryPath);
131+
repositoryManager = Unity.RepositoryManager.CreateInstance(Platform, TaskManager, GitClient, ProcessManager, Environment.FileSystem, Environment.RepositoryPath);
132132
repositoryManager.Initialize();
133133
Environment.Repository.Initialize(repositoryManager);
134134
repositoryManager.Start();

‎src/GitHub.Api/Git/GitClient.cs‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,11 @@ ITask<string> Add(IList<string> files,
6969

7070
ITask<string> AddAll(IOutputProcessor<string> processor = null);
7171

72+
ITask<string> Discard(IList<string> files,
73+
IOutputProcessor<string> processor = null);
74+
75+
ITask<string> DiscardAll(IOutputProcessor<string> processor = null);
76+
7277
ITask<string> Remove(IList<string> files,
7378
IOutputProcessor<string> processor = null);
7479

@@ -365,6 +370,37 @@ public ITask<string> Add(IList<string> files,
365370
return last;
366371
}
367372

373+
public ITask<string> Discard( IList<string> files,
374+
IOutputProcessor<string> processor = null)
375+
{
376+
Logger.Trace("Checkout Files");
377+
378+
GitCheckoutTask last = null;
379+
foreach (var batch in files.Spool(5000))
380+
{
381+
var current = new GitCheckoutTask(batch, cancellationToken, processor).Configure(processManager);
382+
if (last == null)
383+
{
384+
last = current;
385+
}
386+
else
387+
{
388+
last.Then(current);
389+
last = current;
390+
}
391+
}
392+
393+
return last;
394+
}
395+
396+
public ITask<string> DiscardAll(IOutputProcessor<string> processor = null)
397+
{
398+
Logger.Trace("Checkout all files");
399+
400+
return new GitCheckoutTask(cancellationToken, processor)
401+
.Configure(processManager);
402+
}
403+
368404
public ITask<string> Remove(IList<string> files,
369405
IOutputProcessor<string> processor = null)
370406
{

‎src/GitHub.Api/Git/IRepository.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
namespace GitHub.Unity
55
{
66
/// <summary>
7-
/// Represents a repository, either local or retreived via the GitHub API.
7+
/// Represents a repository, either local or retrieved via the GitHub API.
88
/// </summary>
99
public interface IRepository : IEquatable<IRepository>
1010
{
@@ -18,7 +18,7 @@ public interface IRepository : IEquatable<IRepository>
1818
ITask Revert(string changeset);
1919
ITask RequestLock(string file);
2020
ITask ReleaseLock(string file, bool force);
21-
21+
ITask DiscardChanges(GitStatusEntry[] discardEntries);
2222
void CheckLogChangedEvent(CacheUpdateEvent gitLogCacheUpdateEvent);
2323
void CheckStatusChangedEvent(CacheUpdateEvent cacheUpdateEvent);
2424
void CheckStatusEntriesChangedEvent(CacheUpdateEvent cacheUpdateEvent);

‎src/GitHub.Api/Git/Repository.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,11 @@ public ITask ReleaseLock(string file, bool force)
112112
return repositoryManager.UnlockFile(file, force);
113113
}
114114

115+
public ITask DiscardChanges(GitStatusEntry[] gitStatusEntry)
116+
{
117+
return repositoryManager.DiscardChanges(gitStatusEntry);
118+
}
119+
115120
public void CheckLogChangedEvent(CacheUpdateEvent cacheUpdateEvent)
116121
{
117122
var managedCache = cacheContainer.GitLogCache;
@@ -834,4 +839,4 @@ public string UpdatedTimeString
834839
private set { updatedTimeString = value; }
835840
}
836841
}
837-
}
842+
}

‎src/GitHub.Api/Git/RepositoryManager.cs‎

Lines changed: 93 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ public interface IRepositoryManager : IDisposable
1717
event Action<List<GitLogEntry>> GitLogUpdated;
1818
event Action<Dictionary<string, ConfigBranch>> LocalBranchesUpdated;
1919
event Action<Dictionary<string, ConfigRemote>, Dictionary<string, Dictionary<string, ConfigBranch>>> RemoteBranchesUpdated;
20+
event Action<GitAheadBehindStatus> GitAheadBehindStatusUpdated;
2021

2122
void Initialize();
2223
void Start();
@@ -35,6 +36,7 @@ public interface IRepositoryManager : IDisposable
3536
ITask CreateBranch(string branch, string baseBranch);
3637
ITask LockFile(string file);
3738
ITask UnlockFile(string file, bool force);
39+
ITask DiscardChanges(GitStatusEntry[] gitStatusEntries);
3840
void UpdateGitLog();
3941
void UpdateGitStatus();
4042
void UpdateGitAheadBehindStatus();
@@ -44,7 +46,6 @@ public interface IRepositoryManager : IDisposable
4446
IGitConfig Config { get; }
4547
IGitClient GitClient { get; }
4648
bool IsBusy { get; }
47-
event Action<GitAheadBehindStatus> GitAheadBehindStatusUpdated;
4849
}
4950

5051
interface IRepositoryPathConfiguration
@@ -96,7 +97,10 @@ class RepositoryManager : IRepositoryManager
9697
{
9798
private readonly IGitConfig config;
9899
private readonly IGitClient gitClient;
100+
private readonly IProcessManager processManager;
99101
private readonly IRepositoryPathConfiguration repositoryPaths;
102+
private readonly IFileSystem fileSystem;
103+
private readonly CancellationToken token;
100104
private readonly IRepositoryWatcher watcher;
101105

102106
private bool isBusy;
@@ -112,18 +116,24 @@ class RepositoryManager : IRepositoryManager
112116

113117
public RepositoryManager(IGitConfig gitConfig,
114118
IRepositoryWatcher repositoryWatcher, IGitClient gitClient,
119+
IProcessManager processManager,
120+
IFileSystem fileSystem,
121+
CancellationToken token,
115122
IRepositoryPathConfiguration repositoryPaths)
116123
{
117124
this.repositoryPaths = repositoryPaths;
125+
this.fileSystem = fileSystem;
126+
this.token = token;
118127
this.gitClient = gitClient;
128+
this.processManager = processManager;
119129
this.watcher = repositoryWatcher;
120130
this.config = gitConfig;
121131

122132
SetupWatcher();
123133
}
124134

125-
public static RepositoryManager CreateInstance(IPlatform platform, ITaskManager taskManager,
126-
IGitClient gitClient, NPath repositoryRoot)
135+
public static RepositoryManager CreateInstance(IPlatform platform, ITaskManager taskManager, IGitClient gitClient,
136+
IProcessManager processManager, IFileSystem fileSystem, NPath repositoryRoot)
127137
{
128138
var repositoryPathConfiguration = new RepositoryPathConfiguration(repositoryRoot);
129139
string filePath = repositoryPathConfiguration.DotGitConfig;
@@ -132,7 +142,8 @@ public static RepositoryManager CreateInstance(IPlatform platform, ITaskManager
132142
var repositoryWatcher = new RepositoryWatcher(platform, repositoryPathConfiguration, taskManager.Token);
133143

134144
return new RepositoryManager(gitConfig, repositoryWatcher,
135-
gitClient, repositoryPathConfiguration);
145+
gitClient, processManager, fileSystem,
146+
taskManager.Token, repositoryPathConfiguration);
136147
}
137148

138149
public void Initialize()
@@ -211,15 +222,13 @@ public ITask Revert(string changeset)
211222
public ITask RemoteAdd(string remote, string url)
212223
{
213224
var task = GitClient.RemoteAdd(remote, url);
214-
task = HookupHandlers(task, true, false);
215-
return task;
225+
return HookupHandlers(task, true, false);
216226
}
217227

218228
public ITask RemoteRemove(string remote)
219229
{
220230
var task = GitClient.RemoteRemove(remote);
221-
task = HookupHandlers(task, true, false);
222-
return task;
231+
return HookupHandlers(task, true, false);
223232
}
224233

225234
public ITask RemoteChange(string remote, string url)
@@ -260,28 +269,75 @@ public ITask UnlockFile(string file, bool force)
260269

261270
public void UpdateGitLog()
262271
{
263-
var task = GitClient.Log();
264-
task = HookupHandlers(task, false, false);
265-
task.Then((success, logEntries) =>
266-
{
267-
if (success)
272+
var task = GitClient
273+
.Log()
274+
.Then((success, logEntries) =>
268275
{
269-
GitLogUpdated?.Invoke(logEntries);
270-
}
271-
}).Start();
276+
if (success)
277+
{
278+
GitLogUpdated?.Invoke(logEntries);
279+
}
280+
});
281+
task = HookupHandlers(task, false, false);
282+
task.Start();
272283
}
273284

274285
public void UpdateGitStatus()
275286
{
276-
var task = GitClient.Status();
287+
var task = GitClient
288+
.Status()
289+
.Then((success, status) =>
290+
{
291+
if (success)
292+
{
293+
GitStatusUpdated?.Invoke(status);
294+
}
295+
});
277296
task = HookupHandlers(task, true, false);
278-
task.Then((success, status) =>
279-
{
280-
if (success)
297+
task.Start();
298+
}
299+
300+
public ITask DiscardChanges(GitStatusEntry[] gitStatusEntries)
301+
{
302+
Guard.ArgumentNotNullOrEmpty(gitStatusEntries, "gitStatusEntries");
303+
304+
ActionTask<GitStatusEntry[]> task = null;
305+
task = new ActionTask<GitStatusEntry[]>(token, (_, entries) =>
281306
{
282-
GitStatusUpdated?.Invoke(status);
307+
var itemsToDelete = new List<string>();
308+
var itemsToRevert = new List<string>();
309+
310+
foreach (var gitStatusEntry in gitStatusEntries)
311+
{
312+
if (gitStatusEntry.status == GitFileStatus.Added || gitStatusEntry.status == GitFileStatus.Untracked)
313+
{
314+
itemsToDelete.Add(gitStatusEntry.path);
315+
}
316+
else
317+
{
318+
itemsToRevert.Add(gitStatusEntry.path);
319+
}
320+
}
321+
322+
if (itemsToDelete.Any())
323+
{
324+
foreach (var itemToDelete in itemsToDelete)
325+
{
326+
fileSystem.FileDelete(itemToDelete);
327+
}
328+
}
329+
330+
ITask<string> gitDiscardTask = null;
331+
if (itemsToRevert.Any())
332+
{
333+
gitDiscardTask = GitClient.Discard(itemsToRevert);
334+
task.Then(gitDiscardTask);
335+
}
283336
}
284-
}).Start();
337+
, () => gitStatusEntries);
338+
339+
340+
return HookupHandlers(task, true, true);
285341
}
286342

287343
public void UpdateGitAheadBehindStatus()
@@ -295,15 +351,17 @@ public void UpdateGitAheadBehindStatus()
295351
var name = configBranch.Value.Name;
296352
var trackingName = configBranch.Value.IsTracking ? configBranch.Value.Remote.Value.Name + "/" + name : "[None]";
297353

298-
var task = GitClient.AheadBehindStatus(name, trackingName);
299-
task = HookupHandlers(task, true, false);
300-
task.Then((success, status) =>
301-
{
302-
if (success)
354+
var task = GitClient
355+
.AheadBehindStatus(name, trackingName)
356+
.Then((success, status) =>
303357
{
304-
GitAheadBehindStatusUpdated?.Invoke(status);
305-
}
306-
}).Start();
358+
if (success)
359+
{
360+
GitAheadBehindStatusUpdated?.Invoke(status);
361+
}
362+
});
363+
task = HookupHandlers(task, true, false);
364+
task.Start();
307365
}
308366
else
309367
{
@@ -324,9 +382,9 @@ public void UpdateLocks()
324382
}).Start();
325383
}
326384

327-
private ITask<T> HookupHandlers<T>(ITask<T> task, bool isExclusive, bool filesystemChangesExpected)
385+
private ITask HookupHandlers(ITask task, bool isExclusive, bool filesystemChangesExpected)
328386
{
329-
return new ActionTask(TaskManager.Instance.Token, () => {
387+
return new ActionTask(token, () => {
330388
if (isExclusive)
331389
{
332390
Logger.Trace("Starting Operation - Setting Busy Flag");
@@ -340,7 +398,7 @@ private ITask<T> HookupHandlers<T>(ITask<T> task, bool isExclusive, bool filesys
340398
}
341399
})
342400
.Then(task)
343-
.Finally((success, exception, result) => {
401+
.Finally((success, exception) => {
344402
if (filesystemChangesExpected)
345403
{
346404
Logger.Trace("Ended Operation - Enable Watcher");
@@ -353,12 +411,10 @@ private ITask<T> HookupHandlers<T>(ITask<T> task, bool isExclusive, bool filesys
353411
IsBusy = false;
354412
}
355413

356-
if (success)
414+
if (!success)
357415
{
358-
return result;
416+
throw exception;
359417
}
360-
361-
throw exception;
362418
});
363419
}
364420

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

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Threading;
4+
5+
namespace GitHub.Unity
6+
{
7+
class GitCheckoutTask : ProcessTask<string>
8+
{
9+
private const string TaskName = "git checkout";
10+
private readonly string arguments;
11+
12+
public GitCheckoutTask(IEnumerable<string> files, CancellationToken token,
13+
IOutputProcessor<string> processor = null) : base(token, processor ?? new SimpleOutputProcessor())
14+
{
15+
Guard.ArgumentNotNull(files, "files");
16+
Name = TaskName;
17+
18+
arguments = "checkout ";
19+
arguments += " -- ";
20+
21+
foreach (var file in files)
22+
{
23+
arguments += " \"" + file.ToNPath().ToString(SlashMode.Forward) + "\"";
24+
}
25+
}
26+
27+
public GitCheckoutTask(CancellationToken token,
28+
IOutputProcessor<string> processor = null) : base(token, processor ?? new SimpleOutputProcessor())
29+
{
30+
arguments = "checkout -- .";
31+
}
32+
33+
public override string ProcessArguments { get { return arguments; } }
34+
public override TaskAffinity Affinity { get { return TaskAffinity.Exclusive; } }
35+
}
36+
}

‎src/GitHub.Api/GitHub.Api.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@
100100
<Compile Include="Application\Organization.cs" />
101101
<Compile Include="Cache\CacheInterfaces.cs" />
102102
<Compile Include="Extensions\ListExtensions.cs" />
103+
<Compile Include="Git\Tasks\GitCheckoutTask.cs" />
103104
<Compile Include="Git\GitAheadBehindStatus.cs" />
104105
<Compile Include="Git\Tasks\GitAheadBehindStatusTask.cs" />
105106
<Compile Include="Git\Tasks\GitLfsVersionTask.cs" />

0 commit comments

Comments
 (0)