prints replaced by infoPrint
authorClaus Gittinger <cg@exept.de>
Sun, 17 Dec 1995 16:19:09 +0100
changeset 160 dacfc2454cc8
parent 159 b66f0e62b312
child 161 de0f00bd60ca
prints replaced by infoPrint
AbstrSCMgr.st
AbstractSourceCodeManager.st
CVSSCMgr.st
CVSSourceCodeManager.st
--- a/AbstrSCMgr.st	Sat Dec 16 18:44:37 1995 +0100
+++ b/AbstrSCMgr.st	Sun Dec 17 16:19:09 1995 +0100
@@ -284,7 +284,7 @@
 
     cls := aClass.
     cls isMeta ifTrue:[
-	cls := cls soleInstance
+        cls := cls soleInstance
     ].
 
     "/
@@ -298,17 +298,17 @@
     "/
     sourceInfo := cls packageSourceCodeInfo.
     sourceInfo isNil ifTrue:[
-	revInfo isNil ifTrue:[
-	    'SOURCEMGR: class has neither source nor compiled-in info' infoPrintNL.
-	    ^ nil
-	].
+        revInfo isNil ifTrue:[
+            'SOURCEMGR: class has neither source nor compiled-in info' infoPrintNL.
+            ^ nil
+        ].
 
-	container := revInfo at:#repositoryPathName ifAbsent:nil.
-	container notNil ifTrue:[
-	    sourceInfo := revInfo.
-	    sourceInfo at:#directory put:(self directoryFromContainerPath:container).
-	    sourceInfo at:#module put:(self moduleFromContainerPath:container).
-	]
+        container := revInfo at:#repositoryPathName ifAbsent:nil.
+        container notNil ifTrue:[
+            sourceInfo := revInfo.
+            sourceInfo at:#directory put:(self directoryFromContainerPath:container).
+            sourceInfo at:#module put:(self moduleFromContainerPath:container).
+        ]
     ].
 
 
@@ -319,27 +319,27 @@
 
     newInfo := IdentityDictionary new.
     sourceInfo keysAndValuesDo:[:key :value |
-	newInfo at:key put:value
+        newInfo at:key put:value
     ].
 
     "/ check ..
     revInfo notNil ifTrue:[
-	actualSourceFileName := revInfo at:#fileName ifAbsent:nil.
-	actualSourceFileName notNil ifTrue:[
-	    actualSourceFileName ~= (classFileName , '.st') ifTrue:[
-		('SOURCEMGR: source of class ' , aClass name , ' found in ' , actualSourceFileName , ' (expected: ' , classFileName , '.st); renamed ?') printNL.
-		newInfo at:#expectedFileName put:(classFileName).
-		newInfo at:#renamed put:true.
-		classFileName := actualSourceFileName copyWithoutLast:3
-	    ]
-	]
+        actualSourceFileName := revInfo at:#fileName ifAbsent:nil.
+        actualSourceFileName notNil ifTrue:[
+            actualSourceFileName ~= (classFileName , '.st') ifTrue:[
+                ('SOURCEMGR: source of class ' , aClass name , ' found in ' , actualSourceFileName , ' (expected: ' , classFileName , '.st); renamed ?') infoPrintNL.
+                newInfo at:#expectedFileName put:(classFileName).
+                newInfo at:#renamed put:true.
+                classFileName := actualSourceFileName copyWithoutLast:3
+            ]
+        ]
     ].
 
     newInfo at:#classFileName put:classFileName.
     ^ newInfo
 
     "Created: 25.11.1995 / 12:40:19 / cg"
-    "Modified: 25.11.1995 / 18:51:16 / cg"
+    "Modified: 17.12.1995 / 16:03:31 / cg"
 !
 
 streamForClass:cls fileName:classFileName revision:revision directory:packageDir module:moduleDir cache:cacheIt
@@ -819,6 +819,6 @@
 !AbstractSourceCodeManager class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/Attic/AbstrSCMgr.st,v 1.38 1995-12-16 15:52:27 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/Attic/AbstrSCMgr.st,v 1.39 1995-12-17 15:18:28 cg Exp $'
 ! !
 AbstractSourceCodeManager initialize!
