#UI_ENHANCEMENT by cg
class: CVSSourceCodeManager
changed:
#checkin:text:directory:module:logMessage:force:
#checkinClass:fileName:directory:module:source:logMessage:force:
--- a/CVSSourceCodeManager.st Thu Oct 13 23:45:23 2016 +0200
+++ b/CVSSourceCodeManager.st Fri Oct 14 03:42:18 2016 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
"
COPYRIGHT (c) 1995 by Claus Gittinger
All Rights Reserved
@@ -1818,7 +1816,7 @@
"/
"/ pretty good - nothing has changed in the meanwhile
"/
- Transcript showCR:'checking in ' , containerFilename , ' ...'
+ Transcript showCR:'CVSSourceCodeManager [info]: checking in ' , containerFilename , ' ...'
] ifFalse:[
| mySource mergedSource |
@@ -1899,7 +1897,7 @@
"/ Transcript showCR:'checkin aborted - (no merge; repository unchanged)'.
"/ ^ false.
"/ ].
- Transcript showCR:'checking in ' , containerFilename , ' (merged other changes) ...'
+ Transcript showCR:'CVSSourceCodeManager [info]: checking in ' , containerFilename , ' (merged other changes) ...'
]
] ifFalse:[
(whatHappened startsWith:'C ') ifTrue:[
@@ -2014,7 +2012,7 @@
].
checkInRepaired ifTrue:[
- Transcript showCR:'checking in ' , containerFilename , ' (manually repaired version) ...'
+ Transcript showCR:'CVSSourceCodeManager [info]: checking in ' , containerFilename , ' (manually repaired version) ...'
] ifFalse:[
'CVSSourceCodeManager [warning]: cannot (for now) checkin; conflicts found' infoPrintCR.
Transcript showCR:'checkin of ' , containerFilename , ' aborted (conflicting changes; repository unchanged)'.
@@ -2411,7 +2409,7 @@
"/
"/ pretty good - nothing has changed in the meanwhile
"/
- Transcript showCR:('checking in %1 (%2)...' bindWith:className with:modulePath).
+ Transcript showCR:('CVSSourceCodeManager [info]: checking in %1 (%2)...' bindWith:className with:modulePath).
] ifFalse:[
|mySource mergedSource |
@@ -2506,7 +2504,7 @@
"/ Transcript showCR:'checkin aborted - (no merge; repository unchanged)'.
"/ ^ false.
"/ ].
- Transcript showCR:('checking in %1 (%2) (merge)...' bindWith:className with:modulePath).
+ Transcript showCR:('CVSSourceCodeManager [info]: checking in %1 (%2) (merge)...' bindWith:className with:modulePath).
]
] ifFalse:[
(whatHappened startsWith:'C ') ifTrue:[
@@ -2641,10 +2639,10 @@
checkInRepaired ifTrue:[
checkInNew ifTrue:[
- Transcript showCR:('checking in %1 (%2) (force)...' bindWith:className with:modulePath).
+ Transcript showCR:('CVSSourceCodeManager [info]: checking in %1 (%2) (force)...' bindWith:className with:modulePath).
] ifFalse:[
conflictResolvedManually := true. "/ checkInRepaired and:[checkInNew not].
- Transcript showCR:('checking in %1 (%2) (manually repaired)...' bindWith:className with:modulePath).
+ Transcript showCR:('CVSSourceCodeManager [info]: checking in %1 (%2) (manually repaired)...' bindWith:className with:modulePath).
].
] ifFalse:[
Transcript showCR:'checkin of ' , className , ' aborted (conflicting changes; repository unchanged)'.
@@ -4732,17 +4730,17 @@
"/ The repair code will be removed at some time in the future...
"/ temporary fix Felix' bad string translation:
- (aString startsWith:'§Header:') ifTrue:[
- (aString endsWith:'Exp §') ifTrue:[
+ (aString startsWith:'§Header:') ifTrue:[
+ (aString endsWith:'Exp §') ifTrue:[
fixedString := '$' , (aString copyFrom:3 to:(aString size - 2)) , '$'.
aClass isNil ifTrue:[
autoFixHolder value ifFalse:[
- Dialog information:'Attention: the CVS version string is corrupted (§-bug). Please fix it manually'.
+ Dialog information:'Attention: the CVS version string is corrupted (§-bug). Please fix it manually'.
]
] ifFalse:[
(autoFixHolder value
- or:[ Dialog confirm:('Attention: the CVS version string is corrupted in "%1" (§-bug). Fix it?' withCRs bindWith:aClass name) ]
+ 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.
].
@@ -4750,7 +4748,7 @@
].
].
- "/ temporary fix Jan's bad Umlaut-removal (which results in Felix's bad § being removed):
+ "/ temporary fix Jan's bad Umlaut-removal (which results in Felix's bad § being removed):
(aString startsWith:'Header: ') ifTrue:[
(aString endsWith:'Exp ') ifTrue:[
fixedString := '$' , aString , '$'.