Disable merge rebase commands when branch is local

[GintasS]

Fixes #1248

Proposed changes

Like the author of the issue has said, I'm disabling these two buttons when the branch is local.

Screenshots

Before

After

Test methodology

Manual

---

✒️ I contribute this code under The Developer Certificate of Origin.

[RussKie]

👍
Please add tests

[GintasS]

👍
Please add tests

Will do :)

[GintasS]

Please let me know if the this test is not sufficient, could not figure out how to make a scenario where a branch becomes a remote one, so it would set true to Enabled, Checked properties.

[gerhardol]

If the default action is Merge or Rebase, the error message still appears, this should also be handled

The screenshot After does not have the circle checked, it should be set here.

[GintasS]

Ok, try to see the cases, I removed the circle so it wouldn't confuse that an option is selected, but somehow is disabled.

[gerhardol]

Ok, try to see the cases, I removed the circle so it wouldn't confuse that an option is selected, but somehow is disabled.

For the disabled options, it is good to disable
I was asking about the remaining enabled option

[GintasS]

Ok, try to see the cases, I removed the circle so it wouldn't confuse that an option is selected, but somehow is disabled.

For the disabled options, it is good to disable
I was asking about the remaining enabled option

Just to be sure, you're talking about "Do not merge, only fetch remote changes"?

[gerhardol]

Just to be sure, you're talking about "Do not merge, only fetch remote changes"?

yes

[RussKie]

LGTM

[GintasS]

Just to be sure, you're talking about "Do not merge, only fetch remote changes"?

yes

Fixed this.

[codecov]

Codecov Report

Merging #8517 into master will decrease coverage by 0.01%.
The diff coverage is 52.78%.

@@            Coverage Diff             @@
##           master    #8517      +/-   ##
==========================================
- Coverage   55.07%   55.06%   -0.02%     
==========================================
  Files         899      899              
  Lines       64708    64742      +34     
  Branches    11624    11648      +24     
==========================================
+ Hits        35639    35650      +11     
  Misses      26340    26340              
- Partials     2729     2752      +23     

Flag	Coverage Δ
#production	41.97% <45.97%> (-0.01%)	⬇️
#tests	94.70% <72.88%> (-0.10%)	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

[GintasS]

If the default action is Merge or Rebase, the error message still appears, this should also be handled

The screenshot After does not have the circle checked, it should be set here.

I'm not sure how to do it properly, I know that you can set default action via:
AppSettings.DefaultPullAction

[RussKie]

I know that you can set default action via:
AppSettings.DefaultPullAction

We shouldn't touch this, this is a user setting.

If the default action is Merge or Rebase, the error message still appears, this should also be handled
The screenshot After does not have the circle checked, it should be set here.

I'm not sure how to do it properl

I presume what @gerhardol is referring to here is that by disabling the two merge options the 3rd is left unchecked. I'm not saying it has be checked until we understand the new behaviour with your fix.
Have you tested what happens if you click the "Pull" button?

[GintasS]

I know that you can set default action via:
AppSettings.DefaultPullAction

We shouldn't touch this, this is a user setting.

If the default action is Merge or Rebase, the error message still appears, this should also be handled
The screenshot After does not have the circle checked, it should be set here.

I'm not sure how to do it properl

I presume what @gerhardol is referring to here is that by disabling the two merge options the 3rd is left unchecked. I'm not saying it has be checked until we understand the new behaviour with your fix.
Have you tested what happens if you click the "Pull" button?

So yes, I disabled the 3rd option with my new fix. Now regarding what happens when I press Pull button:

1.Default action is set to Pull - merge

2.Default action is set to Pull - rebase

[GintasS]

Updated "After" image on the first comment.

[RussKie]

@gerhardol what do you think of this? To me this feels acceptable.

[gerhardol]

A few naming suggestions (not commented all occurrences) and setting of checked
Otherwise fine

[GintasS]

Why does the build fail, integration tests are fine from my end?

[gerhardol]

Why does the build fail, integration tests are fine from my end?

They fail for me too, all on
accessor.Fetch.Checked.Should().Be(fetchChecked);
Some defaults maybe?

[RussKie]

I'll have a look in a few days

[RussKie]

Please don't do that, rebase cleanly on HEAD instead.

[RussKie]

There's something wrong, you have too many changes, and most aren't yours.
Please cleanly rebase only your changes on top of the master branch, and squash. https://github.com/gitextensions/gitextensions/wiki/How-To%3A-Squash-and-Rebase-your-changes

[GintasS]

There's something wrong, you have too many changes, and most aren't yours.
Please cleanly rebase only your changes on top of the master branch, and squash. https://github.com/gitextensions/gitextensions/wiki/How-To%3A-Squash-and-Rebase-your-changes

I removed the changes, but the rebase thing is till valid.