Merge pull request #804 from github-for-unity/enhancements/showing-diffs

Adding the ability to see diffs of files and folders using the configured diff viewer

Author: StanleyGoldman

common/properties.props

@@ -4,6 +4,7 @@
   <PropertyGroup>
     <BuildType Condition="Exists('$(SolutionDir)script\src\MetricsService.cs')">Internal</BuildType>
     <BuildDefs Condition="Exists('$(SolutionDir)script\src\MetricsService.cs')">ENABLE_METRICS</BuildDefs>
+    <BuildDefs>ENABLE_MONO</BuildDefs>
 
     <UnityDir Condition="$(UnityDir) == '' and Exists('$(SolutionDir)\script\lib\Managed\UnityEditor.dll')">$(SolutionDir)script\lib\</UnityDir>
     <UnityDir Condition="$(UnityDir) == '' and Exists('$(SolutionDir)\lib\Managed\UnityEditor.dll')">$(SolutionDir)lib\</UnityDir>

src/GitHub.Api/Cache/CacheInterfaces.cs

@@ -102,6 +102,7 @@ public interface IRepositoryInfoCacheData
         GitBranch? CurrentGitBranch { get; }
         ConfigRemote? CurrentConfigRemote { get; }
         ConfigBranch? CurrentConfigBranch { get; }
+        string CurrentHead { get; }
     }
 
     public interface IRepositoryInfoCache : IManagedCache, IRepositoryInfoCacheData, ICanUpdate<IRepositoryInfoCacheData>

src/GitHub.Api/Cache/CachingClasses.cs

@@ -14,5 +14,6 @@ sealed class RepositoryInfoCacheData : IRepositoryInfoCacheData
         public GitBranch? CurrentGitBranch { get; set; }
         public ConfigRemote? CurrentConfigRemote { get; set; }
         public ConfigBranch? CurrentConfigBranch { get; set; }
+        public string CurrentHead { get; set; }
     }
 }

src/GitHub.Api/Git/GitClient.cs

@@ -40,6 +40,7 @@ public interface IGitClient
         ITask<TheVersion> LfsVersion(IOutputProcessor<TheVersion> processor = null);
         ITask<GitCountObjects> CountObjects(IOutputProcessor<GitCountObjects> processor = null);
         ITask<GitUser> SetConfigNameAndEmail(string username, string email);
+        ITask<string> GetHead(IOutputProcessor<string> processor = null);
     }
 
     class GitClient : IGitClient
@@ -310,6 +311,12 @@ public ITask<string> Unlock(NPath file, bool force,
                 .Configure(processManager);
         }
 
+        public ITask<string> GetHead(IOutputProcessor<string> processor = null)
+        {
+            return new FirstNonNullLineProcessTask(cancellationToken, "rev-parse --short HEAD") { Name = "Getting current head..." }
+                .Configure(processManager);
+        }
+
         protected static ILogging Logger { get; } = LogHelper.GetLogger<GitClient>();
     }
 

src/GitHub.Api/Git/IRepository.cs

@@ -60,6 +60,7 @@ public interface IRepository : IEquatable<IRepository>, IDisposable, IBackedByCa
         string CurrentBranchName { get; }
         List<GitLogEntry> CurrentLog { get; }
         bool IsBusy { get; }
+        string CurrentHead { get; }
 
         event Action<CacheUpdateEvent> LogChanged;
         event Action<CacheUpdateEvent> TrackingStatusChanged;

src/GitHub.Api/Git/Repository.cs

@@ -238,7 +238,7 @@ private void CacheHasBeenInvalidated(CacheType cacheType)
             }
         }
 
