refactor: use StringBuilder instead of concating string with operator +

love-linger · love-linger · commit 291361df5ce1 · 2025-12-04T16:28:49.000+08:00
Signed-off-by: leo &lt;longshuang@msn.cn&gt;
diff --git a/src/Commands/Apply.cs b/src/Commands/Apply.cs
@@ -1,19 +1,26 @@
-﻿namespace SourceGit.Commands
+﻿using System.Text;
+
+namespace SourceGit.Commands
 {
     public class Apply : Command
     {
         public Apply(string repo, string file, bool ignoreWhitespace, string whitespaceMode, string extra)
         {
             WorkingDirectory = repo;
             Context = repo;
-            Args = "apply ";
+
+            var builder = new StringBuilder(1024);
+            builder.Append("apply ");
+
             if (ignoreWhitespace)
-                Args += "--ignore-whitespace ";
+                builder.Append("--ignore-whitespace ");
             else
-                Args += $"--whitespace={whitespaceMode} ";
+                builder.Append("--whitespace=").Append(whitespaceMode).Append(' ');
+
             if (!string.IsNullOrEmpty(extra))
-                Args += $"{extra} ";
-            Args += $"{file.Quoted()}";
+                builder.Append(extra).Append(' ');
+
+            Args = builder.Append(file.Quoted()).ToString();
         }
     }
 }
diff --git a/src/Commands/CherryPick.cs b/src/Commands/CherryPick.cs
@@ -1,4 +1,6 @@
-﻿namespace SourceGit.Commands
+﻿using System.Text;
+
+namespace SourceGit.Commands
 {
     public class CherryPick : Command
     {
@@ -7,14 +9,16 @@ public CherryPick(string repo, string commits, bool noCommit, bool appendSourceT
             WorkingDirectory = repo;
             Context = repo;
 
-            Args = "cherry-pick ";
+            var builder = new StringBuilder(1024);
+            builder.Append("cherry-pick ");
             if (noCommit)
-                Args += "-n ";
+                builder.Append("-n ");
             if (appendSourceToMessage)
-                Args += "-x ";
+                builder.Append("-x ");
             if (!string.IsNullOrEmpty(extraParams))
-                Args += $"{extraParams} ";
-            Args += commits;
+                builder.Append(extraParams).Append(' ');
+
+            Args = builder.Append(commits).ToString();
         }
     }
 }
diff --git a/src/Commands/Clone.cs b/src/Commands/Clone.cs
@@ -1,4 +1,6 @@
-﻿namespace SourceGit.Commands
+﻿using System.Text;
+
+namespace SourceGit.Commands
 {
     public class Clone : Command
     {
@@ -7,15 +9,16 @@ public Clone(string ctx, string path, string url, string localName, string sshKe
             Context = ctx;
             WorkingDirectory = path;
             SSHKey = sshKey;
-            Args = "clone --progress --verbose ";
 
+            var builder = new StringBuilder(1024);
+            builder.Append("clone --progress --verbose ");
             if (!string.IsNullOrEmpty(extraArgs))
-                Args += $"{extraArgs} ";
-
-            Args += $"{url} ";
-
+                builder.Append(extraArgs).Append(' ');
+            builder.Append(url).Append(' ');
             if (!string.IsNullOrEmpty(localName))
-                Args += localName;
+                builder.Append(localName);
+
+            Args = builder.ToString();
         }
     }
 }
diff --git a/src/Commands/Command.cs b/src/Commands/Command.cs
@@ -190,7 +190,7 @@ protected ProcessStartInfo CreateGitStartInfo(bool redirect)
                 start.Environment.Add("LC_ALL", "C");
             }
 
-            var builder = new StringBuilder();
+            var builder = new StringBuilder(2048);
             builder
                 .Append("--no-pager -c core.quotepath=off -c credential.helper=")
                 .Append(Native.OS.CredentialHelper)
