Use "real" GitUICommands instance #11927
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pmiossec
approved these changes
Sep 18, 2024
mstv
reviewed
Sep 18, 2024
| private readonly IRepositoryHostPlugin _gitHoster; | ||
| private readonly EventHandler<GitModuleEventArgs>? _gitModuleChanged; | ||
|
|
||
| public ForkAndCloneForm(IRepositoryHostPlugin gitHoster, EventHandler<GitModuleEventArgs>? gitModuleChanged) | ||
| public ForkAndCloneForm(IGitUICommands commands, IRepositoryHostPlugin gitHoster, EventHandler<GitModuleEventArgs>? gitModuleChanged) |
There was a problem hiding this comment.
Suggested change
| public ForkAndCloneForm(IGitUICommands commands, IRepositoryHostPlugin gitHoster, EventHandler<GitModuleEventArgs>? gitModuleChanged) | |
| public ForkAndCloneForm(IServiceProvider serviceProvider, IRepositoryHostPlugin gitHoster, EventHandler<GitModuleEventArgs>? gitModuleChanged) |
There was a problem hiding this comment.
We don't do this for the forms, only for controls. I haven't given this too much thought, but on the surface it's probably a good change to make across the codebase.
| @@ -370,11 +372,9 @@ private void Clone(IHostedRepository repo) | |||
| return; | |||
| } | |||
|
|
|||
| GitUICommands uiCommands = new(GitUICommands.EmptyServiceProvider, new GitModule(null)); | |||
| ArgumentString cmd = Commands.Clone(repo.CloneUrl, targetDir, _commands.Module.GetPathForGitExecution, depth: GetDepth()); | |||
There was a problem hiding this comment.
Suggested change
| ArgumentString cmd = Commands.Clone(repo.CloneUrl, targetDir, _commands.Module.GetPathForGitExecution, depth: GetDepth()); | |
| GitUICommands uiCommands = new(_serviceProvider, new GitModule(null)); |
| @@ -1302,7 +1302,7 @@ public void StartCloneForkFromHoster(IWin32Window? owner, IRepositoryHostPlugin | |||
| { | |||
| WrapRepoHostingCall(TranslatedStrings.ForkCloneRepo, gitHoster, gh => | |||
| { | |||
| using ForkAndCloneForm frm = new(gh, gitModuleChanged); | |||
| using ForkAndCloneForm frm = new(this, gh, gitModuleChanged); | |||
There was a problem hiding this comment.
Suggested change
| using ForkAndCloneForm frm = new(this, gh, gitModuleChanged); | |
| using ForkAndCloneForm frm = new(serviceProvider: this, gh, gitModuleChanged); |
I was about (I worked on it and diagnosed the issue but I had to stop working on it and so was slower than @RussKie to propose the fix) |
This was referenced Sep 30, 2024
This was referenced Nov 4, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #11906
Test methodology
Test environment(s)
Merge strategy
I agree that the maintainer squash merge this PR (if the commit message is clear).
✒️ I contribute this code under The Developer Certificate of Origin.