Git add packages (#79)

* committing to see deleted file

* staged deleted file

* Staging another file to delete later

* Staging class file to see how delete works

* clean up

* Commit to test delete in Uncommitted queue

* minor refactoring

* delete class file made for testing

* Add code to remove file from Uncommitted queue after commit.

* Remove unneeded file

* Uncommitted queue now saves deleted files

* Commit changes with logging statements for testing

* Adding packages to source control now works properly

* Remove changes carried over from unrelated branch

* Made the fix for package names not having the .pkg extension on VS Code more universal

Co-authored-by: Sarmishta Velury <[email protected]>

Author: isc-svelury

.gitignore

@@ -1,5 +1,4 @@
 .vscode/
-testcode.txt
 .gitattributes
 *.code-workspace
 package-lock.json

cls/SourceControl/Git/Change.cls

@@ -88,4 +88,3 @@ ClassMethod RefreshUncommitted(Display = 1, IncludeRevert = 0) As %Status
 }
 
 }
-

cls/SourceControl/Git/Extension.cls

@@ -47,6 +47,10 @@ Method UserAction(Type As %Integer, Name As %String, InternalName As %String, Se
     if menu '= "%SourceMenu", menu'="%SourceContext" {
         quit $$$OK
     }
+    do $System.OBJ.GetPackageList(.files,InternalName)
+    if ($DATA(files) '= 0) {
+            set InternalName = ($piece($order(files("")), ".", 1)_".pkg")
+    }
     set InternalName = ##class(Utils).NormalizeInternalName(InternalName)
     set context = ##class(SourceControl.Git.PackageManagerContext).ForInternalName(InternalName)
     set ec = ##class(Utils).UserAction(InternalName, Name, .Target, .Action, .Reload)
@@ -160,6 +164,14 @@ Method OnSourceMenuContextItem(itemName As %String, menuItemName As %String, ByR
 /// this menu item from the list totally, 0 will gray the menu item out and the default 1 will display the menu item as normal.
 Method OnMenuItem(MenuName As %String, InternalName As %String, SelectedText As %String, ByRef Enabled As %Boolean, ByRef DisplayName As %String) As %Status
 {
+    
+    if (InternalName '= ""){
+        do $System.OBJ.GetPackageList(.files,InternalName)
+        if ($DATA(files) '= 0) {
+                set InternalName = ($piece($order(files("")), ".", 1)_".pkg")
+        }
+    }
+
     set InternalName = ##class(Utils).NormalizeInternalName(InternalName)
     set context = ##class(SourceControl.Git.PackageManagerContext).ForInternalName(InternalName)
 
@@ -303,4 +315,3 @@ Method GetStatus(InternalName As %String, ByRef IsInSourceControl As %Boolean, B
 }
 
 }
-

cls/SourceControl/Git/Utils.cls

@@ -254,33 +254,33 @@ ClassMethod Revert(InternalName As %String) As %Status
     quit $$$OK
 }
 
-ClassMethod NewBranch(newBranchName As %String) As %Status
+ClassMethod Commit(InternalName As %String, Message As %String = "example commit message") As %Status
 {
-    do ..RunGitWithArgs(.errStream, .outStream, "checkout", "-b", newBranchName)
-    do errStream.OutputToDevice()
+    set filename = ..FullExternalName(InternalName)
+    set username = ..GitUserName()
+    set email = ..GitUserEmail()
+    set author = username_" <"_email_">"
+    do ..RunGitWithArgs(.errStream, .outStream, "commit", "--author", author, "-m", Message, filename)
+    write !
     do outStream.OutputToDevice()
+    write !
+    do errStream.OutputToDevice()
     quit $$$OK
 }
 
-ClassMethod SwitchBranch(targetBranchName As %String) As %Status
+ClassMethod NewBranch(newBranchName As %String) As %Status
 {
-    do ..RunGitWithArgs(.errStream, .outStream, "checkout", targetBranchName)
+    do ..RunGitWithArgs(.errStream, .outStream, "checkout", "-b", newBranchName)
     do errStream.OutputToDevice()
     do outStream.OutputToDevice()
     quit $$$OK
 }
 
-ClassMethod Commit(InternalName As %String, Message As %String = "example commit message") As %Status
+ClassMethod SwitchBranch(targetBranchName As %String) As %Status
 {
-    set filename = ..FullExternalName(InternalName)
-    set username = ..GitUserName()
-    set email = ..GitUserEmail()
-    set author = username_" <"_email_">"
-    do ..RunGitWithArgs(.errStream, .outStream, "commit", "--author", author, "-m", Message, filename)
-    write !
-    do outStream.OutputToDevice()
-    write !
+    do ..RunGitWithArgs(.errStream, .outStream, "checkout", targetBranchName)
     do errStream.OutputToDevice()
+    do outStream.OutputToDevice()
     quit $$$OK
 }
 
@@ -386,14 +386,17 @@ ClassMethod AddToSourceControl(InternalName As %String) As %Status
     for i = 1:1:$length(InternalName, ",") {
         #dim item as %String = ..NormalizeExtension($piece(InternalName, ",", i))
         set @..#Storage@("items", item) = ""
-        #dim sc as %Status =  ..ExportItem(item)
+        #dim sc as %Status =  ..ExportItem(item,,,.filenames)
         if 'sc {
             set ec = $$$ADDSC(ec, sc)
         }
-        // Necessary for items in new folders
-        do ..RunGitCommand("add",.errStream,.outStream,..ExternalName(InternalName))
-        do outStream.OutputToDevice()
-        do errStream.OutputToDevice()
+        #dim extension = $piece(item, ".", $length(item, "."))
+
+        for i=1:1:filenames{
+            do ..RunGitCommand("add",.errStream,.outStream,filenames(i))
+            do outStream.OutputToDevice()
+            do errStream.OutputToDevice()
+        }
     }
     set ec = $$$ADDSC(ec, ..ExportSCList())
     quit ec
