This repository has been archived by the owner on Nov 6, 2020. It is now read-only.
Fix matching workspace folders (primarily for 'restrictWorkspace') #264
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jpricket
reviewed
Jun 26, 2017
| //With tf.exe, folder and teamProject should match (TEE won't) | ||
| if (folder !== teamProject.toLowerCase()) { | ||
| for (let i: number = 0; i < mappings.length; i++) { | ||
| for (let i: number = 0; i < mappings.length; i++) { |
There was a problem hiding this comment.
What about cloaked paths? Are those excluded somehow?
There was a problem hiding this comment.
😄 Yeah, those are actually excluded by never being returned from the earlier call to getMapping. TF.exe returns a cloaked mapping that ends with ':' and the CLC returns a cloaked mapping that doesn't end with ':'. Both of these fail the if in getMapping. We should talk about how to properly handle cloaked folders (since they aren't today).
jpricket
reviewed
Jun 26, 2017
src/tfvc/commands/findworkspace.ts
Outdated
| openedPath = openedPath.toLowerCase(); | ||
| workspacePath = workspacePath.toLowerCase(); | ||
|
|
||
| return openedPath.lastIndexOf(workspacePath, 0) === 0; |
There was a problem hiding this comment.
startsWith might read a bit better here.
jpricket
approved these changes
Jun 26, 2017
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The existing code works only because TF.exe will return only the workspace mapping information for the folder that is passed in to the command. The TEE CLC returns all workspace mapping information no matter what folder you pass into it. Therefore, when using the CLC, even if the user opens a single folder with
tfvc.restrictWorkspaceenabled, the first team project (and almost always the wrong one) is chosen. This PR is to ensure we actually get the proper match (the most-specific match) so we can return the proper team project (for both TF.exe (not just because of a bug) and the CLC (because we match the proper folder)).