Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Automatically load PuTTY SSH key files when needed in left panel #6301

Merged
merged 9 commits into from Mar 20, 2019

Conversation

mast-eu
Copy link
Member

@mast-eu mast-eu commented Feb 22, 2019

This is a follow-up of #6293 and needs to be rebased before it can be merged.

Proposed changes

Test methodology

  • manual tests
  • ran unit tests

Test environment(s)

  • Git Extensions 3.00.00.4433
  • Git Extensions 3.1.0
  • Build 5cc1e8e
  • Git 2.20.1.windows.1
  • Microsoft Windows NT 6.1.7601 Service Pack 1
  • .NET Framework 4.7.3324.0
  • DPI 120dpi (125% scaling)

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

@codecov
Copy link

codecov bot commented Feb 23, 2019

Codecov Report

Merging #6301 into master will decrease coverage by 0.01%.
The diff coverage is 16.66%.

@@            Coverage Diff             @@
##           master    #6301      +/-   ##
==========================================
- Coverage   46.19%   46.18%   -0.02%     
==========================================
  Files         674      674              
  Lines       50790    50813      +23     
  Branches     6693     6695       +2     
==========================================
+ Hits        23464    23467       +3     
- Misses      26042    26059      +17     
- Partials     1284     1287       +3
Flag Coverage Δ
#production 35.74% <16.66%> (-0.02%) ⬇️
#tests 97.57% <ø> (+0.03%) ⬆️

@RussKie
Copy link
Member

RussKie commented Feb 25, 2019

Could you please rebase and fix the MC

@mast-eu mast-eu changed the title WIP: Automatically load PuTTY SSH key files when needed in left panel Automatically load PuTTY SSH key files when needed in left panel Feb 25, 2019
@mast-eu
Copy link
Member Author

mast-eu commented Feb 25, 2019

Could you please rebase and fix the MC

done

GitUI/BranchTreePanel/RepoObjectsTree.cs Outdated Show resolved Hide resolved
@mast-eu
Copy link
Member Author

mast-eu commented Mar 1, 2019

Proposed changes

  • Left panel remotes context menu: changed "Update all remotes" to "Fetch all remotes" (both text and git command); added icon (same as corresponding pull dialog shortcut)
  • Left panel remotes context menu: changed "Update and prune all remotes" to "Fetch and prune all remotes" (both text and git command); added icon (same as corresponding pull dialog shortcut)
  • Left panel remote context menu: changed icon for "Fetch" (same as corresponding pull dialog shortcut)
  • Left panel remote context menu : changed "Prune remote" to "Fetch and prune" (both text and git command); created new icon, similar to the other ones
  • all above actions now use the existing pull dialog, thus avoid code duplication and keep logic for handling SSH keys away from the left panel
  • refactoring of the MessageBox "Warning! The fetch with prune will remove all the remote-tracking references which no longer exist on remotes. Do you want to proceed?", in order to show it also when pruning is triggered from the left panel (via "Fetch and prune all remotes" or "Fetch and prune")

Screenshots

Before

image

image

oldmessage

After

contextall

contextsingle

newmessageall

newmessagesingle

Test methodology

  • manual tests
  • ran unit tests

Test environment(s)

  • Git Extensions 3.1.0
  • Build 34bc955
  • Git 2.20.1.windows.1
  • Microsoft Windows NT 6.1.7601 Service Pack 1
  • .NET Framework 4.7.3324.0
  • DPI 120dpi (125% scaling)

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

@mast-eu
Copy link
Member Author

mast-eu commented Mar 1, 2019

@pmiossec I changed quite a bit what you have implemented in #6293. Could you please have a look?

GitCommands/Settings/AppSettings.cs Outdated Show resolved Hide resolved
GitUI/CommandsDialogs/FormPull.cs Show resolved Hide resolved
@RussKie
Copy link
Member

RussKie commented Mar 6, 2019

@pmiossec are you happy with the changes?

@pmiossec
Copy link
Member

pmiossec commented Mar 7, 2019

@pmiossec are you happy with the changes?

Yes. The only thing that we could improve is that we could remove the last use of FormRemoteProcess.ShowDialog(this, "remote update"); in
https://github.com/gitextensions/gitextensions/blob/master/GitUI/CommandsDialogs/FormRemotes.cs#L450
to also use UICommands.StartPullDialogAndPullImmediately().

@mast-eu
Copy link
Member Author

mast-eu commented Mar 7, 2019

The only thing that we could improve is that we could remove the last use of FormRemoteProcess.ShowDialog(this, "remote update"); in
https://github.com/gitextensions/gitextensions/blob/master/GitUI/CommandsDialogs/FormRemotes.cs#L450
to also use UICommands.StartPullDialogAndPullImmediately().

Good point. I will add this.

…ogAndPullImmediately() in "Remote repositories" dialog
@mast-eu
Copy link
Member Author

mast-eu commented Mar 7, 2019

I added a commit implementing @pmiossec's suggestion.

@RussKie RussKie merged commit 521e9e8 into gitextensions:master Mar 20, 2019
@RussKie
Copy link
Member

RussKie commented Mar 20, 2019

Thank you

@RussKie RussKie added this to the 3.1.0 milestone Mar 20, 2019
@mast-eu mast-eu deleted the leftpanel_prune_remotes branch March 22, 2019 22:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants