-
Notifications
You must be signed in to change notification settings - Fork 9
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
Advanced configuration #108
Conversation
This 'little' change makes it possible to introduce a much bigger feature.
89ece76
to
717a318
Compare
717a318
to
f92a4a5
Compare
Keeping a local configuration file might cause some trouble when switching branches, where the new configuration might be expected. To solve this it might be an idea to use a special |
f92a4a5
to
2791c3b
Compare
Local configuration is now stored in a special branch named "_hubkit", the configuration is loaded once (using a special temporary repository) and it not effected by branch switching. This new config branch can also be used in the future to keep special hook scripts for upmerge for example, as the script can be executed without the need to keep this in the lowest possible branch. |
816eb59
to
c036530
Compare
In addition to the previous commit this provides a near complete rewrite of configuration handling. - Configuration is now validated using the Symfony Config component - Per branch configuration (requires schema-version 2 is used) - Local configuration usage for easier management (requires schema-version 2 is used in the main config file) Stored in a special branch named "_hubkit". Use the newly added commands to initialize the configuration 'share' the upstream repository The per branch configuration allows defining a default configuration, per branch and version ranges by allowing regexp. Existing configurations will continue to work but will not be supported in Hubkit v2.0 Show local repository info in self-diagnose - Shows the (resolved) configuration for the local repository - Whether configuration was local or if the _hubkit branch exists but no config.php file was found - Return proper status (0: OK, 1: error)
c036530
to
71d1f54
Compare
OK. I'm finally done! I added two additional commands to initialize the configuration (importing any existing configuration to ease the transition) and another one to synchronize the configuration with the upstream (pull/push/rebase when diverged). All and all I'm really pleased with this feature! |
The allows for a more advanced configuration, mainly per branch configuration and a local configuration file.
Stored in a special branch named "_hubkit".
The per branch configuration allows defining a default configuration, per branch
and version ranges by allowing regexp.
Existing configurations will continue to work but will not be supported in Hubkit v2.0