#UI_ENHANCEMENT by cg
class: CVSSourceCodeManager class
changed:
#checkin:text:directory:module:logMessage:force:onBranch:
#checkinClass:fileName:directory:module:source:logMessage:force:asBranch:
--- a/CVSSourceCodeManager.st Mon Jan 06 16:02:46 2020 +0100
+++ b/CVSSourceCodeManager.st Wed Jan 29 15:04:22 2020 +0100
@@ -1838,7 +1838,7 @@
"/
"/ pretty good - nothing has changed in the meanwhile
"/
- Transcript showCR:'CVSSourceCodeManager [info]: checking in ' , containerFilename , ' ...'
+ Logger info:'checking in %1...' with:containerFilename
] ifFalse:[
| mySource mergedSource |
@@ -1919,7 +1919,7 @@
"/ Transcript showCR:'checkin aborted - (no merge; repository unchanged)'.
"/ ^ false.
"/ ].
- Transcript showCR:'CVSSourceCodeManager [info]: checking in ' , containerFilename , ' (merged other changes) ...'
+ Logger info:'checking in %1 (merged other changes)...' with:containerFilename
]
] ifFalse:[
(whatHappened startsWith:'C ') ifTrue:[
@@ -2034,10 +2034,10 @@
].
checkInRepaired ifTrue:[
- Transcript showCR:'CVSSourceCodeManager [info]: checking in ' , containerFilename , ' (manually repaired version) ...'
+ Logger info:'checking in %1 (manually repaired version)...' with:containerFilename
] ifFalse:[
'CVSSourceCodeManager [warning]: cannot (for now) checkin; conflicts found' infoPrintCR.
- Transcript showCR:'checkin of ' , containerFilename , ' aborted (conflicting changes; repository unchanged)'.
+ Logger warning:'checkin of %1 aborted (conflicting changes; repository unchanged)' with:containerFilename.
^ false.
]
] ifFalse:[
@@ -2450,7 +2450,7 @@
"/
"/ pretty good - nothing has changed in the meanwhile
"/
- Transcript showCR:('CVSSourceCodeManager [info]: checking in %1 (%2)...' bindWith:className with:modulePath).
+ Logger info:'checking in %1 (%2)...' with:className with:modulePath.
] ifFalse:[
|mySource mergedSource |
@@ -2545,7 +2545,7 @@
"/ Transcript showCR:'checkin aborted - (no merge; repository unchanged)'.
"/ ^ false.
"/ ].
- Transcript showCR:('CVSSourceCodeManager [info]: checking in %1 (%2) (merge)...' bindWith:className with:modulePath).
+ Logger info:'checking in %1 (%2) (merge)...' with:className with:modulePath.
]
] ifFalse:[
(whatHappened startsWith:'C ') ifTrue:[
@@ -2690,13 +2690,13 @@
checkInRepaired ifTrue:[
checkInNew ifTrue:[
- Transcript showCR:('CVSSourceCodeManager [info]: checking in %1 (%2) (force)...' bindWith:className with:modulePath).
+ Logger info:'checking in %1 (%2) (force)...' with:className with:modulePath.
] ifFalse:[
conflictResolvedManually := true. "/ checkInRepaired and:[checkInNew not].
- Transcript showCR:('CVSSourceCodeManager [info]: checking in %1 (%2) (manually repaired)...' bindWith:className with:modulePath).
+ Logger info:'checking in %1 (%2) (manually repaired)...' with:className with:modulePath.
].
] ifFalse:[
- Transcript showCR:'checkin of ' , className , ' aborted (conflicting changes; repository unchanged)'.
+ Logger warning:'checkin of %1 aborted (conflicting changes; repository unchanged)' with:className.
self reportError:'checkin of ' , className , ' aborted (conflicting changes; repository unchanged)'.
^ false.
].