--- a/PerforceSourceCodeManagerUtilities.st Wed Aug 17 11:03:48 2016 +0200
+++ b/PerforceSourceCodeManagerUtilities.st Mon Aug 22 11:26:40 2016 +0200
@@ -2724,7 +2724,7 @@
^ info
!
-setSymbolicName:symbolicNameArg revision:rev overWrite:overWriteBool pathes:pathesInRepository
+setSymbolicName:symbolicNameArg revision:rev overWrite:overWriteBool pathes:pathsInRepository
"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.
@@ -2732,26 +2732,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 moduleDirs symbolicName perforceCommand outputStream|
- 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"
+ pathsInRepository size > 1 ifTrue:[
+ self assert:(rev isNil or:[rev == 0]) "revision must be nil (for head) or 0 (for delete) with multiple paths"
].
- moduleDirs := pathesInRepository
+ moduleDirs := pathsInRepository
collect:[:pathInRepository |
(pathInRepository asCollectionOfSubstringsSeparatedByAny:'/\') first.
].
moduleDirs do:[:moduleDir |
- |pathesInModule pathesInModuleAsArgument|
-
- pathesInModule := pathesInRepository
+ |pathsInModule pathsInModuleAsArgument|
+
+ pathsInModule := pathsInRepository
select:[:pathInRepository |
|moduleOfThisPath|
@@ -2768,7 +2768,7 @@
].
].
- pathesInModuleAsArgument := pathesInModule
+ pathsInModuleAsArgument := pathsInModule
collect:[:eachPath |
(eachPath includes:Character space) ifTrue:[
'"',eachPath,'"'
@@ -2776,20 +2776,20 @@
eachPath
].
].
- pathesInModuleAsArgument := pathesInModuleAsArgument asStringCollection asStringWith:Character space.
-
- self activityNotification:'setting symbolic name for: ', pathesInModuleAsArgument.
+ pathsInModuleAsArgument := pathsInModuleAsArgument asStringCollection asStringWith:Character space.
+
+ self activityNotification:'setting symbolic name for: ', pathsInModuleAsArgument.
self information:'Implementation not finished yet'.
^self.
- perforceCommand := ('label "' , pathesInRepository, '"').
+ perforceCommand := ('label "' , pathsInRepository, '"').
outputStream := ReadWriteStream on:''.
errorStream := ReadWriteStream on:''.
- result := self executePerforceCommand:perforceCommand inDirectory:self root
- inputFrom:nil outputTo:outputStream
+ result := self executePerforceCommand:perforceCommand inDirectory:self root
+ inputFrom:nil outputTo:outputStream
errorTo:errorStream
- logHeader:('set label ', pathesInRepository, '.').
+ logHeader:('set label ', pathsInRepository, '.').
result ifFalse:[
^ nil
].
@@ -2799,24 +2799,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' )
"