Merge branch 'master' into fixes/update-repository-info

Author: StanleyGoldman

common/SolutionInfo.cs

@@ -31,6 +31,6 @@
 namespace System
 {
     internal static class AssemblyVersionInformation {
-        internal const string Version = "0.22.0";
+        internal const string Version = "0.23.0";
     }
 }

src/GitHub.Api/Git/GitClient.cs

@@ -23,7 +23,7 @@ ITask<string> GetConfig(string key, GitConfigSource configSource,
         ITask<string> SetConfig(string key, string value, GitConfigSource configSource,
             IOutputProcessor<string> processor = null);
 
-        ITask<string[]> GetConfigUserAndEmail();
+        ITask<User> GetConfigUserAndEmail();
 
         ITask<List<GitLock>> ListLocks(bool local,
             BaseOutputListProcessor<GitLock> processor = null);
@@ -255,26 +255,28 @@ public ITask<string> SetConfig(string key, string value, GitConfigSource configS
                 .Configure(processManager);
         }
 
-        public ITask<string[]> GetConfigUserAndEmail()
+        public ITask<User> GetConfigUserAndEmail()
         {
             string username = null;
             string email = null;
 
-            return GetConfig("user.name", GitConfigSource.User).Then((success, value) => {
-                if (success)
-                {
-                    username = value;
-                }
-
-            }).Then(GetConfig("user.email", GitConfigSource.User).Then((success, value) => {
-                if (success)
-                {
-                    email = value;
-                }
-            })).Then(success => {
-                Logger.Trace("user.name:{1} user.email:{2}", success, username, email);
-                return new[] { username, email };
-            });
+            return GetConfig("user.name", GitConfigSource.User)
+                .Then((success, value) => {
+                    if (success)
+                    {
+                        username = value;
+                    }
+                })
+                .Then(GetConfig("user.email", GitConfigSource.User)
+                .Then((success, value) => {
+                    if (success)
+                    {
+                        email = value;
+                    }
+                })).Then(success => {
+                    Logger.Trace("{0}:{1} {2}:{3}", "user.name", username, "user.email", email);
+                    return new User { Name= username, Email = email };
+                });
         }
 
         public ITask<List<GitLock>> ListLocks(bool local, BaseOutputListProcessor<GitLock> processor = null)

src/GitHub.Api/Git/IRepository.cs

@@ -19,6 +19,9 @@ public interface IRepository : IEquatable<IRepository>
         ITask RequestLock(string file);
         ITask ReleaseLock(string file, bool force);
 
+        void RefreshLog();
+        void RefreshStatus();
+        void UpdateConfigData();
         void CheckLogChangedEvent(CacheUpdateEvent gitLogCacheUpdateEvent);
         void CheckStatusChangedEvent(CacheUpdateEvent cacheUpdateEvent);
         void CheckCurrentBranchChangedEvent(CacheUpdateEvent cacheUpdateEvent);

src/GitHub.Api/Git/Repository.cs

@@ -81,12 +81,22 @@ public ITask SetupRemote(string remote, string remoteUrl)
 
         public ITask CommitAllFiles(string message, string body)
         {
-            return repositoryManager.CommitAllFiles(message, body);
+            return repositoryManager
+                .CommitAllFiles(message, body)
+                .Then(() => {
+                    UpdateGitStatus();
+                    UpdateGitLog();
+                });
         }
 
         public ITask CommitFiles(List<string> files, string message, string body)
         {
-            return repositoryManager.CommitFiles(files, message, body);
+            return repositoryManager
+                .CommitFiles(files, message, body)
+                .Then(() => {
+                    UpdateGitStatus();
+                    UpdateGitLog();
+                });
         }
 
         public ITask Pull()
@@ -122,6 +132,21 @@ public ITask ReleaseLock(string file, bool force)
                 .Then(UpdateLocks);
         }
 
+        public void RefreshLog()
+        {
+            UpdateGitLog();
+        }
+
+        public void RefreshStatus()
+        {
+            UpdateGitStatus();
+        }
+
+        public void UpdateConfigData()
+        {
+            repositoryManager?.UpdateConfigData();
+        }
+
         public void CheckLogChangedEvent(CacheUpdateEvent cacheUpdateEvent)
         {
             var managedCache = cacheContainer.GitLogCache;

src/GitHub.Api/Git/RepositoryManager.cs

@@ -40,6 +40,7 @@ public interface IRepositoryManager : IDisposable
         ITask LockFile(string file);
         ITask UnlockFile(string file, bool force);
         int WaitForEvents();
+        void UpdateConfigData();
 
         IGitConfig Config { get; }
         IGitClient GitClient { get; }
@@ -296,21 +297,17 @@ public ITask UnlockFile(string file, bool force)
             return HookupHandlers(task);
         }
 
