Merge pull request #350 from LeSeulArtichaut/assign-team

Allow r? assignment of team without ping

Author: Mark-Simulacrum

highfive/newpr.py

@@ -33,7 +33,8 @@
 review_with_reviewer = 'r? @%s\n\n(rust-highfive has picked a reviewer for you, use r? to override)'
 review_without_reviewer = '@%s: no appropriate reviewer found, use r? to override'
 
-reviewer_re = re.compile("\\b[rR]\?[:\- ]*@(?:([a-zA-Z0-9\-]+)/)?([a-zA-Z0-9\-]+)")
+reviewer_re = re.compile("\\b[rR]\?[:\- ]*@([a-zA-Z0-9\-]+)")
+reviewer_group_re = re.compile("\\b[rR]\?[:\- ]*@?(?:([a-zA-Z0-9\-]+)/)([a-zA-Z0-9\-]+)")
 submodule_re = re.compile(".*\+Subproject\scommit\s.*", re.DOTALL | re.MULTILINE)
 target_re = re.compile("^[+-]{3} [ab]/compiler/rustc_target/src/spec/", re.MULTILINE)
 
@@ -248,22 +249,17 @@ def find_reviewer(self, msg, exclude):
         None.
         """
         if msg is not None:
+            match = reviewer_group_re.search(msg)
+            if match:
+                groups = self.get_groups()
+                potential = groups.get(match.group(2)) or groups.get("%s/%s" % (match.group(1), match.group(2))) or []
+                potential.extend(groups["all"])
+                return self.pick_reviewer(groups, potential, exclude)
+
             match = reviewer_re.search(msg)
             if match:
-                if match.group(1):
-                    # assign someone from the specified team
-                    groups = self.get_groups()
-                    potential = groups.get(match.group(2))
-                    if potential is None:
-                        potential = groups.get("%s/%s" % (match.group(1), match.group(2)))
-                    if potential is None:
-                        potential = groups["all"]
-                    else:
-                        potential.extend(groups["all"])
-
-                    return self.pick_reviewer(groups, potential, exclude)
-                else:
-                    return match.group(2)
+                return match.group(1)
+
 
     def choose_reviewer(self, repo, owner, diff, exclude):
         """Choose a reviewer for the PR."""

highfive/tests/test_newpr.py

@@ -1268,12 +1268,15 @@ def test_with_team_ping(self):
 
         found_cases = (
             ("r? @foo/a", "pnkfelix"),
+            ("r? foo/a", "pnkfelix"),
             ("r? @b/c", "nrc"),
+            ("r? b/c", "nrc"),
         )
 
         not_found_cases = (
             "r? @/a",
             "r? @a/b",
+            "r? pnkfelix",
         )
 
         for (msg, reviewer) in found_cases: