--- a/CVSSourceCodeManager.st Fri May 08 06:59:09 2015 +0200
+++ b/CVSSourceCodeManager.st Sat May 09 06:56:39 2015 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
"
COPYRIGHT (c) 1995 by Claus Gittinger
All Rights Reserved
@@ -1528,7 +1530,7 @@
rightPart := rightPart copyFrom:idx+1.
"/ originalVersionString:
- "/ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.507 2015-05-07 11:06:26 cg Exp $'
+ "/ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.508 2015-05-08 12:26:42 cg Exp $'
"/ leftPart:
"/ '$Header: /cvs/stx/stx/goodies/refactoryBrowser/lint/RBLiteralArrayContainsCommaRule.st,v'
"/ dateAndTimePart:
@@ -1729,7 +1731,7 @@
"/
"/ synchronize i.e. merge in any changes
"/
- self activityNotification:'Merging ' , containerFilename , ' with repository version...'.
+ self activityNotification:'CVS: Merging ' , containerFilename , ' with repository version...'.
cmd := 'update ', CVSUpdateOptions, ' ', containerFilename, ' >', '"' , cmdOut name , '"'.
(self
@@ -2042,7 +2044,7 @@
"/
"/ now check it in again
"/
- self activityNotification:'Saving ' , containerFilename , ' in repository...'.
+ self activityNotification:'CVS: Saving ' , containerFilename , ' in repository...'.
logMsg := logMsg replChar:$" withString:'\"'.
@@ -2240,7 +2242,7 @@
"/
"/ synchronize i.e. merge in any changes
"/
- self activityNotification:'Merging ' , cls name , ' with repository version...'.
+ self activityNotification:'CVS: Merging ' , cls name , ' with repository version...'.
revisionOption := ''.
(revision asCollectionOfSubstringsSeparatedBy:$.) size > 2 ifTrue:[
@@ -2670,7 +2672,7 @@
"/
"/ now check it in again
"/
- self activityNotification:'Saving ' , cls name , ' in repository...'.
+ self activityNotification:'CVS: Saving ' , cls name , ' in repository...'.
logMsg := logMsg replChar:$" withString:'\"'.
@@ -2775,7 +2777,7 @@
].
self activityNotification:'Done.'.
] ifFalse:[
- self activityNotification:'Fetch new revision number of ', cls name.
+ self activityNotification:'CVS: Fetch new revision number of ', cls name.
changeLog := self revisionLogOf:cls fromRevision:newRevision toRevision:newRevision.
(changeLog isNil or:[(changeLog at:#revisions) size ~~ 1]) ifTrue:[
@@ -2846,7 +2848,7 @@
dirName := aModule.
].
- self activityNotification:'Checking out everything in ' , dirName , '...'.
+ self activityNotification:'CVS: Checking out everything in ' , dirName , '...'.
tempdir := self createTempDirectory:nil forModule:nil.
[
@@ -3009,7 +3011,7 @@
"/ zArg := ' -z 9'.
"/ ].
- self activityNotification:'Checking out source ' , checkoutName , revMsg.
+ self activityNotification:'CVS: Checking out source ' , checkoutName , revMsg.
OperatingSystem isUNIXlike ifTrue:[
"/ can redirect output
cmdOut := FileStream newTemporary
@@ -3058,9 +3060,9 @@
ifTrue:[
(OsError catch:[
fullTempName moveTo:fullCachedName.
- self activityNotification:'Cached as ',fullCachedName asFilename baseName.
+ self activityNotification:'CVS: Cached as ',fullCachedName asFilename baseName.
]) ifTrue:[
- self activityNotification:'Not cached.'.
+ self activityNotification:'CVS: Not cached.'.
('CVSSourceCodeManager [error]: failed to rename ', fullTempName pathName, ' to ', cachedSourceFilename) errorPrintCR.
^ nil
].
@@ -3069,11 +3071,11 @@
].
] ifFalse:[
fileName = 'extensions.st' ifTrue:[
- self activityNotification:('"%1" not cached - please check your settings and/or version method in the "%2" projectDefinition.'
+ self activityNotification:('CVS: "%1" not cached - please check your settings and/or version method in the "%2" projectDefinition.'
bindWith:fileName
with:(moduleDir,':',packageDir))
] ifFalse:[
- self activityNotification:('"%1" not cached - please check your settings and/or version method in the "%2" projectDefinition.'
+ self activityNotification:('CVS: "%1" not cached - please check your settings and/or version method in the "%2" projectDefinition.'
bindWith:fileName
with:(moduleDir,':',packageDir))
].
@@ -3308,7 +3310,7 @@
].
].
- self activityNotification:'Checking for existing module ' , moduleDir.
+ self activityNotification:'CVS: Checking for existing module ' , moduleDir.
cvsRoot := self getCVSROOTForModule:moduleDir.
cvsRoot isNil ifTrue:[^ false].
@@ -3379,7 +3381,7 @@
].
].
- self activityNotification:'Checking for existing package ' , directory.
+ self activityNotification:'CVS: Checking for existing package ' , directory.
cvsRoot := self getCVSROOTForModule:moduleDir.
cvsRoot isNil ifTrue:[^ false].
@@ -3461,7 +3463,7 @@
"/ required later.
"/
- self activityNotification:'Checking for directory ' , checkoutName.
+ self activityNotification:'CVS: Checking for directory ' , checkoutName.
tempdir := self createLocalDirectory:packageDir inModule:moduleDir.
tempdir isNil ifTrue:[
('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
@@ -3499,7 +3501,7 @@
"/
"/ and add it to the repository
"/
- self activityNotification:'Adding ' , fileName.
+ self activityNotification:'CVS: Adding ' , fileName.
OperatingSystem isUNIXlike ifTrue:[
checkInDir := tempdir constructString:checkoutName.
@@ -3526,7 +3528,7 @@
"/
"/ commit
"/
- self activityNotification:'Committing ' , fileName.
+ self activityNotification:'CVS: Committing ' , fileName.
OperatingSystem isUNIXlike ifFalse:[
"/ save the log message into another tempFile ...
@@ -3668,7 +3670,7 @@
"/ required later.
"/
- self activityNotification:'Checking for directory ' , checkoutName.
+ self activityNotification:'CVS: Checking for directory ' , checkoutName.
tempdir := self createLocalDirectory:packageDir inModule:moduleDir.
tempdir isNil ifTrue:[
('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
@@ -3698,7 +3700,7 @@
"/
"/ and add it to the repository
"/
- self activityNotification:'Adding ' , fileName.
+ self activityNotification:'CVS: Adding ' , fileName.
OperatingSystem isUNIXlike ifTrue:[
checkInDir := tempdir constructString:checkoutName.
@@ -3724,7 +3726,7 @@
"/
"/ commit
"/
- self activityNotification:'Committing ' , fileName.
+ self activityNotification:'CVS: Committing ' , fileName.
OperatingSystem isUNIXlike ifFalse:[
"/ save the log message into another tempFile ...
@@ -4017,7 +4019,7 @@
special:''
overwrite:false.
- msg := 'Fetching diff list of '.
+ msg := 'CVS: Fetching diff list of '.
clsOrNil isNil ifTrue:[
msg := msg , fullName.
] ifFalse:[
@@ -4125,7 +4127,7 @@
|directories|
- self activityNotification:'getting list of directories...'.
+ self activityNotification:'CVS: Fetching list of directories...'.
directories := Set new.
self listDirectoriesIn:cvsPath
@@ -4205,7 +4207,7 @@
|containers|
- self activityNotification:'getting list of containers...'.
+ self activityNotification:'CVS: Fetching list of containers...'.
containers := Set new.
self listDirectoriesIn:cvsPath
@@ -4245,7 +4247,7 @@
fullName := modulePath , '/' , classFileName.
[
- self activityNotification:'Fetching revision info for ', fullName.
+ self activityNotification:'CVS: Fetching revision info for ', fullName.
inStream := self
executeCVSCommand:('rlog -h -N ' , fullName)
@@ -4346,7 +4348,7 @@
"/
"/ and remove it to the repository
"/
- self activityNotification:'removing ' , fileName.
+ self activityNotification:'CVS: Removing ' , fileName.
RecentlyCheckedModulesAndPackages := nil. "/ flush (could do better...)
@@ -4385,7 +4387,7 @@
"/
"/ commit
"/
- self activityNotification:'committing removal of ' , fileName.
+ self activityNotification:'CVS Committing removal of ' , fileName.
cmd := 'commit -m "removed container" -l ' , fileName , ' 2> ' , cmdOut name.
(self
@@ -4678,17 +4680,17 @@
"/ The repair code will be removed at some time in the future...
"/ temporary fix Felix' bad string translation:
- (aString startsWith:'§Header:') ifTrue:[
- (aString endsWith:'Exp §') ifTrue:[
+ (aString startsWith:'§Header:') ifTrue:[
+ (aString endsWith:'Exp §') ifTrue:[
fixedString := '$' , (aString copyFrom:3 to:(aString size - 2)) , '$'.
aClass isNil ifTrue:[
autoFixHolder value ifFalse:[
- Dialog information:'Attention: the CVS version string is corrupted (§-bug). Please fix it manually'.
+ Dialog information:'Attention: the CVS version string is corrupted (§-bug). Please fix it manually'.
]
] ifFalse:[
(autoFixHolder value
- or:[ Dialog confirm:('Attention: the CVS version string is corrupted in "%1" (§-bug). Fix it?' withCRs bindWith:aClass name) ]
+ or:[ Dialog confirm:('Attention: the CVS version string is corrupted in "%1" (§-bug). Fix it?' withCRs bindWith:aClass name) ]
) ifTrue:[
self updateVersionMethodOf:aClass for:fixedString.
].
@@ -4696,7 +4698,7 @@
].
].
- "/ temporary fix Jan's bad Umlaut-removal (which results in Felix's bad § being removed):
+ "/ temporary fix Jan's bad Umlaut-removal (which results in Felix's bad § being removed):
(aString startsWith:'Header: ') ifTrue:[
(aString endsWith:'Exp ') ifTrue:[
fixedString := '$' , aString , '$'.
@@ -4836,9 +4838,9 @@
].
headerOnly ifTrue:[
- msg := 'Fetching revision info '
+ msg := 'CVS: Fetching revision info '
] ifFalse:[
- msg := 'Reading revision log '
+ msg := 'CVS: Reading revision log '
].
clsOrNil isNil ifTrue:[
msg := msg , 'in ' , fullName.
@@ -5043,9 +5045,9 @@
headerOnly := false.
headerOnly ifTrue:[
- msg := 'Fetching revision info '
+ msg := 'CVS: Fetching revision info '
] ifFalse:[
- msg := 'Reading revision log '
+ msg := 'CVS: Reading revision log '
].
msg := msg , 'in package ' , modulePath.
self activityNotification:msg,'...'.
@@ -5192,7 +5194,7 @@
[
|revisionUsed dateSelector searchFor|
- self activityNotification:('Fetching revision infos for %1%2'
+ self activityNotification:('CVS: Fetching revision infos for %1%2'
bindWith:modulePath
with:(aDateOrNilForNewest isNil
ifTrue:[ '' ]
@@ -5251,7 +5253,7 @@
modulePath := module , '/' , packageDir.
- self activityNotification:('Fetching revision infos for %1%2'
+ self activityNotification:('CVS: Fetching revision infos for %1%2'
bindWith:modulePath
with:(' tagged as "',symbolicName,'"')).
@@ -5458,7 +5460,7 @@
].
pathesInModuleAsArgument := pathesInModuleAsArgument asStringCollection asStringWith:Character space.
- self activityNotification:('setting symbolic name "%1" for: %2' bindWith:symbolicName with:pathesInModuleAsArgument).
+ self activityNotification:('CVS: Setting symbolic name "%1" for: %2' bindWith:symbolicName with:pathesInModuleAsArgument).
errorStream := '' writeStream.
outStream := '' writeStream.
@@ -5539,7 +5541,7 @@
special:''
overwrite:false.
- msg := 'Fetching status info of '.
+ msg := 'CVS: fetching status info of '.
clsOrNil isNil ifTrue:[
msg := msg , fullName.
] ifFalse:[
@@ -5556,7 +5558,7 @@
(inStream isNil or:[inStream atEnd]) ifTrue:[
('CVSSourceCodeManager [error]: cannot open pipe to cvs status ', fullName) errorPrintCR.
- SourceCodeManagerError raiseRequestWith:'failed to open pipe to "cvs status"'.
+ SourceCodeManagerError raiseRequestErrorString:'failed to open pipe to "cvs status"'.
^ nil
].
@@ -5598,7 +5600,8 @@
]
].
info isEmpty ifTrue:[
- ('CVSSourceCodeManager [warning]: no status for ', fullName) errorPrintCR.
+ ('CVSSourceCodeManager [warning]: no status for "', fullName,'"') errorPrintCR.
+ SourceCodeManagerError raiseRequestErrorString:'no status for "', fullName,'"'.
^ nil
].
] ensure:[
@@ -5628,11 +5631,11 @@
!CVSSourceCodeManager class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.507 2015-05-07 11:06:26 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.508 2015-05-08 12:26:42 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.507 2015-05-07 11:06:26 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.508 2015-05-08 12:26:42 cg Exp $'
! !