The Trunk: System-mt.1229.mcz

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

The Trunk: System-mt.1229.mcz

commits-2
Marcel Taeumel uploaded a new version of System to project The Trunk:
http://source.squeak.org/trunk/System-mt.1229.mcz

==================== Summary ====================

Name: System-mt.1229
Author: mt
Time: 19 April 2021, 4:25:07.545053 pm
UUID: e30af833-38ea-524f-b023-4657894a7d92
Ancestors: System-mt.1228

Fixes #changeStampPerSe and use it to remove interruptions from the update stream (again).

=============== Diff against System-mt.1228 ===============

Item was changed:
  ----- Method: ChangeSet>>event: (in category 'change logging') -----
  event: anEvent
  "Hook for SystemChangeNotifier"
  anEvent itemKind = SystemChangeNotifier classKind ifTrue: [
  anEvent isRemoved
  ifTrue: [self noteRemovalOf: anEvent item].
  anEvent isAdded
  ifTrue: [self addClass: anEvent item].
  anEvent isModified
  ifTrue: [anEvent anyChanges ifTrue: [self changeClass: anEvent item from: anEvent oldItem]].
  anEvent isCommented
  ifTrue: [self commentClass: anEvent item].
  anEvent isRenamed
  ifTrue: [self renameClass: anEvent item from: anEvent oldName to: anEvent newName].
  anEvent isReorganized
  ifTrue: [self reorganizeClass: anEvent item].
  anEvent isRecategorized
  ifTrue: [self changeClass: anEvent item from: anEvent item].
  ].
 
  anEvent itemKind = SystemChangeNotifier methodKind ifTrue: [
  anEvent isAdded
  ifTrue: [self noteNewMethod: anEvent item forClass: anEvent itemClass selector: anEvent itemSelector priorMethod: nil].
  anEvent isModified
  ifTrue: [self noteNewMethod: anEvent item forClass: anEvent itemClass selector: anEvent itemSelector priorMethod: anEvent oldItem].
  anEvent isRemoved
+ ifTrue: [self removeSelector: anEvent itemSelector class: anEvent itemClass priorMethod: anEvent item lastMethodInfo: {anEvent item sourcePointer. anEvent itemProtocol. Utilities changeStampPerSe}].
- ifTrue: [self removeSelector: anEvent itemSelector class: anEvent itemClass priorMethod: anEvent item lastMethodInfo: {anEvent item sourcePointer. anEvent itemProtocol. Utilities changeStamp}].
  anEvent isRecategorized
  ifTrue: [self reorganizeClass: anEvent itemClass].
  ].!

Item was changed:
  ----- Method: ClassChangeRecord>>noteChangeType:fromClass: (in category 'all changes') -----
  noteChangeType: changeSymbol fromClass: class
 
+ timeStamp := Utilities changeStampPerSe.
- timeStamp := Utilities changeStamp.
  (changeSymbol = #new or: [changeSymbol = #add]) ifTrue:
  [changeTypes add: #add.
  changeTypes remove: #change ifAbsent: [].
  revertable := false.
  ^ self].
  changeSymbol = #change ifTrue:
  [(changeTypes includes: #add) ifTrue: [^ self].
  ^ changeTypes add: changeSymbol].
  changeSymbol == #addedThenRemoved ifTrue:
  [^ self].  "An entire class was added but then removed"
  changeSymbol = #comment ifTrue:
  [^ changeTypes add: changeSymbol].
  changeSymbol = #reorganize ifTrue:
  [^ changeTypes add: changeSymbol].
  changeSymbol = #rename ifTrue:
  [^ changeTypes add: changeSymbol].
  (changeSymbol beginsWith: 'oldName: ') ifTrue:
  ["Must only be used when assimilating other changeSets"
  (changeTypes includes: #add) ifTrue: [^ self].
  priorName := changeSymbol copyFrom: 'oldName: ' size + 1 to: changeSymbol size.
  ^ changeTypes add: #rename].
  changeSymbol = #remove ifTrue:
  [(changeTypes includes: #add)
  ifTrue: [changeTypes add: #addedThenRemoved]
  ifFalse: [changeTypes add: #remove].
  ^ changeTypes removeAllFoundIn: #(add change comment reorganize)].
 
  self error: 'Unrecognized changeType'!

Item was changed:
  ----- Method: Utilities class>>changeStampPerSe (in category 'identification') -----
  changeStampPerSe
  "Answer a string to be pasted into source code to mark who changed it and when."
  ^String streamContents:
  [ : stream |
+ stream nextPutAll: (self authorInitialsPerSe isEmptyOrNil
- self authorInitialsPerSe isEmptyOrNil
  ifTrue: [ 'ยท' ]
+ ifFalse: [ self authorInitialsPerSe ]).
- ifFalse: [ self authorInitialsPerSe ].
  stream
  space ;
  nextPutAll: Date today mmddyyyy ;
  space.
+ stream nextPutAll: ((String streamContents:
- (String streamContents:
  [ : s |
  Time now
  print24: true
  on: s ])
  copyFrom: 1
+ to: 5) ]!
- to: 5 ]!