Index: svn/StudioHook.cls.xml =================================================================== diff -u -r1545 -r1553 --- svn/StudioHook.cls.xml (.../StudioHook.cls.xml) (revision 1545) +++ svn/StudioHook.cls.xml (.../StudioHook.cls.xml) (revision 1553) @@ -196,12 +196,7 @@ set UpdateToVersion = $select(tMenu(2)["to head":"",1:0) do ..SubversionUpdate(.InternalName,.Action,.Target,.Msg,.Reload,UpdateToVersion) } elseif tMenu="getlatest" { - #dim Feedback As %CharacterStream = ..svnHelper.SubversionGetLatest() - Do Feedback.Rewind() - While 'Feedback.AtEnd - { - Write Feedback.ReadLine(),! - } + do ..svnHelper.SubversionGetLatest() } elseif tMenu="pre-commit" { do ..SubversionPreCommit(.InternalName,.Action,.Target,.Msg,.Reload) } elseif tMenu="check" { Index: svn/Helper.cls.xml =================================================================== diff -u -r1551 -r1553 --- svn/Helper.cls.xml (.../Helper.cls.xml) (revision 1551) +++ svn/Helper.cls.xml (.../Helper.cls.xml) (revision 1553) @@ -96,11 +96,11 @@ 1 - -%GlobalCharacterStream + +%Boolean - + %Boolean @@ -144,7 +144,7 @@ } Set SvnHelper = ##class(svn.Helper).%New() Do SvnHelper.VoerUitGetLatest() - If (SvnHelper.Failed.Count()>0){ + If (SvnHelper.GetLatestFailed){ Do SvnHelper.MailGefaaldeSvnCommands("GetLatest") }ElseIf(UitvoerenUnitTesten && SvnHelper.IsCodeVeranderd){ Do SvnHelper.VoerUitUnitTesten() @@ -165,8 +165,7 @@ 1 0 { - #dim FeedbackStream As %CharacterStream = ..GeefFailedCharacterStream(Actie) - + #dim FeedbackStream As %CharacterStream = ..GeefFailedCharacterStream(Actie) #dim ServerNaam As %String = ##class(TECH.Context.RuntimeContext).Instance().GeefServerNaam() #dim Namespace As %String = ##class(TECH.Context.RuntimeContext).Instance().GeefNamespace() #dim From As %String = $$$SystemMail(ServerNaam_" - Subversion") @@ -319,7 +317,7 @@ } if ImportUitvoeren { - Do ..Feedback.WriteLine("Importing "_InternalName) + w "Importing "_InternalName,! do ..Import(Filename) do ##class(svn.SourceCodeInfo).Update(InternalName,Filename) } @@ -329,7 +327,7 @@ } } else { - Do ..Feedback.WriteLine("Skipping : "_Filename) + w "Skipping : "_Filename,! } } ]]> @@ -1074,13 +1072,6 @@ elseif ..MatchesWildCard(InternalName,"csp.svn*") { set result = 1 } elseif InternalName["svnSynchro" { set result = 1 } - /* - if ..MatchesWildCard(InternalName,"kutac*") { set result = 1 } - elseif ..MatchesWildCard(InternalName,"SyncTool*") { set result = 1 } - elseif ..MatchesWildCard(InternalName,"/csp/SourceControl*") { set result = 1 } - elseif ..MatchesWildCard(InternalName,"SourceControl*") { set result = 1 } - */ - quit result ]]> @@ -1262,13 +1253,18 @@ - -Actie:%String="" -%GlobalCharacterStream +Actie:%String +%CharacterStream %Status -%CharacterStream 1 @@ -1953,7 +1930,7 @@ performs results display and post processing (if desired) pCmd:svn.Command -%CharacterStream +%Boolean 0 { - If ..Debug Do ..Feedback.WriteLine("SubCommand: "_pCmd.SubCommand_" & Reload = "_+pCmd.Reload) + If ..Debug w "SubCommand: "_pCmd.SubCommand_" & Reload = "_+pCmd.Reload,! if pCmd.SubCommand="checkout" { // checkout returns full external name - with path set i="" set tCmdResult=pCmd.Results.GetNext(.i) - If ..Debug Do ..Feedback.WriteLine("tCmdResult:"_tCmdResult_" -> "_tCmdResult.Action_"---> "_pCmd.Results.GetNext(.i)) + If ..Debug w "tCmdResult:"_tCmdResult_" -> "_tCmdResult.Action_"---> "_pCmd.Results.GetNext(.i),! while tCmdResult'=$$$NULLOREF { if tCmdResult.Action="A" { Do ..SVNImport(tCmdResult.ExternalName) - Do ..Feedback.WriteLine(" *** Studio HINT: please make sure you add this file into your copy of project!") + w " *** Studio HINT: please make sure you add this file into your copy of project!",! } elseif tCmdResult.Action="D" { set tIName=..InternalName(tCmdResult.ExternalName) if ..HasToBeSynchronized(tIName) do ..DeleteCode(tIName) @@ -1993,7 +1970,7 @@ // +DK 1.21 } elseif (pCmd.SubCommand="update")&(pCmd.Reload) { // update returns only external name without path - If ..Debug Do ..Feedback.WriteLine("Updating.. "_pCmd.SubCommand) + If ..Debug w "Updating.. "_pCmd.SubCommand,! set i="" set tCmdResult=pCmd.Results.GetNext(.i) while tCmdResult'=$$$NULLOREF { // +DK 1.21, DK 2.11 (G option)