Skip to content

Consistent filenames in add #194

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Apr 22, 2022
Merged

Consistent filenames in add #194

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1668b4a
When we can't find a matching mapping we don't export the file.
isc-svelury Apr 15, 2022
d9671c2
Normalize the file extension before adding to source control
isc-svelury Apr 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 20 additions & 14 deletions cls/SourceControl/Git/Utils.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,9 +418,9 @@ ClassMethod NormalizeFolder(folder As %String) As %String
quit folder
}

ClassMethod ExternalName(InternalName As %String) As %String
ClassMethod ExternalName(InternalName As %String, ByRef MappingExists As %Boolean) As %String
{
quit ..Name(InternalName)
quit ..Name(InternalName,.MappingExists)
}

ClassMethod AddToServerSideSourceControl(InternalName As %String) As %Status
Expand All @@ -446,20 +446,14 @@ ClassMethod AddToSourceControl(InternalName As %String) As %Status
#dim item as %String = ..NormalizeExtension($piece(InternalName, ",", i))
#dim type as %String = ..Type(item)

if ((type '= "pkg") && (type '= "prj")){
set @..#Storage@("items", item) = ""
}

#dim sc as %Status = ..ExportItem(item,,1,.filenames)
if 'sc {
set ec = $$$ADDSC(ec, sc)
}
for i=1:1:filenames{
set FileInternalName = ##class(SourceControl.Git.Utils).NameToInternalName(filenames(i), 0)
set FileInternalName = ##class(SourceControl.Git.Utils).NormalizeExtension(##class(SourceControl.Git.Utils).NameToInternalName(filenames(i), 0))
set FileType = ##class(SourceControl.Git.Utils).Type(FileInternalName)

continue:..NormalizeExtension(FileInternalName)=item
continue:$DATA(@..#Storage@("items", FileInternalName))
set @..#Storage@("items", FileInternalName) = ""
do ..RunGitCommand("add",.errStream,.outStream,filenames(i))
write !, "Added ", FileInternalName, " to source control."
Expand Down Expand Up @@ -842,6 +836,7 @@ ClassMethod IsInSourceControl(InternalName As %String, ByRef sourceControlItem A
{
#dim isInSourceControl as %Boolean = 1
set sourceControlItem = ""
set InternalName = ##class(SourceControl.Git.Utils).NormalizeExtension(InternalName)
if (InternalName = "") {
quit 0
}
Expand Down Expand Up @@ -890,9 +885,9 @@ ClassMethod IsInSourceControl(InternalName As %String, ByRef sourceControlItem A
quit isInSourceControl
}

ClassMethod FullExternalName(InternalName As %String) As %String [ CodeMode = expression ]
ClassMethod FullExternalName(InternalName As %String, ByRef MappingExists As %Boolean) As %String [ CodeMode = expression ]
{
##class(%File).NormalizeFilename(..TempFolder()_..ExternalName(InternalName))
##class(%File).NormalizeFilename(..TempFolder()_..ExternalName(InternalName, .MappingExists))
}

ClassMethod NormalizeInternalName(name As %String) As %String
Expand Down Expand Up @@ -1220,7 +1215,11 @@ ClassMethod ExportItem(InternalName As %String, expand As %Boolean = 1, force As
$$$QuitOnError(..ExportRoutinesAux(InternalName , "/", 0, force, .filenames))
}else {
if ..IsTempFileOutdated(InternalName) || force {
#dim filename as %String = ..FullExternalName(InternalName)
#dim filename as %String = ..FullExternalName(InternalName, .MappingExists)
if (MappingExists = 0){
write "Did not find a matching mapping for """_InternalName_""". Skipping export."
quit $$$OK
}
set filenames($I(filenames)) = filename
write !, "exporting new version of ", InternalName, " to ", filename
$$$QuitOnError($system.OBJ.ExportUDL(InternalName, filename,"-d/diff"))
Expand Down Expand Up @@ -1387,8 +1386,10 @@ ClassMethod GitStatus(ByRef files, IncludeAllFiles = 0)
Name(InternalName): returns Unix-style slash path relative to repo root cooresponding to internal name
(e.g., cls/SourceControl/Git/Utils.cls)
*/
ClassMethod Name(InternalName As %String) As %String
ClassMethod Name(InternalName As %String, ByRef MappingExists As %Boolean) As %String
{

set MappingExists = -1
set InternalName=##class(%Studio.SourceControl.Interface).normalizeName(InternalName)
set context = ##class(SourceControl.Git.PackageManagerContext).%Get()
if (context.IsInGitEnabledPackage) && (InternalName = context.InternalName) && $isobject(context.ResourceReference) {
Expand Down Expand Up @@ -1475,9 +1476,14 @@ ClassMethod Name(InternalName As %String) As %String
set default=0
} elseif $data(found)=0{
set found = $zconvert(ext,"L")_"/"
set MappingExists = 0
}
}

if (MappingExists '= 0){
set MappingExists = 1
}

if InternalName["/" {
// If no specific mapping was specified (p=""), then return the whole csp filename; otherwise return the name without the mapped piece
set InternalName=$extract(InternalName,$length(p)+2,*)
Expand Down Expand Up @@ -1513,7 +1519,7 @@ ClassMethod NameToInternalName(Name, IgnorePercent = 1, IgnoreNonexistent = 1) A
if (##class(%File).Exists(Name)) {
new %SourceControl //don't trigger source hooks with this test load to get the Name
set sc=$system.OBJ.Load(Name,"-d",,.outName,1)
if ($data(outName)=1) || ($data(outName) = 11 && ($order(outName(""),-1) = $order(outName("")))) {
if (($data(outName)=1) || ($data(outName) = 11 && ($order(outName(""),-1) = $order(outName(""))))) && ($zconvert(..Type(outName),"U") '= "CSP") {
//only set if a single Name was returned ... ignore multi-item files
set InternalName=outName
}
Expand Down