--- a/CVSSourceCodeManager.st Fri Aug 19 13:00:23 2011 +0200
+++ b/CVSSourceCodeManager.st Fri Aug 19 13:06:47 2011 +0200
@@ -524,6 +524,12 @@
"
! !
+!CVSSourceCodeManager class methodsFor:'others'!
+
+version_CVS
+ ^ '$$'
+! !
+
!CVSSourceCodeManager class methodsFor:'private'!
checkOut:relativeFilename module:moduleDir in:tempdir
@@ -4093,12 +4099,12 @@
"return a dictionary filled with revision info.
This extracts the relevant info from aString."
- |fixedString doNotShowAgainHolder|
-
- doNotShowAgainHolder := UserPreferences current showBadRevisionStringDialogs asValue.
+ |fixedString autoFixHolder|
+
+ autoFixHolder := UserPreferences current showBadRevisionStringDialogs not asValue.
Dialog aboutToOpenBoxNotificationSignal handle:[:ex |
- ex parameter addCheckBox:'Do not show this dialog again (proceed after fixing)' on:doNotShowAgainHolder.
+ ex parameter addCheckBox:'Do not show this dialog again (always fix & proceed)' on:autoFixHolder.
ex proceed.
] do:[
"/ temporary fix Felix' bad string translation:
@@ -4107,12 +4113,12 @@
fixedString := '$' , (aString copyFrom:3 to:(aString size - 2)) , '$'.
aClass isNil ifTrue:[
- doNotShowAgainHolder value ifTrue:[
+ autoFixHolder value ifFalse:[
Dialog information:'Attention: the CVS version string is corrupted (§-bug). Please fix it manually'.
]
] ifFalse:[
- (doNotShowAgainHolder value
- or:[ Dialog confirm:'Attention: the CVS version string is corrupted (§-bug). Fix it?' ]
+ (autoFixHolder value
+ or:[ Dialog confirm:('Attention: the CVS version string is corrupted in "%1" (§-bug). Fix it?' withCRs bindWith:aClass name) ]
) ifTrue:[
self updateVersionMethodOf:aClass for:fixedString.
].
@@ -4126,12 +4132,12 @@
fixedString := '$' , aString , '$'.
aClass isNil ifTrue:[
- doNotShowAgainHolder value ifTrue:[
+ autoFixHolder value ifFalse:[
Dialog information:'Attention: the CVS version string is corrupted (Umlaut remover-bug). Please fix it manually'.
]
] ifFalse:[
- (doNotShowAgainHolder value
- or:[ Dialog confirm:'Attention: the CVS version string is corrupted (Umlaut remover-bug). Fix it?']
+ (autoFixHolder value
+ or:[ Dialog confirm:('Attention: the CVS version string is corrupted in "%1" (Umlaut remover-bug). Fix it?' withCRs bindWith:aClass name) ]
) ifTrue:[
self updateVersionMethodOf:aClass for:fixedString.
].
@@ -4145,11 +4151,11 @@
fixedString := '$' , (aString copyFrom:2 to:(aString size - 1)) , '$'.
aClass isNil ifTrue:[
- doNotShowAgainHolder value ifTrue:[
+ autoFixHolder value ifFalse:[
Dialog information:'Attention: the CVS version string is corrupted (Escaper-bug). Please fix it manually'.
]
] ifFalse:[
- (doNotShowAgainHolder value
+ (autoFixHolder value
or:[ Dialog confirm:('Attention: the CVS version string is corrupted in "%1" (Escaper-bug).\\Fix it?' withCRs bindWith:aClass name) ]
) ifTrue:[
self updateVersionMethodOf:aClass for:fixedString.
@@ -4157,7 +4163,7 @@
].
].
].
- UserPreferences current showBadRevisionStringDialogs:doNotShowAgainHolder value.
+ UserPreferences current showBadRevisionStringDialogs:autoFixHolder value not.
].
^ self revisionInfoFromRCSString:(fixedString ? aString)
@@ -4168,7 +4174,7 @@
"
"Created: / 01-07-2011 / 13:51:41 / cg"
- "Modified: / 19-08-2011 / 12:56:23 / cg"
+ "Modified: / 19-08-2011 / 13:06:01 / cg"
!
revisionLogOf:clsOrNil fromRevision:firstRevOrNil toRevision:lastRevOrNil numberOfRevisions:numRevisionsOrNil fileName:classFileName directory:packageDir module:moduleDir
@@ -4983,11 +4989,7 @@
!CVSSourceCodeManager class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.397 2011-08-19 11:00:23 cg Exp $'
-!
-
-version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.397 2011-08-19 11:00:23 cg Exp $'
+ ^ '$vs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.397 2011-08-19 11:00:23 +00$'
! !
CVSSourceCodeManager initialize!