No folders fix #138
Merged
No folders fix #138
Conversation
This file contains hidden or 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
…w format of storing mappings.
isc-tleavitt
requested changes
Mar 21, 2022
cls/SourceControl/Git/Utils.cls
Outdated
| @@ -1556,7 +1550,7 @@ ClassMethod NameToInternalName(Name, IgnorePercent = 1, IgnoreNonexistent = 1) A | |||
| } | |||
| } | |||
| set fileExt=$zconvert($piece(nam,".",$length(nam,".")),"L") | |||
| if (InternalName="")&&('$data(ext)=0)&&('$listfind($listbuild("xml","rtn"),fileExt)) { | |||
| if (InternalName="")&&($data(ext)=0)&&('$listfind($listbuild("xml","rtn"),fileExt)) { | |||
| //no match found yet, and this is in a subdir for a specific document type (ext), however it is not in a typical export format | |||
| //so treat it as a non-mapped file | |||
| kill ext | |||
There was a problem hiding this comment.
If $data(ext)=0 then killing it is a no-op.
|
|
||
| Method %OnClose() As %Status | ||
| { | ||
| merge @##class(SourceControl.Git.Utils).MappingsNode() = ..Mappings |
There was a problem hiding this comment.
This should kill the mappings node as well (first). As it stands it'll leave the nspace/hl7/ in place.
| // % class that exists but we ignore % classes | ||
| do $$$AssertEquals(##class(Utils).NameToInternalName("cls\%Studio\Extension\Base.cls"),"") | ||
| // % class that exists and we don't ignore % classes | ||
| do $$$AssertEquals(##class(Utils).NameToInternalName("cls\%Studio\Extension\Base.cls", 0),"%Studio.Extension.Base.CLS") |
There was a problem hiding this comment.
In all of these cases, we shouldn't have % in the folder name. (I believe this is illegal in Windows which is why we generally don't do it.) But it should still work.
There was a problem hiding this comment.
Right. I forgot about that. I'll change the tests.
|
@isc-svelury I think this is still in progress / pending changes - can you confirm? |
|
It is in progress. The |
isc-tleavitt
approved these changes
Mar 22, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
NoFolderstoggle is off, and store mappings accordingly.This PR closes #130 and #145