--- a/AbstractSourceCodeManager.st	Sat Dec 16 18:44:37 1995 +0100
+++ b/AbstractSourceCodeManager.st	Sun Dec 17 16:19:09 1995 +0100
@@ -284,7 +284,7 @@
 
     cls := aClass.
     cls isMeta ifTrue:[
-	cls := cls soleInstance
+        cls := cls soleInstance
     ].
 
     "/
@@ -298,17 +298,17 @@
     "/
     sourceInfo := cls packageSourceCodeInfo.
     sourceInfo isNil ifTrue:[
-	revInfo isNil ifTrue:[
-	    'SOURCEMGR: class has neither source nor compiled-in info' infoPrintNL.
-	    ^ nil
-	].
+        revInfo isNil ifTrue:[
+            'SOURCEMGR: class has neither source nor compiled-in info' infoPrintNL.
+            ^ nil
+        ].
 
-	container := revInfo at:#repositoryPathName ifAbsent:nil.
-	container notNil ifTrue:[
-	    sourceInfo := revInfo.
-	    sourceInfo at:#directory put:(self directoryFromContainerPath:container).
-	    sourceInfo at:#module put:(self moduleFromContainerPath:container).
-	]
+        container := revInfo at:#repositoryPathName ifAbsent:nil.
+        container notNil ifTrue:[
+            sourceInfo := revInfo.
+            sourceInfo at:#directory put:(self directoryFromContainerPath:container).
+            sourceInfo at:#module put:(self moduleFromContainerPath:container).
+        ]
     ].
 
 
@@ -319,27 +319,27 @@
 
     newInfo := IdentityDictionary new.
     sourceInfo keysAndValuesDo:[:key :value |
-	newInfo at:key put:value
+        newInfo at:key put:value
     ].
 
     "/ check ..
     revInfo notNil ifTrue:[
-	actualSourceFileName := revInfo at:#fileName ifAbsent:nil.
-	actualSourceFileName notNil ifTrue:[
-	    actualSourceFileName ~= (classFileName , '.st') ifTrue:[
-		('SOURCEMGR: source of class ' , aClass name , ' found in ' , actualSourceFileName , ' (expected: ' , classFileName , '.st); renamed ?') printNL.
-		newInfo at:#expectedFileName put:(classFileName).
-		newInfo at:#renamed put:true.
-		classFileName := actualSourceFileName copyWithoutLast:3
-	    ]
-	]
+        actualSourceFileName := revInfo at:#fileName ifAbsent:nil.
+        actualSourceFileName notNil ifTrue:[
+            actualSourceFileName ~= (classFileName , '.st') ifTrue:[
+                ('SOURCEMGR: source of class ' , aClass name , ' found in ' , actualSourceFileName , ' (expected: ' , classFileName , '.st); renamed ?') infoPrintNL.
+                newInfo at:#expectedFileName put:(classFileName).
+                newInfo at:#renamed put:true.
+                classFileName := actualSourceFileName copyWithoutLast:3
+            ]
+        ]
     ].
 
     newInfo at:#classFileName put:classFileName.
     ^ newInfo
 
     "Created: 25.11.1995 / 12:40:19 / cg"
-    "Modified: 25.11.1995 / 18:51:16 / cg"
+    "Modified: 17.12.1995 / 16:03:31 / cg"
 !
 
 streamForClass:cls fileName:classFileName revision:revision directory:packageDir module:moduleDir cache:cacheIt
@@ -819,6 +819,6 @@
 !AbstractSourceCodeManager class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.38 1995-12-16 15:52:27 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.39 1995-12-17 15:18:28 cg Exp $'
 ! !
 AbstractSourceCodeManager initialize!
