Adds Bitbucket PR Support: remotes, autolinks, home, etc. #4070

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merged

sergeibbb merged 6 commits into main from 4045-home-pr-issue

Feb 26, 2025

Member

sergeibbb commented Feb 18, 2025 •

edited

Loading

Description

solves #4045

Adds enriched Bitbucket PRs to various places:

such as remote branches on remotes,
autolinks on commits, on Home and in Graph.

Checklist

I have followed the guidelines in the Contributing document
My changes follow the coding style of this project
My changes build without any errors or warnings
My changes have been formatted and linted
My changes include any required corresponding changes to the documentation (including CHANGELOG.md and README.md)
My changes have been rebased and squashed to the minimal number (typically 1) of relevant commits
My changes have a descriptive commit message with a short title, including a Fixes $XXX - or Closes #XXX - prefix to auto-close the issue that your PR addresses

sergeibbb requested review from axosoft-ramint and d13

February 18, 2025 12:07

sergeibbb linked an issue

that may be closed by this pull request

Bitbucket Cloud: Add Home PR/Issue Support #4045

Closed

9 tasks

sergeibbb force-pushed the 4044-bitbucket-basic branch from f1680a0 to 8d1586f Compare

February 20, 2025 12:45

Base automatically changed from 4044-bitbucket-basic to main

February 20, 2025 12:52

sergeibbb added a commit that referenced this pull request


          Adds Bitbucket integration and retrieves PR for a branch

5fd3b97

