hg/stx-libbasic3: comparison SourceCodeManagerUtilities.st

equal deleted inserted replaced

-:4a56f1f1fa48
+:bb70a0f30e98
 mgr := currentClass sourceCodeManager.
 mgr isNil ifTrue:[
 self warn:'No sourceCode manager - check settings'.
 ^ self
 ].
-rev := currentClass binaryRevision.
+currentClass isLoaded ifTrue:[
-rev2 := currentClass revision.
+rev := currentClass binaryRevision.
-rev isNil ifTrue:[
+rev2 := currentClass revision.
-rev := rev2
+rev isNil ifTrue:[
-].
+rev := rev2
-rev isNil ifTrue:[
+].
-self warn:'Class seems to be not yet in the repository'.
+rev isNil ifTrue:[
-^ self
+self warn:'Class seems to be not yet in the repository'.
+^ self
+].
 ].
 "/
 "/ class in repository - ask for revision
 "/
 rev := SourceCodeManagerUtilities
 askForExistingRevision:msg
 title:'CheckOut from repository'
 class:currentClass.
+rev isNil ifTrue:[
+"/ cancelled
+^ self
+].
 (rev notNil or:[containerFile notNil]) ifTrue:[
 rev notNil ifTrue:[
 rev withoutSpaces isEmpty ifTrue:[
 msg := 'extracting newest %1 (' , (newestRev ? '???') , ')'.
 ] do:[
 sourceToLoad := aStream contents asString.
 ].
 aStream close.
+currentClass isLoaded ifFalse:[
+rev = newestRev ifTrue:[
+currentClass autoload.
+] ifFalse:[
+sourceToLoad readStream fileIn.
+].
+^ self.
+].
 self activityNotification:'generating current source...'.
 aStream := '' writeStream.
 Method flushSourceStreamCache.
 changed isEmpty ifTrue:[
 self information:'Versions are identical.'.
 ^ self
 ].
 msg := 'Load repository version ?'.
-msg := msg , '\\This will undo all your changes made to the class.'.
+msg := msg , '\\This will undo your changes made to the class (if any were made).'.
 labels := #('cancel' 'load').
 values := #(nil #load).
 ] ifFalse:[
 changed isEmpty ifTrue:[
 msg := 'Load repository version ?'.
 msg := msg , '\\This will load methods which are not present in the class.'.
 labels := #('cancel' 'load').
 values := #(nil #load).
 ] ifFalse:[
 msg := 'Load repository version, or merge it into your current version ?'.
-msg := msg , '\\Load will undo all your changes made to the class;'.
+msg := msg , '\\Load will undo your changes made to the class (if any were made);'.
 msg := msg , '\Merge will only load methods which are not present in the class.'.
 ].
 ]
 ] ifFalse:[
 onlyInRep isEmpty ifTrue:[
 msg := 'Load repository version ?'.
-msg := msg , '\\This will undo all your changes made to the class,'.
+msg := msg , '\\This will undo your changes made to the class (if any were made),'.
 msg := msg , '\and remove methods which are not present in the repository version.'.
 labels := #('cancel' 'load').
 values := #(nil #load).
 ] ifFalse:[
 msg := 'Load repository version, or merge it into your current version ?'.
-msg := msg , '\\Load will undo all your changes made to the class;'.
+msg := msg , '\\Load will undo your changes made to the class (if any were made);'.
 msg := msg , '\Merge will only load methods which are not present in the class.'.
 ]
 ].
 answer := (Dialog confirmWithCancel:msg withCRs
 labels:(resources array:labels)
 ! !
 !SourceCodeManagerUtilities class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.29 2000-11-14 16:14:30 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.30 2000-11-14 17:15:57 cg Exp $'
 ! !

changeset 989	bb70a0f30e98
parent 987	fa4fc87b8540
child 990	edf1dd382621