Skip to content

Commit

Permalink
Improved Readme.md and fix vsixmanifest
Browse files Browse the repository at this point in the history
consistent DiffFinder naming.
added Example images and links to marketplace for previous versions.
Fix vsixmanifest for x64 VS2022.
  • Loading branch information
dprZoft committed Feb 4, 2023
1 parent 4c40a6e commit 8db6dac
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 7 deletions.
3 changes: 0 additions & 3 deletions DiffFinder/source.extension.vsixmanifest
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ Improved in https://github.com/dprZoft/shelvesetcomparer</Description>
<InstallationTarget Version="[17.0,18.0)" Id="Microsoft.VisualStudio.IntegratedShell">
<ProductArchitecture>amd64</ProductArchitecture>
</InstallationTarget>
<InstallationTarget Version="[17.0,18.0)" Id="Microsoft.VisualStudio.IntegratedShell">
<ProductArchitecture>x86</ProductArchitecture>
</InstallationTarget>
</Installation>
<Dependencies>
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.7,)" />
Expand Down
41 changes: 37 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,41 @@
# Diff Finder
# DiffFinder

Diff Finder (from **[rajeevboobna / shelvesetcomparer](https://github.com/rajeevboobna/shelvesetcomparer)**) extends the existing **[hamidshahid / shelvesetcomparer](https://github.com/hamidshahid/shelvesetcomparer)** Visual Studio extension.
DiffFinder (from **[rajeevboobna / shelvesetcomparer](https://github.com/rajeevboobna/shelvesetcomparer)**) extends the existing **[hamidshahid / shelvesetcomparer](https://github.com/hamidshahid/shelvesetcomparer)** Visual Studio extension.
ShelvesetComparer is a Visual Studio extension that allow users to compare contents of two shelvesets (from on or different users).

**Diff Finder** extends it to also
**DiffFinder** extends it to also

* allow comparison of a shelveset with current workspace local pending changes
* compare shelvesets targeting different branches, e.g. $/BranchA/path/to/file1 with $/BranchB/path/to/file1
* compare shelvesets targeting different branches, e.g. `$/BranchA/path/to/file1` with `$/BranchB/path/to/file1`

In the comparison list following color coding is used:

* **black**: no difference / both files are identical
* **red**: differences / both files differ
* **blue**: file exists only in one of the compared containers (Shelveset or Pending Changes)

## VisualStudio Marketplace

* Previous versions:
1. [DiffFinder (VS2017)](https://marketplace.visualstudio.com/items?itemName=RajeevBoobna.DiffFinder)
1. [ShelvesetComparer (VS2017)](https://marketplace.visualstudio.com/items?itemName=HamidShahid.ShelvesetComparer-19329)

## Examples

1. Open Shelveset selection from TeamExplorer:
![TeamExplorer Diff Finder Button](/DiffFinder/Resources/PreviewImage.png)

2. Select two Shelvesets for comparison or one Shelvesets to compare with current Pending Changes:
![TeamExplorer Diff Finder Button](/DiffFinder/Resources/Example_SelectCompareShelvesets.png)

3. File comparison view comparing two Shelvesets:

* Shelvesets with same file paths (same branch):
![TeamExplorer Diff Finder Button](/DiffFinder/Resources/Example_CompareSameBranch.png)

* Shelvesets with different paths (algorithm tries to find the best match (most common path parts)):
* differerent branches but same relative path:
![TeamExplorer Diff Finder Button](/DiffFinder/Resources/Example_CompareDifferentBranches.png)

* different branches and different paths:
![File comparison: different branches and folders -> tries to find best match](/DiffFinder/Resources/Example_CompareDifferentBranchesAndFolders.png)

0 comments on commit 8db6dac

Please sign in to comment.