Don't use startswith when comparing mentions paths.

Author: ehuss

highfive/newpr.py

@@ -340,7 +340,11 @@ def get_to_mention(self, diff, author):
                         cur_dir = None
                     if len(full_dir) > 0:
                         for entry in mentions:
-                            if full_dir.startswith(entry):
+                            # Check if this entry is a prefix
+                            eparts = entry.split("/")
+                            if (len(eparts) <= len(parts) and
+                                all(a==b for a,b in zip(parts, eparts))
+                            ):
                                 to_mention.add(entry)
                             elif entry.endswith('.rs') and full_dir.endswith(entry):
                                 to_mention.add(entry)

highfive/tests/fakes.py

@@ -48,6 +48,24 @@ def get_repo_configs():
             "groups": {"all": []},
             "dirs": {},
         },
+        'mentions': {
+            "groups": {"all": []},
+            "dirs": {"compiler": ["@pnkfelix"]},
+            "mentions": {
+                "src/tools/cargo": {
+                    "message": "this should not match startswith",
+                    "reviewers": ["@ehuss"],
+                },
+                "error_codes.rs": {
+                    "message": "bare .rs file should match endswith",
+                    "reviewers": ["@GuillaumeGomez"],
+                },
+                "compiler/rustc": {
+                    "message": "directory should match all files within",
+                    "reviewers": ["@pnkfelix"],
+                }
+            }
+        }
     }
 
 

highfive/tests/fakes/mentions.diff

@@ -0,0 +1,34 @@
+diff --git a/compiler/rustc/src/main.rs b/compiler/rustc/src/main.rs
+index 6bc5aa6382c..4fc3e397508 100644
+--- a/compiler/rustc/src/main.rs
++++ b/compiler/rustc/src/main.rs
+@@ -1,3 +1,4 @@
++// Hello!
+ fn main() {
+     // Pull in jemalloc when enabled.
+     //
+diff --git a/compiler/rustc_error_codes/src/error_codes.rs b/compiler/rustc_error_codes/src/error_codes.rs
+index 636c37142ad..2172d8eaec9 100644
+--- a/compiler/rustc_error_codes/src/error_codes.rs
++++ b/compiler/rustc_error_codes/src/error_codes.rs
+@@ -463,6 +463,7 @@
+ E0777: include_str!("./error_codes/E0777.md"),
+ E0778: include_str!("./error_codes/E0778.md"),
+ E0779: include_str!("./error_codes/E0779.md"),
++E0779: include_str!("./error_codes/E0780.md"),
+ ;
+ //  E0006, // merged with E0005
+ //  E0008, // cannot bind by-move into a pattern guard
+diff --git a/src/tools/cargotest/main.rs b/src/tools/cargotest/main.rs
+index 8aabe077cf1..0a6bac48ebb 100644
+--- a/src/tools/cargotest/main.rs
++++ b/src/tools/cargotest/main.rs
+@@ -36,7 +36,7 @@ struct Test {
+     Test {
+         name: "xsv",
+         repo: "https://github.com/BurntSushi/xsv",
+-        sha: "66956b6bfd62d6ac767a6b6499c982eae20a2c9f",
++        sha: "3de6c04269a7d315f7e9864b9013451cd9580a08",
+         lock: None,
+         packages: &[],
+     },

highfive/tests/test_newpr.py

@@ -1032,6 +1032,7 @@ def make_fakes(cls):
             'diff': {
                 'normal': load_fake('normal.diff'),
                 'travis-yml': load_fake('travis-yml.diff'),
+                'mentions': load_fake('mentions.diff'),
             },
             'config': fakes.get_repo_configs(),
             'global_': fakes.get_global_configs(),
@@ -1073,7 +1074,9 @@ def choose_reviewers(self, diff, author, global_=None):
             )
             mentions = self.get_to_mention(diff, global_)
             chosen_reviewers.add(reviewer)
-            mention_list.add(tuple(mentions))
+            for mention in mentions:
+                for reviewer in mention['reviewers']:
+                    mention_list.add(reviewer)
         return chosen_reviewers, mention_list
 
     def test_individuals_no_dirs_1(self):
@@ -1087,7 +1090,7 @@ def test_individuals_no_dirs_1(self):
             self.fakes['diff']['normal'], "nikomatsakis"
         )
         assert set(["pnkfelix", "nrc"]) == chosen_reviewers
-        assert set([()]) == mentions
+        assert set() == mentions
 
     def test_individuals_no_dirs_2(self):
         """Test choosing a reviewer from a list of individual reviewers, no
@@ -1100,7 +1103,7 @@ def test_individuals_no_dirs_2(self):
             self.fakes['diff']['normal'], "nrc"
         )
         assert set(["pnkfelix"]) == chosen_reviewers
-        assert set([()]) == mentions
+        assert set() == mentions
 
     def test_circular_groups(self):
         """Test choosing a reviewer from groups that have circular references.
@@ -1125,7 +1128,7 @@ def test_global_core(self):
             self.fakes['global_']['base']
         )
         assert set(['alexcrichton']) == chosen_reviewers
-        assert set([()]) == mentions
+        assert set() == mentions
 
     @mock.patch('highfive.newpr.HighfiveHandler._load_json_file')
     def test_global_group_overlap(self, mock_load_json):
@@ -1152,7 +1155,7 @@ def test_no_potential_reviewers(self):
             self.fakes['global_']['base']
         )
         assert set([None]) == chosen_reviewers
-        assert set([()]) == mentions
+        assert set() == mentions
 
     def test_with_dirs(self):
         """Test choosing a reviewer when directory reviewers are defined that
@@ -1165,7 +1168,7 @@ def test_with_dirs(self):
             self.fakes['diff']['normal'], "nikomatsakis"
         )
         assert set(["pnkfelix", "nrc"]) == chosen_reviewers
-        assert set([()]) == mentions
+        assert set() == mentions
 
     def test_with_dirs_no_intersection(self):
         """Test choosing a reviewer when directory reviewers are defined that
@@ -1178,7 +1181,7 @@ def test_with_dirs_no_intersection(self):
             self.fakes['diff']['normal'], "nikomatsakis"
         )
         assert set(["pnkfelix", "nrc"]) == chosen_reviewers
-        assert set([()]) == mentions
+        assert set() == mentions
 
     def test_with_files(self):
         """Test choosing a reviewer when a file os changed."""
@@ -1189,7 +1192,19 @@ def test_with_files(self):
             self.fakes['diff']['travis-yml'], "nikomatsakis"
         )
         assert set(["pnkfelix", "nrc", "aturon"]) == chosen_reviewers
-        assert set([()]) == mentions
+        assert set() == mentions
+
+    def test_mentions(self):
+        """Test tagging people listed in the mentions list."""
+        self.handler = HighfiveHandlerMock(
+            Payload({}), repo_config=self.fakes['config']['mentions']
+        ).handler
+        (chosen_reviewers, mentions) = self.choose_reviewers(
+            self.fakes['diff']['mentions'], "nikomatsakis",
+        )
+        assert set(["pnkfelix"]) == chosen_reviewers
+        # @ehuss should not be listed here
+        assert set(["@pnkfelix", "@GuillaumeGomez"]) == mentions
 
 
 class TestRun(TestNewPR):