@@ -448,7 +451,7 @@ ClassMethod RemoveFromSourceControl(InternalName As %String) As %Status
         } else {
             #dim parentElement as %String = ""
             if ..IsInSourceControl(item, .parentElement) {
-                set tsc = ..MakeError(item _ " is contained in "_parentElement_" that tracked by SourceControl")
+                set tsc = ..MakeError(item _ " is contained in "_parentElement_" that tracked is by SourceControl")
             }else {
                 set tsc = ..MakeError(item _ " is not in SourceControl")
             }
@@ -918,7 +921,7 @@ ClassMethod ImportRoutines(force As %Boolean = 0) As %Status
     quit ec
 }
 
-ClassMethod ExportRoutinesAux(path As %String, sep As %String = "", level As %Integer = 0, force As %Boolean = 0) As %Status
+ClassMethod ExportRoutinesAux(path As %String, sep As %String = "", level As %Integer = 0, force As %Boolean = 0, ByRef filenames) As %Status
 {
     #define Dir
     #define OrderBy
@@ -941,32 +944,33 @@ ClassMethod ExportRoutinesAux(path As %String, sep As %String = "", level As %In
 
         if (type = $$$Directory) || (type = $$$CSPFolder) {
             #dim newpath as %String = $case(path,"":name,:path_isdirectory_name)
-            do ..ExportRoutinesAux(newpath, isdirectory, level + 1, force)
+            do ..ExportRoutinesAux(newpath, isdirectory, level + 1, force, .filenames)
         } else {
             #dim InternalName as %String = path_sep_name
             if (type = $$$CspFile) && ($extract(InternalName) '= "/") {
                 set InternalName = "/"_InternalName
             }
-            set ec = ..ExportItem(InternalName, 1, force)
+            set ec = ..ExportItem(InternalName, 1, force, .filenames)
         }
     }
     kill rs
     quit ec
 }
 
-ClassMethod ExportItem(InternalName As %String, expand As %Boolean = 1, force As %Boolean = 0) As %Status
+ClassMethod ExportItem(InternalName As %String, expand As %Boolean = 1, force As %Boolean = 0, ByRef filenames) As %Status
 {
     #dim type = ..Type(InternalName)
     if type = "pkg" {
-        $$$QuitOnError(..ExportRoutinesAux(..NameWithoutExtension(InternalName), ".", 0, force))
+        $$$QuitOnError(..ExportRoutinesAux(..NameWithoutExtension(InternalName), ".", 0, force, .filenames))
     }elseif type = "prj" && expand {
-        $$$QuitOnError(..ExportProject(..NameWithoutExtension(InternalName), force))
-        $$$QuitOnError(..ExportItem(InternalName, 0, force))
+        $$$QuitOnError(..ExportProject(..NameWithoutExtension(InternalName), force, .filenames))
+        $$$QuitOnError(..ExportItem(InternalName, 0, force, .filenames))
     }elseif (type = "csp") && ..IsCspFolder(InternalName) {
-        $$$QuitOnError(..ExportRoutinesAux(InternalName , "/", 0, force))
+        $$$QuitOnError(..ExportRoutinesAux(InternalName , "/", 0, force, .filenames))
     }else {
         if ..IsTempFileOutdated(InternalName) || force {
             #dim filename as %String = ..FullExternalName(InternalName)
+            set filenames($I(filenames)) = filename
             write "exporting new version of ", InternalName, " to ", filename,!
             $$$QuitOnError($system.OBJ.ExportUDL(InternalName, filename,"-d/diff"))
             $$$QuitOnError(..UpdateRoutineTSH(InternalName, $h))
@@ -978,7 +982,7 @@ ClassMethod ExportItem(InternalName As %String, expand As %Boolean = 1, force As
     quit $$$OK
 }
 
-ClassMethod ExportProject(project As %String, force As %Boolean = 0) As %Status
+ClassMethod ExportProject(project As %String, force As %Boolean = 0, ByRef filenames) As %Status
 {
     #dim rs as %ResultSet = ##class(%ResultSet).%New("%Studio.Project:ProjectItemsList")
     $$$QuitOnError(rs.Execute(project))
@@ -988,7 +992,7 @@ ClassMethod ExportProject(project As %String, force As %Boolean = 0) As %Status
         if $listfind(typesWithoutExtension, rs.Get("Type")) {
             set name = name _ "." _ rs.Get("Type")
         }
-        #dim ec as %Status = ..ExportItem(name, 1, force)
+        #dim ec as %Status = ..ExportItem(name, 1, force, .filenames)
         quit:'ec
     }
     kill rs

git-webui/release/share/git-webui/webui/js/git-webui.js

@@ -2049,4 +2049,4 @@ $(function () {
         e.preventDefault();
         location.reload()
     });
-});
+});