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 @@
 <XData name="Menu">
 <Data><![CDATA[
 <MenuBase>
-<Menu Name = "Subversion2" Type = "0">
-<MenuItem Name="Project Status"/>
-<MenuItem Name="Project Update (HEAD)"/>
-<MenuItem Name="Project Commit"/>
-<MenuItem Separator="1" Name="----------------------------------"/> 
-<MenuItem Name="TortoiseSVN Log" />
-<MenuItem Name="TortoiseSVN Status" />
-<MenuItem Name="TortoiseSVN Commit" />
-<MenuItem Separator="1" Name="----------------------------------"/> 
-<MenuItem Name="TortoiseSVN Browse repository" />
-<MenuItem Name="TortoiseSVN Merge (!)" />
-<MenuItem Separator="1" Name="----------------------------------"/>
-<MenuItem Name="Source Control Code Update" />
-<MenuItem Separator="1" Name="----------------------------------"/> 
-</Menu>
 <Menu Name = "Subversion" Type="0">
 <MenuItem Name="GetLatest" />
 <MenuItem Name="Reload File" />
@@ -97,6 +82,9 @@
 <MenuItem Separator="1" Name="----------------------------------"/> 
 <MenuItem Name="Settings"/>
 <MenuItem Name="Dump Settings" />
+<MenuItem Separator="1" Name="----------------------------------"/> 
+<MenuItem Name="Source Control Code Update" />
+<MenuItem Separator="1" Name="----------------------------------"/> 
 </Menu>
 </MenuBase>
 ]]></Data>
@@ -147,7 +135,7 @@
 <FormalSpec><![CDATA[Type:%Integer,Name:%String,InternalName:%String,SelectedText:%String,&Action:%String,&Target:%String,&Msg:%String,&Reload:%Boolean]]></FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	if ..Debug Write !,"Method 'UserAction' Type:"_Type_" Name:"_Name_" InternalName:"_InternalName_" SelectedText:"_SelectedText_" Action:"_Action_" Target:"_Target_" Msg:"_Msg_" Reload:"_Reload
+	if ..Debug write !,"Method 'UserAction' Type:"_Type_" Name:"_Name_" InternalName:"_InternalName_" SelectedText:"_SelectedText_" Action:"_Action_" Target:"_Target_" Msg:"_Msg_" Reload:"_Reload
 	#dim tCmd as svn.Command
 	set tIsPopupMenu=$zcvt($p(Name,",",1),"L")["integration"
 	set tMenu=$zcvt($p($p(Name,",",2)," ",1),"L")
@@ -252,7 +240,7 @@
 <FormalSpec><![CDATA[&InternalName:%String,&Action:%String,&Target:%String,&Msg:%String,&Reload:%Boolean,&tCmd:svn.Command,tMenu:%String]]></FormalSpec>
 <Implementation><![CDATA[
 	set Action=0
-	set tCmd=##class(svn.Command).%New($lb(Helper.LocalWorkspacePath(..svnHelper.Branch)))
+	set tCmd=##class(svn.Command).%New($lb(..svnHelper.LocalWorkspacePath(..svnHelper.Branch)))
 	set tCmd.File=..ProjectNameModified
 	set tCmd.InternalName=tCmd.File		
 	if (tMenu(2) [ "commit") do ..SubversionProjectCommit(.InternalName,.Action,.Target,.Msg,.Reload,.tCmd)
@@ -858,35 +846,16 @@
 	if ..Debug Write !,"Method 'OnAfterLoad' InternalName:"_InternalName
 	#dim tCmd as svn.Command
 	
-	if ..svnHelper.HasToBeSynchronized(InternalName) {
+	set Repository = ..svnHelper.GeefRepository(InternalName)
 	
-		set tCmd=##class(svn.Command).%New($lb(..svnHelper.LocalWorkspacePath(..svnHelper.Branch)))
-		set tCmd.SubCommand="status"
-		do tCmd.Options.SetAt("","-u")
-		do tCmd.Options.SetAt("","-v")
-		if ..svnHelper.PassCredentials do tCmd.GlobalOptions.SetAt(..Name,"--username"),tCmd.GlobalOptions.SetAt(..Password,"--password") 
-		set tCmd.File=..svnHelper.ExternalName(InternalName,$$$FULLPATH)
-		do tCmd.Execute()
-		set tIsDisconnected=..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...
-			//write !," *** Studio: HINT: you may need to 'svn update' your item now, check text above...",!
-		} else {
-			write !," *** Studio: your're disconnected from "_..#PRODUCT_", you can't update from repository"	
-		}
+	if $IsObject(Repository) {
+		do Repository.Status(InternalName)
+	}
 	
-		// Additional processing for projects
-	
-		// FMA Early quit to disable most project handling
-		if ##class(TECH.SourceCodeUtils).Type(InternalName)="project" {
-			set ..ProjectNameOriginal=$p(InternalName,".",1)
-			//set ..ProjectNameModified=$tr($p(InternalName,".",1)," ","_")
-			set ..ProjectNameModified = ..svnHelper.ExternalName(InternalName,$$$FULLPATH)
-			// FMA quick hack to trigger auto-update and never auto-commit below
-			set ..IsNewProject=0
-		}
+	if ##class(TECH.SourceCodeUtils).Type(InternalName)="project" {
+		set ..ProjectNameOriginal=$p(InternalName,".",1)
+		set ..ProjectNameModified = ..svnHelper.ExternalName(InternalName,$$$FULLPATH)
+		set ..IsNewProject=0
 	}
 	
 	Quit $$$OK
@@ -956,6 +925,9 @@
 <FormalSpec>InternalName:%String</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+	
+	write "InternalName : "_InternalName ,!
+	
 	// item deleted
 	Set tFile = ..DeleteFromSVN(InternalName)
 	Do ..DeleteEmptyDirectory(tFile)
@@ -1067,7 +1039,7 @@
 <FormalSpec>InternalName:%String</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	set ExternalName=..svnHelper.ExternalName(InternalName)
+	set ExternalName=..svnHelper.GeefRepository(InternalName).ExternalName(InternalName)
 	quit ##class(svn.SourceCodeInfo).Create(InternalName,ExternalName)
 ]]></Implementation>
 </Method>
@@ -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) 
 	}