Merge branch 'master' into features/lock-files-view

Author: StanleyGoldman

src/GitHub.Api/Git/IRepository.cs

@@ -78,5 +78,6 @@ public interface IRepository : IEquatable<IRepository>, IDisposable
         ITask DeleteBranch(string branch, bool force);
         ITask CreateBranch(string branch, string baseBranch);
         ITask SwitchBranch(string branch);
+        void Refresh(CacheType cacheType);
     }
 }

src/GitHub.Api/Git/Repository.cs

@@ -162,14 +162,16 @@ public bool Equals(IRepository other)
 
         private void RefreshCache(CacheType cacheType)
         {
-            taskManager.RunInUI(() =>
+            taskManager.RunInUI(() => Refresh(cacheType));
+        }
+
+        public void Refresh(CacheType cacheType)
             {
                 var cache = cacheContainer.GetCache(cacheType);
                 // if the cache has valid data, we need to force an invalidation to refresh it
                 // if it doesn't have valid data, it will trigger an invalidation automatically
                 if (cache.ValidateData())
                     cache.InvalidateData();
-            });
         }
 
         private void CacheHasBeenInvalidated(CacheType cacheType)

src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Styles.cs

@@ -66,7 +66,7 @@ class Styles
                                 headerRepoLabelStyle,
                                 headerTitleStyle,
                                 headerDescriptionStyle,
-                                historyToolbarButtonStyle,
+                                toolbarButtonStyle,
                                 historyLockStyle,
                                 historyEntrySummaryStyle,
                                 historyEntryDetailsStyle,
@@ -382,18 +382,18 @@ public static GUIStyle LongMessageStyle
             }
         }
 
-        public static GUIStyle HistoryToolbarButtonStyle
+        public static GUIStyle ToolbarButtonStyle
         {
             get
             {
-                if (historyToolbarButtonStyle == null)
+                if (toolbarButtonStyle == null)
                 {
-                    historyToolbarButtonStyle = new GUIStyle(EditorStyles.toolbarButton);
-                    historyToolbarButtonStyle.name = "HistoryToolbarButtonStyle";
-                    historyToolbarButtonStyle.richText = true;
-                    historyToolbarButtonStyle.wordWrap = true;
+                    toolbarButtonStyle = new GUIStyle(EditorStyles.toolbarButton);
+                    toolbarButtonStyle.name = "HistoryToolbarButtonStyle";
+                    toolbarButtonStyle.richText = true;
+                    toolbarButtonStyle.wordWrap = true;
                 }
-                return historyToolbarButtonStyle;
+                return toolbarButtonStyle;
             }
         }
 

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs

@@ -92,6 +92,13 @@ public override void OnDisable()
             DetachHandlers(Repository);
         }
 
+        public override void Refresh()
+        {
+            base.Refresh();
+            Repository.Refresh(CacheType.Branches);
+            Repository.Refresh(CacheType.RepositoryInfo);
+        }
+
         public override void OnDataUpdate()
         {
             base.OnDataUpdate();

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ChangesView.cs

@@ -60,6 +60,14 @@ public override void OnDisable()
             DetachHandlers(Repository);
         }
 
+        public override void Refresh()
+        {
+            base.Refresh();
+            Repository.Refresh(CacheType.GitStatus);
+            Repository.Refresh(CacheType.RepositoryInfo);
+            Repository.Refresh(CacheType.GitLocks);
+        }
+
         public override void OnDataUpdate()
         {
             base.OnDataUpdate();
@@ -355,10 +363,10 @@ private void Commit()
                         if (success)
                         {
                             TaskManager.Run(UsageTracker.IncrementChangesViewButtonCommit);
-                        }
 
-                        commitMessage = "";
-                        commitBody = "";
+                            commitMessage = "";
+                            commitBody = "";
+                        }
                     }).Start();
         }
     }

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs

@@ -345,6 +345,13 @@ public override void OnDisable()
             DetachHandlers(Repository);
         }
 
