Merge branch 'master' into feature/inline-reviews-tooltip

Author: jcansdale

src/GitHub.App/Factories/HostCacheFactory.cs

@@ -1,17 +1,22 @@
 using System;
 using System.ComponentModel.Composition;
 using System.IO;
+using System.Reactive.Linq;
 using Akavache;
 using GitHub.Primitives;
 using Rothko;
 using GitHub.Extensions;
+using System.Threading.Tasks;
 
 namespace GitHub.Factories
 {
     [Export(typeof(IHostCacheFactory))]
     [PartCreationPolicy(CreationPolicy.Shared)]
     public class HostCacheFactory : IHostCacheFactory
     {
+        const int CacheVersion = 1;
+        const string CacheVersionKey = "cacheVersion";
+
         readonly Lazy<IBlobCacheFactory> blobCacheFactory;
         readonly Lazy<IOperatingSystem> operatingSystem;
 
@@ -22,7 +27,7 @@ public HostCacheFactory(Lazy<IBlobCacheFactory> blobCacheFactory, Lazy<IOperatin
             this.operatingSystem = operatingSystem;
         }
 
-        public IBlobCache Create(HostAddress hostAddress)
+        public async Task<IBlobCache> Create(HostAddress hostAddress)
         {
             var environment = OperatingSystem.Environment;
             // For GitHub.com, the cache file name should be "api.github.com.cache.db"
@@ -34,7 +39,17 @@ public IBlobCache Create(HostAddress hostAddress)
 
             // CreateDirectory is a noop if the directory already exists.
             OperatingSystem.Directory.CreateDirectory(Path.GetDirectoryName(userAccountPath));
-            return BlobCacheFactory.CreateBlobCache(userAccountPath);
+
+            var cache = BlobCacheFactory.CreateBlobCache(userAccountPath);
+            var version = await cache.GetOrCreateObject<int>(CacheVersionKey, () => 0);
+
+            if (version != CacheVersion)
+            {
+                await cache.InvalidateAll();
+                await cache.InsertObject(CacheVersionKey, CacheVersion);
+            }
+
+            return cache;
         }
 
         IOperatingSystem OperatingSystem { get { return operatingSystem.Value; } }

src/GitHub.App/Factories/IHostCacheFactory.cs

@@ -1,11 +1,12 @@
 using Akavache;
 using GitHub.Primitives;
 using System;
+using System.Threading.Tasks;
 
 namespace GitHub.Factories
 {
     public interface IHostCacheFactory : IDisposable
     {
-        IBlobCache Create(HostAddress hostAddress);
+        Task<IBlobCache> Create(HostAddress hostAddress);
     }
 }

src/GitHub.App/Factories/RepositoryHostFactory.cs

@@ -44,7 +44,7 @@ public RepositoryHostFactory(
         public async Task<IRepositoryHost> Create(HostAddress hostAddress)
         {
             var apiClient = await apiClientFactory.Create(hostAddress);
-            var hostCache = hostCacheFactory.Create(hostAddress);
+            var hostCache = await hostCacheFactory.Create(hostAddress);
             var modelService = new ModelService(apiClient, hostCache, avatarProvider);
             var host = new RepositoryHost(apiClient, modelService, loginManager, loginCache, usage);
             hosts.Add(host);

src/GitHub.App/Services/GitClient.cs

@@ -296,7 +296,7 @@ public Task<string> ExtractFile(IRepository repository, string commitSha, string
             return Task.Factory.StartNew(() =>
             {
                 var commit = repository.Lookup<Commit>(commitSha);
-                if(commit == null)
+                if (commit == null)
                 {
                     throw new FileNotFoundException("Couldn't find '" + fileName + "' at commit " + commitSha + ".");
                 }

src/GitHub.App/ViewModels/RepositoryCloneViewModel.cs

@@ -125,15 +125,17 @@ public override void Initialize([AllowNull] ViewWithData data)
 
             IsBusy = true;
             repositoryHost.ModelService.GetRepositories(repositories);
-            repositories.OriginalCompleted.Subscribe(
-                _ => { }
-                , ex =>
-                {
-                    LoadingFailed = true;
-                    IsBusy = false;
-                    log.Error("Error while loading repositories", ex);
-                },
-                () => IsBusy = false
+            repositories.OriginalCompleted
+                .ObserveOn(RxApp.MainThreadScheduler)
+                .Subscribe(
+                    _ => { }
+                    , ex =>
+                    {
+                        LoadingFailed = true;
+                        IsBusy = false;
+                        log.Error("Error while loading repositories", ex);
+                    },
+                    () => IsBusy = false
             );
             repositories.Subscribe();
         }

src/GitHub.Exports/Models/DiffUtilities.cs

@@ -96,7 +96,10 @@ public static DiffLine Match(IEnumerable<DiffChunk> diff, IList<DiffLine> target
                 {
                     if (source.Lines[i].Content == target[j].Content)
                     {
-                        if (++j == target.Count) return source.Lines[i + j - 1];
+                        if (++j == target.Count || i == 0)
+                        {
+                            return source.Lines[i + j - 1];
+                        }
                     }
                     else
                     {

src/GitHub.Extensions/StringExtensions.cs

@@ -180,21 +180,6 @@ public static string Wrap(this string text, int maxLength = 72)
             return sb.ToString();
         }
 
-        public static bool EqualsIgnoringLineEndings(this string a, string b)
-        {
-            if (ReferenceEquals(a, b))
-                return true;
-
-            if (a == null || b == null)
-                return false;
-
-            // TODO: Write a non-allocating comparison.
-            a = a.Replace("\r\n", "\n");
-            b = b.Replace("\r\n", "\n");
-
-            return a == b;
-        }
-
         public static Uri ToUriSafe(this string url)
         {
             Uri uri;

src/GitHub.InlineReviews/Commands/InlineCommentNavigationCommand.cs

@@ -49,7 +49,7 @@ public override bool IsEnabled
             get
             {
                 var tags = GetTags(GetCurrentTextViews());
-                return tags.Count > 1;
+                return tags.Count > 0;
             }
         }
 

src/GitHub.InlineReviews/GitHub.InlineReviews.csproj

@@ -82,6 +82,7 @@
     <Compile Include="InlineReviewsPackage.cs" />
     <Compile Include="Models\InlineCommentThreadModel.cs" />
     <Compile Include="Models\PullRequestSessionFile.cs" />
+    <Compile Include="Tags\MouseEnterAndLeaveEventRouter.cs" />
     <Compile Include="Peek\InlineCommentPeekableItem.cs" />
     <Compile Include="Peek\InlineCommentPeekableItemSource.cs" />
     <Compile Include="Peek\InlineCommentPeekableItemSourceProvider.cs" />

src/GitHub.InlineReviews/Glyph/GlyphData.cs

@@ -5,6 +5,10 @@
 
 namespace GitHub.InlineReviews.Glyph.Implementation
 {
+    /// <summary>
+    /// Information about the position of a glyph.
+    /// </summary>
+    /// <typeparam name="TGlyphTag">The type of glyph tag we're dealing with.</typeparam>
     internal class GlyphData<TGlyphTag>
     {
         double deltaY;