--- a/CVSSCMgr.st	Sat Dec 16 18:44:37 1995 +0100
+++ b/CVSSCMgr.st	Sun Dec 17 16:19:09 1995 +0100
@@ -356,7 +356,7 @@
     cmd := 'cd ' , tempdir name , ';cvs checkout' , revisionArg , ' ' , checkoutName , ' > ' , cmdOut name.
 
     Verbose == true ifTrue:[
-        ('CVSMGR: executing: ' , cmd) printNL.
+        ('CVSMGR: executing: ' , cmd) infoPrintNL.
     ].
 
     (OperatingSystem executeCommand:cmd) ifFalse:[
@@ -404,7 +404,7 @@
     "/ copy-over our current version
     "/
     cmd := 'mv ' , sourceFileName , ' ' , tempdir name , '/' , checkoutName.
-"/ ('move over: ' , cmd) printNL.
+"/ ('move over: ' , cmd) infoPrintNL.
     (OperatingSystem executeCommand:cmd) ifFalse:[
 "/        'failed: ' errorPrint. cmd errorPrintNL.
         tempdir recursiveRemove.
@@ -421,7 +421,7 @@
 
     cmd := 'cd ' , tempdir name , ';cvs update ' , checkoutName , ' > ' , cmdOut name.
     Verbose == true ifTrue:[
-        ('CVSMGR: executing: ' , cmd) printNL.
+        ('CVSMGR: executing: ' , cmd) infoPrintNL.
     ].
 
     (OperatingSystem executeCommand:cmd) ifFalse:[
@@ -624,7 +624,7 @@
     logMsg := logMsg replChar:$"  withString:'\"'.
     cmd := 'cd ' , tempdir name , ';cvs commit -m "', logMsg ,'" ' , ' 2> ' , cmdOut name.
     Verbose == true ifTrue:[
-        ('CVSMGR: executing: ' , cmd) printNL.
+        ('CVSMGR: executing: ' , cmd) infoPrintNL.
     ].
     (OperatingSystem executeCommand:cmd) ifFalse:[
         Verbose == true ifTrue:[
@@ -718,7 +718,7 @@
      SourceCodeManager checkinClass:Array logMessage:'testing only'
     "
 
-    "Modified: 16.12.1995 / 17:50:24 / cg"
+    "Modified: 17.12.1995 / 16:02:37 / cg"
 !
 
 streamForClass:cls fileName:classFileName revision:revision directory:packageDir module:moduleDir cache:cacheIt
@@ -977,7 +977,7 @@
     "/
     cmd := 'cd ' , tempdir name , ';cvs commit -m "intitial checkin" 2> ' , cmdOut name.
     Verbose == true ifTrue:[
-        ('CVSMGR: executing: ' , cmd) printNL.
+        ('CVSMGR: executing: ' , cmd) infoPrintNL.
     ].
     (OperatingSystem executeCommand:cmd) ifFalse:[
         Verbose == true ifTrue:[
@@ -1058,7 +1058,7 @@
     ^ true
 
     "Created: 9.12.1995 / 19:13:37 / cg"
-    "Modified: 10.12.1995 / 12:58:24 / cg"
+    "Modified: 17.12.1995 / 16:02:06 / cg"
 !
 
 createModule:moduleName
@@ -1237,6 +1237,7 @@
     "/ This has to be changed to use cvs rlog in order for server mode
     "/ to work as well.
     "/
+
     fullName := CVSRoot , '/' , moduleDir , '/' , packageDir , '/' , classFileName , ',v'.
     file := fullName asFilename.
     file exists ifFalse:[
@@ -1262,6 +1263,7 @@
         ]
     ].
 
+    self activityNotification:'reading log'.
     cmd := 'rlog ' , revArg , ' ' , file name.
 "/ cmd printNL.
     inStream := PipeStream readingFrom:cmd.
@@ -1370,7 +1372,7 @@
     "
 
     "Created: 16.11.1995 / 13:25:30 / cg"
-    "Modified: 10.12.1995 / 12:53:50 / cg"
+    "Modified: 16.12.1995 / 18:53:02 / cg"
 !
 
 writeHistoryLogSince:timeGoal filterSTSources:filter filterUser:userFilter to:aStream
@@ -1433,6 +1435,6 @@
 !CVSSourceCodeManager class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/Attic/CVSSCMgr.st,v 1.67 1995-12-16 17:44:37 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/Attic/CVSSCMgr.st,v 1.68 1995-12-17 15:19:09 cg Exp $'
 ! !
 CVSSourceCodeManager initialize!
--- a/CVSSourceCodeManager.st	Sat Dec 16 18:44:37 1995 +0100
+++ b/CVSSourceCodeManager.st	Sun Dec 17 16:19:09 1995 +0100
@@ -356,7 +356,7 @@
     cmd := 'cd ' , tempdir name , ';cvs checkout' , revisionArg , ' ' , checkoutName , ' > ' , cmdOut name.
 
     Verbose == true ifTrue:[
-        ('CVSMGR: executing: ' , cmd) printNL.
+        ('CVSMGR: executing: ' , cmd) infoPrintNL.
     ].
 
     (OperatingSystem executeCommand:cmd) ifFalse:[
@@ -404,7 +404,7 @@
     "/ copy-over our current version
     "/
     cmd := 'mv ' , sourceFileName , ' ' , tempdir name , '/' , checkoutName.
-"/ ('move over: ' , cmd) printNL.
+"/ ('move over: ' , cmd) infoPrintNL.
     (OperatingSystem executeCommand:cmd) ifFalse:[
 "/        'failed: ' errorPrint. cmd errorPrintNL.
         tempdir recursiveRemove.
@@ -421,7 +421,7 @@
 
     cmd := 'cd ' , tempdir name , ';cvs update ' , checkoutName , ' > ' , cmdOut name.
     Verbose == true ifTrue:[
-        ('CVSMGR: executing: ' , cmd) printNL.
+        ('CVSMGR: executing: ' , cmd) infoPrintNL.
     ].
 
     (OperatingSystem executeCommand:cmd) ifFalse:[
@@ -624,7 +624,7 @@
     logMsg := logMsg replChar:$"  withString:'\"'.
     cmd := 'cd ' , tempdir name , ';cvs commit -m "', logMsg ,'" ' , ' 2> ' , cmdOut name.
     Verbose == true ifTrue:[
-        ('CVSMGR: executing: ' , cmd) printNL.
+        ('CVSMGR: executing: ' , cmd) infoPrintNL.
     ].
     (OperatingSystem executeCommand:cmd) ifFalse:[
         Verbose == true ifTrue:[
@@ -718,7 +718,7 @@
      SourceCodeManager checkinClass:Array logMessage:'testing only'
     "
 
-    "Modified: 16.12.1995 / 17:50:24 / cg"
+    "Modified: 17.12.1995 / 16:02:37 / cg"
 !
 
 streamForClass:cls fileName:classFileName revision:revision directory:packageDir module:moduleDir cache:cacheIt
@@ -977,7 +977,7 @@
     "/
     cmd := 'cd ' , tempdir name , ';cvs commit -m "intitial checkin" 2> ' , cmdOut name.
     Verbose == true ifTrue:[
-        ('CVSMGR: executing: ' , cmd) printNL.
+        ('CVSMGR: executing: ' , cmd) infoPrintNL.
     ].
     (OperatingSystem executeCommand:cmd) ifFalse:[
         Verbose == true ifTrue:[
@@ -1058,7 +1058,7 @@
     ^ true
 
     "Created: 9.12.1995 / 19:13:37 / cg"
-    "Modified: 10.12.1995 / 12:58:24 / cg"
+    "Modified: 17.12.1995 / 16:02:06 / cg"
 !
 
 createModule:moduleName
@@ -1237,6 +1237,7 @@
     "/ This has to be changed to use cvs rlog in order for server mode
     "/ to work as well.
     "/
+
     fullName := CVSRoot , '/' , moduleDir , '/' , packageDir , '/' , classFileName , ',v'.
     file := fullName asFilename.
     file exists ifFalse:[
@@ -1262,6 +1263,7 @@
         ]
     ].
 
+    self activityNotification:'reading log'.
     cmd := 'rlog ' , revArg , ' ' , file name.
 "/ cmd printNL.
     inStream := PipeStream readingFrom:cmd.
@@ -1370,7 +1372,7 @@
     "
 
     "Created: 16.11.1995 / 13:25:30 / cg"
-    "Modified: 10.12.1995 / 12:53:50 / cg"
+    "Modified: 16.12.1995 / 18:53:02 / cg"
 !
 
 writeHistoryLogSince:timeGoal filterSTSources:filter filterUser:userFilter to:aStream
@@ -1433,6 +1435,6 @@
 !CVSSourceCodeManager class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.67 1995-12-16 17:44:37 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.68 1995-12-17 15:19:09 cg Exp $'
 ! !
 CVSSourceCodeManager initialize!