From d24af6b78396f7e13fa71b8eed7ee89a32d6475b Mon Sep 17 00:00:00 2001 From: Stanley Goldman Date: Mon, 31 Jul 2017 15:43:28 -0400 Subject: [PATCH 1/2] Splicing out Task name refactors --- src/GitHub.Api/Git/Tasks/GitAddTask.cs | 3 ++- src/GitHub.Api/Git/Tasks/GitBranchCreateTask.cs | 3 ++- src/GitHub.Api/Git/Tasks/GitBranchDeleteTask.cs | 3 ++- src/GitHub.Api/Git/Tasks/GitCommitTask.cs | 3 ++- src/GitHub.Api/Git/Tasks/GitConfigGetTask.cs | 7 +++++-- src/GitHub.Api/Git/Tasks/GitConfigListTask.cs | 3 ++- src/GitHub.Api/Git/Tasks/GitConfigSetTask.cs | 7 +------ src/GitHub.Api/Git/Tasks/GitFetchTask.cs | 3 ++- src/GitHub.Api/Git/Tasks/GitInitTask.cs | 7 +++++-- src/GitHub.Api/Git/Tasks/GitLfsInstallTask.cs | 7 +++++-- src/GitHub.Api/Git/Tasks/GitListBranchesTask.cs | 8 ++++---- src/GitHub.Api/Git/Tasks/GitListLocksTask.cs | 3 ++- src/GitHub.Api/Git/Tasks/GitLockTask.cs | 3 ++- src/GitHub.Api/Git/Tasks/GitLogTask.cs | 5 +++-- src/GitHub.Api/Git/Tasks/GitPullTask.cs | 3 ++- src/GitHub.Api/Git/Tasks/GitPushTask.cs | 4 +++- src/GitHub.Api/Git/Tasks/GitRemoteAddTask.cs | 3 ++- src/GitHub.Api/Git/Tasks/GitRemoteBranchDeleteTask.cs | 3 ++- src/GitHub.Api/Git/Tasks/GitRemoteChangeTask.cs | 3 ++- src/GitHub.Api/Git/Tasks/GitRemoteListTask.cs | 4 +++- src/GitHub.Api/Git/Tasks/GitRemoteRemoveTask.cs | 3 ++- src/GitHub.Api/Git/Tasks/GitRemoveFromIndexTask.cs | 3 ++- src/GitHub.Api/Git/Tasks/GitRevertTask.cs | 4 ++-- src/GitHub.Api/Git/Tasks/GitStatusTask.cs | 5 +++-- src/GitHub.Api/Git/Tasks/GitSwitchBranchesTask.cs | 6 ++---- src/GitHub.Api/Git/Tasks/GitUnlockTask.cs | 3 ++- src/GitHub.Api/Platform/FindExecTask.cs | 3 +-- 27 files changed, 67 insertions(+), 45 deletions(-) diff --git a/src/GitHub.Api/Git/Tasks/GitAddTask.cs b/src/GitHub.Api/Git/Tasks/GitAddTask.cs index 5c56cd1e9..45ab0cf16 100644 --- a/src/GitHub.Api/Git/Tasks/GitAddTask.cs +++ b/src/GitHub.Api/Git/Tasks/GitAddTask.cs @@ -5,6 +5,7 @@ namespace GitHub.Unity { class GitAddTask : ProcessTask { + private const string TaskName = "git add"; private readonly string arguments; public GitAddTask(IEnumerable files, @@ -12,6 +13,7 @@ public GitAddTask(IEnumerable files, : base(token, processor ?? new SimpleOutputProcessor()) { Guard.ArgumentNotNull(files, "files"); + Name = TaskName; arguments = "add "; arguments += " -- "; @@ -22,7 +24,6 @@ public GitAddTask(IEnumerable files, } } - public override string Name { get { return "git add"; } } public override string ProcessArguments { get { return arguments; } } public override TaskAffinity Affinity { get { return TaskAffinity.Exclusive; } } } diff --git a/src/GitHub.Api/Git/Tasks/GitBranchCreateTask.cs b/src/GitHub.Api/Git/Tasks/GitBranchCreateTask.cs index b48d1a35c..673979f69 100644 --- a/src/GitHub.Api/Git/Tasks/GitBranchCreateTask.cs +++ b/src/GitHub.Api/Git/Tasks/GitBranchCreateTask.cs @@ -5,6 +5,7 @@ namespace GitHub.Unity { class GitBranchCreateTask : ProcessTask { + private const string TaskName = "git branch"; private readonly string arguments; public GitBranchCreateTask(string newBranch, string baseBranch, @@ -14,10 +15,10 @@ public GitBranchCreateTask(string newBranch, string baseBranch, Guard.ArgumentNotNullOrWhiteSpace(newBranch, "newBranch"); Guard.ArgumentNotNullOrWhiteSpace(baseBranch, "baseBranch"); + Name = TaskName; arguments = String.Format("branch {0} {1}", newBranch, baseBranch); } - public override string Name { get { return "git branch"; } } public override string ProcessArguments { get { return arguments; } } public override TaskAffinity Affinity { get { return TaskAffinity.Exclusive; } } } diff --git a/src/GitHub.Api/Git/Tasks/GitBranchDeleteTask.cs b/src/GitHub.Api/Git/Tasks/GitBranchDeleteTask.cs index 495046806..983e40944 100644 --- a/src/GitHub.Api/Git/Tasks/GitBranchDeleteTask.cs +++ b/src/GitHub.Api/Git/Tasks/GitBranchDeleteTask.cs @@ -4,6 +4,7 @@ namespace GitHub.Unity { class GitBranchDeleteTask : ProcessTask { + private const string TaskName = "git branch -d"; private readonly string arguments; public GitBranchDeleteTask(string branch, bool deleteUnmerged, @@ -11,10 +12,10 @@ public GitBranchDeleteTask(string branch, bool deleteUnmerged, : base(token, processor ?? new SimpleOutputProcessor()) { Guard.ArgumentNotNullOrWhiteSpace(branch, "branch"); + Name = TaskName; arguments = !deleteUnmerged ? $"branch -d {branch}" : $"branch -D {branch}"; } - public override string Name { get { return "git branch"; } } public override string ProcessArguments { get { return arguments; } } public override TaskAffinity Affinity { get { return TaskAffinity.Exclusive; } } } diff --git a/src/GitHub.Api/Git/Tasks/GitCommitTask.cs b/src/GitHub.Api/Git/Tasks/GitCommitTask.cs index c532ce5d3..1f0c4726b 100644 --- a/src/GitHub.Api/Git/Tasks/GitCommitTask.cs +++ b/src/GitHub.Api/Git/Tasks/GitCommitTask.cs @@ -5,6 +5,7 @@ namespace GitHub.Unity { class GitCommitTask : ProcessTask { + private const string TaskName = "git commit"; private readonly string arguments; public GitCommitTask(string message, string body, @@ -13,6 +14,7 @@ public GitCommitTask(string message, string body, { Guard.ArgumentNotNullOrWhiteSpace(message, "message"); + Name = TaskName; arguments = "commit "; arguments += String.Format(" -m \"{0}", message); if (!String.IsNullOrEmpty(body)) @@ -20,7 +22,6 @@ public GitCommitTask(string message, string body, arguments += "\""; } - public override string Name { get { return "git commit"; } } public override string ProcessArguments { get { return arguments; } } public override TaskAffinity Affinity { get { return TaskAffinity.Exclusive; } } } diff --git a/src/GitHub.Api/Git/Tasks/GitConfigGetTask.cs b/src/GitHub.Api/Git/Tasks/GitConfigGetTask.cs index aeb72adea..a33a418f5 100644 --- a/src/GitHub.Api/Git/Tasks/GitConfigGetTask.cs +++ b/src/GitHub.Api/Git/Tasks/GitConfigGetTask.cs @@ -5,12 +5,15 @@ namespace GitHub.Unity { class GitConfigGetAllTask : ProcessTaskWithListOutput { + private const string TaskName = "git config get"; private readonly string arguments; public GitConfigGetAllTask(string key, GitConfigSource configSource, CancellationToken token, BaseOutputListProcessor processor = null) : base(token, processor ?? new SimpleListOutputProcessor()) { + Guard.ArgumentNotNullOrWhiteSpace(key, nameof(key)); + Name = TaskName; var source = ""; source += configSource == GitConfigSource.NonSpecified ? "--get-all" : @@ -20,19 +23,20 @@ public GitConfigGetAllTask(string key, GitConfigSource configSource, arguments = String.Format("config {0} {1}", source, key); } - public override string Name { get { return "git config get"; } } public override string ProcessArguments { get { return arguments; } } public override TaskAffinity Affinity { get { return TaskAffinity.Concurrent; } } } class GitConfigGetTask : ProcessTask { + private const string TaskName = "git config get"; private readonly string arguments; public GitConfigGetTask(string key, GitConfigSource configSource, CancellationToken token, IOutputProcessor processor = null) : base(token, processor ?? new FirstNonNullLineOutputProcessor()) { + Name = TaskName; var source = ""; source += configSource == GitConfigSource.NonSpecified ? "--get-all" : @@ -42,7 +46,6 @@ public GitConfigGetTask(string key, GitConfigSource configSource, arguments = String.Format("config {0} {1}", source, key); } - public override string Name { get { return "git config get"; } } public override string ProcessArguments { get { return arguments; } } public override TaskAffinity Affinity { get { return TaskAffinity.Concurrent; } } } diff --git a/src/GitHub.Api/Git/Tasks/GitConfigListTask.cs b/src/GitHub.Api/Git/Tasks/GitConfigListTask.cs index be706dad1..8d0fd3d92 100644 --- a/src/GitHub.Api/Git/Tasks/GitConfigListTask.cs +++ b/src/GitHub.Api/Git/Tasks/GitConfigListTask.cs @@ -6,11 +6,13 @@ namespace GitHub.Unity { class GitConfigListTask : ProcessTaskWithListOutput> { + private const string TaskName = "git config list"; private readonly string arguments; public GitConfigListTask(GitConfigSource configSource, CancellationToken token, BaseOutputListProcessor> processor = null) : base(token, processor ?? new ConfigOutputProcessor()) { + Name = TaskName; var source = ""; if (configSource != GitConfigSource.NonSpecified) { @@ -24,7 +26,6 @@ public GitConfigListTask(GitConfigSource configSource, CancellationToken token, arguments = String.Format("config {0} -l", source); } - public override string Name { get { return "git config list"; } } public override string ProcessArguments { get { return arguments; } } public override TaskAffinity Affinity { get { return TaskAffinity.Exclusive; } } } diff --git a/src/GitHub.Api/Git/Tasks/GitConfigSetTask.cs b/src/GitHub.Api/Git/Tasks/GitConfigSetTask.cs index a83a4a98a..4f4604236 100644 --- a/src/GitHub.Api/Git/Tasks/GitConfigSetTask.cs +++ b/src/GitHub.Api/Git/Tasks/GitConfigSetTask.cs @@ -1,20 +1,16 @@ using System; -using System.Collections.Generic; using System.Threading; namespace GitHub.Unity { class GitConfigSetTask : ProcessTask { - private readonly string value; private readonly string arguments; - private string label; public GitConfigSetTask(string key, string value, GitConfigSource configSource, CancellationToken token, IOutputProcessor processor = null) : base(token, processor ?? new SimpleOutputProcessor()) { - this.value = value; var source = ""; source += configSource == GitConfigSource.NonSpecified ? "" : @@ -22,10 +18,9 @@ public GitConfigSetTask(string key, string value, GitConfigSource configSource, configSource == GitConfigSource.User ? "--replace-all --global" : "--replace-all --system"; arguments = String.Format("config {0} {1} \"{2}\"", source, key, value); - label = String.Format("config {0} {1} \"{2}\"", source, key, new String('*', value.Length)); + Name = String.Format("config {0} {1} \"{2}\"", source, key, new String('*', value.Length)); } - public override string Name { get { return label;} } public override string ProcessArguments { get { return arguments; } } public override TaskAffinity Affinity { get { return TaskAffinity.Exclusive; } } } diff --git a/src/GitHub.Api/Git/Tasks/GitFetchTask.cs b/src/GitHub.Api/Git/Tasks/GitFetchTask.cs index 96981c125..ec46a51b3 100644 --- a/src/GitHub.Api/Git/Tasks/GitFetchTask.cs +++ b/src/GitHub.Api/Git/Tasks/GitFetchTask.cs @@ -6,12 +6,14 @@ namespace GitHub.Unity { class GitFetchTask : ProcessTask { + private const string TaskName = "git fetch"; private readonly string arguments; public GitFetchTask(string remote, CancellationToken token, IOutputProcessor processor = null) : base(token, processor ?? new SimpleOutputProcessor()) { + Name = TaskName; var stringBuilder = new StringBuilder(); stringBuilder.Append("fetch"); @@ -24,7 +26,6 @@ public GitFetchTask(string remote, arguments = stringBuilder.ToString(); } - public override string Name { get { return "git fetch"; } } public override string ProcessArguments { get { return arguments; } } public override TaskAffinity Affinity { get { return TaskAffinity.Exclusive; } } } diff --git a/src/GitHub.Api/Git/Tasks/GitInitTask.cs b/src/GitHub.Api/Git/Tasks/GitInitTask.cs index 2c8d635c1..f669db44d 100644 --- a/src/GitHub.Api/Git/Tasks/GitInitTask.cs +++ b/src/GitHub.Api/Git/Tasks/GitInitTask.cs @@ -4,11 +4,14 @@ namespace GitHub.Unity { class GitInitTask : ProcessTask { + private const string TaskName = "git init"; + public GitInitTask(CancellationToken token, IOutputProcessor processor = null) : base(token, processor ?? new SimpleOutputProcessor()) - { } + { + Name = TaskName; + } - public override string Name { get { return "git init"; } } public override string ProcessArguments { get { return "init"; } } public override TaskAffinity Affinity { get { return TaskAffinity.Exclusive; } } } diff --git a/src/GitHub.Api/Git/Tasks/GitLfsInstallTask.cs b/src/GitHub.Api/Git/Tasks/GitLfsInstallTask.cs index 2938eb24a..0aaef1dfc 100644 --- a/src/GitHub.Api/Git/Tasks/GitLfsInstallTask.cs +++ b/src/GitHub.Api/Git/Tasks/GitLfsInstallTask.cs @@ -4,11 +4,14 @@ namespace GitHub.Unity { class GitLfsInstallTask : ProcessTask { + private const string TaskName = "git lsf install"; + public GitLfsInstallTask(CancellationToken token, IOutputProcessor processor = null) : base(token, processor ?? new SimpleOutputProcessor()) - { } + { + Name = TaskName; + } - public override string Name { get { return "git lfs install"; } } public override string ProcessArguments { get { return "lfs install"; } } public override TaskAffinity Affinity { get { return TaskAffinity.Exclusive; } } } diff --git a/src/GitHub.Api/Git/Tasks/GitListBranchesTask.cs b/src/GitHub.Api/Git/Tasks/GitListBranchesTask.cs index 24985fdf5..97938f95a 100644 --- a/src/GitHub.Api/Git/Tasks/GitListBranchesTask.cs +++ b/src/GitHub.Api/Git/Tasks/GitListBranchesTask.cs @@ -4,15 +4,15 @@ namespace GitHub.Unity { class GitListLocalBranchesTask : ProcessTaskWithListOutput { + private const string TaskName = "git list local branches"; private const string Arguments = "branch -vv"; public GitListLocalBranchesTask(CancellationToken token, BaseOutputListProcessor processor = null) : base(token, processor ?? new BranchListOutputProcessor()) { + Name = TaskName; } - public override string Name { get { return "git list branch"; } } - public override string ProcessArguments { get { return Arguments ; } @@ -22,15 +22,15 @@ public override string ProcessArguments class GitListRemoteBranchesTask : ProcessTaskWithListOutput { + private const string TaskName = "git list remote branches"; private const string Arguments = "branch -vvr"; public GitListRemoteBranchesTask(CancellationToken token) : base(token, new BranchListOutputProcessor()) { + Name = TaskName; } - public override string Name { get { return "git list branch"; } } - public override string ProcessArguments { get { return Arguments; } diff --git a/src/GitHub.Api/Git/Tasks/GitListLocksTask.cs b/src/GitHub.Api/Git/Tasks/GitListLocksTask.cs index afba339c5..d73197348 100644 --- a/src/GitHub.Api/Git/Tasks/GitListLocksTask.cs +++ b/src/GitHub.Api/Git/Tasks/GitListLocksTask.cs @@ -4,12 +4,14 @@ namespace GitHub.Unity { class GitListLocksTask : ProcessTaskWithListOutput { + private const string TaskName = "git lfs locks"; private readonly string args; public GitListLocksTask(IGitObjectFactory gitObjectFactory, bool local, CancellationToken token, BaseOutputListProcessor processor = null) : base(token, processor ?? new LockOutputProcessor(gitObjectFactory)) { + Name = TaskName; args = "lfs locks"; if (local) { @@ -17,7 +19,6 @@ public GitListLocksTask(IGitObjectFactory gitObjectFactory, bool local, } } - public override string Name { get { return "git lfs locks"; } } public override string ProcessArguments => args; } } diff --git a/src/GitHub.Api/Git/Tasks/GitLockTask.cs b/src/GitHub.Api/Git/Tasks/GitLockTask.cs index 7bcc16bac..4903f8341 100644 --- a/src/GitHub.Api/Git/Tasks/GitLockTask.cs +++ b/src/GitHub.Api/Git/Tasks/GitLockTask.cs @@ -5,17 +5,18 @@ namespace GitHub.Unity { class GitLockTask : ProcessTask { + private const string TaskName = "git lfs lock"; private readonly string arguments; public GitLockTask(string path, CancellationToken token, IOutputProcessor processor = null) : base(token, processor ?? new SimpleOutputProcessor()) { + Name = TaskName; Guard.ArgumentNotNullOrWhiteSpace(path, "path"); arguments = String.Format("lfs lock \"{0}\"", path); } - public override string Name { get; set; } = "git lfs lock"; public override string ProcessArguments => arguments; public override TaskAffinity Affinity { get { return TaskAffinity.Exclusive; } } } diff --git a/src/GitHub.Api/Git/Tasks/GitLogTask.cs b/src/GitHub.Api/Git/Tasks/GitLogTask.cs index e21d00a85..eb09b8f5c 100644 --- a/src/GitHub.Api/Git/Tasks/GitLogTask.cs +++ b/src/GitHub.Api/Git/Tasks/GitLogTask.cs @@ -4,14 +4,15 @@ namespace GitHub.Unity { class GitLogTask : ProcessTaskWithListOutput { + private const string TaskName = "git log"; + public GitLogTask(IGitObjectFactory gitObjectFactory, CancellationToken token, BaseOutputListProcessor processor = null) : base(token, processor ?? new LogEntryOutputProcessor(gitObjectFactory)) { + Name = TaskName; } - public override string Name { get { return "git log"; } } - public override string ProcessArguments { get { return @"log --pretty=format:""%H%n%P%n%aN%n%aE%n%aI%n%cN%n%cE%n%cI%n%B---GHUBODYEND---"" --name-status"; } diff --git a/src/GitHub.Api/Git/Tasks/GitPullTask.cs b/src/GitHub.Api/Git/Tasks/GitPullTask.cs index dfc7b8595..fe51032bf 100644 --- a/src/GitHub.Api/Git/Tasks/GitPullTask.cs +++ b/src/GitHub.Api/Git/Tasks/GitPullTask.cs @@ -6,12 +6,14 @@ namespace GitHub.Unity { class GitPullTask : ProcessTask { + private const string TaskName = "git pull"; private readonly string arguments; public GitPullTask(string remote, string branch, CancellationToken token, IOutputProcessor processor = null) : base(token, processor ?? new SimpleOutputProcessor()) { + Name = TaskName; var stringBuilder = new StringBuilder(); stringBuilder.Append("pull"); @@ -30,7 +32,6 @@ public GitPullTask(string remote, string branch, arguments = stringBuilder.ToString(); } - public override string Name { get { return "git pull"; } } public override string ProcessArguments { get { return arguments; } } public override TaskAffinity Affinity { get { return TaskAffinity.Exclusive; } } } diff --git a/src/GitHub.Api/Git/Tasks/GitPushTask.cs b/src/GitHub.Api/Git/Tasks/GitPushTask.cs index d31f6aeb7..0e4c74cfd 100644 --- a/src/GitHub.Api/Git/Tasks/GitPushTask.cs +++ b/src/GitHub.Api/Git/Tasks/GitPushTask.cs @@ -5,11 +5,13 @@ namespace GitHub.Unity { class GitPushTask : ProcessTask { + private const string TaskName = "git push"; private readonly string arguments; public GitPushTask(CancellationToken token, IOutputProcessor processor = null) : base(token, processor ?? new SimpleOutputProcessor()) { + Name = TaskName; arguments = "push"; } @@ -20,12 +22,12 @@ public GitPushTask(string remote, string branch, bool setUpstream, Guard.ArgumentNotNullOrWhiteSpace(remote, "remote"); Guard.ArgumentNotNullOrWhiteSpace(branch, "branch"); + Name = TaskName; arguments = String.Format("push {0} {1} {2}:{2}", setUpstream ? "-u" : "", remote, branch); } - public override string Name { get { return "git push"; } } public override string ProcessArguments { get { return arguments; } } public override TaskAffinity Affinity { get { return TaskAffinity.Exclusive; } } } diff --git a/src/GitHub.Api/Git/Tasks/GitRemoteAddTask.cs b/src/GitHub.Api/Git/Tasks/GitRemoteAddTask.cs index 80e35f482..f6e948009 100644 --- a/src/GitHub.Api/Git/Tasks/GitRemoteAddTask.cs +++ b/src/GitHub.Api/Git/Tasks/GitRemoteAddTask.cs @@ -5,6 +5,7 @@ namespace GitHub.Unity { class GitRemoteAddTask : ProcessTask { + private const string TaskName = "git remote add"; private readonly string arguments; public GitRemoteAddTask(string remote, string url, @@ -14,10 +15,10 @@ public GitRemoteAddTask(string remote, string url, Guard.ArgumentNotNullOrWhiteSpace(remote, "remote"); Guard.ArgumentNotNullOrWhiteSpace(url, "url"); + Name = TaskName; arguments = String.Format("remote add {0} {1}", remote, url); } - public override string Name { get { return "git remote add"; } } public override string ProcessArguments { get { return arguments; } } public override TaskAffinity Affinity { get { return TaskAffinity.Exclusive; } } } diff --git a/src/GitHub.Api/Git/Tasks/GitRemoteBranchDeleteTask.cs b/src/GitHub.Api/Git/Tasks/GitRemoteBranchDeleteTask.cs index d061d341a..6be6ffbef 100644 --- a/src/GitHub.Api/Git/Tasks/GitRemoteBranchDeleteTask.cs +++ b/src/GitHub.Api/Git/Tasks/GitRemoteBranchDeleteTask.cs @@ -5,6 +5,7 @@ namespace GitHub.Unity { class GitRemoteBranchDeleteTask : ProcessTask { + private const string TaskName = "git push --delete"; private readonly string arguments; public GitRemoteBranchDeleteTask(string remote, string branch, @@ -14,10 +15,10 @@ public GitRemoteBranchDeleteTask(string remote, string branch, Guard.ArgumentNotNullOrWhiteSpace(remote, "remote"); Guard.ArgumentNotNullOrWhiteSpace(branch, "branch"); + Name = TaskName; arguments = String.Format("push {0} --delete {1}", remote, branch); } - public override string Name { get { return "git push --delete"; } } public override string ProcessArguments { get { return arguments; } } public override TaskAffinity Affinity { get { return TaskAffinity.Exclusive; } } } diff --git a/src/GitHub.Api/Git/Tasks/GitRemoteChangeTask.cs b/src/GitHub.Api/Git/Tasks/GitRemoteChangeTask.cs index 526f8749e..02eb69a48 100644 --- a/src/GitHub.Api/Git/Tasks/GitRemoteChangeTask.cs +++ b/src/GitHub.Api/Git/Tasks/GitRemoteChangeTask.cs @@ -5,6 +5,7 @@ namespace GitHub.Unity { class GitRemoteChangeTask : ProcessTask { + private const string TaskName = "git remote set-url"; private readonly string arguments; public GitRemoteChangeTask(string remote, string url, @@ -14,10 +15,10 @@ public GitRemoteChangeTask(string remote, string url, Guard.ArgumentNotNullOrWhiteSpace(remote, "remote"); Guard.ArgumentNotNullOrWhiteSpace(url, "url"); + Name = TaskName; arguments = String.Format("remote set-url {0} {1}", remote, url); } - public override string Name { get { return "git remote set-url"; } } public override string ProcessArguments { get { return arguments; } } public override TaskAffinity Affinity { get { return TaskAffinity.Exclusive; } } } diff --git a/src/GitHub.Api/Git/Tasks/GitRemoteListTask.cs b/src/GitHub.Api/Git/Tasks/GitRemoteListTask.cs index 65379cf0f..c1538cb63 100644 --- a/src/GitHub.Api/Git/Tasks/GitRemoteListTask.cs +++ b/src/GitHub.Api/Git/Tasks/GitRemoteListTask.cs @@ -4,12 +4,14 @@ namespace GitHub.Unity { class GitRemoteListTask : ProcessTaskWithListOutput { + private const string TaskName = "git remote"; + public GitRemoteListTask(CancellationToken token, BaseOutputListProcessor processor = null) : base(token, processor ?? new RemoteListOutputProcessor()) { + Name = TaskName; } - public override string Name { get { return "git remote"; } } public override string ProcessArguments { get { return "remote -v"; } } } } diff --git a/src/GitHub.Api/Git/Tasks/GitRemoteRemoveTask.cs b/src/GitHub.Api/Git/Tasks/GitRemoteRemoveTask.cs index 0ff396093..79f969b2c 100644 --- a/src/GitHub.Api/Git/Tasks/GitRemoteRemoveTask.cs +++ b/src/GitHub.Api/Git/Tasks/GitRemoteRemoveTask.cs @@ -5,6 +5,7 @@ namespace GitHub.Unity { class GitRemoteRemoveTask : ProcessTask { + private const string TaskName = "git remote rm"; private readonly string arguments; public GitRemoteRemoveTask(string remote, @@ -12,10 +13,10 @@ public GitRemoteRemoveTask(string remote, : base(token, processor ?? new SimpleOutputProcessor()) { Guard.ArgumentNotNullOrWhiteSpace(remote, "remote"); + Name = TaskName; arguments = String.Format("remote rm {0}", remote); } - public override string Name { get { return "git remote rm"; } } public override string ProcessArguments { get { return arguments; } } public override TaskAffinity Affinity { get { return TaskAffinity.Exclusive; } } } diff --git a/src/GitHub.Api/Git/Tasks/GitRemoveFromIndexTask.cs b/src/GitHub.Api/Git/Tasks/GitRemoveFromIndexTask.cs index dafa5cf3b..ab83c01ee 100644 --- a/src/GitHub.Api/Git/Tasks/GitRemoveFromIndexTask.cs +++ b/src/GitHub.Api/Git/Tasks/GitRemoveFromIndexTask.cs @@ -5,6 +5,7 @@ namespace GitHub.Unity { class GitRemoveFromIndexTask : ProcessTask { + private const string TaskName = "git reset HEAD"; private readonly string arguments; public GitRemoveFromIndexTask(IEnumerable files, @@ -13,6 +14,7 @@ public GitRemoveFromIndexTask(IEnumerable files, { Guard.ArgumentNotNull(files, "files"); + Name = TaskName; arguments = "reset HEAD"; arguments += " -- "; @@ -22,7 +24,6 @@ public GitRemoveFromIndexTask(IEnumerable files, } } - public override string Name { get { return "git add"; } } public override string ProcessArguments { get { return arguments; } } public override TaskAffinity Affinity { get { return TaskAffinity.Exclusive; } } } diff --git a/src/GitHub.Api/Git/Tasks/GitRevertTask.cs b/src/GitHub.Api/Git/Tasks/GitRevertTask.cs index 94adeed16..862b78c4d 100644 --- a/src/GitHub.Api/Git/Tasks/GitRevertTask.cs +++ b/src/GitHub.Api/Git/Tasks/GitRevertTask.cs @@ -4,6 +4,7 @@ namespace GitHub.Unity { class GitRevertTask : ProcessTask { + private const string TaskName = "git revert"; private readonly string arguments; public GitRevertTask(string changeset, @@ -11,11 +12,10 @@ public GitRevertTask(string changeset, : base(token, processor ?? new SimpleOutputProcessor()) { Guard.ArgumentNotNull(changeset, "changeset"); - + Name = TaskName; arguments = $"revert --no-edit {changeset}"; } - public override string Name { get { return "git revert"; } } public override string ProcessArguments { get { return arguments; } } public override TaskAffinity Affinity { get { return TaskAffinity.Exclusive; } } } diff --git a/src/GitHub.Api/Git/Tasks/GitStatusTask.cs b/src/GitHub.Api/Git/Tasks/GitStatusTask.cs index 13afb9389..a574cef6a 100644 --- a/src/GitHub.Api/Git/Tasks/GitStatusTask.cs +++ b/src/GitHub.Api/Git/Tasks/GitStatusTask.cs @@ -4,14 +4,15 @@ namespace GitHub.Unity { class GitStatusTask : ProcessTask { + private const string TaskName = "git status"; + public GitStatusTask(IGitObjectFactory gitObjectFactory, CancellationToken token, IOutputProcessor processor = null) : base(token, processor ?? new StatusOutputProcessor(gitObjectFactory)) { + Name = TaskName; } - public override string Name { get { return "git status"; } } - public override string ProcessArguments { get { return "status -b -u --ignored --porcelain"; } diff --git a/src/GitHub.Api/Git/Tasks/GitSwitchBranchesTask.cs b/src/GitHub.Api/Git/Tasks/GitSwitchBranchesTask.cs index e33974bc1..80efe5e40 100644 --- a/src/GitHub.Api/Git/Tasks/GitSwitchBranchesTask.cs +++ b/src/GitHub.Api/Git/Tasks/GitSwitchBranchesTask.cs @@ -1,24 +1,22 @@ using System; using System.Threading; -using GitHub.Unity; namespace GitHub.Unity { class GitSwitchBranchesTask : ProcessTask { + private const string TaskName = "git checkout"; private readonly string arguments; - private readonly string branch; public GitSwitchBranchesTask(string branch, CancellationToken token, IOutputProcessor processor = null) : base(token, processor ?? new SimpleOutputProcessor()) { Guard.ArgumentNotNullOrWhiteSpace(branch, "branch"); - this.branch = branch; + Name = TaskName; arguments = String.Format("checkout {0}", branch); } - public override string Name { get { return "git checkout"; } } public override string ProcessArguments { get { return arguments; } } public override TaskAffinity Affinity { get { return TaskAffinity.Exclusive; } } } diff --git a/src/GitHub.Api/Git/Tasks/GitUnlockTask.cs b/src/GitHub.Api/Git/Tasks/GitUnlockTask.cs index 82fbcdfd4..ad2c80eb2 100644 --- a/src/GitHub.Api/Git/Tasks/GitUnlockTask.cs +++ b/src/GitHub.Api/Git/Tasks/GitUnlockTask.cs @@ -5,6 +5,7 @@ namespace GitHub.Unity { class GitUnlockTask : ProcessTask { + private const string TaskName = "git lfs unlock"; private readonly string arguments; public GitUnlockTask(string path, bool force, @@ -13,6 +14,7 @@ public GitUnlockTask(string path, bool force, { Guard.ArgumentNotNullOrWhiteSpace(path, "path"); + Name = TaskName; var stringBuilder = new StringBuilder("lfs unlock "); if (force) @@ -27,7 +29,6 @@ public GitUnlockTask(string path, bool force, arguments = stringBuilder.ToString(); } - public override string Name { get; set; } = "git lfs unlock"; public override string ProcessArguments => arguments; public override TaskAffinity Affinity { get { return TaskAffinity.Exclusive; } } diff --git a/src/GitHub.Api/Platform/FindExecTask.cs b/src/GitHub.Api/Platform/FindExecTask.cs index 925a644f1..f301e6ead 100644 --- a/src/GitHub.Api/Platform/FindExecTask.cs +++ b/src/GitHub.Api/Platform/FindExecTask.cs @@ -10,11 +10,10 @@ class FindExecTask : ProcessTask public FindExecTask(string executable, CancellationToken token) : base(token, new FirstLineIsPathOutputProcessor()) { - name = DefaultEnvironment.OnWindows ? "where" : "which"; + Name = name = DefaultEnvironment.OnWindows ? "where" : "which"; arguments = executable; } - public override string Name { get { return name; } } public override string ProcessArguments { get { return arguments; } } public override TaskAffinity Affinity { get { return TaskAffinity.Concurrent; } } } From 373e2a17a6df53b69c66d8331b9f897152aaab14 Mon Sep 17 00:00:00 2001 From: Stanley Goldman Date: Mon, 31 Jul 2017 18:33:09 -0400 Subject: [PATCH 2/2] Removing virtual field - we should not call virtual methods on constructors --- src/GitHub.Api/NewTaskSystem/TaskBase.cs | 2 +- src/GitHub.Api/Platform/FindExecTask.cs | 3 +-- .../GitHub.Unity/Tasks/EvaluateProjectConfigurationTask.cs | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/GitHub.Api/NewTaskSystem/TaskBase.cs b/src/GitHub.Api/NewTaskSystem/TaskBase.cs index 1aef74c77..9110ff8a4 100644 --- a/src/GitHub.Api/NewTaskSystem/TaskBase.cs +++ b/src/GitHub.Api/NewTaskSystem/TaskBase.cs @@ -370,7 +370,7 @@ public override string ToString() public WaitHandle AsyncWaitHandle { get { return (Task as IAsyncResult).AsyncWaitHandle; } } public object AsyncState { get { return (Task as IAsyncResult).AsyncState; } } public bool CompletedSynchronously { get { return (Task as IAsyncResult).CompletedSynchronously; } } - public virtual string Name { get; set; } + public string Name { get; set; } public virtual TaskAffinity Affinity { get; set; } private ILogging logger; protected ILogging Logger { get { return logger = logger ?? Logging.GetLogger(GetType()); } } diff --git a/src/GitHub.Api/Platform/FindExecTask.cs b/src/GitHub.Api/Platform/FindExecTask.cs index f301e6ead..ae7ccfda9 100644 --- a/src/GitHub.Api/Platform/FindExecTask.cs +++ b/src/GitHub.Api/Platform/FindExecTask.cs @@ -5,12 +5,11 @@ namespace GitHub.Unity class FindExecTask : ProcessTask { private readonly string arguments; - private readonly string name; public FindExecTask(string executable, CancellationToken token) : base(token, new FirstLineIsPathOutputProcessor()) { - Name = name = DefaultEnvironment.OnWindows ? "where" : "which"; + Name = DefaultEnvironment.OnWindows ? "where" : "which"; arguments = executable; } diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/Tasks/EvaluateProjectConfigurationTask.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/Tasks/EvaluateProjectConfigurationTask.cs index 4c66c20b1..4263e2f5e 100644 --- a/src/UnityExtension/Assets/Editor/GitHub.Unity/Tasks/EvaluateProjectConfigurationTask.cs +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/Tasks/EvaluateProjectConfigurationTask.cs @@ -321,7 +321,7 @@ private IEnumerable EvaluateGitIgnore() } } - public override string Name { get { return "Project Evaluation"; } } + public string Name { get { return "Project Evaluation"; } } private enum SerializationSetting {