diff --git a/src/Commands/Fetch.cs b/src/Commands/Fetch.cs
@@ -1,31 +1,30 @@
-﻿using System.Threading.Tasks;
+﻿using System.Text;
+using System.Threading.Tasks;
 
 namespace SourceGit.Commands
 {
     public class Fetch : Command
     {
         public Fetch(string repo, string remote, bool noTags, bool force)
         {
-            _remoteKey = $"remote.{remote}.sshkey";
+            _remote = remote;
 
             WorkingDirectory = repo;
             Context = repo;
-            Args = "fetch --progress --verbose ";
-
-            if (noTags)
-                Args += "--no-tags ";
-            else
-                Args += "--tags ";
 
+            var builder = new StringBuilder(512);
+            builder.Append("fetch --progress --verbose ");
+            builder.Append(noTags ? "--no-tags " : "--tags ");
             if (force)
-                Args += "--force ";
+                builder.Append("--force ");
+            builder.Append(remote);
 
-            Args += remote;
+            Args = builder.ToString();
         }
 
         public Fetch(string repo, Models.Branch local, Models.Branch remote)
         {
-            _remoteKey = $"remote.{remote.Remote}.sshkey";
+            _remote = remote.Remote;
 
             WorkingDirectory = repo;
             Context = repo;
@@ -34,10 +33,10 @@ public Fetch(string repo, Models.Branch local, Models.Branch remote)
 
         public async Task<bool> RunAsync()
         {
-            SSHKey = await new Config(WorkingDirectory).GetAsync(_remoteKey).ConfigureAwait(false);
+            SSHKey = await new Config(WorkingDirectory).GetAsync($"remote.{_remote}.sshkey").ConfigureAwait(false);
             return await ExecAsync().ConfigureAwait(false);
         }
 
-        private readonly string _remoteKey;
+        private readonly string _remote;
     }
 }
diff --git a/src/Commands/InteractiveRebase.cs b/src/Commands/InteractiveRebase.cs
@@ -1,4 +1,6 @@
-﻿namespace SourceGit.Commands
+﻿using System.Text;
+
+namespace SourceGit.Commands
 {
     public class InteractiveRebase : Command
     {
@@ -7,10 +9,13 @@ public InteractiveRebase(string repo, string basedOn, bool autoStash)
             WorkingDirectory = repo;
             Context = repo;
             Editor = EditorType.RebaseEditor;
-            Args = "rebase -i --autosquash ";
+
+            var builder = new StringBuilder(512);
+            builder.Append("rebase -i --autosquash ");
             if (autoStash)
-                Args += "--autostash ";
-            Args += basedOn;
+                builder.Append("--autostash ");
+
+            Args = builder.Append(basedOn).ToString();
         }
     }
 }
diff --git a/src/Commands/Pull.cs b/src/Commands/Pull.cs
@@ -1,4 +1,5 @@
-﻿using System.Threading.Tasks;
+﻿using System.Text;
+using System.Threading.Tasks;
 
 namespace SourceGit.Commands
 {
@@ -10,12 +11,14 @@ public Pull(string repo, string remote, string branch, bool useRebase)
 
             WorkingDirectory = repo;
             Context = repo;
-            Args = "pull --verbose --progress ";
 
+            var builder = new StringBuilder(512);
+            builder.Append("pull --verbose --progress ");
             if (useRebase)
-                Args += "--rebase=true ";
+                builder.Append("--rebase=true ");
+            builder.Append(remote).Append(' ').Append(branch);
 
-            Args += $"{remote} {branch}";
+            Args = builder.ToString();
         }
 
         public async Task<bool> RunAsync()
