CVSSourceCodeManager.st
changeset 1447 2ac1cf09722b
parent 1425 c02c03705574
child 1448 50aa98fb89be
--- a/CVSSourceCodeManager.st	Tue Jan 10 12:17:55 2006 +0100
+++ b/CVSSourceCodeManager.st	Tue Jan 17 13:17:28 2006 +0100
@@ -1186,7 +1186,7 @@
     revision := self newestRevisionInFile:containerFilename directory:packageDir module:moduleDir.
 
     logMsg := logMessage.
-    (logMsg isNil or:[logMsg isEmpty]) ifTrue:[
+    (logMsg isEmptyOrNil) ifTrue:[
         logMsg := 'checkin from browser'.
     ].
 
@@ -1281,7 +1281,7 @@
     ].
     cmdOut remove.
 
-    (whatHappened isNil or:[whatHappened isEmpty]) ifTrue:[
+    (whatHappened isEmptyOrNil) ifTrue:[
         "/
         "/ no change
         "/
@@ -1635,7 +1635,7 @@
     "/ fetch the new revision nr as found in the commit commands output
     "/
 
-    (whatHappened isNil or:[whatHappened isEmpty]) ifTrue:[
+    (whatHappened isEmptyOrNil) ifTrue:[
         'CVSSourceCodeManager [error]: unexpected empty checkin command output' errorPrintCR.
     ] ifFalse:[
         whatHappened := whatHappened asCollectionOfLines asStringCollection.
@@ -1800,7 +1800,7 @@
     ].
     cmdOut remove.
 
-    (whatHappened isNil or:[whatHappened isEmpty]) ifTrue:[
+    (whatHappened isEmptyOrNil) ifTrue:[
         "/
         "/ no change
         "/
@@ -2210,7 +2210,7 @@
     "/ fetch the new revision nr as found in the commit commands output
     "/
 
-    (whatHappened isNil or:[whatHappened isEmpty]) ifTrue:[
+    (whatHappened isEmptyOrNil) ifTrue:[
         'CVSSourceCodeManager [error]: unexpected empty checkin command output' errorPrintCR.
     ] ifFalse:[
         whatHappened := whatHappened asCollectionOfLines asStringCollection.
@@ -2889,7 +2889,7 @@
     "/
     "/ good - its in the CVS repository; now, we need the updated RCS header
     "/
-    (whatHappened isNil or:[whatHappened isEmpty]) ifTrue:[
+    (whatHappened isEmptyOrNil) ifTrue:[
         'CVSSourceCodeManager [warning]: unexpected empty commit command output' errorPrintCR.
         "/ TODO: scan the file for $Header ...
         "/ and extract the revision manually
@@ -3091,7 +3091,7 @@
         "/
         "/ good - its in the CVS repository; now, we need the updated RCS header
         "/
-        (whatHappened isNil or:[whatHappened isEmpty]) ifTrue:[
+        (whatHappened isEmptyOrNil) ifTrue:[
             'CVSSourceCodeManager [warning]: unexpected empty commit command output' errorPrintCR.
             "/ TODO: scan the file for $Header ...
             "/ and extract the revision manually
@@ -3837,7 +3837,7 @@
         ].
 
         cmd := cmd , ' history -x WARM -a'.
-        (timeGoal notNil and:[timeGoal notEmpty]) ifTrue:[
+        (timeGoal notEmptyOrNil) ifTrue:[
             cmd := cmd , ' -D "' , timeGoal , '"'.
         ].
         filterRep notNil ifTrue:[
@@ -4482,7 +4482,7 @@
 !CVSSourceCodeManager class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.293 2005-10-11 07:52:42 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.294 2006-01-17 12:17:22 cg Exp $'
 ! !
 
 CVSSourceCodeManager initialize!