From 16bd4503234b8d0d16086e2a48ed856d4f02a319 Mon Sep 17 00:00:00 2001 From: Dmytro Bondar Date: Fri, 28 Jun 2024 16:39:57 +0200 Subject: [PATCH] Parse AZDO PR's numbers with enabled auto-complete --- src/repositories/azdo_git_repository.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/repositories/azdo_git_repository.py b/src/repositories/azdo_git_repository.py index 3a4f9b1..0953e0d 100644 --- a/src/repositories/azdo_git_repository.py +++ b/src/repositories/azdo_git_repository.py @@ -2,6 +2,7 @@ # Licensed under the MIT License. import os +import re import json import requests import utils @@ -123,12 +124,16 @@ def get_commit_message(self, commit_id): def get_pr_num(self, commit_id) -> str: comment = self.get_commit_message(commit_id) - MERGED_PR = "Merged PR " - pr_num = None - if MERGED_PR in comment: - merged_pr_index = comment.index(MERGED_PR) - pr_num = comment[merged_pr_index + len(MERGED_PR): comment.index(":", merged_pr_index)] - return pr_num + # Regex pattern to match "Merged PR " or "Merge pull request " + pattern = r'Merged PR (\d+)|Merge pull request (\d+)' + + match = re.search(pattern, comment) + if match: + # Group 1 is for "Merged PR", Group 2 is for "Merge pull request" + pr_num = match.group(1) or match.group(2) + return pr_num + + return "" def is_commit_finished(self, commit_id): return False