Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F14362679
D7489.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
3 KB
Subscribers
None
D7489.diff
View Options
diff --git a/contrib/buildbot/server.py b/contrib/buildbot/server.py
--- a/contrib/buildbot/server.py
+++ b/contrib/buildbot/server.py
@@ -154,7 +154,7 @@
return repl
line = re.sub(
- r'PR(\d{3}\d+)',
+ r'PR[ #]*(\d{3}\d+)',
replacePRWithLink(
'https://github.com/bitcoin/bitcoin/pull'),
line)
@@ -162,7 +162,7 @@
# Be less aggressive about serving libsecp256k1 links. Check
# for some reference to the name first.
if re.search('secp', line, re.IGNORECASE):
- line = re.sub(r'PR(\d{2}\d?)([^\d]|$)', replacePRWithLink(
+ line = re.sub(r'PR[ #]*(\d{2}\d?)([^\d]|$)', replacePRWithLink(
'https://github.com/bitcoin-core/secp256k1/pull'), line)
newSummary += line
diff --git a/contrib/buildbot/test/test_endpoint_backportcheck.py b/contrib/buildbot/test/test_endpoint_backportcheck.py
--- a/contrib/buildbot/test/test_endpoint_backportcheck.py
+++ b/contrib/buildbot/test/test_endpoint_backportcheck.py
@@ -70,6 +70,7 @@
'summary': "This is a test summary\n"
# Bitcoin Core links
"Backport of Core PR2345 and PR34567\n"
+ "Backports with optional separators PR 2345 and PR#34567 and PR #4567\n"
"PR6789 outside of a code block `PR4567 inside a code block`\n"
"```PR4567 in a single-line code block```\n"
"```\nPR4567 in a multi-line code block\n```\n"
@@ -77,6 +78,7 @@
"Another backport PR567890\n"
# secp256k1 links
"Backport of Secp256k1 PR23 and PR345\n"
+ "Backport of Secp256k1 PR 23 and PR#345 and PR #45\n"
"SECP256K1 PR678 outside of a code block `secp256k1 PR456 inside a code block`\n"
"```secp256k1 PR456 in a single-line code block```\n"
"```\nsecp256k1 PR456 in a multi-line code block\n```\n"
@@ -96,6 +98,9 @@
# Bitcoin Core links
"Backport of Core [[https://github.com/bitcoin/bitcoin/pull/2345 | PR2345]] and "
"[[https://github.com/bitcoin/bitcoin/pull/34567 | PR34567]]\n"
+ "Backports with optional separators [[https://github.com/bitcoin/bitcoin/pull/2345 | PR2345]] and "
+ "[[https://github.com/bitcoin/bitcoin/pull/34567 | PR34567]] and "
+ "[[https://github.com/bitcoin/bitcoin/pull/4567 | PR4567]]\n"
"[[https://github.com/bitcoin/bitcoin/pull/6789 | PR6789]] outside of a code block `PR4567 inside a code block`\n"
"```PR4567 in a single-line code block```\n"
"```\nPR4567 in a multi-line code block\n```\n"
@@ -104,6 +109,9 @@
# secp256k1 links
"Backport of Secp256k1 [[https://github.com/bitcoin-core/secp256k1/pull/23 | PR23]] and "
"[[https://github.com/bitcoin-core/secp256k1/pull/345 | PR345]]\n"
+ "Backport of Secp256k1 [[https://github.com/bitcoin-core/secp256k1/pull/23 | PR23]] and "
+ "[[https://github.com/bitcoin-core/secp256k1/pull/345 | PR345]] and "
+ "[[https://github.com/bitcoin-core/secp256k1/pull/45 | PR45]]\n"
"SECP256K1 [[https://github.com/bitcoin-core/secp256k1/pull/678 | PR678]] outside of a code block `secp256k1 PR456 inside a code block`\n"
"```secp256k1 PR456 in a single-line code block```\n"
"```\nsecp256k1 PR456 in a multi-line code block\n```\n"
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Mon, May 12, 01:40 (4 h, 4 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5776759
Default Alt Text
D7489.diff (3 KB)
Attached To
D7489: [buildbot] Strip out commonly used separators when detecting backports in diff summaries
Event Timeline
Log In to Comment