Index: svn/Repository/CodeRepository.cls.xml =================================================================== diff -u --- svn/Repository/CodeRepository.cls.xml (revision 0) +++ svn/Repository/CodeRepository.cls.xml (revision 1570) @@ -0,0 +1,263 @@ + + + +svn.Repository + + +ExternalName:%String +%String + + + + +InternalName:%String,FullPath:%Boolean=1 +%String + + + + +InternalName:%String +%Status + "_ExternalName, ! + } + + do ##class(svn.SourceCodeInfo).Update(InternalName,ExternalName) + + + + quit +]]> + + + +InternalName + + + + +InternalName:%String +%Boolean + + + + +ExternalName:%String +%Status + + + + +ExternalName:%String,InternalName:%String="" + + + + +ExternalName:%String + + + + +ExternalName:%String,InternalName:%String + + + + + +%Status +")&&(Line["") + continue:$$$StartsWith(Line,"")&&(Line["") + continue:$$$StartsWith(Line,"" + #endif + do File.WriteLine(Line) + } + + do File.SaveStream() + + quit Status +]]> + + + + +%Status + + + + +%Library.CacheStorage + + + + + Index: vhUnitTest/Manager.cls.xml =================================================================== diff -u --- vhUnitTest/Manager.cls.xml (revision 0) +++ vhUnitTest/Manager.cls.xml (revision 1570) @@ -0,0 +1,10 @@ + + + + +1 +Tools.UnitTest.Manager + + + + Index: svn/StudioHook.cls.xml =================================================================== diff -u -r1553 -r1570 --- svn/StudioHook.cls.xml (.../StudioHook.cls.xml) (revision 1553) +++ svn/StudioHook.cls.xml (.../StudioHook.cls.xml) (revision 1570) @@ -74,21 +74,6 @@ - - - - - - - - - - - - - - - @@ -97,6 +82,9 @@ + + + ]]> @@ -147,7 +135,7 @@ %Status InternalName:%String %Status InternalName:%String %Status @@ -1079,7 +1051,7 @@ set Status = $$$OK if $IsObject(Object) { - set ExternalName=..svnHelper.ExternalName(InternalName) + set ExternalName=..svnHelper.GeefRepository(InternalName).ExternalName(InternalName) Set Status = ##class(svn.SourceCodeInfo).Create(InternalName,ExternalName) } Index: svn/Setting.cls.xml =================================================================== diff -u --- svn/Setting.cls.xml (revision 0) +++ svn/Setting.cls.xml (revision 1570) @@ -0,0 +1,102 @@ + + + +svn +%RegisteredObject + + +1 + + + + +1 +%Boolean + + + + +1 +MagUitvoeren:%Boolean + + + + +1 +MagUitvoeren:%Boolean + + + + +1 +%Boolean + + + + +1 +%Boolean + + + + +IsBezig:%Boolean +%Status + + + + +1 +%Boolean + + + + +1 +ChangeSourceControl:%Boolean + + + + +1 +%Boolean + + + + +1 +%Boolean + + + + +1 +%Boolean + + + + +1 +Conflict:%Boolean +%Boolean + + + + + + Index: vhUnitTest/svn/Helper.cls.xml =================================================================== diff -u --- vhUnitTest/svn/Helper.cls.xml (revision 0) +++ vhUnitTest/svn/Helper.cls.xml (revision 1570) @@ -0,0 +1,8 @@ + + + +vhUnitTest.TestCase + + + + Index: svn/Repository/CSPRepository.cls.xml =================================================================== diff -u --- svn/Repository/CSPRepository.cls.xml (revision 0) +++ svn/Repository/CSPRepository.cls.xml (revision 1570) @@ -0,0 +1,74 @@ + + + +svn.Repository + + +%String + + + +InternalName + + + + +InternalName:%String +%Boolean + + + + +InternalName:%String +%String + + + + +ExternalName:%String +%String + + + + +%Library.CacheStorage +CSPRepositoryDefaultData + +listnode +"CSPRepository" + +Application + + + + + + + Index: vhUnitTest/svn/Repository/CodeRepository.cls.xml =================================================================== diff -u --- vhUnitTest/svn/Repository/CodeRepository.cls.xml (revision 0) +++ vhUnitTest/svn/Repository/CodeRepository.cls.xml (revision 1570) @@ -0,0 +1,78 @@ + + + +vhUnitTest.TestCase + + + + + + + + + + + + + + + + Index: svn/Helper.cls.xml =================================================================== diff -u -r1567 -r1570 --- svn/Helper.cls.xml (.../Helper.cls.xml) (revision 1567) +++ svn/Helper.cls.xml (.../Helper.cls.xml) (revision 1570) @@ -17,12 +17,6 @@ - - -Product name, e.g. VSS, ClearCase, CVS, etc.. -SVN - - svn.CompileList @@ -43,40 +37,6 @@ - -%String - - - - -%String - - - - -%String - - - - -%String - - - - - -this indicates the branch name, default is trunk -%String -1 - - - - -%String -1 - - - %Boolean @@ -92,7 +52,7 @@ %Boolean -1 +1 1 @@ -116,33 +76,32 @@ 1 - -1 - - - - -1 -%Boolean - - - - -1 -%Boolean - - - - -IsBezig:%Boolean -1 -%Status + +1 +Path:%String,WorkSpacePath:%String @@ -229,35 +188,6 @@ ]]> - - -!!!! Path and WorkSpacePath are case sensitive -1 -Path:%String,WorkSpacePath:%String - - - iPath:%String %String @@ -286,172 +216,6 @@ ]]> - -InternalName -%Status - "_ExternalName, ! - } - - do ##class(svn.SourceCodeInfo).Update(InternalName,ExternalName) - } - else { - - write "Skipping : "_InternalName - } - - quit -]]> - - - -Filename:%String - - - - -InternalName:%String,isDirectory:%Boolean=0,flagDeleteCode:%Boolean=1 -%String - - - - -tFile:%String -%Status - - - rset:%ResultSet 1 @@ -466,72 +230,6 @@ ]]> - -InternalName - - - - -InternalName -1 - - - - -InternalName -%Boolean - - - flagRecompile:%Boolean=0 - -InternalName -%Boolean - - - - - -accessor method for LocalWorspacePath property -pBranch:%String="" -%String - - - - -pBranch:%String="" -%String - - - - -pBranch:%String="" -%String - - - - -JBL + set path to a good format +1 Path:%String="" %String - - -Convert the internal name, e.g. TEST.MAC to an external name that is used to export -the routine/class/csp item. This is often a filename to write the file out to. -InternalName:%String,FullPath:%Boolean=1 -%String - - - - -\package\classname.cls.xml to an internal name that is used to import -the routine/class/csp item. ]]> -ExternalName:%String,LocalWorkSpacePath:%String="" -%String - - - - -%String - - - %ListOfDataTypes - -%ListOfObjects - - - +1 InternalName %String - -Horolog1,Horolog2 -1 -%Boolean - - - - -InternalName -%Boolean - - - - -InternalName -%Boolean - - - - -ExternalName -%Boolean - - - - -InternalName -%Boolean - - - - + -Delete is nodig wanneer code nog bestaat in database maar niet meer op het filesysteem en -als er in de database een import/export historiek bestaat. +check if a SourceFile needs to be synchronized if so add it to the module persistent data InternalName -%Boolean - - -InternalName:%String - - - - -InternalName -1 -svn.SyncStatus - - - - - - - - -InternalName -%Boolean - - - - -Input:%String,WildCard:%String -0 - - - - -InternalName -%Boolean - - - - -WildCard:%String,StartWith:%String - - - helper function to create intermediate directory when needed @@ -1173,138 +388,13 @@ ]]> - - -accessor method for LocalWorspaceRoot property -%String - - - - - -accessor method for LocalWorspaceRoot property -%String - - - - - -accessor method for LocalWorspaceRoot property -%String - - - - - -accessor method for RepositoryRoot property -this method automatically adds NAMESPACE to the repository root -%String - - - - - -DK 2.10 -%Boolean - - - - -pBranch:%String="" -%String - - - - - - - - -%Boolean - - - - -%Boolean - - - Actie:%String="" @@ -1351,448 +441,37 @@ ]]> - -%String + +InternalName - - - -%String - - - - -ExternalName,InternalName - - - - - -%Status - - - - - -%Status -")&&(Line["") - continue:$$$StartsWith(Line,"")&&(Line["") - continue:$$$StartsWith(Line,"" - #endif - do File.WriteLine(Line) - } - - do File.SaveStream() - - quit Status -]]> - - - - -%Status - - - - -ExternalName:%String -%Status - - - - -ExternalName:%String,InternalName:%String="" -%Status - - - - -ExternalName:%String,InternalName:%String="" - - - - -ExternalName:%String - - - - - -1 set Hash=$system.Encryption.MD5Encode(Hash) - #else - Set Hash=$system.Encryption.SHA1HashStream(Stream) - #endif - - if flagIsTempFile { - do ##class(%File).Delete(ExternalName) - } - - quit Hash -]]> - - - - - -InternalName:%String -%String + +InternalName - - - -Path:%String - - - - - - - - - - -Revisions...:%String -%ListOfDataTypes - 0) - { - if ResultInfo.Action = "D" { - if ##class(TECH.SourceCodeUtils).Type(InternalName) = "other" { - do ..RemovePackageFromArray(arrFiles,InternalName) - } - do arrFiles.RemoveAt(InternalName) - } - else { do arrFiles.SetAt(InternalName,InternalName) } - } - Else - { - w "Geen interne klasse gevonden voor "_ResultInfo.ExternalName,! - } - } - } - } - - Kill ^oddPROJECT(..#svn2FilebridgeProjectname) - - set Project = ##class(%Studio.Project).%New() - set Project.Name = ..#svn2FilebridgeProjectname - - set itFiles = ##class(TECH.ListIterator).%New(arrFiles) - while itFiles.HasNext() { - set InternalName = itFiles.Next() - set Extension = $zconvert($piece(InternalName,".",$length(InternalName,".")),"l") - if ##class(TECH.SourceCodeUtils).Type(InternalName) = "class" { - set InternalName = $piece(InternalName,".",1,$length(InternalName,".")-1) - - } - if Extension="inc" set Extension="mac" - set scAddItem = Project.AddItem(InternalName,Extension) - } - - write Project.%Save() - - quit -]]> - - arrInternalNames:%ArrayOfDataTypes,Package:%String - -InternalName:%String -%Boolean - - - - - - - - - - - - - 0 { - write ! - set itExternalNames = ##class(TECH.ListIterator).%New(listExternalNames) - while itExternalNames.HasNext() { - set ExternalName = itExternalNames.Next() - write ExternalName,! - do ..SVNImport(ExternalName) - } - do ..CompileImportedSourceCode() - } -]]> - - 1 0) - do ..Failed.Clear() - } + if '..IsGetLatestGefaald { + if ..ToCompile.List.Count() { + w !!,"Hercompilatie voorgaande fouten",! + do ..CompileImportedSourceCode(1) + Do ..ShowFailed("Hercompilatie bij GetLatest") + set ..IsGetLatestGefaald = (..Failed.Count()>0) + do ..Failed.Clear() } + } - if '..IsGetLatestGefaald { - w !,"Starting deploy classes",! - do ##class(svn.Deploy).Run() - w "Deploy classes finished",! - } - } + if '..IsGetLatestGefaald { + w !,"Starting deploy classes",! + do ##class(svn.Deploy).Run() + w "Deploy classes finished",! } ]]> - - -performs results display and post processing (if desired) -pCmd:svn.Command + +1 %Boolean + + + +1 +%Boolean +0 { - 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 w "tCmdResult:"_tCmdResult_" -> "_tCmdResult.Action_"---> "_pCmd.Results.GetNext(.i),! - while tCmdResult'=$$$NULLOREF { - if tCmdResult.Action="A" { - Do ..SVNImport(tCmdResult.ExternalName) - 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) - } 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) Do ..SVNImport(tFile) - } elseif (tCmdResult.Action="D") { - set tIName=..InternalName(tCmdResult.ExternalName) - if ..HasToBeSynchronized(tIName) do ..DeleteCode(tIName) - } elseif (tCmdResult.Action="S")||(tCmdResult.Action="C") { - set $$$SVNGlobal("SourceControl",$$$PRODUCT,"HasConflicts")=1 - set tIName=..InternalName(tCmdResult.ExternalName) - do ..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 + quit WerktOffline +]]> + + + +InternalName:%String +svn.Repository + Index: svn/Repository/FileRepository.cls.xml =================================================================== diff -u --- svn/Repository/FileRepository.cls.xml (revision 0) +++ svn/Repository/FileRepository.cls.xml (revision 1570) @@ -0,0 +1,21 @@ + + + +svn.Repository + + +InternalName:%String +%Boolean + + + + +InternalName:%String + + + + + + Index: vhUnitTest/svn/Repository/CSPRepository.cls.xml =================================================================== diff -u --- vhUnitTest/svn/Repository/CSPRepository.cls.xml (revision 0) +++ vhUnitTest/svn/Repository/CSPRepository.cls.xml (revision 1570) @@ -0,0 +1,58 @@ + + + +vhUnitTest.TestCase + + + + + + + + + + + + + + + + Index: svn/SourceCodeInfo.cls.xml =================================================================== diff -u -r1517 -r1570 --- svn/SourceCodeInfo.cls.xml (.../SourceCodeInfo.cls.xml) (revision 1517) +++ svn/SourceCodeInfo.cls.xml (.../SourceCodeInfo.cls.xml) (revision 1570) @@ -96,11 +96,12 @@ + + +1 + +0 +Tools.UnitTest.Report +3 + + + + Index: vhUnitTest/TestCase.cls.xml =================================================================== diff -u --- vhUnitTest/TestCase.cls.xml (revision 0) +++ vhUnitTest/TestCase.cls.xml (revision 1570) @@ -0,0 +1,10 @@ + + + + +1 +Tools.UnitTest.TestCase + + + + Index: svn/Repository.cls.xml =================================================================== diff -u --- svn/Repository.cls.xml (revision 0) +++ svn/Repository.cls.xml (revision 1570) @@ -0,0 +1,352 @@ + + + +persistent +svn +TECH.Persistent + + +%String + + + +%String + + + +%Boolean +1 + + + +%String +list + + + +%String +list + + + +Revision:%String="" + + + + +InternalName:%String + + + + +svnCommand:svn.Command +0 { + if ##class(svn.Setting).Debug() w "SubCommand: "_svnCommand.SubCommand_" & Reload = "_+svnCommand.Reload,! + if svnCommand.SubCommand="checkout" { + // checkout returns full external name - with path + set i="" set tCmdResult=svnCommand.Results.GetNext(.i) + If ##class(svn.Setting).Debug() w "tCmdResult:"_tCmdResult_" -> "_tCmdResult.Action_"---> "_svnCommand.Results.GetNext(.i),! + while tCmdResult'=$$$NULLOREF { + if tCmdResult.Action="A" { + Do ..SVNImport(tCmdResult.ExternalName) + 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) + } else { + } + set tCmdResult=svnCommand.Results.GetNext(.i) + } + } elseif (svnCommand.SubCommand="update")&(svnCommand.Reload) { + // update returns only external name without path + If ##class(svn.Setting).Debug() w "Updating.. "_svnCommand.SubCommand,! + set i="" set tCmdResult=svnCommand.Results.GetNext(.i) + while tCmdResult'=$$$NULLOREF { + if (tCmdResult.Action="A")||(tCmdResult.Action="U")||(tCmdResult.Action="G") { + set tFile=tCmdResult.ExternalName + if $length(tFile) Do ..SVNImport(tFile) + } elseif (tCmdResult.Action="D") { + set tIName=..InternalName(tCmdResult.ExternalName) + if ..HasToBeSynchronized(tIName) do ..DeleteCode(tIName) + } elseif (tCmdResult.Action="S")||(tCmdResult.Action="C") { + set $$$SVNGlobal("SourceControl","SVN","HasConflicts")=1 + set tIName=..InternalName(tCmdResult.ExternalName) + do ..Failed.Insert(tIName_" (Conflict)") + } + set tCmdResult=svnCommand.Results.GetNext(.i) + } + } else { + + } + } +]]> + + + +pBranch:%String="" +%String + + + + +InternalName:%String +%Boolean + + + + +InternalName +%Boolean + + + + +1 +ExternalName:%String +%String + + + +1 +InternalName:%String +%String + + + +InternalName + + + +InternalName +1 + + + + +Filename:%String + + + + +ExternalName:%String +%Status + + + +iPath:%String +%String + + + + +InternalName:%String +%Boolean + + + + +InternalName:%String +%String + + + + +%Library.CacheStorage +^svn.RepositoryD +RepositoryDefaultData +^svn.RepositoryD +^svn.RepositoryI +^svn.RepositoryS + +listnode + + +%%CLASSNAME + + +Path + + +Branch + + +ChangeSourceControl + + +IsCodeVeranderd + + +Failed + + +ToCompile + + + + + + +