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

Added ShowContentInLFSDiff to info struct

Browse source 
Otherwise toggling the button did not trigger a reload of the diff view
This commit is contained in:
Henrik Andersson 2025-06-04 10:40:26 +02:00
parent 2e3a61471f
commit 620118f45f
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/ViewModels/DiffContext.cs
View file

@ -140,7 +140,7 @@ namespace SourceGit.ViewModels
var ignoreWS = Preferences.Instance.IgnoreWhitespaceChangesInDiff; var ignoreWS = Preferences.Instance.IgnoreWhitespaceChangesInDiff;
var showContentInLFSDiff = Preferences.Instance.ShowContentInLFSDiff; 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, showContentInLFSDiff, latest);
if (_info != null && info.IsSame(_info)) if (_info != null && info.IsSame(_info))
return; return;
@ -310,14 +310,16 @@ namespace SourceGit.ViewModels
public string Argument { get; set; } public string Argument { get; set; }
public int UnifiedLines { get; set; } public int UnifiedLines { get; set; }
public bool IgnoreWhitespace { get; set; } public bool IgnoreWhitespace { get; set; }
public bool ShowContentInLFSDiff { get; set; }
public string OldHash { get; set; } public string OldHash { get; set; }
public string NewHash { get; set; } public string NewHash { get; set; }
public Info(Models.DiffOption option, int unifiedLines, bool ignoreWhitespace, Models.DiffResult result) public Info(Models.DiffOption option, int unifiedLines, bool ignoreWhitespace, bool showContentInFLSDiff, Models.DiffResult result)
{ {
Argument = option.ToString(); Argument = option.ToString();
UnifiedLines = unifiedLines; UnifiedLines = unifiedLines;
IgnoreWhitespace = ignoreWhitespace; IgnoreWhitespace = ignoreWhitespace;
ShowContentInLFSDiff = showContentInFLSDiff;
OldHash = result.OldHash; OldHash = result.OldHash;
NewHash = result.NewHash; NewHash = result.NewHash;
} }
@ -327,6 +329,7 @@ namespace SourceGit.ViewModels
return Argument.Equals(other.Argument, StringComparison.Ordinal) && return Argument.Equals(other.Argument, StringComparison.Ordinal) &&
UnifiedLines == other.UnifiedLines && UnifiedLines == other.UnifiedLines &&
IgnoreWhitespace == other.IgnoreWhitespace && IgnoreWhitespace == other.IgnoreWhitespace &&
ShowContentInLFSDiff == other.ShowContentInLFSDiff &&
OldHash.Equals(other.OldHash, StringComparison.Ordinal) && OldHash.Equals(other.OldHash, StringComparison.Ordinal) &&
NewHash.Equals(other.NewHash, StringComparison.Ordinal); NewHash.Equals(other.NewHash, StringComparison.Ordinal);
} }