+        public override void Refresh()
+        {
+            base.Refresh();
+            Repository.Refresh(CacheType.GitLog);
+            Repository.Refresh(CacheType.GitAheadBehind);
+        }
+
         public override void OnDataUpdate()
         {
             base.OnDataUpdate();
@@ -389,11 +396,11 @@ public override void OnGUI()
                 // Top bar for scrolling to selection or clearing it
                 GUILayout.BeginHorizontal(EditorStyles.toolbar);
                 {
-                    if (GUILayout.Button(CommitDetailsTitle, Styles.HistoryToolbarButtonStyle))
+                    if (GUILayout.Button(CommitDetailsTitle, Styles.ToolbarButtonStyle))
                     {
                         historyControl.ScrollTo(historyControl.SelectedIndex);
                     }
-                    if (GUILayout.Button(ClearSelectionButton, Styles.HistoryToolbarButtonStyle, GUILayout.ExpandWidth(false)))
+                    if (GUILayout.Button(ClearSelectionButton, Styles.ToolbarButtonStyle, GUILayout.ExpandWidth(false)))
                     {
                         selectedEntry = GitLogEntry.Default;
                         historyControl.SelectedIndex = -1;

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs

@@ -81,6 +81,8 @@ public override void Refresh()
             base.Refresh();
             gitPathView.Refresh();
             userSettingsView.Refresh();
+            if (Repository != null)
+                Repository.Refresh(CacheType.GitLocks);
         }
 
         public override void OnGUI()

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs

@@ -486,15 +486,15 @@ private void DoActionbarGUI()
                     EditorGUI.BeginDisabledGroup(currentRemoteName == null);
                     {
                         // Fetch button
-                        var fetchClicked = GUILayout.Button(Localization.FetchButtonText, Styles.HistoryToolbarButtonStyle);
+                        var fetchClicked = GUILayout.Button(Localization.FetchButtonText, Styles.ToolbarButtonStyle);
                         if (fetchClicked)
                         {
                             Fetch();
                         }
 
                         // Pull button
                         var pullButtonText = statusBehind > 0 ? String.Format(Localization.PullButtonCount, statusBehind) : Localization.PullButton;
-                        var pullClicked = GUILayout.Button(pullButtonText, Styles.HistoryToolbarButtonStyle);
+                        var pullClicked = GUILayout.Button(pullButtonText, Styles.ToolbarButtonStyle);
 
                         if (pullClicked &&
                             EditorUtility.DisplayDialog(Localization.PullConfirmTitle,
@@ -512,7 +512,7 @@ private void DoActionbarGUI()
                     EditorGUI.BeginDisabledGroup(currentRemoteName == null || statusBehind != 0);
                     {
                         var pushButtonText = statusAhead > 0 ? String.Format(Localization.PushButtonCount, statusAhead) : Localization.PushButton;
-                        var pushClicked = GUILayout.Button(pushButtonText, Styles.HistoryToolbarButtonStyle);
+                        var pushClicked = GUILayout.Button(pushButtonText, Styles.ToolbarButtonStyle);
 
                         if (pushClicked &&
                             EditorUtility.DisplayDialog(Localization.PushConfirmTitle,
@@ -529,13 +529,17 @@ private void DoActionbarGUI()
                 else
                 {
                     // Publishing a repo
-                    var publishedClicked = GUILayout.Button(Localization.PublishButton, Styles.HistoryToolbarButtonStyle);
-                    if (publishedClicked)
+                    if (GUILayout.Button(Localization.PublishButton, Styles.ToolbarButtonStyle))
                     {
                         PopupWindow.OpenWindow(PopupWindow.PopupViewType.PublishView);
                     }
                 }
 
+                if (GUILayout.Button(Localization.RefreshButton, Styles.ToolbarButtonStyle))
+                {
+                    Refresh();
+                }
+
                 GUILayout.FlexibleSpace();
 
                 if (GUILayout.Button("Account", EditorStyles.toolbarDropDown))