diff --git a/src/Commands/Push.cs b/src/Commands/Push.cs
@@ -1,4 +1,5 @@
-﻿using System.Threading.Tasks;
+﻿using System.Text;
+using System.Threading.Tasks;
 
 namespace SourceGit.Commands
 {
@@ -10,18 +11,20 @@ public Push(string repo, string local, string remote, string remoteBranch, bool
 
             WorkingDirectory = repo;
             Context = repo;
-            Args = "push --progress --verbose ";
 
+            var builder = new StringBuilder(1024);
+            builder.Append("push --progress --verbose ");
             if (withTags)
-                Args += "--tags ";
+                builder.Append("--tags ");
             if (checkSubmodules)
-                Args += "--recurse-submodules=check ";
+                builder.Append("--recurse-submodules=check ");
             if (track)
-                Args += "-u ";
+                builder.Append("-u ");
             if (force)
-                Args += "--force-with-lease ";
+                builder.Append("--force-with-lease ");
 
-            Args += $"{remote} {local}:{remoteBranch}";
+            builder.Append(remote).Append(' ').Append(local).Append(':').Append(remoteBranch);
+            Args = builder.ToString();
         }
 
         public Push(string repo, string remote, string refname, bool isDelete)
@@ -30,12 +33,14 @@ public Push(string repo, string remote, string refname, bool isDelete)
 
             WorkingDirectory = repo;
             Context = repo;
-            Args = "push ";
 
+            var builder = new StringBuilder(512);
+            builder.Append("push ");
             if (isDelete)
-                Args += "--delete ";
+                builder.Append("--delete ");
+            builder.Append(remote).Append(' ').Append(refname);
 
-            Args += $"{remote} {refname}";
+            Args = builder.ToString();
         }
 
         public async Task<bool> RunAsync()
