From 3d49f26005abb46fbbf9497eeea625fd5bbc1235 Mon Sep 17 00:00:00 2001 From: Philippe Miossec Date: Thu, 4 Apr 2024 16:44:05 +0200 Subject: [PATCH] refactor: convert to interpolated strings --- src/GitTfs.VsCommon/TfsHelper.Common.cs | 3 +-- src/GitTfs/Commands/CheckinBase.cs | 4 ++-- src/GitTfs/Commands/Clone.cs | 4 ++-- src/GitTfs/Commands/Subtree.cs | 12 ++++-------- src/GitTfs/Core/GitHelpers.cs | 4 ++-- src/GitTfs/Core/GitRepository.cs | 4 ++-- src/GitTfs/Core/GitTfsRemote.cs | 2 +- src/GitTfs/Core/GitTfsVersionProvider.cs | 5 +---- src/GitTfs/Core/TfsChangeset.cs | 16 +++++----------- src/GitTfs/Core/TfsInterop/IBranch.cs | 2 +- src/GitTfs/Core/TfsInterop/RootBranch.cs | 2 +- src/GitTfs/Util/ChangeSieve.cs | 4 ++-- 12 files changed, 24 insertions(+), 38 deletions(-) diff --git a/src/GitTfs.VsCommon/TfsHelper.Common.cs b/src/GitTfs.VsCommon/TfsHelper.Common.cs index 33c48a70..42e549af 100644 --- a/src/GitTfs.VsCommon/TfsHelper.Common.cs +++ b/src/GitTfs.VsCommon/TfsHelper.Common.cs @@ -483,8 +483,7 @@ namespace GitTfs.VsCommon public int TargetChangeset; public string TargetItem; - public override string ToString() => string.Format("`{0}` C{1} `{2}` Source `{3}` C{4} `{5}`", TargetChangeType, TargetChangeset, TargetItem, - SourceChangeType, SourceChangeset, SourceItem); + public override string ToString() => $"`{TargetChangeType}` C{TargetChangeset} `{TargetItem}` Source `{SourceChangeType}` C{SourceChangeset} `{SourceItem}`"; } private IEnumerable GetMergeInfo(string tfsPathBranchToCreate, string tfsPathParentBranch, diff --git a/src/GitTfs/Commands/CheckinBase.cs b/src/GitTfs/Commands/CheckinBase.cs index ead4836a..903f958c 100644 --- a/src/GitTfs/Commands/CheckinBase.cs +++ b/src/GitTfs/Commands/CheckinBase.cs @@ -27,12 +27,12 @@ namespace GitTfs.Commands if (_checkinOptions.NoMerge) { - Trace.TraceInformation("TFS Changeset #" + newChangesetId + " was created."); + Trace.TraceInformation($"TFS Changeset #{newChangesetId} was created."); parentChangeset.Remote.Fetch(); } else { - Trace.TraceInformation("TFS Changeset #" + newChangesetId + " was created. Marking it as a merge commit..."); + Trace.TraceInformation($"TFS Changeset #{newChangesetId} was created. Marking it as a merge commit..."); parentChangeset.Remote.FetchWithMerge(newChangesetId, false, refToCheckin); if (refToCheckin == "HEAD") diff --git a/src/GitTfs/Commands/Clone.cs b/src/GitTfs/Commands/Clone.cs index 38ff69c9..5a9f864c 100644 --- a/src/GitTfs/Commands/Clone.cs +++ b/src/GitTfs/Commands/Clone.cs @@ -86,13 +86,13 @@ namespace GitTfs.Commands catch (IOException e) { // swallow IOException. Smth went wrong before this and we're much more interested in that error - string msg = string.Format("warning: Something went wrong while cleaning file after internal error (See below).\n Can't clean up files because of IOException:\n{0}\n", e.IndentExceptionMessage()); + string msg = $"warning: Something went wrong while cleaning file after internal error (See below).\n Can't clean up files because of IOException:\n{e.IndentExceptionMessage()}\n"; Trace.WriteLine(msg); } catch (UnauthorizedAccessException e) { // swallow it also - string msg = string.Format("warning: Something went wrong while cleaning file after internal error (See below).\n Can't clean up files because of UnauthorizedAccessException:\n{0}\n", e.IndentExceptionMessage()); + string msg = $"warning: Something went wrong while cleaning file after internal error (See below).\n Can't clean up files because of UnauthorizedAccessException:\n{e.IndentExceptionMessage()}\n"; Trace.WriteLine(msg); } } diff --git a/src/GitTfs/Commands/Subtree.cs b/src/GitTfs/Commands/Subtree.cs index 43e345ea..974b5819 100644 --- a/src/GitTfs/Commands/Subtree.cs +++ b/src/GitTfs/Commands/Subtree.cs @@ -142,15 +142,11 @@ namespace GitTfs.Commands int latest = Math.Max(owner.MaxChangesetId, remote.MaxChangesetId); string msg = string.Format(GitTfsConstants.TfsCommitInfoFormat, owner.TfsUrl, owner.TfsRepositoryPath, latest); - msg = string.Format(@"Add '{0}/' from commit '{1}' + msg = $@"Add '{Prefix}/' from commit '{remote.MaxCommitHash}' -{2}", Prefix, remote.MaxCommitHash, msg); +{msg}"; - _globals.Repository.CommandNoisy( - "subtree", "add", - "--prefix=" + p, - string.Format("-m {0}", msg), - remote.RemoteRef); + _globals.Repository.CommandNoisy("subtree", "add", "--prefix=" + p, $"-m {msg}", remote.RemoteRef); //update the owner remote to point at the commit where the newly created subtree was merged. var commit = _globals.Repository.GetCurrentCommit(); @@ -207,7 +203,7 @@ namespace GitTfs.Commands { if (!Directory.Exists(Prefix)) { - throw new GitTfsException(string.Format("Directory {0} does not exist", Prefix)) + throw new GitTfsException($"Directory {Prefix} does not exist") .WithRecommendation("Add the subtree using 'git tfs subtree add -p= [tfs-server] [tfs-repository]'"); } } diff --git a/src/GitTfs/Core/GitHelpers.cs b/src/GitTfs/Core/GitHelpers.cs index 00b27734..ce6d8c96 100644 --- a/src/GitTfs/Core/GitHelpers.cs +++ b/src/GitTfs/Core/GitHelpers.cs @@ -139,7 +139,7 @@ namespace GitTfs.Core finally { var end = DateTime.Now; - Trace.WriteLine(string.Format("[{0}] {1}", end - start, string.Join(" ", command)), "git command time"); + Trace.WriteLine($"[{end - start}] {string.Join(" ", command)}", "git command time"); } } @@ -158,7 +158,7 @@ namespace GitTfs.Core if (!process.WaitForExit((int)TimeSpan.FromSeconds(10).TotalMilliseconds)) throw new GitCommandException("Command did not terminate.", process); if (process.ExitCode != 0) - throw new GitCommandException(string.Format("Command exited with error code: {0}\n{1}", process.ExitCode, process.StandardErrorString), process); + throw new GitCommandException($"Command exited with error code: {process.ExitCode}\n{process.StandardErrorString}", process); } private void RedirectStdout(ProcessStartInfo startInfo) diff --git a/src/GitTfs/Core/GitRepository.cs b/src/GitTfs/Core/GitRepository.cs index f83b6864..afd3f0ec 100644 --- a/src/GitTfs/Core/GitRepository.cs +++ b/src/GitTfs/Core/GitRepository.cs @@ -196,11 +196,11 @@ namespace GitTfs.Core throw new GitTfsException("error: the new name of the remote is invalid!"); if (HasRemote(newRemoteName)) - throw new GitTfsException(string.Format("error: this remote name \"{0}\" is already used!", newRemoteName)); + throw new GitTfsException($"error: this remote name \"{newRemoteName}\" is already used!"); var oldRemote = ReadTfsRemote(oldRemoteName); if (oldRemote == null) - throw new GitTfsException(string.Format("error: the remote \"{0}\" doesn't exist!", oldRemoteName)); + throw new GitTfsException($"error: the remote \"{oldRemoteName}\" doesn't exist!"); var remoteInfo = oldRemote.RemoteInfo; remoteInfo.Id = newRemoteName; diff --git a/src/GitTfs/Core/GitTfsRemote.cs b/src/GitTfs/Core/GitTfsRemote.cs index b262dcd5..2bfe2332 100644 --- a/src/GitTfs/Core/GitTfsRemote.cs +++ b/src/GitTfs/Core/GitTfsRemote.cs @@ -497,7 +497,7 @@ namespace GitTfs.Core workitemUrl = workitemUrl.Replace(oldWorkitemId, workitemId); } } - workitemNote += string.Format("[{0}] {1}\n {2}\n", workitemId, workitem.Title, workitemUrl); + workitemNote += $"[{workitemId}] {workitem.Title}\n {workitemUrl}\n"; } metadatas.Append(workitemNote); } diff --git a/src/GitTfs/Core/GitTfsVersionProvider.cs b/src/GitTfs/Core/GitTfsVersionProvider.cs index e64d6412..0313684f 100644 --- a/src/GitTfs/Core/GitTfsVersionProvider.cs +++ b/src/GitTfs/Core/GitTfsVersionProvider.cs @@ -13,10 +13,7 @@ namespace GitTfs.Core _tfsHelper = tfsHelper; } - public string GetVersionString() => string.Format("git-tfs version {0} (TFS client library {1}) ({2}-bit)", - GetType().Assembly.GetName().Version, - _tfsHelper.TfsClientLibraryVersion, - (Environment.Is64BitProcess ? "64" : "32")); + public string GetVersionString() => $"git-tfs version {GetType().Assembly.GetName().Version} (TFS client library {_tfsHelper.TfsClientLibraryVersion}) ({(Environment.Is64BitProcess ? "64" : "32")}-bit)"; public string GetPathToGitTfsExecutable() => Assembly.GetExecutingAssembly().Location; } diff --git a/src/GitTfs/Core/TfsChangeset.cs b/src/GitTfs/Core/TfsChangeset.cs index 0cb23929..694d0b7f 100644 --- a/src/GitTfs/Core/TfsChangeset.cs +++ b/src/GitTfs/Core/TfsChangeset.cs @@ -78,19 +78,13 @@ namespace GitTfs.Core } } - private void Ignore(string pathInGitRepo) => Trace.TraceInformation(string.Format("C{0} ! No changes applied to '{1}', file ignored", _changeset.ChangesetId, pathInGitRepo)); + private void Ignore(string pathInGitRepo) => Trace.TraceInformation($"C{_changeset.ChangesetId} ! No changes applied to '{pathInGitRepo}', file ignored"); public IEnumerable GetTree() => GetFullTree().Where(item => item.Item.ItemType == TfsItemType.File && !Summary.Remote.ShouldSkip(item.FullName)); - public bool IsMergeChangeset - { - get - { - if (_changeset == null || _changeset.Changes == null || !_changeset.Changes.Any()) - return false; - return _changeset.Changes.Any(c => c.ChangeType.IncludesOneOf(TfsChangeType.Merge)); - } - } + public bool IsMergeChangeset => _changeset == null || _changeset.Changes == null || !_changeset.Changes.Any() + ? false + : _changeset.Changes.Any(c => c.ChangeType.IncludesOneOf(TfsChangeType.Merge)); public IEnumerable GetFullTree() { @@ -201,7 +195,7 @@ namespace GitTfs.Core if (split.Length == 2) { name = split[1].ToLower(); - email = string.Format("{0}@{1}.tfs.local", name, split[0].ToLower()); + email = $"{name}@{split[0].ToLower()}.tfs.local"; } } // committer's & author's name and email MUST NOT be empty as otherwise they would be picked diff --git a/src/GitTfs/Core/TfsInterop/IBranch.cs b/src/GitTfs/Core/TfsInterop/IBranch.cs index 5926f70d..d1211961 100644 --- a/src/GitTfs/Core/TfsInterop/IBranch.cs +++ b/src/GitTfs/Core/TfsInterop/IBranch.cs @@ -40,7 +40,7 @@ namespace GitTfs.Core.TfsInterop public string ParentPath => Branch.ParentPath; public bool IsRoot => Branch.IsRoot; - public override string ToString() => string.Format("{0} [{1} children]", Path, ChildBranches.Count); + public override string ToString() => $"{Path} [{ChildBranches.Count} children]"; } public static class BranchExtensions diff --git a/src/GitTfs/Core/TfsInterop/RootBranch.cs b/src/GitTfs/Core/TfsInterop/RootBranch.cs index e70a5693..ed683e75 100644 --- a/src/GitTfs/Core/TfsInterop/RootBranch.cs +++ b/src/GitTfs/Core/TfsInterop/RootBranch.cs @@ -25,7 +25,7 @@ namespace GitTfs.Core.TfsInterop private string DebuggerDisplay => string.Format("{0} C{1}{2}{3}", /* {0} */ TfsBranchPath, /* {1} */ SourceBranchChangesetId, - /* {2} */ TargetBranchChangesetId > -1 ? string.Format(" (target C{0})", TargetBranchChangesetId) : string.Empty, + /* {2} */ TargetBranchChangesetId > -1 ? $" (target C{TargetBranchChangesetId})" : string.Empty, /* {3} */ IsRenamedBranch ? " renamed" : "" ); } diff --git a/src/GitTfs/Util/ChangeSieve.cs b/src/GitTfs/Util/ChangeSieve.cs index 059334e8..d8177eda 100644 --- a/src/GitTfs/Util/ChangeSieve.cs +++ b/src/GitTfs/Util/ChangeSieve.cs @@ -194,14 +194,14 @@ namespace GitTfs.Util var previousChange = history.FirstOrDefault(); if (previousChange == null) { - Trace.WriteLine(string.Format("No history found for item {0} changesetId {1}", item.ServerItem, item.ChangesetId)); + Trace.WriteLine($"No history found for item {item.ServerItem} changesetId {item.ChangesetId}"); return null; } oldItem = previousChange.Changes[0].Item; } catch { - Trace.WriteLine(string.Format("No history found for item {0} changesetId {1}", item.ServerItem, item.ChangesetId)); + Trace.WriteLine($"No history found for item {item.ServerItem} changesetId {item.ChangesetId}"); return null; } }