Allow customise colors of remotes #12273
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
There was a problem hiding this comment.
Pull Request Overview
This pull request adds support for customizing remote colors and reorders the URL and Name rows in the FormRemotes dialog. Key changes include:
- Adding methods in GitModule and IGitModule to get and reset remote colors.
- Updating the UI in FormRemotes.cs to support the new remote color feature with proper button behavior.
- Modifying the remote settings save logic and corresponding unit tests to include the optional remote color.
Reviewed Changes
Copilot reviewed 12 out of 15 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| src/app/GitCommands/Git/GitModule.cs | Introduces _remoteColors and GetRemoteColors/ResetRemoteColors methods for caching remote colors. |
| src/app/GitCommands/Config/SettingKeyString.cs | Adds a new setting key for remote color configuration. |
| src/app/GitUI/CommandsDialogs/FormRemotes.cs | Updates the remote configuration dialog to include remote color UI elements and logic. |
| src/app/GitCommands/Remotes/ConfigFileRemoteSettingsManager.cs | Enhances SaveRemote and PopulateRemotes to handle the new remote color property. |
| tests/app/UnitTests/GitCommands.Tests/Remote/ConfigFileRemoteSettingsManagerTests.cs | Updates unit tests to account for the new remote color parameter. |
| Additional files | Various updates to pass the remote colors through to the revision grid UI. |
Files not reviewed (3)
- src/app/GitUI/CommandsDialogs/FormRemotes.Designer.cs: Language not supported
- src/app/GitUI/CommandsDialogs/FormRemotes.resx: Language not supported
- src/app/GitUI/Translation/English.xlf: Language not supported
tests/app/UnitTests/GitCommands.Tests/Remote/ConfigFileRemoteSettingsManagerTests.cs
Outdated
Show resolved
Hide resolved
mstv
reviewed
Mar 22, 2025
src/app/GitUI/UserControls/RevisionGrid/Columns/MessageColumnProvider.cs
Outdated
Show resolved
Hide resolved
tests/app/UnitTests/GitCommands.Tests/Remote/ConfigFileRemoteSettingsManagerTests.cs
Outdated
Show resolved
Hide resolved
|
a3274b7 to
f4ce758
Compare
mstv
approved these changes
Mar 23, 2025
mstv
reviewed
Mar 25, 2025
Comment on lines
+159
to
+160
| using GitModuleTestHelper moduleTestHelper = new(); | ||
| GitModule gitModule = GetGitModuleWithExecutable(_executable, module: moduleTestHelper.Module); |
There was a problem hiding this comment.
AI output must be checked thrice! When resolving the MCs, it took long until I noticed that this code makes use of _executable but not of _gitModule.
There was a problem hiding this comment.
Yep, some of these tests are special...
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.
I generally work in repos where maintainers tend to use main trunks instead of own forks, which makes repos very busy. Those repos also tend to have several remotes, which often make finding the right branch a daunting task.
Colouring the remotes makes finding the right remote easier.
Proposed changes
Key points:
Screenshots
Before
After
If the color is not set, then only "Set color" button is available:
Once a color for a remote is set, then there is an additional button to reset:
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.