Merge branch 'main' into fix-124

Author: isc-etamarch

CHANGELOG.md

@@ -5,15 +5,21 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [2.6.0] - Unreleased
+## [2.7.0] - Unreleased
+
+### Added
+- Added 'git push --force' in expert mode (#527)
+- Added environment awareness in configuration, and showing of environment name in UI (#124)
+
+## [2.6.0] - 2024-10-07
 
 ### Added
 - Discards safeguarded by discard stash and warning modal (#455)
 - Files in uncommitted queue in any namespace warn users when opened except for in VSCode (#370)
 - Added link back to IRIS management portal from Settings, Git WebUI pages (#449)
 - Added Import all and Import All (Force) to basic mode menu (#498)
 - Improved behavior for commits when attribution settings are not configured (#450)
-- Added environment awareness in configuration, and showing of environment name in UI (#124)
+- Convert URLs in Sync output UI into clickable links (#497)
 
 ### Fixed
 - Changed prompts in configure from 0/1 to no/yes (#461)
@@ -24,6 +30,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fetch diff output uses correct remote branch (#509)
 - Properly handle more cases of truncated filenames from git pull (#511)
 - Made git-source-control backwards compatible with IRIS 2021.1 (#513)
+- Sync, pull properly handle more change edge cases for import (#517, #496)
+- "Status" menu item actually includes branch when IRIS version allows (#472)
 
 ## [2.5.0] - 2024-09-24
 

cls/SourceControl/Git/Extension.cls

@@ -22,6 +22,7 @@ XData Menu
 <MenuItem Separator="true"/>
 <MenuItem Name="Sync" />
 <MenuItem Name="Push" />
+<MenuItem Name="PushForce" />
 <MenuItem Name="Fetch" />
 <MenuItem Name="Pull" />
 <MenuItem Separator="true"/>
@@ -127,6 +128,7 @@ Method LocalizeName(name As %String) As %String
         "Commit":$$$Text("@Commit@Commit changes to file"),
         "Sync":$$$Text("@Sync@Sync"),
         "Push":$$$Text("@Push@Push to remote branch"),
+        "PushForce":$$$Text("@PushForce@Push to remote branch (Force)"),
         "Fetch":$$$Text("@Fetch@Fetch from remote"),
         "Pull":$$$Text("@Pull@Pull changes from remote branch"),
         "Status": $$$Text("@Status@Status"),
@@ -174,6 +176,7 @@ Method OnSourceMenuItem(name As %String, ByRef Enabled As %String, ByRef Display
                 "NewBranch": 1,
                 "SwitchBranch": 1,
                 "Push": 1,
+                "PushForce": 1,
                 "Fetch": 1,
                 "Pull": 1,
                 "Sync": -1,
@@ -194,7 +197,7 @@ Method OnSourceMenuItem(name As %String, ByRef Enabled As %String, ByRef Display
 
     if (name = "Status") {
         set DisplayName = ..LocalizeName(name)_" (branch: "_##class(SourceControl.Git.Utils).GetCurrentBranch()_")"
-    } if (name '= "") {
+    } elseif (name '= "") {
 	    set DisplayName = ..LocalizeName(name)
     }
     quit $$$OK

cls/SourceControl/Git/Utils.cls

@@ -282,6 +282,10 @@ ClassMethod UserAction(InternalName As %String, MenuName As %String, ByRef Targe
         quit $$$OK
     } elseif (menuItemName = "Push") {
         quit ..Push()
+    } elseif (menuItemName = "PushForce") {
+        set Target = "Force pushing is potentially destructive and may overwrite the commit history of the remote branch. Are you sure you want to proceed?"
+        set Action = 1 // Make sure the user confirms that they want to do this
+        quit $$$OK
     } elseif (menuItemName = "Fetch") {
         $$$QuitOnError(..Fetch(.diffFiles))
         set pointer = 0
@@ -331,6 +335,11 @@ ClassMethod AfterUserAction(Type As %Integer, Name As %String, InternalName As %
             do ..Sync(Msg)
             set Reload = 1
         }
+    } elseif (menuItemName = "PushForce") {
+        if (Answer = 1) {
+            do ..Push(,1)
+            set Reload = 1
+        }
     } elseif (menuItemName = "GitWebUI") {
         // Always force reload as many things could have possibly changed.
         set Reload = 1
@@ -457,8 +466,7 @@ ClassMethod MergeDefaultRemoteBranch(Output alert As %String = "") As %Boolean
         do ..RunGitWithArgs(.errStream, .outStream, "fetch", "origin", defaultMergeBranch_":"_defaultMergeBranch)
         do ..PrintStreams(errStream, outStream)
 
-        do ..RunGitWithArgs(,.outStream, "rev-parse", "HEAD")
-        set startSha = outStream.ReadLine()
+        set startSha = ..GetCurrentRevision()
 
         // Start a transaction so code changes can be rolled back
         set initTLevel = $TLevel
@@ -566,6 +574,13 @@ ClassMethod GetCurrentBranch() As %String
     quit branchName
 }
 
+ClassMethod GetCurrentRevision() As %String
+{
+    do ##class(SourceControl.Git.Utils).RunGitCommandWithInput("rev-parse",,.errStream,.outStream,"HEAD")
+    set revision = outStream.ReadLine(outStream.Size)
+    quit revision
+}
+
 ClassMethod Pull(remote As %String = "origin") As %Status
 {
     New %gitSCOutputFlag
@@ -1741,7 +1756,11 @@ ClassMethod RunGitCommandWithInput(command As %String, inFile As %String = "", O
     } elseif (command = "restore") {
         // Leave diffCompare empty, this actually does the right thing.
         set syncIrisWithDiff = 1
-    } elseif (command = "merge") || (command = "rebase")  || (command = "pull") {
+    } elseif (command = "pull") {
+        set syncIrisWithDiff = 1
+        // The current revision, prior to the pull, will be compared against
+        set diffCompare = ..GetCurrentRevision()
+    } elseif (command = "merge") || (command = "rebase") {
         set syncIrisWithCommand = 1
         if $data(args) && $data(args(args),diffCompare) {
             // no-op
@@ -1805,7 +1824,10 @@ ClassMethod RunGitCommandWithInput(command As %String, inFile As %String = "", O
         set syncIrisWithCommand = 0
     }
 
-    if syncIrisWithDiff {
+    // If performing a pull don't perform a diff until after the pull has occured.
+    // This is to avoid a double fetch, as pull performs one for us and also to avoid a potential
+    // race condition if the remote changes between now and the pull actually being performed.
+    if syncIrisWithDiff && (command '= "pull") {
         if diffBase = "" {
             set diffBase = ..GetCurrentBranch()
         }
@@ -1819,23 +1841,30 @@ ClassMethod RunGitCommandWithInput(command As %String, inFile As %String = "", O
     set outLog = ##class(%Library.File).TempFilename()
     set errLog = ##class(%Library.File).TempFilename()
 
-    set command = $extract(..GitBinPath(),2,*-1)
+    set gitCommand = $extract(..GitBinPath(),2,*-1)
 
     set baseArgs = "/STDOUT="_$$$QUOTE(outLog)_" /STDERR="_$$$QUOTE(errLog)_$case(inFile, "":"", :" /STDIN="_$$$QUOTE(inFile))
     try {
         // Inject instance manager directory as global git config home directory
         // On Linux, this avoids trying to use /root/.config/git/attributes for global git config
         set env("XDG_CONFIG_HOME") = ##class(%File).ManagerDirectory()
-        set returnCode = $zf(-100,"/ENV=env... "_baseArgs,command,newArgs...)
+        set returnCode = $zf(-100,"/ENV=env... "_baseArgs,gitCommand,newArgs...)
     } catch e {
         if $$$isWINDOWS {
-            set returnCode = $zf(-100,baseArgs,command,newArgs...)
+            set returnCode = $zf(-100,baseArgs,gitCommand,newArgs...)
         } else {
             // If can't inject XDG_CONFIG_HOME (older IRIS version), need /SHELL on Linux to avoid permissions errors trying to use root's config
-            set returnCode = $zf(-100,"/SHELL "_baseArgs,command,newArgs...)
+            set returnCode = $zf(-100,"/SHELL "_baseArgs,gitCommand,newArgs...)
         }
     }
 
+    // If performing a pull then do a diff now after the pull has occured.
+    if syncIrisWithDiff && (command = "pull") {
+        do ##class(SourceControl.Git.Utils).RunGitCommandWithInput("diff",,.errorStream,.outputStream, diffCompare, "--name-status")
+        // Verbose output should not be required as pull already outputs a summary
+        do ..ParseDiffStream(outputStream,0,.files)
+    }
+
     set errStream = ##class(%Stream.FileCharacter).%OpenId(errLog,,.sc)
     set outStream = ##class(%Stream.FileCharacter).%OpenId(outLog,,.sc)
     set outStream.TranslateTable="UTF8"

csp/sync.csp

@@ -147,7 +147,8 @@
             &js<
                 var outputContainer = document.getElementById('outputBox');
                 var lineText = #(..QuoteJS(escapedLine))#;
-                var lineTextNode = document.createTextNode(lineText);
+                var urlRegex = /(https?:\/\/[^ ]*)/gi;
+                lineText = lineText.replace(urlRegex, "<a href='$1' target=_blank>$1</a>");
                 outputContainer.innerHTML += lineText + "<br>";
             >
         }

docs/menu-items.md

@@ -20,6 +20,8 @@ This menu option is analogous to the [git add](https://git-scm.com/docs/git-add)
 This menu option will only appear if the currently open file has been already added using the 'Add' menu option. It undoes the effect of adding the file, similar to running [git reset](https://git-scm.com/docs/git-reset) on a specific file.
 ## Push to remote branch
 This option pushes the commits in the branch to the remote repository. This exhibits the same behavior as the [git push](https://git-scm.com/docs/git-push) command.
+## Push to remote branch (force)
+This option forcibly pushes the commits in the branch to the remote repository. This is potentially destructive and may overwrite the commit history of the remote branch. This exhibits the same behavior as the [git push --force](https://git-scm.com/docs/git-push) command.
 ## Fetch from remote
 Much like the [git fetch](https://git-scm.com/docs/git-fetch) command, this option fetches the most recent versions of the branch without merging that version into the local copy of the branch.
 ## Pull changes from remote branch

module.xml

@@ -3,7 +3,7 @@
   <Document name="git-source-control.ZPM">
     <Module>
       <Name>git-source-control</Name>
-      <Version>2.6.0</Version>
+      <Version>2.7.0</Version>
       <Description>Server-side source control extension for use of Git on InterSystems platforms</Description>
       <Keywords>git source control studio vscode</Keywords>
       <Packaging>module</Packaging>