So… this is a major refactor of the Git subsystem, together with the addition of the merge feature.
On the formal side, there is not a single existing test that had to be adapted (including the switch-branch ones).
It also leverages local idioms such that utils.check_output, or the function to issue a git commit (keeps proper insulation with other tests, works on dumb buildslaves…)
I believe the end result is indeed clearer, especially the relation with remote branches.
The only caveat is that test_git has some pep8 errors (the kind I'll fix in a second).
So, a big thank you, let's test this in the trunk !
So… this is a major refactor of the Git subsystem, together with the addition of the merge feature.
On the formal side, there is not a single existing test that had to be adapted (including the switch-branch ones).
It also leverages local idioms such that utils.check_output, or the function to issue a git commit (keeps proper insulation with other tests, works on dumb buildslaves…)
I believe the end result is indeed clearer, especially the relation with remote branches.
The only caveat is that test_git has some pep8 errors (the kind I'll fix in a second).
So, a big thank you, let's test this in the trunk !