Skip to content
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.

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

Compare improvements [v1.0.3.19] #18

Open
wants to merge 19 commits into
base: master
Choose a base branch
from

Conversation

dprZoft
Copy link

@dprZoft dprZoft commented May 2, 2021

[using and based on AsyncPackage changes]

  • Improved comparison:
    • use Pending Changes hash values for initial comparison (no temp files created)
    • if comparing shelvesets targeting different branches, e.g. $/BranchA/path/to/file1 with $/BranchB/path/to/file1 the extension now tries to match them by relative path instead of item id to allow different branch comparison
  • increased version to 1.0.3.19

dprZoft and others added 19 commits April 10, 2021 21:42
- Added comparison of files between branches by search best matching file by relative path
- Improve file comparison by using shelveset upload hash value and stream comparison (less temp files)
- Rename debug define FakeShelvesetResult to StubbingWithoutServer, activate to generate fake data without server connection
- increased versions to 1.0.2.19
Initial convert from Package to AsyncPackage.
Move OutputError method to ShelvesetComparer instance.
- Fix hash comparison
- add missing reference
- Add Extension class
- Add tracing methog
Disable autoload, load on first action
Added select to TeamExplorer drop down.
Rename menu ids.
Added CommandPlacements.
Reorder in Teams menu: Selcet before Results.
Added command name for key mapping.
- Add hint for new branch compare to readme.
- added github url to vsix.
- Add links to LICENSE and README.md to csproj
- Reorder Teams menu buttons: Select before results.
- Replace duplicate OutputError with ShelvesetComparer.Instance method.
- TODO: LICENSE is GPL v2 but license.rtf is MS-PL -> which one is the valid one now? Correct invalid one and link correct one in vsix.
- remove duplicate ServiceProvider extension methods and move them to own file.
- add tracing for Debug cases and moved StubbingWithoutServer define to project settings (otherwise it is not globally set)
- disable tracing in Release mode.
- fixed classes in Stubbing mode.
Increase version and adapted auto load comment.
fix build after merge
Add assembly configuration.
Increase version and adapted auto load comment.
Sync assembly version and vsix version.
fix header for TeamExplorer extensions (used code from other repos)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant