@@ -349,14 +349,14 @@ ClassMethod SwitchBranch(targetBranchName As %String) As %Status
349
349
350
350
ClassMethod PreSync () As %String
351
351
{
352
- set uncommittedFilesWithAction = ##class (SourceControl.Git.WebUIDriver ).UncommittedWithAction ().%Get (" current user's changes " )
352
+ set uncommittedFilesWithAction = ##class (SourceControl.Git.WebUIDriver ).UncommittedWithAction ().%Get (" user" )
353
353
quit ..GenerateCommitMessageFromFiles (uncommittedFilesWithAction )
354
354
}
355
355
356
356
/// Commits all the files as needed by the Sync operation
357
357
ClassMethod SyncCommit (Msg As %String ) As %Status
358
358
{
359
- set uncommittedFilesWithAction = ##class (SourceControl.Git.WebUIDriver ).UncommittedWithAction ().%Get (" current user's changes " )
359
+ set uncommittedFilesWithAction = ##class (SourceControl.Git.WebUIDriver ).UncommittedWithAction ().%Get (" user" )
360
360
set username = ..GitUserName ()
361
361
set email = ..GitUserEmail ()
362
362
set author = username _" <" _email _" >"
@@ -370,7 +370,7 @@ ClassMethod SyncCommit(Msg As %String) As %Status
370
370
/// Goes through all the added files and stages them
371
371
ClassMethod StageAddedFiles ()
372
372
{
373
- set uncommittedFilesWithAction = ##class (SourceControl.Git.WebUIDriver ).UncommittedWithAction ().%Get (" current user's changes " )
373
+ set uncommittedFilesWithAction = ##class (SourceControl.Git.WebUIDriver ).UncommittedWithAction ().%Get (" user" )
374
374
set iterator = uncommittedFilesWithAction .%GetIterator ()
375
375
while iterator .%GetNext (,.value ,) {
376
376
set file = value .%Get (" file" )
@@ -1570,7 +1570,7 @@ ClassMethod RunGitCommand(command As %String, Output errStream, Output outStream
1570
1570
ClassMethod RunGitCommandWithInput (command As %String , inFile As %String = " " , Output errStream , Output outStream , args ...) As %Integer
1571
1571
{
1572
1572
// Special case: git --version is used internally even when the settings incorporated here may be invalid/unspecified.
1573
- if (command '= " --version" ) && ( command '= " remote " ) {
1573
+ if (command '= " --version" ) {
1574
1574
set newArgs ($increment (newArgs )) = " -C"
1575
1575
set newArgs ($increment (newArgs )) = ..TempFolder ()
1576
1576
@@ -1639,18 +1639,19 @@ ClassMethod GenerateCommitMessageFromFiles(filesWithActions) As %String
1639
1639
set action = value .%Get (" action" )
1640
1640
set file = value .%Get (" file" )
1641
1641
1642
+ set oneFileMsg = $Case (action ,
1643
+ " A" :" added" ,
1644
+ " M" : " modified" ,
1645
+ " D" : " deleted" ,
1646
+ " R" : " renamed" ,
1647
+ " U" : " updated" ,
1648
+ : " ???"
1649
+ )_ " " _file
1642
1650
1643
- if action = " A" {
1644
- set commitMsg = commitMsg _ " added " _ file _ " , "
1645
- } elseif action = " M" {
1646
- set commitMsg = commitMsg _ " modified " _ file _ " , "
1647
- } elseif action = " D" {
1648
- set commitMsg = commitMsg _ " deleted " _ file _ " , "
1649
- } elseif action = " R" {
1650
- set commitMsg = commitMsg _ " renamed " _ file _ " , "
1651
- }
1651
+ set commitMsg = commitMsg _$LISTBUILD (oneFileMsg )
1652
+
1652
1653
}
1653
- quit commitMsg
1654
+ quit $LISTTOSTRING ( commitMsg , " , " )
1654
1655
}
1655
1656
1656
1657
ClassMethod GitStatus (ByRef files , IncludeAllFiles = 0 )
0 commit comments