Merge branch 'fixes/asset-explorer-refresh' into stanley/0.31-rc

StanleyGoldman · StanleyGoldman · commit 7e99d897aaf9 · 2018-04-04T11:02:22.000-04:00
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ProjectWindowInterface.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ProjectWindowInterface.cs
@@ -34,9 +34,8 @@ public static void Initialize(IRepository repo)
 
             if (repository != null)
             {
-                repository.TrackingStatusChanged += RepositoryOnStatusChanged;
+                repository.StatusEntriesChanged += RepositoryOnStatusEntriesChanged;
                 repository.LocksChanged += RepositoryOnLocksChanged;
-
             }
         }
 
@@ -46,7 +45,7 @@ private static void ValidateCachedData(IRepository repository)
             repository.CheckAndRaiseEventsIfCacheNewer(CacheType.GitLocks, lastLocksChangedEvent);
         }
 
-        private static void RepositoryOnStatusChanged(CacheUpdateEvent cacheUpdateEvent)
+        private static void RepositoryOnStatusEntriesChanged(CacheUpdateEvent cacheUpdateEvent)
         {
             if (!lastRepositoryStatusChangedEvent.Equals(cacheUpdateEvent))
             {

Original file line number	Diff line number	Diff line change
`@@ -34,9 +34,8 @@ public static void Initialize(IRepository repo)`
`34`	`34`
`35`	`35`	`if (repository != null)`
`36`	`36`	`{`
`37`		`- repository.TrackingStatusChanged += RepositoryOnStatusChanged;`
	`37`	`+ repository.StatusEntriesChanged += RepositoryOnStatusEntriesChanged;`
`38`	`38`	`repository.LocksChanged += RepositoryOnLocksChanged;`
`39`		`-`
`40`	`39`	`}`
`41`	`40`	`}`
`42`	`41`
`@@ -46,7 +45,7 @@ private static void ValidateCachedData(IRepository repository)`
`46`	`45`	`repository.CheckAndRaiseEventsIfCacheNewer(CacheType.GitLocks, lastLocksChangedEvent);`
`47`	`46`	`}`
`48`	`47`
`49`		`- private static void RepositoryOnStatusChanged(CacheUpdateEvent cacheUpdateEvent)`
	`48`	`+ private static void RepositoryOnStatusEntriesChanged(CacheUpdateEvent cacheUpdateEvent)`
`50`	`49`	`{`
`51`	`50`	`if (!lastRepositoryStatusChangedEvent.Equals(cacheUpdateEvent))`
`52`	`51`	`{`