dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-06-21 02:15:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Added ability to diff lfs file contents

Browse source
This commit is contained in:
Henrik Andersson 2025-06-04 10:40:26 +02:00
parent 052132d796
commit 2e3a61471f
1 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/ViewModels/DiffContext.cs
View file

@ -138,6 +138,7 @@ namespace SourceGit.ViewModels
// so instead we set a very high number for the "lines of context" parameter. // so instead we set a very high number for the "lines of context" parameter.
var numLines = Preferences.Instance.UseFullTextDiff ? 999999999 : _unifiedLines; var numLines = Preferences.Instance.UseFullTextDiff ? 999999999 : _unifiedLines;
var ignoreWS = Preferences.Instance.IgnoreWhitespaceChangesInDiff; var ignoreWS = Preferences.Instance.IgnoreWhitespaceChangesInDiff;
var showContentInLFSDiff = Preferences.Instance.ShowContentInLFSDiff;
var latest = new Commands.Diff(_repo, _option, numLines, ignoreWS).Result(); var latest = new Commands.Diff(_repo, _option, numLines, ignoreWS).Result();
var info = new Info(_option, numLines, ignoreWS, latest); var info = new Info(_option, numLines, ignoreWS, latest);
if (_info != null && info.IsSame(_info)) if (_info != null && info.IsSame(_info))
@ -146,6 +147,18 @@ namespace SourceGit.ViewModels
_info = info; _info = info;
var rs = GetDiffObject(latest, _option); var rs = GetDiffObject(latest, _option);
if (latest.IsLFS && showContentInLFSDiff)
{
var newLFSFilePath = GetLFSObjectPath(latest.LFSDiff.New.Oid);
var oldLFSFilePath = latest.LFSDiff.Old.Oid.Length > 0 ? GetLFSObjectPath(latest.LFSDiff.Old.Oid) : "/dev/null";
var oidDiffOption = new DiffOption(oldLFSFilePath, newLFSFilePath);
var oidDiff = new Commands.Diff(_repo, oidDiffOption, numLines, ignoreWS).Result();
// FIXME: if we have an lfs file that points to another lfs file, the showContentInLFSDiff will toggle between the
// original lfs pointer sha and the 1 depth recursed lfs sha pointer
rs = GetDiffObject(oidDiff, oidDiffOption, _option.Path);
}
Dispatcher.UIThread.Post(() => Dispatcher.UIThread.Post(() =>
{ {
@ -160,7 +173,7 @@ namespace SourceGit.ViewModels
}); });
} }
private object GetDiffObject(DiffResult diffResult, DiffOption diffOption) private object GetDiffObject(DiffResult diffResult, DiffOption diffOption, string LFSOrigFilePath = "")
{ {
var rs = null as object; var rs = null as object;
if (diffResult.TextDiff != null) if (diffResult.TextDiff != null)
@ -201,7 +214,7 @@ namespace SourceGit.ViewModels
else if (diffResult.IsBinary) else if (diffResult.IsBinary)
{ {
var oldPath = string.IsNullOrEmpty(diffOption.OrgPath) ? diffOption.Path : diffOption.OrgPath; var oldPath = string.IsNullOrEmpty(diffOption.OrgPath) ? diffOption.Path : diffOption.OrgPath;
var ext = Path.GetExtension(diffOption.Path); var ext = LFSOrigFilePath.Length == 0 ? Path.GetExtension(diffOption.Path) : Path.GetExtension(LFSOrigFilePath);
if (IMG_EXTS.Contains(ext)) if (IMG_EXTS.Contains(ext))
{ {