Index: svn/StudioHook.cls.xml
===================================================================
diff -u -r1539 -r1545
--- svn/StudioHook.cls.xml (.../StudioHook.cls.xml) (revision 1539)
+++ svn/StudioHook.cls.xml (.../StudioHook.cls.xml) (revision 1545)
@@ -196,7 +196,12 @@
set UpdateToVersion = $select(tMenu(2)["to head":"",1:0)
do ..SubversionUpdate(.InternalName,.Action,.Target,.Msg,.Reload,UpdateToVersion)
} elseif tMenu="getlatest" {
- do ..SubversionGetLatest()
+ #dim Feedback As %CharacterStream = ..svnHelper.SubversionGetLatest()
+ Do Feedback.Rewind()
+ While 'Feedback.AtEnd
+ {
+ Write Feedback.ReadLine(),!
+ }
} elseif tMenu="pre-commit" {
do ..SubversionPreCommit(.InternalName,.Action,.Target,.Msg,.Reload)
} elseif tMenu="check" {
@@ -259,7 +264,7 @@
if (tMenu(2) [ "status") do ..SubversionProjectStatus(.InternalName,.Action,.Target,.Msg,.Reload,.tCmd)
if (tMenu(2) [ "update") do ..SubversionProjectUpdate(.InternalName,.Action,.Target,.Msg,.Reload,.tCmd)
do tCmd.Execute()
- set tSC=..PostProcessing(tCmd)
+ Set ..IsDisconnected =..svnHelper.PostProcessing(tCmd)
]]>
@@ -561,95 +566,6 @@
]]>
-
-
-
-
-
-
-performs results display and post processing (if desired)
-pCmd:svn.Command
-%Status
-0 {
- If ..Debug write "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 w !,"tCmdResult:",tCmdResult," -> ",tCmdResult.Action , "---> ", pCmd.Results.GetNext(.i)
- while tCmdResult'=$$$NULLOREF {
- if tCmdResult.Action="A" {
- set tSC=..svnHelper.SVNImport(tCmdResult.ExternalName)
- w " *** Studio HINT: please make sure you add this file into your copy of project!",!
- } elseif tCmdResult.Action="D" {
- set tIName=..svnHelper.InternalName(tCmdResult.ExternalName)
- if ..svnHelper.HasToBeSynchronized(tIName) do ..svnHelper.DeleteCode(tIName)
- } else {
- // other actions here?
- }
- set tCmdResult=pCmd.Results.GetNext(.i)
- }
- // +DK 1.21
- } elseif (pCmd.SubCommand="update")&(pCmd.Reload) {
- // update returns only external name without path
- 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)
-
- if (tCmdResult.Action="A")||(tCmdResult.Action="U")||(tCmdResult.Action="G") {
- set tFile=tCmdResult.ExternalName
- if $length(tFile) set tSC=..svnHelper.SVNImport(tFile)
- } elseif (tCmdResult.Action="D") {
- set tIName=..svnHelper.InternalName(tCmdResult.ExternalName)
- if ..svnHelper.HasToBeSynchronized(tIName) do ..svnHelper.DeleteCode(tIName)
- } elseif (tCmdResult.Action="S")||(tCmdResult.Action="C") {
- set $$$SVNGlobal("SourceControl",$$$PRODUCT,"HasConflicts")=1
- set tIName=..svnHelper.InternalName(tCmdResult.ExternalName)
- do ..svnHelper.Failed.Insert(tIName_" (Conflict)")
- }
- set tCmdResult=pCmd.Results.GetNext(.i)
- }
- } else {
-
- // other commands?
- }
- // -DK 1.21
- }
-
- // Compile wat nodig is (sourcecode die via importcode is ingeladen
-
- if (..svnHelper.ExecCompile && ( ..svnHelper.Failed.Count() = 0 )) {
- Do ..svnHelper.CompileImportedSourceCode()
- }
-
- set ..IsDisconnected=pCmd.IsDisconnected
- // clean-up
- if 'pCmd.Log set tSC=pCmd.%DeleteId(pCmd.%Id())
-
- quit tSC
-]]>
-
-
@@ -1039,7 +873,7 @@
set tCmd.File=..svnHelper.ExternalName(InternalName,$$$FULLPATH)
do tCmd.Execute()
set tIsDisconnected=..IsDisconnected
- set tSC=..PostProcessing(tCmd) // postprocessing may reset IsDisconnected!
+ set tSC=..svnHelper.PostProcessing(tCmd) // postprocessing may reset IsDisconnected!
set ..IsDisconnected=tIsDisconnected
if '..IsDisconnected {
// FMA no need for a SVN tutorial all the time...
@@ -1210,7 +1044,9 @@
set tCmd.SubCommand="commit"
do tCmd.Options.SetAt("deleted by user","-m")
do tCmd.Execute()
- if 'isDirectory do ..PostProcessing(tCmd)
+ if 'isDirectory {
+ Set ..IsDisconnected = ..svnHelper.PostProcessing(tCmd)
+ }
} else {
write !," *** Studio: please commit to propagate deletion to repository. ***"
}