Skip to content

Commit b6c103e

Browse files
RussKieRussKie
authoredAug 19, 2018
Merge pull request gitextensions#5324 from RussKie/Next_selection_as_default
Next selection as default
2 parents b6bdf5c + a01dfd7 commit b6c103e

File tree

8 files changed

+53
-109
lines changed

8 files changed

+53
-109
lines changed
 

‎GitCommands/Git/GitModule.cs

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -368,24 +368,6 @@ public static Encoding SystemEncoding
368368
[NotNull]
369369
public Encoding LogOutputEncoding => EffectiveConfigFile.LogOutputEncoding ?? CommitEncoding;
370370

371-
public AppSettings.PullAction LastPullAction
372-
{
373-
get => AppSettings.GetEnum("LastPullAction_" + WorkingDir, AppSettings.PullAction.None);
374-
set => AppSettings.SetEnum("LastPullAction_" + WorkingDir, value);
375-
}
376-
377-
public void LastPullActionToFormPullAction()
378-
{
379-
if (LastPullAction == AppSettings.PullAction.FetchAll)
380-
{
381-
AppSettings.FormPullAction = AppSettings.PullAction.Fetch;
382-
}
383-
else if (LastPullAction != AppSettings.PullAction.None)
384-
{
385-
AppSettings.FormPullAction = LastPullAction;
386-
}
387-
}
388-
389371
/// <summary>Indicates whether the <see cref="WorkingDir"/> contains a git repository.</summary>
390372
public bool IsValidGitWorkingDir()
391373
{

‎GitCommands/Settings/AppSettings.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -679,10 +679,10 @@ public enum PullAction
679679
Default
680680
}
681681

682-
public static PullAction FormPullAction
682+
public static PullAction DefaultPullAction
683683
{
684-
get => GetEnum("FormPullAction", PullAction.Merge);
685-
set => SetEnum("FormPullAction", value);
684+
get => GetEnum("DefaultPullAction", PullAction.Merge);
685+
set => SetEnum("DefaultPullAction", value);
686686
}
687687

688688
public static bool SetNextPullActionAsDefault

‎GitUI/CommandsDialogs/FormBrowse.Designer.cs

Lines changed: 19 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎GitUI/CommandsDialogs/FormBrowse.cs

Lines changed: 8 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1211,26 +1211,23 @@ private void PullToolStripMenuItemClick(object sender, EventArgs e)
12111211
bool isSilent;
12121212
if (sender == toolStripButtonPull || sender == pullToolStripMenuItem)
12131213
{
1214-
if (Module.LastPullAction == AppSettings.PullAction.None)
1214+
if (AppSettings.DefaultPullAction == AppSettings.PullAction.None)
12151215
{
12161216
isSilent = (ModifierKeys & Keys.Shift) != 0;
12171217
}
1218-
else if (Module.LastPullAction == AppSettings.PullAction.FetchAll)
1218+
else if (AppSettings.DefaultPullAction == AppSettings.PullAction.FetchAll)
12191219
{
12201220
fetchAllToolStripMenuItem_Click(sender, e);
12211221
return;
12221222
}
12231223
else
12241224
{
12251225
isSilent = sender == toolStripButtonPull;
1226-
Module.LastPullActionToFormPullAction();
12271226
}
12281227
}
12291228
else
12301229
{
12311230
isSilent = sender != pullToolStripMenuItem1;
1232-
1233-
Module.LastPullActionToFormPullAction();
12341231
}
12351232

12361233
if (isSilent)
@@ -2167,20 +2164,12 @@ private void dontSetAsDefaultToolStripMenuItem_Click(object sender, EventArgs e)
21672164

