Add a refresh button

shana · shana · commit a66a7f843dae · 2018-05-17T14:31:42.000+02:00
There may be times when the filesystem has changed but Unity reloads
the domain too fast for us to invalidate the cache, at which point
the data will be stale and won't be automatically updated.
diff --git a/src/GitHub.Api/Git/IRepository.cs b/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);
     }
 }
diff --git a/src/GitHub.Api/Git/Repository.cs b/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)
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Styles.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Styles.cs
@@ -62,7 +62,7 @@ class Styles
                                 headerRepoLabelStyle,
                                 headerTitleStyle,
                                 headerDescriptionStyle,
-                                historyToolbarButtonStyle,
+                                toolbarButtonStyle,
                                 historyLockStyle,
                                 historyEntrySummaryStyle,
                                 historyEntryDetailsStyle,
@@ -378,18 +378,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;
             }
         }
 
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs b/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();
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ChangesView.cs b/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();
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs b/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;
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs
@@ -87,6 +87,8 @@ public override void Refresh()
             base.Refresh();
             gitPathView.Refresh();
             userSettingsView.Refresh();
+            if (Repository != null)
+                Repository.Refresh(CacheType.GitLocks);
         }
 
         public override void OnGUI()
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs
@@ -482,15 +482,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,
@@ -508,7 +508,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,
@@ -525,13 +525,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))

Original file line number	Diff line number	Diff line change
`@@ -78,5 +78,6 @@ public interface IRepository : IEquatable<IRepository>, IDisposable`
`78`	`78`	`ITask DeleteBranch(string branch, bool force);`
`79`	`79`	`ITask CreateBranch(string branch, string baseBranch);`
`80`	`80`	`ITask SwitchBranch(string branch);`
	`81`	`+ void Refresh(CacheType cacheType);`
`81`	`82`	`}`
`82`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -162,14 +162,16 @@ public bool Equals(IRepository other)`
`162`	`162`
`163`	`163`	`private void RefreshCache(CacheType cacheType)`
`164`	`164`	`{`
`165`		`- taskManager.RunInUI(() =>`
	`165`	`+ taskManager.RunInUI(() => Refresh(cacheType));`
	`166`	`+ }`
	`167`	`+`
	`168`	`+ public void Refresh(CacheType cacheType)`
`166`	`169`	`{`
`167`	`170`	`var cache = cacheContainer.GetCache(cacheType);`
`168`	`171`	`// if the cache has valid data, we need to force an invalidation to refresh it`
`169`	`172`	`// if it doesn't have valid data, it will trigger an invalidation automatically`
`170`	`173`	`if (cache.ValidateData())`
`171`	`174`	`cache.InvalidateData();`
`172`		`- });`
`173`	`175`	`}`
`174`	`176`
`175`	`177`	`private void CacheHasBeenInvalidated(CacheType cacheType)`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ class Styles`
`62`	`62`	`headerRepoLabelStyle,`
`63`	`63`	`headerTitleStyle,`
`64`	`64`	`headerDescriptionStyle,`
`65`		`- historyToolbarButtonStyle,`
	`65`	`+ toolbarButtonStyle,`
`66`	`66`	`historyLockStyle,`
`67`	`67`	`historyEntrySummaryStyle,`
`68`	`68`	`historyEntryDetailsStyle,`
`@@ -378,18 +378,18 @@ public static GUIStyle LongMessageStyle`
`378`	`378`	`}`
`379`	`379`	`}`
`380`	`380`
`381`		`- public static GUIStyle HistoryToolbarButtonStyle`
	`381`	`+ public static GUIStyle ToolbarButtonStyle`
`382`	`382`	`{`
`383`	`383`	`get`
`384`	`384`	`{`
`385`		`- if (historyToolbarButtonStyle == null)`
	`385`	`+ if (toolbarButtonStyle == null)`
`386`	`386`	`{`
`387`		`- historyToolbarButtonStyle = new GUIStyle(EditorStyles.toolbarButton);`
`388`		`- historyToolbarButtonStyle.name = "HistoryToolbarButtonStyle";`
`389`		`- historyToolbarButtonStyle.richText = true;`
`390`		`- historyToolbarButtonStyle.wordWrap = true;`
	`387`	`+ toolbarButtonStyle = new GUIStyle(EditorStyles.toolbarButton);`
	`388`	`+ toolbarButtonStyle.name = "HistoryToolbarButtonStyle";`
	`389`	`+ toolbarButtonStyle.richText = true;`
	`390`	`+ toolbarButtonStyle.wordWrap = true;`
`391`	`391`	`}`
`392`		`- return historyToolbarButtonStyle;`
	`392`	`+ return toolbarButtonStyle;`
`393`	`393`	`}`
`394`	`394`	`}`
`395`	`395`
Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,13 @@ public override void OnDisable()`
`92`	`92`	`DetachHandlers(Repository);`
`93`	`93`	`}`
`94`	`94`
	`95`	`+ public override void Refresh()`
	`96`	`+ {`
	`97`	`+ base.Refresh();`
	`98`	`+ Repository.Refresh(CacheType.Branches);`
	`99`	`+ Repository.Refresh(CacheType.RepositoryInfo);`
	`100`	`+ }`
	`101`	`+`