+        public void UpdateConfigData()
+        {
+            UpdateConfigData(false);
+        }
+
         private void LoadGitUser()
         {
             GitClient.GetConfigUserAndEmail()
-                .Then((success, strings) => {
-                    var username = strings[0];
-                    var email = strings[1];
-
-                    var user = new User {
-                        Name = username,
-                        Email = email
-                    };
-
+                .Then((success, user) => {
                     Logger.Trace("OnGitUserLoaded: {0}", user);
                     OnGitUserLoaded?.Invoke(user);
-
                 }).Start();
         }
 

src/GitHub.Api/Localization.resx

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
+  <!--
+    Microsoft ResX Schema
+
     Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
     associated with the data types.
-    
+
     Example:
-    
+
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-                
-    There are any number of "resheader" rows that contain simple 
+
+    There are any number of "resheader" rows that contain simple
     name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
     mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
     extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
     read any of the formats listed below.
-    
+
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
+    value   : The object must be serialized into a byte array
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -286,12 +286,12 @@
     <value>Branch pushed</value>
   </data>
   <data name="InitializeRepositoryButtonText" xml:space="preserve">
-    <value>Initialize repository</value>
+    <value>Initialize a git repository for this project</value>
   </data>
   <data name="SwitchBranchTitle" xml:space="preserve">
     <value>Switch branch</value>
   </data>
   <data name="SwitchBranchFailedDescription" xml:space="preserve">
     <value>Could not switch to branch {0}</value>
   </data>
-</root>
+</root>

src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj

@@ -151,6 +151,8 @@
     <EmbeddedResource Include="IconsAndLogos\dot.png" />
     <EmbeddedResource Include="IconsAndLogos\dropdown-list-icon%402x.png" />
     <EmbeddedResource Include="IconsAndLogos\dropdown-list-icon.png" />
+    <EmbeddedResource Include="IconsAndLogos\[email protected]" />
+    <EmbeddedResource Include="IconsAndLogos\empty-state-init.png" />
     <EmbeddedResource Include="IconsAndLogos\favorite-branch-indicator.png" />
     <EmbeddedResource Include="IconsAndLogos\git-merge%402x.png" />
     <EmbeddedResource Include="IconsAndLogos\git-merge-light%402x.png" />
@@ -207,12 +209,12 @@
   </ItemGroup>
   <Import Project="..\..\..\..\..\common\nativelibraries.props" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
   -->
   <Import Project="..\..\..\..\..\common\build.targets" />
-</Project>
+</Project>

src/UnityExtension/Assets/Editor/GitHub.Unity/IconsAndLogos/empty-state-init.png

@@ -69,6 +69,7 @@ class Styles
                                 commitFileAreaStyle,
                                 commitButtonStyle,
                                 textFieldStyle,
+                                boldCenteredLabel,
                                 centeredLabel,
                                 commitDescriptionFieldStyle,
                                 toggleMixedStyle,
@@ -94,6 +95,7 @@ class Styles
                                  localCommitIcon,
                                  repoIcon,
                                  lockIcon,
+                                 emptyStateInit,
                                  dropdownListIcon;
 
         public static Texture2D GetFileStatusIcon(GitFileStatus status, bool isLocked)
@@ -556,6 +558,22 @@ public static GUIStyle CenteredLabel
             }
         }
 
+        public static GUIStyle BoldCenteredLabel
+        {
+            get
+            {
+                if (boldCenteredLabel == null)
+                {
+                    boldCenteredLabel = new GUIStyle(EditorStyles.boldLabel);
+                    boldCenteredLabel.name = "BoldCenteredLabelStyle";
+                    boldCenteredLabel.alignment = TextAnchor.MiddleCenter;
+                    boldCenteredLabel.wordWrap = true;
+                }
+                return boldCenteredLabel;
+            }
+        }
+
+
         public static GUIStyle CommitDescriptionFieldStyle
         {
             get
@@ -787,6 +805,19 @@ public static Texture2D LockIcon
             }
         }
 
+        public static Texture2D EmptyStateInit
+        {
+          get
+          {
+            if (emptyStateInit == null)
+            {
+              emptyStateInit = Utility.GetIcon("empty-state-init.png", "[email protected]");
+            }
+            return emptyStateInit;
+          }
+
+        }
+
         public static Texture2D DropdownListIcon
         {
             get