Merge pull request #324 from isc-pbarton/fix-pull

isc-tleavitt · web-flow · commit 37da37d61553 · 2024-03-04T08:04:57.000-05:00
Git pull correctly actions modified files
diff --git a/cls/SourceControl/Git/Utils.cls b/cls/SourceControl/Git/Utils.cls
@@ -355,7 +355,7 @@ ClassMethod Pull(remote As %String = "origin", preview As %Boolean = 0) As %Stat
     write !, "Fetch done"
     write !, "Files that will be modified by git pull: "
 
-    do ##class(SourceControl.Git.Utils).RunGitCommandWithInput("diff",,.errStream,.outStream, remote_"/"_branchName, "--name-status")
+    do ##class(SourceControl.Git.Utils).RunGitCommandWithInput("diff",,.errStream,.outStream, branchName_".."_remote_"/"_branchName, "--name-status")
     while (outStream.AtEnd = 0) {
         set file = outStream.ReadLine()
         set modification = ##class(SourceControl.Git.Modification).%New()
@@ -2036,3 +2036,4 @@ ClassMethod ResetSourceControlClass()
 }
 
 }
+

Original file line number	Diff line number	Diff line change
`@@ -355,7 +355,7 @@ ClassMethod Pull(remote As %String = "origin", preview As %Boolean = 0) As %Stat`
`355`	`355`	`write !, "Fetch done"`
`356`	`356`	`write !, "Files that will be modified by git pull: "`
`357`	`357`
`358`		`- do ##class(SourceControl.Git.Utils).RunGitCommandWithInput("diff",,.errStream,.outStream, remote_"/"_branchName, "--name-status")`
	`358`	`+ do ##class(SourceControl.Git.Utils).RunGitCommandWithInput("diff",,.errStream,.outStream, branchName_".."_remote_"/"_branchName, "--name-status")`
`359`	`359`	`while (outStream.AtEnd = 0) {`
`360`	`360`	`set file = outStream.ReadLine()`
`361`	`361`	`set modification = ##class(SourceControl.Git.Modification).%New()`
`@@ -2036,3 +2036,4 @@ ClassMethod ResetSourceControlClass()`
`2036`	`2036`	`}`
`2037`	`2037`
`2038`	`2038`	`}`
	`2039`	`+`