Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

Next challenges

Recent achievements

  • Global
  • Personal

Recognition

  • Give kudos
  • Received
  • Given

Leaderboard

  • Global

Trophy case

Kudos (beta program)

Kudos logo

You've been invited into the Kudos (beta program) private group. Chat with others in the program, or give feedback to Atlassian.

View group

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

BitBucket 4.14 diff between any two commits

I want to show a list of files on a repo that were changed between any two commits. When user clicks on individual file he will sill the diff between the revision i have provided. I do not need an UI element for this , just URL is fine. I looked at 

https://bitbucket.org/site/master/issues/4779/ability-to-diff-between-any-two-commits

But that link does not work in bitbucket 4.14, the enterprise version tht we have in our organization. Is there some way to do so in version 4.14 ? 

4 answers

1 accepted

5 votes
Answer accepted

Hey Victor, 

It appears that you're looking for the Bitbucket Server feature request BSERV-2896. The link you posted is for Bitbucket Cloud which is a different code base. I posted a workaround there I think you might find helpful. I'll outline it below: 

You can tag commits that you wish to diff and then create a pull request and selecting tags instead of branches.

diftag.png

If you are willing to go outside of the UI, we have REST API that you can utilize to diff arbitrary commits. Here is our documentation on that REST API end point:

https://developer.atlassian.com/static/rest/stash/3.11.3/stash-rest.html#idp257216


The command line for diffs is: "git diff A B", where it shows the changes from A to B. Our REST URL looks like

/rest/api/latest/projects/KEY/repos/slug/changes?since=A&until=B 

(where A and B have the same relevance). That will list all the files that changed.

You can call /rest/api/latest/projects/KEY/repos/slug/diff/<one file>?since=A&until=B. Write the file path you want the diff for after "/diff/" and before "?since".

*Example:*


https://mybitbucket.com/rest/api/latest/projects/STASH/repos/stash/changes?since=689fcf1017dc944ab976433a9ead8f2912d83622&until=a222a1f58c17f9164eb498eeaadde94675a49467}}
https://mybitbucket.com/rest/api/latest/projects/STASH/repos/stash/diff/dao-impl/src/main/java/com/atlassian/stash/internal/pull/HibernateRescopeRequestDao.java?since=689fcf1017dc944ab976433a9ead8f2912d83622&until=a222a1f58c17f9164eb498eeaadde94675a49467

You will have to include a path after {{/diff}}. You can't just ask for the entire diff
So something like this will return a 400 Bad Request:

https://mybitbucket.com/rest/api/latest/projects/STASH/repos/stash/diff?since=689fcf1017dc944ab976433a9ead8f2912d83622&until=a222a1f58c17f9164eb498eeaadde94675a49467

I realize that neither of these are great options, but hopefully these workarounds can hold you over.

@The Commodore, this isn't mentioned in the REST api docs you linked to, but UI assume the response is in unified diff format? If so, that doesn't add anything over what I could do with git at command line. The whole point of this is to leverage Bitbucket's rich UI.

Error

We were unable to load this page.

That's all I get in diff tab :( 

Can you send me the link?

Hi. I can't, it's private repo.

I get it. You can also try replacing the commit id's with the version's

Thanks for your help! I was using short (7 digit) id instead of full id and thats why it didn't work.

Like samvloeberghs likes this

Oops! I should have been more clear. It's good that you figured it out.

It seems to only work when diffing 2 branches. It does not work for me if it's the same branch.

Like davideghz likes this

this is so easy to get on github UI ...

Like Anatolii_Bivol likes this

 

Go to compare and past commit id into search field:

image.png

This does not work for me in Bitbucket v6.2.0

Like # people like this

We have bitbucket v5.8 and the following works for me:

https://gitep/projects/<PROJECT>/repos/<REPO>/pull-requests/<PULL REQUEST ID>/commits/<UNTIL COMMIT HASH>?since=<SINCE COMMIT HASH>

For example:
https://gitep/projects/MyProject/repos/MyRepo/pull-requests/8865/commits/c2a5e355336666c897727f961de460f090f427b7?since=248addca4fab36483db9644f5037b261bf317634

The point is here that the OP doesn't want to create a PR for this. We all know diff api works to view PR diffs. We also know that you can tag both commits you want to diff and the "compare" function in the UI works. This is hacky, and cumbersome for those of us that'd like to leverage and reference BB's rich UI from a build system, e.g. I'm using a jenkins job and would like a nice submodule-aware changelog and diff view, which doesn't really exist in any existing jenkins plugins. If I could just like to a bitbucket server page, problem would be solved, elegantly.

This does help when trying to track what changed between commits on a PR, but it would be nice to be able to hit a URL that allowed you to simply use a commit hash to compare against. The API can do it and the UI can already do it between ranges on a PR. It really shouldn't be much more than supporting a new route and composing a new UI (or just extending the existing compare UI) based on shared code.

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Bitbucket

Powering DevOps with Bitbucket Server & Data Center

Hi everyone, The Cloud team recently announced 12 new DevOps features that help developers ship better code, faster   ! While we’re all excited about the new improvements to Bitbucket ...

2,135 views 0 7
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you