addressed issue where pull doesn't work with preview

isc-hwojnick · isc-hwojnick · commit 0e9b877cdafa · 2024-06-24T16:28:22.000-04:00
diff --git a/cls/SourceControl/Git/API.cls b/cls/SourceControl/Git/API.cls
@@ -36,11 +36,6 @@ ClassMethod Configure()
     }
 }
 
-/// API for git pull - just wraps Utils
-ClassMethod Pull(preview As %Boolean = 0)
-{
-    quit ##class(SourceControl.Git.Utils).Pull(,.preview)
-}
 
 /// Locks the environment to prevent changes to code other than through git pull.
 /// Returns 1 if the environment was already locked, 0 if it was previously unlocked.
diff --git a/cls/SourceControl/Git/Utils.cls b/cls/SourceControl/Git/Utils.cls
@@ -439,7 +439,7 @@ ClassMethod GetCurrentBranch() As %String
     quit branchName
 }
 
-ClassMethod Pull(remote As %String = "origin", preview As %Boolean = 0) As %Status
+ClassMethod Pull(remote As %String = "origin") As %Status
 {
     #define Force 1
     do ##class(SourceControl.Git.Utils).RunGitCommandWithInput("branch",,.errStream,.outStream,"--show-current")

Original file line number	Diff line number	Diff line change
`@@ -36,11 +36,6 @@ ClassMethod Configure()`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`
`39`		`-/// API for git pull - just wraps Utils`
`40`		`-ClassMethod Pull(preview As %Boolean = 0)`
`41`		`-{`
`42`		`- quit ##class(SourceControl.Git.Utils).Pull(,.preview)`
`43`		`-}`
`44`	`39`
`45`	`40`	`/// Locks the environment to prevent changes to code other than through git pull.`
`46`	`41`	`/// Returns 1 if the environment was already locked, 0 if it was previously unlocked.`
Original file line number	Diff line number	Diff line change
`@@ -439,7 +439,7 @@ ClassMethod GetCurrentBranch() As %String`
`439`	`439`	`quit branchName`
`440`	`440`	`}`
`441`	`441`
`442`		`-ClassMethod Pull(remote As %String = "origin", preview As %Boolean = 0) As %Status`
	`442`	`+ClassMethod Pull(remote As %String = "origin") As %Status`
`443`	`443`	`{`
`444`	`444`	`#define Force 1`
`445`	`445`	`do ##class(SourceControl.Git.Utils).RunGitCommandWithInput("branch",,.errStream,.outStream,"--show-current")`