diff --git a/src/Commands/QueryCommits.cs b/src/Commands/QueryCommits.cs
@@ -8,12 +8,12 @@ namespace SourceGit.Commands
 {
     public class QueryCommits : Command
     {
-        public QueryCommits(string repo, string limits, bool needFindHead = true)
+        public QueryCommits(string repo, string limits, bool markMerged = true)
         {
             WorkingDirectory = repo;
             Context = repo;
             Args = $"log --no-show-signature --decorate=full --format=%H%x00%P%x00%D%x00%aN±%aE%x00%at%x00%cN±%cE%x00%ct%x00%s {limits}";
-            _findFirstMerged = needFindHead;
+            _markMerged = markMerged;
         }
 
         public QueryCommits(string repo, string filter, Models.CommitSearchMethod method, bool onlyCurrentBranch)
@@ -51,7 +51,7 @@ public QueryCommits(string repo, string filter, Models.CommitSearchMethod method
             WorkingDirectory = repo;
             Context = repo;
             Args = builder.ToString();
-            _findFirstMerged = false;
+            _markMerged = false;
         }
 
         public async Task<List<Models.Commit>> GetResultAsync()
@@ -63,6 +63,7 @@ public QueryCommits(string repo, string filter, Models.CommitSearchMethod method
                 proc.StartInfo = CreateGitStartInfo(true);
                 proc.Start();
 
+                var findHead = false;
                 while (await proc.StandardOutput.ReadLineAsync().ConfigureAwait(false) is { } line)
                 {
                     var parts = line.Split('\0');
@@ -79,13 +80,12 @@ public QueryCommits(string repo, string filter, Models.CommitSearchMethod method
                     commit.Subject = parts[7];
                     commits.Add(commit);
 
-                    if (commit.IsMerged && !_isHeadFound)
-                        _isHeadFound = true;
+                    findHead |= commit.IsMerged;
                 }
 
                 await proc.WaitForExitAsync().ConfigureAwait(false);
 
-                if (_findFirstMerged && !_isHeadFound && commits.Count > 0)
+                if (_markMerged && !findHead && commits.Count > 0)
                 {
                     var set = await new QueryCurrentBranchCommitHashes(WorkingDirectory, commits[^1].CommitterTime)
                         .GetResultAsync()
@@ -109,7 +109,6 @@ public QueryCommits(string repo, string filter, Models.CommitSearchMethod method
             return commits;
         }
 
-        private bool _findFirstMerged = false;
-        private bool _isHeadFound = false;
+        private bool _markMerged = false;
     }
 }
diff --git a/src/Commands/QueryRevisionObjects.cs b/src/Commands/QueryRevisionObjects.cs
@@ -1,5 +1,6 @@
 ﻿using System.Collections.Generic;
 using System.Diagnostics;
+using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
@@ -14,10 +15,13 @@ public QueryRevisionObjects(string repo, string sha, string parentFolder)
         {
             WorkingDirectory = repo;
             Context = repo;
-            Args = $"ls-tree {sha}";
 
+            var builder = new StringBuilder(1024);
+            builder.Append("ls-tree ").Append(sha);
             if (!string.IsNullOrEmpty(parentFolder))
-                Args += $" -- {parentFolder.Quoted()}";
+                builder.Append(" -- ").Append(parentFolder.Quoted());
+
+            Args = builder.ToString();
         }
 
         public async Task<List<Models.Object>> GetResultAsync()
diff --git a/src/Commands/Rebase.cs b/src/Commands/Rebase.cs
@@ -1,15 +1,20 @@
-﻿namespace SourceGit.Commands
+﻿using System.Text;
+
+namespace SourceGit.Commands
 {
     public class Rebase : Command
     {
         public Rebase(string repo, string basedOn, bool autoStash)
         {
             WorkingDirectory = repo;
             Context = repo;
-            Args = "rebase ";
+
+            var builder = new StringBuilder(512);
+            builder.Append("rebase ");
             if (autoStash)
-                Args += "--autostash ";
-            Args += basedOn;
+                builder.Append("--autostash ");
+
+            Args = builder.Append(basedOn).ToString();
         }
     }
 }
diff --git a/src/Commands/Revert.cs b/src/Commands/Revert.cs
@@ -1,14 +1,23 @@
-﻿namespace SourceGit.Commands
+﻿using System.Text;
+
+namespace SourceGit.Commands
 {
     public class Revert : Command
     {
         public Revert(string repo, string commit, bool autoCommit)
         {
             WorkingDirectory = repo;
             Context = repo;
-            Args = $"revert -m 1 {commit} --no-edit";
+
+            var builder = new StringBuilder(512);
+            builder
+                .Append("revert -m 1 ")
+                .Append(commit)
+                .Append(" --no-edit");
             if (!autoCommit)
-                Args += " --no-commit";
+                builder.Append(" --no-commit");
+
+            Args = builder.ToString();
         }
     }
 }
diff --git a/src/Commands/Worktree.cs b/src/Commands/Worktree.cs

Original file line number	Diff line number	Diff line change
`@@ -1,19 +1,26 @@`
`1`		`-namespace SourceGit.Commands`
	`1`	`+using System.Text;`
	`2`	`+`
	`3`	`+namespace SourceGit.Commands`
`2`	`4`	`{`
`3`	`5`	`public class Apply : Command`
`4`	`6`	`{`
`5`	`7`	`public Apply(string repo, string file, bool ignoreWhitespace, string whitespaceMode, string extra)`
`6`	`8`	`{`
`7`	`9`	`WorkingDirectory = repo;`
`8`	`10`	`Context = repo;`
`9`		`- Args = "apply ";`
	`11`	`+`
	`12`	`+ var builder = new StringBuilder(1024);`
	`13`	`+ builder.Append("apply ");`
	`14`	`+`
`10`	`15`	`if (ignoreWhitespace)`
`11`		`- Args += "--ignore-whitespace ";`
	`16`	`+ builder.Append("--ignore-whitespace ");`
`12`	`17`	`else`
`13`		`- Args += $"--whitespace={whitespaceMode} ";`
	`18`	`+ builder.Append("--whitespace=").Append(whitespaceMode).Append(' ');`
	`19`	`+`
`14`	`20`	`if (!string.IsNullOrEmpty(extra))`
`15`		`- Args += $"{extra} ";`
`16`		`- Args += $"{file.Quoted()}";`
	`21`	`+ builder.Append(extra).Append(' ');`
	`22`	`+`
	`23`	`+ Args = builder.Append(file.Quoted()).ToString();`
`17`	`24`	`}`
`18`	`25`	`}`
`19`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`		`-namespace SourceGit.Commands`
	`1`	`+using System.Text;`
	`2`	`+`
	`3`	`+namespace SourceGit.Commands`
`2`	`4`	`{`
`3`	`5`	`public class CherryPick : Command`
`4`	`6`	`{`
`@@ -7,14 +9,16 @@ public CherryPick(string repo, string commits, bool noCommit, bool appendSourceT`
`7`	`9`	`WorkingDirectory = repo;`
`8`	`10`	`Context = repo;`
`9`	`11`
`10`		`- Args = "cherry-pick ";`
	`12`	`+ var builder = new StringBuilder(1024);`
	`13`	`+ builder.Append("cherry-pick ");`
`11`	`14`	`if (noCommit)`
`12`		`- Args += "-n ";`
	`15`	`+ builder.Append("-n ");`
`13`	`16`	`if (appendSourceToMessage)`
`14`		`- Args += "-x ";`
	`17`	`+ builder.Append("-x ");`
`15`	`18`	`if (!string.IsNullOrEmpty(extraParams))`
`16`		`- Args += $"{extraParams} ";`
`17`		`- Args += commits;`
	`19`	`+ builder.Append(extraParams).Append(' ');`
	`20`	`+`
	`21`	`+ Args = builder.Append(commits).ToString();`
`18`	`22`	`}`
`19`	`23`	`}`
`20`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ protected ProcessStartInfo CreateGitStartInfo(bool redirect)`
`190`	`190`	`start.Environment.Add("LC_ALL", "C");`
`191`	`191`	`}`
`192`	`192`
`193`		`- var builder = new StringBuilder();`
	`193`	`+ var builder = new StringBuilder(2048);`
`194`	`194`	`builder`
`195`	`195`	`.Append("--no-pager -c core.quotepath=off -c credential.helper=")`
`196`	`196`	`.Append(Native.OS.CredentialHelper)`
Original file line number	Diff line number	Diff line change
`@@ -1,31 +1,30 @@`
`1`		`-using System.Threading.Tasks;`
	`1`	`+using System.Text;`
	`2`	`+using System.Threading.Tasks;`
`2`	`3`
`3`	`4`	`namespace SourceGit.Commands`
`4`	`5`	`{`
`5`	`6`	`public class Fetch : Command`
`6`	`7`	`{`
`7`	`8`	`public Fetch(string repo, string remote, bool noTags, bool force)`
`8`	`9`	`{`
`9`		`- _remoteKey = $"remote.{remote}.sshkey";`
	`10`	`+ _remote = remote;`
`10`	`11`
`11`	`12`	`WorkingDirectory = repo;`
`12`	`13`	`Context = repo;`
`13`		`- Args = "fetch --progress --verbose ";`
`14`		`-`
`15`		`- if (noTags)`
`16`		`- Args += "--no-tags ";`
`17`		`- else`
`18`		`- Args += "--tags ";`
`19`	`14`
	`15`	`+ var builder = new StringBuilder(512);`
	`16`	`+ builder.Append("fetch --progress --verbose ");`
	`17`	`+ builder.Append(noTags ? "--no-tags " : "--tags ");`
`20`	`18`	`if (force)`
`21`		`- Args += "--force ";`
	`19`	`+ builder.Append("--force ");`
	`20`	`+ builder.Append(remote);`
`22`	`21`
`23`		`- Args += remote;`
	`22`	`+ Args = builder.ToString();`
`24`	`23`	`}`
`25`	`24`
`26`	`25`	`public Fetch(string repo, Models.Branch local, Models.Branch remote)`
`27`	`26`	`{`
`28`		`- _remoteKey = $"remote.{remote.Remote}.sshkey";`
	`27`	`+ _remote = remote.Remote;`
`29`	`28`
`30`	`29`	`WorkingDirectory = repo;`
`31`	`30`	`Context = repo;`
`@@ -34,10 +33,10 @@ public Fetch(string repo, Models.Branch local, Models.Branch remote)`
`34`	`33`
`35`	`34`	`public async Task<bool> RunAsync()`
`36`	`35`	`{`
`37`		`- SSHKey = await new Config(WorkingDirectory).GetAsync(_remoteKey).ConfigureAwait(false);`
	`36`	`+ SSHKey = await new Config(WorkingDirectory).GetAsync($"remote.{_remote}.sshkey").ConfigureAwait(false);`
`38`	`37`	`return await ExecAsync().ConfigureAwait(false);`
`39`	`38`	`}`
`40`	`39`
`41`		`- private readonly string _remoteKey;`
	`40`	`+ private readonly string _remote;`
`42`	`41`	`}`
`43`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,12 +8,12 @@ namespace SourceGit.Commands`
`8`	`8`	`{`
`9`	`9`	`public class QueryCommits : Command`
`10`	`10`	`{`
`11`		`- public QueryCommits(string repo, string limits, bool needFindHead = true)`
	`11`	`+ public QueryCommits(string repo, string limits, bool markMerged = true)`
`12`	`12`	`{`
`13`	`13`	`WorkingDirectory = repo;`
`14`	`14`	`Context = repo;`
`15`	`15`	`Args = $"log --no-show-signature --decorate=full --format=%H%x00%P%x00%D%x00%aN±%aE%x00%at%x00%cN±%cE%x00%ct%x00%s {limits}";`
`16`		`- _findFirstMerged = needFindHead;`
	`16`	`+ _markMerged = markMerged;`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`public QueryCommits(string repo, string filter, Models.CommitSearchMethod method, bool onlyCurrentBranch)`
`@@ -51,7 +51,7 @@ public QueryCommits(string repo, string filter, Models.CommitSearchMethod method`
`51`	`51`	`WorkingDirectory = repo;`
`52`	`52`	`Context = repo;`
`53`	`53`	`Args = builder.ToString();`
`54`		`- _findFirstMerged = false;`
	`54`	`+ _markMerged = false;`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`public async Task<List<Models.Commit>> GetResultAsync()`
`@@ -63,6 +63,7 @@ public QueryCommits(string repo, string filter, Models.CommitSearchMethod method`
`63`	`63`	`proc.StartInfo = CreateGitStartInfo(true);`
`64`	`64`	`proc.Start();`
`65`	`65`
	`66`	`+ var findHead = false;`
`66`	`67`	`while (await proc.StandardOutput.ReadLineAsync().ConfigureAwait(false) is { } line)`
`67`	`68`	`{`
`68`	`69`	`var parts = line.Split('\0');`
`@@ -79,13 +80,12 @@ public QueryCommits(string repo, string filter, Models.CommitSearchMethod method`
`79`	`80`	`commit.Subject = parts[7];`
`80`	`81`	`commits.Add(commit);`
`81`	`82`
`82`		`- if (commit.IsMerged && !_isHeadFound)`
`83`		`- _isHeadFound = true;`
	`83`	`+ findHead \|= commit.IsMerged;`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`await proc.WaitForExitAsync().ConfigureAwait(false);`
`87`	`87`
`88`		`- if (_findFirstMerged && !_isHeadFound && commits.Count > 0)`
	`88`	`+ if (_markMerged && !findHead && commits.Count > 0)`
`89`	`89`	`{`
`90`	`90`	`var set = await new QueryCurrentBranchCommitHashes(WorkingDirectory, commits[^1].CommitterTime)`
`91`	`91`	`.GetResultAsync()`
`@@ -109,7 +109,6 @@ public QueryCommits(string repo, string filter, Models.CommitSearchMethod method`
`109`	`109`	`return commits;`
`110`	`110`	`}`
`111`	`111`
`112`		`- private bool _findFirstMerged = false;`
`113`		`- private bool _isHeadFound = false;`
	`112`	`+ private bool _markMerged = false;`
`114`	`113`	`}`
`115`	`114`	`}`