21682165
private void DoPullAction(Action action)
21692166
{
2170-
var actLastPullAction = Module.LastPullAction;
21712167
try
21722168
{
21732169
action();
21742170
}
21752171
finally
21762172
{
2177-
if (!AppSettings.SetNextPullActionAsDefault)
2178-
{
2179-
Module.LastPullAction = actLastPullAction;
2180-
Module.LastPullActionToFormPullAction();
2181-
}
2182-
2183-
AppSettings.SetNextPullActionAsDefault = false;
21842173
RefreshPullIcon();
21852174
}
21862175
}
@@ -2189,7 +2178,7 @@ private void mergeToolStripMenuItem_Click(object sender, EventArgs e)
21892178
{
21902179
DoPullAction(() =>
21912180
{
2192-
Module.LastPullAction = AppSettings.PullAction.Merge;
2181+
AppSettings.DefaultPullAction = AppSettings.PullAction.Merge;
21932182
PullToolStripMenuItemClick(sender, e);
21942183
});
21952184
}
@@ -2198,7 +2187,7 @@ private void rebaseToolStripMenuItem1_Click(object sender, EventArgs e)
21982187
{
21992188
DoPullAction(() =>
22002189
{
2201-
Module.LastPullAction = AppSettings.PullAction.Rebase;
2190+
AppSettings.DefaultPullAction = AppSettings.PullAction.Rebase;
22022191
PullToolStripMenuItemClick(sender, e);
22032192
});
22042193
}
@@ -2207,7 +2196,7 @@ private void fetchToolStripMenuItem_Click(object sender, EventArgs e)
22072196
{
22082197
DoPullAction(() =>
22092198
{
2210-
Module.LastPullAction = AppSettings.PullAction.Fetch;
2199+
AppSettings.DefaultPullAction = AppSettings.PullAction.Fetch;
22112200
PullToolStripMenuItemClick(sender, e);
22122201
});
22132202
}
@@ -2216,23 +2205,15 @@ private void pullToolStripMenuItem1_Click(object sender, EventArgs e)
22162205
{
22172206
if (AppSettings.SetNextPullActionAsDefault)
22182207
{
2219-
Module.LastPullAction = AppSettings.PullAction.None;
2208+
AppSettings.DefaultPullAction = AppSettings.PullAction.None;
22202209
}
22212210

22222211
PullToolStripMenuItemClick(sender, e);
2223-
2224-
// restore AppSettings.FormPullAction value
2225-
if (!AppSettings.SetNextPullActionAsDefault)
2226-
{
2227-
Module.LastPullActionToFormPullAction();
2228-
}
2229-
2230-
AppSettings.SetNextPullActionAsDefault = false;
22312212
}
22322213

