Skip to content

Commit c1d6b38

Browse files
committed
code_review: PR #1540
- Fix the issue that `StringReader` traits all outputs of `git ls-tree -z` command as a single-line - Remove unused namespace using Signed-off-by: leo <[email protected]>
1 parent 5c9d96f commit c1d6b38

File tree

6 files changed

+8
-24
lines changed

6 files changed

+8
-24
lines changed

src/Commands/QueryRevisionObjects.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public QueryRevisionObjects(string repo, string sha, string parentFolder)
1414
{
1515
WorkingDirectory = repo;
1616
Context = repo;
17-
Args = $"ls-tree -z {sha}";
17+
Args = $"ls-tree {sha}";
1818

1919
if (!string.IsNullOrEmpty(parentFolder))
2020
Args += $" -- \"{parentFolder}\"";

src/ViewModels/ChangeTreeNode.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
using System;
21
using System.Collections.Generic;
32

43
using CommunityToolkit.Mvvm.ComponentModel;

src/ViewModels/SubmoduleCollection.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
1+
using System.Collections.Generic;
32

43
using Avalonia.Collections;
54

src/ViewModels/TagCollection.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
using System;
21
using System.Collections.Generic;
32

43
using Avalonia.Collections;

src/ViewModels/WorkingCopy.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1652,10 +1652,9 @@ public ContextMenu CreateContextMenuForCommitMessages()
16521652
{
16531653
for (int i = 0; i < historiesCount; i++)
16541654
{
1655-
var message = _repo.Settings.CommitMessages[i].Trim().ReplaceLineEndings("\n");
1656-
var subject = message.Split('\n', 2)[0];
1655+
var message = _repo.Settings.CommitMessages[i].Trim().ReplaceLineEndings(" ");
16571656
var item = new MenuItem();
1658-
item.Header = new CommitMessageRecord(subject);
1657+
item.Header = new CommitMessageRecord(message);
16591658
item.Icon = App.CreateMenuIcon("Icons.Histories");
16601659
item.Click += (_, e) =>
16611660
{

src/Views/CommitMessageEditor.axaml.cs

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,9 @@ public void AsStandalone(string file)
2020

2121
var content = File.ReadAllText(file).ReplaceLineEndings("\n").Trim();
2222
var parts = content.Split('\n', 2);
23-
if (parts.Length != 2)
24-
{
25-
Editor.SubjectEditor.Text = content;
26-
}
27-
else
28-
{
29-
Editor.SubjectEditor.Text = parts[0];
23+
Editor.SubjectEditor.Text = parts[0];
24+
if (parts.Length > 1)
3025
Editor.DescriptionEditor.Text = parts[1];
31-
}
3226
}
3327

3428
public void AsBuiltin(string msg, Action<string> onSave)
@@ -37,15 +31,9 @@ public void AsBuiltin(string msg, Action<string> onSave)
3731
_shouldExitApp = false;
3832

3933
var parts = msg.Split('\n', 2);
40-
if (parts.Length != 2)
41-
{
42-
Editor.SubjectEditor.Text = msg;
43-
}
44-
else
45-
{
46-
Editor.SubjectEditor.Text = parts[0];
34+
Editor.SubjectEditor.Text = parts[0];
35+
if (parts.Length > 1)
4736
Editor.DescriptionEditor.Text = parts[1];
48-
}
4937
}
5038

5139
protected override void OnClosed(EventArgs e)

0 commit comments

Comments
 (0)