Add matching against hypothetical (new) ghstack pull-request trailer (#153528)

Chillee · pytorchmergebot · commit cd119ddd7c89 · 2025-05-14T14:07:01.000Z
I would like to change ghstack to use a new trailer Pull Request resolved: #153528 Approved by: https://github.com/malfet
diff --git a/.github/scripts/trymerge.py b/.github/scripts/trymerge.py
@@ -434,7 +434,7 @@ def __init__(self, name: str, url: str, run_id: int, status: Optional[str]):
 RE_GHSTACK_HEAD_REF = re.compile(r"^(gh/[^/]+/[0-9]+/)head$")
 RE_GHSTACK_DESC = re.compile(r"Stack.*:\r?\n(\* [^\r\n]+\r?\n)+", re.MULTILINE)
 RE_PULL_REQUEST_RESOLVED = re.compile(
-    r"(Pull Request resolved|Pull-Request-resolved): "
+    r"(Pull Request resolved|Pull-Request-resolved|Pull-Request): "
     r"https://github.com/(?P<owner>[^/]+)/(?P<repo>[^/]+)/pull/(?P<number>[0-9]+)",
     re.MULTILINE,
 )

Original file line number	Diff line number	Diff line change
`@@ -434,7 +434,7 @@ def __init__(self, name: str, url: str, run_id: int, status: Optional[str]):`
`434`	`434`	`RE_GHSTACK_HEAD_REF = re.compile(r"^(gh/[^/]+/[0-9]+/)head$")`
`435`	`435`	`RE_GHSTACK_DESC = re.compile(r"Stack.:\r?\n(\ [^\r\n]+\r?\n)+", re.MULTILINE)`
`436`	`436`	`RE_PULL_REQUEST_RESOLVED = re.compile(`
`437`		`- r"(Pull Request resolved\|Pull-Request-resolved): "`
	`437`	`+ r"(Pull Request resolved\|Pull-Request-resolved\|Pull-Request): "`
`438`	`438`	`r"https://github.com/(?P<owner>[^/]+)/(?P<repo>[^/]+)/pull/(?P<number>[0-9]+)",`
`439`	`439`	`re.MULTILINE,`
`440`	`440`	`)`