Scaled-Tech-Consulting/Gitea-Tools
2
0
Fork 0
Code Issues 77 Pull Requests 10 Actions Packages Projects Releases Wiki Activity

fix: use exact issue-number boundary in own-branch adoption (#442)

Browse Source 
Replace substring issue-marker matching with a numeric word-boundary
regex so issue-42 adoption is not false-blocked by unrelated issue-420
branches. Add regression tests for the #42 vs #420 collision.

Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]>
This commit is contained in:
sysadmin
2026-07-07 17:31:34 -04:00
co-authored by Claude Opus 4.8
parent c2330e3929
commit ab4af23afd
4 changed files with 39 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test_issue_lock_adoption.py
+20 -6
View File
@@ -75,17 +75,31 @@ class TestAssessOwnBranchAdoption(unittest.TestCase):
)
self.assertEqual(result["outcome"], NO_MATCH)
def test_substring_issue_number_not_falsely_matched_as_exact(self):
# A different issue's branch must not be adopted as ours.
def test_higher_issue_number_branch_does_not_block_lower_issue_adoption(self):
# issue-420 must not be treated as competing work for issue #42.
own_branch = "feat/issue-42-widget"
result = assess_own_branch_adoption(
issue_number=42,
requested_branch=own_branch,
existing_branches=[
{"name": own_branch, "commit_sha": "abc1234"},
{"name": "feat/issue-420-server-code-parity"},
],
)
self.assertEqual(result["outcome"], ADOPT)
self.assertTrue(result["adopt"])
self.assertFalse(result["block"])
self.assertEqual(result["matched_branch"], own_branch)
def test_unrelated_higher_number_branch_is_ignored_without_own_branch(self):
result = assess_own_branch_adoption(
issue_number=42,
requested_branch="feat/issue-42-thing",
existing_branches=[{"name": "feat/issue-420-server-code-parity"}],
)
# 'issue-42' is a substring of 'issue-420', so marker matches but the
# name differs -> competing block, never adoption of the wrong branch.
self.assertEqual(result["outcome"], BLOCK_COMPETING)
self.assertNotEqual(result["matched_branch"], "feat/issue-420-server-code-parity")
self.assertEqual(result["outcome"], NO_MATCH)
self.assertFalse(result["block"])
self.assertFalse(result["adopt"])
class TestBuildAdoptionProof(unittest.TestCase):