Interactively and hierarchically perform git merges across branches and run commands in between.
Project description
GIUP - Git Interactive Update and Publish
Allows to interactively perform hierarchical merges and run publishing commands in between.
When commands fail the user is given the chance to intervene by rerunning the current command, just continuing, running a custom shell command or stopping the project, or the current merge path.
Example Workflow
Example workflow from one of my Minecraft modding projects:
.giup:
{
"merge-paths": [
"1.16",
"1.16->1.15->1.14",
"1.16->1.17"
],
"commands": [
{
"title": "Cleanup build directories",
"run": "rm -rf build .gradle",
"nt": "rmdir /S /Q build & rmdir /S /Q .gradle"
},
{
"title": "Build and publish",
"run": "./gradlew publish",
"nt": "gradlew publish"
},
"git push"
]
}
This will consecutively merge:
1.16
to1.15
1.15
to1.14
1.16
to1.17
After each merge GIUP will cleanup, build, publish and push the code
Specification
By default, the project specification will be read from the .giup
file in the working directory. The specification should be defined in JSON and uses the following keys:
merge-paths
Here you can specify certain merge hierarchies. You can either specify a hierarchy as a string delimited by arrows (->
) or as an array with all branches (["1.16","1.15","1.14"]
).
Specifying a single branch will just switch to that branch and run the commands.
commands
In this array commands are specified.
Commands are specified as an object or a string, which is a short form for an object with the run
key.
The run
entry should contain a string that will be run as a shell command. You can define overrides for Windows (nt
) and POSIX (posix
) shells.
The title
entry is a string that optionally gets displayed when the command is run. If not defined, the command itself will be displayed before execution.
Project details
Release history Release notifications | RSS feed
Download files
Download the file for your platform. If you're not sure which to choose, learn more about installing packages.
Source Distribution
Built Distribution
Hashes for GIUP-1.0.0rc0-py2.py3-none-any.whl
Algorithm | Hash digest | |
---|---|---|
SHA256 | 2c726e824f6cbb87d3353b2f78829265ca37c4653d54e95eaafa637cc9806bfe |
|
MD5 | c6fefd0ef0c931fae4292908e3562b34 |
|
BLAKE2b-256 | ecdccb10b65f2d3e06d168485d152a2a4d3e430473a63a249012f74a57f8dc22 |