--- a/CVSSourceCodeManager.st Tue Aug 16 06:52:00 2016 +0200
+++ b/CVSSourceCodeManager.st Tue Aug 23 07:03:47 2016 +0200
@@ -5394,12 +5394,12 @@
If filename is nil, the symbolicName for a whole package is set"
- |pathes alreadyWarned|
+ |paths alreadyWarned|
alreadyWarned := 0.
- pathes := aCollectionOfClasses
- collect:[:cls |
+ paths := aCollectionOfClasses
+ collect:[:cls |
|info path answer|
cls isLoaded ifFalse:[
@@ -5414,7 +5414,7 @@
answer == true ifTrue:[
alreadyWarned := alreadyWarned + 1.
].
- ]
+ ]
].
nil
] ifTrue:[
@@ -5433,10 +5433,10 @@
]
thenSelect:[:path | path notNil].
self
- setSymbolicName:symbolicName
- revision:rev
- overWrite:overWriteBool
- pathes:pathes
+ setSymbolicName:symbolicName
+ revision:rev
+ overWrite:overWriteBool
+ pathes:paths
"
self setSymbolicName:'foo' revision:nil overWrite:false classes:(Array with:True with:False)
@@ -5459,9 +5459,9 @@
If filename is nil, the symbolicName for a whole package is set"
self
- setSymbolicName:symbolicName
- revision:rev
- overWrite:overWriteBool
+ setSymbolicName:symbolicName
+ revision:rev
+ overWrite:overWriteBool
pathes:(Array with:pathInRepository)
"
@@ -5482,26 +5482,26 @@
If overWriteBool is false, an error will be raised if symbolicName has already been set.
If filename is nil, the symbolicName for a whole package is set.
- If multiple pathes are given, the revision MUST be nil."
+ If multiple paths are given, the revision MUST be nil."
|argumentString result errorStream outStream moduleDirs symbolicName|
- symbolicName := (symbolicNameArg includes:Character space)
+ symbolicName := (symbolicNameArg includes:Character space)
ifTrue:[ '"',symbolicNameArg,'"' ]
ifFalse:[ symbolicNameArg ].
pathesInRepository size > 1 ifTrue:[
- self assert:(rev isNil or:[rev == 0]) "revision must be nil (for head) or 0 (for delete) with multiple pathes"
+ self assert:(rev isNil or:[rev == 0]) "revision must be nil (for head) or 0 (for delete) with multiple paths"
].
- moduleDirs := pathesInRepository
+ moduleDirs := pathesInRepository
collect:[:pathInRepository |
(pathInRepository asCollectionOfSubstringsSeparatedByAny:'/\') first.
].
moduleDirs do:[:moduleDir |
- |pathesInModule pathesInModuleAsArgument|
-
- pathesInModule := pathesInRepository
+ |pathsInModule pathsInModuleAsArgument|
+
+ pathsInModule := pathesInRepository
select:[:pathInRepository |
|moduleOfThisPath|
@@ -5518,7 +5518,7 @@
].
].
- pathesInModuleAsArgument := pathesInModule
+ pathsInModuleAsArgument := pathsInModule
collect:[:eachPath |
(eachPath includes:Character space) ifTrue:[
'"',eachPath,'"'
@@ -5526,26 +5526,26 @@
eachPath
].
].
- pathesInModuleAsArgument := pathesInModuleAsArgument asStringCollection asStringWith:Character space.
-
- self activityNotification:('CVS: Setting symbolic name "%1" for: %2' bindWith:symbolicName with:pathesInModuleAsArgument).
+ pathsInModuleAsArgument := pathsInModuleAsArgument asStringCollection asStringWith:Character space.
+
+ self activityNotification:('CVS: Setting symbolic name "%1" for: %2' bindWith:symbolicName with:pathsInModuleAsArgument).
errorStream := '' writeStream.
outStream := '' writeStream.
- result := self
- executeCVSCommand:('rtag ' , argumentString, ' ', symbolicName, ' ', pathesInModuleAsArgument)
- module:moduleDir
- inDirectory:nil
+ result := self
+ executeCVSCommand:('rtag ' , argumentString, ' ', symbolicName, ' ', pathsInModuleAsArgument)
+ module:moduleDir
+ inDirectory:nil
log:true
outputTo:outStream
errorTo:errorStream.
self activityNotification:nil.
(result not or:[errorStream size ~~ 0]) ifTrue:[
- SourceCodeManagerError raiseRequestWith:errorStream contents errorString:' cvs tag failed: ', pathesInModuleAsArgument.
+ SourceCodeManagerError raiseRequestWith:errorStream contents errorString:' cvs tag failed: ', pathsInModuleAsArgument.
] ifFalse:[
(outStream contents asStringCollection contains:[:someLine| someLine startsWithAnyOf:'WE']) ifTrue:[
- SourceCodeManagerError raiseRequestWith:outStream contents errorString:' cvs tag could not be set: ', pathesInModuleAsArgument.
+ SourceCodeManagerError raiseRequestWith:outStream contents errorString:' cvs tag could not be set: ', pathsInModuleAsArgument.
].
].
].
@@ -5554,24 +5554,24 @@
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:'test1'
- revision:nil
- overWrite:true
+ self
+ setSymbolicName:'test1'
+ revision:nil
+ overWrite:true
path:'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st'
- self
- setSymbolicName:'test2'
- revision:nil
- overWrite:true
- pathes:#( 'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st'
+ self
+ setSymbolicName:'test2'
+ revision:nil
+ overWrite:true
+ pathes:#( 'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st'
'bosch/dapasx/datenbasis/DAPASX__ProjectSearch.st' )
- self
- setSymbolicName:'test2'
- revision:0
- overWrite:true
- pathes:#( 'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st'
+ self
+ setSymbolicName:'test2'
+ revision:0
+ overWrite:true
+ pathes:#( 'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st'
'bosch/dapasx/datenbasis/DAPASX__ProjectSearch.st' )
"