Improve tracking branch filter parsing

sbesson commented 7 years ago

While the filter branch functionality is working and checked by an integration test, it fails to integrate a branch called bf_5.3.0-SNAPSHOT. This is a deficiency in the regexp logic when identifying candidate branches.

To fix this issue, this PR extends the _parse_filters() logic to actively parse tracking branches using regular expressions. Unit tests are also added covering the range of tracking branch names.

Support is also added for branch tracking using the full Github URL similarly to what is done for Pull Request inclusion.

To test this PR:

check the unit tests are all passing on Travis including the newly added ones
run the integration tests and check everything is green
for the keen ones, fork an upstream organization repository e.g. https://github.com/openmicroscopy/snoopys-sandbox, create a local branch with 1 commit ahead of the base branch, name it with a string composed of [a-Z0-9_-.], push this branch to your fork but do not create a Pull Request. Then locally reset to the HEAD to the base branch and try to merge your remote branch using one of the 2 forms:
```
git reset --hard origin/<base_branch>
python /path/to/snoopycrimecop/scc/main.py merge <base_branch> -Dnone -I <username>/<repo>:<branch_with-and.>
python /path/to/snoopycrimecop/scc/main.py merge <base_branch> -Dnone -I https://github.com/<username>/<repo>/tree/<branch_with-and.>
```
In both cases the command should merge the remote branch locally.

mtbc commented 7 years ago

https://ci.openmicroscopy.org/job/SCC-merge/869/ is green with this PR in.

sbesson commented 7 years ago

Discussed at SA meeting. Merging (and will do a patch release).

ome / scc

Improve tracking branch filter parsing #211