Skip to content

Commit 52fcc97

Browse files
authored
Merge branch 'sourcegit-scm:develop' into develop
2 parents e9c5c69 + 3e65576 commit 52fcc97

9 files changed

Lines changed: 42 additions & 14 deletions

File tree

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2026.23
1+
2026.24

‎src/Commands/Command.cs‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,13 +147,18 @@ protected async Task<Result> ReadToEndAsync()
147147
return Result.Failed(e.Message);
148148
}
149149

150-
var rs = new Result() { IsSuccess = true };
151-
rs.StdOut = await proc.StandardOutput.ReadToEndAsync(CancellationToken).ConfigureAwait(false);
152-
rs.StdErr = await proc.StandardError.ReadToEndAsync(CancellationToken).ConfigureAwait(false);
153-
await proc.WaitForExitAsync(CancellationToken).ConfigureAwait(false);
150+
var stdOutTask = proc.StandardOutput.ReadToEndAsync(CancellationToken);
151+
var stdErrTask = proc.StandardError.ReadToEndAsync(CancellationToken);
152+
var waitForExitTask = proc.WaitForExitAsync(CancellationToken);
154153

155-
rs.IsSuccess = proc.ExitCode == 0;
156-
return rs;
154+
await Task.WhenAll(stdOutTask, stdErrTask, waitForExitTask).ConfigureAwait(false);
155+
156+
return new Result
157+
{
158+
IsSuccess = proc.ExitCode == 0,
159+
StdOut = await stdOutTask.ConfigureAwait(false),
160+
StdErr = await stdErrTask.ConfigureAwait(false)
161+
};
157162
}
158163

159164
protected ProcessStartInfo CreateGitStartInfo(bool redirect)

‎src/Models/DiffResult.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ public partial class TextDiff
5353
public int NewMode { get; set; } = 0;
5454
public string OldHash { get; set; } = string.Empty;
5555
public string NewHash { get; set; } = string.Empty;
56+
public bool IsNewOrDeletedFile => OldMode != NewMode && (OldMode == 0 || NewMode == 0);
5657
}
5758

5859
public class LFSDiff

‎src/Models/User.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public User(string data)
2525

2626
public static User FindOrAdd(string data)
2727
{
28-
return _caches.GetOrAdd(data, key => new User(key));
28+
return _caches.GetOrAdd(data, static key => new User(key));
2929
}
3030

3131
public override string ToString()

‎src/ViewModels/DiffContext.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public void CheckSettings()
104104
return;
105105
}
106106

107-
if (ctx.IsSideBySide() != pref.UseSideBySideDiff)
107+
if (ctx.IsSideBySide() != pref.UseSideBySideDiff && !ctx.Data.IsNewOrDeletedFile)
108108
Content = ctx.SwitchMode();
109109
}
110110
else if (Content is Models.NoOrEOLChange)
@@ -188,7 +188,7 @@ private void LoadContent()
188188
IsTextDiff = true;
189189
IsIgnoreWhitespaceVisible = true;
190190

191-
if (Preferences.Instance.UseSideBySideDiff)
191+
if (Preferences.Instance.UseSideBySideDiff && !cur.IsNewOrDeletedFile)
192192
Content = new TwoSideTextDiff(_option, cur, _content as TextDiffContext);
193193
else
194194
Content = new CombinedTextDiff(_option, cur, _content as TextDiffContext);
@@ -256,7 +256,7 @@ private void LoadContent()
256256
imgDiff.Old = oldImage.Bitmap;
257257
imgDiff.OldFileSize = oldImage.Size;
258258

259-
var newImage = await ImageSource.FromRevisionAsync(_repo, string.Empty, oldPath, imgDecoder).ConfigureAwait(false);
259+
var newImage = await ImageSource.FromRevisionAsync(_repo, string.Empty, _option.Path, imgDecoder).ConfigureAwait(false);
260260
imgDiff.New = newImage.Bitmap;
261261
imgDiff.NewFileSize = newImage.Size;
262262
}

‎src/ViewModels/Repository.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,10 @@ public void Close()
481481
{
482482
var commitMessage = _workingCopy.CommitMessage;
483483
if (!string.IsNullOrEmpty(commitMessage) && _workingCopy.InProgressContext != null)
484+
{
484485
File.WriteAllText(Path.Combine(GitDir, "MERGE_MSG"), commitMessage);
486+
commitMessage = string.Empty; // Clears this from ui-state, since it is already saved in MERGE_MSG file.
487+
}
485488

486489
_uiStates.LastCommitMessage = commitMessage;
487490
_uiStates.Save();

‎src/ViewModels/WorkingCopy.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -817,6 +817,8 @@ private void UpdateInProgressState()
817817

818818
if (oldType != null && IsAutoLoadedCommitMessage())
819819
CommitMessage = string.Empty;
820+
else if (string.IsNullOrEmpty(_commitMessage))
821+
LoadCommitMessageFromFile(Path.Combine(_repo.GitDir, "MERGE_MSG"));
820822

821823
return;
822824
}

‎src/Views/ControlExtensions.cs‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,19 @@ public static Control CreateFromViewModels(object data)
2626

2727
public static async Task CopyTextAsync(this Control control, string text)
2828
{
29-
var clipboard = TopLevel.GetTopLevel(control)?.Clipboard;
30-
if (clipboard != null)
31-
await clipboard.SetTextAsync(text);
29+
var topLevel = TopLevel.GetTopLevel(control) as Window;
30+
if (topLevel == null)
31+
return;
32+
33+
try
34+
{
35+
if (topLevel.Clipboard is { } clipboard)
36+
await clipboard.SetTextAsync(text);
37+
}
38+
catch (Exception e)
39+
{
40+
await new Alert().ShowAsync(topLevel, "Failed to copy text to clipboard: " + e.Message, true);
41+
}
3242
}
3343

3444
public static Path CreateMenuIcon(this Control control, string iconKey)

‎src/Views/TextDiffView.axaml.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1028,6 +1028,13 @@ protected override void OnDataContextChanged(EventArgs e)
10281028
}
10291029

10301030
Text = builder.ToString();
1031+
1032+
var oldLineNumberVisible = !diff.IsNewOrDeletedFile || diff.OldMode != 0;
1033+
var newLineNumberVisible = !diff.IsNewOrDeletedFile || diff.NewMode != 0;
1034+
TextArea.LeftMargins[0].IsVisible = oldLineNumberVisible;
1035+
TextArea.LeftMargins[1].IsVisible = oldLineNumberVisible;
1036+
TextArea.LeftMargins[2].IsVisible = newLineNumberVisible;
1037+
TextArea.LeftMargins[3].IsVisible = newLineNumberVisible;
10311038
}
10321039
else
10331040
{

0 commit comments

Comments
 (0)