lawliet89/fusionner

Tool to create merge commits between your default branches and topic branches for testing purposes.

fusionner

Documentation

fusionner is French for merge. This tool exists to create merge commits between your watched topic branches and your target default branch.

These merged commits can then be tested in your CI tool.

Consider the diagram below:

Normally, tests will be run on the commit labelled Pull Request. Ideally, we would like to run tests on a merge commit with your master branch. This is what fusionner does!

If your master branch has moved on, fusionner will update the merge commit with the new commits from master.

Linting

Code should be formatted with rustfmt: cargo fmt -- --write-mode=overwrite

Tests

Tests can simply be run with cargo test.

Usage

fusionner can be included as a crate (i.e. library) in your code, or run directly as an executable.

For usage as an executable, you can see the usage documentation with cargo run -- --help.

For usage as a library, please look at src/main.rs as an example for now, until the documentation is written.

[dependencies]
fusionner = { git = "https://github.com/lawliet89/fusionner", branch = "master" }

fusionner's Issues

`merger::should_merge` should check if the found merged OID exists

Include references in merge commit message

Investigate moving CLI tool to clap

https://github.com/kbknapp/clap-rs

Esp for issues like #6

Replace `rustc_serialize` with `serde`

Implement clean up in merge commits

• Go through notes
• Find if commits have been merged into target reference
• If so, find the merge reference and delete it

Then Git's GC will eventually clear away the orphaned commits.

Make target refs be less "set in stone"

Move it out of repository configuration and allow it to be set after initialising objects.

Make type alias `merger::Merges` public

And explain what it does

Support multiple target ref

Update notes to support multiple target refs

Remove `fetch_refspecs` and `push_refspecs` from `RepositoryConfiguration`

But we cannot remove them until docopt supports repeating options.

docopt/docopt#275