Merge branch 'master' into niceio-latest

Author: StanleyGoldman

docs/process/roadmap.md

@@ -0,0 +1,51 @@
+# The roadmap
+
+## The road to 1.0
+
+### 1.0-RC ETA
+
+March 2018
+
+### 1.0 ETA
+
+May 2018
+
+### Feature list
+
+- Windows and Mac support
+  - Unity 5.4 and above
+- Initialize new repository in existing project
+  - Configure yaml merge tool
+  - Configure project serialization for source control
+  - Configure git and lfs
+- Publish to GitHub
+- Authentication
+  - Login with user/password and 2FA if needed
+  - Invoked when doing git operations
+  - https support
+- Local repository management
+  - List changed files
+  - Commit selectively
+  - Discard file changes
+- Repository history and network operations
+  - List of commits
+  - Individual commit detail
+  - Revert commit
+  - List of local branches
+  - List of remote branches
+  - Create branch
+  - Delete branch
+  - Fetch
+  - Push
+  - Pull
+- File locking
+  - Lock and unlock files
+  - Visual locking indicators in file UIs
+  - List locked files
+  - Notification when file is locked by someone else
+- Git management
+  - User and email configuration
+  - Git remote configuration
+  - Git installation path configuration
+- Misc
+  - Notification of new releases

src/GitHub.Api/Application/ApplicationManagerBase.cs

@@ -72,8 +72,7 @@ public void Run(bool firstRun)
                         }
                     });
 
-                var applicationDataPath = Environment.GetSpecialFolder(System.Environment.SpecialFolder.LocalApplicationData).ToNPath();
-                var installDetails = new GitInstallDetails(applicationDataPath, true);
+                var installDetails = new GitInstallDetails(Environment.UserCachePath, true);
                 var gitInstaller = new GitInstaller(Environment, CancellationToken, installDetails);
 
                 // if successful, continue with environment initialization, otherwise try to find an existing git installation
@@ -128,7 +127,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.FileSystem, Environment.RepositoryPath);
                 repositoryManager.Initialize();
                 Environment.Repository.Initialize(repositoryManager);
                 repositoryManager.Start();

src/GitHub.Api/Git/GitClient.cs

@@ -69,6 +69,11 @@ ITask<string> Add(IList<string> files,
 
         ITask<string> AddAll(IOutputProcessor<string> processor = null);
 
+        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);
 
@@ -365,6 +370,37 @@ public ITask<string> Add(IList<string> files,
             return last;
         }
 
