enhance: try load lfs image from local cache first before loading it by git lfs smudge command

love-linger · love-linger · commit 2df1830ffc4e · 2025-08-27T11:40:25.000+08:00
Signed-off-by: leo &lt;longshuang@msn.cn&gt;
diff --git a/src/Commands/QueryGitCommonDir.cs b/src/Commands/QueryGitCommonDir.cs
@@ -0,0 +1,27 @@
+﻿using System.IO;
+using System.Threading.Tasks;
+
+namespace SourceGit.Commands
+{
+    public class QueryGitCommonDir : Command
+    {
+        public QueryGitCommonDir(string workDir)
+        {
+            WorkingDirectory = workDir;
+            Args = "rev-parse --git-common-dir";
+            RaiseError = false;
+        }
+
+        public async Task<string> GetResultAsync()
+        {
+            var rs = await ReadToEndAsync().ConfigureAwait(false);
+            if (!rs.IsSuccess || string.IsNullOrEmpty(rs.StdOut))
+                return string.Empty;
+
+            var dir = rs.StdOut.Trim();
+            if (Path.IsPathRooted(dir))
+                return dir;
+            return Path.GetFullPath(Path.Combine(WorkingDirectory, dir));
+        }
+    }
+}
diff --git a/src/ViewModels/FileHistories.cs b/src/ViewModels/FileHistories.cs
@@ -36,7 +36,7 @@ public object ViewContent
             set => SetProperty(ref _viewContent, value);
         }
 
