Merge pull request #101 from camelid/merge-conflicts-review-note

Add note about merge conflicts and reviews

Author: pietroalbini

.gitignore

@@ -3,6 +3,7 @@
 /cfg.toml
 /cfg.json
 /homu.egg-info/
+/.eggs/
 /main.db
 /cache
 *.pyc

homu/html/index.html

@@ -56,7 +56,7 @@ <h3>Commands</h3>
             <li><code>delegate=NAME</code>: Allow NAME to issue all homu commands for this PR.</li>
             <li><code>delegate+</code>: Delegate to the PR owner.</li>
             <li><code>delegate-</code>: Remove the delegatee.</li>
-            <li><code>treeclosed=NUMBER</code>: Any PR below priority <code>NUMBER</code> will not test. Please consider if <i>you</i> really want to do this.</li>
+            <li><code>treeclosed=NUMBER</code>: Any PR below priority <code>NUMBER</code> will not test. Please consider if you <i>really</i> want to do this.</li>
             <li><code>treeclosed-</code>: Undo a previous <code>treeclosed=NUMBER</code>.</li>
         </ul>
 

homu/main.py

@@ -1488,9 +1488,20 @@ def fetch_mergeability(mergeable_que):
                 _blame = ''
                 if issue_or_commit:
                     _blame = ' (presumably {})'.format(issue_or_commit)
-                state.add_comment(':umbrella: The latest upstream changes{} made this pull request unmergeable. Please resolve the merge conflicts.'.format(  # noqa
-                    _blame
-                ))
+                state.add_comment(
+                    ':umbrella: The latest upstream changes{} made this '
+                    'pull request unmergeable. Please resolve the merge '
+                    'conflicts.\n\n'
+                    '*Note that reviewers usually do not review pull requests '
+                    'until merge conflicts are resolved!* Once you resolve '
+                    'the conflicts, you should change the labels applied by '
+                    'bors to indicate that your PR is ready for review. '
+                    'Post this as a comment to change the labels:\n'
+                    '```\n'
+                    '@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author\n'  # noqa
+                    '```'
+                    .format(_blame)
+                )
                 state.change_labels(LabelEvent.CONFLICT)
 
             state.set_mergeable(mergeable, que=False)