(kyuubi-shaded) branch master updated: [KYUUBI-SHADED #63] Correct fix_title in dev/merge_kyuubi_pr.py

[chengpan]

This is an automated email from the ASF dual-hosted git repository.

chengpan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kyuubi-shaded.git


The following commit(s) were added to refs/heads/master by this push:
     new 84dbd29  [KYUUBI-SHADED #63] Correct fix_title in 
dev/merge_kyuubi_pr.py
84dbd29 is described below

commit 84dbd29a6f3547e9df2e5d4fd79032c65afe38f4
Author: Cheng Pan <cheng...@apache.org>
AuthorDate: Fri Jul 18 17:16:29 2025 +0800

    [KYUUBI-SHADED #63] Correct fix_title in dev/merge_kyuubi_pr.py
    
    ### _Why are the changes needed?_
    
    To make it also recognize PR title prefix like `[KYUUBI-SHADED #60]`
    
    ### _How was this patch tested?_
    Before
    ```
    fix_title("[KYUUBI-SHADED #60] Step 1/2: Copy TSaslServerTransport from 
Thrift 0.16.0", 62)
    '[KYUUBI-SHADED #62][KYUUBI-SHADED #60] Step 1/2: Copy TSaslServerTransport 
from Thrift 0.16.0'
    ```
    After
    ```
    >>> fix_title("[KYUUBI-SHADED #60] Step 1/2: Copy TSaslServerTransport from 
Thrift 0.16.0", 62)
    '[KYUUBI-SHADED #60] Step 1/2: Copy TSaslServerTransport from Thrift 0.16.0'
    ```
    
    Closes #63 from pan3793/merge-fix.
    
    d7090c4 [Cheng Pan] Correct fix_title in dev/merge_kyuubi_pr.py
    
    Authored-by: Cheng Pan <cheng...@apache.org>
    Signed-off-by: Cheng Pan <cheng...@apache.org>
---
 dev/merge_kyuubi_pr.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/merge_kyuubi_pr.py b/dev/merge_kyuubi_pr.py
index 5f5d1f9..7004cfb 100755
--- a/dev/merge_kyuubi_pr.py
+++ b/dev/merge_kyuubi_pr.py
@@ -90,7 +90,7 @@ def clean_up():
             run_cmd("git branch -D %s" % branch)
 
 def fix_title(text, num):
-    if (re.search(r'^\[KYUUBI\s#[0-9]{3,6}\].*', text)):
+    if (re.search(r'^\[KYUUBI(-SHADED)?\s#[0-9]{2,6}\].*', text)):
         return text
 
     return '[KYUUBI-SHADED #%s] %s' % (num, text)