Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

Azure DevOps - compare two commits right in the web UI?

This is surely something simple I'm overlooking. In the Azure DevOps web interface (not integrated as part of an IDE), I see how to compare any commit to its parent, but I can't figure out how to compare it to an arbitrary commit.

ie, I'm looking for the equivalent of GitHub's compare/hash1..hash2 functionality.

The appeal is that the web UI is a view/tool common to everyone, and presumably I could get a link to the specific diff I'm interested in and share it with colleagues.

The web UI suggests it might be possible because when viewing the changes for a particular commit it has text Diff to Parent 1 - <my commit hash> but I haven't figured out how to change Parent 1.

like image 264
orion elenzil Avatar asked Dec 30 '19 16:12

orion elenzil


People also ask

How do you compare different commits?

You can compare files between two Git commits by specifying the name of the ref that refers to the commits you want to compare. A ref may be a commit ID or HEAD, which refers to the current branch. Let's compare two commits in our Git repository. The above command will perform a diff operation across our two commits.

How does Azure DevOps compare to different branches?

From your web browser, open the team project for your Azure DevOps organization. In the Repos > Branches view, select the ellipsis for any branch and choose Compare branches to open the Branch compare view. In the Branch compare view, choose the two branches that you want to compare.

How do I see the difference between two branches in Visual Studio?

To compare your currently checked out branch with other branches using Visual Studio, you can utilize the branch picker hosted in the status bar and the Git changes tool window to choose any local or remote branch to compare with. Right click the branch you are targeting and select Compare with Current Branch.

How do you check from which branch a branch is created in Azure DevOps?

You can right-click any branch in the Hierarchy window and perform any one of the following steps: Select Properties to display the Properties dialog box, which you can use to view additional information about the branch, including its path, who owns it, and who has permissions to work with it.


4 Answers

If you go to the list of branches for a repository, you can click on ... (More Actions) on one of the branches and choose Compare branches

This will take you to a URL in the form: https://dev.azure.com/{organisation}/{project}/_git/{repository}/branches?baseVersion=GB{baseBranch}&targetVersion=GB{targetBranch}&_a=files

You can then change the baseVersion and targetVersion parameters in the query string. These can take the following forms, and can be mixed and matched:

  • GB{branchName}
  • GC{commitHash}
  • GT{tagName}

Just in case that link gets broken, clicking "View Merge Changes" on a pull request takes you to the same page but with a slightly different URL https://dev.azure.com/{organisation}/{project}/_git/{repository}/branchCompare?baseVersion=GC{baseCommit}&targetVersion=GC{targetCommit}&_a=files

I'm not sure if there's a nicer way of comparing commits from the UI, as it only shows branches and tags, but if you do it this way you don't have to temporarily tag commits or create temporary branches just to get a diff that shows all of the changed files.

like image 56
George Helyar Avatar answered Oct 22 '22 09:10

George Helyar


If you want to compare two arbitrary commits for one file, navigate to the file in the repo, select the compare tab, and apply the appropriate commit range.

enter image description here

If you want to compare two arbitrary commits for all files , you can create tags at commits , then compare them. This will give you a list of commits between them and allow you to show the diffs.

enter image description here

enter image description here

enter image description here

enter image description here

For details, you can refer to this case.

like image 27
Hugh Lin Avatar answered Oct 22 '22 10:10

Hugh Lin


The Devops UI does now allow a comparison of the commits between branches as well as files. The URL is very similar to the one detailed in George Heylar's answer, you just change the end of the URL from 'files' to 'commits':

https://dev.azure.com/{organisation}/{project}/_git/{repository}/branches?baseVersion=GB{baseBranch}&targetVersion=GB{targetBranch}&_a=commits

The short way to do that via the UI if 'Compare Branches' is not disabled

  1. Open the Branch list for your project:

Azure DevOps Branch list

  1. Click the vertical ellipsis button against the first branch you want to compare:

Branch row options list

  1. Select 'Compare branches' to open the screen below. If the 'Compare branches' option is disabled see the longer approach below.

Top of the Branch compare page

  1. Select the branch to compare to in the second combo and then you will see a list of the commit differences between the two branches:

Branch compare page showing commit differences between master branch and a release branch

  1. If you want to see the file differences just choose the 'Files' option in the not terribly obvious tab control:

Compare Commits or Files tab

The long way to achieve that via the UI if 'Compare Branches' is disabled

  1. Open the Branch list for your project:

Azure DevOps Branch list

  1. Click the vertical ellipsis button against the first branch you want to compare:

Branch row options list

  1. Select 'Set as default branch'

  2. Repeat the same process for the second branch you want to compare to:

Branch row options list

  1. This time select Select 'Set as compare branch'

  2. Finally open the ellipsis menu again for the branch you set as the default branch (i.e. the one you picked in step 3 above)

Branch ellipsis menu when default and compare branches have been selected

  1. Select the 'Compare branches' menu item and that will open the 'Branch Compare' page:

Branch compare page

like image 7
tomRedox Avatar answered Oct 22 '22 10:10

tomRedox


The "Diff to Parent 1" feature is described in "Commit details / What are the changes included in the commit?"

https://learn.microsoft.com/en-us/azure/devops/repos/git/_img/commit-details/10difftoparent.png?view=azure-devops

Diff to parent - Click on Diff on parent1 in the Source Explorer pane to view the difference between the current commit and its parent commit.

One can see what Parent1 references in the diff view itself:

https://learn.microsoft.com/en-us/azure/devops/repos/git/_img/commit-details/11sidebyside.png?view=azure-devops

But I don't see any web URL which could help reference that diff. Hence my initial Azure DevOps Git API that I proposed before.

like image 1
VonC Avatar answered Oct 22 '22 11:10

VonC