-        public FileHistoriesSingleRevision(Repository repo, string file, Models.Commit revision, bool prevIsDiffMode)
+        public FileHistoriesSingleRevision(string repo, string file, Models.Commit revision, bool prevIsDiffMode)
         {
             _repo = repo;
             _file = file;
@@ -49,7 +49,7 @@ public FileHistoriesSingleRevision(Repository repo, string file, Models.Commit r
 
         public async Task<bool> ResetToSelectedRevisionAsync()
         {
-            return await new Commands.Checkout(_repo.FullPath)
+            return await new Commands.Checkout(_repo)
                 .FileWithRevisionAsync(_file, $"{_revision.SHA}")
                 .ConfigureAwait(false);
         }
@@ -59,13 +59,13 @@ public async Task OpenWithDefaultEditorAsync()
             if (_viewContent is not FileHistoriesRevisionFile { CanOpenWithDefaultEditor: true })
                 return;
 
-            var fullPath = Native.OS.GetAbsPath(_repo.FullPath, _file);
+            var fullPath = Native.OS.GetAbsPath(_repo, _file);
             var fileName = Path.GetFileNameWithoutExtension(fullPath) ?? "";
             var fileExt = Path.GetExtension(fullPath) ?? "";
             var tmpFile = Path.Combine(Path.GetTempPath(), $"{fileName}~{_revision.SHA.AsSpan(0, 10)}{fileExt}");
 
             await Commands.SaveRevisionFile
-                .RunAsync(_repo.FullPath, _revision.SHA, _file, tmpFile)
+                .RunAsync(_repo, _revision.SHA, _file, tmpFile)
                 .ConfigureAwait(false);
 
             Native.OS.OpenWithDefaultEditor(tmpFile);
@@ -81,7 +81,7 @@ private void RefreshViewContent()
 
             Task.Run(async () =>
             {
-                var objs = await new Commands.QueryRevisionObjects(_repo.FullPath, _revision.SHA, _file)
+                var objs = await new Commands.QueryRevisionObjects(_repo, _revision.SHA, _file)
                     .GetResultAsync()
                     .ConfigureAwait(false);
 
@@ -100,31 +100,31 @@ private async Task<object> GetRevisionFileContentAsync(Models.Object obj)
         {
             if (obj.Type == Models.ObjectType.Blob)
             {
-                var isBinary = await new Commands.IsBinary(_repo.FullPath, _revision.SHA, _file).GetResultAsync().ConfigureAwait(false);
+                var isBinary = await new Commands.IsBinary(_repo, _revision.SHA, _file).GetResultAsync().ConfigureAwait(false);
                 if (isBinary)
                 {
                     var imgDecoder = ImageSource.GetDecoder(_file);
                     if (imgDecoder != Models.ImageDecoder.None)
                     {
-                        var source = await ImageSource.FromRevisionAsync(_repo.FullPath, _revision.SHA, _file, imgDecoder).ConfigureAwait(false);
+                        var source = await ImageSource.FromRevisionAsync(_repo, _revision.SHA, _file, imgDecoder).ConfigureAwait(false);
                         var image = new Models.RevisionImageFile(_file, source.Bitmap, source.Size);
                         return new FileHistoriesRevisionFile(_file, image, true);
                     }
 
-                    var size = await new Commands.QueryFileSize(_repo.FullPath, _file, _revision.SHA).GetResultAsync().ConfigureAwait(false);
+                    var size = await new Commands.QueryFileSize(_repo, _file, _revision.SHA).GetResultAsync().ConfigureAwait(false);
                     var binaryFile = new Models.RevisionBinaryFile() { Size = size };
                     return new FileHistoriesRevisionFile(_file, binaryFile, true);
                 }
 
-                var contentStream = await Commands.QueryFileContent.RunAsync(_repo.FullPath, _revision.SHA, _file).ConfigureAwait(false);
+                var contentStream = await Commands.QueryFileContent.RunAsync(_repo, _revision.SHA, _file).ConfigureAwait(false);
                 var content = await new StreamReader(contentStream).ReadToEndAsync();
                 var lfs = Models.LFSObject.Parse(content);
                 if (lfs != null)
                 {
                     var imgDecoder = ImageSource.GetDecoder(_file);
                     if (imgDecoder != Models.ImageDecoder.None)
                     {
-                        var combined = new RevisionLFSImage(_repo.FullPath, _file, lfs, imgDecoder);
+                        var combined = new RevisionLFSImage(_repo, _file, lfs, imgDecoder);
                         return new FileHistoriesRevisionFile(_file, combined, true);
                     }
 
@@ -138,7 +138,7 @@ private async Task<object> GetRevisionFileContentAsync(Models.Object obj)
 
             if (obj.Type == Models.ObjectType.Commit)
             {
-                var submoduleRoot = Path.Combine(_repo.FullPath, _file);
+                var submoduleRoot = Path.Combine(_repo, _file);
                 var commit = await new Commands.QuerySingleCommit(submoduleRoot, obj.SHA).GetResultAsync().ConfigureAwait(false);
                 var message = commit != null ? await new Commands.QueryCommitFullMessage(submoduleRoot, obj.SHA).GetResultAsync().ConfigureAwait(false) : null;
                 var module = new Models.RevisionSubmodule()
@@ -156,10 +156,10 @@ private async Task<object> GetRevisionFileContentAsync(Models.Object obj)
         private void SetViewContentAsDiff()
         {
             var option = new Models.DiffOption(_revision, _file);
-            ViewContent = new DiffContext(_repo.FullPath, option, _viewContent as DiffContext);
+            ViewContent = new DiffContext(_repo, option, _viewContent as DiffContext);
         }
 
-        private Repository _repo = null;
+        private string _repo = null;
         private string _file = null;
         private Models.Commit _revision = null;
         private bool _isDiffMode = false;
@@ -186,7 +186,7 @@ public DiffContext ViewContent
             set => SetProperty(ref _viewContent, value);
         }
 
-        public FileHistoriesCompareRevisions(Repository repo, string file, Models.Commit start, Models.Commit end)
+        public FileHistoriesCompareRevisions(string repo, string file, Models.Commit start, Models.Commit end)
         {
             _repo = repo;
             _file = file;
@@ -204,28 +204,28 @@ public void Swap()
         public async Task<bool> SaveAsPatch(string saveTo)
         {
             return await Commands.SaveChangesAsPatch
-                .ProcessRevisionCompareChangesAsync(_repo.FullPath, _changes, _startPoint.SHA, _endPoint.SHA, saveTo)
+                .ProcessRevisionCompareChangesAsync(_repo, _changes, _startPoint.SHA, _endPoint.SHA, saveTo)
                 .ConfigureAwait(false);
         }
 
         private void RefreshViewContent()
         {
             Task.Run(async () =>
             {
-                _changes = await new Commands.CompareRevisions(_repo.FullPath, _startPoint.SHA, _endPoint.SHA, _file).ReadAsync().ConfigureAwait(false);
+                _changes = await new Commands.CompareRevisions(_repo, _startPoint.SHA, _endPoint.SHA, _file).ReadAsync().ConfigureAwait(false);
                 if (_changes.Count == 0)
                 {
                     Dispatcher.UIThread.Post(() => ViewContent = null);
                 }
                 else
                 {
                     var option = new Models.DiffOption(_startPoint.SHA, _endPoint.SHA, _changes[0]);
-                    Dispatcher.UIThread.Post(() => ViewContent = new DiffContext(_repo.FullPath, option, _viewContent));
+                    Dispatcher.UIThread.Post(() => ViewContent = new DiffContext(_repo, option, _viewContent));
                 }
             });
         }
 
-        private Repository _repo = null;
+        private string _repo = null;
         private string _file = null;
         private Models.Commit _startPoint = null;
         private Models.Commit _endPoint = null;
@@ -264,7 +264,7 @@ public object ViewContent
             private set => SetProperty(ref _viewContent, value);
         }
 
-        public FileHistories(Repository repo, string file, string commit = null)
+        public FileHistories(string repo, string file, string commit = null)
         {
             if (!string.IsNullOrEmpty(commit))
                 Title = $"{file} @ {commit}";
@@ -282,7 +282,7 @@ public FileHistories(Repository repo, string file, string commit = null)
                     .Append(" -- ")
                     .Append(file.Quoted());
 
-                var commits = await new Commands.QueryCommits(_repo.FullPath, argsBuilder.ToString(), false)
+                var commits = await new Commands.QueryCommits(_repo, argsBuilder.ToString(), false)
                     .GetResultAsync()
                     .ConfigureAwait(false);
 
@@ -311,7 +311,18 @@ public FileHistories(Repository repo, string file, string commit = null)
 
         public void NavigateToCommit(Models.Commit commit)
         {
-            _repo.NavigateToCommit(commit.SHA);
+            var launcher = App.GetLauncher();
+            if (launcher != null)
+            {
+                foreach (var page in launcher.Pages)
+                {
+                    if (page.Data is Repository repo && repo.FullPath.Equals(_repo, StringComparison.Ordinal))
+                    {
+                        repo.NavigateToCommit(commit.SHA);
+                        break;
+                    }
+                }
+            }
         }
 
         public string GetCommitFullMessage(Models.Commit commit)
@@ -320,12 +331,12 @@ public string GetCommitFullMessage(Models.Commit commit)
             if (_fullCommitMessages.TryGetValue(sha, out var msg))
                 return msg;
 
-            msg = new Commands.QueryCommitFullMessage(_repo.FullPath, sha).GetResult();
+            msg = new Commands.QueryCommitFullMessage(_repo, sha).GetResult();
             _fullCommitMessages[sha] = msg;
             return msg;
         }
 
-        private readonly Repository _repo = null;
+        private readonly string _repo = null;
         private bool _isLoading = true;
         private bool _prevIsDiffMode = true;
         private List<Models.Commit> _commits = null;
diff --git a/src/ViewModels/ImageSource.cs b/src/ViewModels/ImageSource.cs
@@ -3,6 +3,7 @@
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
+
 using Avalonia;
 using Avalonia.Media.Imaging;
 using Avalonia.Platform;
@@ -52,7 +53,12 @@ public static async Task<ImageSource> FromLFSObjectAsync(string repo, Models.LFS
             if (string.IsNullOrEmpty(lfs.Oid) || lfs.Size == 0)
                 return new ImageSource(null, 0);
 
-            var stream = await Commands.QueryFileContent.FromLFSAsync(repo, lfs.Oid, lfs.Size).ConfigureAwait(false);
+            var commonDir = await new Commands.QueryGitCommonDir(repo).GetResultAsync().ConfigureAwait(false);
+            var localFile = Path.Combine(commonDir, "lfs", "objects", lfs.Oid.Substring(0, 2), lfs.Oid.Substring(2, 2), lfs.Oid);
+            if (File.Exists(localFile))
+                return await FromFileAsync(localFile, decoder).ConfigureAwait(false);
+
+            await using var stream = await Commands.QueryFileContent.FromLFSAsync(repo, lfs.Oid, lfs.Size).ConfigureAwait(false);
             return await Task.Run(() => LoadFromStream(stream, decoder)).ConfigureAwait(false);
         }
 
diff --git a/src/ViewModels/RevisionLFSImage.cs b/src/ViewModels/RevisionLFSImage.cs
@@ -25,7 +25,7 @@ public RevisionLFSImage(string repo, string file, Models.LFSObject lfs, Models.I
             {
                 var source = await ImageSource.FromLFSObjectAsync(repo, lfs, decoder).ConfigureAwait(false);
                 var img = new Models.RevisionImageFile(file, source.Bitmap, source.Size);
-                Dispatcher.UIThread.Invoke(() => Image = img);
+                Dispatcher.UIThread.Post(() => Image = img);
             });
         }
 
diff --git a/src/Views/CommitDetail.axaml.cs b/src/Views/CommitDetail.axaml.cs
@@ -137,7 +137,7 @@ public ContextMenu CreateChangeContextMenu(Models.Change change)
             history.Icon = App.CreateMenuIcon("Icons.Histories");
             history.Click += (_, ev) =>
             {
-                App.ShowWindow(new ViewModels.FileHistories(repo, change.Path, commit.SHA));
+                App.ShowWindow(new ViewModels.FileHistories(repo.FullPath, change.Path, commit.SHA));
                 ev.Handled = true;
             };
 
diff --git a/src/Views/RevisionFileTreeView.axaml.cs b/src/Views/RevisionFileTreeView.axaml.cs
@@ -535,7 +535,7 @@ public ContextMenu CreateRevisionFileContextMenu(ViewModels.Repository repo, Vie
             history.Icon = App.CreateMenuIcon("Icons.Histories");
             history.Click += (_, ev) =>
             {
-                App.ShowWindow(new ViewModels.FileHistories(repo, file.Path, commit.SHA));
+                App.ShowWindow(new ViewModels.FileHistories(repo.FullPath, file.Path, commit.SHA));
                 ev.Handled = true;
             };
 
diff --git a/src/Views/SubmodulesView.axaml.cs b/src/Views/SubmodulesView.axaml.cs
@@ -248,7 +248,7 @@ private void OnItemContextRequested(object sender, ContextRequestedEventArgs e)
                     histories.Icon = App.CreateMenuIcon("Icons.Histories");
                     histories.Click += (_, ev) =>
                     {
-                        App.ShowWindow(new ViewModels.FileHistories(repo, submodule.Path));
+                        App.ShowWindow(new ViewModels.FileHistories(repo.FullPath, submodule.Path));
                         ev.Handled = true;
                     };
 
diff --git a/src/Views/WorkingCopy.axaml.cs b/src/Views/WorkingCopy.axaml.cs
@@ -620,7 +620,7 @@ private ContextMenu CreateContextMenuForUnstagedChanges(ViewModels.WorkingCopy v
                     history.Icon = App.CreateMenuIcon("Icons.Histories");
                     history.Click += (_, e) =>
                     {
-                        App.ShowWindow(new ViewModels.FileHistories(repo, change.Path));
+                        App.ShowWindow(new ViewModels.FileHistories(repo.FullPath, change.Path));
                         e.Handled = true;
                     };
 
@@ -1086,7 +1086,7 @@ public ContextMenu CreateContextMenuForStagedChanges(ViewModels.WorkingCopy vm,
                     history.Icon = App.CreateMenuIcon("Icons.Histories");
                     history.Click += (_, e) =>
                     {
-                        App.ShowWindow(new ViewModels.FileHistories(repo, change.Path));
+                        App.ShowWindow(new ViewModels.FileHistories(repo.FullPath, change.Path));
                         e.Handled = true;
                     };
 

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public object ViewContent`
`36`	`36`	`set => SetProperty(ref _viewContent, value);`
`37`	`37`	`}`
`38`	`38`
`39`		`- public FileHistoriesSingleRevision(Repository repo, string file, Models.Commit revision, bool prevIsDiffMode)`
	`39`	`+ public FileHistoriesSingleRevision(string repo, string file, Models.Commit revision, bool prevIsDiffMode)`
`40`	`40`	`{`
`41`	`41`	`_repo = repo;`
`42`	`42`	`_file = file;`
`@@ -49,7 +49,7 @@ public FileHistoriesSingleRevision(Repository repo, string file, Models.Commit r`
`49`	`49`
`50`	`50`	`public async Task<bool> ResetToSelectedRevisionAsync()`
`51`	`51`	`{`
`52`		`- return await new Commands.Checkout(_repo.FullPath)`
	`52`	`+ return await new Commands.Checkout(_repo)`
`53`	`53`	`.FileWithRevisionAsync(_file, $"{_revision.SHA}")`
`54`	`54`	`.ConfigureAwait(false);`
`55`	`55`	`}`
`@@ -59,13 +59,13 @@ public async Task OpenWithDefaultEditorAsync()`
`59`	`59`	`if (_viewContent is not FileHistoriesRevisionFile { CanOpenWithDefaultEditor: true })`
`60`	`60`	`return;`
`61`	`61`
`62`		`- var fullPath = Native.OS.GetAbsPath(_repo.FullPath, _file);`
	`62`	`+ var fullPath = Native.OS.GetAbsPath(_repo, _file);`
`63`	`63`	`var fileName = Path.GetFileNameWithoutExtension(fullPath) ?? "";`
`64`	`64`	`var fileExt = Path.GetExtension(fullPath) ?? "";`
`65`	`65`	`var tmpFile = Path.Combine(Path.GetTempPath(), $"{fileName}~{_revision.SHA.AsSpan(0, 10)}{fileExt}");`
`66`	`66`
`67`	`67`	`await Commands.SaveRevisionFile`
`68`		`- .RunAsync(_repo.FullPath, _revision.SHA, _file, tmpFile)`
	`68`	`+ .RunAsync(_repo, _revision.SHA, _file, tmpFile)`
`69`	`69`	`.ConfigureAwait(false);`
`70`	`70`
`71`	`71`	`Native.OS.OpenWithDefaultEditor(tmpFile);`
`@@ -81,7 +81,7 @@ private void RefreshViewContent()`
`81`	`81`
`82`	`82`	`Task.Run(async () =>`
`83`	`83`	`{`
`84`		`- var objs = await new Commands.QueryRevisionObjects(_repo.FullPath, _revision.SHA, _file)`
	`84`	`+ var objs = await new Commands.QueryRevisionObjects(_repo, _revision.SHA, _file)`
`85`	`85`	`.GetResultAsync()`
`86`	`86`	`.ConfigureAwait(false);`
`87`	`87`
`@@ -100,31 +100,31 @@ private async Task<object> GetRevisionFileContentAsync(Models.Object obj)`
`100`	`100`	`{`
`101`	`101`	`if (obj.Type == Models.ObjectType.Blob)`
`102`	`102`	`{`
`103`		`- var isBinary = await new Commands.IsBinary(_repo.FullPath, _revision.SHA, _file).GetResultAsync().ConfigureAwait(false);`
	`103`	`+ var isBinary = await new Commands.IsBinary(_repo, _revision.SHA, _file).GetResultAsync().ConfigureAwait(false);`
`104`	`104`	`if (isBinary)`
`105`	`105`	`{`
`106`	`106`	`var imgDecoder = ImageSource.GetDecoder(_file);`
`107`	`107`	`if (imgDecoder != Models.ImageDecoder.None)`
`108`	`108`	`{`
`109`		`- var source = await ImageSource.FromRevisionAsync(_repo.FullPath, _revision.SHA, _file, imgDecoder).ConfigureAwait(false);`
	`109`	`+ var source = await ImageSource.FromRevisionAsync(_repo, _revision.SHA, _file, imgDecoder).ConfigureAwait(false);`
`110`	`110`	`var image = new Models.RevisionImageFile(_file, source.Bitmap, source.Size);`
`111`	`111`	`return new FileHistoriesRevisionFile(_file, image, true);`
`112`	`112`	`}`
`113`	`113`
`114`		`- var size = await new Commands.QueryFileSize(_repo.FullPath, _file, _revision.SHA).GetResultAsync().ConfigureAwait(false);`
	`114`	`+ var size = await new Commands.QueryFileSize(_repo, _file, _revision.SHA).GetResultAsync().ConfigureAwait(false);`
`115`	`115`	`var binaryFile = new Models.RevisionBinaryFile() { Size = size };`
`116`	`116`	`return new FileHistoriesRevisionFile(_file, binaryFile, true);`
`117`	`117`	`}`
`118`	`118`
`119`		`- var contentStream = await Commands.QueryFileContent.RunAsync(_repo.FullPath, _revision.SHA, _file).ConfigureAwait(false);`
	`119`	`+ var contentStream = await Commands.QueryFileContent.RunAsync(_repo, _revision.SHA, _file).ConfigureAwait(false);`
`120`	`120`	`var content = await new StreamReader(contentStream).ReadToEndAsync();`
`121`	`121`	`var lfs = Models.LFSObject.Parse(content);`
`122`	`122`	`if (lfs != null)`
`123`	`123`	`{`
`124`	`124`	`var imgDecoder = ImageSource.GetDecoder(_file);`
`125`	`125`	`if (imgDecoder != Models.ImageDecoder.None)`
`126`	`126`	`{`
`127`		`- var combined = new RevisionLFSImage(_repo.FullPath, _file, lfs, imgDecoder);`
	`127`	`+ var combined = new RevisionLFSImage(_repo, _file, lfs, imgDecoder);`
`128`	`128`	`return new FileHistoriesRevisionFile(_file, combined, true);`
`129`	`129`	`}`
`130`	`130`
`@@ -138,7 +138,7 @@ private async Task<object> GetRevisionFileContentAsync(Models.Object obj)`
`138`	`138`
`139`	`139`	`if (obj.Type == Models.ObjectType.Commit)`
`140`	`140`	`{`
`141`		`- var submoduleRoot = Path.Combine(_repo.FullPath, _file);`
	`141`	`+ var submoduleRoot = Path.Combine(_repo, _file);`
`142`	`142`	`var commit = await new Commands.QuerySingleCommit(submoduleRoot, obj.SHA).GetResultAsync().ConfigureAwait(false);`
`143`	`143`	`var message = commit != null ? await new Commands.QueryCommitFullMessage(submoduleRoot, obj.SHA).GetResultAsync().ConfigureAwait(false) : null;`
`144`	`144`	`var module = new Models.RevisionSubmodule()`
`@@ -156,10 +156,10 @@ private async Task<object> GetRevisionFileContentAsync(Models.Object obj)`
`156`	`156`	`private void SetViewContentAsDiff()`
`157`	`157`	`{`
`158`	`158`	`var option = new Models.DiffOption(_revision, _file);`
`159`		`- ViewContent = new DiffContext(_repo.FullPath, option, _viewContent as DiffContext);`
	`159`	`+ ViewContent = new DiffContext(_repo, option, _viewContent as DiffContext);`
`160`	`160`	`}`
`161`	`161`
`162`		`- private Repository _repo = null;`
	`162`	`+ private string _repo = null;`
`163`	`163`	`private string _file = null;`
`164`	`164`	`private Models.Commit _revision = null;`
`165`	`165`	`private bool _isDiffMode = false;`
`@@ -186,7 +186,7 @@ public DiffContext ViewContent`
`186`	`186`	`set => SetProperty(ref _viewContent, value);`
`187`	`187`	`}`
`188`	`188`
`189`		`- public FileHistoriesCompareRevisions(Repository repo, string file, Models.Commit start, Models.Commit end)`
	`189`	`+ public FileHistoriesCompareRevisions(string repo, string file, Models.Commit start, Models.Commit end)`
`190`	`190`	`{`
`191`	`191`	`_repo = repo;`
`192`	`192`	`_file = file;`
`@@ -204,28 +204,28 @@ public void Swap()`
`204`	`204`	`public async Task<bool> SaveAsPatch(string saveTo)`
`205`	`205`	`{`
`206`	`206`	`return await Commands.SaveChangesAsPatch`
`207`		`- .ProcessRevisionCompareChangesAsync(_repo.FullPath, _changes, _startPoint.SHA, _endPoint.SHA, saveTo)`
	`207`	`+ .ProcessRevisionCompareChangesAsync(_repo, _changes, _startPoint.SHA, _endPoint.SHA, saveTo)`
`208`	`208`	`.ConfigureAwait(false);`
`209`	`209`	`}`
`210`	`210`
`211`	`211`	`private void RefreshViewContent()`
`212`	`212`	`{`
`213`	`213`	`Task.Run(async () =>`
`214`	`214`	`{`
`215`		`- _changes = await new Commands.CompareRevisions(_repo.FullPath, _startPoint.SHA, _endPoint.SHA, _file).ReadAsync().ConfigureAwait(false);`
	`215`	`+ _changes = await new Commands.CompareRevisions(_repo, _startPoint.SHA, _endPoint.SHA, _file).ReadAsync().ConfigureAwait(false);`
`216`	`216`	`if (_changes.Count == 0)`
`217`	`217`	`{`
`218`	`218`	`Dispatcher.UIThread.Post(() => ViewContent = null);`
`219`	`219`	`}`
`220`	`220`	`else`
`221`	`221`	`{`
`222`	`222`	`var option = new Models.DiffOption(_startPoint.SHA, _endPoint.SHA, _changes[0]);`
`223`		`- Dispatcher.UIThread.Post(() => ViewContent = new DiffContext(_repo.FullPath, option, _viewContent));`
	`223`	`+ Dispatcher.UIThread.Post(() => ViewContent = new DiffContext(_repo, option, _viewContent));`
`224`	`224`	`}`
`225`	`225`	`});`
`226`	`226`	`}`
`227`	`227`
`228`		`- private Repository _repo = null;`
	`228`	`+ private string _repo = null;`
`229`	`229`	`private string _file = null;`
`230`	`230`	`private Models.Commit _startPoint = null;`
`231`	`231`	`private Models.Commit _endPoint = null;`
`@@ -264,7 +264,7 @@ public object ViewContent`
`264`	`264`	`private set => SetProperty(ref _viewContent, value);`
`265`	`265`	`}`
`266`	`266`
`267`		`- public FileHistories(Repository repo, string file, string commit = null)`
	`267`	`+ public FileHistories(string repo, string file, string commit = null)`
`268`	`268`	`{`
`269`	`269`	`if (!string.IsNullOrEmpty(commit))`
`270`	`270`	`Title = $"{file} @ {commit}";`
`@@ -282,7 +282,7 @@ public FileHistories(Repository repo, string file, string commit = null)`
`282`	`282`	`.Append(" -- ")`
`283`	`283`	`.Append(file.Quoted());`
`284`	`284`
`285`		`- var commits = await new Commands.QueryCommits(_repo.FullPath, argsBuilder.ToString(), false)`
	`285`	`+ var commits = await new Commands.QueryCommits(_repo, argsBuilder.ToString(), false)`
`286`	`286`	`.GetResultAsync()`
`287`	`287`	`.ConfigureAwait(false);`
`288`	`288`
`@@ -311,7 +311,18 @@ public FileHistories(Repository repo, string file, string commit = null)`
`311`	`311`
`312`	`312`	`public void NavigateToCommit(Models.Commit commit)`
`313`	`313`	`{`
`314`		`- _repo.NavigateToCommit(commit.SHA);`
	`314`	`+ var launcher = App.GetLauncher();`
	`315`	`+ if (launcher != null)`
	`316`	`+ {`
	`317`	`+ foreach (var page in launcher.Pages)`
	`318`	`+ {`
	`319`	`+ if (page.Data is Repository repo && repo.FullPath.Equals(_repo, StringComparison.Ordinal))`
	`320`	`+ {`
	`321`	`+ repo.NavigateToCommit(commit.SHA);`
	`322`	`+ break;`
	`323`	`+ }`
	`324`	`+ }`
	`325`	`+ }`
`315`	`326`	`}`
`316`	`327`
`317`	`328`	`public string GetCommitFullMessage(Models.Commit commit)`
`@@ -320,12 +331,12 @@ public string GetCommitFullMessage(Models.Commit commit)`
`320`	`331`	`if (_fullCommitMessages.TryGetValue(sha, out var msg))`
`321`	`332`	`return msg;`
`322`	`333`
`323`		`- msg = new Commands.QueryCommitFullMessage(_repo.FullPath, sha).GetResult();`
	`334`	`+ msg = new Commands.QueryCommitFullMessage(_repo, sha).GetResult();`
`324`	`335`	`_fullCommitMessages[sha] = msg;`
`325`	`336`	`return msg;`
`326`	`337`	`}`
`327`	`338`
`328`		`- private readonly Repository _repo = null;`
	`339`	`+ private readonly string _repo = null;`
`329`	`340`	`private bool _isLoading = true;`
`330`	`341`	`private bool _prevIsDiffMode = true;`
`331`	`342`	`private List<Models.Commit> _commits = null;`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public RevisionLFSImage(string repo, string file, Models.LFSObject lfs, Models.I`
`25`	`25`	`{`
`26`	`26`	`var source = await ImageSource.FromLFSObjectAsync(repo, lfs, decoder).ConfigureAwait(false);`
`27`	`27`	`var img = new Models.RevisionImageFile(file, source.Bitmap, source.Size);`
`28`		`- Dispatcher.UIThread.Invoke(() => Image = img);`
	`28`	`+ Dispatcher.UIThread.Post(() => Image = img);`
`29`	`29`	`});`
`30`	`30`	`}`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ public ContextMenu CreateChangeContextMenu(Models.Change change)`
`137`	`137`	`history.Icon = App.CreateMenuIcon("Icons.Histories");`
`138`	`138`	`history.Click += (_, ev) =>`
`139`	`139`	`{`
`140`		`- App.ShowWindow(new ViewModels.FileHistories(repo, change.Path, commit.SHA));`
	`140`	`+ App.ShowWindow(new ViewModels.FileHistories(repo.FullPath, change.Path, commit.SHA));`
`141`	`141`	`ev.Handled = true;`
`142`	`142`	`};`
`143`	`143`
Original file line number	Diff line number	Diff line change
`@@ -535,7 +535,7 @@ public ContextMenu CreateRevisionFileContextMenu(ViewModels.Repository repo, Vie`
`535`	`535`	`history.Icon = App.CreateMenuIcon("Icons.Histories");`
`536`	`536`	`history.Click += (_, ev) =>`
`537`	`537`	`{`
`538`		`- App.ShowWindow(new ViewModels.FileHistories(repo, file.Path, commit.SHA));`
	`538`	`+ App.ShowWindow(new ViewModels.FileHistories(repo.FullPath, file.Path, commit.SHA));`
`539`	`539`	`ev.Handled = true;`
`540`	`540`	`};`
`541`	`541`
Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,7 @@ private void OnItemContextRequested(object sender, ContextRequestedEventArgs e)`
`248`	`248`	`histories.Icon = App.CreateMenuIcon("Icons.Histories");`
`249`	`249`	`histories.Click += (_, ev) =>`
`250`	`250`	`{`
`251`		`- App.ShowWindow(new ViewModels.FileHistories(repo, submodule.Path));`
	`251`	`+ App.ShowWindow(new ViewModels.FileHistories(repo.FullPath, submodule.Path));`
`252`	`252`	`ev.Handled = true;`
`253`	`253`	`};`
`254`	`254`