Merge branch 'master' into enhancements/user-settings-view

Author: StanleyGoldman

GitHub.Unity.sln.DotSettings

@@ -341,4 +341,6 @@
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/UnitTesting/ShadowCopy/@EntryValue">False</s:Boolean>
+	</wpf:ResourceDictionary>

README.md

@@ -2,7 +2,7 @@
 
 ## Notices
 
-From version 0.19 onwards, the location of the plugin has moved to `Assets/Plugins/GitHub`. If you have version 0.18 or lower, you need to delete the `Assets/Editor/GitHub` folder before you install newer versions. You should exit Unity and delete the folder from Explorer/Finder, as Unity will not unload native libraries while it's running.
+From version 0.19 onwards, the location of the plugin has moved to `Assets/Plugins/GitHub`. If you have version 0.18 or lower, you need to delete the `Assets/Editor/GitHub` folder before you install newer versions. You should exit Unity and delete the folder from Explorer/Finder, as Unity will not unload native libraries while it's running. Also, remember to update your `.gitignore` file.
 
 ![Build Status](https://ci.appveyor.com/api/projects/status/github/github-for-unity/Unity?branch=master&svg=true)
 
@@ -81,7 +81,11 @@ Once the extension is installed, you can open a command line with the same Git a
 
 ### Installation
 
-To install the extension, download the latest package from [the releases page](https://github.com/github-for-unity/Unity/releases) and double click on it.
+This extensions needs to be installed (and updated) for each Unity project that you want to version control. 
+First step is to download the latest package from [the releases page](https://github.com/github-for-unity/Unity/releases);
+it will be saved as a file with the extension `.unitypackage`.
+To install it, open Unity, then open the project you want to version control, and then double click on the downloaded package.
+Alternatively, import the package by clicking Assets, Import Package, Custom Package, then select the downloaded package.
 
 #### Log files
 

src/GitHub.Api/Git/GitConfig.cs

@@ -86,10 +86,11 @@ public IEnumerable<ConfigRemote> GetRemotes()
             return groups
                 .Where(x => x.Key == "remote")
                 .SelectMany(x => x.Value)
+                .Where(x => x.Value.TryGetString("url") != null)
                 .Select(x => new ConfigRemote
                 {
                     Name = x.Key,
-                    Url = x.Value.GetString("url")
+                    Url = x.Value.TryGetString("url")
                 });
         }
 
@@ -98,7 +99,7 @@ public IEnumerable<ConfigRemote> GetRemotes()
             return groups
                 .Where(x => x.Key == "remote")
                 .SelectMany(x => x.Value)
-                .Where(x => x.Key == remote)
+                .Where(x => x.Key == remote && x.Value.TryGetString("url") != null)
                 .Select(x => new ConfigRemote
                 {
                     Name = x.Key,

src/GitHub.Api/Git/IRepository.cs

@@ -10,7 +10,10 @@ 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();
         ITask Push();
         ITask Fetch();

src/GitHub.Api/Git/Repository.cs

@@ -3,6 +3,7 @@
 using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
+using System.Threading;
 
 namespace GitHub.Unity
 {
@@ -78,6 +79,24 @@ public ITask SetupRemote(string remote, string remoteUrl)
             }
         }
 
+        public ITask<List<GitLogEntry>> Log()
+        {
+            if (repositoryManager == null)
+                return new FuncListTask<GitLogEntry>(TaskHelpers.GetCompletedTask(new List<GitLogEntry>()));
+
+            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,7 +28,9 @@ 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);
         ITask Pull(string remote, string branch);
         ITask Push(string remote, string branch);
@@ -191,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);
@@ -200,6 +211,13 @@ public ITask CommitFiles(List<string> files, string message, string body)
                 .Finally(() => IsBusy = false);
         }
 
+        public ITask<List<GitLogEntry>> Log()
+        {
+            var task = GitClient.Log();
+            HookupHandlers(task);
+            return task;
+        }
+
         public ITask Fetch(string remote)
         {
             var task = GitClient.Fetch(remote);

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

@@ -15,7 +15,7 @@ public GitStatusTask(IGitObjectFactory gitObjectFactory,
 
         public override string ProcessArguments
         {
-            get { return "-c i18n.logoutputencoding=utf8 -c core.quotepath=false status -b -u --ignored --porcelain"; }
+            get { return "-c i18n.logoutputencoding=utf8 -c core.quotepath=false status -b -u --porcelain"; }
         }
         public override TaskAffinity Affinity { get { return TaskAffinity.Exclusive; } }
     }

src/GitHub.Api/GitHub.Api.csproj

@@ -109,6 +109,7 @@
     <Compile Include="Helpers\Constants.cs" />
     <Compile Include="Cache\IBranchCache.cs" />
     <Compile Include="Helpers\Validation.cs" />
+    <Compile Include="Helpers\TaskHelpers.cs" />
     <Compile Include="Platform\DefaultEnvironment.cs" />
     <Compile Include="Extensions\EnvironmentExtensions.cs" />
     <Compile Include="Extensions\FileEventExtensions.cs" />

src/GitHub.Api/Helpers/TaskHelpers.cs

@@ -0,0 +1,12 @@
+using System.Threading.Tasks;
+
+namespace GitHub.Unity
+{
+    static class TaskHelpers
+    {
+        public static Task<T> GetCompletedTask<T>(T result)
+        {
+            return TaskEx.FromResult(result);
+        }
+    }
+}

src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationCache.cs

@@ -126,52 +126,52 @@ public List<GitBranch> RemoteBranches
     }
 
     [Location("views/branches.yaml", LocationAttribute.Location.LibraryFolder)]
-    sealed class Favourites : ScriptObjectSingleton<Favourites>
+    sealed class Favorites : ScriptObjectSingleton<Favorites>
     {
-        [SerializeField] private List<string> favouriteBranches;
-        public List<string> FavouriteBranches
+        [SerializeField] private List<string> favoriteBranches;
+        public List<string> FavoriteBranches
         {
             get
             {
-                if (favouriteBranches == null)
-                    FavouriteBranches = new List<string>();
-                return favouriteBranches;
+                if (favoriteBranches == null)
+                    FavoriteBranches = new List<string>();
+                return favoriteBranches;
             }
             set
             {
-                favouriteBranches = value;
+                favoriteBranches = value;
                 Save(true);
             }
         }
 
-        public void SetFavourite(string branchName)
+        public void SetFavorite(string branchName)
         {
-            if (FavouriteBranches.Contains(branchName))
+            if (FavoriteBranches.Contains(branchName))
                 return;
-            FavouriteBranches.Add(branchName);
+            FavoriteBranches.Add(branchName);
             Save(true);
         }
 
-        public void UnsetFavourite(string branchName)
+        public void UnsetFavorite(string branchName)
         {
-            if (!FavouriteBranches.Contains(branchName))
+            if (!FavoriteBranches.Contains(branchName))
                 return;
-            FavouriteBranches.Remove(branchName);
+            FavoriteBranches.Remove(branchName);
             Save(true);
         }
 
-        public void ToggleFavourite(string branchName)
+        public void ToggleFavorite(string branchName)
         {
-            if (FavouriteBranches.Contains(branchName))
-                FavouriteBranches.Remove(branchName);
+            if (FavoriteBranches.Contains(branchName))
+                FavoriteBranches.Remove(branchName);
             else
-                FavouriteBranches.Add(branchName);
+                FavoriteBranches.Add(branchName);
             Save(true);
         }
 
-        public bool IsFavourite(string branchName)
+        public bool IsFavorite(string branchName)
         {
-            return FavouriteBranches.Contains(branchName);
+            return FavoriteBranches.Contains(branchName);
         }
     }