Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 01b0283

Browse files
vbjayvbjay
committedOct 16, 2018
Replace ArgumentBuilder when making Git arguments
1 parent a80eb39 commit 01b0283

File tree

8 files changed

+15
-29
lines changed

8 files changed

+15
-29
lines changed
 

‎GitCommands/Git/GitCheckoutBranchCmd.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,8 @@ public GitCheckoutBranchCmd(
3737

3838
protected override ArgumentString BuildArguments()
3939
{
40-
return new ArgumentBuilder
40+
return new GitArgumentBuilder("checkout")
4141
{
42-
"checkout",
4342
{ LocalChanges == LocalChangesAction.Merge, "--merge" },
4443
{ LocalChanges == LocalChangesAction.Reset, "--force" },
4544
{ Remote && NewBranchMode == CheckoutNewBranchMode.Create, $"-b {NewBranchName.Quote()}" },

‎GitCommands/Git/GitDeleteBranchCmd.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@ protected override ArgumentString BuildArguments()
2424
var hasRemoteBranch = _branches.Any(branch => branch.IsRemote);
2525
var hasNonRemoteBranch = _branches.Any(branch => !branch.IsRemote);
2626

27-
return new ArgumentBuilder
27+
return new GitArgumentBuilder("branch")
2828
{
29-
"branch",
3029
{ _force, "-D", "-d" },
3130
{ hasRemoteBranch && hasNonRemoteBranch, "-a" },
3231
{ hasRemoteBranch && !hasNonRemoteBranch, "-r" },

‎GitCommands/Git/GitDeleteRemoteBranchesCmd.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,8 @@ public GitDeleteRemoteBranchesCmd(string remote, IEnumerable<string> branchLocal
3131

3232
protected override ArgumentString BuildArguments()
3333
{
34-
return new ArgumentBuilder
34+
return new GitArgumentBuilder("push")
3535
{
36-
"push",
3736
_remote,
3837
_branches.Select(branch => $":refs/heads/{branch.Quote()}")
3938
};

‎GitCommands/Git/GitModule.cs

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@ public ExecutionResult Clean(bool dryRun, bool directories = false, bool nonIgno
566566

567567
public bool EditNotes(ObjectId commitId)
568568
{
569-
var arguments = new ArgumentBuilder { "notes", "edit", commitId };
569+
var arguments = new GitArgumentBuilder("notes") { "edit", commitId };
570570
var editor = GetEffectiveSetting("core.editor").ToLower();
571571
var createWindow = !editor.Contains("gitextensions") && !editor.Contains("notepad");
572572

@@ -1610,9 +1610,8 @@ public string GetPuttyKeyFileForRemote([CanBeNull] string remote)
16101610

16111611
public ArgumentString FetchCmd([CanBeNull] string remote, [CanBeNull] string remoteBranch, [CanBeNull] string localBranch, bool? fetchTags = false, bool isUnshallow = false, bool prune = false)
16121612
{
1613-
return new ArgumentBuilder
1613+
return new GitArgumentBuilder("fetch")
16141614
{
1615-
"fetch",
16161615
{ GitVersion.Current.FetchCanAskForProgress, "--progress" },
16171616
{
16181617
!string.IsNullOrEmpty(remote) || !string.IsNullOrEmpty(remoteBranch) || !string.IsNullOrEmpty(localBranch),
@@ -1623,9 +1622,8 @@ public ArgumentString FetchCmd([CanBeNull] string remote, [CanBeNull] string rem
16231622

16241623
public ArgumentString PullCmd(string remote, string remoteBranch, bool rebase, bool? fetchTags = false, bool isUnshallow = false, bool prune = false)
16251624
{
1626-
return new ArgumentBuilder
1625+
return new GitArgumentBuilder("pull")
16271626
{
1628-
"pull",
16291627
{ rebase, "--rebase" },
16301628
{ GitVersion.Current.FetchCanAskForProgress, "--progress" },
16311629
GetFetchArgs(remote, remoteBranch, null, fetchTags, isUnshallow, prune && !rebase)
@@ -1702,9 +1700,8 @@ public string GetRebaseDir()
17021700
public ArgumentString PushAllCmd(string remote, ForcePushOptions force, bool track, int recursiveSubmodules)
17031701
{
17041702
// TODO make an enum for RecursiveSubmodulesOption and add to ArgumentBuilderExtensions
1705-
return new ArgumentBuilder
1703+
return new GitArgumentBuilder("push")
17061704
{
1707-
"push",
17081705
force,
17091706
{ track, "-u" },
17101707
{ recursiveSubmodules == 1, "--recurse-submodules=check" },
@@ -1737,9 +1734,8 @@ public ArgumentString PushCmd([NotNull] string remote, [NotNull] string fromBran
17371734
}
17381735

17391736
// TODO make an enum for RecursiveSubmodulesOption and add to ArgumentBuilderExtensions
1740-
return new ArgumentBuilder
1737+
return new GitArgumentBuilder("push")
17411738
{
1742-
"push",
17431739
force,
17441740
{ track, "-u" },
17451741
{ recursiveSubmodules == 1, "--recurse-submodules=check" },
@@ -3043,9 +3039,8 @@ public IReadOnlyList<string> GetAllBranchesWhichContainGivenCommit(ObjectId obje
30433039
}
30443040

30453041
var output = _gitExecutable.GetOutput(
3046-
new ArgumentBuilder
3042+
new GitArgumentBuilder("branch")
30473043
{
3048-
"branch",
30493044
{ getRemote && getLocal, "-a" },
30503045
{ getRemote && !getLocal, "-r" },
30513046
"--contains",
@@ -3186,9 +3181,8 @@ public IReadOnlyList<string> GetFullTree(string id)
31863181

31873182
public IEnumerable<IGitItem> GetTree(ObjectId commitId, bool full)
31883183
{
3189-
var args = new ArgumentBuilder
3184+
var args = new GitArgumentBuilder("ls-tree")
31903185
{
3191-
"ls-tree",
31923186
"-z",
31933187
{ full, "-r" },
31943188
commitId
@@ -3201,9 +3195,8 @@ public IEnumerable<IGitItem> GetTree(ObjectId commitId, bool full)
32013195

32023196
public GitBlame Blame(string fileName, string from, Encoding encoding, string lines = null)
32033197
{
3204-
var args = new ArgumentBuilder
3198+
var args = new GitArgumentBuilder("blame")
32053199
{
3206-
"blame",
32073200
"--porcelain",
32083201
{ AppSettings.DetectCopyInFileOnBlame, "-M" },
32093202
{ AppSettings.DetectCopyInAllOnBlame, "-C" },

‎GitCommands/Git/Tag/GitCreateTagCmd.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@ public GitCreateTagCmd(GitCreateTagArgs args, [CanBeNull] string tagMessageFileN
2121

2222
protected override ArgumentString BuildArguments()
2323
{
24-
return new ArgumentBuilder
24+
return new GitArgumentBuilder("tag")
2525
{
26-
"tag",
2726
{ CreateTagArguments.Force, "-f" },
2827
GetArgumentForOperation(),
2928
{ CreateTagArguments.Operation.CanProvideMessage(), $"-F {TagMessageFileName.Quote()}" },

‎GitUI/CommandsDialogs/WorktreeDialog/FormCreateWorktree.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,8 @@ private void CreateWorktree()
105105
{
106106
// https://git-scm.com/docs/git-worktree
107107

108-
var args = new ArgumentBuilder
108+
var args = new GitArgumentBuilder("worktree")
109109
{
110-
"worktree",
111110
"add",
112111
WorktreeDirectory.Quote(),
113112
{ radioButtonCreateNewBranch.Checked, $"-b {textBoxNewBranchName.Text}", ((GitRef)comboBoxBranches.SelectedItem).Name }

‎GitUI/UserControls/RevisionGrid/RevisionGridControl.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1149,9 +1149,8 @@ int SearchRevision(ObjectId objectId)
11491149
[NotNull]
11501150
private IEnumerable<ObjectId> TryGetParents(ObjectId objectId)
11511151
{
1152-
var args = new ArgumentBuilder
1152+
var args = new GitArgumentBuilder("rev-list")
11531153
{
1154-
"rev-list",
11551154
{ AppSettings.OrderRevisionByDate, "--date-order" },
11561155
{ AppSettings.MaxRevisionGraphCommits > 0, $"--max-count={AppSettings.MaxRevisionGraphCommits}" },
11571156
objectId

‎Plugins/Gerrit/FormGerritPublish.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,8 @@ private void PublishClick(object sender, EventArgs e)
4242

4343
private static ArgumentString PushCmd(string remote, string toBranch)
4444
{
45-
return new ArgumentBuilder
45+
return new GitArgumentBuilder("push")
4646
{
47-
"push",
4847
{ GitVersion.Current.PushCanAskForProgress, "--progress" },
4948
remote.ToPosixPath().Trim().Quote(),
5049
$"HEAD:{GitRefName.GetFullBranchName(toBranch)?.Replace(" ", "")}"

0 commit comments

Comments
 (0)
Please sign in to comment.