22332214
private void RefreshPullIcon()
22342215
{
2235-
switch (Module.LastPullAction)
2216+
switch (AppSettings.DefaultPullAction)
22362217
{
22372218
case AppSettings.PullAction.Fetch:
22382219
toolStripButtonPull.Image = Images.PullFetch;
@@ -2265,20 +2246,12 @@ private void fetchAllToolStripMenuItem_Click(object sender, EventArgs e)
22652246
{
22662247
if (AppSettings.SetNextPullActionAsDefault)
22672248
{
2268-
Module.LastPullAction = AppSettings.PullAction.FetchAll;
2249+
AppSettings.DefaultPullAction = AppSettings.PullAction.FetchAll;
22692250
}
22702251

22712252
RefreshPullIcon();
22722253

22732254
UICommands.StartPullDialogAndPullImmediately(this, fetchAll: true);
2274-
2275-
// restore AppSettings.FormPullAction value
2276-
if (!AppSettings.SetNextPullActionAsDefault)
2277-
{
2278-
Module.LastPullActionToFormPullAction();
2279-
}
2280-
2281-
AppSettings.SetNextPullActionAsDefault = false;
22822255
}
22832256

22842257
private void branchSelect_MouseUp(object sender, MouseEventArgs e)

‎GitUI/CommandsDialogs/FormBrowse.resx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,15 @@
123123
<metadata name="toolStripMenuItem4.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
124124
<value>False</value>
125125
</metadata>
126+
<metadata name="toolStripSeparator14.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
127+
<value>False</value>
128+
</metadata>
126129
<metadata name="ToolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
127130
<value>251, 17</value>
128131
</metadata>
132+
<metadata name="toolStripSeparator11.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
133+
<value>False</value>
134+
</metadata>
129135
<metadata name="FilterToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
130136
<value>17, 17</value>
131137
</metadata>

‎GitUI/CommandsDialogs/FormPull.cs

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,12 @@ public FormPull(GitUICommands commands, string defaultRemoteBranch, string defau
127127
_branch = Module.GetSelectedBranch();
128128
BindRemotesDropDown(defaultRemote);
129129

130-
Merge.Checked = AppSettings.FormPullAction == AppSettings.PullAction.Merge;
131-
Rebase.Checked = AppSettings.FormPullAction == AppSettings.PullAction.Rebase;
132-
Fetch.Checked = AppSettings.FormPullAction == AppSettings.PullAction.Fetch;
130+
Merge.Checked = AppSettings.DefaultPullAction == AppSettings.PullAction.Merge;
131+
Rebase.Checked = AppSettings.DefaultPullAction == AppSettings.PullAction.Rebase;
132+
Fetch.Checked = AppSettings.DefaultPullAction == AppSettings.PullAction.Fetch;
133133
localBranch.Enabled = Fetch.Checked;
134134
AutoStash.Checked = AppSettings.AutoStash;
135-
Prune.Enabled = AppSettings.FormPullAction == AppSettings.PullAction.Merge || AppSettings.FormPullAction == AppSettings.PullAction.Fetch;
135+
Prune.Enabled = AppSettings.DefaultPullAction == AppSettings.PullAction.Merge || AppSettings.DefaultPullAction == AppSettings.PullAction.Fetch;
136136

137137
ErrorOccurred = false;
138138

@@ -286,8 +286,6 @@ public DialogResult PullChanges(IWin32Window owner)
286286
return DialogResult.No;
287287
}
288288

289-
UpdateSettingsDuringPull();
290-
291289
DialogResult dr = ShouldRebaseMergeCommit();
292290
if (dr != DialogResult.Yes)
293291
{
@@ -399,26 +397,6 @@ bool ShouldPullChanges()
399397
return true;
400398
}
401399

402-
void UpdateSettingsDuringPull()
403-
{
404-
if (Merge.Checked)
405-
{
406-
AppSettings.FormPullAction = AppSettings.PullAction.Merge;
407-
}
408-
409-
if (Rebase.Checked)
410-
{
411-
AppSettings.FormPullAction = AppSettings.PullAction.Rebase;
412-
}
413-
414-
if (Fetch.Checked)
415-
{
416-
AppSettings.FormPullAction = AppSettings.PullAction.Fetch;
417-
}
418-
419-
AppSettings.AutoStash = AutoStash.Checked;
420-
}
421-
422400
string CalculateSource()
423401
{
424402
if (PullFromUrl.Checked)

‎GitUI/CommandsDialogs/FormPush.cs

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ private ForcePushOptions GetForcePushOption()
470470

471471
private bool IsRebasingMergeCommit()
472472
{
473-
if (AppSettings.FormPullAction == AppSettings.PullAction.Rebase &&
473+
if (AppSettings.DefaultPullAction == AppSettings.PullAction.Rebase &&
474474
_candidateForRebasingMergeCommit &&
475475
_selectedBranch == _currentBranchName &&
476476
_selectedRemote == _currentBranchRemote)
@@ -512,7 +512,7 @@ private bool HandlePushOnExit(ref bool isError, FormProcess form)
512512
bool cancel = false;
513513
string destination = _NO_TRANSLATE_Remotes.Text;
514514
string buttons = _pullRepositoryButtons.Text;
515-
switch (Module.LastPullAction)
515+
switch (AppSettings.DefaultPullAction)
516516
{
517517
case AppSettings.PullAction.Fetch:
518518
case AppSettings.PullAction.FetchAll:
@@ -551,18 +551,18 @@ private bool HandlePushOnExit(ref bool isError, FormProcess form)
551551

552552
break;
553553
case 1:
554-
AppSettings.FormPullAction = AppSettings.PullAction.Rebase;
554+
AppSettings.DefaultPullAction = AppSettings.PullAction.Rebase;
555555
if (rememberDecision)
556556
{
557-
AppSettings.AutoPullOnPushRejectedAction = AppSettings.FormPullAction;
557+
AppSettings.AutoPullOnPushRejectedAction = AppSettings.DefaultPullAction;
558558
}
559559

560560
break;
561561
case 2:
562-
AppSettings.FormPullAction = AppSettings.PullAction.Merge;
562+
AppSettings.DefaultPullAction = AppSettings.PullAction.Merge;
563563
if (rememberDecision)
564564
{
565-
AppSettings.AutoPullOnPushRejectedAction = AppSettings.FormPullAction;
565+
AppSettings.AutoPullOnPushRejectedAction = AppSettings.DefaultPullAction;
566566
}
567567

568568
break;
@@ -604,17 +604,13 @@ private bool HandlePushOnExit(ref bool isError, FormProcess form)
604604
return false;
605605
}
606606

607-
if (AppSettings.AutoPullOnPushRejectedAction == AppSettings.PullAction.Default)
607+
if (AppSettings.AutoPullOnPushRejectedAction == AppSettings.PullAction.Default &&
608+
AppSettings.DefaultPullAction == AppSettings.PullAction.None)
608609
{
609-
if (Module.LastPullAction == AppSettings.PullAction.None)
610-
{
611-
return false;
612-
}
613-
614-
Module.LastPullActionToFormPullAction();
610+
return false;
615611
}
616612

617-
if (AppSettings.FormPullAction == AppSettings.PullAction.Fetch)
613+
if (AppSettings.DefaultPullAction == AppSettings.PullAction.Fetch)
618614
{
619615
form.AppendOutput(Environment.NewLine +
620616
"Can not perform auto pull, when merge option is set to fetch.");

0 commit comments

Comments
 (0)
Please sign in to comment.