Teach scc merge to parse comments for labels
#125
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ghost
assigned 
With this commit, if any line starts with "--label ", the following content will be treated as label and used for exclusion/inclusion.
| @@ -49,6 +49,14 @@ def tearDown(self): | |||
| self.sandbox.push_branch(":%s" % self.branch, remote=self.user) | |||
| super(TestMerge, self).tearDown() | |||
|
|
|||
| def create_status(self, state): | |||
There was a problem hiding this comment.
Why the move of this block? To keep it alphabetical?
There was a problem hiding this comment.
Primarily to separate setup/helper methods from proper test methods. But it doesn't matter that much so I can restore the old behaviour.
There was a problem hiding this comment.
No need. Just wondering if there was a new policy.
|
How is it intended to remove labels via |
|
What do you mean by remove labels? Unlink label from the issue? |
|
Well, if one comment allows: |
|
After discussion with @joshmoore, the next steps for this PR are:
All the dynamic action labelling ( |
- run_filter() now returns a reason together with the filter status - unit tests have been fixed accordingly - status-excluded PRs are now included as part of the excluded PRs section
|
NB: with the three last commits, the output of |
Add unit test with a whitelisting function checking organization members
- Check for exclude comments ahead of PR filters and fail-fast if found - Mark comment-excluded PRs separately - Reuse the default filter mode for whitelisting PR comments - Fix documentation of default mode in the command help
|
With the last two comments, whitelisting should be turned on for parsing |
|
Travis is green and changes look good. Only other verification we wanted was SCC-self-merge, correct? |
|
Yes, especially the 2 first tests of http://hudson.openmicroscopy.org.uk/view/Mgmt/job/SCC-self-merge/180/testReport/test.integration.TestMerge/TestMerge/. |
|
👍 |
joshmoore
added a commit
that referenced
this pull request
Nov 15, 2013
Teach `scc merge` to parse comments for labels
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
All merge commands, e.g.
scc mergeshould be able to parse--excludein the comments/description. Such comments will exclude the PR during the merge operation.