--- a/PerforceSourceCodeManager.st	Mon Jun 10 09:04:01 2013 +0000
+++ b/PerforceSourceCodeManager.st	Thu Jun 13 17:25:01 2013 +0200
@@ -432,16 +432,17 @@
 !
 
 savePreferencesOn:aStream
+
     aStream nextPutLine:'PerforceSourceCodeManager notNil ifTrue:['.
     self repositoryInfoPerModule notEmptyOrNil ifTrue:[
-        aStream nextPutLine:'    PerforceSourceCodeManager repositoryInfoPerModule:' , self repositoryInfoPerModule storeString , '.'.
+	aStream nextPutLine:'    PerforceSourceCodeManager repositoryInfoPerModule:' , self repositoryInfoPerModule storeString , '.'.
     ].
     PerforceExecutable notNil ifTrue:[
-        aStream nextPutLine:'    PerforceSourceCodeManager perforceExecutable:' , PerforceExecutable storeString , '.'.
+	aStream nextPutLine:'    PerforceSourceCodeManager perforceExecutable:' , PerforceExecutable storeString , '.'.
     ].
+    aStream nextPutLine:'    PerforceSourceCodeManager repositoryName:' , self getPerforceDefaultSettingsString storeString, '.'.
     (Smalltalk at:#SourceCodeManager) == self ifTrue:[
-        aStream nextPutLine:'    Smalltalk at:#SourceCodeManager put: PerforceSourceCodeManager.'.
-        aStream nextPutLine:'    PerforceSourceCodeManager initializeForRepository:' , self repositoryName storeString , '.'.
+	aStream nextPutLine:'    Smalltalk at:#SourceCodeManager put: PerforceSourceCodeManager.'.
     ].
     aStream nextPutLine:'].'.
 !
@@ -897,14 +898,16 @@
 
     workSpace := self getWorkSpaceForPackage:(checkInDefinition packageString).
     workSpace isNil ifTrue:[
-        ('PerforceSourceCodeManager [error]: failed to create workspace for', checkInDefinition fileName)  errorPrintCR.
-        ^ nil
+	('PerforceSourceCodeManager [error]: failed to create workspace for', checkInDefinition fileName)  errorPrintCR.
+	^ nil
     ].
+
+    checkInDefinition workSpace:workSpace.
     self perforceError handle:[:ex|
-        self reportError:ex description.
-        ex proceed.
+	self reportError:ex description.
+	ex proceed.
     ] do:[
-        ^workSpace streamFor:checkInDefinition revision:revision cache:doCache.
+	^workSpace streamFor:checkInDefinition revision:revision cache:doCache.
     ].
     ^nil
 !
@@ -973,6 +976,26 @@
     ^checkInDefinition
 !
 
+moduleFromContainerPath:containerPath forPackage:packageID
+    "given a full path as in an RCS header, extract the module."
+
+    | realPackageID|
+
+    realPackageID := PackageId from:packageID.
+    realPackageID isNil ifTrue:[
+	^nil
+    ].
+    ^ realPackageID module
+
+
+    "
+     SourceCodeManager moduleFromContainerPath:'/files/CVS/stx/libbasic/Array.st' forPackage:Array package
+    "
+
+    "Created: / 25.11.1995 / 18:42:20 / cg"
+    "Modified: / 11.8.1998 / 23:01:24 / cg"
+!
+
 postCheckInClass:class checkInDefinition:checkInDefinition
 
     self postCheckInClass:class.
@@ -1003,7 +1026,6 @@
 updateVersionMethodOf:aClass for:newRevisionString
     " redefinition because I like to handle my version updates by myself "
 
-self halt.
     super updateVersionMethodOf:aClass for:newRevisionString.
     ^ self
 !
@@ -1047,7 +1069,7 @@
 
 checkInInfoDialogClass
 
-    ^P4CheckinInfoDialog
+    ^PerforceSourceCodeManagerUtilities checkInInfoDialogClass
 !
 
 checkPerforceSettings:aSettingsString forPackage:aPackage 
@@ -1815,7 +1837,7 @@
      Timestamp now printOn:s format:'%h-%m-%s.%i'.
      versionInfo time:s contents.
      PerforceVersionInfo fromRCSString:versionInfo getVersionString.
-     PerforceVersionInfo fromRCSString:'$Header: /cvs/stx/stx/libbasic3/PerforceSourceCodeManager.st,v 1.33 2013-05-15 10:47:42 cg Exp $'
+     PerforceVersionInfo fromRCSString:'$Header: /cvs/stx/stx/libbasic3/PerforceSourceCodeManager.st,v 1.34 2013-06-13 15:25:01 cg Exp $'
     "
 
     "Modified: / 01-06-2012 / 13:32:40 / cg"
@@ -1916,10 +1938,10 @@
 !PerforceSourceCodeManager class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/PerforceSourceCodeManager.st,v 1.33 2013-05-15 10:47:42 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/PerforceSourceCodeManager.st,v 1.34 2013-06-13 15:25:01 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/PerforceSourceCodeManager.st,v 1.33 2013-05-15 10:47:42 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/PerforceSourceCodeManager.st,v 1.34 2013-06-13 15:25:01 cg Exp $'
 ! !