From bc2da06983938b483c57c43430393655ff756448 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Jan 08 2019 14:21:32 +0000 Subject: Add support for the Fix keyword as we document it Signed-off-by: Pierre-Yves Chibon --- diff --git a/pagure/lib/link.py b/pagure/lib/link.py index 5cc7ecd..a2ecec2 100644 --- a/pagure/lib/link.py +++ b/pagure/lib/link.py @@ -21,7 +21,7 @@ from pagure.config import config as pagure_config FIXES = [ re.compile(r"(?:.*\s+)?{0}?[sd]?:?\s*?#(\d+)".format(kw), re.I) - for kw in ["fixe", "merge", "close", "resolve"] + for kw in ["fix", "fixe", "merge", "close", "resolve"] ] FIXES += [ re.compile( @@ -31,7 +31,7 @@ FIXES += [ ), re.I, ) - for kw in ["fixe", "merge", "close", "resolve"] + for kw in ["fix", "fixe", "merge", "close", "resolve"] ] diff --git a/tests/test_pagure_lib_link.py b/tests/test_pagure_lib_link.py index ab088c5..361e8dd 100644 --- a/tests/test_pagure_lib_link.py +++ b/tests/test_pagure_lib_link.py @@ -294,9 +294,12 @@ class PagureLibLinktests(tests.Modeltests): self.assertEqual(match.group(1), issue) issue_match('This fixed #5', '5') + issue_match('This fix #5', '5') issue_match('Merged #17', '17') issue_match('Fixed: #23', '23') + issue_match('Fix: #23', '23') issue_match('This commit fixes: #42', '42') + issue_match('This commit fix #42', '42') issue_match('Merge #137', '137') issue_match('Merges #137', '137') issue_match('Merges: #137', '137')