-        private void RepositoryManagerOnCurrentBranchUpdated(ConfigBranch? branch, ConfigRemote? remote)
+        private void RepositoryManagerOnCurrentBranchUpdated(ConfigBranch? branch, ConfigRemote? remote, string head)
         {
             taskManager.RunInUI(() =>
             {
@@ -247,6 +247,7 @@ private void RepositoryManagerOnCurrentBranchUpdated(ConfigBranch? branch, Confi
                 data.CurrentGitBranch = branch.HasValue ? (GitBranch?)GetLocalGitBranch(branch.Value.name, branch.Value) : null;
                 data.CurrentConfigRemote = remote;
                 data.CurrentGitRemote = remote.HasValue ? (GitRemote?)GetGitRemote(remote.Value) : null;
+                data.CurrentHead = head;
                 name = null;
                 cloneUrl = null;
                 cacheContainer.RepositoryInfoCache.UpdateData(data);
@@ -347,6 +348,7 @@ public void Dispose()
         public GitRemote? CurrentRemote => cacheContainer.RepositoryInfoCache.CurrentGitRemote;
         public List<GitLogEntry> CurrentLog => cacheContainer.GitLogCache.Log;
         public List<GitLock> CurrentLocks => cacheContainer.GitLocksCache.GitLocks;
+        public string CurrentHead => cacheContainer.RepositoryInfoCache.CurrentHead;
 
         public UriString CloneUrl
         {

src/GitHub.Api/Git/RepositoryManager.cs

@@ -9,7 +9,7 @@ namespace GitHub.Unity
     public interface IRepositoryManager : IDisposable
     {
         event Action<bool> IsBusyChanged;
-        event Action<ConfigBranch?, ConfigRemote?> CurrentBranchUpdated;
+        event Action<ConfigBranch?, ConfigRemote?, string> CurrentBranchUpdated;
         event Action<GitStatus> GitStatusUpdated;
         event Action<List<GitLock>> GitLocksUpdated;
         event Action<List<GitLogEntry>> GitLogUpdated;
@@ -106,7 +106,7 @@ class RepositoryManager : IRepositoryManager
 
         private bool isBusy;
 
-        public event Action<ConfigBranch?, ConfigRemote?> CurrentBranchUpdated;
+        public event Action<ConfigBranch?, ConfigRemote?, string> CurrentBranchUpdated;
         public event Action<bool> IsBusyChanged;
         public event Action<GitStatus> GitStatusUpdated;
         public event Action<GitAheadBehindStatus> GitAheadBehindStatusUpdated;
@@ -394,9 +394,10 @@ public ITask UpdateRepositoryInfo()
                 ConfigBranch? branch;
                 ConfigRemote? remote;
                 GetCurrentBranchAndRemote(out branch, out remote);
-                CurrentBranchUpdated?.Invoke(branch, remote);
+                var currentHead = GitClient.GetHead().RunSynchronously();
+                CurrentBranchUpdated?.Invoke(branch, remote, currentHead);
             })
-            { Message = "Updating repository info..." };;
+            { Message = "Updating repository info..." };
             return HookupHandlers(task, false);
         }
 

src/GitHub.Api/IO/FileSystem.cs

@@ -23,13 +23,11 @@ public interface IFileSystem
         IEnumerable<string> GetDirectories(string path);
         IEnumerable<string> GetDirectories(string path, string pattern);
         IEnumerable<string> GetDirectories(string path, string pattern, SearchOption searchOption);
-        string GetDirectoryName(string path);
         string GetFileNameWithoutExtension(string fileName);
         IEnumerable<string> GetFiles(string path);
         IEnumerable<string> GetFiles(string path, string pattern);
         IEnumerable<string> GetFiles(string path, string pattern, SearchOption searchOption);
         string GetFullPath(string path);
-        string GetParentDirectory(string path);
         string GetRandomFileName();
         string GetTempPath();
         Stream OpenRead(string path);
@@ -46,6 +44,7 @@ public interface IFileSystem
         void WriteLines(string path, string[] contents);
 
         char DirectorySeparatorChar { get; }
+        string GetProcessDirectory();
     }
 
 
@@ -102,11 +101,6 @@ public string GetFullPath(string path)
             return Path.GetFullPath(path);
         }
 
-        public string GetDirectoryName(string path)
-        {
-            return Path.GetDirectoryName(path);
-        }
-
         public bool DirectoryExists(string path)
         {
             return Directory.Exists(path);
@@ -118,11 +112,6 @@ public bool ExistingPathIsDirectory(string path)
             return (attr & FileAttributes.Directory) == FileAttributes.Directory;
         }
 
-        public string GetParentDirectory(string path)
-        {
-            return Directory.GetParent(path).FullName;
-        }
-
         public IEnumerable<string> GetDirectories(string path, string pattern)
         {
             return Directory.GetDirectories(path, pattern);
@@ -163,7 +152,7 @@ public IEnumerable<string> GetFiles(string path, string pattern, SearchOption se
                 yield break;
 
 #if ENABLE_MONO
-            if (NPath.IsLinux)
+            if (NPath.IsUnix)
             {
                 try
                 {
@@ -177,7 +166,7 @@ public IEnumerable<string> GetFiles(string path, string pattern, SearchOption se
             {
                 var realdir = dir;
 #if ENABLE_MONO
-                if (NPath.IsLinux)
+                if (NPath.IsUnix)
                 {
                     try
                     {
@@ -242,6 +231,11 @@ public string GetCurrentDirectory()
             return Directory.GetCurrentDirectory();
         }
 
+        public string GetProcessDirectory()
+        {
+            return Directory.GetCurrentDirectory();
+        }
+
         public void WriteAllText(string path, string contents)
         {
             File.WriteAllText(path, contents);