From 2beefab89a64a56e77aeb0e6850869d0a645da0a Mon Sep 17 00:00:00 2001 From: mhoecke1 Date: Fri, 23 Aug 2024 10:47:27 -0400 Subject: [PATCH] BB server 2 way diff fixes --- .../bitbucket_server_provider.py | 27 ++- tests/unittest/test_bitbucket_provider.py | 201 +++++++++++++++++- 2 files changed, 223 insertions(+), 5 deletions(-) diff --git a/pr_agent/git_providers/bitbucket_server_provider.py b/pr_agent/git_providers/bitbucket_server_provider.py index b8358176..f7e2f92b 100644 --- a/pr_agent/git_providers/bitbucket_server_provider.py +++ b/pr_agent/git_providers/bitbucket_server_provider.py @@ -15,7 +15,8 @@ from ..log import get_logger class BitbucketServerProvider(GitProvider): def __init__( - self, pr_url: Optional[str] = None, incremental: Optional[bool] = False + self, pr_url: Optional[str] = None, incremental: Optional[bool] = False, + bitbucket_client: Optional[Bitbucket] = None, ): self.bitbucket_server_url = None self.workspace_slug = None @@ -30,8 +31,9 @@ class BitbucketServerProvider(GitProvider): self.bitbucket_pull_request_api_url = pr_url self.bitbucket_server_url = self._parse_bitbucket_server(url=pr_url) - self.bitbucket_client = Bitbucket(url=self.bitbucket_server_url, - token=get_settings().get("BITBUCKET_SERVER.BEARER_TOKEN", None)) + self.bitbucket_client = bitbucket_client or Bitbucket(url=self.bitbucket_server_url, + token=get_settings().get("BITBUCKET_SERVER.BEARER_TOKEN", + None)) if pr_url: self.set_pr(pr_url) @@ -134,11 +136,28 @@ class BitbucketServerProvider(GitProvider): diffstat = [change["path"]['toString'] for change in changes] return diffstat + #gets the best common ancestor: https://git-scm.com/docs/git-merge-base + @staticmethod + def get_best_common_ancestor(source_commits_list, destination_commits_list, guaranteed_common_ancestor) -> str: + destination_commit_hashes = {commit['id'] for commit in destination_commits_list} + destination_commit_hashes.add(guaranteed_common_ancestor) + + for commit in source_commits_list: + for parent_commit in commit['parents']: + if commit['id'] in destination_commit_hashes or parent_commit['id'] in destination_commit_hashes: + return parent_commit['id'] + + return guaranteed_common_ancestor + def get_diff_files(self) -> list[FilePatchInfo]: if self.diff_files: return self.diff_files - base_sha = self.pr.toRef['latestCommit'] + source_commits_list = list(self.bitbucket_client.get_pull_requests_commits(self.workspace_slug, self.repo_slug, self.pr_num)) + guaranteed_common_ancestor = source_commits_list[-1]['parents'][0]['id'] + destination_commits = list(self.bitbucket_client.get_commits(self.workspace_slug, self.repo_slug, guaranteed_common_ancestor, self.pr.toRef['latestCommit'])) + + base_sha = self.get_best_common_ancestor(source_commits_list, destination_commits, guaranteed_common_ancestor) head_sha = self.pr.fromRef['latestCommit'] diff_files = [] diff --git a/tests/unittest/test_bitbucket_provider.py b/tests/unittest/test_bitbucket_provider.py index e17a26ce..fb7eb293 100644 --- a/tests/unittest/test_bitbucket_provider.py +++ b/tests/unittest/test_bitbucket_provider.py @@ -1,5 +1,8 @@ from pr_agent.git_providers import BitbucketServerProvider from pr_agent.git_providers.bitbucket_provider import BitbucketProvider +from unittest.mock import MagicMock +from atlassian.bitbucket import Bitbucket +from pr_agent.algo.types import EDIT_TYPE, FilePatchInfo class TestBitbucketProvider: @@ -10,9 +13,205 @@ class TestBitbucketProvider: assert repo_slug == "MY_TEST_REPO" assert pr_number == 321 - def test_bitbucket_server_pr_url(self): + +class TestBitbucketServerProvider: + def test_parse_pr_url(self): url = "https://git.onpreminstance.com/projects/AAA/repos/my-repo/pull-requests/1" workspace_slug, repo_slug, pr_number = BitbucketServerProvider._parse_pr_url(url) assert workspace_slug == "AAA" assert repo_slug == "my-repo" assert pr_number == 1 + + def mock_get_content_of_file(self, project_key, repository_slug, filename, at=None, markup=None): + if at == '9c1cffdd9f276074bfb6fb3b70fbee62d298b058': + return 'file\nwith\nsome\nlines\nto\nemulate\na\nreal\nfile\n' + elif at == '2a1165446bdf991caf114d01f7c88d84ae7399cf': + return 'file\nwith\nmultiple \nlines\nto\nemulate\na\nfake\nfile\n' + elif at == 'f617708826cdd0b40abb5245eda71630192a17e3': + return 'file\nwith\nmultiple \nlines\nto\nemulate\na\nreal\nfile\n' + elif at == 'cb68a3027d6dda065a7692ebf2c90bed1bcdec28': + return 'file\nwith\nsome\nchanges\nto\nemulate\na\nreal\nfile\n' + elif at == '1905dcf16c0aac6ac24f7ab617ad09c73dc1d23b': + return 'file\nwith\nsome\nlines\nto\nemulate\na\nfake\ntest\n' + elif at == 'ae4eca7f222c96d396927d48ab7538e2ee13ca63': + return 'readme\nwithout\nsome\nlines\nto\nsimulate\na\nreal\nfile' + elif at == '548f8ba15abc30875a082156314426806c3f4d97': + return 'file\nwith\nsome\nlines\nto\nemulate\na\nreal\nfile' + return '' + + ''' + tests the 2-way diff functionality where the diff should be between the HEAD of branch b and node c + NOT between the HEAD of main and the HEAD of branch b + + - o branch b + / + o - o - o main + ^ node c + ''' + + def test_get_diff_files_simple_diverge(self): + bitbucket_client = MagicMock(Bitbucket) + bitbucket_client.get_pull_request.return_value = { + 'toRef': {'latestCommit': '9c1cffdd9f276074bfb6fb3b70fbee62d298b058'}, + 'fromRef': {'latestCommit': '2a1165446bdf991caf114d01f7c88d84ae7399cf'} + } + bitbucket_client.get_pull_requests_commits.return_value = [ + {'id': '2a1165446bdf991caf114d01f7c88d84ae7399cf', + 'parents': [{'id': 'f617708826cdd0b40abb5245eda71630192a17e3'}]} + ] + bitbucket_client.get_commits.return_value = [ + {'id': '9c1cffdd9f276074bfb6fb3b70fbee62d298b058'}, + {'id': 'dbca09554567d2e4bee7f07993390153280ee450'} + ] + bitbucket_client.get_pull_requests_changes.return_value = [ + { + 'path': {'toString': 'Readme.md'}, + 'type': 'MODIFY', + } + ] + + bitbucket_client.get_content_of_file.side_effect = self.mock_get_content_of_file + + provider = BitbucketServerProvider( + "https://git.onpreminstance.com/projects/AAA/repos/my-repo/pull-requests/1", + bitbucket_client=bitbucket_client + ) + + expected = [ + FilePatchInfo( + 'file\nwith\nmultiple \nlines\nto\nemulate\na\nreal\nfile\n', + 'file\nwith\nmultiple \nlines\nto\nemulate\na\nfake\nfile\n', + '--- \n+++ \n@@ -5,5 +5,5 @@\n to\n emulate\n a\n-real\n+fake\n file\n', + 'Readme.md', + edit_type=EDIT_TYPE.MODIFIED, + ) + ] + + actual = provider.get_diff_files() + + assert actual == expected + + ''' + tests the 2-way diff functionality where the diff should be between the HEAD of branch b and node c + NOT between the HEAD of main and the HEAD of branch b + + - o - o - o branch b + / / + o - o -- o - o main + ^ node c + ''' + + def test_get_diff_files_diverge_with_merge_commit(self): + bitbucket_client = MagicMock(Bitbucket) + bitbucket_client.get_pull_request.return_value = { + 'toRef': {'latestCommit': 'cb68a3027d6dda065a7692ebf2c90bed1bcdec28'}, + 'fromRef': {'latestCommit': '1905dcf16c0aac6ac24f7ab617ad09c73dc1d23b'} + } + bitbucket_client.get_pull_requests_commits.return_value = [ + {'id': '1905dcf16c0aac6ac24f7ab617ad09c73dc1d23b', + 'parents': [{'id': '692772f456c3db77a90b11ce39ea516f8c2bad93'}]}, + {'id': '692772f456c3db77a90b11ce39ea516f8c2bad93', 'parents': [ + {'id': '2a1165446bdf991caf114d01f7c88d84ae7399cf'}, + {'id': '9c1cffdd9f276074bfb6fb3b70fbee62d298b058'}, + ]}, + {'id': '2a1165446bdf991caf114d01f7c88d84ae7399cf', + 'parents': [{'id': 'f617708826cdd0b40abb5245eda71630192a17e3'}]} + ] + bitbucket_client.get_commits.return_value = [ + {'id': 'cb68a3027d6dda065a7692ebf2c90bed1bcdec28'}, + {'id': '9c1cffdd9f276074bfb6fb3b70fbee62d298b058'}, + {'id': 'dbca09554567d2e4bee7f07993390153280ee450'} + ] + bitbucket_client.get_pull_requests_changes.return_value = [ + { + 'path': {'toString': 'Readme.md'}, + 'type': 'MODIFY', + } + ] + + bitbucket_client.get_content_of_file.side_effect = self.mock_get_content_of_file + + provider = BitbucketServerProvider( + "https://git.onpreminstance.com/projects/AAA/repos/my-repo/pull-requests/1", + bitbucket_client=bitbucket_client + ) + + expected = [ + FilePatchInfo( + 'file\nwith\nsome\nlines\nto\nemulate\na\nreal\nfile\n', + 'file\nwith\nsome\nlines\nto\nemulate\na\nfake\ntest\n', + '--- \n+++ \n@@ -5,5 +5,5 @@\n to\n emulate\n a\n-real\n-file\n+fake\n+test\n', + 'Readme.md', + edit_type=EDIT_TYPE.MODIFIED, + ) + ] + + actual = provider.get_diff_files() + + assert actual == expected + + ''' + tests the 2-way diff functionality where the diff should be between the HEAD of branch c and node d + NOT between the HEAD of main and the HEAD of branch c + + ---- o - o branch c + / / + ---- o branch b + / / + o - o - o main + ^ node d + ''' + + def test_get_diff_files_multi_merge_diverge(self): + bitbucket_client = MagicMock(Bitbucket) + bitbucket_client.get_pull_request.return_value = { + 'toRef': {'latestCommit': '9569922b22fe4fd0968be6a50ed99f71efcd0504'}, + 'fromRef': {'latestCommit': 'ae4eca7f222c96d396927d48ab7538e2ee13ca63'} + } + bitbucket_client.get_pull_requests_commits.return_value = [ + {'id': 'ae4eca7f222c96d396927d48ab7538e2ee13ca63', + 'parents': [{'id': 'bbf300fb3af5129af8c44659f8cc7a526a6a6f31'}]}, + {'id': 'bbf300fb3af5129af8c44659f8cc7a526a6a6f31', 'parents': [ + {'id': '10b7b8e41cb370b48ceda8da4e7e6ad033182213'}, + {'id': 'd1bb183c706a3ebe4c2b1158c25878201a27ad8c'}, + ]}, + {'id': 'd1bb183c706a3ebe4c2b1158c25878201a27ad8c', 'parents': [ + {'id': '5bd76251866cb415fc5ff232f63a581e89223bda'}, + {'id': '548f8ba15abc30875a082156314426806c3f4d97'} + ]}, + {'id': '5bd76251866cb415fc5ff232f63a581e89223bda', + 'parents': [{'id': '0e898cb355a5170d8c8771b25d43fcaa1d2d9489'}]}, + {'id': '10b7b8e41cb370b48ceda8da4e7e6ad033182213', + 'parents': [{'id': '0e898cb355a5170d8c8771b25d43fcaa1d2d9489'}]} + ] + bitbucket_client.get_commits.return_value = [ + {'id': '9569922b22fe4fd0968be6a50ed99f71efcd0504'}, + {'id': '548f8ba15abc30875a082156314426806c3f4d97'} + ] + bitbucket_client.get_pull_requests_changes.return_value = [ + { + 'path': {'toString': 'Readme.md'}, + 'type': 'MODIFY', + } + ] + + bitbucket_client.get_content_of_file.side_effect = self.mock_get_content_of_file + + provider = BitbucketServerProvider( + "https://git.onpreminstance.com/projects/AAA/repos/my-repo/pull-requests/1", + bitbucket_client=bitbucket_client + ) + + expected = [ + FilePatchInfo( + 'file\nwith\nsome\nlines\nto\nemulate\na\nreal\nfile', + 'readme\nwithout\nsome\nlines\nto\nsimulate\na\nreal\nfile', + '--- \n+++ \n@@ -1,9 +1,9 @@\n-file\n-with\n+readme\n+without\n some\n lines\n to\n-emulate\n+simulate\n a\n real\n file', + 'Readme.md', + edit_type=EDIT_TYPE.MODIFIED, + ) + ] + + actual = provider.get_diff_files() + + assert actual == expected