Skip to content

Commit 808302c

Browse files
committed
code_review: PR #1106
- Use new syntex `[...]` instead of `new char[] {...}` to create char arrays - Use `string.ReplaceLineEndings('\n').Split('\n')` instead of `string.Split(['\n', '\r'], StringSplitOptions.RemoveEmptyEntries)` because that the `Signer` part may be missing Signed-off-by: leo <[email protected]>
1 parent b930066 commit 808302c

11 files changed

+15
-15
lines changed

src/Commands/Config.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public Dictionary<string, string> ListAll()
2929
var rs = new Dictionary<string, string>();
3030
if (output.IsSuccess)
3131
{
32-
var lines = output.StdOut.Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries);
32+
var lines = output.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
3333
foreach (var line in lines)
3434
{
3535
var idx = line.IndexOf('=', StringComparison.Ordinal);

src/Commands/CountLocalChangesWithoutUntracked.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public int Result()
1616
var rs = ReadToEnd();
1717
if (rs.IsSuccess)
1818
{
19-
var lines = rs.StdOut.Split(['\n', '\r'], StringSplitOptions.RemoveEmptyEntries);
19+
var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
2020
return lines.Length;
2121
}
2222

src/Commands/LFS.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public void Prune(Action<string> outputHandler)
8282
var rs = cmd.ReadToEnd();
8383
if (rs.IsSuccess)
8484
{
85-
var lines = rs.StdOut.Split(new[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries);
85+
var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
8686
foreach (var line in lines)
8787
{
8888
var match = REG_LOCK().Match(line);

src/Commands/QueryBranches.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public QueryBranches(string repo)
2424
if (!rs.IsSuccess)
2525
return branches;
2626

27-
var lines = rs.StdOut.Split('\n', StringSplitOptions.RemoveEmptyEntries);
27+
var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
2828
var remoteBranches = new HashSet<string>();
2929
foreach (var line in lines)
3030
{

src/Commands/QueryCommitSignInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ public Models.CommitSignInfo Result()
2020
if (!rs.IsSuccess)
2121
return null;
2222

23-
var raw = rs.StdOut.Trim();
23+
var raw = rs.StdOut.Trim().ReplaceLineEndings("\n");
2424
if (raw.Length <= 1)
2525
return null;
2626

27-
var lines = raw.Split(['\n', '\r'], StringSplitOptions.RemoveEmptyEntries);
27+
var lines = raw.Split('\n');
2828
return new Models.CommitSignInfo()
2929
{
3030
VerifyResult = lines[0][0],

src/Commands/QueryCommits.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public QueryCommits(string repo, string limits, bool needFindHead = true)
1010
{
1111
WorkingDirectory = repo;
1212
Context = repo;
13-
Args = $"log --no-show-signature --decorate=full --pretty=format:%H%n%P%n%D%n%aN±%aE%n%at%n%cN±%cE%n%ct%n%s {limits}";
13+
Args = $"log --no-show-signature --decorate=full --format=%H%n%P%n%D%n%aN±%aE%n%at%n%cN±%cE%n%ct%n%s {limits}";
1414
_findFirstMerged = needFindHead;
1515
}
1616

@@ -35,7 +35,7 @@ public QueryCommits(string repo, string filter, Models.CommitSearchMethod method
3535
var argsBuilder = new StringBuilder();
3636
argsBuilder.Append(search);
3737

38-
var words = filter.Split(new[] { ' ', '\t', '\r' }, StringSplitOptions.RemoveEmptyEntries);
38+
var words = filter.Split([' ', '\t', '\r'], StringSplitOptions.RemoveEmptyEntries);
3939
foreach (var word in words)
4040
{
4141
var escaped = word.Trim().Replace("\"", "\\\"", StringComparison.Ordinal);
@@ -124,7 +124,7 @@ private void MarkFirstMerged()
124124
Args = $"log --since=\"{_commits[^1].CommitterTimeStr}\" --format=\"%H\"";
125125

126126
var rs = ReadToEnd();
127-
var shas = rs.StdOut.Split('\n', StringSplitOptions.RemoveEmptyEntries);
127+
var shas = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
128128
if (shas.Length == 0)
129129
return;
130130

src/Commands/QueryRefsContainsCommit.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public QueryRefsContainsCommit(string repo, string commit)
2020
if (!output.IsSuccess)
2121
return rs;
2222

23-
var lines = output.StdOut.Split('\n');
23+
var lines = output.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
2424
foreach (var line in lines)
2525
{
2626
if (line.EndsWith("/HEAD", StringComparison.Ordinal))

src/Commands/QueryStagedChangesWithAmend.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public QueryStagedChangesWithAmend(string repo)
2424
if (rs.IsSuccess)
2525
{
2626
var changes = new List<Models.Change>();
27-
var lines = rs.StdOut.Split('\n', StringSplitOptions.RemoveEmptyEntries);
27+
var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
2828
foreach (var line in lines)
2929
{
3030
var match = REG_FORMAT2().Match(line);

src/Commands/QuerySubmodules.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public QuerySubmodules(string repo)
2626
var rs = ReadToEnd();
2727

2828
var builder = new StringBuilder();
29-
var lines = rs.StdOut.Split('\n', System.StringSplitOptions.RemoveEmptyEntries);
29+
var lines = rs.StdOut.Split(['r', '\n'], System.StringSplitOptions.RemoveEmptyEntries);
3030
foreach (var line in lines)
3131
{
3232
var match = REG_FORMAT1().Match(line);
@@ -55,7 +55,7 @@ public QuerySubmodules(string repo)
5555
return submodules;
5656

5757
var dirty = new HashSet<string>();
58-
lines = rs.StdOut.Split('\n', System.StringSplitOptions.RemoveEmptyEntries);
58+
lines = rs.StdOut.Split(['\r', '\n'], System.StringSplitOptions.RemoveEmptyEntries);
5959
foreach (var line in lines)
6060
{
6161
var match = REG_FORMAT_STATUS().Match(line);

src/Commands/QueryTrackStatus.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public Models.BranchTrackStatus Result()
1919
if (!rs.IsSuccess)
2020
return status;
2121

22-
var lines = rs.StdOut.Split(new char[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries);
22+
var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
2323
foreach (var line in lines)
2424
{
2525
if (line[0] == '>')

0 commit comments

Comments
 (0)