--- a/CVSSourceCodeManager.st Wed Feb 22 23:14:01 2006 +0100
+++ b/CVSSourceCodeManager.st Thu Feb 23 13:06:15 2006 +0100
@@ -3360,14 +3360,14 @@
"Modified: / 18.1.2000 / 20:14:01 / cg"
!
-deleteSymbolicName:symbolicName fileName:classFileName directory:packageDir module:moduleDir
+deleteSymbolicName:symbolicName path:pathInRepository
"remove symbolicName from classFileName"
- self setSymbolicName:symbolicName revision:0 overWrite:false fileName:classFileName directory:packageDir module:moduleDir
+ self setSymbolicName:symbolicName revision:0 overWrite:false path:pathInRepository
"
- self deleteSymbolicName:'stable' fileName:'Array.st' directory:'libbasic' module:'stx'
- self deleteSymbolicName:'testBLAbla' fileName:nil directory:'libbasic' module:'stx'
+ self deleteSymbolicName:'stable' path:'stx/libbasic/Array.st'
+ self deleteSymbolicName:'testBLAbla' path:'stx/libbasic/Array.st'
"
!
@@ -4077,7 +4077,7 @@
module:moduleDir
!
-setSymbolicName:symbolicName revision:rev overWrite:overWriteBool fileName:filename directory:packageDir module:moduleDir
+setSymbolicName:symbolicName revision:rev overWrite:overWriteBool path:pathInRepository
"set a symbolicName for revision rev.
If rev is nil, set it for the head (most recent) revision.
If rev is 0, delete the symbolic name.
@@ -4086,14 +4086,9 @@
If filename is nil, the symbolicName for a whole package is set"
- |fullName modulePath inStream argumentString result tempDir errorStream outStream|
-
- modulePath := moduleDir , '/' , packageDir.
- filename notNil ifTrue:[
- fullName := modulePath , '/' , filename.
- ] ifFalse:[
- fullName := modulePath.
- ].
+ |inStream argumentString result errorStream outStream moduleDir|
+
+ moduleDir := (pathInRepository asCollectionOfSubstringsSeparatedByAny:'/\') first.
rev = 0 ifTrue:[
argumentString := ' -d '.
@@ -4105,32 +4100,32 @@
].
[
- self activityNotification:'setting symbolic name ', fullName.
+ self activityNotification:'setting symbolic name ', pathInRepository.
errorStream := '' writeStream.
outStream := '' writeStream.
- result := self executeCVSCommand:('rtag ' , argumentString, ' ', symbolicName, ' ', fullName)
+ result := self executeCVSCommand:('rtag ' , argumentString, ' ', symbolicName, ' ', pathInRepository)
module:moduleDir
- inDirectory:tempDir
+ inDirectory:nil
log:true
outputTo:outStream
errorTo:errorStream.
(result not or:[errorStream size ~~ 0]) ifTrue:[
- SourceCodeManagerError raiseWith:errorStream contents errorString:' cvs tag failed: ', fullName.
+ SourceCodeManagerError raiseWith:errorStream contents errorString:' cvs tag failed: ', pathInRepository.
].
(outStream contents asStringCollection contains:[:eachLine| eachLine startsWithAnyOf:'WE']) ifTrue:[
- SourceCodeManagerError raiseWith:outStream contents errorString:' cvs tag could not be set: ', fullName.
+ SourceCodeManagerError raiseWith:outStream contents errorString:' cvs tag could not be set: ', pathInRepository.
].
] ensure:[
inStream notNil ifTrue:[inStream close].
].
"
- self setSymbolicName:'stable' revision:nil overWrite:false fileName:'Array.st' directory:'libbasic' module:'stx'
- self setSymbolicName:'stable' revision:nil overWrite:true fileName:'Array.st' directory:'libbasic' module:'stx'
- self setSymbolicName:'stable' revision:nil overWrite:true fileName:nil directory:'libbasic' module:'stx'
- self setSymbolicName:'stable' revision:'1.1' overWrite:true fileName:'Array.st' directory:'libbasic' module:'stx'
+ self setSymbolicName:'stable' revision:nil overWrite:false path:'stx/libbasic/Array.st'
+ self setSymbolicName:'stable' revision:nil overWrite:true path:'stx/libbasic/Array.st'
+ self setSymbolicName:'stable' revision:nil overWrite:true path:'stx/libbasic/Array.st'
+ self setSymbolicName:'stable' revision:'1.1' overWrite:true path:'stx/libbasic/Array.st'
"
!
@@ -4237,7 +4232,7 @@
!CVSSourceCodeManager class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.297 2006-02-22 22:07:08 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.298 2006-02-23 12:06:15 stefan Exp $'
! !
CVSSourceCodeManager initialize!