+        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)
         {

src/GitHub.Api/Git/IRepository.cs

@@ -4,7 +4,7 @@
 namespace GitHub.Unity
 {
     /// <summary>
-    /// Represents a repository, either local or retreived via the GitHub API.
+    /// Represents a repository, either local or retrieved via the GitHub API.
     /// </summary>
     public interface IRepository : IEquatable<IRepository>
     {
@@ -18,7 +18,7 @@ public interface IRepository : IEquatable<IRepository>
         ITask Revert(string changeset);
         ITask RequestLock(string file);
         ITask ReleaseLock(string file, bool force);
-
+        ITask DiscardChanges(GitStatusEntry[] discardEntries);
         void CheckLogChangedEvent(CacheUpdateEvent gitLogCacheUpdateEvent);
         void CheckStatusChangedEvent(CacheUpdateEvent cacheUpdateEvent);
         void CheckStatusEntriesChangedEvent(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 DiscardChanges(GitStatusEntry[] gitStatusEntry)
+        {
+            return repositoryManager.DiscardChanges(gitStatusEntry);
+        }
+
         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

@@ -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,6 +36,7 @@ public interface IRepositoryManager : IDisposable
         ITask CreateBranch(string branch, string baseBranch);
         ITask LockFile(string file);
         ITask UnlockFile(string file, bool force);
+        ITask DiscardChanges(GitStatusEntry[] gitStatusEntries);
         void UpdateGitLog();
         void UpdateGitStatus();
         void UpdateGitAheadBehindStatus();
@@ -44,7 +46,6 @@ public interface IRepositoryManager : IDisposable
         IGitConfig Config { get; }
         IGitClient GitClient { get; }
         bool IsBusy { get; }
-        event Action<GitAheadBehindStatus> GitAheadBehindStatusUpdated;
     }
 
     interface IRepositoryPathConfiguration
@@ -96,7 +97,10 @@ class RepositoryManager : IRepositoryManager
     {
         private readonly IGitConfig config;
         private readonly IGitClient gitClient;
+        private readonly IProcessManager processManager;
         private readonly IRepositoryPathConfiguration repositoryPaths;
+        private readonly IFileSystem fileSystem;
+        private readonly CancellationToken token;
         private readonly IRepositoryWatcher watcher;
 
         private bool isBusy;
@@ -112,18 +116,24 @@ class RepositoryManager : IRepositoryManager
 
         public RepositoryManager(IGitConfig gitConfig,
             IRepositoryWatcher repositoryWatcher, IGitClient gitClient,
+            IProcessManager processManager,
+            IFileSystem fileSystem,
+            CancellationToken token,
             IRepositoryPathConfiguration repositoryPaths)
         {
             this.repositoryPaths = repositoryPaths;
+            this.fileSystem = fileSystem;
+            this.token = token;
             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, IFileSystem fileSystem, NPath repositoryRoot)
         {
             var repositoryPathConfiguration = new RepositoryPathConfiguration(repositoryRoot);
             string filePath = repositoryPathConfiguration.DotGitConfig;
@@ -132,7 +142,8 @@ public static RepositoryManager CreateInstance(IPlatform platform, ITaskManager
             var repositoryWatcher = new RepositoryWatcher(platform, repositoryPathConfiguration, taskManager.Token);
 
             return new RepositoryManager(gitConfig, repositoryWatcher,
-                gitClient, repositoryPathConfiguration);
+                gitClient, processManager, fileSystem,
+                taskManager.Token, repositoryPathConfiguration);
         }
 
         public void Initialize()
@@ -211,15 +222,13 @@ public ITask Revert(string changeset)
         public ITask RemoteAdd(string remote, string url)
         {
             var task = GitClient.RemoteAdd(remote, url);
-            task = HookupHandlers(task, true, false);
-            return task;
+            return HookupHandlers(task, true, false);
         }
 
         public ITask RemoteRemove(string remote)
         {
             var task = GitClient.RemoteRemove(remote);
-            task = HookupHandlers(task, true, false);
-            return task;
+            return HookupHandlers(task, true, false);
         }
 
         public ITask RemoteChange(string remote, string url)
@@ -260,28 +269,75 @@ public ITask UnlockFile(string file, bool force)
 
         public void UpdateGitLog()
         {
-            var task = GitClient.Log();
-            task = HookupHandlers(task, false, false);
-            task.Then((success, logEntries) =>
-            {
-                if (success)
+            var task = GitClient
+                .Log()
+                .Then((success, logEntries) =>
                 {
-                    GitLogUpdated?.Invoke(logEntries);
-                }
-            }).Start();
+                    if (success)
+                    {
+                        GitLogUpdated?.Invoke(logEntries);
+                    }
+                });
+            task = HookupHandlers(task, false, false);
+            task.Start();
         }
 
         public void UpdateGitStatus()
         {
-            var task = GitClient.Status();
+            var task = GitClient
+                .Status()
+                .Then((success, status) =>
+                {
+                    if (success)
+                    {
+                        GitStatusUpdated?.Invoke(status);
+                    }
+                });
             task = HookupHandlers(task, true, false);
-            task.Then((success, status) =>
-            {
-                if (success)
+            task.Start();
+        }
+
+        public ITask DiscardChanges(GitStatusEntry[] gitStatusEntries)
+        {
+            Guard.ArgumentNotNullOrEmpty(gitStatusEntries, "gitStatusEntries");
+
+            ActionTask<GitStatusEntry[]> task = null;
+            task = new ActionTask<GitStatusEntry[]>(token, (_, entries) =>
                 {
-                    GitStatusUpdated?.Invoke(status);
+                    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);
+                        }
+                    }
+
+                    if (itemsToDelete.Any())
+                    {
+                        foreach (var itemToDelete in itemsToDelete)
+                        {
+                            fileSystem.FileDelete(itemToDelete);
+                        }
+                    }
+
+                    ITask<string> gitDiscardTask = null;
+                    if (itemsToRevert.Any())
+                    {
+                        gitDiscardTask = GitClient.Discard(itemsToRevert);
+                        task.Then(gitDiscardTask);
+                    }
                 }
-            }).Start();
+                , () => gitStatusEntries);
+
+
+            return HookupHandlers(task, true, true);
         }
 
         public void UpdateGitAheadBehindStatus()
@@ -295,15 +351,17 @@ public void UpdateGitAheadBehindStatus()
                 var name = configBranch.Value.Name;
                 var trackingName = configBranch.Value.IsTracking ? configBranch.Value.Remote.Value.Name + "/" + name : "[None]";
 
-                var task = GitClient.AheadBehindStatus(name, trackingName);
-                task = HookupHandlers(task, true, false);
-                task.Then((success, status) =>
-                {
-                    if (success)
+                var task = GitClient
+                    .AheadBehindStatus(name, trackingName)
+                    .Then((success, status) =>
                     {
-                        GitAheadBehindStatusUpdated?.Invoke(status);
-                    }
-                }).Start();
+                        if (success)
+                        {
+                            GitAheadBehindStatusUpdated?.Invoke(status);
+                        }
+                    });
+                task = HookupHandlers(task, true, false);
+                task.Start();
             }
             else
             {
@@ -324,9 +382,9 @@ public void UpdateLocks()
             }).Start();
         }
 
-        private ITask<T> HookupHandlers<T>(ITask<T> task, bool isExclusive, bool filesystemChangesExpected)
+        private ITask HookupHandlers(ITask task, bool isExclusive, bool filesystemChangesExpected)
         {
-            return new ActionTask(TaskManager.Instance.Token, () => {
+            return new ActionTask(token, () => {
                     if (isExclusive)
                     {
                         Logger.Trace("Starting Operation - Setting Busy Flag");
@@ -340,7 +398,7 @@ private ITask<T> HookupHandlers<T>(ITask<T> task, bool isExclusive, bool filesys
                     }
                 })
                 .Then(task)
-                .Finally((success, exception, result) => {
+                .Finally((success, exception) => {
                     if (filesystemChangesExpected)
                     {
                         Logger.Trace("Ended Operation - Enable Watcher");
@@ -353,12 +411,10 @@ private ITask<T> HookupHandlers<T>(ITask<T> task, bool isExclusive, bool filesys
                         IsBusy = false;
                     }
 
-                    if (success)
+                    if (!success)
                     {
-                        return result;
+                        throw exception;
                     }
-
-                    throw exception;
                 });
         }