Merge branch 'atlassian-api:master' into master

Author: gonchik

atlassian/bitbucket/__init__.py

@@ -838,6 +838,16 @@ def get_project_audit_log(self, project_key, start=0, limit=None):
         return self._get_paged(url, params=params)
 
     def _url_repos(self, project_key, api_root=None, api_version=None):
+        """Return the repository collection URL for a project or personal owner.
+
+        Bitbucket Server/Data Center addresses personal repositories through a
+        user-centric route. Pass the owner's user slug with a leading ``~``
+        (for example, ``~alice``) wherever a ``project_key`` is accepted by a
+        repository method. Project repositories continue to use the existing
+        ``projects/{projectKey}/repos`` route.
+        """
+        if not self.cloud and str(project_key).startswith("~"):
+            return self.resource_url(f"users/{project_key}/repos", api_root, api_version)
         return f"{self._url_project(project_key, api_root, api_version)}/repos"
 
     def repo_list(self, project_key, start=0, limit=25):

atlassian/bitbucket/server/__init__.py

@@ -3,6 +3,7 @@
 from .base import BitbucketServerBase
 from .globalPermissions import Groups, Users
 from .projects import Projects
+from .projects.repos import Repositories
 
 
 class Server(BitbucketServerBase):
@@ -44,3 +45,13 @@ def projects(self):
         Reference: https://docs.atlassian.com/bitbucket-server/rest/7.8.0/bitbucket-rest.html#idp147
         """
         return self.__projects
+
+    def personal_repositories(self, username):
+        """Return repositories owned by a Bitbucket Server/Data Center user.
+
+        ``username`` may be supplied with or without the leading ``~``. The
+        returned collection has the same API as ``project.repos`` and uses
+        Bitbucket's user-centric ``/users/{userSlug}/repos`` endpoint.
+        """
+        user_slug = username if username.startswith("~") else f"~{username}"
+        return Repositories(self._sub_url(f"users/{user_slug}/repos"), **self._new_session_args)

docs/bitbucket.rst

@@ -40,6 +40,32 @@ already a Python dictionary.
 objects from individual requests. Do not enable it for the high-level paginated
 methods above; use their yielded dictionaries instead.
 
+Personal repositories (Server/Data Center)
+------------------------------------------
+
+Repository methods accept a personal-project user slug in place of a project
+key. Prefix the Bitbucket username with ``~`` and the legacy client uses the
+user-centric ``/users/{userSlug}/repos/{repositorySlug}`` endpoint. This works
+for pull-request settings and every other repository method that accepts
+``project_key`` and ``repository_slug``.
+
+.. code-block:: python
+
+    owner = "~alice"
+    settings = bitbucket.get_pull_request_settings(owner, "personal-repository")
+    bitbucket.set_pull_request_settings(owner, "personal-repository", settings)
+
+For the object-oriented Server/Data Center client, use
+``personal_repositories()``. It accepts either ``"alice"`` or ``"~alice"``.
+
+.. code-block:: python
+
+    from atlassian.bitbucket.server import Server
+
+    bitbucket = Server("https://bitbucket.example.com", username="admin", password="token")
+    repository = bitbucket.personal_repositories("alice").get("personal-repository")
+    print(repository.name)
+
 Hook scripts (Data Center 8+)
 -----------------------------
 

tests/test_bitbucket_server.py

@@ -133,3 +133,25 @@ def test_configure_repo_hook_script(self, mock_put):
         mock_put.assert_called_once_with(
             "rest/api/latest/projects/PROJ/repos/repository/hook-scripts/12", data={"triggerIds": []}
         )
+
+
+class TestPersonalRepositories(TestCase):
+    def setUp(self):
+        self.bitbucket = Bitbucket("https://bitbucket.example.com", username="admin", password="password")
+
+    def test_personal_repository_urls_use_the_user_centric_route(self):
+        self.assertEqual(
+            self.bitbucket._url_repo("~alice", "example"),
+            "rest/api/1.0/users/~alice/repos/example",
+        )
+        self.assertEqual(self.bitbucket._url_repos("~alice"), "rest/api/1.0/users/~alice/repos")
+
+    @patch.object(Bitbucket, "post")
+    def test_pull_request_settings_support_personal_repositories(self, mock_post):
+        settings = {"requiredApprovals": 2}
+
+        self.bitbucket.set_pull_request_settings("~alice", "example", settings)
+
+        mock_post.assert_called_once_with(
+            "rest/api/1.0/users/~alice/repos/example/settings/pull-requests", data=settings
+        )

tests/test_bitbucket_server_oo.py

@@ -18,6 +18,12 @@
 
 @pytest.mark.skipif(sys.version_info < (3, 4), reason="requires python3.4")
 class TestBasic:
+    def test_personal_repositories_accepts_a_username_or_user_slug(self):
+        expected_url = f"{BITBUCKET.url}/users/~alice/repos"
+
+        assert BITBUCKET.personal_repositories("alice").url == expected_url
+        assert BITBUCKET.personal_repositories("~alice").url == expected_url
+
     def test_global_permissions(self):
         result = list(BITBUCKET.groups.each())
         assert [x.name for x in result] == ["group_a", "group_b", "group_c", "group_d"], "Each global group"