Merge branch 'main' of https://github.com/intersystems/git-source-control into claude-dev-container

Author: isc-pbarton

.github/pull_request_template.md

@@ -0,0 +1,13 @@
+## Description
+- Link the issue using the [magic closing words](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests#linking-a-pull-request-to-an-issue).
+- Provide a summary of the change and how it addresses the issue (e.g. if it is a bug, explain the root cause of the bug and how this change fixes it).
+- Include any other necessary context, especially if any section warrants special reviewer attention.
+
+## Testing
+How has this change been tested? Have you added unit or integration tests as appropriate?
+
+## Checklist
+- [ ] This branch has the latest changes from the `main` branch rebased or merged.
+- [ ] Web UI has been built (any changes in `git-webui/src` have matching changes in `git-webui/release`)
+- [ ] CHANGELOG.md entry added if appropriate.
+- [ ] Documentation has been/will be updated

CHANGELOG.md

@@ -9,10 +9,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 - Import of decomposed production items now has a brief timeout in case another deploy is in progress (#949)
+- Option to view an individual file's history in the source control menu (#960)
+- Change context menu now lists IPM packages from all Git-enabled namespaces, prefixed with the namespace name (#952)
 
 ### Fixed
 - Changes to % routines mapped to the current namespace may now be added to source control and committed (#944)
 - Edits to a decomposed production in VS Code fixed after changes to the VS Code ObjectScript extension (#949)
+- Configure prompt no longer quits out with an unhelpful error if existing boolean settings are null (#962)
+- Branch names are now constrained to a reasonable set of allowed characters, fixing an issue where branch names with special characters were hidden without explanation (#914)
 
 ## [2.16.0] - 2026-03-06
 

cls/SourceControl/Git/Extension.cls

@@ -36,13 +36,15 @@ XData Menu
 <MenuItem Name="Import" />
 <MenuItem Name="ImportForce" />
 <MenuItem Name="TakeOwnership" />
+<MenuItem Name="FileHistory" Save="101" />
 </Menu>
 <Menu Name="%SourceContext" Type="1">
 <MenuItem Name="AddToSC" Save="100" />
 <MenuItem Name="RemoveFromSC"/>
 <MenuItem Name="Revert" Save="100" />
 <MenuItem Name="Commit" Save="100" />
 <MenuItem Name="TakeOwnership" />
+<MenuItem Name="FileHistory" Save="101" />
 </Menu>
 </MenuBase>
 }
@@ -153,6 +155,7 @@ Method LocalizeName(name As %String) As %String
         "Revert":$$$Text("@Revert@Discard changes to file"),
         "Commit":$$$Text("@Commit@Commit changes to file"),
         "TakeOwnership":$$$Text("@TakeOwnership@Take ownership of changes to file"),
+        "FileHistory":$$$Text("@FileHistory@View file history"),
         "Sync":$$$Text("@Sync@Sync"),
         "Push":$$$Text("@Push@Push to remote branch"),
         "PushForce":$$$Text("@PushForce@Push to remote branch (Force)"),
@@ -175,7 +178,7 @@ Method OnSourceMenuItem(name As %String, ByRef Enabled As %String, ByRef Display
     }
     if ##class(SourceControl.Git.Utils).IsNamespaceInGit() {
 
-        if $listfind($listbuild("AddToSC", "RemoveFromSC", "Revert", "Commit", "ExportProduction", "TakeOwnership"), name) {
+        if $listfind($listbuild("AddToSC", "RemoveFromSC", "Revert", "Commit", "ExportProduction", "TakeOwnership", "FileHistory"), name) {
             quit ..OnSourceMenuContextItem(InternalName,name,.Enabled,.DisplayName)
         }
 
@@ -270,6 +273,8 @@ Method OnSourceMenuContextItem(itemName As %String, menuItemName As %String, ByR
         if isCheckedOut && (userCheckedOut '= $username) {
             set Enabled = 1
         }
+    } elseif menuItemName = "FileHistory" {
+        set Enabled = ##class(SourceControl.Git.Utils).IsInSourceControl(itemName)
     } elseif menuItemName = "ExportProduction" {
         set itemNameNoExt = $piece(itemName,".",1,*-1)
         set Enabled = (##class(SourceControl.Git.Production).IsProductionClass(itemNameNoExt,"FullExternalName"))

cls/SourceControl/Git/Settings.cls

@@ -280,7 +280,7 @@ ClassMethod CreateNamespaceTempFolder() As %Status [ Internal ]
     return $$$OK
 }
 
-ClassMethod Configure() As %Boolean [ CodeMode = objectgenerator, Internal ]
+ClassMethod Configure(Output sc As %Status = {$$$OK}) As %Boolean [ CodeMode = objectgenerator, Internal ]
 {
     do %code.WriteLine(" set inst = ..%New()")
     do %code.WriteLine(" do inst.RetrieveDefaults()")
@@ -305,6 +305,7 @@ ClassMethod Configure() As %Boolean [ CodeMode = objectgenerator, Internal ]
         set promptQuoted = $replace(promptQuoted,"${username}","'""_$Username_""'")
         set propertyDef = ##class(%Dictionary.PropertyDefinition).%OpenId("SourceControl.Git.Settings||"_property_"")
         if ((propertyDef) && (propertyDef.Type = "%Boolean")) {
+            do %code.WriteLine(" set value = ''value")
             do %code.WriteLine(" set response = ##class(%Library.Prompt).GetYesNo("_promptQuoted_",.value,,"_defaultPromptFlag_")")
         } elseif ((propertyDef) && (propertyDef.Name = "gitBinPath")) {
             do %code.WriteLine(" set valid = 0")
@@ -342,6 +343,7 @@ ClassMethod Configure() As %Boolean [ CodeMode = objectgenerator, Internal ]
         } else {
             do %code.WriteLine(" set response = ##class(%Library.Prompt).GetString("_promptQuoted_",.value,,,,"_defaultPromptFlag_")")
         }
+        do %code.WriteLine(" if (response = $$$ErrorResponse) { set sc = $get(%objlasterror, 0) }")
         do %code.WriteLine(" if response '= $$$SuccessResponse { quit 0 }")
         do %code.WriteLine(" set value = $zstrip(value,""<>W"")")
         do %code.WriteLine(" set inst."_property_" = value")

cls/SourceControl/Git/Utils.cls

@@ -10,11 +10,11 @@ Parameter InstallNamespace = "%SYS";
 Parameter Slash = {$case($system.Version.GetOS(),"Windows":"\",:"/")};
 
 /// Name of the file with version controlled items
-Parameter GitMenuItems = ",Settings,Commit,Sync,Pull,Fetch,Push,Revert,";
+Parameter GitMenuItems = ",Settings,Commit,Sync,Pull,Fetch,Push,Revert,FileHistory,";
 
 Parameter ImportAfterGitMenuItems = ",Commit,Sync,Pull,Fetch,Push,";
 
-Parameter GitContextMenuItems = ",%Diff,%Blame,";
+Parameter GitContextMenuItems = ",%Diff,%Blame,FileHistory,";
 
 ClassMethod %SYSNamespaceStorage() As %String [ CodeMode = expression ]
 {
@@ -282,6 +282,12 @@ ClassMethod UserAction(InternalName As %String, MenuName As %String, ByRef Targe
     } elseif (menuItemName = "GitWebUI") {
         set Action = 2 + externalBrowser
         set Target = urlPrefix _ "/isc/studio/usertemplates/gitsourcecontrol/webuidriver.csp/"_$namespace_"/"_$zconvert(InternalName,"O","URL")_"?"_urlPostfix
+    } elseif (menuItemName = "FileHistory") {
+        set Action = 2 + externalBrowser
+        set Target = urlPrefix _ "/isc/studio/usertemplates/gitsourcecontrol/webuidriver.csp/"_$namespace_"/"_$zconvert(InternalName,"O","URL")_"?view=file-history"
+        if urlPostfix '= "" {
+            set Target = Target_"&"_urlPostfix
+        }
     } elseif (menuItemName = "Export") || (menuItemName = "ExportForce") {
         write !, "==export start==",!
         set ec = ..ExportAll($case(menuItemName="ExportForce",1:$$$Force,:0))
@@ -451,12 +457,22 @@ ClassMethod TakeOwnership(InternalName As %String) As %Status
     quit sc
 }
 
+/// Validates that a branch name contains only supported characters.
+/// Supported: letters (a-z, A-Z), digits (0-9), hyphens (-), underscores (_), periods (.), and forward slashes (/).
+ClassMethod IsValidBranchName(branchName As %String) As %Boolean
+{
+    quit $match(branchName, "[a-zA-Z0-9._/-]+")
+}
+
 /// <p>This function performs <code>git checkout -b [newBranchName]</code> from the current commit.</p>
 /// <p>If the user is in "Basic Mode" AND there is a Default Merge Branch defined,
 /// then this method first checks out and pulls that default merge branch before creating the new branch. This is
 /// equivalent to <code>git checkout [defaultMergeBranch] && git pull</code>.</p>
 ClassMethod NewBranch(newBranchName As %String) As %Status
 {
+    if '..IsValidBranchName(newBranchName) {
+        quit $$$ERROR($$$GeneralError, "Invalid branch name. Branch names may only contain letters, numbers, hyphens, underscores, periods, and forward slashes.")
+    }
     set settings = ##class(SourceControl.Git.Settings).%New()
     if (settings.basicMode) && (settings.defaultMergeBranch '= ""){
         set err = ..RunGitWithArgs(.errStream, .outStream, "checkout", settings.defaultMergeBranch)
@@ -2807,18 +2823,28 @@ ClassMethod GetContexts(onlyNamespaces As %Boolean) As %DynamicArray
 
     set name = ""
 
-    // Using embedded for backwards compatability
+    // Using embedded instead of ExecDirectNoPriv() for backwards compatability
     if '(onlyNamespaces) {
         &sql(DECLARE C1 CURSOR FOR SELECT name into :name from %Library.RoutineMgr_StudioOpenDialog('*.ZPM'))
-        &sql(OPEN C1)
-            throw:SQLCODE<0 ##class(%Exception.SQL).CreateFromSQLCODE(SQLCODE, %msg)
-        &sql(FETCH C1)
-        while(SQLCODE = 0) {
-            set package = name
-            do contexts.%Push(package)
-            &sql(FETCH C1)
+        new $namespace
+        set ptr = 0
+        while $listnext(namespaces,ptr,ns) {
+            if '($FIND(ns,"^^")) {
+                try {
+                    set $NAMESPACE = ns
+                    &sql(OPEN C1)
+                    throw:(SQLCODE<0) ##class(%Exception.SQL).CreateFromSQLCODE(SQLCODE, %msg)
+                    &sql(FETCH C1)
+                    while (SQLCODE = 0) {
+                        do contexts.%Push(ns_":"_name)
+                        &sql(FETCH C1)
+                    }
+                    &sql(CLOSE C1)
+                } catch e {
+                    // skip inaccessible namespaces
+                }
+            }
         }
-        &sql(CLOSE C1)
     }
 
     return contexts
@@ -3391,3 +3417,4 @@ ClassMethod IsSchemaStandard(pName As %String = "") As %Boolean [ Internal ]
 }
 
 }
+

cls/SourceControl/Git/WebUIDriver.cls

@@ -16,6 +16,8 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
             set responseJSON = ..UserInfo()
         } elseif $extract(pagePath,6,*) = "uncommitted" {
             set responseJSON = ..Uncommitted()
+        } elseif $extract(pagePath,6,*) = "page-info" {
+            set responseJSON = ..PageInfo(InternalName, $get(%request.Data("view",1)))
         } elseif $extract(pagePath,6,*) = "settings" {
             set responseJSON = ..GetSettingsURL(%request)
         } elseif $extract(pagePath, 6, *) = "get-package-version"{
@@ -380,6 +382,21 @@ ClassMethod UserInfo() As %SystemBase
     }
 }
 
+ClassMethod PageInfo(InternalName As %String = "", View As %String = "") As %SystemBase
+{
+    set externalName = ""
+    if InternalName '= "" {
+        set externalName = ##class(SourceControl.Git.Utils).ExternalName(InternalName)
+        set externalName = $translate(externalName, "\", "/")
+    }
+    quit {
+        "internalName": (InternalName),
+        "externalName": (externalName),
+        "view": (View),
+        "isFileHistory": (View = "file-history")
+    }
+}
+
 ClassMethod Uncommitted() As %SystemBase
 {
     // Stub