Skip to content

fix: avoid infinite loop #485

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 1 commit into from
Sep 23, 2024
Merged

fix: avoid infinite loop #485

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions cls/SourceControl/Git/Utils.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1144,7 +1144,7 @@ ClassMethod NormalizeInternalName(ByRef name As %String, Output fromWebApp As %B
if (name [ "/") && (type = "csp") {
set cspFilename = $System.CSP.GetFileName(name)
if (cspFilename '= "") && (cspFilename [ ..TempFolder()) {
set name = ..NameToInternalName(cspFilename)
set name = ..NameToInternalName(cspFilename,,,,0)
set fromWebApp = 1
} else {
kill cspFilename
Expand Down Expand Up @@ -2190,7 +2190,7 @@ ClassMethod FileIsMapped(InternalName As %String) As %Boolean
NameToInternalName(name): given a Unix-style slash path relative to repo root,
returns the internal name for that file (e.g., cls/SourceControl/Git/Utils.cls -> SourceControl.Git.Utils.CLS)
*/
ClassMethod NameToInternalName(Name, IgnorePercent = 1, IgnoreNonexistent = 1, Verbose As %Boolean = 0) As %String
ClassMethod NameToInternalName(Name, IgnorePercent = 1, IgnoreNonexistent = 1, Verbose As %Boolean = 0, normalize As %Boolean = 1) As %String
{
set InternalName=""
set Deleted = 0
Expand All @@ -2206,7 +2206,7 @@ ClassMethod NameToInternalName(Name, IgnorePercent = 1, IgnoreNonexistent = 1, V
set InternalName = ##class(SourceControl.Git.File).ExternalNameToInternalName(Name)
if (InternalName '= "") && (context.IsInGitEnabledPackage) {
// Don't need mappings!
return ..NormalizeInternalName(InternalName)
return $select(normalize:..NormalizeInternalName(InternalName),1:InternalName)
}
} else {
// check for file in uncommitted queue
Expand Down Expand Up @@ -2349,7 +2349,7 @@ ClassMethod NameToInternalName(Name, IgnorePercent = 1, IgnoreNonexistent = 1, V
}
if ((IgnorePercent)&&($extract(InternalName)="%")) { set InternalName = "" } // don't return a result for % items if instructed to ignore them
if ((IgnoreNonexistent)&&('##class(%RoutineMgr).Exists(InternalName))&&('Deleted)) { set InternalName = "" } // only return item names which exist in the DB
quit ..NormalizeInternalName(InternalName)
return $select(normalize:..NormalizeInternalName(InternalName),1:InternalName)
}

ClassMethod OutputConfigureMessage()
Expand Down
Loading