`95`	`102`	`public override void OnDataUpdate()`
`96`	`103`	`{`
`97`	`104`	`base.OnDataUpdate();`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,14 @@ public override void OnDisable()`
`60`	`60`	`DetachHandlers(Repository);`
`61`	`61`	`}`
`62`	`62`
	`63`	`+ public override void Refresh()`
	`64`	`+ {`
	`65`	`+ base.Refresh();`
	`66`	`+ Repository.Refresh(CacheType.GitStatus);`
	`67`	`+ Repository.Refresh(CacheType.RepositoryInfo);`
	`68`	`+ Repository.Refresh(CacheType.GitLocks);`
	`69`	`+ }`
	`70`	`+`
`63`	`71`	`public override void OnDataUpdate()`
`64`	`72`	`{`
`65`	`73`	`base.OnDataUpdate();`
Original file line number	Diff line number	Diff line change
`@@ -345,6 +345,13 @@ public override void OnDisable()`
`345`	`345`	`DetachHandlers(Repository);`
`346`	`346`	`}`
`347`	`347`
	`348`	`+ public override void Refresh()`
	`349`	`+ {`
	`350`	`+ base.Refresh();`
	`351`	`+ Repository.Refresh(CacheType.GitLog);`
	`352`	`+ Repository.Refresh(CacheType.GitAheadBehind);`
	`353`	`+ }`
	`354`	`+`
`348`	`355`	`public override void OnDataUpdate()`
`349`	`356`	`{`
`350`	`357`	`base.OnDataUpdate();`
`@@ -389,11 +396,11 @@ public override void OnGUI()`
`389`	`396`	`// Top bar for scrolling to selection or clearing it`
`390`	`397`	`GUILayout.BeginHorizontal(EditorStyles.toolbar);`
`391`	`398`	`{`
`392`		`- if (GUILayout.Button(CommitDetailsTitle, Styles.HistoryToolbarButtonStyle))`
	`399`	`+ if (GUILayout.Button(CommitDetailsTitle, Styles.ToolbarButtonStyle))`
`393`	`400`	`{`
`394`	`401`	`historyControl.ScrollTo(historyControl.SelectedIndex);`
`395`	`402`	`}`
`396`		`- if (GUILayout.Button(ClearSelectionButton, Styles.HistoryToolbarButtonStyle, GUILayout.ExpandWidth(false)))`
	`403`	`+ if (GUILayout.Button(ClearSelectionButton, Styles.ToolbarButtonStyle, GUILayout.ExpandWidth(false)))`
`397`	`404`	`{`
`398`	`405`	`selectedEntry = GitLogEntry.Default;`
`399`	`406`	`historyControl.SelectedIndex = -1;`
Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,8 @@ public override void Refresh()`
`87`	`87`	`base.Refresh();`
`88`	`88`	`gitPathView.Refresh();`
`89`	`89`	`userSettingsView.Refresh();`
	`90`	`+ if (Repository != null)`
	`91`	`+ Repository.Refresh(CacheType.GitLocks);`
`90`	`92`	`}`
`91`	`93`
`92`	`94`	`public override void OnGUI()`
Original file line number	Diff line number	Diff line change
`@@ -482,15 +482,15 @@ private void DoActionbarGUI()`
`482`	`482`	`EditorGUI.BeginDisabledGroup(currentRemoteName == null);`
`483`	`483`	`{`
`484`	`484`	`// Fetch button`
`485`		`- var fetchClicked = GUILayout.Button(Localization.FetchButtonText, Styles.HistoryToolbarButtonStyle);`
	`485`	`+ var fetchClicked = GUILayout.Button(Localization.FetchButtonText, Styles.ToolbarButtonStyle);`
`486`	`486`	`if (fetchClicked)`
`487`	`487`	`{`
`488`	`488`	`Fetch();`
`489`	`489`	`}`
`490`	`490`
`491`	`491`	`// Pull button`
`492`	`492`	`var pullButtonText = statusBehind > 0 ? String.Format(Localization.PullButtonCount, statusBehind) : Localization.PullButton;`
`493`		`- var pullClicked = GUILayout.Button(pullButtonText, Styles.HistoryToolbarButtonStyle);`
	`493`	`+ var pullClicked = GUILayout.Button(pullButtonText, Styles.ToolbarButtonStyle);`
`494`	`494`
`495`	`495`	`if (pullClicked &&`
`496`	`496`	`EditorUtility.DisplayDialog(Localization.PullConfirmTitle,`
`@@ -508,7 +508,7 @@ private void DoActionbarGUI()`
`508`	`508`	`EditorGUI.BeginDisabledGroup(currentRemoteName == null \|\| statusBehind != 0);`
`509`	`509`	`{`
`510`	`510`	`var pushButtonText = statusAhead > 0 ? String.Format(Localization.PushButtonCount, statusAhead) : Localization.PushButton;`
`511`		`- var pushClicked = GUILayout.Button(pushButtonText, Styles.HistoryToolbarButtonStyle);`
	`511`	`+ var pushClicked = GUILayout.Button(pushButtonText, Styles.ToolbarButtonStyle);`
`512`	`512`
`513`	`513`	`if (pushClicked &&`
`514`	`514`	`EditorUtility.DisplayDialog(Localization.PushConfirmTitle,`
`@@ -525,13 +525,17 @@ private void DoActionbarGUI()`
`525`	`525`	`else`
`526`	`526`	`{`
`527`	`527`	`// Publishing a repo`
`528`		`- var publishedClicked = GUILayout.Button(Localization.PublishButton, Styles.HistoryToolbarButtonStyle);`
`529`		`- if (publishedClicked)`
	`528`	`+ if (GUILayout.Button(Localization.PublishButton, Styles.ToolbarButtonStyle))`
`530`	`529`	`{`
`531`	`530`	`PopupWindow.OpenWindow(PopupWindow.PopupViewType.PublishView);`
`532`	`531`	`}`
`533`	`532`	`}`
`534`	`533`
	`534`	`+ if (GUILayout.Button(Localization.RefreshButton, Styles.ToolbarButtonStyle))`
	`535`	`+ {`
	`536`	`+ Refresh();`
	`537`	`+ }`
	`538`	`+`
`535`	`539`	`GUILayout.FlexibleSpace();`
`536`	`540`
`537`	`541`	`if (GUILayout.Button("Account", EditorStyles.toolbarDropDown))`