Merge pull request #937 from github-for-unity/refrsh-asset-database

StanleyGoldman · web-flow · commit 1c53148a39f8 · 2018-10-10T10:33:35.000-04:00
Refreshing the asset database differently
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs
@@ -514,6 +514,7 @@ private void SwitchBranch(string branch)
                         {
                             UsageTracker.IncrementBranchesViewButtonCheckoutLocalBranch();
                             Redraw();
+                            AssetDatabase.Refresh();
                         }
                         else
                         {
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ProjectWindowInterface.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ProjectWindowInterface.cs
@@ -67,7 +67,6 @@ private static void RepositoryOnStatusEntriesChanged(CacheUpdateEvent cacheUpdat
             if (!lastRepositoryStatusChangedEvent.Equals(cacheUpdateEvent))
             {
                 lastRepositoryStatusChangedEvent = cacheUpdateEvent;
-                AssetDatabase.Refresh();
                 entries.Clear();
                 entries.AddRange(Repository.CurrentChanges);
                 OnStatusUpdate();
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs
@@ -757,6 +757,8 @@ private void Pull()
                             EditorUtility.DisplayDialog(Localization.PullActionTitle,
                                 String.Format(Localization.PullSuccessDescription, currentRemoteName),
                             Localization.Ok);
+
+                            AssetDatabase.Refresh();
                         }
                         else
                         {

Original file line number	Diff line number	Diff line change
`@@ -514,6 +514,7 @@ private void SwitchBranch(string branch)`
`514`	`514`	`{`
`515`	`515`	`UsageTracker.IncrementBranchesViewButtonCheckoutLocalBranch();`
`516`	`516`	`Redraw();`
	`517`	`+ AssetDatabase.Refresh();`
`517`	`518`	`}`
`518`	`519`	`else`
`519`	`520`	`{`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,6 @@ private static void RepositoryOnStatusEntriesChanged(CacheUpdateEvent cacheUpdat`
`67`	`67`	`if (!lastRepositoryStatusChangedEvent.Equals(cacheUpdateEvent))`
`68`	`68`	`{`
`69`	`69`	`lastRepositoryStatusChangedEvent = cacheUpdateEvent;`
`70`		`- AssetDatabase.Refresh();`
`71`	`70`	`entries.Clear();`
`72`	`71`	`entries.AddRange(Repository.CurrentChanges);`
`73`	`72`	`OnStatusUpdate();`
Original file line number	Diff line number	Diff line change
`@@ -757,6 +757,8 @@ private void Pull()`
`757`	`757`	`EditorUtility.DisplayDialog(Localization.PullActionTitle,`
`758`	`758`	`String.Format(Localization.PullSuccessDescription, currentRemoteName),`
`759`	`759`	`Localization.Ok);`
	`760`	`+`
	`761`	`+ AssetDatabase.Refresh();`
`760`	`762`	`}`
`761`	`763`	`else`
`762`	`764`	`{`