diff --git a/CHANGELOG.md b/CHANGELOG.md index d5fb31f4..106d0e6e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ 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.5.0] - Unreleased + +### Added +- New UI for the basic mode Sync (#415) + ## [2.4.1] - 2024-08-02 ### Added diff --git a/cls/SourceControl/Git/Utils.cls b/cls/SourceControl/Git/Utils.cls index 4e55ff2f..3c201915 100644 --- a/cls/SourceControl/Git/Utils.cls +++ b/cls/SourceControl/Git/Utils.cls @@ -253,17 +253,8 @@ ClassMethod UserAction(InternalName As %String, MenuName As %String, ByRef Targe set Action = 7 quit $$$OK } elseif (menuItemName = "Sync") { - if ..CheckForUncommittedFiles() { - set Target = "Enter a commit message for the sync operation" - set Action = 7 - set Msg = ..PreSync() - } else { - set Target = "" - do ..Sync("",.Target) - if (Target '= "") { - set Action = 6 - } - } + set Action = 2 + externalBrowser + set Target = urlPrefix _ "/isc/studio/usertemplates/gitsourcecontrol/sync.csp?Namespace="_$NAMESPACE quit $$$OK } elseif (menuItemName = "Push") { @@ -1947,7 +1938,7 @@ ClassMethod GenerateCommitMessageFromFiles(filesWithActions) As %String set commitMsg = commitMsg_$LISTBUILD(oneFileMsg) } - quit $LISTTOSTRING(commitMsg, ",") + quit $LISTTOSTRING(commitMsg, ", ") } ClassMethod GitStatus(ByRef files, IncludeAllFiles = 0) diff --git a/csp/sync.csp b/csp/sync.csp new file mode 100644 index 00000000..78be9c2c --- /dev/null +++ b/csp/sync.csp @@ -0,0 +1,184 @@ + + + + + + + + + #(##class(SourceControl.Git.Utils).GetSourceControlInclude())# + + + + + set settings = ##class(SourceControl.Git.Settings).%New() + + set uncommittedWithAction = ##class(SourceControl.Git.Utils).UncommittedWithAction().%Get("user") + set commitMsg = ##class(SourceControl.Git.Utils).GenerateCommitMessageFromFiles(uncommittedWithAction) + set filesToSync = ($length(commitMsg) > 0) + set fileSectionDisplay = $select( + filesToSync = 1: "block", + 1: "none" + ) + set noFileDisplay = $select( + filesToSync = 0: "block", + 1: "none" + ) + + set outputDisplay = "none" + + + +
+

Sync Repository

+
+
+
+

Files to be committed with sync:

+
    + + set iterator = uncommittedWithAction.%GetIterator() + while iterator.%GetNext(,.uncommitted) { + set action = uncommitted.%Get("action") + set file = uncommitted.%Get("file") + &html<
  • #(..EscapeHTML(file))#
    • > + } +     +
+

Sync commit message:

+ +
+
+

No files to commit with sync

+
+

Sync details:

+

Upon syncing, the local repository will pull the changes from remote and commit the newest changes before committing and pushing

+ + + if settings.defaultMergeBranch '= "" { + &html<

Local changes will be merged with #(..EscapeHTML(settings.defaultMergeBranch))# after receiving the latest changes

> + } + + + +
+

Sync output:

+
+ 

+                        

+                    

+                

+            

+            
+        

+    
+    
+    
+
+
+
\ No newline at end of file
diff --git a/module.xml b/module.xml
index bca6ae6a..ea8274fd 100644
--- a/module.xml
+++ b/module.xml
@@ -27,6 +27,7 @@
       
       
       
+