(#4045, #4070)

sergeibbb added a commit that referenced this pull request


          Retrieve a Bitbucket PR by its id, that lets us show it in autolinks

205c71a

(#4045, #4070)

sergeibbb force-pushed the 4045-home-pr-issue branch from c8a2244 to 2050f43 Compare

February 20, 2025 13:00

sergeibbb added a commit that referenced this pull request


          Adds support of Bitbucket issues in autolinks

a617d18

(#4045, #4070)

sergeibbb added a commit that referenced this pull request


          Mentions Bitbucket cloud integration in the changelog

df70a03

(#4045, #4070)

sergeibbb added a commit that referenced this pull request


          Fixes prettier

2050f43

(#4070)

sergeibbb added a commit that referenced this pull request


          Adds Bitbucket integration and retrieves PR for a branch

be011bd

(#4045, #4070)

sergeibbb added a commit that referenced this pull request


          Retrieve a Bitbucket PR by its id, that lets us show it in autolinks

b61c6a3

(#4045, #4070)

sergeibbb added a commit that referenced this pull request


          Adds support of Bitbucket issues in autolinks

d667451

(#4045, #4070)

sergeibbb added a commit that referenced this pull request


          Mentions Bitbucket cloud integration in the changelog

db763f4

(#4045, #4070)

sergeibbb added a commit that referenced this pull request


          Fixes prettier

daf4b83

(#4070)

sergeibbb force-pushed the 4045-home-pr-issue branch from 2050f43 to daf4b83 Compare

February 21, 2025 09:39

axosoft-ramint reviewed

View reviewed changes

CHANGELOG.md Outdated

                 - Adds a _Switch Model_ button to the AI confirmation prompts
               - Adds Windsurf support &mdash; closes [#3969](https://github.com/gitkraken/vscode-gitlens/issues/3969)
               - Adds "pro" indicators for applicable integrations &mdash; closes [#3972](https://github.com/gitkraken/vscode-gitlens/issues/3972)
+              - Adds integration with Bitbucket Cloud by showing enrichhed links to PRs and issues [#4045](https://github.com/gitkraken/vscode-gitlens/issues/4045)

Contributor

axosoft-ramint Feb 21, 2025

Let's do a header line for the parent issue once all the BitBucket support is in, with sub-lines like this one covering each aspect of the integration. For now, this can stay out of this PR.

src/plus/integrations/providers/bitbucket/bitbucket-api.ts Outdated

		@@ -0,0 +1,289 @@
		import type { HttpsProxyAgent } from 'https-proxy-agent';

Contributor

axosoft-ramint Feb 21, 2025

For consistency can this file follow the naming pattern of similar ones for other providers?

Member Author

sergeibbb Feb 24, 2025

done

src/plus/integrations/providers/bitbucket/models.ts Show resolved Hide resolved

src/plus/integrations/providers/bitbucket/models.ts Outdated

+              		return undefined;
+              	}
+              	let hasReviews = false;
+              	let hasRejections = false;

Contributor

axosoft-ramint Feb 21, 2025

A change request isn't quite the same as a rejection IMO. Maybe hasChangeRequests?

Member Author

sergeibbb Feb 24, 2025

done

src/plus/integrations/providers/bitbucket/models.ts Show resolved Hide resolved

src/plus/integrations/providers/bitbucket/models.ts Outdated

Comment on lines 263 to 264

		undefined,
		undefined,

Contributor

axosoft-ramint Feb 21, 2025 •

edited

Loading

I suggest surfacing to the team that we do not know mergeableState or viewerCanUpdate on PRs from BitBucket, because this means that several Launchpad categories, including Ready to Merge, Has Conflicts, Failing CI, won't work with BitBucket PRs.

Member Author

sergeibbb Feb 24, 2025

@axosoft-ramint

ok. There is also problem with assignees that does not exist in Bitbucket.

src/plus/integrations/providers/bitbucket/models.ts Outdated

Comment on lines 290 to 292

+              		pr.participants
+              			?.filter(prt => prt.role === 'REVIEWER')
+              			.map(prt => fromBitbucketParticipantToReviewer(prt, pr.closed_by, pr.state)),

Contributor

axosoft-ramint Feb 21, 2025

This would be all reviewers assigned to the PR who's review state is "review requested" i.e. they have been requested to review but have not yet submitted a review for that request.

Is that what this filter is capturing? Note importantly that anyone who's review status is "approved, changes requested, commented, dismissed" etc. shouldn't be in this list.

Member Author

sergeibbb Feb 24, 2025

@axosoft-ramint So, we should show Pending only, right?

src/plus/integrations/providers/bitbucket/bitbucket-api.ts Outdated

+              		owner: string,
+              		repo: string,
+              		id: string,
+              		options: {

Contributor

axosoft-ramint Feb 21, 2025 •

edited

Loading

An options param shouldn't be required here. Any required bits should be outside of the options object.

Suggested change

      
            		options: {
          
            		options?: {

Member Author

sergeibbb Feb 24, 2025

fixed. I've moved the baseUrl to required params.

src/autolinks/autolinksProvider.ts Show resolved Hide resolved

sergeibbb added a commit that referenced this pull request


          Adds Bitbucket integration and retrieves PR for a branch

515612c

(#4045, #4070)

sergeibbb added a commit that referenced this pull request


          Retrieve a Bitbucket PR by its id, that lets us show it in autolinks

f539698

(#4045, #4070)

sergeibbb added a commit that referenced this pull request


          Adds support of Bitbucket issues in autolinks

656f698

(#4045, #4070)

sergeibbb force-pushed the 4045-home-pr-issue branch from daf4b83 to 1ff3232 Compare

February 24, 2025 12:32

sergeibbb added a commit that referenced this pull request


          Mentions Bitbucket cloud integration in the changelog

1ff3232

(#4045, #4070)

sergeibbb added a commit that referenced this pull request


          Adds Bitbucket integration and retrieves PR for a branch

49d0013

(#4045, #4070)

rename bitbucket-api.ts to bitbucket.ts

sergeibbb added a commit that referenced this pull request


          Retrieve a Bitbucket PR by its id, that lets us show it in autolinks

a656f57

(#4045, #4070)

sergeibbb added a commit that referenced this pull request


          Adds support of Bitbucket issues in autolinks

a0619c3

(#4045, #4070)

sergeibbb added a commit that referenced this pull request


          Mentions Bitbucket cloud integration in the changelog

07826fa

(#4045, #4070)

sergeibbb force-pushed the 4045-home-pr-issue branch from 1ff3232 to 07826fa Compare

February 24, 2025 13:37

sergeibbb added a commit that referenced this pull request


          Adds Bitbucket integration and retrieves PR for a branch

e8fc288

(#4045, #4070)

rename bitbucket-api.ts to bitbucket.ts

sergeibbb added a commit that referenced this pull request


          Shows only requested reviewers who is pending

a2c363a

(#4045, #4070)

sergeibbb added a commit that referenced this pull request


          Mentions Bitbucket cloud integration in the changelog

3dbb7ac

(#4045, #4070)

sergeibbb added a commit that referenced this pull request


          Requires baseUrl be provided to methods of BitbucketApi class

fd5452b

(#4045, #4070)

sergeibbb added a commit that referenced this pull request


          Mentions Bitbucket cloud integration in the changelog

(#4045, #4070)

sergeibbb force-pushed the 4045-home-pr-issue branch from a1727c0 to 6844237 Compare

February 25, 2025 14:28

sergeibbb added a commit that referenced this pull request


          Mentions Bitbucket cloud integration in the changelog

a328685

(#4045, #4070)

sergeibbb force-pushed the 4045-home-pr-issue branch from 6844237 to a328685 Compare

February 25, 2025 14:28

axosoft-ramint approved these changes

View reviewed changes

Contributor

axosoft-ramint left a comment

A bit weird that we require qualifiers like "pull request #" for autolinks instead of having it work like GitHub, but we can address that separately.

sergeibbb force-pushed the debt/4098-remove-searched-wrappers branch 2 times, most recently from 867f9d2 to 36cc563 Compare

February 26, 2025 08:24

Base automatically changed from debt/4098-remove-searched-wrappers to main

February 26, 2025 08:42

sergeibbb added 6 commits

February 26, 2025 09:54


          Adds Bitbucket integration and retrieves PR for a branch

bd0dc9a

(#4045, #4070)


          Shows only requested reviewers who is pending

037e646

(#4045, #4070)


          Retrieve a Bitbucket PR by its id, that lets us show it in autolinks

fd2e6f3

(#4045, #4070)


          Adds support of Bitbucket issues in autolinks

ad54cdf

(#4045, #4070)


          Requires baseUrl be provided to methods of BitbucketApi class

f883fa7

(#4045, #4070)


          Mentions Bitbucket cloud integration in the changelog

aedf600

(#4045, #4070)

sergeibbb force-pushed the 4045-home-pr-issue branch from a328685 to aedf600 Compare

February 26, 2025 08:55

sergeibbb merged commit 1d41f04 into main

3 checks passed

sergeibbb added a commit that referenced this pull request


          Adds Bitbucket integration and retrieves PR for a branch

2d6a53f

(#4045, #4070)

sergeibbb added a commit that referenced this pull request


          Shows only requested reviewers who is pending

06a4359

(#4045, #4070)

sergeibbb added a commit that referenced this pull request


          Retrieve a Bitbucket PR by its id, that lets us show it in autolinks

9f66ea6

(#4045, #4070)

sergeibbb added a commit that referenced this pull request


          Adds support of Bitbucket issues in autolinks

34a70fb

(#4045, #4070)

sergeibbb added a commit that referenced this pull request


          Requires baseUrl be provided to methods of BitbucketApi class

63d4b11

(#4045, #4070)

sergeibbb deleted the 4045-home-pr-issue branch

February 26, 2025 10:52

saeedzaha pushed a commit to saeedzaha/vscode-gitlens that referenced this pull request


          Adds Bitbucket integration and retrieves PR for a branch

e816f15

(gitkraken#4045, gitkraken#4070)

saeedzaha pushed a commit to saeedzaha/vscode-gitlens that referenced this pull request


          Shows only requested reviewers who is pending

071d81c

(gitkraken#4045, gitkraken#4070)

saeedzaha pushed a commit to saeedzaha/vscode-gitlens that referenced this pull request


          Retrieve a Bitbucket PR by its id, that lets us show it in autolinks

e8e2b18

(gitkraken#4045, gitkraken#4070)

saeedzaha pushed a commit to saeedzaha/vscode-gitlens that referenced this pull request


          Adds support of Bitbucket issues in autolinks

32dab21

(gitkraken#4045, gitkraken#4070)

saeedzaha pushed a commit to saeedzaha/vscode-gitlens that referenced this pull request


          Requires baseUrl be provided to methods of BitbucketApi class

9c40f58

(gitkraken#4045, gitkraken#4070)

saeedzaha pushed a commit to saeedzaha/vscode-gitlens that referenced this pull request


          Mentions Bitbucket cloud integration in the changelog

539560a

(gitkraken#4045, gitkraken#4070)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet