From 09cf2c2aee797293bbe6829601f500be3e62bccf Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Oct 19 2016 08:17:22 +0000
Subject: [PATCH 1/2] Adjust the fork/main issue regex


So that we can cross link to project using <project name>#<issue id>
or <project name>#<pr id> where the project name contains a dash '-'.

Relates to https://pagure.io/pagure/issue/1406

---

diff --git a/pagure/pfmarkdown.py b/pagure/pfmarkdown.py
index 4fa826a..fe1b54d 100644
--- a/pagure/pfmarkdown.py
+++ b/pagure/pfmarkdown.py
@@ -31,8 +31,8 @@ import pagure.lib
 
 
 MENTION_RE = r'@(\w+)'
-EXPLICIT_FORK_ISSUE_RE = r'(\w+)/(\w+)#([0-9]+)'
-EXPLICIT_MAIN_ISSUE_RE = r'[^|\w](?<!\/)(\w+)#([0-9]+)'
+EXPLICIT_FORK_ISSUE_RE = r'(\w+)/([\w-]+)#([0-9]+)'
+EXPLICIT_MAIN_ISSUE_RE = r'[^|\w](?<!\/)([\w-]+)#([0-9]+)'
 IMPLICIT_ISSUE_RE = r'[^|\w](?<!\w)#([0-9]+)'
 IMPLICIT_PR_RE = r'[^|\w](?<!\w)PR#([0-9]+)'
 STRIKE_THROUGH_RE = r'~~(\w+)~~'

From 6c7986a01f4923106f74a3919e39ca78d25dfe19 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Oct 19 2016 08:17:22 +0000
Subject: [PATCH 2/2] Simplify the explicit regex and make it support PRs as well


Fixes https://pagure.io/pagure/issue/1406

---

diff --git a/pagure/pfmarkdown.py b/pagure/pfmarkdown.py
index fe1b54d..063d9a6 100644
--- a/pagure/pfmarkdown.py
+++ b/pagure/pfmarkdown.py
@@ -32,7 +32,7 @@ import pagure.lib
 
 MENTION_RE = r'@(\w+)'
 EXPLICIT_FORK_ISSUE_RE = r'(\w+)/([\w-]+)#([0-9]+)'
-EXPLICIT_MAIN_ISSUE_RE = r'[^|\w](?<!\/)([\w-]+)#([0-9]+)'
+EXPLICIT_MAIN_ISSUE_RE = r'([\w-]+)#([0-9]+)'
 IMPLICIT_ISSUE_RE = r'[^|\w](?<!\w)#([0-9]+)'
 IMPLICIT_PR_RE = r'[^|\w](?<!\w)PR#([0-9]+)'
 STRIKE_THROUGH_RE = r'~~(\w+)~~'
@@ -74,10 +74,15 @@ class ExplicitForkIssuePattern(markdown.inlinepatterns.Pattern):
             return text
 
         issue = _issue_exists(user, repo, idx)
-        if not issue:
-            return text
+        if issue:
+            return _obj_anchor_tag(user, repo, issue, text)
+
 
-        return _obj_anchor_tag(user, repo, issue, text)
+        request = _pr_exists(user, repo, idx)
+        if request:
+            return _obj_anchor_tag(user, repo, request, text)
+
+        return text
 
 
 class ExplicitMainIssuePattern(markdown.inlinepatterns.Pattern):
@@ -87,17 +92,22 @@ class ExplicitMainIssuePattern(markdown.inlinepatterns.Pattern):
         """ When the pattern matches, update the text. """
         repo = markdown.util.AtomicString(m.group(2))
         idx = markdown.util.AtomicString(m.group(3))
-        text = ' %s#%s' % (repo, idx)
+        text = '%s#%s' % (repo, idx)
         try:
             idx = int(idx)
         except:
             return text
 
         issue = _issue_exists(None, repo, idx)
-        if not issue:
-            return text
+        if issue:
+            return _obj_anchor_tag(None, repo, issue, text)
+
 
-        return _obj_anchor_tag(None, repo, issue, text)
+        request = _pr_exists(None, repo, idx)
+        if request:
+            return _obj_anchor_tag(None, repo, request, text)
+
+        return text
 
 
 class ImplicitIssuePattern(markdown.inlinepatterns.Pattern):