juliogonzalez commented 7 years ago

WARNING!!!! WARNING!!!! WARNING!!!!

This is still an experimental feature.

It is already tested locally, but I would like to make more extensive testing before merging it.

Anyway it can be already reviewed, so feel free to have a look and comment anything strange you see. Feedback will be more than welcomed.

Second round, this time with retrocompatibility.

If --no_merge_upstream is present then gitarro will:

Create an empty repository
Fetch first commit from the PR
First first commit from the reference branch and try to merge it
Repeat with the second, third commits and so on, until merge is possible (or until it tries 100 times, and in that case either it considers there's no merge possible because the history was rewritten, or because the PR has too many commits).

The good thing about this change is that if the repository is big, gitarro will try fetch as less information possible.

As a way to avoid problems, gitarro now detects if a PR is not mergeable.

When that happens gitarro will mark the test as failed and remove the magic comment if needed at the PR, and will write a warning to the log.

If --no_merge_upstream is NOT present, gitarro will work as it worked before, but the PR mergeability detection will work.