--- a/PerforceSourceCodeManagerUtilities.st Thu Jun 30 07:04:36 2016 +0200
+++ b/PerforceSourceCodeManagerUtilities.st Tue Jun 28 08:06:44 2016 +0100
@@ -1663,7 +1663,7 @@
self perforceError raiseErrorString:('Error when getting a change list for ', checkInDefinition definitionObjectString, '.').
^false
].
- packagePath := Smalltalk packageDirectoryForPackageId:checkInDefinition package.
+ packagePath := Smalltalk getPackageDirectoryForPackage:checkInDefinition package.
fullFilename := (packagePath construct:checkInDefinition packageDir) construct:checkInDefinition fileName.
tmpFilename := self getTemporaryFilenameFor:fullFilename pathName.
tmpFilename directory recursiveMakeDirectory.
@@ -1715,6 +1715,8 @@
self activityNotification:''.
^result
+
+ "Modified: / 28-06-2016 / 07:55:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
askForMergedSource:mergedSource
@@ -1937,7 +1939,7 @@
|perforceCommand outputStream errorStream result packagePath fullFilename depotPath|
- packagePath := Smalltalk packageDirectoryForPackageId:checkInDefinition package.
+ packagePath := Smalltalk getPackageDirectoryForPackage:checkInDefinition package.
fullFilename := packagePath construct:checkInDefinition packageDir.
depotPath := self getDepotPathForLocalPath:fullFilename pathName.
perforceCommand := ('dirs "' ,depotPath , '"').
@@ -1945,20 +1947,22 @@
errorStream := ReadWriteStream on:''.
self getTemporaryWorkspaceFor:checkInDefinition.
self temporaryWorkSpace isNil ifTrue:[
- self perforceError raiseErrorString:('Error getting temporary workspace when check for existing container ', checkInDefinition definitionObjectString, '.').
- ^false.
+ self perforceError raiseErrorString:('Error getting temporary workspace when check for existing container ', checkInDefinition definitionObjectString, '.').
+ ^false.
].
result := self temporaryWorkSpace executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root
- inputFrom:nil outputTo:outputStream
- errorTo:errorStream
- logHeader:('dirs in checkForExistingContainer for ', depotPath, '.').
+ inputFrom:nil outputTo:outputStream
+ errorTo:errorStream
+ logHeader:('dirs in checkForExistingContainer for ', depotPath, '.').
result ifFalse:[
- ^ false
+ ^ false
].
errorStream contents notEmpty ifTrue:[
- ^false
+ ^false
].
^ true
+
+ "Modified: / 28-06-2016 / 07:55:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
checkIn:checkInDefinition submit:doSubmit
@@ -1968,163 +1972,165 @@
self activityNotification:'checkin ' , checkInDefinition definitionObjectString , ' to perforce repository...'.
[
- cls := checkInDefinition definitionClass.
- self getTemporaryWorkspaceFor:checkInDefinition.
- self temporaryWorkSpace isNil ifTrue:[
- self perforceError raiseErrorString:('Error getting temporary workspace when check in ', checkInDefinition definitionObjectString, '.').
- ^false.
- ].
- baseRevision := checkInDefinition getLocalRevisionNumber.
- newestInRepository := checkInDefinition getReposRevisionNumberBeforeCheckin.
- (checkInDefinition isClassCheckin and:[baseRevision isNil]) ifTrue:[
- (Dialog confirm:('The version-info of ',checkInDefinition definitionObjectString allBold,' not exists. \Patch the version info?') withCRs)
- ifTrue:[
- newVersionString := self updatedRevisionStringOf:cls
- forRevision:newestInRepository printString with:(cls revisionStringOfManager:PerforceSourceCodeManager).
- PerforceSourceCodeManager updateVersionMethod:(PerforceSourceCodeManager nameOfVersionMethodInClasses)
- of:cls
- for:newVersionString.
- baseRevision := checkInDefinition getLocalRevisionNumber.
- baseRevision notNil ifTrue:[
- (Dialog confirm:('Check in ', checkInDefinition definitionObjectString allBold, 'based on version ', baseRevision printString, '?') withCRs)
- ifFalse:[
- ^false.
- ].
- ].
- ] ifFalse:[
- ^false
- ].
- ].
- packagePath := Smalltalk packageDirectoryForPackageId:checkInDefinition package.
- fullFilename := (packagePath construct:checkInDefinition packageDir) construct:checkInDefinition fileName.
- tmpFilename := self getTemporaryFilenameFor:fullFilename pathName.
- tmpFilename directory recursiveMakeDirectory.
- checkInDefinition isClassCheckin ifTrue:[
- baseRevision > newestInRepository ifTrue:[
- openChangeNumber := self getOpenChangeFor:checkInDefinition.
- openChangeNumber isNil ifTrue:[
- (Dialog confirm:('The version-info of ',checkInDefinition definitionObjectString allBold,' is wrong \(The class version (',baseRevision printString allBold,') is newer than the newest version in the repository (',newestInRepository printString allBold,').\\Patch the version and checkin ?') withCRs)
- ifTrue:[
- newVersionString := self updatedRevisionStringOf:cls
- forRevision:newestInRepository printString with:(cls revisionStringOfManager:PerforceSourceCodeManager).
- PerforceSourceCodeManager updateVersionMethod:(PerforceSourceCodeManager nameOfVersionMethodInClasses)
- of:cls
- for:newVersionString.
-
- cls updateVersionMethodFor:newVersionString.
- ].
- ].
- ].
- ].
- checkInDefinition isClassCheckin ifTrue:[
- fileNameAndRev := checkInDefinition fileName, '#', baseRevision printString.
- ] ifFalse:[
- fileNameAndRev := checkInDefinition fileName, '#', newestInRepository printString.
- ].
- tmpFilenameAndRev := tmpFilename directory construct:fileNameAndRev.
-
- openChangeNumber notNil ifTrue:[
- s := tmpFilename writeStream.
- checkInDefinition isClassCheckin ifTrue:[
- PerforceSourceCodeManager fileOutSourceCodeOf:cls on:s.
- ] ifFalse:[
- s nextPutAll:checkInDefinition fileContents.
- ].
- s close.
- self changeChangeDescriptionTo:checkInDefinition logMessage asStringCollection changeNumber:openChangeNumber printString.
- doSubmit ifTrue:[
- self submitChangeNumber:openChangeNumber printString
- ].
- ^true
- ].
- perforceCommand := ('revert "' , tmpFilename pathName, '"').
- outputStream := ReadWriteStream on:''.
- errorStream := ReadWriteStream on:''.
- result := self temporaryWorkSpace executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root
- inputFrom:nil outputTo:outputStream
- errorTo:errorStream
- logHeader:('sync ', checkInDefinition definitionObjectString, ' to revision ', baseRevision printString, '.').
- result ifFalse:[
- ^ false
- ].
- perforceCommand := ('sync -f "' , tmpFilenameAndRev pathName, '"').
- outputStream := ReadWriteStream on:''.
- errorStream := ReadWriteStream on:''.
- result := self temporaryWorkSpace executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root
- inputFrom:nil outputTo:outputStream
- errorTo:errorStream
- logHeader:('sync ', checkInDefinition definitionObjectString, ' to revision ', baseRevision printString, '.').
- result ifFalse:[
- ^ false
- ].
-
- number := self getChangeListNumber.
- number isNil ifTrue:[
- self perforceError raiseErrorString:('Error when getting a change list for ', checkInDefinition definitionObjectString, '.').
- ^false
- ].
- perforceCommand := ('edit -c ' ,number printString, ' "', tmpFilename pathName, '"').
- outputStream := ReadWriteStream on:''.
- errorStream := ReadWriteStream on:''.
- result := self temporaryWorkSpace executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root
- inputFrom:nil outputTo:outputStream
- errorTo:errorStream
- logHeader:('edit ', checkInDefinition definitionObjectString, '.').
- result ifFalse:[
- ^ false
- ].
- s := tmpFilename writeStream.
- checkInDefinition isClassCheckin ifTrue:[
- PerforceSourceCodeManager fileOutSourceCodeOf:cls on:s.
- ] ifFalse:[
- s nextPutAll:checkInDefinition fileContents.
- ].
- s close.
- perforceCommand := ('diff -db -dw -dl "' , tmpFilename pathName, '"').
- outputStream := ReadWriteStream on:''.
- errorStream := ReadWriteStream on:''.
- result := self temporaryWorkSpace executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root
- inputFrom:nil outputTo:outputStream
- errorTo:errorStream
- logHeader:('diff ', checkInDefinition definitionObjectString, '.').
- diffOutput := outputStream contents asStringCollection.
- haveChange := diffOutput isEmptyOrNil or:[diffOutput notEmptyOrNil and:[diffOutput size > 1]].
- haveChange ifFalse:[
- self information:checkInDefinition definitionObjectString, ' not changed for revision ', baseRevision printString.
- newestInRepository ~= baseRevision ifTrue:[
- newVersionString := self updatedRevisionStringOf:cls
- forRevision:newestInRepository printString with:(cls revisionStringOfManager:PerforceSourceCodeManager).
- PerforceSourceCodeManager updateVersionMethod:(PerforceSourceCodeManager nameOfVersionMethodInClasses)
- of:cls
- for:newVersionString.
- ].
- perforceCommand := ('revert "' , tmpFilename pathName, '"').
- outputStream := ReadWriteStream on:''.
- errorStream := ReadWriteStream on:''.
- result := self temporaryWorkSpace executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root
- inputFrom:nil outputTo:outputStream
- errorTo:errorStream
- logHeader:('revert ', checkInDefinition definitionObjectString, '.').
- ^true
- ].
- checkInDefinition isClassCheckin ifTrue:[
- nextVersionMethod := self nextRevisionStringFor:checkInDefinition.
- nextVersionMethod isNil ifTrue:[
- self perforceError raiseErrorString:('Cant get next version method string for ', checkInDefinition definitionObjectString, ' revision ', baseRevision printString, '.').
- ^false
- ].
- PerforceSourceCodeManager updateVersionMethod:(PerforceSourceCodeManager nameOfVersionMethodInClasses)
- of:cls
- for:nextVersionMethod.
- ].
- result := self changeChangeDescriptionTo:checkInDefinition logMessage asStringCollection changeNumber:number printString.
- doSubmit ifTrue:[
- result := self submitChangeNumber:number printString
- ].
+ cls := checkInDefinition definitionClass.
+ self getTemporaryWorkspaceFor:checkInDefinition.
+ self temporaryWorkSpace isNil ifTrue:[
+ self perforceError raiseErrorString:('Error getting temporary workspace when check in ', checkInDefinition definitionObjectString, '.').
+ ^false.
+ ].
+ baseRevision := checkInDefinition getLocalRevisionNumber.
+ newestInRepository := checkInDefinition getReposRevisionNumberBeforeCheckin.
+ (checkInDefinition isClassCheckin and:[baseRevision isNil]) ifTrue:[
+ (Dialog confirm:('The version-info of ',checkInDefinition definitionObjectString allBold,' not exists. \Patch the version info?') withCRs)
+ ifTrue:[
+ newVersionString := self updatedRevisionStringOf:cls
+ forRevision:newestInRepository printString with:(cls revisionStringOfManager:PerforceSourceCodeManager).
+ PerforceSourceCodeManager updateVersionMethod:(PerforceSourceCodeManager nameOfVersionMethodInClasses)
+ of:cls
+ for:newVersionString.
+ baseRevision := checkInDefinition getLocalRevisionNumber.
+ baseRevision notNil ifTrue:[
+ (Dialog confirm:('Check in ', checkInDefinition definitionObjectString allBold, 'based on version ', baseRevision printString, '?') withCRs)
+ ifFalse:[
+ ^false.
+ ].
+ ].
+ ] ifFalse:[
+ ^false
+ ].
+ ].
+ packagePath := Smalltalk getPackageDirectoryForPackage:checkInDefinition package.
+ fullFilename := (packagePath construct:checkInDefinition packageDir) construct:checkInDefinition fileName.
+ tmpFilename := self getTemporaryFilenameFor:fullFilename pathName.
+ tmpFilename directory recursiveMakeDirectory.
+ checkInDefinition isClassCheckin ifTrue:[
+ baseRevision > newestInRepository ifTrue:[
+ openChangeNumber := self getOpenChangeFor:checkInDefinition.
+ openChangeNumber isNil ifTrue:[
+ (Dialog confirm:('The version-info of ',checkInDefinition definitionObjectString allBold,' is wrong \(The class version (',baseRevision printString allBold,') is newer than the newest version in the repository (',newestInRepository printString allBold,').\\Patch the version and checkin ?') withCRs)
+ ifTrue:[
+ newVersionString := self updatedRevisionStringOf:cls
+ forRevision:newestInRepository printString with:(cls revisionStringOfManager:PerforceSourceCodeManager).
+ PerforceSourceCodeManager updateVersionMethod:(PerforceSourceCodeManager nameOfVersionMethodInClasses)
+ of:cls
+ for:newVersionString.
+
+ cls updateVersionMethodFor:newVersionString.
+ ].
+ ].
+ ].
+ ].
+ checkInDefinition isClassCheckin ifTrue:[
+ fileNameAndRev := checkInDefinition fileName, '#', baseRevision printString.
+ ] ifFalse:[
+ fileNameAndRev := checkInDefinition fileName, '#', newestInRepository printString.
+ ].
+ tmpFilenameAndRev := tmpFilename directory construct:fileNameAndRev.
+
+ openChangeNumber notNil ifTrue:[
+ s := tmpFilename writeStream.
+ checkInDefinition isClassCheckin ifTrue:[
+ PerforceSourceCodeManager fileOutSourceCodeOf:cls on:s.
+ ] ifFalse:[
+ s nextPutAll:checkInDefinition fileContents.
+ ].
+ s close.
+ self changeChangeDescriptionTo:checkInDefinition logMessage asStringCollection changeNumber:openChangeNumber printString.
+ doSubmit ifTrue:[
+ self submitChangeNumber:openChangeNumber printString
+ ].
+ ^true
+ ].
+ perforceCommand := ('revert "' , tmpFilename pathName, '"').
+ outputStream := ReadWriteStream on:''.
+ errorStream := ReadWriteStream on:''.
+ result := self temporaryWorkSpace executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root
+ inputFrom:nil outputTo:outputStream
+ errorTo:errorStream
+ logHeader:('sync ', checkInDefinition definitionObjectString, ' to revision ', baseRevision printString, '.').
+ result ifFalse:[
+ ^ false
+ ].
+ perforceCommand := ('sync -f "' , tmpFilenameAndRev pathName, '"').
+ outputStream := ReadWriteStream on:''.
+ errorStream := ReadWriteStream on:''.
+ result := self temporaryWorkSpace executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root
+ inputFrom:nil outputTo:outputStream
+ errorTo:errorStream
+ logHeader:('sync ', checkInDefinition definitionObjectString, ' to revision ', baseRevision printString, '.').
+ result ifFalse:[
+ ^ false
+ ].
+
+ number := self getChangeListNumber.
+ number isNil ifTrue:[
+ self perforceError raiseErrorString:('Error when getting a change list for ', checkInDefinition definitionObjectString, '.').
+ ^false
+ ].
+ perforceCommand := ('edit -c ' ,number printString, ' "', tmpFilename pathName, '"').
+ outputStream := ReadWriteStream on:''.
+ errorStream := ReadWriteStream on:''.
+ result := self temporaryWorkSpace executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root
+ inputFrom:nil outputTo:outputStream
+ errorTo:errorStream
+ logHeader:('edit ', checkInDefinition definitionObjectString, '.').
+ result ifFalse:[
+ ^ false
+ ].
+ s := tmpFilename writeStream.
+ checkInDefinition isClassCheckin ifTrue:[
+ PerforceSourceCodeManager fileOutSourceCodeOf:cls on:s.
+ ] ifFalse:[
+ s nextPutAll:checkInDefinition fileContents.
+ ].
+ s close.
+ perforceCommand := ('diff -db -dw -dl "' , tmpFilename pathName, '"').
+ outputStream := ReadWriteStream on:''.
+ errorStream := ReadWriteStream on:''.
+ result := self temporaryWorkSpace executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root
+ inputFrom:nil outputTo:outputStream
+ errorTo:errorStream
+ logHeader:('diff ', checkInDefinition definitionObjectString, '.').
+ diffOutput := outputStream contents asStringCollection.
+ haveChange := diffOutput isEmptyOrNil or:[diffOutput notEmptyOrNil and:[diffOutput size > 1]].
+ haveChange ifFalse:[
+ self information:checkInDefinition definitionObjectString, ' not changed for revision ', baseRevision printString.
+ newestInRepository ~= baseRevision ifTrue:[
+ newVersionString := self updatedRevisionStringOf:cls
+ forRevision:newestInRepository printString with:(cls revisionStringOfManager:PerforceSourceCodeManager).
+ PerforceSourceCodeManager updateVersionMethod:(PerforceSourceCodeManager nameOfVersionMethodInClasses)
+ of:cls
+ for:newVersionString.
+ ].
+ perforceCommand := ('revert "' , tmpFilename pathName, '"').
+ outputStream := ReadWriteStream on:''.
+ errorStream := ReadWriteStream on:''.
+ result := self temporaryWorkSpace executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root
+ inputFrom:nil outputTo:outputStream
+ errorTo:errorStream
+ logHeader:('revert ', checkInDefinition definitionObjectString, '.').
+ ^true
+ ].
+ checkInDefinition isClassCheckin ifTrue:[
+ nextVersionMethod := self nextRevisionStringFor:checkInDefinition.
+ nextVersionMethod isNil ifTrue:[
+ self perforceError raiseErrorString:('Cant get next version method string for ', checkInDefinition definitionObjectString, ' revision ', baseRevision printString, '.').
+ ^false
+ ].
+ PerforceSourceCodeManager updateVersionMethod:(PerforceSourceCodeManager nameOfVersionMethodInClasses)
+ of:cls
+ for:nextVersionMethod.
+ ].
+ result := self changeChangeDescriptionTo:checkInDefinition logMessage asStringCollection changeNumber:number printString.
+ doSubmit ifTrue:[
+ result := self submitChangeNumber:number printString
+ ].
] ensure:[
- self activityNotification:''.
+ self activityNotification:''.
].
^result
+
+ "Modified: / 28-06-2016 / 07:55:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
createChange
@@ -2187,7 +2193,7 @@
self perforceError raiseErrorString:('Error getting temporary workspace when check in ', checkInDefinition definitionObjectString, '.').
^false.
].
- packagePath := Smalltalk packageDirectoryForPackageId:checkInDefinition package.
+ packagePath := Smalltalk getPackageDirectoryForPackage:checkInDefinition package.
fullFilename := (packagePath construct:checkInDefinition packageDir) construct:checkInDefinition fileName.
tmpFilename := self getTemporaryFilenameFor:fullFilename pathName.
tmpFilename directory recursiveMakeDirectory.
@@ -2215,6 +2221,8 @@
self activityNotification:''.
].
^result
+
+ "Modified: / 28-06-2016 / 07:55:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
deleteWorkSpaceFromServer
@@ -2623,7 +2631,7 @@
msg := msg , 'of ', clsOrNil name.
].
self activityNotification:msg,'...'.
- packagePath := Smalltalk packageDirectoryForPackageId:aPackage.
+ packagePath := Smalltalk getPackageDirectoryForPackage:aPackage.
fullFilename := (packagePath construct:packageDir) construct:classFileName.
depotPath := foundView getDepotPathForLocalPath:fullFilename pathName.
perforceCommand := ('filelog "' , depotPath, '"').
@@ -2722,6 +2730,8 @@
info at:#symbolicNames put:tags.
^ info
+
+ "Modified: / 28-06-2016 / 07:54:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
setSymbolicName:symbolicNameArg revision:rev overWrite:overWriteBool pathes:pathesInRepository
@@ -2893,7 +2903,7 @@
self activityNotification:'checking out source ' , checkoutName , revMsg.
- packagePath := Smalltalk packageDirectoryForPackageId:checkInDefinition package.
+ packagePath := Smalltalk getPackageDirectoryForPackage:checkInDefinition package.
fullFilename := (packagePath construct:checkInDefinition packageDir) construct:checkInDefinition fileName.
fullTempName := self getTemporaryFilenameFor:fullFilename pathName.
@@ -2972,6 +2982,8 @@
].
^ stream
+
+ "Modified: / 28-06-2016 / 07:53:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
submit
@@ -3065,7 +3077,7 @@
checkInDefinition workSpace:workSpace.
version := PerforceSourceCodeManager versionInfoClass new.
foundView := workSpace getViewForPackage:checkInDefinition package.
- packagePath := Smalltalk packageDirectoryForPackageId:checkInDefinition package.
+ packagePath := Smalltalk getPackageDirectoryForPackage:checkInDefinition package.
fullFilename := (packagePath construct:checkInDefinition packageDir) construct:checkInDefinition fileName.
depotPath := foundView getDepotPathForLocalPath:fullFilename pathName.
@@ -3085,6 +3097,8 @@
"
self initialRevisionStringFor:RTDBInspectorStartup inModule:'applistx' directory:'util/rtdb' container:'RTDBInterfaceInspector.st'
"
+
+ "Modified: / 28-06-2016 / 07:54:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
initialRevisionStringFor:checkInDefinition
@@ -3521,7 +3535,7 @@
packageID := PackageId from:aClass package.
module := packageID module.
foundView := self getViewForPackage:module.
- packagePath := Smalltalk packageDirectoryForPackageId:module.
+ packagePath := Smalltalk getPackageDirectoryForPackage:module.
sourceInfo := PerforceSourceCodeManager sourceInfoOfClass:aClass.
sourceInfo isNil ifTrue:[
PerforceSourceCodeManager reportError:('no sourceInfo for class: ' , aClass name).
@@ -3545,6 +3559,8 @@
forRevision:'6'
with:'$','Header','$'
"
+
+ "Modified: / 28-06-2016 / 07:53:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!PerforceSourceCodeManagerUtilities::WorkSpace methodsFor:'initialization'!
@@ -3710,7 +3726,7 @@
locPackage := package copyReplaceAll:$: with:$/.
[ packagePath isNil ] whileTrue:[
- packagePath := Smalltalk packageDirectoryForPackageId:locPackage.
+ packagePath := Smalltalk getPackageDirectoryForPackage:locPackage.
packagePath notNil ifTrue:[
^packagePath
].
@@ -3721,6 +3737,8 @@
"
PerforceSourceCodeManager perforceWorkspaces first value getViewForPackage:'applisddtx:application/rtdbInspector/builder'
"
+
+ "Modified: / 28-06-2016 / 07:54:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
perforceError