ChangeSet.st
author Jan Vrany <jan.vrany@fit.cvut.cz>
Tue, 03 Apr 2012 13:29:20 +0100
branchjv
changeset 3043 a13599b9f7e6
parent 3042 48e76977cdc3
child 3049 b920db5cdeb3
permissions -rw-r--r--
Added timestamp processing
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3
263f814933d4 *** empty log message ***
claus
parents: 0
diff changeset
     1
"
263f814933d4 *** empty log message ***
claus
parents: 0
diff changeset
     2
 COPYRIGHT (c) 1993 by Claus Gittinger
2376
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
     3
              All Rights Reserved
3
263f814933d4 *** empty log message ***
claus
parents: 0
diff changeset
     4
263f814933d4 *** empty log message ***
claus
parents: 0
diff changeset
     5
 This software is furnished under a license and may be used
263f814933d4 *** empty log message ***
claus
parents: 0
diff changeset
     6
 only in accordance with the terms of that license and with the
263f814933d4 *** empty log message ***
claus
parents: 0
diff changeset
     7
 inclusion of the above copyright notice.   This software may not
263f814933d4 *** empty log message ***
claus
parents: 0
diff changeset
     8
 be provided or otherwise made available to, or used by, any
263f814933d4 *** empty log message ***
claus
parents: 0
diff changeset
     9
 other person.  No title to or ownership of the software is
263f814933d4 *** empty log message ***
claus
parents: 0
diff changeset
    10
 hereby transferred.
263f814933d4 *** empty log message ***
claus
parents: 0
diff changeset
    11
"
921
fa4db05c887b oops - nameSpace prefix handling needed fix due
Claus Gittinger <cg@exept.de>
parents: 916
diff changeset
    12
"{ Package: 'stx:libbasic3' }"
fa4db05c887b oops - nameSpace prefix handling needed fix due
Claus Gittinger <cg@exept.de>
parents: 916
diff changeset
    13
0
470788421600 Initial revision
claus
parents:
diff changeset
    14
OrderedCollection subclass:#ChangeSet
2412
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    15
	instanceVariableNames:'changedClasses changeSelectors name'
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    16
	classVariableNames:''
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    17
	poolDictionaries:''
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    18
	category:'System-Changes'
0
470788421600 Initial revision
claus
parents:
diff changeset
    19
!
470788421600 Initial revision
claus
parents:
diff changeset
    20
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
    21
Object subclass:#ChangeFileReader
2412
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    22
	instanceVariableNames:'inputStream parseTree changeAction changeSet selector receiver
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    23
		arguments receiverSelector receiverReceiver lineNumber position
3043
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
    24
		className methodSelector chunk timestamp'
2412
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    25
	classVariableNames:''
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    26
	poolDictionaries:''
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    27
	privateIn:ChangeSet
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
    28
!
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
    29
2256
b98137d2aa30 changed: #changesFromStream:for:reader:do:
Claus Gittinger <cg@exept.de>
parents: 2247
diff changeset
    30
Error subclass:#ChangeProcessingError
2412
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    31
	instanceVariableNames:''
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    32
	classVariableNames:''
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    33
	poolDictionaries:''
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    34
	privateIn:ChangeSet
2256
b98137d2aa30 changed: #changesFromStream:for:reader:do:
Claus Gittinger <cg@exept.de>
parents: 2247
diff changeset
    35
!
b98137d2aa30 changed: #changesFromStream:for:reader:do:
Claus Gittinger <cg@exept.de>
parents: 2247
diff changeset
    36
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
    37
SmalltalkChunkFileSourceWriter subclass:#ClassSourceWriter
3033
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
    38
	instanceVariableNames:'changeSetBeingSaved namespaceName topClassName classInfos
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
    39
		metaInfos'
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
    40
	classVariableNames:''
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
    41
	poolDictionaries:''
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
    42
	privateIn:ChangeSet
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
    43
!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
    44
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
    45
Object subclass:#ClassInfo
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
    46
	instanceVariableNames:'name superclass definition methods methodDictionary namespace'
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
    47
	classVariableNames:''
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
    48
	poolDictionaries:''
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
    49
	privateIn:ChangeSet::ClassSourceWriter
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
    50
!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
    51
1156
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
    52
Object subclass:#DiffSet
3032
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
    53
	instanceVariableNames:'changed onlyInReceiver onlyInArg same'
2412
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    54
	classVariableNames:''
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    55
	poolDictionaries:''
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    56
	privateIn:ChangeSet
1156
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
    57
!
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
    58
1182
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
    59
ChangeSet::ChangeFileReader subclass:#DolphinPACFileReader
2412
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    60
	instanceVariableNames:''
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    61
	classVariableNames:''
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    62
	poolDictionaries:''
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    63
	privateIn:ChangeSet
1182
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
    64
!
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
    65
2256
b98137d2aa30 changed: #changesFromStream:for:reader:do:
Claus Gittinger <cg@exept.de>
parents: 2247
diff changeset
    66
ChangeSet::ChangeProcessingError subclass:#InvalidChangeChunkError
2412
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    67
	instanceVariableNames:''
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    68
	classVariableNames:''
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    69
	poolDictionaries:''
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    70
	privateIn:ChangeSet
2256
b98137d2aa30 changed: #changesFromStream:for:reader:do:
Claus Gittinger <cg@exept.de>
parents: 2247
diff changeset
    71
!
b98137d2aa30 changed: #changesFromStream:for:reader:do:
Claus Gittinger <cg@exept.de>
parents: 2247
diff changeset
    72
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
    73
ChangeSet::ChangeFileReader subclass:#SIFChangeFileReader
2412
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    74
	instanceVariableNames:''
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    75
	classVariableNames:''
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    76
	poolDictionaries:''
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    77
	privateIn:ChangeSet
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
    78
!
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
    79
625
06f4ed35832b added #patches for ST80 compatibility
Claus Gittinger <cg@exept.de>
parents: 378
diff changeset
    80
!ChangeSet class methodsFor:'documentation'!
9
f5b6ab00bdf6 *** empty log message ***
claus
parents: 3
diff changeset
    81
f5b6ab00bdf6 *** empty log message ***
claus
parents: 3
diff changeset
    82
copyright
f5b6ab00bdf6 *** empty log message ***
claus
parents: 3
diff changeset
    83
"
f5b6ab00bdf6 *** empty log message ***
claus
parents: 3
diff changeset
    84
 COPYRIGHT (c) 1993 by Claus Gittinger
2376
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
    85
              All Rights Reserved
9
f5b6ab00bdf6 *** empty log message ***
claus
parents: 3
diff changeset
    86
f5b6ab00bdf6 *** empty log message ***
claus
parents: 3
diff changeset
    87
 This software is furnished under a license and may be used
f5b6ab00bdf6 *** empty log message ***
claus
parents: 3
diff changeset
    88
 only in accordance with the terms of that license and with the
f5b6ab00bdf6 *** empty log message ***
claus
parents: 3
diff changeset
    89
 inclusion of the above copyright notice.   This software may not
f5b6ab00bdf6 *** empty log message ***
claus
parents: 3
diff changeset
    90
 be provided or otherwise made available to, or used by, any
f5b6ab00bdf6 *** empty log message ***
claus
parents: 3
diff changeset
    91
 other person.  No title to or ownership of the software is
f5b6ab00bdf6 *** empty log message ***
claus
parents: 3
diff changeset
    92
 hereby transferred.
f5b6ab00bdf6 *** empty log message ***
claus
parents: 3
diff changeset
    93
"
f5b6ab00bdf6 *** empty log message ***
claus
parents: 3
diff changeset
    94
!
f5b6ab00bdf6 *** empty log message ***
claus
parents: 3
diff changeset
    95
f5b6ab00bdf6 *** empty log message ***
claus
parents: 3
diff changeset
    96
documentation
f5b6ab00bdf6 *** empty log message ***
claus
parents: 3
diff changeset
    97
"
f5b6ab00bdf6 *** empty log message ***
claus
parents: 3
diff changeset
    98
    used in the changes management to keep track of changes
235
3ebfdc6edab9 documentation
Claus Gittinger <cg@exept.de>
parents: 102
diff changeset
    99
3ebfdc6edab9 documentation
Claus Gittinger <cg@exept.de>
parents: 102
diff changeset
   100
    [author:]
2376
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
   101
        Claus Gittinger
9
f5b6ab00bdf6 *** empty log message ***
claus
parents: 3
diff changeset
   102
"
f5b6ab00bdf6 *** empty log message ***
claus
parents: 3
diff changeset
   103
! !
f5b6ab00bdf6 *** empty log message ***
claus
parents: 3
diff changeset
   104
654
edeb63d98088 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 625
diff changeset
   105
!ChangeSet class methodsFor:'instance creation'!
edeb63d98088 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 625
diff changeset
   106
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   107
forExistingClass:aClass
1869
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
   108
    "build a changeSet for some given class, all of its private classes
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
   109
     and all extensions if any. 
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
   110
     I.e. a changeSet which represents the existing class in the image.
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   111
     That does of course not give deltas, but instead reflects the current
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   112
     state of the given class.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   113
     It is useful in conjunction with the other utility methods,
1869
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
   114
     for example, when building patchLists, diffSets, comparing etc."
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   115
1954
521fa986be30 Fix if method does not exist in change
Stefan Vogel <sv@exept.de>
parents: 1920
diff changeset
   116
    |changeSet s changeObject|
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   117
2633
5a5460e5231a comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2626
diff changeset
   118
    "/ kludge: could do this much faster...
1188
a4594193f884 Remove unused method variables
Stefan Vogel <sv@exept.de>
parents: 1187
diff changeset
   119
    s := ReadWriteStream on:''.
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   120
    aClass fileOutOn:s.
1188
a4594193f884 Remove unused method variables
Stefan Vogel <sv@exept.de>
parents: 1187
diff changeset
   121
    s reset.
a4594193f884 Remove unused method variables
Stefan Vogel <sv@exept.de>
parents: 1187
diff changeset
   122
    changeSet := self fromStream:s.
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   123
1869
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
   124
    "/ fetch the real package info...
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   125
    changeSet do:[:eachChange |
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   126
        eachChange isMethodChange ifTrue:[
1954
521fa986be30 Fix if method does not exist in change
Stefan Vogel <sv@exept.de>
parents: 1920
diff changeset
   127
            changeObject := eachChange changeMethod.
521fa986be30 Fix if method does not exist in change
Stefan Vogel <sv@exept.de>
parents: 1920
diff changeset
   128
            changeObject notNil ifTrue:[
521fa986be30 Fix if method does not exist in change
Stefan Vogel <sv@exept.de>
parents: 1920
diff changeset
   129
                eachChange package:changeObject package
521fa986be30 Fix if method does not exist in change
Stefan Vogel <sv@exept.de>
parents: 1920
diff changeset
   130
            ].
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   131
        ] ifFalse:[
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   132
            eachChange isClassChange ifTrue:[
1954
521fa986be30 Fix if method does not exist in change
Stefan Vogel <sv@exept.de>
parents: 1920
diff changeset
   133
                changeObject := eachChange changeClass.
521fa986be30 Fix if method does not exist in change
Stefan Vogel <sv@exept.de>
parents: 1920
diff changeset
   134
                changeObject notNil ifTrue:[
521fa986be30 Fix if method does not exist in change
Stefan Vogel <sv@exept.de>
parents: 1920
diff changeset
   135
                    eachChange package:changeObject package
521fa986be30 Fix if method does not exist in change
Stefan Vogel <sv@exept.de>
parents: 1920
diff changeset
   136
                ].
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   137
            ].
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   138
        ].
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   139
    ].
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   140
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   141
    ^ changeSet
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   142
1188
a4594193f884 Remove unused method variables
Stefan Vogel <sv@exept.de>
parents: 1187
diff changeset
   143
"/    |source changeSet chunk sawExcla lastTimeStamp s change nameSpace|
a4594193f884 Remove unused method variables
Stefan Vogel <sv@exept.de>
parents: 1187
diff changeset
   144
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   145
"/    changeSet := self new.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   146
"/
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   147
"/    "/ first, a classDefinition change ...
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   148
"/    changeSet addClassDefinitionChangeFor:aClass.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   149
"/    "/ are there any class-instVars ?
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   150
"/    aClass class instVarNames size > 0 ifTrue:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   151
"/        changeSet addInstVarDefinitionChangeFor:aClass class.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   152
"/    ].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   153
"/    "/ a comment ?
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   154
"/    aClass comment size > 0 ifTrue:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   155
"/        changeSet addClassCommentChangeFor:aClass.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   156
"/    ].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   157
"/
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   158
"/    "/ class methods first ...
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   159
"/    aClass class methodDictionary keysAndValuesDo:[:sel :mthd |
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   160
"/        changeSet addMethodChange:mthd in:aClass class. 
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   161
"/    ].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   162
"/
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   163
"/    "/ instance methods ...
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   164
"/    aClass methodDictionary keysAndValuesDo:[:sel :mthd |
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   165
"/        changeSet addMethodChange:mthd in:aClass.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   166
"/    ].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   167
"/
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   168
"/    ^ changeSet
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   169
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   170
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   171
    "
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   172
     ChangeSet forExistingClass:ChangeSet
1869
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
   173
     ChangeSet forExistingClass:A
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   174
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   175
     Rectangle hasExtensions
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   176
     ChangeSet forExistingClass:Rectangle
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   177
    "
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   178
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   179
    "Created: / 16-02-1998 / 12:19:34 / cg"
1869
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
   180
    "Modified: / 12-10-2006 / 23:45:14 / cg"
2633
5a5460e5231a comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2626
diff changeset
   181
    "Modified (format): / 01-12-2011 / 19:10:22 / cg"
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   182
!
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   183
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   184
forExistingClass:aClass withExtensions:withExtensions extensionsOnly:extensionsOnly
1869
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
   185
    "build a changeSet for some given full class, the base-class or the extensions only,
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
   186
     as specified by the with-arguments.
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   187
     That does of course not give deltas, but instead reflects the current
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   188
     state of the given class.
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   189
     It is useful in conjunction with the other utility methods,
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   190
     for example, when building patchLists, diffSets etc."
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   191
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   192
    |changeSet classPackage|
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   193
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   194
    changeSet := self forExistingClass:aClass.
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   195
    classPackage := aClass package.
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   196
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   197
    extensionsOnly ifTrue:[
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   198
        ^ changeSet 
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   199
            select:[:change |
1869
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
   200
                change isMethodChange and:[ change package ~= classPackage ]
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   201
            ].
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   202
    ].
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   203
    withExtensions ifFalse:[
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   204
        ^ changeSet 
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   205
            reject:[:change |
1869
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
   206
                change isMethodChange and:[ change package ~= classPackage ]
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   207
            ].
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   208
    ].
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   209
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   210
    ^ changeSet
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   211
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   212
    "
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   213
     ChangeSet forExistingClass:ChangeSet
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   214
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   215
     Rectangle hasExtensions
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   216
     Rectangle extensions
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   217
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   218
     ChangeSet forExistingClass:Rectangle withExtensions:true extensionsOnly:false
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   219
     ChangeSet forExistingClass:Rectangle withExtensions:false extensionsOnly:false
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   220
     ChangeSet forExistingClass:Rectangle withExtensions:false extensionsOnly:true
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   221
    "
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   222
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   223
    "Created: / 12-10-2006 / 18:13:02 / cg"
1869
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
   224
    "Modified: / 12-10-2006 / 23:46:05 / cg"
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   225
!
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   226
1292
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
   227
forExistingMethods:aCollectionOfMethods
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
   228
    "build a changeSet for a collection of methods.
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
   229
     That does of course not give deltas, but instead reflects the current
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
   230
     state of the given set of methods.
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
   231
     It is useful in conjunction with the other utility methods,
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
   232
     for example, when building patchLists, diffSets etc."
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
   233
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
   234
    |changeSet stream previousPackage|
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
   235
2244
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   236
    changeSet := self new.
1292
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
   237
    aCollectionOfMethods do:[:eachMethod | 
2524
309a3ec3f7d1 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2519
diff changeset
   238
        |change source|
309a3ec3f7d1 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2519
diff changeset
   239
309a3ec3f7d1 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2519
diff changeset
   240
        source := eachMethod source.
309a3ec3f7d1 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2519
diff changeset
   241
        source isNil ifTrue:[
309a3ec3f7d1 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2519
diff changeset
   242
            Transcript showCR:'oops - no source for ',eachMethod whoString.
309a3ec3f7d1 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2519
diff changeset
   243
        ].
2244
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   244
        change := MethodDefinitionChange new.
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   245
        eachMethod mclass notNil ifTrue:[ change className:eachMethod mclass name ].
2524
309a3ec3f7d1 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2519
diff changeset
   246
        source notNil ifTrue:[ change source:source ].
2244
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   247
        change selector:eachMethod selector.
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   248
        change package:(eachMethod package).
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   249
        change category:(eachMethod category).
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   250
        changeSet add:change.
1292
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
   251
    ].
2244
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   252
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   253
"/    stream := ReadWriteStream on:''.
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   254
"/    aCollectionOfMethods do:[:eachMethod | 
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   255
"/        previousPackage ~= eachMethod package ifTrue:[
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   256
"/            stream nextPutAll:'"{ Package: '''.
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   257
"/            stream nextPutAll:eachMethod package asString.
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   258
"/            stream nextPutAll:''' }"'; cr; cr.
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   259
"/        ].
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   260
"/        eachMethod mclass fileOutMethod:eachMethod on:stream
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   261
"/    ].
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   262
"/    stream reset.
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   263
"/    changeSet := self fromStream:stream.
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   264
"/    changeSet do:[:eachChange |
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   265
"/        eachChange package:(eachChange changeMethod package).
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   266
"/    ].
1292
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
   267
    ^ changeSet
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
   268
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
   269
    "
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
   270
     ChangeSet forExistingMethods:(Array with:(Array compiledMethodAt:#at:)
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
   271
                                         with:(Object compiledMethodAt:#at:)
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
   272
                                         with:(Behavior compiledMethodAt:#compiledMethodAt:) )
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
   273
    "
1872
7a1f2a26bf90 changes for compare-project functionality
Claus Gittinger <cg@exept.de>
parents: 1869
diff changeset
   274
2524
309a3ec3f7d1 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2519
diff changeset
   275
    "Modified: / 17-09-2011 / 10:26:03 / cg"
1292
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
   276
!
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
   277
2412
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   278
forPackage: package
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   279
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   280
    ^self forPackage: package ignoreAutoloaded: false.
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   281
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   282
    "Created: / 20-05-2008 / 17:56:18 / Jan Vrany <vranyj1@fel.cvut.cz>"
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   283
    "Modified: / 12-08-2009 / 14:23:15 / Jan Vrany <vranyj1@fel.cvut.cz>"
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   284
!
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   285
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   286
forPackage: package ignoreAutoloaded: ignoreAutoloaded
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   287
    "build a changeSet for a given package"
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   288
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   289
    |changeSet packageClasses packageExtensions|
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   290
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   291
    packageClasses := ProjectDefinition searchForClassesWithProject: package.
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   292
    packageExtensions := ProjectDefinition searchForExtensionsWithProject: package.
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   293
    changeSet := self forExistingMethods: packageExtensions.
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   294
    packageClasses do:
3029
c7be0be50898 - ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3028
diff changeset
   295
        [:cls|
c7be0be50898 - ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3028
diff changeset
   296
        (ignoreAutoloaded not and:[cls isLoaded not])
c7be0be50898 - ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3028
diff changeset
   297
            ifTrue:[cls autoload].
c7be0be50898 - ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3028
diff changeset
   298
        cls isLoaded
c7be0be50898 - ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3028
diff changeset
   299
            ifTrue:
c7be0be50898 - ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3028
diff changeset
   300
                [changeSet addAll:
c7be0be50898 - ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3028
diff changeset
   301
                    (self
c7be0be50898 - ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3028
diff changeset
   302
                        forExistingClass:cls
c7be0be50898 - ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3028
diff changeset
   303
                        withExtensions:false
c7be0be50898 - ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3028
diff changeset
   304
                        extensionsOnly:false)]].
c7be0be50898 - ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3028
diff changeset
   305
    changeSet name: 'Package ' , package.
2412
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   306
    ^changeSet
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   307
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   308
    "Created: / 12-08-2009 / 14:22:44 / Jan Vrany <vranyj1@fel.cvut.cz>"
3029
c7be0be50898 - ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3028
diff changeset
   309
    "Modified: / 16-03-2012 / 15:37:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2412
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   310
!
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   311
2321
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
   312
fromDiffSet:aDiffSet
2322
c5ebd3b56e54 comment/format in: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2321
diff changeset
   313
    "build a changeSet from a given diffSet. This can be used as a patchSet,
c5ebd3b56e54 comment/format in: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2321
diff changeset
   314
     to update the first-version in the diffSet to the second-version"
2321
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
   315
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
   316
    |changeSet|
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
   317
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
   318
    changeSet := self new.
2323
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
   319
    "/ class definitions first...
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
   320
    changeSet addAll:((aDiffSet changed collect:[:eachPair | eachPair second]) select:[:ch | ch isClassDefinitionChange]).
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
   321
    changeSet addAll:((aDiffSet onlyInArg) select:[:ch | ch isClassDefinitionChange]).
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
   322
2321
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
   323
    "/ first add new methods...
2323
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
   324
    changeSet addAll:((aDiffSet onlyInArg) reject:[:ch | ch isClassDefinitionChange]).
2321
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
   325
    "/ then, changed methods...
2323
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
   326
    changeSet addAll:((aDiffSet changed collect:[:eachPair | eachPair second]) reject:[:ch | ch isClassDefinitionChange]).
2321
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
   327
    "/ then, removed methods...
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
   328
    aDiffSet onlyInReceiver do:[:each |
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
   329
        |ch|
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
   330
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
   331
        ch := MethodRemoveChange className:(each className) selector:(each selector).
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
   332
        changeSet add:ch.
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
   333
    ].
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
   334
    ^ changeSet
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
   335
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
   336
    "Created: / 08-02-2011 / 10:48:36 / cg"
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
   337
!
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
   338
2412
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   339
fromDirectory: aStringOfFilename
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   340
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   341
    | d cs |
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   342
    d := aStringOfFilename asFilename.
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   343
    cs := self new.    
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   344
    d directoryContentsAsFilenames do:
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   345
        [:each|
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   346
        each suffix = 'st' ifTrue:
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   347
            [cs addAll: (self fromFileOrDirectory: each)]].
3029
c7be0be50898 - ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3028
diff changeset
   348
    cs name: aStringOfFilename asFilename asAbsoluteFilename pathName.
2412
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   349
    ^cs
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   350
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   351
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   352
    "
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   353
        ChangeSet fromDirectory: (Smalltalk getPackageDirectoryForPackage:'stx:libbasic')
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   354
    "
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   355
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   356
    "Created: / 02-04-2011 / 00:54:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   357
!
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   358
1182
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   359
fromDolphinPACStream:aStream
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   360
    "build a changeSet from a stream, containing dolphin pac file chunks."
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   361
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   362
    ^ self fromDolphinPACStream:aStream while:[:thisChange | true]
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   363
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   364
!
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   365
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   366
fromDolphinPACStream:aStream while:aConditionBlock
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   367
    "build a changeSet from a stream, containing dolphin pac file chunks."
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   368
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   369
    |changeSet|
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   370
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   371
    changeSet := self new.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   372
    self 
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   373
        changesFromStream:aStream 
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   374
        for:changeSet 
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   375
        reader:(DolphinPACFileReader new) 
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   376
        do:[:aChange :lineNumberOrNil :posOrNil |
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   377
            changeSet add:aChange.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   378
            (aConditionBlock value:aChange) ifFalse:[^ changeSet].
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   379
        ].
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   380
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   381
    ^ changeSet
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   382
!
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   383
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   384
fromFile:aFilename
3029
c7be0be50898 - ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3028
diff changeset
   385
    |mime stream nm|
c7be0be50898 - ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3028
diff changeset
   386
c7be0be50898 - ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3028
diff changeset
   387
    nm := aFilename asFilename asAbsoluteFilename pathName.
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   388
    mime := MIMETypes mimeTypeForFilename:aFilename.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   389
    mime isNil ifTrue:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   390
        mime := aFilename asFilename mimeTypeOfContents.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   391
        mime isNil ifTrue:[
1329
91aaace92f86 Do not use #halt
Stefan Vogel <sv@exept.de>
parents: 1315
diff changeset
   392
            self error:'unknown MIME type for file'.
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   393
        ].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   394
    ].
930
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   395
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   396
    [
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   397
        stream := aFilename asFilename readStream.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   398
        mime = 'text/xml' ifTrue:[
3029
c7be0be50898 - ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3028
diff changeset
   399
            ^ (self fromXMLStream:stream) name: nm; yourself.
1182
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   400
        ].
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   401
        mime = 'application/x-smalltalk-source-sif' ifTrue:[
3029
c7be0be50898 - ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3028
diff changeset
   402
            ^ (self fromSIFStream:stream) name: nm; yourself
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   403
        ].
1182
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   404
        mime = 'application/x-smalltalk-dolphin-package' ifTrue:[
3029
c7be0be50898 - ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3028
diff changeset
   405
            ^ (self fromDolphinPACStream:stream) name: nm; yourself
1182
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   406
        ].            
2247
1ff6d78eb96c code move
Claus Gittinger <cg@exept.de>
parents: 2246
diff changeset
   407
        stream := EncodedStream decodedStreamFor:stream.
3029
c7be0be50898 - ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3028
diff changeset
   408
        ^ (self fromStream:stream) name: nm; yourself
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   409
    ] ensure:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   410
        stream notNil ifTrue:[stream close].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   411
    ].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   412
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   413
    "
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   414
     ChangeSet fromFile:('changes')
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   415
     ChangeSet fromFile:('patches')
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   416
    "
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   417
3029
c7be0be50898 - ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3028
diff changeset
   418
    "Created: / 16-02-1998 / 12:19:34 / cg"
c7be0be50898 - ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3028
diff changeset
   419
    "Modified: / 14-12-1999 / 15:23:16 / cg"
c7be0be50898 - ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3028
diff changeset
   420
    "Modified: / 16-03-2012 / 15:46:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   421
!
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   422
2412
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   423
fromFileOrDirectory: fileOrDirectory
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   424
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   425
    | f |
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   426
    f := fileOrDirectory asFilename.
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   427
    ^(f isDirectory 
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   428
        ifTrue:[self fromDirectory: f]
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   429
        ifFalse:[self fromFile: f])
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   430
        name: f pathName;
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   431
        yourself.
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   432
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   433
    "
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   434
        ChangeSet fromFileOrDirectory: (Smalltalk getPackageDirectoryForPackage:'stx:libbasic')
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   435
    "
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   436
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   437
    "Created: / 02-04-2011 / 00:50:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   438
!
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   439
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   440
fromSIFStream:aStream
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   441
    "build a changeSet from a SIF stream, containing chunks
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   442
     in smalltalk interchange format.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   443
     Return the changeSet."
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   444
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   445
    ^ self fromSIFStream:aStream while:[:thisChange | true]
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   446
!
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   447
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   448
fromSIFStream:aStream while:aConditionBlock
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   449
    "build a changeSet from a SIF stream, containing chunks
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   450
     in smalltalk interchange format.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   451
     Return the changeSet."
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   452
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   453
    |changeSet|
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   454
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   455
    changeSet := self new.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   456
    self 
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   457
        changesFromStream:aStream 
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   458
        for:changeSet 
1182
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   459
        reader:(SIFChangeFileReader new) 
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   460
        do:[:aChange :lineNumberOrNil :posOrNil |
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   461
            changeSet add:aChange.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   462
            (aConditionBlock value:aChange) ifFalse:[^ changeSet].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   463
        ].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   464
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   465
    ^ changeSet
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   466
!
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   467
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   468
fromStream:aStream
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   469
    "build a changeSet from a stream, containing chunks.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   470
     (i.e. either a classes sourceFile or a change-file).
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   471
     Return the changeSet."
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   472
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   473
    ^ self fromStream:aStream while:[:thisChange | true]
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
   474
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
   475
    "
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
   476
     ChangeSet fromStream:('changes' asFilename readStream)
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
   477
     ChangeSet fromStream:('patches' asFilename readStream)
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
   478
     ChangeSet fromStream:(Object source asString readStream)
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
   479
    "
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
   480
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
   481
    "Created: / 16.2.1998 / 12:19:34 / cg"
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
   482
    "Modified: / 14.12.1999 / 15:23:16 / cg"
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
   483
!
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
   484
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   485
fromStream:aStream while:aConditionBlock
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   486
    "build a changeSet from a stream, containing chunks.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   487
     (i.e. either a classes sourceFile or a change-file).
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   488
     Return the changeSet."
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   489
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   490
    |changeSet|
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   491
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   492
    changeSet := self new.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   493
    self 
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   494
        changesFromStream:aStream 
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   495
        for:changeSet 
1182
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   496
        reader:(ChangeFileReader new)
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   497
        do:[:aChange :lineNumberOrNil :posOrNil |
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   498
            changeSet add:aChange.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   499
            (aConditionBlock value:aChange) ifFalse:[^ changeSet].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   500
        ].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   501
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   502
    ^ changeSet
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   503
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   504
    "
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   505
     ChangeSet fromStream:('changes' asFilename readStream)
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   506
     ChangeSet fromStream:('patches' asFilename readStream)
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   507
     ChangeSet fromStream:(Object source asString readStream)
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   508
    "
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   509
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   510
    "Created: / 16.2.1998 / 12:19:34 / cg"
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   511
    "Modified: / 14.12.1999 / 15:23:16 / cg"
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   512
!
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   513
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   514
fromXMLStream:aStream
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   515
    "build a changeSet from an XML stream, containing XML definitions.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   516
     Return the changeSet."
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   517
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   518
    |changeSet builder nameSpace|
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   519
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   520
    aStream isNil ifTrue:[^ nil].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   521
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   522
    changeSet := self new.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   523
    nameSpace := Smalltalk.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   524
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   525
    builder := XML::SourceScannerNodeBuilder new.
1475
934d20073adb more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents: 1471
diff changeset
   526
    builder scanFile:aStream do:[:change | changeSet add: change. ].
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   527
    ^ changeSet
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   528
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   529
    "
1247
be7277706e48 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1232
diff changeset
   530
     ChangeSet fromXMLStream:('../../goodies/xml/vw/xmlFileInTests/XMLParser.xml' asFilename readStream)
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   531
     ChangeSetBrowser 
1247
be7277706e48 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1232
diff changeset
   532
        openOn:(ChangeSet fromXMLStream:('../../goodies/xml/vw/xmlFileInTests/XMLParser.xml' asFilename readStream))
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   533
    "
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   534
! !
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   535
1281
6aeafe46d0ad category;
Claus Gittinger <cg@exept.de>
parents: 1264
diff changeset
   536
!ChangeSet class methodsFor:'Compatibility-ST80'!
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   537
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   538
patches
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   539
    ^ #()
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   540
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   541
    "Created: / 27.10.1997 / 13:52:54 / cg"
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   542
! !
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   543
2376
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
   544
1281
6aeafe46d0ad category;
Claus Gittinger <cg@exept.de>
parents: 1264
diff changeset
   545
!ChangeSet class methodsFor:'Compatibility-VW'!
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   546
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   547
component: component definition: anObject change: changeSymbol
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   548
    "Include indication that a class/namespace was added or removed
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   549
     from a CodeComponent." 
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   550
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   551
    self 
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   552
        changed:#'component:definition:change:'
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   553
        with:
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   554
            ( Array 
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   555
                    with: component
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   556
                    with: anObject
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   557
                    with: changeSymbol
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   558
            )
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   559
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   560
! !
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   561
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   562
!ChangeSet class methodsFor:'instance creation-private'!
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   563
1191
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   564
changesFromStream:aStream do:aBlock
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   565
    "enumerate changes from a stream and invoke aBlock on each.
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   566
     The block is invoked with the change, a lineNumberOrNil and streamPosition arguments. 
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   567
     The lineNumber is only valid, if the underlying stream 
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   568
     provides line-numbers; otherwise, nil is passed."
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   569
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   570
    ^ self
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   571
        changesFromStream:aStream 
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   572
        for:(self new) 
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   573
        reader:nil
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   574
        do:aBlock
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   575
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   576
    "
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   577
     ChangeSet 
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   578
        changesFromStream:('changes' asFilename readStream) 
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   579
        do:[:chg | Transcript showCR:chg]
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   580
    "
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   581
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   582
    "Created: / 16.2.1998 / 12:19:34 / cg"
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   583
    "Modified: / 14.12.1999 / 15:23:16 / cg"
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   584
!
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   585
1182
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   586
changesFromStream:aStream for:aChangeSet reader:aReader do:aBlock
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
   587
    "enumerate changes from a stream and invoke aBlock on each.
1191
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   588
     The block is invoked with the change, a lineNumberOrNil and streamPosition arguments. 
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   589
     The lineNumber is only valid, if the underlying stream 
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
   590
     provides line-numbers; otherwise, nil is passed."
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
   591
3043
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
   592
    |chunk s change nameSpace package
3017
114676d42a88 Added progress notifications during while reading changes from stream
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
   593
     lineNumber pos reader size |
930
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   594
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   595
    nameSpace := Smalltalk.
1135
08323691c543 care for package directive (remember)
Claus Gittinger <cg@exept.de>
parents: 1128
diff changeset
   596
    package := Class packageQuerySignal query.
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   597
1182
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   598
    (reader := aReader) isNil ifTrue:[
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   599
        reader := ChangeFileReader new.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   600
    ].
3017
114676d42a88 Added progress notifications during while reading changes from stream
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
   601
    size := aStream size.
114676d42a88 Added progress notifications during while reading changes from stream
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
   602
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   603
    reader changeSet:aChangeSet.
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
   604
    reader changeAction:aBlock.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
   605
    reader inputStream:aStream.
930
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   606
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   607
    [aStream atEnd] whileFalse:[
1182
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   608
        aStream skipSeparators.
930
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   609
        lineNumber := aStream lineNumber.
1209
f98d5eb855d3 code rewritten to be independent of stream zero-base
Claus Gittinger <cg@exept.de>
parents: 1200
diff changeset
   610
        pos := aStream position1Based.
3017
114676d42a88 Added progress notifications during while reading changes from stream
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
   611
114676d42a88 Added progress notifications during while reading changes from stream
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
   612
        ProgressNotification notify: nil progress:(100 / size) * pos.
114676d42a88 Added progress notifications during while reading changes from stream
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
   613
930
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   614
        chunk := aStream nextChunk.
2056
b4bd1ff4709e refactored
Claus Gittinger <cg@exept.de>
parents: 2053
diff changeset
   615
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1428
diff changeset
   616
        (chunk notEmptyOrNil) ifTrue:[
2279
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   617
            Class nameSpaceQuerySignal handle:[:ex| ex proceedWith:nameSpace] do:[
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   618
                Class packageQuerySignal handle:[:ex| ex proceedWith:package] do:[
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   619
                    |parser tree ns pkg|
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   620
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   621
                    parser := Parser for:chunk.
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   622
                    tree := parser 
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   623
                                parseExpressionWithSelf:nil 
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   624
                                notifying:nil 
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   625
                                ignoreErrors:true 
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   626
                                ignoreWarnings:true 
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   627
                                inNameSpace:nameSpace.
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   628
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   629
                    tree notNil ifTrue:[
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   630
                        tree == #Error ifTrue:[
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   631
                            change := DoItChange new.
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   632
                            change source:chunk.
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   633
                            aBlock valueWithOptionalArgument:change and:lineNumber and:pos.
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   634
                        ] ifFalse:[    
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   635
                            "/ if there is any nameSpace directive in there, extract it.
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   636
                            ((ns := parser currentNameSpace) notNil 
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   637
                            and:[ns ~~ nameSpace]) ifTrue:[
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   638
                                nameSpace := ns
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   639
                            ].
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   640
                            "/ if there is any package directive in there, extract it.
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   641
                            ((pkg := parser currentPackage) notNil 
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   642
                            and:[pkg ~~ package]) ifTrue:[
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   643
                                package := pkg
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   644
                            ].
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   645
                            "/
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   646
                            "/ what type of chunk is this ...
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   647
                            "/
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   648
                            tree isConstant ifTrue:[
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   649
                                (s := tree evaluate) isString ifTrue:[
3043
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
   650
                                    (s startsWith:'---- ') ifTrue:[
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
   651
                                        reader inputStream: s readStream.
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
   652
                                        reader processInfo: s.
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
   653
                                        reader inputStream: aStream.
3042
48e76977cdc3 Added info-record processing support into changeset reader
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3036
diff changeset
   654
                                    ].
930
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   655
                                ] ifFalse:[
2279
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   656
                                    self error:'unexpected change-chunk' mayProceed:true
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   657
                                ]
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   658
                            ] ifFalse:[
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   659
                                tree isMessage ifTrue:[
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   660
                                    (reader 
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   661
                                        changesFromParseTree:tree 
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   662
                                        lineNumber:lineNumber
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   663
                                        position:pos
2745
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
   664
                                        chunk: chunk
2279
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   665
                                    ) ifFalse:[
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   666
                                        change := DoItChange new.
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   667
                                        change source:chunk.
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   668
                                        aBlock valueWithOptionalArgument:change and:lineNumber and:pos.
930
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   669
                                    ]
2279
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   670
                                ] ifFalse:[
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   671
                                    InvalidChangeChunkError 
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   672
                                        raiseRequestErrorString:'unexpected change-chunk' 
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   673
                                        "/ mayProceed:true.
930
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   674
                                ]
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   675
                            ]
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   676
                        ]
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   677
                    ]
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   678
                ]
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   679
            ]
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   680
        ]
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   681
    ].
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   682
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   683
    "
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   684
     ChangeSet fromStream:('changes' asFilename readStream)
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   685
     ChangeSet fromStream:('patches' asFilename readStream)
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   686
     ChangeSet fromStream:(Object source asString readStream)
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   687
    "
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   688
2745
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
   689
    "Created: / 16-02-1998 / 12:19:34 / cg"
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
   690
    "Modified: / 14-12-1999 / 15:23:16 / cg"
3043
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
   691
    "Modified: / 02-04-2012 / 19:03:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1380
e33e77f7b88b skip and hide encoding chunk
ca
parents: 1379
diff changeset
   692
!
e33e77f7b88b skip and hide encoding chunk
ca
parents: 1379
diff changeset
   693
e33e77f7b88b skip and hide encoding chunk
ca
parents: 1379
diff changeset
   694
skipEncodingChunkOn:stream
2080
5cfd9170d01d Mark obsolete methods
Stefan Vogel <sv@exept.de>
parents: 2056
diff changeset
   695
    <resource: #obsolete>
1415
44d3d469a528 skipEncodingCHunk now in EncodedStream
Claus Gittinger <cg@exept.de>
parents: 1414
diff changeset
   696
    self obsoleteMethodWarning:'use stream>>skipENcodingChunk'.
44d3d469a528 skipEncodingCHunk now in EncodedStream
Claus Gittinger <cg@exept.de>
parents: 1414
diff changeset
   697
    stream skipEncodingChunk
1083
e3ac808d06e8 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1081
diff changeset
   698
! !
e3ac808d06e8 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1081
diff changeset
   699
625
06f4ed35832b added #patches for ST80 compatibility
Claus Gittinger <cg@exept.de>
parents: 378
diff changeset
   700
!ChangeSet class methodsFor:'queries'!
27
claus
parents: 16
diff changeset
   701
claus
parents: 16
diff changeset
   702
current
claus
parents: 16
diff changeset
   703
    "ST-80 compatibility: return the current changeSet"
claus
parents: 16
diff changeset
   704
claus
parents: 16
diff changeset
   705
    |p|
claus
parents: 16
diff changeset
   706
claus
parents: 16
diff changeset
   707
    (Project notNil and:[(p := Project current) notNil]) ifTrue:[
959
ca4fff926135 ChangeSet current: return empty collection if there is no changeSet
Claus Gittinger <cg@exept.de>
parents: 956
diff changeset
   708
        ^ p changeSet
ca4fff926135 ChangeSet current: return empty collection if there is no changeSet
Claus Gittinger <cg@exept.de>
parents: 956
diff changeset
   709
    ].
ca4fff926135 ChangeSet current: return empty collection if there is no changeSet
Claus Gittinger <cg@exept.de>
parents: 956
diff changeset
   710
    ^ #()
27
claus
parents: 16
diff changeset
   711
claus
parents: 16
diff changeset
   712
    "
claus
parents: 16
diff changeset
   713
     ChangeSet current 
claus
parents: 16
diff changeset
   714
    "
claus
parents: 16
diff changeset
   715
! !
claus
parents: 16
diff changeset
   716
2246
3ce37b8e4967 changed: #decodedStreamFor:
Claus Gittinger <cg@exept.de>
parents: 2244
diff changeset
   717
!ChangeSet class methodsFor:'utilities'!
3ce37b8e4967 changed: #decodedStreamFor:
Claus Gittinger <cg@exept.de>
parents: 2244
diff changeset
   718
3ce37b8e4967 changed: #decodedStreamFor:
Claus Gittinger <cg@exept.de>
parents: 2244
diff changeset
   719
decodedStreamFor:aStream
2247
1ff6d78eb96c code move
Claus Gittinger <cg@exept.de>
parents: 2246
diff changeset
   720
    <resource: #obsolete>
1ff6d78eb96c code move
Claus Gittinger <cg@exept.de>
parents: 2246
diff changeset
   721
    ^ EncodedStream decodedStreamFor:aStream
2246
3ce37b8e4967 changed: #decodedStreamFor:
Claus Gittinger <cg@exept.de>
parents: 2244
diff changeset
   722
! !
3ce37b8e4967 changed: #decodedStreamFor:
Claus Gittinger <cg@exept.de>
parents: 2244
diff changeset
   723
1264
3d1fc5d40ab4 method category rename
Claus Gittinger <cg@exept.de>
parents: 1263
diff changeset
   724
!ChangeSet methodsFor:'Compatibility-ST80'!
378
f106015c98a6 commentary
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
   725
899
7b65d6f2b0f0 more VW compatibility
Claus Gittinger <cg@exept.de>
parents: 894
diff changeset
   726
changeClass:aClass
7b65d6f2b0f0 more VW compatibility
Claus Gittinger <cg@exept.de>
parents: 894
diff changeset
   727
    "dummy here"
100
d09e51d14901 project changeSet fixes
Claus Gittinger <cg@exept.de>
parents: 85
diff changeset
   728
899
7b65d6f2b0f0 more VW compatibility
Claus Gittinger <cg@exept.de>
parents: 894
diff changeset
   729
    "Created: / 4.2.2000 / 18:30:59 / cg"
901
8fd26c5e8e8f more VW compatibility
Claus Gittinger <cg@exept.de>
parents: 899
diff changeset
   730
!
8fd26c5e8e8f more VW compatibility
Claus Gittinger <cg@exept.de>
parents: 899
diff changeset
   731
1476
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   732
changeSelectors
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   733
    "return a collection of all selectors for which changes are in this changeSet"
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   734
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   735
    |selectors|
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   736
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   737
    changeSelectors isNil ifTrue:[
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   738
        selectors := IdentitySet new.
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   739
        self do:[:chg |
1967
18cf73f144e4 care for nil selectors.
Claus Gittinger <cg@exept.de>
parents: 1954
diff changeset
   740
            |sel|
1476
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   741
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   742
            chg notNil ifTrue:[
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   743
                chg isMethodChange ifTrue:[
1967
18cf73f144e4 care for nil selectors.
Claus Gittinger <cg@exept.de>
parents: 1954
diff changeset
   744
                    sel := chg selector.
18cf73f144e4 care for nil selectors.
Claus Gittinger <cg@exept.de>
parents: 1954
diff changeset
   745
                    sel notNil ifTrue:[
18cf73f144e4 care for nil selectors.
Claus Gittinger <cg@exept.de>
parents: 1954
diff changeset
   746
                        selectors add:sel
18cf73f144e4 care for nil selectors.
Claus Gittinger <cg@exept.de>
parents: 1954
diff changeset
   747
                    ]
1476
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   748
                ]
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   749
            ]
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   750
        ].
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   751
        changeSelectors := selectors.
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   752
    ].
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   753
    ^ changeSelectors.
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   754
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   755
    "
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   756
     ChangeSet current changeSelectors  
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   757
    "
1967
18cf73f144e4 care for nil selectors.
Claus Gittinger <cg@exept.de>
parents: 1954
diff changeset
   758
18cf73f144e4 care for nil selectors.
Claus Gittinger <cg@exept.de>
parents: 1954
diff changeset
   759
    "Modified: / 30-05-2007 / 12:12:32 / cg"
1476
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   760
!
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   761
1102
4763b34e4c0e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1099
diff changeset
   762
changedClasses
4763b34e4c0e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1099
diff changeset
   763
    "return a collection of all classes for which changes are in this changeSet"
4763b34e4c0e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1099
diff changeset
   764
4763b34e4c0e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1099
diff changeset
   765
    |classes|
4763b34e4c0e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1099
diff changeset
   766
1128
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
   767
    changedClasses isNil ifTrue:[
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
   768
        classes := IdentitySet new.
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
   769
        self do:[:chg |
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
   770
            |cls|
1102
4763b34e4c0e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1099
diff changeset
   771
1315
f0f764125625 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1313
diff changeset
   772
            chg notNil ifTrue:[
f0f764125625 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1313
diff changeset
   773
                cls := chg changeClass.
f0f764125625 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1313
diff changeset
   774
                cls notNil ifTrue:[
1898
325fa7fbb3e3 use isRealNameSpace
Claus Gittinger <cg@exept.de>
parents: 1885
diff changeset
   775
                    cls isRealNameSpace ifFalse:[
1315
f0f764125625 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1313
diff changeset
   776
                        classes add:cls
f0f764125625 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1313
diff changeset
   777
                    ]
1128
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
   778
                ]
1102
4763b34e4c0e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1099
diff changeset
   779
            ]
1128
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
   780
        ].
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
   781
        changedClasses := classes.
1102
4763b34e4c0e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1099
diff changeset
   782
    ].
1128
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
   783
    ^ changedClasses.
1102
4763b34e4c0e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1099
diff changeset
   784
4763b34e4c0e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1099
diff changeset
   785
    "
4763b34e4c0e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1099
diff changeset
   786
     ChangeSet current changedClasses  
1791
746e0b3aa286 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1718
diff changeset
   787
     ChangeSet current flushChangedClassesCache
1102
4763b34e4c0e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1099
diff changeset
   788
    "
1791
746e0b3aa286 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1718
diff changeset
   789
1898
325fa7fbb3e3 use isRealNameSpace
Claus Gittinger <cg@exept.de>
parents: 1885
diff changeset
   790
    "Modified: / 10-11-2006 / 17:17:26 / cg"
1102
4763b34e4c0e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1099
diff changeset
   791
!
4763b34e4c0e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1099
diff changeset
   792
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   793
component:component definition:anObject change:changeSymbol
1083
e3ac808d06e8 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1081
diff changeset
   794
    "Include indication that a class/namespace was added or removed
e3ac808d06e8 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1081
diff changeset
   795
     from a CodeComponent." 
e3ac808d06e8 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1081
diff changeset
   796
e3ac808d06e8 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1081
diff changeset
   797
    self 
e3ac808d06e8 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1081
diff changeset
   798
        changed:#'component:definition:change:'
e3ac808d06e8 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1081
diff changeset
   799
        with:
e3ac808d06e8 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1081
diff changeset
   800
            ( Array 
e3ac808d06e8 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1081
diff changeset
   801
                    with: component
e3ac808d06e8 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1081
diff changeset
   802
                    with: anObject
e3ac808d06e8 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1081
diff changeset
   803
                    with: changeSymbol
e3ac808d06e8 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1081
diff changeset
   804
            )
e3ac808d06e8 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1081
diff changeset
   805
!
e3ac808d06e8 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1081
diff changeset
   806
901
8fd26c5e8e8f more VW compatibility
Claus Gittinger <cg@exept.de>
parents: 899
diff changeset
   807
reorganizeSystem
8fd26c5e8e8f more VW compatibility
Claus Gittinger <cg@exept.de>
parents: 899
diff changeset
   808
    "dummy here"
8fd26c5e8e8f more VW compatibility
Claus Gittinger <cg@exept.de>
parents: 899
diff changeset
   809
8fd26c5e8e8f more VW compatibility
Claus Gittinger <cg@exept.de>
parents: 899
diff changeset
   810
    "Created: / 6.2.2000 / 20:45:10 / cg"
889
6b05401d7184 more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents: 887
diff changeset
   811
! !
6b05401d7184 more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents: 887
diff changeset
   812
2235
3078dab499ca *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2234
diff changeset
   813
!ChangeSet methodsFor:'accessing'!
3078dab499ca *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2234
diff changeset
   814
3078dab499ca *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2234
diff changeset
   815
name
3078dab499ca *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2234
diff changeset
   816
    ^ name
3078dab499ca *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2234
diff changeset
   817
!
3078dab499ca *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2234
diff changeset
   818
3078dab499ca *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2234
diff changeset
   819
name:something
3078dab499ca *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2234
diff changeset
   820
    name := something.
3078dab499ca *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2234
diff changeset
   821
! !
2234
f5af55bd08cb *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2186
diff changeset
   822
985
d6e52410ac8a *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 965
diff changeset
   823
!ChangeSet methodsFor:'change & update'!
d6e52410ac8a *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 965
diff changeset
   824
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   825
changed:anAspectSymbol with:aParameter 
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   826
    "Allow objects to depend on the ChangeSet class instead of a particular instance 
1099
bd76198721aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1098
diff changeset
   827
     of ChangeSet (which may be switched using projects)."
985
d6e52410ac8a *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 965
diff changeset
   828
1475
934d20073adb more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents: 1471
diff changeset
   829
    self == ChangeSet current ifTrue:[
934d20073adb more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents: 1471
diff changeset
   830
        ChangeSet changed:anAspectSymbol with:aParameter.
934d20073adb more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents: 1471
diff changeset
   831
    ].
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   832
    super changed:anAspectSymbol with:aParameter
985
d6e52410ac8a *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 965
diff changeset
   833
! !
d6e52410ac8a *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 965
diff changeset
   834
901
8fd26c5e8e8f more VW compatibility
Claus Gittinger <cg@exept.de>
parents: 899
diff changeset
   835
!ChangeSet methodsFor:'changes management'!
889
6b05401d7184 more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents: 887
diff changeset
   836
6b05401d7184 more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents: 887
diff changeset
   837
addClassCommentChangeFor:aClass
6b05401d7184 more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents: 887
diff changeset
   838
    "add a classComment change to the receiver"
6b05401d7184 more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents: 887
diff changeset
   839
6b05401d7184 more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents: 887
diff changeset
   840
    |newChange|
6b05401d7184 more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents: 887
diff changeset
   841
6b05401d7184 more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents: 887
diff changeset
   842
    newChange := ClassCommentChange class:aClass.
6b05401d7184 more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents: 887
diff changeset
   843
    newChange comment:aClass comment.
1128
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
   844
    self rememberChangedClass:aClass.
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
   845
    self addChange:newChange
889
6b05401d7184 more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents: 887
diff changeset
   846
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
   847
    "Modified: / 14.11.2001 / 13:35:34 / cg"
100
d09e51d14901 project changeSet fixes
Claus Gittinger <cg@exept.de>
parents: 85
diff changeset
   848
!
d09e51d14901 project changeSet fixes
Claus Gittinger <cg@exept.de>
parents: 85
diff changeset
   849
d09e51d14901 project changeSet fixes
Claus Gittinger <cg@exept.de>
parents: 85
diff changeset
   850
addClassDefinitionChangeFor:aClass
378
f106015c98a6 commentary
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
   851
    "add a classDefinition change to the receiver"
f106015c98a6 commentary
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
   852
100
d09e51d14901 project changeSet fixes
Claus Gittinger <cg@exept.de>
parents: 85
diff changeset
   853
    |newChange|
d09e51d14901 project changeSet fixes
Claus Gittinger <cg@exept.de>
parents: 85
diff changeset
   854
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   855
    newChange := ClassDefinitionChange class:aClass source:(aClass definition).
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   856
    newChange package:aClass package.
1128
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
   857
    self rememberChangedClass:aClass.
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
   858
    self addChange:newChange
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   859
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   860
    "
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   861
     (ChangeSet new addClassDefinitionChangeFor:ChangeSet) inspect
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   862
    "
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   863
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   864
    "Modified: / 12-10-2006 / 18:17:02 / cg"
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   865
!
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   866
1232
58d1ebc59df5 added #addClassRemoveChange:
james
parents: 1209
diff changeset
   867
addClassRemoveChange:oldClass 
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   868
    "add a classRemove change to the receiver"
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   869
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   870
    |newChange|
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   871
1232
58d1ebc59df5 added #addClassRemoveChange:
james
parents: 1209
diff changeset
   872
    newChange := ClassRemoveChange new className:oldClass name.
1281
6aeafe46d0ad category;
Claus Gittinger <cg@exept.de>
parents: 1264
diff changeset
   873
    self rememberChangedClass:oldClass.
1421
eeb8f1c9b6b4 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1415
diff changeset
   874
    oldClass isPrivate ifTrue:[
eeb8f1c9b6b4 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1415
diff changeset
   875
        self rememberChangedClass:oldClass topOwningClass.
eeb8f1c9b6b4 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1415
diff changeset
   876
    ].
1232
58d1ebc59df5 added #addClassRemoveChange:
james
parents: 1209
diff changeset
   877
    ClassRemoveChange::ClassBeingRemovedQuery 
58d1ebc59df5 added #addClassRemoveChange:
james
parents: 1209
diff changeset
   878
        answer:oldClass
58d1ebc59df5 added #addClassRemoveChange:
james
parents: 1209
diff changeset
   879
        do:[
58d1ebc59df5 added #addClassRemoveChange:
james
parents: 1209
diff changeset
   880
            self addChange:newChange
58d1ebc59df5 added #addClassRemoveChange:
james
parents: 1209
diff changeset
   881
        ]
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
   882
    "Modified: / 14.11.2001 / 13:35:39 / cg"
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   883
!
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   884
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   885
addClassRenameChangeFrom:oldName to:newName
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   886
    "add a classRename change to the receiver"
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   887
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   888
    |newChange|
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   889
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   890
    newChange := ClassRenameChange new oldName:oldName newName:newName.
1281
6aeafe46d0ad category;
Claus Gittinger <cg@exept.de>
parents: 1264
diff changeset
   891
    self rememberChangedClass:(Smalltalk at:newName).
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
   892
    self addChange:newChange
100
d09e51d14901 project changeSet fixes
Claus Gittinger <cg@exept.de>
parents: 85
diff changeset
   893
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
   894
    "Modified: / 14.11.2001 / 13:35:41 / cg"
100
d09e51d14901 project changeSet fixes
Claus Gittinger <cg@exept.de>
parents: 85
diff changeset
   895
!
d09e51d14901 project changeSet fixes
Claus Gittinger <cg@exept.de>
parents: 85
diff changeset
   896
1081
5d8001052312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1045
diff changeset
   897
addDoIt:aString
5d8001052312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1045
diff changeset
   898
    "add a doIt to the receiver"
5d8001052312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1045
diff changeset
   899
5d8001052312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1045
diff changeset
   900
    |newChange|
5d8001052312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1045
diff changeset
   901
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   902
    newChange := DoItChange new source:aString.
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
   903
    self addChange:newChange.
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
   904
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
   905
    "Modified: / 14.11.2001 / 13:35:44 / cg"
1081
5d8001052312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1045
diff changeset
   906
!
5d8001052312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1045
diff changeset
   907
889
6b05401d7184 more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents: 887
diff changeset
   908
addInstVarDefinitionChangeFor:aClass
6b05401d7184 more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents: 887
diff changeset
   909
    "add an instVarDefinition change to the receiver"
6b05401d7184 more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents: 887
diff changeset
   910
6b05401d7184 more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents: 887
diff changeset
   911
    |newChange|
6b05401d7184 more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents: 887
diff changeset
   912
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   913
    newChange := ClassInstVarDefinitionChange 
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   914
                        class:aClass
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   915
                        source:(aClass name , ' instanceVariableNames:' , aClass instanceVariableString storeString).
2617
a9e632776c57 visitor support (for monticello);
Claus Gittinger <cg@exept.de>
parents: 2524
diff changeset
   916
    newChange classInstVarNames:aClass instanceVariableString asCollectionOfWords.
1128
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
   917
    self rememberChangedClass:aClass.
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
   918
    self addChange:newChange
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
   919
2617
a9e632776c57 visitor support (for monticello);
Claus Gittinger <cg@exept.de>
parents: 2524
diff changeset
   920
    "Modified: / 25-11-2011 / 17:38:42 / cg"
889
6b05401d7184 more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents: 887
diff changeset
   921
!
6b05401d7184 more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents: 887
diff changeset
   922
16
fcbfbba03d49 *** empty log message ***
claus
parents: 10
diff changeset
   923
addMethodCategoryChange:aMethod category:newCategory in:aClass
378
f106015c98a6 commentary
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
   924
    "add a methodCategory change to the receiver"
f106015c98a6 commentary
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
   925
16
fcbfbba03d49 *** empty log message ***
claus
parents: 10
diff changeset
   926
    |newChange|
fcbfbba03d49 *** empty log message ***
claus
parents: 10
diff changeset
   927
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   928
    newChange := MethodCategoryChange 
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   929
                        class:aClass
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   930
                        selector:(aClass selectorAtMethod:aMethod)
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   931
                        category:newCategory.
1128
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
   932
    self rememberChangedClass:aClass.
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
   933
    self addChange:newChange
16
fcbfbba03d49 *** empty log message ***
claus
parents: 10
diff changeset
   934
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
   935
    "Modified: / 14.11.2001 / 13:35:48 / cg"
44
claus
parents: 39
diff changeset
   936
!
claus
parents: 39
diff changeset
   937
956
0c6c209df4e9 keep previousVersion of method in changeSet
Claus Gittinger <cg@exept.de>
parents: 946
diff changeset
   938
addMethodChange:aMethod fromOld:oldMethod in:aClass
0c6c209df4e9 keep previousVersion of method in changeSet
Claus Gittinger <cg@exept.de>
parents: 946
diff changeset
   939
    "add a method change to the receiver"
0c6c209df4e9 keep previousVersion of method in changeSet
Claus Gittinger <cg@exept.de>
parents: 946
diff changeset
   940
0c6c209df4e9 keep previousVersion of method in changeSet
Claus Gittinger <cg@exept.de>
parents: 946
diff changeset
   941
    |newChange|
0c6c209df4e9 keep previousVersion of method in changeSet
Claus Gittinger <cg@exept.de>
parents: 946
diff changeset
   942
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   943
    newChange := MethodChange 
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   944
                        class:aClass
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   945
                        selector:aMethod selector
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   946
                        source:aMethod source
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   947
                        category:aMethod category.
956
0c6c209df4e9 keep previousVersion of method in changeSet
Claus Gittinger <cg@exept.de>
parents: 946
diff changeset
   948
    oldMethod notNil ifTrue:[
1232
58d1ebc59df5 added #addClassRemoveChange:
james
parents: 1209
diff changeset
   949
        newChange previousVersion:oldMethod.
956
0c6c209df4e9 keep previousVersion of method in changeSet
Claus Gittinger <cg@exept.de>
parents: 946
diff changeset
   950
    ].
1128
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
   951
    self rememberChangedClass:aClass.
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
   952
    self addChange:newChange.
956
0c6c209df4e9 keep previousVersion of method in changeSet
Claus Gittinger <cg@exept.de>
parents: 946
diff changeset
   953
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
   954
    "Modified: / 14.11.2001 / 13:35:50 / cg"
956
0c6c209df4e9 keep previousVersion of method in changeSet
Claus Gittinger <cg@exept.de>
parents: 946
diff changeset
   955
!
0c6c209df4e9 keep previousVersion of method in changeSet
Claus Gittinger <cg@exept.de>
parents: 946
diff changeset
   956
85
c354e2f81394 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 68
diff changeset
   957
addMethodChange:aMethod in:aClass
378
f106015c98a6 commentary
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
   958
    "add a method change to the receiver"
f106015c98a6 commentary
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
   959
85
c354e2f81394 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 68
diff changeset
   960
    |newChange|
c354e2f81394 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 68
diff changeset
   961
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   962
    newChange := MethodChange 
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   963
                        class:aClass
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   964
                        selector:aMethod selector
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   965
                        source:aMethod source
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   966
                        category:aMethod category.
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   967
    newChange package:(aMethod package).
1128
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
   968
    self rememberChangedClass:aClass.
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
   969
    self addChange:newChange
378
f106015c98a6 commentary
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
   970
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   971
    "Modified: / 12-10-2006 / 18:15:28 / cg"
85
c354e2f81394 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 68
diff changeset
   972
!
c354e2f81394 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 68
diff changeset
   973
1842
6ca4e98df305 method-package change record added
Claus Gittinger <cg@exept.de>
parents: 1830
diff changeset
   974
addMethodPackageChange:aMethod package:newPackage in:aClass
6ca4e98df305 method-package change record added
Claus Gittinger <cg@exept.de>
parents: 1830
diff changeset
   975
    "add a methodPackage change to the receiver"
6ca4e98df305 method-package change record added
Claus Gittinger <cg@exept.de>
parents: 1830
diff changeset
   976
6ca4e98df305 method-package change record added
Claus Gittinger <cg@exept.de>
parents: 1830
diff changeset
   977
    |newChange|
6ca4e98df305 method-package change record added
Claus Gittinger <cg@exept.de>
parents: 1830
diff changeset
   978
6ca4e98df305 method-package change record added
Claus Gittinger <cg@exept.de>
parents: 1830
diff changeset
   979
    newChange := MethodPackageChange 
6ca4e98df305 method-package change record added
Claus Gittinger <cg@exept.de>
parents: 1830
diff changeset
   980
                        class:aClass
6ca4e98df305 method-package change record added
Claus Gittinger <cg@exept.de>
parents: 1830
diff changeset
   981
                        selector:(aClass selectorAtMethod:aMethod)
6ca4e98df305 method-package change record added
Claus Gittinger <cg@exept.de>
parents: 1830
diff changeset
   982
                        package:newPackage.
6ca4e98df305 method-package change record added
Claus Gittinger <cg@exept.de>
parents: 1830
diff changeset
   983
    self rememberChangedClass:aClass.
6ca4e98df305 method-package change record added
Claus Gittinger <cg@exept.de>
parents: 1830
diff changeset
   984
    self addChange:newChange
6ca4e98df305 method-package change record added
Claus Gittinger <cg@exept.de>
parents: 1830
diff changeset
   985
6ca4e98df305 method-package change record added
Claus Gittinger <cg@exept.de>
parents: 1830
diff changeset
   986
    "Created: / 09-10-2006 / 14:02:33 / cg"
6ca4e98df305 method-package change record added
Claus Gittinger <cg@exept.de>
parents: 1830
diff changeset
   987
!
6ca4e98df305 method-package change record added
Claus Gittinger <cg@exept.de>
parents: 1830
diff changeset
   988
44
claus
parents: 39
diff changeset
   989
addMethodPrivacyChange:aMethod in:aClass
378
f106015c98a6 commentary
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
   990
    "add a methodPrivacy change to the receiver"
f106015c98a6 commentary
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
   991
44
claus
parents: 39
diff changeset
   992
    |newChange|
claus
parents: 39
diff changeset
   993
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   994
    newChange := MethodPrivacyChange 
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   995
                        class:aClass
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   996
                        selector:(aClass selectorAtMethod:aMethod)
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   997
                        privacy:aMethod privacy.
1128
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
   998
    self rememberChangedClass:aClass.
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
   999
    self addChange:newChange
44
claus
parents: 39
diff changeset
  1000
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
  1001
    "Modified: / 27.8.1995 / 22:55:22 / claus"
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
  1002
    "Modified: / 14.11.2001 / 13:35:55 / cg"
235
3ebfdc6edab9 documentation
Claus Gittinger <cg@exept.de>
parents: 102
diff changeset
  1003
!
3ebfdc6edab9 documentation
Claus Gittinger <cg@exept.de>
parents: 102
diff changeset
  1004
3ebfdc6edab9 documentation
Claus Gittinger <cg@exept.de>
parents: 102
diff changeset
  1005
addPrimitiveDefinitionsChangeFor:aClass
378
f106015c98a6 commentary
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
  1006
    "add a primitiveDefinitions change to the receiver"
f106015c98a6 commentary
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
  1007
235
3ebfdc6edab9 documentation
Claus Gittinger <cg@exept.de>
parents: 102
diff changeset
  1008
    |newChange|
3ebfdc6edab9 documentation
Claus Gittinger <cg@exept.de>
parents: 102
diff changeset
  1009
783
90ffa6f0a86b checkin from browser
Claus Gittinger <cg@exept.de>
parents: 781
diff changeset
  1010
    newChange := ClassPrimitiveDefinitionsChange new
1287
faf72a0bc34a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1281
diff changeset
  1011
                        class:aClass source:(aClass primitiveDefinitionsString).
1128
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
  1012
    self rememberChangedClass:aClass.
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
  1013
    self addChange:newChange
378
f106015c98a6 commentary
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
  1014
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
  1015
    "Modified: / 14.11.2001 / 13:35:57 / cg"
235
3ebfdc6edab9 documentation
Claus Gittinger <cg@exept.de>
parents: 102
diff changeset
  1016
!
3ebfdc6edab9 documentation
Claus Gittinger <cg@exept.de>
parents: 102
diff changeset
  1017
3ebfdc6edab9 documentation
Claus Gittinger <cg@exept.de>
parents: 102
diff changeset
  1018
addPrimitiveFunctionsChangeFor:aClass
378
f106015c98a6 commentary
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
  1019
    "add a primitiveFunctions change to the receiver"
f106015c98a6 commentary
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
  1020
235
3ebfdc6edab9 documentation
Claus Gittinger <cg@exept.de>
parents: 102
diff changeset
  1021
    |newChange|
3ebfdc6edab9 documentation
Claus Gittinger <cg@exept.de>
parents: 102
diff changeset
  1022
783
90ffa6f0a86b checkin from browser
Claus Gittinger <cg@exept.de>
parents: 781
diff changeset
  1023
    newChange := ClassPrimitiveFunctionsChange new
1287
faf72a0bc34a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1281
diff changeset
  1024
                        class:aClass source:(aClass primitiveFunctionsString).
1128
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
  1025
    self rememberChangedClass:aClass.
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
  1026
    self addChange:newChange
378
f106015c98a6 commentary
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
  1027
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
  1028
    "Modified: / 14.11.2001 / 13:35:59 / cg"
235
3ebfdc6edab9 documentation
Claus Gittinger <cg@exept.de>
parents: 102
diff changeset
  1029
!
3ebfdc6edab9 documentation
Claus Gittinger <cg@exept.de>
parents: 102
diff changeset
  1030
3ebfdc6edab9 documentation
Claus Gittinger <cg@exept.de>
parents: 102
diff changeset
  1031
addPrimitiveVariablesChangeFor:aClass
378
f106015c98a6 commentary
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
  1032
    "add a primitiveVariables change to the receiver"
f106015c98a6 commentary
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
  1033
235
3ebfdc6edab9 documentation
Claus Gittinger <cg@exept.de>
parents: 102
diff changeset
  1034
    |newChange|
3ebfdc6edab9 documentation
Claus Gittinger <cg@exept.de>
parents: 102
diff changeset
  1035
783
90ffa6f0a86b checkin from browser
Claus Gittinger <cg@exept.de>
parents: 781
diff changeset
  1036
    newChange := ClassPrimitiveVariablesChange new
1287
faf72a0bc34a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1281
diff changeset
  1037
                         class:aClass source:(aClass primitiveVariablesString).
1128
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
  1038
    self rememberChangedClass:aClass.
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
  1039
    self addChange:newChange
378
f106015c98a6 commentary
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
  1040
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
  1041
    "Modified: / 14.11.2001 / 13:36:01 / cg"
654
edeb63d98088 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 625
diff changeset
  1042
!
edeb63d98088 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 625
diff changeset
  1043
1164
cecaa2229cab removeSelector change: remember methods previous version
Claus Gittinger <cg@exept.de>
parents: 1156
diff changeset
  1044
addRemoveSelectorChange:aSelector fromOld:oldMethod in:aClass
654
edeb63d98088 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 625
diff changeset
  1045
    "add a method-remove change to the receiver"
edeb63d98088 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 625
diff changeset
  1046
edeb63d98088 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 625
diff changeset
  1047
    |newChange|
edeb63d98088 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 625
diff changeset
  1048
1081
5d8001052312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1045
diff changeset
  1049
    newChange := MethodRemoveChange class:aClass selector:aSelector.
1164
cecaa2229cab removeSelector change: remember methods previous version
Claus Gittinger <cg@exept.de>
parents: 1156
diff changeset
  1050
    oldMethod notNil ifTrue:[
1232
58d1ebc59df5 added #addClassRemoveChange:
james
parents: 1209
diff changeset
  1051
        newChange previousVersion:oldMethod.
1164
cecaa2229cab removeSelector change: remember methods previous version
Claus Gittinger <cg@exept.de>
parents: 1156
diff changeset
  1052
    ].
1128
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
  1053
    self rememberChangedClass:aClass.
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
  1054
    self addChange:newChange
654
edeb63d98088 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 625
diff changeset
  1055
edeb63d98088 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 625
diff changeset
  1056
    "Modified: / 27.8.1995 / 22:55:22 / claus"
edeb63d98088 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 625
diff changeset
  1057
    "Created: / 16.2.1998 / 12:47:07 / cg"
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
  1058
    "Modified: / 14.11.2001 / 13:36:04 / cg"
901
8fd26c5e8e8f more VW compatibility
Claus Gittinger <cg@exept.de>
parents: 899
diff changeset
  1059
!
8fd26c5e8e8f more VW compatibility
Claus Gittinger <cg@exept.de>
parents: 899
diff changeset
  1060
8fd26c5e8e8f more VW compatibility
Claus Gittinger <cg@exept.de>
parents: 899
diff changeset
  1061
addRenameCategoryChangeIn:aClass from:oldCategory to:newCategory
8fd26c5e8e8f more VW compatibility
Claus Gittinger <cg@exept.de>
parents: 899
diff changeset
  1062
    "add a category rename change to the receiver"
8fd26c5e8e8f more VW compatibility
Claus Gittinger <cg@exept.de>
parents: 899
diff changeset
  1063
8fd26c5e8e8f more VW compatibility
Claus Gittinger <cg@exept.de>
parents: 899
diff changeset
  1064
    |newChange|
8fd26c5e8e8f more VW compatibility
Claus Gittinger <cg@exept.de>
parents: 899
diff changeset
  1065
8fd26c5e8e8f more VW compatibility
Claus Gittinger <cg@exept.de>
parents: 899
diff changeset
  1066
    newChange := MethodCategoryRenameChange class:aClass.
8fd26c5e8e8f more VW compatibility
Claus Gittinger <cg@exept.de>
parents: 899
diff changeset
  1067
    newChange oldCategoryName:oldCategory newCategoryName:newCategory.
1128
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
  1068
    self rememberChangedClass:aClass.
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
  1069
    self addChange:newChange
1105
b27c0d72d7d0 avoid useless change notifications from #collect:, #select: etc.
Claus Gittinger <cg@exept.de>
parents: 1102
diff changeset
  1070
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
  1071
    "Modified: / 14.11.2001 / 13:36:06 / cg"
1105
b27c0d72d7d0 avoid useless change notifications from #collect:, #select: etc.
Claus Gittinger <cg@exept.de>
parents: 1102
diff changeset
  1072
! !
b27c0d72d7d0 avoid useless change notifications from #collect:, #select: etc.
Claus Gittinger <cg@exept.de>
parents: 1102
diff changeset
  1073
2376
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1074
!ChangeSet methodsFor:'fileOut'!
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1075
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1076
fileOutAs: aStringOrFilename
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1077
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1078
    | stream |
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1079
    stream := aStringOrFilename asFilename writeStream.
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1080
    [ self fileOutOn: stream ]
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1081
        ensure: [stream close]
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1082
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1083
    "Created: / 05-12-2009 / 12:33:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1084
!
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1085
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1086
fileOutOn: stream
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1087
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1088
    self do:[:chg|chg fileOutOn: stream]
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1089
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1090
    "Created: / 05-12-2009 / 12:32:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1091
! !
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1092
2469
4a02caf1782d changed: #saveToStream:format:
Claus Gittinger <cg@exept.de>
parents: 2412
diff changeset
  1093
85
c354e2f81394 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 68
diff changeset
  1094
!ChangeSet methodsFor:'misc'!
c354e2f81394 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 68
diff changeset
  1095
c354e2f81394 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 68
diff changeset
  1096
addPatch:nameOfPatch
c354e2f81394 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 68
diff changeset
  1097
    "ignored for now - allows fileIn of ST-80 patch stuff .."
c354e2f81394 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 68
diff changeset
  1098
c354e2f81394 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 68
diff changeset
  1099
    ^ self
c354e2f81394 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 68
diff changeset
  1100
! !
c354e2f81394 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 68
diff changeset
  1101
2376
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1102
1263
14ef737d93a8 method category rename
Claus Gittinger <cg@exept.de>
parents: 1247
diff changeset
  1103
!ChangeSet methodsFor:'private-accessing'!
1098
420a868fd606 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1097
diff changeset
  1104
1128
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
  1105
addChange:aChange
2053
590bf720dfd4 dont add nil to a set
Claus Gittinger <cg@exept.de>
parents: 2046
diff changeset
  1106
    |changeClass|
590bf720dfd4 dont add nil to a set
Claus Gittinger <cg@exept.de>
parents: 2046
diff changeset
  1107
1898
325fa7fbb3e3 use isRealNameSpace
Claus Gittinger <cg@exept.de>
parents: 1885
diff changeset
  1108
    aChange timeOfChangeIfKnown isNil ifTrue:[
325fa7fbb3e3 use isRealNameSpace
Claus Gittinger <cg@exept.de>
parents: 1885
diff changeset
  1109
        aChange timeStamp:(Timestamp now).
325fa7fbb3e3 use isRealNameSpace
Claus Gittinger <cg@exept.de>
parents: 1885
diff changeset
  1110
    ].
325fa7fbb3e3 use isRealNameSpace
Claus Gittinger <cg@exept.de>
parents: 1885
diff changeset
  1111
1128
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
  1112
    self add:aChange.
1471
d3a32a4b689b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1453
diff changeset
  1113
    changedClasses notNil ifTrue:[
2053
590bf720dfd4 dont add nil to a set
Claus Gittinger <cg@exept.de>
parents: 2046
diff changeset
  1114
        (changeClass := aChange changeClass) notNil ifTrue:[      
590bf720dfd4 dont add nil to a set
Claus Gittinger <cg@exept.de>
parents: 2046
diff changeset
  1115
            changedClasses add:changeClass.
590bf720dfd4 dont add nil to a set
Claus Gittinger <cg@exept.de>
parents: 2046
diff changeset
  1116
        ].
1471
d3a32a4b689b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1453
diff changeset
  1117
    ].
1476
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
  1118
    changeSelectors notNil ifTrue:[
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
  1119
        aChange isMethodChange ifTrue:[
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
  1120
            changeSelectors add:aChange selector.
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
  1121
        ].
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
  1122
    ].
1232
58d1ebc59df5 added #addClassRemoveChange:
james
parents: 1209
diff changeset
  1123
58d1ebc59df5 added #addClassRemoveChange:
james
parents: 1209
diff changeset
  1124
"/    aChange sendChangeNotificationThroughSmalltalk. 
1128
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
  1125
    self changed:#addChange: with:aChange.
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
  1126
1898
325fa7fbb3e3 use isRealNameSpace
Claus Gittinger <cg@exept.de>
parents: 1885
diff changeset
  1127
    "Created: / 14-11-2001 / 13:35:11 / cg"
325fa7fbb3e3 use isRealNameSpace
Claus Gittinger <cg@exept.de>
parents: 1885
diff changeset
  1128
    "Modified: / 10-11-2006 / 16:47:13 / cg"
1128
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
  1129
!
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
  1130
1479
Claus Gittinger <cg@exept.de>
parents: 1478
diff changeset
  1131
flushChangedClassesCache
Claus Gittinger <cg@exept.de>
parents: 1478
diff changeset
  1132
    changedClasses := changeSelectors := nil
Claus Gittinger <cg@exept.de>
parents: 1478
diff changeset
  1133
Claus Gittinger <cg@exept.de>
parents: 1478
diff changeset
  1134
    "
Claus Gittinger <cg@exept.de>
parents: 1478
diff changeset
  1135
     ChangeSet current flushChangedClassesCache
Claus Gittinger <cg@exept.de>
parents: 1478
diff changeset
  1136
    "
Claus Gittinger <cg@exept.de>
parents: 1478
diff changeset
  1137
!
Claus Gittinger <cg@exept.de>
parents: 1478
diff changeset
  1138
1128
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
  1139
rememberChangedClass:aClass
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
  1140
    changedClasses notNil ifTrue:[
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
  1141
        changedClasses add:aClass
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
  1142
    ].
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
  1143
!
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
  1144
1098
420a868fd606 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1097
diff changeset
  1145
removeAll:aCollection
1301
b747d11e7ff8 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1292
diff changeset
  1146
    aCollection notEmpty ifTrue:[
b747d11e7ff8 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1292
diff changeset
  1147
        super removeAll:aCollection.
1476
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
  1148
        changedClasses := changeSelectors := nil.
1301
b747d11e7ff8 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1292
diff changeset
  1149
        self changed:#removeAll: with:aCollection.
b747d11e7ff8 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1292
diff changeset
  1150
    ]
1421
eeb8f1c9b6b4 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1415
diff changeset
  1151
!
eeb8f1c9b6b4 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1415
diff changeset
  1152
eeb8f1c9b6b4 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1415
diff changeset
  1153
unrememberChangedClasses
eeb8f1c9b6b4 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1415
diff changeset
  1154
    changedClasses := nil
1098
420a868fd606 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1097
diff changeset
  1155
! !
420a868fd606 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1097
diff changeset
  1156
1034
cdc9ddc19155 added query for a class being in a changeSet
Claus Gittinger <cg@exept.de>
parents: 985
diff changeset
  1157
!ChangeSet methodsFor:'queries'!
cdc9ddc19155 added query for a class being in a changeSet
Claus Gittinger <cg@exept.de>
parents: 985
diff changeset
  1158
2160
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1159
changedPackages
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1160
    "return a collection of all packages for which changes are in this changeSet"
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1161
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1162
    |classes changedPackages|
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1163
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1164
    changedPackages := Set new.
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1165
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1166
    self do:[:chg |
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1167
        |p mthd cls|
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1168
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1169
        p := chg package.
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1170
        p isNil ifTrue:[
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1171
            chg isMethodChange ifTrue:[
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1172
                mthd := chg changeMethod.
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1173
                mthd notNil ifTrue:[
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1174
                    p := mthd package.
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1175
                ] ifFalse:[
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1176
                    cls := chg changeClass.
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1177
                    cls notNil ifTrue:[
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1178
                        p := cls package.
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1179
                    ]
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1180
                ]
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1181
            ] ifFalse:[
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1182
                chg isClassChange ifTrue:[
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1183
                    cls := chg changeClass.
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1184
                    cls notNil ifTrue:[
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1185
                        p := cls package.
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1186
                    ]
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1187
                ]
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1188
            ].
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1189
        ].
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1190
        p notNil ifTrue:[
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1191
            changedPackages add:p.
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1192
        ]
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1193
    ].
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1194
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1195
"/    self changedClasses do:[:cls |
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1196
"/        |p|
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1197
"/
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1198
"/        (p := cls package) notNil ifTrue:[
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1199
"/            changedPackages add:p.
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1200
"/        ]
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1201
"/    ].
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1202
    ^ changedPackages.
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1203
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1204
    "
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1205
     ChangeSet current changedPackages  
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1206
    "
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1207
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1208
    "Created: / 22-09-2006 / 16:37:40 / cg"
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1209
    "Modified: / 13-10-2006 / 01:20:48 / cg"
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1210
!
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1211
2412
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1212
changesForPackage:aPackageSymbol
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1213
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1214
    "
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1215
	ChangeSet current changesForPackage:#'stx:goodies/libsvn'.
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1216
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1217
    "
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1218
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1219
    ^(self select:[:aChange |
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1220
	|removeThis mClass mthd|
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1221
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1222
	removeThis := false.
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1223
	(aChange isMethodChange or:[aChange isMethodRemoveChange]) ifTrue:[
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1224
	    mClass := aChange changeClass.
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1225
	    mClass notNil ifTrue:[
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1226
		mthd := mClass compiledMethodAt:(aChange selector).
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1227
		mthd isNil ifTrue:[
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1228
		    aChange isMethodRemoveChange ifTrue:[
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1229
			removeThis := (mClass package = aPackageSymbol)
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1230
		    ].
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1231
		] ifFalse:[
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1232
		    removeThis := (mthd package = aPackageSymbol)
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1233
		]
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1234
	    ].
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1235
	] ifFalse:[
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1236
	    (aChange isClassChange) ifTrue:[
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1237
		(aChange changeClass notNil) ifTrue:[
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1238
		    removeThis := (aChange changeClass package = aPackageSymbol)
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1239
		].
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1240
	    ].
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1241
	].
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1242
	removeThis
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1243
    ])
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1244
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1245
    "Created: / 05-11-2001 / 14:21:17 / cg"
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1246
    "Modified: / 12-10-2006 / 16:51:27 / cg"
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1247
    "Modified: / 22-10-2008 / 13:25:02 / Jan Vrany <vranyj1@fel.cvut.cz>"
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1248
!
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1249
1034
cdc9ddc19155 added query for a class being in a changeSet
Claus Gittinger <cg@exept.de>
parents: 985
diff changeset
  1250
includesChangeForClass:aClass
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1251
    |nameOfClass|
1085
e4912b831447 includesChangeFor...
Claus Gittinger <cg@exept.de>
parents: 1083
diff changeset
  1252
e4912b831447 includesChangeFor...
Claus Gittinger <cg@exept.de>
parents: 1083
diff changeset
  1253
    nameOfClass := aClass theNonMetaclass name.
1918
1f3fcb411307 do not check for identical class being in changeSet -
boris
parents: 1898
diff changeset
  1254
1f3fcb411307 do not check for identical class being in changeSet -
boris
parents: 1898
diff changeset
  1255
    (self changedClasses contains:[:aClass | aClass theNonMetaclass name = nameOfClass]) ifFalse:[^ false].
1340
e5ccdb4c4efa checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1329
diff changeset
  1256
    ^ self contains:[:aChange | aChange className = nameOfClass]
1085
e4912b831447 includesChangeFor...
Claus Gittinger <cg@exept.de>
parents: 1083
diff changeset
  1257
e4912b831447 includesChangeFor...
Claus Gittinger <cg@exept.de>
parents: 1083
diff changeset
  1258
    "
e4912b831447 includesChangeFor...
Claus Gittinger <cg@exept.de>
parents: 1083
diff changeset
  1259
     ChangeSet current includesChangeForClass:ChangeSet
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1260
     ChangeSet current includesChangeForClass:ChangeSet class
1686
7d2c1f9f63e9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1521
diff changeset
  1261
     ChangeSet current includesChangeForClass:SourceCodeManagerUtilities
1918
1f3fcb411307 do not check for identical class being in changeSet -
boris
parents: 1898
diff changeset
  1262
     ChangeSet current includesChangeForClass:(Expecco::ExpeccoXMLDecoder::ObjectCreator)
1085
e4912b831447 includesChangeFor...
Claus Gittinger <cg@exept.de>
parents: 1083
diff changeset
  1263
    "
e4912b831447 includesChangeFor...
Claus Gittinger <cg@exept.de>
parents: 1083
diff changeset
  1264
1842
6ca4e98df305 method-package change record added
Claus Gittinger <cg@exept.de>
parents: 1830
diff changeset
  1265
    "Modified: / 09-10-2006 / 13:39:22 / cg"
1085
e4912b831447 includesChangeFor...
Claus Gittinger <cg@exept.de>
parents: 1083
diff changeset
  1266
!
e4912b831447 includesChangeFor...
Claus Gittinger <cg@exept.de>
parents: 1083
diff changeset
  1267
e4912b831447 includesChangeFor...
Claus Gittinger <cg@exept.de>
parents: 1083
diff changeset
  1268
includesChangeForClass:aClass selector:selector
1918
1f3fcb411307 do not check for identical class being in changeSet -
boris
parents: 1898
diff changeset
  1269
    |nameOfNonMetaClass nameOfClass|
1f3fcb411307 do not check for identical class being in changeSet -
boris
parents: 1898
diff changeset
  1270
1478
400bfb0e4ea9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1476
diff changeset
  1271
    (self changeSelectors includes:selector) ifFalse:[^ false].
1476
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
  1272
1918
1f3fcb411307 do not check for identical class being in changeSet -
boris
parents: 1898
diff changeset
  1273
    nameOfNonMetaClass := aClass theNonMetaclass name.
1f3fcb411307 do not check for identical class being in changeSet -
boris
parents: 1898
diff changeset
  1274
    (self changedClasses contains:[:aClass | aClass theNonMetaclass name = nameOfNonMetaClass]) ifFalse:[^ false].
1f3fcb411307 do not check for identical class being in changeSet -
boris
parents: 1898
diff changeset
  1275
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1276
    nameOfClass := aClass name.
1085
e4912b831447 includesChangeFor...
Claus Gittinger <cg@exept.de>
parents: 1083
diff changeset
  1277
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1278
    ^ self contains:[:aChange | 
1232
58d1ebc59df5 added #addClassRemoveChange:
james
parents: 1209
diff changeset
  1279
                        selector = aChange selector 
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1280
                        ifFalse:[
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1281
                            false
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1282
                        ] ifTrue:[
1232
58d1ebc59df5 added #addClassRemoveChange:
james
parents: 1209
diff changeset
  1283
                            nameOfClass = aChange className
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1284
                        ]
1085
e4912b831447 includesChangeFor...
Claus Gittinger <cg@exept.de>
parents: 1083
diff changeset
  1285
                    ]
e4912b831447 includesChangeFor...
Claus Gittinger <cg@exept.de>
parents: 1083
diff changeset
  1286
e4912b831447 includesChangeFor...
Claus Gittinger <cg@exept.de>
parents: 1083
diff changeset
  1287
    "
e4912b831447 includesChangeFor...
Claus Gittinger <cg@exept.de>
parents: 1083
diff changeset
  1288
     ChangeSet current includesChangeForClass:ChangeSet selector:#includesChangeForClass:
e4912b831447 includesChangeFor...
Claus Gittinger <cg@exept.de>
parents: 1083
diff changeset
  1289
    "
e4912b831447 includesChangeFor...
Claus Gittinger <cg@exept.de>
parents: 1083
diff changeset
  1290
e4912b831447 includesChangeFor...
Claus Gittinger <cg@exept.de>
parents: 1083
diff changeset
  1291
    "Created: / 31.10.2001 / 10:26:31 / cg"
e4912b831447 includesChangeFor...
Claus Gittinger <cg@exept.de>
parents: 1083
diff changeset
  1292
    "Modified: / 31.10.2001 / 10:59:49 / cg"
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1293
!
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1294
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1295
includesChangeForClassOrMetaclass:aClass
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1296
    |nameOfClass nameOfMetaclass|
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1297
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1298
    nameOfClass := aClass theNonMetaclass name.
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1299
    nameOfMetaclass := aClass theMetaclass name.
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1300
1920
4365130e896f bad spelling of methodname
Stefan Vogel <sv@exept.de>
parents: 1918
diff changeset
  1301
    (self changedClasses contains:[:eachClass | eachClass theNonMetaclass name = nameOfClass]) ifFalse:[
1918
1f3fcb411307 do not check for identical class being in changeSet -
boris
parents: 1898
diff changeset
  1302
        ^ false.
1f3fcb411307 do not check for identical class being in changeSet -
boris
parents: 1898
diff changeset
  1303
    ].
1f3fcb411307 do not check for identical class being in changeSet -
boris
parents: 1898
diff changeset
  1304
1f3fcb411307 do not check for identical class being in changeSet -
boris
parents: 1898
diff changeset
  1305
1920
4365130e896f bad spelling of methodname
Stefan Vogel <sv@exept.de>
parents: 1918
diff changeset
  1306
    ^ self contains:[:eachChange | 
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1307
                        |changeClassName|
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1308
1920
4365130e896f bad spelling of methodname
Stefan Vogel <sv@exept.de>
parents: 1918
diff changeset
  1309
                        changeClassName := eachChange className.
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1310
                        changeClassName = nameOfClass or:[changeClassName = nameOfMetaclass]
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1311
                    ]
1842
6ca4e98df305 method-package change record added
Claus Gittinger <cg@exept.de>
parents: 1830
diff changeset
  1312
6ca4e98df305 method-package change record added
Claus Gittinger <cg@exept.de>
parents: 1830
diff changeset
  1313
    "Modified: / 09-10-2006 / 13:40:29 / cg"
1127
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1314
!
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1315
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1316
includesChangeForClassOrMetaclassOrPrivateClassOf:aClass
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1317
    |nameOfClass nameOfMetaclass|
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1318
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1319
    nameOfClass := aClass theNonMetaclass name.
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1320
    nameOfMetaclass := aClass theMetaclass name.
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1321
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1322
    self do:[:aChange | 
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1323
        |changeClassName changeClass|
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1324
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1325
        changeClassName := aChange className.
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1326
        (changeClassName = nameOfClass) ifTrue:[^ true].
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1327
        (changeClassName = nameOfMetaclass) ifTrue:[^ true].
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1328
        changeClass := aChange changeClass.
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1329
        (changeClass notNil
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1330
        and:[changeClass isPrivate
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1331
        and:[changeClass owningClass == aClass]]) ifTrue:[
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1332
            ^ true
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1333
        ]
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1334
    ].
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1335
    ^ false
1885
b77dd687e497 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1883
diff changeset
  1336
!
b77dd687e497 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1883
diff changeset
  1337
2519
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1338
includesChangeForClassOrMetaclassOrPrivateClassOfAny:aCollectionOfClasses
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1339
    |namesOfClasses namesOfMetaclasses|
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1340
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1341
    namesOfClasses := aCollectionOfClasses collect:[:eachClass | eachClass theNonMetaclass name] as:Array.
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1342
    namesOfMetaclasses := aCollectionOfClasses collect:[:eachClass | eachClass theMetaclass name] as:Array.
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1343
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1344
    self do:[:aChange | 
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1345
        |changeClassName changeClass|
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1346
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1347
        changeClassName := aChange className.
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1348
        (namesOfClasses includes:changeClassName) ifTrue:[^ true].
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1349
        (namesOfMetaclasses includes:changeClassName) ifTrue:[^ true].
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1350
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1351
        changeClass := aChange changeClass.
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1352
        (changeClass notNil and:[changeClass isPrivate]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1353
            (aCollectionOfClasses includes:changeClass owningClass) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1354
                ^ true
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1355
            ].
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1356
        ]
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1357
    ].
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1358
    ^ false
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1359
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1360
    "Created: / 08-09-2011 / 04:24:26 / cg"
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1361
!
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1362
1885
b77dd687e497 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1883
diff changeset
  1363
includesChangeForPackage:aPackageID
b77dd687e497 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1883
diff changeset
  1364
    ^ self changedPackages includes:aPackageID
b77dd687e497 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1883
diff changeset
  1365
b77dd687e497 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1883
diff changeset
  1366
"/    ^ self contains:[:aChange | aChange package = aPackageID]
b77dd687e497 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1883
diff changeset
  1367
b77dd687e497 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1883
diff changeset
  1368
    "
b77dd687e497 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1883
diff changeset
  1369
     ChangeSet current includesChangeForPackage:'stx:libbasic'
b77dd687e497 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1883
diff changeset
  1370
    "
b77dd687e497 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1883
diff changeset
  1371
b77dd687e497 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1883
diff changeset
  1372
    "Created: / 25-10-2006 / 18:06:55 / cg"
2519
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1373
!
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1374
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1375
selectForWhichIncludesChangeForClassOrMetaclassOrPrivateClassFrom:aCollectionOfClasses
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1376
    |namesOfClasses namesOfMetaclasses|
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1377
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1378
    namesOfClasses := aCollectionOfClasses collect:[:eachClass | eachClass theNonMetaclass name] as:Array.
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1379
    namesOfMetaclasses := aCollectionOfClasses collect:[:eachClass | eachClass theMetaclass name] as:Array.
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1380
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1381
    ^ aCollectionOfClasses 
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1382
        select:[:aChange | 
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1383
            |changeClassName changeClass|
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1384
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1385
            changeClassName := aChange className.
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1386
            (namesOfClasses includes:changeClassName) 
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1387
            or:[ (namesOfMetaclasses includes:changeClassName)
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1388
            or:[
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1389
                changeClass := aChange changeClass.
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1390
                (changeClass notNil 
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1391
                and:[ changeClass isPrivate
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1392
                and:[ (aCollectionOfClasses includes:changeClass owningClass) ]])
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1393
            ]]
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1394
        ].
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1395
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1396
    "Created: / 08-09-2011 / 04:38:32 / cg"
1034
cdc9ddc19155 added query for a class being in a changeSet
Claus Gittinger <cg@exept.de>
parents: 985
diff changeset
  1397
! !
cdc9ddc19155 added query for a class being in a changeSet
Claus Gittinger <cg@exept.de>
parents: 985
diff changeset
  1398
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1399
!ChangeSet methodsFor:'utilities'!
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1400
878
99583ccfe415 *** empty log message ***
ps
parents: 877
diff changeset
  1401
apply
99583ccfe415 *** empty log message ***
ps
parents: 877
diff changeset
  1402
    "apply all changes in the receivers changeSet"
99583ccfe415 *** empty log message ***
ps
parents: 877
diff changeset
  1403
99583ccfe415 *** empty log message ***
ps
parents: 877
diff changeset
  1404
    self do:[:aChange |
2376
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1405
        aChange apply
878
99583ccfe415 *** empty log message ***
ps
parents: 877
diff changeset
  1406
    ]
99583ccfe415 *** empty log message ***
ps
parents: 877
diff changeset
  1407
!
99583ccfe415 *** empty log message ***
ps
parents: 877
diff changeset
  1408
2412
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1409
condenseChanges
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1410
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1411
    | changesToRemove changesToKeep |
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1412
    changesToKeep := self class new.
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1413
    changesToRemove := self class new.
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1414
    self reverseDo:
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1415
	[:change|
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1416
	(changesToKeep anySatisfy:[:each|each isForSameAs: change])
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1417
	    ifTrue:[changesToRemove add: change]
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1418
	    ifFalse:[changesToKeep add: change]
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1419
	].
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1420
    self condenseChanges: changesToRemove.
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1421
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1422
    "Created: / 22-10-2008 / 13:05:13 / Jan Vrany <vranyj1@fel.cvut.cz>"
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1423
!
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1424
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1425
condenseChanges:changesToRemove
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1426
    "remove the given changes - a helper for the rest of the condense protocol"
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1427
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1428
    changesToRemove notEmpty ifTrue:[
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1429
        changedClasses := changeSelectors := nil.
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1430
        self removeAll:changesToRemove.
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1431
        self changed.
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1432
        Smalltalk changed:#currentChangeSet with:self.
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1433
    ].
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1434
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1435
    "Created: / 12-10-2006 / 16:51:11 / cg"
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1436
!
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1437
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1438
condenseChangesForClass:aClass 
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1439
    "remove all changes for aClass
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1440
     (i.e. leave changes for other classes)."
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1441
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1442
    self condenseChangesForClass:aClass package:nil
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1443
!
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1444
878
99583ccfe415 *** empty log message ***
ps
parents: 877
diff changeset
  1445
condenseChangesForClass:aClass package:aPackageSymbol
99583ccfe415 *** empty log message ***
ps
parents: 877
diff changeset
  1446
    "remove all changes for aClass and aPackageSymbol
1087
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1447
     (i.e. leave methodChanges for other packages).
956
0c6c209df4e9 keep previousVersion of method in changeSet
Claus Gittinger <cg@exept.de>
parents: 946
diff changeset
  1448
     This is invoked when a class is checked into the repository."
878
99583ccfe415 *** empty log message ***
ps
parents: 877
diff changeset
  1449
1186
a47e1a5770c2 condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents: 1184
diff changeset
  1450
    self condenseChangesForClass:aClass selector:nil package:aPackageSymbol
a47e1a5770c2 condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents: 1184
diff changeset
  1451
a47e1a5770c2 condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents: 1184
diff changeset
  1452
    "Modified: / 5.11.2001 / 14:29:22 / cg"
a47e1a5770c2 condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents: 1184
diff changeset
  1453
!
a47e1a5770c2 condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents: 1184
diff changeset
  1454
1830
a44c9beee9a6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1827
diff changeset
  1455
condenseChangesForClass:aClass selector:aSelector
a44c9beee9a6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1827
diff changeset
  1456
    "remove all changes for aClass >> selector."
a44c9beee9a6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1827
diff changeset
  1457
a44c9beee9a6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1827
diff changeset
  1458
    self condenseChangesForClass:aClass selector:aSelector package:nil
a44c9beee9a6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1827
diff changeset
  1459
a44c9beee9a6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1827
diff changeset
  1460
    "Created: / 26-09-2006 / 17:22:59 / cg"
a44c9beee9a6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1827
diff changeset
  1461
!
a44c9beee9a6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1827
diff changeset
  1462
1186
a47e1a5770c2 condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents: 1184
diff changeset
  1463
condenseChangesForClass:aClass selector:selectorOrNil package:aPackageSymbol
a47e1a5770c2 condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents: 1184
diff changeset
  1464
    "remove all changes for aClass/selector and aPackageSymbol
a47e1a5770c2 condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents: 1184
diff changeset
  1465
     (i.e. leave methodChanges for other packages).
a47e1a5770c2 condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents: 1184
diff changeset
  1466
     If selectorOrNil is nil, all changes for that class are removed;
a47e1a5770c2 condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents: 1184
diff changeset
  1467
     otherwise, only changes for the given selector.
a47e1a5770c2 condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents: 1184
diff changeset
  1468
     This is invoked when a class is checked into the repository."
a47e1a5770c2 condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents: 1184
diff changeset
  1469
945
f9e349d38d49 care for metaclasses when condensing changeSet
Claus Gittinger <cg@exept.de>
parents: 944
diff changeset
  1470
    |changesToRemove className metaClassName chgCls|
878
99583ccfe415 *** empty log message ***
ps
parents: 877
diff changeset
  1471
945
f9e349d38d49 care for metaclasses when condensing changeSet
Claus Gittinger <cg@exept.de>
parents: 944
diff changeset
  1472
    className := aClass theNonMetaclass name.
f9e349d38d49 care for metaclasses when condensing changeSet
Claus Gittinger <cg@exept.de>
parents: 944
diff changeset
  1473
    metaClassName := aClass theMetaclass name.
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1474
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1475
    changesToRemove := self select:[:aChange | 
1087
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1476
        |chgClassName chgClass removeThis mClass mthd|
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1477
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1478
        removeThis := false.
945
f9e349d38d49 care for metaclasses when condensing changeSet
Claus Gittinger <cg@exept.de>
parents: 944
diff changeset
  1479
        chgClassName := aChange className.
1168
48ec2c3c4151 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
  1480
        (chgClassName = className or:[chgClassName = metaClassName]) ifTrue:[
1187
f63ecc7dbaff condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents: 1186
diff changeset
  1481
            removeThis := true
944
f4cb7e9b034b when condensing, also care for private classes
Claus Gittinger <cg@exept.de>
parents: 939
diff changeset
  1482
        ] ifFalse:[
f4cb7e9b034b when condensing, also care for private classes
Claus Gittinger <cg@exept.de>
parents: 939
diff changeset
  1483
            chgCls := aChange changeClass.
1718
c5b36c490912 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1686
diff changeset
  1484
            chgCls isNil ifTrue:[
c5b36c490912 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1686
diff changeset
  1485
                (chgClassName startsWith:(aClass name,':')) ifTrue:[
c5b36c490912 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1686
diff changeset
  1486
                    "a change for a private class of a no-longer present one..."
c5b36c490912 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1686
diff changeset
  1487
                        removeThis := true
c5b36c490912 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1686
diff changeset
  1488
                ].
c5b36c490912 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1686
diff changeset
  1489
            ].
c5b36c490912 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1686
diff changeset
  1490
944
f4cb7e9b034b when condensing, also care for private classes
Claus Gittinger <cg@exept.de>
parents: 939
diff changeset
  1491
            (chgCls notNil
f4cb7e9b034b when condensing, also care for private classes
Claus Gittinger <cg@exept.de>
parents: 939
diff changeset
  1492
            and:[chgCls isPrivate
1190
02e2436893b6 condense after checkin: also condense sub-sub-private classes
Claus Gittinger <cg@exept.de>
parents: 1188
diff changeset
  1493
            and:[chgCls topOwningClass == aClass]]) ifTrue:[
1087
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1494
                removeThis := true
944
f4cb7e9b034b when condensing, also care for private classes
Claus Gittinger <cg@exept.de>
parents: 939
diff changeset
  1495
            ]
1087
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1496
        ].
1186
a47e1a5770c2 condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents: 1184
diff changeset
  1497
        selectorOrNil notNil ifTrue:[
1187
f63ecc7dbaff condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents: 1186
diff changeset
  1498
            (aChange isMethodChange or:[aChange isMethodRemoveChange]) ifFalse:[
1186
a47e1a5770c2 condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents: 1184
diff changeset
  1499
                removeThis := false.
a47e1a5770c2 condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents: 1184
diff changeset
  1500
            ] ifTrue:[
a47e1a5770c2 condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents: 1184
diff changeset
  1501
                aChange selector = selectorOrNil ifFalse:[
a47e1a5770c2 condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents: 1184
diff changeset
  1502
                    removeThis := false.
a47e1a5770c2 condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents: 1184
diff changeset
  1503
                ].
a47e1a5770c2 condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents: 1184
diff changeset
  1504
            ]
a47e1a5770c2 condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents: 1184
diff changeset
  1505
        ].
1187
f63ecc7dbaff condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents: 1186
diff changeset
  1506
1087
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1507
        removeThis ifTrue:[
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1508
            aChange isMethodChange ifTrue:[
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1509
                mClass := aChange changeClass.
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1510
                mClass notNil ifTrue:[
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1511
                    mthd := mClass compiledMethodAt:(aChange selector).
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1512
                    mthd isNil ifTrue:[
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1513
                        "/ mthd does no longer exist
1168
48ec2c3c4151 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
  1514
"/ I no longer understand what this was meant for .. (sigh)
48ec2c3c4151 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
  1515
"/                        aPackageSymbol notNil ifTrue:[
48ec2c3c4151 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
  1516
"/                            removeThis := false
48ec2c3c4151 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
  1517
"/                        ]
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1518
                    ] ifFalse:[
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1519
                        (aPackageSymbol notNil and:[mthd package ~= aPackageSymbol]) ifTrue:[
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1520
                            removeThis := false
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1521
                        ]
1087
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1522
                    ]
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1523
                ]
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1524
            ].
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1525
        ].
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1526
        removeThis
1301
b747d11e7ff8 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1292
diff changeset
  1527
    ].
1087
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1528
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1529
    self condenseChanges:changesToRemove
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1530
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1531
    "Modified: / 12-10-2006 / 16:51:38 / cg"
1087
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1532
!
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1533
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1534
condenseChangesForExtensionsInPackage:aPackageSymbol
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1535
    "remove all changes for aClass and aPackageSymbol
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1536
     (i.e. leave methodChanges for other packages).
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1537
     This is invoked when a class is checked into the repository."
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1538
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1539
    |changesToRemove|
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1540
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1541
    changesToRemove := OrderedCollection new.
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1542
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1543
    changesToRemove := self select:[:aChange | 
1087
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1544
        |removeThis mClass mthd|
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1545
1187
f63ecc7dbaff condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents: 1186
diff changeset
  1546
        (aChange isMethodChange or:[aChange isMethodRemoveChange]) ifTrue:[
1087
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1547
            removeThis := false.
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1548
            mClass := aChange changeClass.
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1549
            mClass notNil ifTrue:[
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1550
                mthd := mClass compiledMethodAt:(aChange selector).
1187
f63ecc7dbaff condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents: 1186
diff changeset
  1551
                mthd isNil ifTrue:[
f63ecc7dbaff condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents: 1186
diff changeset
  1552
                    aChange isMethodRemoveChange ifTrue:[
f63ecc7dbaff condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents: 1186
diff changeset
  1553
                        removeThis := true
f63ecc7dbaff condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents: 1186
diff changeset
  1554
                    ].
f63ecc7dbaff condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents: 1186
diff changeset
  1555
                ] ifFalse:[
f63ecc7dbaff condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents: 1186
diff changeset
  1556
                    mthd package = aPackageSymbol ifTrue:[
f63ecc7dbaff condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents: 1186
diff changeset
  1557
                        removeThis := true
f63ecc7dbaff condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents: 1186
diff changeset
  1558
                    ]
1087
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1559
                ]
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1560
            ].
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1561
        ].
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1562
        removeThis
1087
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1563
    ].
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1564
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1565
    self condenseChanges:changesToRemove
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1566
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1567
    "Created: / 05-11-2001 / 14:21:17 / cg"
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1568
    "Modified: / 12-10-2006 / 16:51:32 / cg"
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1569
!
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1570
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1571
condenseChangesForPackage:aPackageSymbol
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1572
    "remove all changes for aPackageSymbol
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1573
     This is invoked when a project is checked into the repository."
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1574
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1575
    |changesToRemove|
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1576
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1577
    changesToRemove := self select:[:aChange | 
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1578
        |removeThis mClass mthd|
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1579
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1580
        removeThis := false.
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1581
        (aChange isMethodChange or:[aChange isMethodRemoveChange]) ifTrue:[
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1582
            mClass := aChange changeClass.
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1583
            mClass notNil ifTrue:[
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1584
                mthd := mClass compiledMethodAt:(aChange selector).
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1585
                mthd isNil ifTrue:[
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1586
                    aChange isMethodRemoveChange ifTrue:[
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1587
                        removeThis := (mClass package = aPackageSymbol)
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1588
                    ].
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1589
                ] ifFalse:[
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1590
                    removeThis := (mthd package = aPackageSymbol)
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1591
                ]
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1592
            ].
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1593
        ] ifFalse:[
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1594
            (aChange isClassChange) ifTrue:[
1883
40975a15e85f *** empty log message ***
sr
parents: 1876
diff changeset
  1595
                (aChange changeClass notNil) ifTrue:[
40975a15e85f *** empty log message ***
sr
parents: 1876
diff changeset
  1596
                    removeThis := (aChange changeClass package = aPackageSymbol)     
40975a15e85f *** empty log message ***
sr
parents: 1876
diff changeset
  1597
                ].
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1598
            ].
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1599
        ].
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1600
        removeThis
1521
ea6cb41e4523 send out a change notification, when I condensed
Claus Gittinger <cg@exept.de>
parents: 1479
diff changeset
  1601
    ].
ea6cb41e4523 send out a change notification, when I condensed
Claus Gittinger <cg@exept.de>
parents: 1479
diff changeset
  1602
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1603
    self condenseChanges:changesToRemove
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1604
1521
ea6cb41e4523 send out a change notification, when I condensed
Claus Gittinger <cg@exept.de>
parents: 1479
diff changeset
  1605
    "Created: / 05-11-2001 / 14:21:17 / cg"
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1606
    "Modified: / 12-10-2006 / 16:51:27 / cg"
878
99583ccfe415 *** empty log message ***
ps
parents: 877
diff changeset
  1607
!
99583ccfe415 *** empty log message ***
ps
parents: 877
diff changeset
  1608
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1609
diffSetsAgainst:anotherChangeSet
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1610
    "walk over the receiver and anotherChangeSet,
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1611
     add all changes to one of the tree lists:
946
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1612
        onlyInReceiver, onlyInArg or changed,
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1613
     each being a changeSet containing corresponding changes.
1867
dad9e13fba4c comments
Claus Gittinger <cg@exept.de>
parents: 1865
diff changeset
  1614
     WARNING: 
dad9e13fba4c comments
Claus Gittinger <cg@exept.de>
parents: 1865
diff changeset
  1615
        destructive; could modify both the receiver and the argument by possibly
2633
5a5460e5231a comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2626
diff changeset
  1616
        changing methodChanges into categoryChanges"
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1617
1200
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1618
    |otherChangeIndicesBySelector otherNonMethodChangeIndices changeIndicesBySelector nonMethodChangeIndices
3032
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  1619
     onlyInReceiver onlyInArg changedMethods same
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1620
     indexFromChangedMethodsToA indexFromChangedMethodsToB
864
4f35b96a799e checkin from browser
ps
parents: 860
diff changeset
  1621
     "info" ret|
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1622
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1623
    onlyInReceiver := ChangeSet new.
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1624
    onlyInArg      := ChangeSet new.
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1625
    changedMethods := ChangeSet new.
3032
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  1626
    same           := ChangeSet new.
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1627
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1628
    indexFromChangedMethodsToA := OrderedCollection new.
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1629
    indexFromChangedMethodsToB := OrderedCollection new.
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1630
1200
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1631
    otherChangeIndicesBySelector := Dictionary new.
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1632
    otherNonMethodChangeIndices := OrderedCollection new.
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1633
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1634
    "/ these caches reduces square runtime to almost linear...
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1635
    anotherChangeSet keysAndValuesDo:[:idxB :aChangeInB |
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1636
        |setOfOtherChangeIndicesForThisSelector|
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1637
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1638
        aChangeInB isMethodChange ifTrue:[
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1639
            setOfOtherChangeIndicesForThisSelector := otherChangeIndicesBySelector at:(aChangeInB selector) ifAbsentPut:[OrderedCollection new].
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1640
            setOfOtherChangeIndicesForThisSelector add:idxB.
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1641
        ] ifFalse:[
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1642
            otherNonMethodChangeIndices add:idxB
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1643
        ].
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1644
    ].
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1645
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1646
    self keysAndValuesDo:[:idxA :aChangeInA |
1200
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1647
        |indicesOfChangesToExplore anyFound ch|
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1648
946
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1649
        anyFound := false.
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1650
1200
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1651
        aChangeInA isMethodChange ifTrue:[
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1652
            indicesOfChangesToExplore := otherChangeIndicesBySelector at:(aChangeInA selector) ifAbsent:#()
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1653
        ] ifFalse:[
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1654
            indicesOfChangesToExplore := otherNonMethodChangeIndices.
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1655
        ].
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1656
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1657
        indicesOfChangesToExplore do:[:idxB |
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1658
            |aChangeInB|
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1659
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1660
            aChangeInB := anotherChangeSet at:idxB.
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1661
946
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1662
            (aChangeInA isForSameAs:aChangeInB) ifTrue:[
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1663
                anyFound := true.
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1664
946
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1665
                "/ also in B - is it different ?
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1666
                (aChangeInA sameAs:aChangeInB) ifFalse:[
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1667
                    changedMethods add:aChangeInA.
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1668
                    indexFromChangedMethodsToA add:idxA.
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1669
                    indexFromChangedMethodsToB add:idxB.
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1670
                ] ifTrue:[
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1671
                    aChangeInA isMethodChange ifTrue:[
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1672
                        aChangeInA methodCategory ~= aChangeInB methodCategory ifTrue:[
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1673
                            "/ only the category is different;
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1674
                            "/ make it a MethodCategory changes.
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1675
946
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1676
                            ch := MethodCategoryChange new
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1677
                                    className:aChangeInA className
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1678
                                    selector:aChangeInA selector
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  1679
                                    category:aChangeInA methodCategory;
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  1680
                                    "JV@2012-03-20: Also keeps origin, required by merge tool"
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  1681
                                    origin: aChangeInA.
946
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1682
                            self at:idxA put:ch.
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1683
946
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1684
                            ch := MethodCategoryChange new
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1685
                                    className:aChangeInB className
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1686
                                    selector:aChangeInB selector
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  1687
                                    category:aChangeInB methodCategory;
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  1688
                                    "JV@2012-03-20: Also keeps origin, required by merge tool"
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  1689
                                    origin: aChangeInB.
946
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1690
                            anotherChangeSet at:idxB put:ch.
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1691
946
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1692
                            changedMethods add:aChangeInA.
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1693
                            indexFromChangedMethodsToA add:idxA.
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1694
                            indexFromChangedMethodsToB add:idxB.
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1695
                        ]
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1696
                    ].
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1697
                ]
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1698
            ] ifFalse:[
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1699
                (aChangeInA sameAs:aChangeInB) ifTrue:[
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1700
                    anyFound := true.
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1701
                ] ifFalse:[
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1702
                ]
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1703
            ]
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1704
        ].
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1705
946
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1706
        anyFound ifFalse:[
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1707
            onlyInReceiver add:aChangeInA.
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1708
        ]
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1709
    ].
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1710
1200
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1711
    "/ these caches reduces square runtime to almost linear...
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1712
    changeIndicesBySelector := Dictionary new.
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1713
    nonMethodChangeIndices := OrderedCollection new.
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1714
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1715
    self keysAndValuesDo:[:idxA :aChangeInA |
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1716
        |setOfChangeIndicesForThisSelector|
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1717
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1718
        aChangeInA isMethodChange ifTrue:[
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1719
            setOfChangeIndicesForThisSelector := changeIndicesBySelector at:(aChangeInA selector) ifAbsentPut:[OrderedCollection new].
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1720
            setOfChangeIndicesForThisSelector add:idxA.
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1721
        ] ifFalse:[
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1722
            nonMethodChangeIndices add:idxA
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1723
        ].
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1724
    ].
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1725
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1726
    anotherChangeSet keysAndValuesDo:[:idxB :aChangeInB |
1200
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1727
        |anyFound indicesOfChangesToExplore|
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1728
946
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1729
        anyFound := false.
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1730
1200
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1731
        aChangeInB isMethodChange ifTrue:[
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1732
            indicesOfChangesToExplore := changeIndicesBySelector at:(aChangeInB selector) ifAbsent:#()
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1733
        ] ifFalse:[
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1734
            indicesOfChangesToExplore := nonMethodChangeIndices.
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1735
        ].
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1736
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1737
        indicesOfChangesToExplore do:[:idxA |
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1738
            |aChangeInA idxM|
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1739
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1740
            aChangeInA := self at:idxA.
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1741
946
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1742
            (aChangeInA isForSameAs:aChangeInB) ifTrue:[
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1743
                anyFound := true.
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1744
946
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1745
                "/ also in B - is it different ?
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1746
                (aChangeInA sameAs:aChangeInB) ifFalse:[
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1747
                    "/ already there ?
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1748
                    idxM := changedMethods findFirst:[:c | c isForSameAs:aChangeInB].
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1749
                    idxM == 0 ifTrue:[
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1750
                        changedMethods add:aChangeInB.
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1751
                        indexFromChangedMethodsToB add:idxB.
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1752
                    ] ifFalse:[
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1753
                        indexFromChangedMethodsToB at:idxM put:idxB
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1754
                    ]
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1755
                ]
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1756
            ] ifFalse:[
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1757
                (aChangeInA sameAs:aChangeInB) ifTrue:[
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1758
                    anyFound := true.
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1759
                ] ifFalse:[
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1760
                ]
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1761
            ]
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1762
        ].
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1763
        anyFound ifFalse:[
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1764
            onlyInArg add:aChangeInB.
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1765
        ]
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1766
    ].
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1767
864
4f35b96a799e checkin from browser
ps
parents: 860
diff changeset
  1768
"/    info := OrderedCollection new:(changedMethods size).
4f35b96a799e checkin from browser
ps
parents: 860
diff changeset
  1769
"/    changedMethods keysAndValuesDo:[:idx :changedMethod |
4f35b96a799e checkin from browser
ps
parents: 860
diff changeset
  1770
"/        info add:(Array 
4f35b96a799e checkin from browser
ps
parents: 860
diff changeset
  1771
"/                        with:(indexFromChangedMethodsToA at:idx)
4f35b96a799e checkin from browser
ps
parents: 860
diff changeset
  1772
"/                        with:(indexFromChangedMethodsToB at:idx)
4f35b96a799e checkin from browser
ps
parents: 860
diff changeset
  1773
"/                 )
4f35b96a799e checkin from browser
ps
parents: 860
diff changeset
  1774
"/    ].
1450
0ec14b2064fb *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1447
diff changeset
  1775
    changedMethods := (1 to:changedMethods size) asOrderedCollection collect:[:idx |
946
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1776
                        |cA cB|
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1777
946
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1778
                        cA := self at:(indexFromChangedMethodsToA at:idx).
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1779
                        cB := anotherChangeSet at:(indexFromChangedMethodsToB at:idx).
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1780
                        Array with:cA with:cB
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1781
                      ].
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1782
3033
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  1783
    same := self reject:[:chg|(changedMethods contains:[:pair|pair first == chg]) or:[onlyInReceiver includes: chg]].
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  1784
1156
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  1785
    ret := DiffSet new
1450
0ec14b2064fb *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1447
diff changeset
  1786
                changed:changedMethods
1156
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  1787
                onlyInReceiver:onlyInReceiver
3032
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  1788
                onlyInArg:onlyInArg
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  1789
                same: same.
1156
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  1790
"/    ret info:info.
864
4f35b96a799e checkin from browser
ps
parents: 860
diff changeset
  1791
    ^ret
1867
dad9e13fba4c comments
Claus Gittinger <cg@exept.de>
parents: 1865
diff changeset
  1792
dad9e13fba4c comments
Claus Gittinger <cg@exept.de>
parents: 1865
diff changeset
  1793
    "Modified: / 12-10-2006 / 22:22:39 / cg"
2633
5a5460e5231a comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2626
diff changeset
  1794
    "Modified (comment): / 01-12-2011 / 19:12:55 / cg"
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  1795
    "Modified: / 20-03-2012 / 22:05:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2323
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1796
!
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1797
2412
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1798
diffSetsAgainstImage
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1799
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1800
    |imageChangeSet|
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1801
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1802
    imageChangeSet := self class new.
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1803
    self changedClasses do:
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1804
	[:class|
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1805
	(class isMetaclass or:[class isPrivate]) ifFalse:
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1806
	    [imageChangeSet addAll:
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1807
		(self class fromStream: class source asString readStream)]].
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1808
    ^self diffSetsAgainst: imageChangeSet
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1809
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1810
    "Created: / 04-12-2007 / 16:03:28 / janfrog"
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1811
!
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1812
2376
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1813
flatten
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1814
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1815
    | flatten |
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1816
    flatten := self class new: self size.
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1817
    self do:[:ea|ea do:[:ea2|flatten add: ea2]].
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1818
    ^flatten
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1819
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1820
    "Created: / 29-10-2010 / 14:40:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1821
!
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1822
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1823
groupBy: groupBlock labelAs: labelBlock
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1824
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1825
    "
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1826
        returns a new changeset consisting of CompositeChanges.
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1827
        Changes are grouped together by value (tag) of groupBlock.
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1828
        Each composite change is then labeled using label
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1829
        returned by labelBlock (called with the tag returned
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1830
        by groupBlock as arg)
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1831
    "
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1832
2491
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1833
    ^ self groupBy: groupBlock labelAs: labelBlock sort: false
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1834
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1835
    "Created: / 24-07-2009 / 23:17:38 / Jan Vrany <vranyj1@fel.cvut.cz>"
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1836
    "Modified: / 25-07-2009 / 19:40:16 / Jan Vrany <vranyj1@fel.cvut.cz>"
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1837
    "Modified: / 29-10-2010 / 12:45:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1838
    "Modified: / 30-08-2011 / 16:07:30 / cg"
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1839
!
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1840
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1841
groupBy: groupBlock labelAs: labelBlock sort: doSort
2626
0ac000060c44 changed: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2617
diff changeset
  1842
    "returns a new changeset consisting of CompositeChanges.
0ac000060c44 changed: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2617
diff changeset
  1843
     Changes are grouped together by value (tag) of groupBlock.
0ac000060c44 changed: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2617
diff changeset
  1844
     Each composite change is then labeled using label
0ac000060c44 changed: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2617
diff changeset
  1845
     returned by labelBlock (called with the tag returned
0ac000060c44 changed: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2617
diff changeset
  1846
     by groupBlock as arg)"
2491
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1847
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1848
    | buckets newChangeset keys |
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1849
2376
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1850
    buckets := OrderedDictionary new.
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1851
    self do:
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1852
        [:change| | tag |
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1853
        tag := groupBlock value: change.
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1854
        (buckets at: tag ifAbsentPut: [ChangeSet new:4])
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1855
            add: change].
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1856
    newChangeset := ChangeSet new: buckets size.
2491
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1857
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1858
    keys := buckets keys select:[:k | k notNil].
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1859
    doSort ifTrue:[
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1860
        keys sort.
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1861
    ].
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1862
    keys do:[:tag |
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1863
        |changes classDefs|
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1864
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1865
        changes := buckets at:tag.
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1866
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1867
"/    buckets keysAndValuesDo:
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1868
"/            [:tag :changes| | classDefs |
2376
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1869
            "Move class definition to the front"
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1870
            classDefs := changes select:[:chg|chg isClassDefinitionChange].
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1871
            changes removeAll: classDefs.
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1872
            changes addAllFirst: classDefs.
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1873
2626
0ac000060c44 changed: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2617
diff changeset
  1874
            tag notNil ifTrue:[
0ac000060c44 changed: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2617
diff changeset
  1875
                newChangeset add:
2376
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1876
                    (CompositeChange 
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1877
                        name: (labelBlock value: tag)
2626
0ac000060c44 changed: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2617
diff changeset
  1878
                        changes: changes)]
0ac000060c44 changed: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2617
diff changeset
  1879
            ].
0ac000060c44 changed: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2617
diff changeset
  1880
    (buckets includesKey: nil) ifTrue:[
0ac000060c44 changed: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2617
diff changeset
  1881
        newChangeset addAll: (buckets at: nil)
0ac000060c44 changed: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2617
diff changeset
  1882
    ].
2376
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1883
    ^newChangeset
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1884
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1885
    "Created: / 24-07-2009 / 23:17:38 / Jan Vrany <vranyj1@fel.cvut.cz>"
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1886
    "Modified: / 25-07-2009 / 19:40:16 / Jan Vrany <vranyj1@fel.cvut.cz>"
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1887
    "Modified: / 29-10-2010 / 12:45:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2491
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1888
    "Created: / 30-08-2011 / 16:07:01 / cg"
2376
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1889
!
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1890
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1891
groupByClass
2491
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1892
    |nm|
2376
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1893
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1894
    ^self
2491
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1895
        groupBy: [:change|
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1896
            change isClassChange ifTrue: [
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1897
                nm := change className.
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1898
                (nm endsWith:' class') ifTrue:[nm := nm copyTo: nm size - 6].
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1899
                nm
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1900
            ] ifFalse: [
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1901
                nil
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1902
            ]
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1903
        ]
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1904
        labelAs: [:className|
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1905
            className
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1906
        ]
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1907
        sort: true
2376
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1908
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1909
    "Created: / 25-07-2009 / 19:43:14 / Jan Vrany <vranyj1@fel.cvut.cz>"
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1910
    "Modified: / 24-10-2009 / 18:49:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2491
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1911
    "Modified: / 30-08-2011 / 16:08:38 / cg"
2376
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1912
!
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1913
2323
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1914
saveSignedToFile:aFilename
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1915
    "write the changeSet to a signed file in chunk format"
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1916
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1917
    self saveSignedToFile:aFilename format:nil
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1918
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1919
    "Created: / 08-02-2011 / 11:18:54 / cg"
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1920
!
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1921
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1922
saveSignedToFile:aFilename format:formatSymbolOrNil
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1923
    "write the changeSet to a signed file in some format.
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1924
     Sign with the exept key (which you do not have outside of exept!!).
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1925
     Nil fomat is chunk"
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1926
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1927
    |s pkcs7SignedData|
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1928
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1929
    s := WriteStream on:(String new:2000).
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1930
    self saveToStream:s format:formatSymbolOrNil.
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1931
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1932
    pkcs7SignedData := Expecco::KeyFileGenerator new signExpeccoCode:s contents.
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1933
    aFilename asFilename contents:pkcs7SignedData.
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1934
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1935
    "Modified: / 08-02-2011 / 11:48:01 / cg"
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1936
!
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1937
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1938
saveToFile:aFilename
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1939
    "write the changeSet to a regular file in chunk format"
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1940
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1941
    self saveToFile:aFilename format:nil
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1942
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1943
    "Created: / 08-02-2011 / 11:18:46 / cg"
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1944
!
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1945
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1946
saveToFile:aFilename format:formatSymbolOrNil
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1947
    "write the changeSet to a regular file in some format.
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1948
     Nil fomat is chunk"
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1949
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1950
    |s|
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1951
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1952
    s := aFilename asFilename writeStream.
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1953
    self saveToStream:s format:formatSymbolOrNil.
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1954
    s close.
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1955
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1956
    "Created: / 08-02-2011 / 11:20:06 / cg"
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1957
!
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1958
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1959
saveToStream:aStream format:formatSymbolOrNil
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1960
    "write the changeSet to a stream in some format.
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1961
     Nil fomat is chunk"
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1962
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1963
    formatSymbolOrNil isNil ifTrue:[
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1964
        self do:[:eachChange |
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1965
            eachChange isMethodCodeChange ifTrue:[
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1966
                aStream nextPutAll:'!!',(eachChange className),' methodsFor: '.
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1967
                aStream nextPutAll:(eachChange methodCategory storeString).
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1968
                aStream nextPutLine:'!!'.
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1969
                aStream cr.
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1970
                aStream nextPutAll:(eachChange source).
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1971
                aStream nextPutLine:'!! !!'.
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1972
           ] ifFalse:[
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1973
                aStream nextPutAll:(eachChange source).
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1974
                aStream nextPutLine:'!!'.
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1975
            ].
2469
4a02caf1782d changed: #saveToStream:format:
Claus Gittinger <cg@exept.de>
parents: 2412
diff changeset
  1976
            aStream cr.
2323
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1977
        ].
3031
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  1978
        ^self.
2323
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1979
    ].
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1980
3031
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  1981
    formatSymbolOrNil == #classSource ifTrue:[
3033
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  1982
        ClassSourceWriter new 
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  1983
            fileOut:self 
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  1984
            on:aStream 
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  1985
            withTimeStamp:false 
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  1986
            withInitialize:true 
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  1987
            withDefinition:true
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  1988
            methodFilter:nil encoder:nil.
3031
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  1989
        ^self.
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  1990
    ].
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  1991
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  1992
    self error:'Unknown format, possible formats are { nil, #classSource }'
2323
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1993
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1994
    "Created: / 08-02-2011 / 11:25:16 / cg"
3033
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  1995
    "Modified: / 20-03-2012 / 14:06:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1996
! !
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1997
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  1998
!ChangeSet::ChangeFileReader methodsFor:'accessing'!
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  1999
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2000
changeAction:aBlock
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2001
    changeAction := aBlock.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2002
!
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2003
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2004
changeSet:something
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2005
    "set the value of the instance variable 'changeSet' (automatically generated)"
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2006
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2007
    changeSet := something.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2008
!
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2009
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2010
inputStream:aStream
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2011
    inputStream := aStream.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2012
! !
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2013
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2014
!ChangeSet::ChangeFileReader methodsFor:'helpers'!
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2015
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2016
addChange:change
3043
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2017
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2018
    timestamp notNil ifTrue:[change timeStamp: timestamp].
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2019
    timestamp := nil.
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2020
2008
204b171a553d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1977
diff changeset
  2021
    changeAction 
204b171a553d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1977
diff changeset
  2022
        valueWithOptionalArgument:change 
204b171a553d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1977
diff changeset
  2023
        and:lineNumber 
204b171a553d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1977
diff changeset
  2024
        and:position.
204b171a553d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1977
diff changeset
  2025
3043
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2026
    "Modified: / 02-04-2012 / 19:09:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2027
!
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2028
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2029
checkReceiverIsGlobalNamed:expectedName
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2030
    ^ self variableNameOfReceiver = expectedName
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2031
!
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2032
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2033
classNameOf:aReceiver
2376
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  2034
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  2035
    | nameSpace clsName |
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  2036
    nameSpace := Class nameSpaceQuerySignal query.
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  2037
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  2038
    (aReceiver isUnaryMessage and:[aReceiver selector == #class]) 
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  2039
            ifTrue:[clsName := (aReceiver receiver name) , ' class'] 
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  2040
            ifFalse:[clsName := aReceiver name].
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  2041
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  2042
    ^(nameSpace ~~ Smalltalk and:[(clsName startsWith: nameSpace name) not])
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  2043
        ifTrue:[nameSpace name , '::' , clsName]
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  2044
        ifFalse:[clsName].
2745
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2045
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2046
    "Modified: / 24-01-2012 / 17:07:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2047
!
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2048
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2049
receiversClassName
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2050
    ^ self classNameOf:receiver
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2051
!
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2052
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2053
variableNameOfReceiver
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2054
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2055
    receiver isVariable ifFalse:[ ^ nil ].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2056
    ^ receiver name
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2057
! !
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2058
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2059
!ChangeSet::ChangeFileReader methodsFor:'reading'!
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2060
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2061
changesFromParseTree:aTree lineNumber:initialLineNumberOrNil position:initialPositionOrNil
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2062
    "given a parse-tree (from parsing some changes source/chunk),
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2063
     create changes and evaluate changeAction on each.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2064
     The chnageAction-block is invoked with the change and a lineNumberOrNil as
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2065
     arg; the lineNumber is only valid, if the underlying inputStream 
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2066
     provides line-numbers; otherwise, nil is passed."
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2067
2745
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2068
    ^self changesFromParseTree:aTree lineNumber:initialLineNumberOrNil position:initialPositionOrNil chunk: nil
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2069
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2070
    "Modified: / 24-01-2012 / 17:29:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2071
!
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2072
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2073
changesFromParseTree:aTree lineNumber:initialLineNumberOrNil position:initialPositionOrNil chunk: initialChunkOrNil
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2074
    "given a parse-tree (from parsing some changes source/chunk),
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2075
     create changes and evaluate changeAction on each.
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2076
     The chnageAction-block is invoked with the change and a lineNumberOrNil as
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2077
     arg; the lineNumber is only valid, if the underlying inputStream 
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2078
     provides line-numbers; otherwise, nil is passed."
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2079
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2080
    lineNumber := initialLineNumberOrNil.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2081
    position := initialPositionOrNil.
2745
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2082
    chunk := initialChunkOrNil.
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2083
    parseTree := aTree.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2084
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2085
    selector := aTree selector.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2086
    receiver := aTree receiver.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2087
    arguments := aTree arguments.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2088
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2089
    receiver isMessage ifTrue:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2090
        receiverSelector := receiver selector.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2091
        receiverReceiver := receiver receiver.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2092
    ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2093
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2094
    ^ self processChange
2745
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2095
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2096
    "Created: / 24-01-2012 / 17:28:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2097
! !
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2098
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2099
!ChangeSet::ChangeFileReader methodsFor:'reading-private'!
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2100
2117
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2101
handleCategoriesForChange
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2102
    |selector category categories attributes change|
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2103
2256
b98137d2aa30 changed: #changesFromStream:for:reader:do:
Claus Gittinger <cg@exept.de>
parents: 2247
diff changeset
  2104
    selector := arguments first value.
2117
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2105
    className := self receiversClassName.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2106
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2107
    categories := OrderedCollection new.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2108
    attributes := OrderedCollection new.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2109
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2110
    [
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2111
        inputStream skipSeparators.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2112
        category := inputStream nextChunk.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2113
        category notEmptyOrNil
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2114
    ] whileTrue:[
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2115
        ( #( 'public' 'private' ) includes: category) ifTrue:[
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2116
            attributes add:category
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2117
        ] ifFalse:[
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2118
            categories add:category
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2119
        ].
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2120
    ].
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2121
    categories size == 1 ifTrue:[
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2122
        "/ easy
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2123
        change := MethodCategoryChange 
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2124
                        className:className
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2125
                        selector:selector
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2126
                        source:(parseTree printString)
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2127
                        category:(categories first).
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2128
        self addChange:change.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2129
    ] ifFalse:[
2298
Claus Gittinger <cg@exept.de>
parents: 2290
diff changeset
  2130
        self halt:'multiple/missing categories not supported'.
2117
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2131
    ].
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2132
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2133
    attributes size == 1 ifTrue:[
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2134
        "/ easy
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2135
        (attributes first = 'public') ifTrue:[
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2136
            "/ default anyway - ignore
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2137
        ] ifFalse:[
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2138
            change := MethodPrivacyChange 
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2139
                        className:className
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2140
                        selector:selector
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2141
                        privacy:(attributes first asSymbol).
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2142
            change source:(parseTree printString).
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2143
            self addChange:change.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2144
        ].
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2145
    ] ifFalse:[
2298
Claus Gittinger <cg@exept.de>
parents: 2290
diff changeset
  2146
        self halt:'multiple/missing attributes not supported'.
2117
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2147
    ].
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2148
    ^ true
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2149
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2150
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2151
handleClassCommentChange
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2152
    |change|
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2153
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2154
    className := self receiversClassName.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2155
"/        nameSpace ~~ Smalltalk ifTrue:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2156
"/            className := nameSpace name , '::' , className
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2157
"/        ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2158
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2159
    change := ClassCommentChange new.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2160
    change className:className comment:(arguments at:1) evaluate.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2161
    change source:(parseTree printString).
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2162
    self addChange:change.
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2163
    ^ true
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2164
!
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2165
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2166
handleClassDefinitionChange
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2167
    |nameSpace change|
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2168
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2169
    className := (arguments at:1) evaluate.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2170
"/        nameSpace ~~ Smalltalk ifTrue:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2171
"/            className := nameSpace name , '::' , className
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2172
"/        ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2173
    nameSpace := Class nameSpaceQuerySignal query.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2174
    nameSpace ~~ Smalltalk ifTrue:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2175
        className := nameSpace name , '::' , className
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2176
    ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2177
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2178
    change := ClassDefinitionChange new.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2179
    change className:className; source:(parseTree printString).
1453
27882f000bc9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1450
diff changeset
  2180
    receiver isVariable ifTrue:[
27882f000bc9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1450
diff changeset
  2181
        change superClassName:receiver name.
27882f000bc9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1450
diff changeset
  2182
    ].
1428
807f0bc05504 more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
  2183
    selector keywords with:arguments do:[:kw :arg |
807f0bc05504 more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
  2184
        kw = #'instanceVariableNames:' ifTrue:[
807f0bc05504 more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
  2185
            change instanceVariableNames:arg evaluate.
807f0bc05504 more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
  2186
        ].
807f0bc05504 more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
  2187
        kw = #'classVariableNames:' ifTrue:[
807f0bc05504 more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
  2188
            change classVariableNames:arg evaluate.
807f0bc05504 more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
  2189
        ].
807f0bc05504 more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
  2190
        kw = #'poolDictionaries:' ifTrue:[
807f0bc05504 more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
  2191
            change poolDictionaries:arg evaluate.
807f0bc05504 more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
  2192
        ].
807f0bc05504 more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
  2193
        kw = #'category:' ifTrue:[
807f0bc05504 more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
  2194
            change category:arg evaluate.
807f0bc05504 more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
  2195
        ].
2125
3c071cecc2b0 changed: #handleClassDefinitionChange
fm
parents: 2122
diff changeset
  2196
        kw = #'privateIn:' ifTrue:[
2290
882d87800dea private class handling
Claus Gittinger <cg@exept.de>
parents: 2279
diff changeset
  2197
            change className:(arg name ,'::',change classNameWithoutNamespace).
882d87800dea private class handling
Claus Gittinger <cg@exept.de>
parents: 2279
diff changeset
  2198
            change owningClassName:(arg name).
882d87800dea private class handling
Claus Gittinger <cg@exept.de>
parents: 2279
diff changeset
  2199
            change private:true.
2125
3c071cecc2b0 changed: #handleClassDefinitionChange
fm
parents: 2122
diff changeset
  2200
        ].
1428
807f0bc05504 more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
  2201
    ].
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2202
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2203
    change package:(Class packageQuerySignal query).
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2204
"/        nameSpace ~~ Smalltalk ifTrue:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2205
"/            change nameSpaceName:(nameSpace name).
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2206
"/        ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2207
"/
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2208
    self addChange:change.
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2209
    ^ true
2290
882d87800dea private class handling
Claus Gittinger <cg@exept.de>
parents: 2279
diff changeset
  2210
882d87800dea private class handling
Claus Gittinger <cg@exept.de>
parents: 2279
diff changeset
  2211
    "Modified: / 30-08-2010 / 13:56:32 / cg"
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2212
!
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2213
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2214
handleClassInstanceVariableDefinitionChange
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2215
    |change|
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2216
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2217
    className := self receiversClassName.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2218
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2219
"/        nameSpace ~~ Smalltalk ifTrue:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2220
"/            className := nameSpace name , '::' , className
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2221
"/        ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2222
    change := ClassInstVarDefinitionChange new.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2223
    change className:className.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2224
    change source:(parseTree printString).
2617
a9e632776c57 visitor support (for monticello);
Claus Gittinger <cg@exept.de>
parents: 2524
diff changeset
  2225
    change classInstVarNames:(parseTree arguments first value asCollectionOfWords asArray).
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2226
    self addChange:change.
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2227
    ^ true
2617
a9e632776c57 visitor support (for monticello);
Claus Gittinger <cg@exept.de>
parents: 2524
diff changeset
  2228
a9e632776c57 visitor support (for monticello);
Claus Gittinger <cg@exept.de>
parents: 2524
diff changeset
  2229
    "Modified: / 25-11-2011 / 17:40:49 / cg"
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2230
!
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2231
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2232
handleMethodCategoryChange
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2233
    |change|
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2234
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2235
    (receiver isMessage
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2236
    and:[receiverSelector == #'compiledMethodAt:']) ifFalse:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2237
        self error:'unexpected change' mayProceed:true.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2238
        ^ false.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2239
    ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2240
    className := self classNameOf:receiverReceiver.
2046
6d7bc535ea69 Change #halt: to #shouldImplement or #assert:
Stefan Vogel <sv@exept.de>
parents: 2008
diff changeset
  2241
    self assert:className notNil.
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2242
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2243
"/            nameSpace ~~ Smalltalk ifTrue:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2244
"/                className := nameSpace name , '::' , className
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2245
"/            ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2246
    methodSelector := (receiver arguments at:1) evaluate.
2046
6d7bc535ea69 Change #halt: to #shouldImplement or #assert:
Stefan Vogel <sv@exept.de>
parents: 2008
diff changeset
  2247
    self assert:methodSelector notNil.
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2248
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2249
    change := MethodCategoryChange new.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2250
    change 
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2251
        className:className
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2252
        selector:methodSelector
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2253
        category:(arguments at:1) evaluate.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2254
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2255
    self addChange:change.
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2256
    ^ true
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2257
!
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2258
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2259
handleMethodCategoryRenameChange
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2260
    |change|
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2261
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2262
    className := self receiversClassName.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2263
"/        nameSpace ~~ Smalltalk ifTrue:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2264
"/            className := nameSpace name , '::' , className
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2265
"/        ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2266
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2267
    change := MethodCategoryRenameChange new.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2268
    change 
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2269
        className:className;
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2270
        oldCategoryName:(arguments at:1) evaluate
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2271
        newCategoryName:(arguments at:2) evaluate.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2272
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2273
    self addChange:change.
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2274
    ^ true
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2275
!
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2276
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2277
handleMethodChange
2745
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2278
    [
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2279
        ^ self handleMethodChangeUnsafe
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2280
    ] on: Error do:[:ex|
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2281
        | change |
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2282
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2283
        change := InvalidChange new source: chunk.
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2284
        self addChange: change.
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2285
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2286
        "Read methods that may follow"    
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2287
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2288
        [ (chunk := inputStream nextChunk) notEmptyOrNil ] whileTrue:[
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2289
            change := InvalidChange new source: chunk.
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2290
            self addChange: change.
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2291
        ]
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2292
    ].
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2293
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2294
    ^ true
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2295
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2296
    "Modified (comment): / 24-01-2012 / 17:32:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2297
!
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2298
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2299
handleMethodChangeUnsafe
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2300
    |priv categoryName methodSource changes change parser |
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2301
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2302
    (selector == #'ignoredMethodsFor:') ifTrue:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2303
        priv := #ignored.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2304
    ] ifFalse:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2305
        priv := nil
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2306
    ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2307
    className := self receiversClassName.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2308
"/        nameSpace ~~ Smalltalk ifTrue:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2309
"/            className := nameSpace name , '::' , className
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2310
"/        ].
1977
3694111ead95 publicMethods & privateMethods detection
fm
parents: 1969
diff changeset
  2311
    ((selector == #'methods') 
3694111ead95 publicMethods & privateMethods detection
fm
parents: 1969
diff changeset
  2312
    or:[(selector == #'publicMethods')
3694111ead95 publicMethods & privateMethods detection
fm
parents: 1969
diff changeset
  2313
    or:[(selector == #'methodsFor')]]) ifTrue:[
3694111ead95 publicMethods & privateMethods detection
fm
parents: 1969
diff changeset
  2314
        categoryName := 'uncategorized public'
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2315
    ] ifFalse:[
1977
3694111ead95 publicMethods & privateMethods detection
fm
parents: 1969
diff changeset
  2316
        (selector == #'privateMethods') ifTrue:[
3694111ead95 publicMethods & privateMethods detection
fm
parents: 1969
diff changeset
  2317
            categoryName := 'uncategorized private'
3694111ead95 publicMethods & privateMethods detection
fm
parents: 1969
diff changeset
  2318
        ] ifFalse:[
3694111ead95 publicMethods & privateMethods detection
fm
parents: 1969
diff changeset
  2319
            categoryName := (arguments at:1) evaluate.
3694111ead95 publicMethods & privateMethods detection
fm
parents: 1969
diff changeset
  2320
        ]
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2321
    ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2322
    inputStream skipSeparators.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2323
    lineNumber := inputStream lineNumber.
1209
f98d5eb855d3 code rewritten to be independent of stream zero-base
Claus Gittinger <cg@exept.de>
parents: 1200
diff changeset
  2324
    position := inputStream position1Based.
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2325
2745
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2326
    methodSource := chunk := inputStream nextChunk.
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2327
    changes := OrderedCollection new.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2328
1395
6ea99b157f6b Use #setFilename:forClass:package: to define an abbreviation
Stefan Vogel <sv@exept.de>
parents: 1389
diff changeset
  2329
    [methodSource notEmptyOrNil] whileTrue:[
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2330
        parser := Parser
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2331
                    parseMethodArgAndVarSpecification:methodSource 
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2332
                    in:nil 
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2333
                    ignoreErrors:true 
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2334
                    ignoreWarnings:true
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2335
                    parseBody:false.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2336
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2337
        parser isNil ifTrue:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2338
            "/ something wierd ...
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2339
            methodSelector := '????'.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2340
        ] ifFalse:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2341
            methodSelector := parser selector.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2342
        ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2343
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2344
        change := MethodChange new.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2345
        change 
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2346
            className:className
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2347
            selector:methodSelector
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2348
            source:methodSource
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2349
            category:categoryName
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2350
            privacy:priv.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2351
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2352
        self addChange:change.
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2353
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2354
        inputStream skipSeparators.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2355
        lineNumber := inputStream lineNumber.
1209
f98d5eb855d3 code rewritten to be independent of stream zero-base
Claus Gittinger <cg@exept.de>
parents: 1200
diff changeset
  2356
        position := inputStream position1Based.
2745
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2357
        methodSource := chunk := inputStream nextChunk.
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2358
    ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2359
    ^ true
2745
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2360
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2361
    "Created: / 24-01-2012 / 16:52:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2362
!
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2363
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2364
handleMethodPrivacyChange
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2365
    |change|
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2366
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2367
    (receiver isMessage
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2368
    and:[receiverSelector == #'compiledMethodAt:']) ifFalse:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2369
        self error:'unexpected change' mayProceed:true.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2370
        ^ false.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2371
    ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2372
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2373
    className := self classNameOf:receiverReceiver.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2374
"/            nameSpace ~~ Smalltalk ifTrue:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2375
"/                className := nameSpace name , '::' , className
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2376
"/            ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2377
    methodSelector := (receiver arguments at:1) evaluate.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2378
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2379
    change := MethodPrivacyChange new.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2380
    change 
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2381
        className:className
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2382
        selector:methodSelector
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2383
        privacy:(arguments at:1) evaluate.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2384
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2385
    self addChange:change.
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2386
    ^ true
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2387
!
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2388
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2389
handleNameSpaceCreationChange
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2390
    |change|
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2391
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2392
    (self checkReceiverIsGlobalNamed:#Namespace) ifFalse:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2393
        (self checkReceiverIsGlobalNamed:#NameSpace) ifFalse:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2394
            self error:'unexpected receiver in nameSpace message' mayProceed:true.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2395
            ^ false
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2396
        ].
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2397
    ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2398
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2399
    className := (arguments at:1) evaluate.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2400
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2401
    change := NameSpaceCreationChange new.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2402
    change name:className.
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2403
    self addChange:change.
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2404
    ^ true
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2405
!
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2406
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2407
handlePrimitiveChange 
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2408
    |change primSource|
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2409
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2410
    className := self receiversClassName.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2411
"/        nameSpace ~~ Smalltalk ifTrue:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2412
"/            className := nameSpace name , '::' , className
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2413
"/        ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2414
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2415
    inputStream skipSeparators.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2416
    primSource := inputStream nextChunk.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2417
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2418
    selector == #'primitiveDefinitions' ifTrue:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2419
        change := ClassPrimitiveDefinitionsChange new
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2420
    ] ifFalse:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2421
        selector == #'primitiveFunctions' ifTrue:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2422
            change := ClassPrimitiveFunctionsChange new
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2423
        ] ifFalse:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2424
            change := ClassPrimitiveVariablesChange new
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2425
        ]
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2426
    ].
1287
faf72a0bc34a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1281
diff changeset
  2427
    change className:className source:primSource.
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2428
    self addChange:change.
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2429
    ^ true
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2430
!
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2431
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2432
handleRemoveClassChange
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2433
    |change|
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2434
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2435
    (self checkReceiverIsGlobalNamed:#Smalltalk) ifFalse:[
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2436
        self error:'unexpected receiver in remove-class message' mayProceed:true.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2437
        ^ false
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2438
    ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2439
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2440
    className := (arguments at:1) name.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2441
"/            nameSpace ~~ Smalltalk ifTrue:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2442
"/                className := nameSpace name , '::' , className
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2443
"/            ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2444
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2445
    change := ClassRemoveChange new.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2446
    change className:className.
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2447
    self addChange:change.
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2448
    ^ true
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2449
!
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2450
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2451
handleRemoveMethodChange
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2452
    |change|
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2453
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2454
    className := self receiversClassName.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2455
"/        nameSpace ~~ Smalltalk ifTrue:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2456
"/            className := nameSpace name , '::' , className
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2457
"/        ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2458
    methodSelector := (arguments at:1) evaluate.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2459
    change := MethodRemoveChange new.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2460
    change className:className selector:methodSelector.
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2461
    self addChange:change.
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2462
    ^ true
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2463
!
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2464
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2465
handleRenameClassChange
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2466
    |oldName newName change|
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2467
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2468
    (self checkReceiverIsGlobalNamed:#Smalltalk) ifFalse:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2469
        self error:'unexpected receiver in rename-class message' mayProceed:true.
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2470
        ^ false.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2471
    ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2472
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2473
    oldName := (arguments at:1) name.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2474
    newName := (arguments at:2) evaluate.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2475
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2476
    change := ClassRenameChange new oldName:oldName newName:newName.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2477
    self addChange:change.
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2478
    ^ true
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2479
!
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2480
1181
e13c86138164 more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents: 1176
diff changeset
  2481
handleSqueakCommentStamp
e13c86138164 more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents: 1176
diff changeset
  2482
    |comment change|
e13c86138164 more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents: 1176
diff changeset
  2483
e13c86138164 more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents: 1176
diff changeset
  2484
    inputStream skipSeparators.
e13c86138164 more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents: 1176
diff changeset
  2485
e13c86138164 more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents: 1176
diff changeset
  2486
    comment := inputStream nextChunk.
e13c86138164 more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents: 1176
diff changeset
  2487
e13c86138164 more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents: 1176
diff changeset
  2488
    className := self receiversClassName.
e13c86138164 more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents: 1176
diff changeset
  2489
    change := ClassCommentChange new.
e13c86138164 more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents: 1176
diff changeset
  2490
    change className:className comment:comment.
e13c86138164 more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents: 1176
diff changeset
  2491
    change source:(parseTree printString).
e13c86138164 more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents: 1176
diff changeset
  2492
    self addChange:change.
e13c86138164 more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents: 1176
diff changeset
  2493
    ^ true
e13c86138164 more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents: 1176
diff changeset
  2494
!
e13c86138164 more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents: 1176
diff changeset
  2495
1183
419dc41ad796 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1182
diff changeset
  2496
handleVW7ClassDefinitionChange
419dc41ad796 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1182
diff changeset
  2497
    |nameSpace change|
419dc41ad796 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1182
diff changeset
  2498
419dc41ad796 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1182
diff changeset
  2499
    nameSpace := receiver.
419dc41ad796 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1182
diff changeset
  2500
    className := (arguments at:1) evaluate.
419dc41ad796 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1182
diff changeset
  2501
419dc41ad796 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1182
diff changeset
  2502
"/    nameSpace := Class nameSpaceQuerySignal query.
419dc41ad796 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1182
diff changeset
  2503
"/    nameSpace ~~ Smalltalk ifTrue:[
419dc41ad796 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1182
diff changeset
  2504
"/        className := nameSpace name , '::' , className
419dc41ad796 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1182
diff changeset
  2505
"/    ].
419dc41ad796 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1182
diff changeset
  2506
419dc41ad796 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1182
diff changeset
  2507
    change := ClassDefinitionChange new.
419dc41ad796 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1182
diff changeset
  2508
    change className:className; source:(parseTree printString).
419dc41ad796 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1182
diff changeset
  2509
419dc41ad796 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1182
diff changeset
  2510
    change package:(Class packageQuerySignal query).
419dc41ad796 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1182
diff changeset
  2511
    self addChange:change.
419dc41ad796 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1182
diff changeset
  2512
    ^ true
419dc41ad796 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1182
diff changeset
  2513
!
419dc41ad796 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1182
diff changeset
  2514
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2515
processChange
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2516
    "given a parse-tree (from parsing some changes source/chunk),
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2517
     create changes and evaluate changeAction on each.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2518
     The block is invoked with the change and a lineNumberOrNil as
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2519
     arg; the lineNumber is only valid, if the underlying stream 
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2520
     provides line-numbers; otherwise, nil is passed."
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2521
2745
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2522
    [
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2523
        ^ self processChangeUnsafe
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2524
    ] on: Error do:[:ex|
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2525
        | change |
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2526
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2527
        change := InvalidChange new source: chunk.
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2528
        self addChange: change.
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2529
    ].
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2530
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2531
    ^true
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2532
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2533
    "Modified: / 24-01-2012 / 17:34:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2534
!
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2535
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2536
processChangeUnsafe
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2537
    "given a parse-tree (from parsing some changes source/chunk),
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2538
     create changes and evaluate changeAction on each.
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2539
     The block is invoked with the change and a lineNumberOrNil as
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2540
     arg; the lineNumber is only valid, if the underlying stream 
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2541
     provides line-numbers; otherwise, nil is passed."
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2542
2117
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2543
    |dispatchSelector|
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2544
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2545
    dispatchSelector := ('process_',(selector copyReplaceAll:$: with:$_)) asSymbol.
2122
3ffe8c94f2cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2117
diff changeset
  2546
"/ Transcript showCR:dispatchSelector.
2179
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  2547
    (self respondsTo:dispatchSelector) ifTrue:[
2117
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2548
        ^ self perform:dispatchSelector.
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2549
    ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2550
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2551
    "/ any subclass definiton selector ?
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2552
    (Behavior definitionSelectors includes:selector)
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2553
    ifTrue:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2554
        ^ self handleClassDefinitionChange.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2555
    ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2556
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2557
    ^ false
2745
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2558
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2559
    "Created: / 24-01-2012 / 17:33:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2117
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2560
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2561
3042
48e76977cdc3 Added info-record processing support into changeset reader
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3036
diff changeset
  2562
processInfo: string
48e76977cdc3 Added info-record processing support into changeset reader
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3036
diff changeset
  2563
    "Processes 'info record' - an info record consist of a chunk containing
48e76977cdc3 Added info-record processing support into changeset reader
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3036
diff changeset
  2564
     single string literal starting with ----, such as:
48e76977cdc3 Added info-record processing support into changeset reader
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3036
diff changeset
  2565
3043
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2566
    '---- timestamp jv@neso 12-03-2012 10:49:40 ----'
3042
48e76977cdc3 Added info-record processing support into changeset reader
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3036
diff changeset
  2567
    '---- snapshot st.img 30-03-2012 11:40:24 ----'
48e76977cdc3 Added info-record processing support into changeset reader
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3036
diff changeset
  2568
    '---- checkin SVN::ConfigurationApp into stx:libsvn (1.12) 12-03-2012 10:51:15 ----'
48e76977cdc3 Added info-record processing support into changeset reader
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3036
diff changeset
  2569
    '---- rake update 30-03-2012 11:40:24 ----'
48e76977cdc3 Added info-record processing support into changeset reader
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3036
diff changeset
  2570
48e76977cdc3 Added info-record processing support into changeset reader
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3036
diff changeset
  2571
    timestamp info records are (for historical reasons) processed in ChangeSet
48e76977cdc3 Added info-record processing support into changeset reader
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3036
diff changeset
  2572
    "
48e76977cdc3 Added info-record processing support into changeset reader
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3036
diff changeset
  2573
3043
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2574
    | kind  sel|
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2575
    inputStream skip: 5.
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2576
    kind := inputStream upTo: Character space.
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2577
    sel := ('process_', kind) asSymbolIfInterned.
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2578
    sel notNil ifTrue:[
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2579
        MessageNotUnderstood handle:[
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2580
            "/Unknown info record, do nothing"
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2581
        ] do:[
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2582
            self perform: sel.
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2583
        ]
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2584
    ]
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2585
3042
48e76977cdc3 Added info-record processing support into changeset reader
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3036
diff changeset
  2586
    "Created: / 30-03-2012 / 16:44:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
48e76977cdc3 Added info-record processing support into changeset reader
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3036
diff changeset
  2587
!
48e76977cdc3 Added info-record processing support into changeset reader
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3036
diff changeset
  2588
2117
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2589
process_categoriesFor_
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2590
    "'categoriesFor:' chunk (Dolphin)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2591
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2592
    ^ self handleCategoriesForChange.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2593
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2594
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2595
process_category_
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2596
    "'category:' chunk (ST/X)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2597
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2598
    ^ self handleMethodCategoryChange.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2599
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2600
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2601
process_commentStamp_prior_
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2602
    "'commentStamp:prior::' chunk (Squeak)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2603
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2604
    ^ self handleSqueakCommentStamp.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2605
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2606
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2607
process_comment_
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2608
    "'comment:' chunk (ST/X)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2609
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2610
    ^ self handleClassCommentChange.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2611
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2612
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2613
process_ignoredMethodsFor_
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2614
    "'ignoredMethodsFor:' chunk (ST/X)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2615
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2616
    ^ self handleMethodChange.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2617
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2618
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2619
process_instanceVariableNames_
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2620
    "'instanceVariableNames:' chunk (ST/X)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2621
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2622
    ^ self handleClassInstanceVariableDefinitionChange.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2623
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2624
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2625
process_methods
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2626
    "'methods' chunk (ST/V and dolphin)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2627
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2628
    ^ self handleMethodChange.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2629
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2630
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2631
process_methodsFor
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2632
    "'methodsFor' chunk (ST/V and dolphin)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2633
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2634
    ^ self handleMethodChange.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2635
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2636
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2637
process_methodsForUndefined_
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2638
    "'methodsForUndefined:' chunk (?)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2639
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2640
    ^ self handleMethodChange.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2641
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2642
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2643
process_methodsFor_
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2644
    "'methodsFor:' chunk (ST/80, Squeak, ST/X, VW, ...)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2645
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2646
    ^ self handleMethodChange.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2647
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2648
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2649
process_methodsFor_stamp_
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2650
    "'methodsFor:stamp:' chunk (Squeak)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2651
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2652
    ^ self handleMethodChange.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2653
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2654
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2655
process_name_
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2656
    "'name:' chunk (ST/X)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2657
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2658
    ^ self handleNameSpaceCreationChange.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2659
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2660
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2661
process_primitiveDefinitions
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2662
    "'primitiveDefinitions' chunk (ST/X)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2663
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2664
    ^ self handlePrimitiveChange.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2665
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2666
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2667
process_primitiveFunctions
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2668
    "'primitiveFunctions' chunk (ST/X)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2669
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2670
    ^ self handlePrimitiveChange.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2671
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2672
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2673
process_primitiveVariables
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2674
    "'primitiveVariables' chunk (ST/X)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2675
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2676
    ^ self handlePrimitiveChange.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2677
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2678
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2679
process_privacy_
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2680
    "'privacy:' chunk (ST/X)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2681
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2682
    ^ self handleMethodPrivacyChange.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2683
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2684
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2685
process_privateMethods
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2686
    "'privateMethods' chunk (ST/V and dolphin)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2687
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2688
    ^ self handleMethodChange.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2689
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2690
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2691
process_privateMethodsFor_
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2692
    "'privateMethodsFor:' chunk (ST/X)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2693
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2694
    ^ self handleMethodChange.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2695
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2696
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2697
process_protectedMethodsFor_
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2698
    "'protectedMethodsFor:' chunk (ST/X)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2699
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2700
    ^ self handleMethodChange.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2701
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2702
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2703
process_publicMethods
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2704
    "'publicMethods' chunk (ST/V and dolphin)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2705
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2706
    ^ self handleMethodChange.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2707
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2708
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2709
process_publicMethodsFor_
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2710
    "'publicMethodsFor:' chunk (ST/X)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2711
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2712
    ^ self handleMethodChange.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2713
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2714
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2715
process_removeClass_
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2716
    "'removeClass:' chunk (ST/X)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2717
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2718
    ^ self handleRemoveClassChange.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2719
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2720
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2721
process_removeSelector_
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2722
    "'removeSelector:' chunk (ST/X)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2723
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2724
    ^ self handleRemoveMethodChange.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2725
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2726
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2727
process_renameCategory_to_
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2728
    "'renameCategory:to:' chunk (ST/X)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2729
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2730
    ^ self handleMethodCategoryRenameChange.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2731
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2732
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2733
process_renameClass_to_
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2734
    "'renameClass:to:' chunk (ST/X)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2735
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2736
    ^ self handleRenameClassChange.
3043
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2737
!
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2738
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2739
process_timestamp
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2740
    "St/X timestamp info record. Example:
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2741
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2742
    '---- timestamp jv@neso 12-03-2012 10:49:40 ----'!!
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2743
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2744
    'timestamp' is already read from inputStream.
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2745
    "
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2746
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2747
    inputStream skipSeparators; through: Character space. "/read username@host
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2748
    timestamp := Timestamp readFrom: inputStream.
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2749
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2750
    "Created: / 02-04-2012 / 19:08:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2751
! !
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2752
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2753
!ChangeSet::ClassSourceWriter methodsFor:'private'!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2754
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2755
analyze
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2756
    "Analyzes changeset an build some index"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2757
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2758
    classInfos := Dictionary new.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2759
    metaInfos := Dictionary new.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2760
    topClassName := nil.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2761
    "Pass 1 - collect classes"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2762
    changeSetBeingSaved do:[:change|
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2763
        change isClassDefinitionChange ifTrue:[
3033
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  2764
            | nm ns |
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2765
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2766
            nm := change className.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2767
            (nm endsWith:' class') ifFalse:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2768
                (classInfos includesKey: nm) ifTrue:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2769
                    self error:'Multiple definitions of class ', nm.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2770
                    ^self.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2771
                ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2772
                classInfos at: nm put: (ClassInfo new name: nm).
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2773
                metaInfos at: nm put: (ClassInfo new name: nm , ' class').
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2774
                change isPrivateClassDefinitionChange ifFalse:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2775
                    topClassName notNil ifTrue:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2776
                        self error: ('Multiple top class definitions (%1 vs %2)' bindWith: topClassName with: nm).
3033
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  2777
                        ^self.
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2778
                    ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2779
                    topClassName := nm.
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2780
                    namespaceName := change nameSpaceName.
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2781
                ]
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2782
            ]            .
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2783
        ]
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2784
    ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2785
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2786
    "Pass 2: fill in infos"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2787
    changeSetBeingSaved do:[:change|
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2788
        change isClassChange ifTrue:[
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2789
            | nm info |
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2790
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2791
            nm := change className.
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2792
            (nm endsWith: ' class') ifTrue:[
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2793
                info := metaInfos at: (nm copyTo:(nm size - 6)).
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2794
            ] ifFalse:[
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2795
                info := classInfos at: nm.
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2796
                "Fill superclass info..."                
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2797
                change isClassDefinitionChange ifTrue:[
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2798
                    | superNm |
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2799
                    superNm := change superClassName.
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2800
                    (classInfos includesKey: superNm) ifTrue:[
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2801
                        info superclass: (classInfos at: superNm).
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2802
                        (metaInfos at: nm) superclass: (classInfos at: superNm).
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2803
                    ].
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2804
                ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2805
            ].
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2806
            info addChange: change.
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2807
        ]
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2808
    ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2809
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2810
    classInfos do:[:info|info namespace: namespaceName].
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2811
    metaInfos  do:[:info|info namespace: namespaceName].
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2812
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2813
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2814
    "
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2815
        ChangeSet::ClassSourceWriter new
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2816
            changeSetBeingSaved: (ChangeSet forExistingClass: ChangeSet);
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2817
            analyze;
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2818
            yourself
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2819
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2820
    "
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2821
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2822
    "Created: / 15-03-2012 / 17:51:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2823
!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2824
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2825
changeSetBeingSaved:something
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2826
    changeSetBeingSaved := something.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2827
!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2828
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2829
privateClassesOf: classInfo
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2830
3031
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  2831
    | classInfoNameSz |
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  2832
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  2833
    classInfoNameSz := classInfo name size.
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2834
    ^classInfos values select:[:info|
3031
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  2835
        info name size > classInfoNameSz and:[
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  2836
            (info name startsWith: classInfo name)
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  2837
                and:[(info name at:classInfoNameSz + 1) == $:
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  2838
                    and:[(info name at:classInfoNameSz + 2) == $:
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  2839
                        and:[(info name indexOf: $: startingAt: classInfo name size + 3) == 0]]]]
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2840
    ]
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2841
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2842
    "Created: / 15-03-2012 / 19:31:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2843
!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2844
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2845
privateClassesSortedOf: classInfo
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2846
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2847
    |classes|
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2848
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2849
    classes := self privateClassesOf: classInfo.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2850
    (classes size > 0) ifTrue:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2851
        classes := classes asOrderedCollection.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2852
        classes sort:[:a :b | a name < b name].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2853
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2854
        classes topologicalSort:[:a :b |
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2855
            "/ a must come before b iff:
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2856
            "/    b is a subclass of a
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2857
            "/    b has a private class which is a subclass of a
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2858
3031
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  2859
            |mustComeBefore privateClassesOfB|
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2860
            mustComeBefore := (b isSubclassOf:a) or:[b isPrivateClassOf: a].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2861
            mustComeBefore
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2862
        ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2863
    ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2864
    ^ classes.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2865
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2866
    "
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2867
     Object privateClassesSorted
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2868
     NewSystemBrowser privateClassesSorted
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2869
     NewSystemBrowser privateClasses
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2870
    "
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2871
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2872
    "Created: / 15-03-2012 / 19:45:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2873
! !
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2874
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2875
!ChangeSet::ClassSourceWriter methodsFor:'source writing'!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2876
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2877
fileOut:aChangeSet on:outStreamArg withTimeStamp:stampIt withInitialize:initIt withDefinition:withDefinition methodFilter:methodFilter encoder:encoderOrNil
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2878
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2879
    |collectionOfCategories versionMethods
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2880
     nonMeta meta classesImplementingInitialize outStream|
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2881
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2882
    changeSetBeingSaved := aChangeSet.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2883
    self analyze.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2884
    nonMeta := classInfos at: topClassName.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2885
       meta :=  metaInfos at: topClassName.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2886
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2887
    methodsAlreadySaved := Set new.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2888
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2889
    encoderOrNil isNil ifTrue:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2890
        outStream := outStreamArg.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2891
    ] ifFalse:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2892
        outStream := EncodedStream stream:outStreamArg encoder:encoderOrNil.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2893
        outStream nextPutAll:'"{ Encoding: ' , encoderOrNil nameOfEncoding , ' }"'; cr; cr.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2894
    ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2895
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2896
    "
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2897
     if there is a copyright method, add a copyright comment
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2898
     at the beginning, taking the string from the copyright method.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2899
     We cannot do this unconditionally - that would lead to my copyrights
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2900
     being put on your code ;-).
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2901
     On the other hand: I want every file created by myself to have the
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2902
     copyright string at the beginning be preserved .... even if the
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2903
     code was edited in the browser and filedOut.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2904
    "
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2905
    self generateHeaderWithCopyrightOn:outStream.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2906
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2907
    stampIt ifTrue:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2908
        "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2909
        "/ first, a timestamp
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2910
        "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2911
        outStream nextPutAll:(Smalltalk timeStamp).
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2912
        outStream nextPutChunkSeparator. 
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2913
        outStream cr; cr.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2914
    ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2915
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2916
    withDefinition ifTrue:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2917
        "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2918
        "/ then the definition(s)
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2919
        "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2920
        self fileOutAllDefinitionsOf:nonMeta on:outStream.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2921
        "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2922
        "/ a comment - if any
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2923
        "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2924
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2925
"/        (comment := nonMeta comment) notNil ifTrue:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2926
"/            nonMeta fileOutCommentOn:outStream.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2927
"/            outStream cr.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2928
"/        ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2929
        "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2930
        "/ ST/X primitive definitions - if any
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2931
        "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2932
        self fileOutPrimitiveSpecsOf: nonMeta on:outStream.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2933
    ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2934
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2935
    "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2936
    "/ methods from all categories in metaclass (i.e. class methods)
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2937
    "/ EXCEPT: the version method is placed at the very end, to
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2938
    "/         avoid sourcePosition-shifts when checked out later.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2939
    "/         (RCS expands this string, so its size is not constant)
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2940
    "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2941
    collectionOfCategories := meta categories asSortedCollection.
3031
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  2942
    versionMethods := meta methods select:[:change |AbstractSourceCodeManager isVersionMethodSelector:change selector].
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2943
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2944
    collectionOfCategories notNil ifTrue:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2945
        "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2946
        "/ documentation first (if any), but not the version method
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2947
        "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2948
        (collectionOfCategories includes:'documentation') ifTrue:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2949
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2950
"/            versionMethods do:[:versionMethod |
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2951
"/                |source|
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2952
"/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2953
"/                source := versionMethod source.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2954
"/                (source isEmptyOrNil or:[(source startsWith:nonMeta nameOfOldVersionMethod) not]) ifTrue:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2955
"/                    "something bad happend to the classes code"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2956
"/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2957
"/                    Class fileOutErrorSignal 
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2958
"/                        raiseRequestWith:aClass
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2959
"/                        errorString:' - bad source for version method (uncompiled class file?): ', (versionMethod displayString)
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2960
"/                ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2961
"/            ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2962
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2963
            self fileOutCategory:'documentation' of:meta except:versionMethods only:nil methodFilter:methodFilter on:outStream.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2964
            outStream cr.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2965
        ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2966
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2967
        "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2968
        "/ initialization next (if any)
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2969
        "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2970
        (collectionOfCategories includes:'initialization') ifTrue:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2971
            self fileOutCategory:'initialization' of:meta methodFilter:methodFilter on:outStream.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2972
            outStream cr.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2973
        ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2974
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2975
        "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2976
        "/ instance creation next (if any)
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2977
        "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2978
        (collectionOfCategories includes:'instance creation') ifTrue:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2979
            self fileOutCategory:'instance creation' of:meta methodFilter:methodFilter on:outStream.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2980
            outStream cr.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2981
        ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2982
        collectionOfCategories do:[:aCategory |
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2983
            ((aCategory ~= 'documentation')
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2984
            and:[(aCategory ~= 'initialization')
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2985
            and:[aCategory ~= 'instance creation']]) ifTrue:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2986
                self fileOutCategory:aCategory of:meta methodFilter:methodFilter on:outStream.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2987
                outStream cr
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2988
            ]
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2989
        ]
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2990
    ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2991
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2992
    "/ if there are any primitive definitions (vw-like ffi-primitives),
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2993
    "/ file them out first in the order: defines, types.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2994
    "/ Otherwise, we might have trouble when filing in later, because the types are needed
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2995
    "/ for the primitive calls.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2996
    nonMeta methodDictionary keysAndValuesDo:[:sel :m |
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2997
        m isVisualWorksTypedef ifTrue:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2998
            self fileOutCategory:m category of:nonMeta except:nil only:(Array with:m) methodFilter:methodFilter on:outStream.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2999
        ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3000
    ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3001
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3002
    "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3003
    "/ methods from all categories
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3004
    "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3005
    collectionOfCategories := nonMeta categories asSortedCollection.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3006
    collectionOfCategories notNil ifTrue:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3007
        collectionOfCategories do:[:aCategory |
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3008
            self fileOutCategory:aCategory of:nonMeta methodFilter:methodFilter on:outStream.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3009
            outStream cr
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3010
        ]
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3011
    ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3012
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3013
    "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3014
    "/ any private classes' methods
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3015
    "/
3031
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3016
    (self privateClassesSortedOf: nonMeta) do:[:aClass |
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3017
        self fileOutAllMethodsOf:aClass on:outStream methodFilter:methodFilter
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3018
    ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3019
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3020
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3021
    "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3022
    "/ finally, the previously skipped version method
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3023
    "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3024
    versionMethods notEmpty ifTrue: [
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3025
        self fileOutCategory:'documentation' of:meta except:nil only:versionMethods methodFilter:methodFilter on:outStream.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3026
    ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3027
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3028
    initIt ifTrue:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3029
        "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3030
        "/ optionally an initialize message
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3031
        "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3032
        classesImplementingInitialize := OrderedCollection new.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3033
3031
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3034
        classInfos values with: metaInfos values do:[:class :meta|
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3035
            (meta includesSelector: #initialize) ifTrue:[
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3036
                classesImplementingInitialize add: class.
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3037
            ]
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3038
        ].
3031
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3039
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3040
        classesImplementingInitialize size ~~ 0 ifTrue:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3041
            classesImplementingInitialize topologicalSort:[:a :b | b isSubclassOf:a].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3042
            outStream cr.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3043
            classesImplementingInitialize do:[:eachClass |
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3044
                eachClass printClassNameOn:outStream. outStream nextPutAll:' initialize'.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3045
                outStream nextPutChunkSeparator.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3046
                outStream cr.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3047
            ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3048
        ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3049
    ]
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3050
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3051
    "Created: / 15-11-1995 / 12:53:06 / cg"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3052
    "Modified: / 01-04-1997 / 16:01:05 / stefan"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3053
    "Modified: / 29-09-2011 / 14:53:49 / cg"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3054
    "Created: / 15-03-2012 / 17:39:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3055
!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3056
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3057
fileOutAllDefinitionsOf:nonMetaInfo on:aStream
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3058
    "append expressions on aStream, which defines myself and all of my private classes."
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3059
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3060
    | metaInfo |
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3061
3031
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3062
    nonMetaInfo definition isPrivateClassDefinitionChange ifFalse:[
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3063
        nonMetaInfo definition package notNil ifTrue:[
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3064
            aStream nextPutAll: ('"{ Package: ''%1'' }"' bindWith: nonMetaInfo definition package).
3033
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  3065
            aStream cr; cr.
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  3066
        ].
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  3067
        namespaceName notNil ifTrue:[
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  3068
            aStream nextPutAll: ('"{ NameSpace: %1 }"' bindWith: namespaceName).
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  3069
            aStream cr; cr.
3031
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3070
        ].
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3071
    ].
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3072
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3073
    aStream nextPutAll: (nonMetaInfo definition definitionStringInNamespace: namespaceName).
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3074
    aStream nextPutChunkSeparator. 
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3075
    aStream cr; cr.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3076
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3077
    "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3078
    "/ optional classInstanceVariables
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3079
    "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3080
    metaInfo := metaInfos at: nonMetaInfo name.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3081
    metaInfo definition notNil ifTrue:[
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3082
        | anySuperClassInstVar myClass |
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3083
        aStream 
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3084
            nextPutAll: metaInfo definition className; 
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3085
            nextPutAll:' instanceVariableNames:';
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3086
            nextPutAll: (metaInfo definition classInstVarNames asStringWith:' ') storeString.
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3087
        "mhmh - good idea; saw this in SmallDraw sourcecode ..."
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3088
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3089
        anySuperClassInstVar := false.
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3090
        myClass := metaInfo definition changeClass.
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3091
        myClass notNil ifTrue:[myClass := myClass theNonMetaclass].
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3092
        myClass notNil ifTrue:[
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3093
            myClass allSuperclassesDo:[:aSuperClass |
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3094
                aSuperClass class instVarNames do:[:ignored | anySuperClassInstVar := true].
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3095
            ].
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3096
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3097
            aStream cr; cr; nextPut:(Character doubleQuote); cr; space.
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3098
            anySuperClassInstVar ifFalse:[
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3099
                aStream
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3100
                    nextPutLine:'No other class instance variables are inherited by this class.'.
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3101
            ] ifTrue:[
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3102
                aStream
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3103
                    nextPutLine:'The following class instance variables are inherited by this class:'.
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3104
                aStream cr.
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3105
                myClass allSuperclassesDo:[:aSuperClass |
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3106
                    aStream tab; nextPutAll:aSuperClass name; nextPutAll:' - '.
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3107
                    aStream nextPutLine:(aSuperClass class instanceVariableString).
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3108
                ].
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3109
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3110
            ].
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3111
        ].
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3112
        aStream nextPut:(Character doubleQuote); cr.
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3113
        aStream nextPut:$!!; cr; cr
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3114
    ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3115
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3116
    "/ here, the full nameSpace prefixes are output,
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3117
    "/ to avoid confusing stc 
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3118
    "/ (which otherwise could not find the correct superclass)
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3119
    "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3120
    Class fileOutNameSpaceQuerySignal answer:false do:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3121
        Class forceNoNameSpaceQuerySignal answer:true do:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3122
            (self privateClassesSortedOf: nonMetaInfo) do:[:i |
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3123
                 self fileOutAllDefinitionsOf:i on:aStream
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3124
            ]
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3125
        ]
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3126
    ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3127
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3128
    "Created: / 15-10-1996 / 11:15:19 / cg"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3129
    "Modified: / 22-03-1997 / 16:11:56 / cg"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3130
    "Created: / 15-03-2012 / 19:18:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3131
!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3132
3031
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3133
fileOutAllMethodsOf:aClass on:aStream methodFilter:methodFilter
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3134
    | collectionOfCategories meta |
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3135
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3136
    meta := metaInfos at: aClass name.
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3137
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3138
    collectionOfCategories := meta categories asSortedCollection.
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3139
    collectionOfCategories notNil ifTrue:[
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3140
        collectionOfCategories do:[:aCategory |
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3141
            self fileOutCategory:aCategory of:meta  methodFilter:methodFilter on:aStream.
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3142
            aStream cr
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3143
        ]
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3144
    ].
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3145
    collectionOfCategories := aClass categories asSortedCollection.
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3146
    collectionOfCategories notNil ifTrue:[
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3147
        collectionOfCategories do:[:aCategory |
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3148
            self fileOutCategory:aCategory of:aClass methodFilter:methodFilter on:aStream.
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3149
            aStream cr
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3150
        ]
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3151
    ].
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3152
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3153
    (self privateClassesSortedOf: aClass) do:[:privateClass |
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3154
        self fileOutAllMethodsOf:privateClass on:aStream methodFilter:methodFilter
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3155
    ].
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3156
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3157
    "Created: / 15-10-1996 / 11:13:00 / cg"
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3158
    "Modified: / 22-03-1997 / 16:12:17 / cg"
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3159
    "Created: / 19-03-2012 / 18:21:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3160
!
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3161
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3162
fileOutMethod:change on:aStream
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3163
    "file a single method onto aStream."
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3164
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3165
    | changeToFileOut |
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3166
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3167
    change isMethodCategoryChange ifTrue:[
3036
7be02f89af2b Fixes in merging category changes
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3034
diff changeset
  3168
        self assert: change origin notNil.
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3169
        changeToFileOut := change origin copy.
3036
7be02f89af2b Fixes in merging category changes
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3034
diff changeset
  3170
        changeToFileOut category: change category.
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3171
    ] ifFalse:[
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3172
        changeToFileOut := change.
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3173
    ].
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3174
    changeToFileOut source notEmptyOrNil ifTrue:[
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3175
        super fileOutMethod:changeToFileOut on:aStream
3036
7be02f89af2b Fixes in merging category changes
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3034
diff changeset
  3176
    ] ifFalse:[
7be02f89af2b Fixes in merging category changes
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3034
diff changeset
  3177
"/        self error: 'Should not happen' mayProceed: true.
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3178
    ]
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3179
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3180
    "Created: / 20-03-2012 / 22:33:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3181
!
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3182
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3183
fileOutPrimitiveSpecsOf: nonMeta on:outStream
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3184
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3185
    "Nothing now..."
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3186
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3187
    "Created: / 15-03-2012 / 19:48:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3188
!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3189
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3190
generateHeaderWithCopyrightOn:outStream
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3191
    |copyrightChange copyrightText|
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3192
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3193
    copyrightChange :=
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3194
        (metaInfos at: topClassName) methodAt: #copyright.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3195
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3196
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3197
    copyrightChange notNil ifTrue:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3198
        "
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3199
         get the copyright method's comment-text, strip off empty and blank lines
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3200
         and insert at beginning.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3201
        "
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3202
        copyrightText := Parser methodCommentFromSource: copyrightChange source.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3203
        copyrightText notEmptyOrNil ifTrue:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3204
            copyrightText := copyrightText asCollectionOfLines asStringCollection.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3205
            copyrightText := copyrightText withoutLeadingBlankLines.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3206
            copyrightText := copyrightText withoutTrailingBlankLines.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3207
            copyrightText notEmpty ifTrue:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3208
                copyrightText addFirst:'"'.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3209
                copyrightText addLast:'"'.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3210
                copyrightText := copyrightText asString.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3211
                outStream nextPutAllAsChunk:copyrightText.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3212
            ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3213
        ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3214
    ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3215
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3216
    "Created: / 15-03-2012 / 19:01:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3217
! !
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3218
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3219
!ChangeSet::ClassSourceWriter::ClassInfo class methodsFor:'instance creation'!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3220
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3221
new
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3222
    "return an initialized instance"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3223
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3224
    ^ self basicNew initialize.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3225
! !
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3226
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3227
!ChangeSet::ClassSourceWriter::ClassInfo methodsFor:'accessing'!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3228
3031
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3229
categories
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3230
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3231
    ^ (methods collect:[:e|e category]) asSet
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3232
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3233
    "Created: / 19-03-2012 / 18:03:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3234
!
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3235
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3236
definition
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3237
    ^ definition
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3238
!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3239
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3240
definition:something
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3241
    definition := something.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3242
!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3243
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3244
methodAt: selector 
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3245
    ^methods detect:[:each|each selector == selector] ifNone:[nil].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3246
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3247
    "Created: / 15-03-2012 / 19:11:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3248
!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3249
3031
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3250
methodDictionary
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3251
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3252
    methodDictionary isNil ifTrue:[
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3253
        methodDictionary := Dictionary new.
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3254
    ].
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3255
    ^methodDictionary
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3256
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3257
    "Created: / 19-03-2012 / 18:11:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3258
!
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3259
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3260
methods
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3261
    ^ methods
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3262
!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3263
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3264
methods:something
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3265
    methods := something.
3031
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3266
    methodDictionary := Dictionary new.
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3267
    methods do:[:m|methodDictionary at: m selector put: m].
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3268
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3269
    "Modified: / 19-03-2012 / 18:12:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3270
!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3271
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3272
name
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3273
    ^ name
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3274
!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3275
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3276
name:something
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3277
    name := something.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3278
!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3279
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3280
namespace
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3281
    ^ namespace
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3282
!
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3283
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3284
namespace:aString
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3285
    namespace := aString.
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3286
!
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3287
3031
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3288
selectorAtMethod: m
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3289
    ^m selector
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3290
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3291
    "Created: / 19-03-2012 / 18:14:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3292
!
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3293
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3294
superclass
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3295
    ^ superclass
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3296
!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3297
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3298
superclass:something
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3299
    superclass := something.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3300
! !
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3301
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3302
!ChangeSet::ClassSourceWriter::ClassInfo methodsFor:'adding'!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3303
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3304
addChange: change
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3305
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3306
    change isClassDefinitionChange ifTrue:[
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3307
        self assert: definition isNil.
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3308
        definition := change.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3309
        ^self.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3310
    ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3311
    change isMethodCodeChange ifTrue:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3312
        methods add: change.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3313
        ^self.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3314
    ].
3036
7be02f89af2b Fixes in merging category changes
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3034
diff changeset
  3315
    change isMethodCategoryChange ifTrue:[
7be02f89af2b Fixes in merging category changes
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3034
diff changeset
  3316
        methods add: change.
7be02f89af2b Fixes in merging category changes
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3034
diff changeset
  3317
        ^self.
7be02f89af2b Fixes in merging category changes
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3034
diff changeset
  3318
    ].
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3319
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3320
    change isClassInstVarDefinitionChange ifTrue:[
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3321
        self assert: definition isNil.
3036
7be02f89af2b Fixes in merging category changes
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3034
diff changeset
  3322
        definition := change.
7be02f89af2b Fixes in merging category changes
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3034
diff changeset
  3323
        ^self
7be02f89af2b Fixes in merging category changes
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3034
diff changeset
  3324
    ].
7be02f89af2b Fixes in merging category changes
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3034
diff changeset
  3325
7be02f89af2b Fixes in merging category changes
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3034
diff changeset
  3326
    self error: 'Unknown change'
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3327
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3328
    "Created: / 15-03-2012 / 19:12:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3329
! !
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3330
3031
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3331
!ChangeSet::ClassSourceWriter::ClassInfo methodsFor:'enumerating'!
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3332
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3333
methodsDo: aBlock
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3334
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3335
    methods do: aBlock
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3336
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3337
    "Created: / 19-03-2012 / 18:14:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3338
! !
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3339
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3340
!ChangeSet::ClassSourceWriter::ClassInfo methodsFor:'initialization'!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3341
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3342
initialize
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3343
    "Invoked when a new instance is created."
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3344
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3345
    "/ please change as required (and remove this comment)
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3346
    "/ name := nil.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3347
    "/ instDefinition := nil.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3348
    "/ classDefinition := nil.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3349
    methods := OrderedCollection new.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3350
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3351
    "/ super initialize.   -- commented since inherited method does nothing
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3352
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3353
    "Modified: / 15-03-2012 / 19:12:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3354
! !
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3355
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3356
!ChangeSet::ClassSourceWriter::ClassInfo methodsFor:'printing & storing'!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3357
3033
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  3358
printClassNameOn:aStream
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3359
    | nameWithoutNs |
3033
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  3360
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  3361
    nameWithoutNs := name.
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3362
    namespace notNil ifTrue:[
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3363
        self assert: (name startsWith:namespace).
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3364
        nameWithoutNs := nameWithoutNs copyFrom: namespace size + 3.
3033
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  3365
    ].
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  3366
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  3367
    aStream nextPutAll: nameWithoutNs
3031
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3368
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3369
    "Created: / 19-03-2012 / 18:17:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3370
!
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3371
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3372
printOn:aStream
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3373
    "append a printed representation if the receiver to the argument, aStream"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3374
3031
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3375
    aStream nextPutAll: self class nameWithoutPrefix.
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3376
    aStream nextPutAll:'('.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3377
    name printOn:aStream.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3378
    aStream nextPutAll:')'.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3379
3031
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3380
    "Modified: / 19-03-2012 / 19:43:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3381
! !
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3382
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3383
!ChangeSet::ClassSourceWriter::ClassInfo methodsFor:'queries'!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3384
3031
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3385
includesSelector: selector
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3386
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3387
    ^methods anySatisfy:[:m|m selector == selector].
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3388
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3389
    "Created: / 19-03-2012 / 18:22:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3390
!
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3391
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3392
isPrivateClassOf: classInfo
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3393
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3394
    ^(name startsWith: classInfo name)
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3395
        and:[ (name at: (classInfo name size + 1)) == $:
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3396
            and:[ (name at: (classInfo name size + 2)) == $:]]
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3397
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3398
    "Created: / 15-03-2012 / 19:42:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3399
!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3400
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3401
isSubclassOf: classInfo
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3402
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3403
    ^superclass notNil and:
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3404
        [superclass == classInfo or:[superclass isSubclassOf: classInfo]]
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3405
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3406
    "Created: / 15-03-2012 / 19:41:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3407
! !
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3408
2321
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
  3409
!ChangeSet::DiffSet class methodsFor:'documentation'!
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
  3410
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
  3411
documentation
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
  3412
"
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
  3413
    I represent the differences between two change sets.
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
  3414
    As such, I can be used by a VersionDiffBrowser and to generate patchSets.
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
  3415
"
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
  3416
! !
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
  3417
1156
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3418
!ChangeSet::DiffSet methodsFor:'accessing'!
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3419
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3420
changed
1867
dad9e13fba4c comments
Claus Gittinger <cg@exept.de>
parents: 1865
diff changeset
  3421
    "return the set of methods which were different"
1156
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3422
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3423
    ^ changed
1867
dad9e13fba4c comments
Claus Gittinger <cg@exept.de>
parents: 1865
diff changeset
  3424
dad9e13fba4c comments
Claus Gittinger <cg@exept.de>
parents: 1865
diff changeset
  3425
    "Modified: / 12-10-2006 / 22:06:55 / cg"
1156
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3426
!
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3427
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3428
changed:something
1867
dad9e13fba4c comments
Claus Gittinger <cg@exept.de>
parents: 1865
diff changeset
  3429
    "set the set of changed methods"
1156
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3430
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3431
    changed := something.
1867
dad9e13fba4c comments
Claus Gittinger <cg@exept.de>
parents: 1865
diff changeset
  3432
dad9e13fba4c comments
Claus Gittinger <cg@exept.de>
parents: 1865
diff changeset
  3433
    "Modified: / 12-10-2006 / 22:06:03 / cg"
1156
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3434
!
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3435
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3436
changed:changedArg onlyInReceiver:onlyInReceiverArg onlyInArg:onlyInArgArg 
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3437
    "set instance variables (automatically generated)"
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3438
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3439
    changed := changedArg.
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3440
    changed isNil ifTrue:[changed := OrderedCollection new].
1450
0ec14b2064fb *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1447
diff changeset
  3441
1156
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3442
    onlyInReceiver := onlyInReceiverArg.
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3443
    onlyInReceiver isNil ifTrue:[onlyInReceiver := ChangeSet new].
1450
0ec14b2064fb *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1447
diff changeset
  3444
1156
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3445
    onlyInArg := onlyInArgArg.
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3446
    onlyInArg isNil ifTrue:[onlyInArg := ChangeSet new].
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3447
!
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3448
3032
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3449
changed:changedArg onlyInReceiver:onlyInReceiverArg onlyInArg:onlyInArgArg same: sameArg
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3450
    "set instance variables (automatically generated)"
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3451
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3452
    changed := changedArg.
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3453
    changed isNil ifTrue:[changed := OrderedCollection new].
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3454
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3455
    onlyInReceiver := onlyInReceiverArg.
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3456
    onlyInReceiver isNil ifTrue:[onlyInReceiver := ChangeSet new].
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3457
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3458
    onlyInArg := onlyInArgArg.
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3459
    onlyInArg isNil ifTrue:[onlyInArg := ChangeSet new].
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3460
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3461
    same := sameArg.
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3462
    same isNil ifTrue:[same := ChangeSet new].
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3463
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3464
    "Created: / 19-03-2012 / 21:35:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3465
!
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3466
1156
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3467
onlyInArg
1867
dad9e13fba4c comments
Claus Gittinger <cg@exept.de>
parents: 1865
diff changeset
  3468
    "return the set of methods which were only present in the argument of the diffset"
dad9e13fba4c comments
Claus Gittinger <cg@exept.de>
parents: 1865
diff changeset
  3469
1156
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3470
    ^ onlyInArg
1867
dad9e13fba4c comments
Claus Gittinger <cg@exept.de>
parents: 1865
diff changeset
  3471
dad9e13fba4c comments
Claus Gittinger <cg@exept.de>
parents: 1865
diff changeset
  3472
    "Modified: / 12-10-2006 / 22:07:02 / cg"
1156
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3473
!
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3474
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3475
onlyInArg:something
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3476
    onlyInArg := something.
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3477
!
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3478
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3479
onlyInReceiver
1867
dad9e13fba4c comments
Claus Gittinger <cg@exept.de>
parents: 1865
diff changeset
  3480
    "return the set of methods which were only present in the receiver of the diffset"
dad9e13fba4c comments
Claus Gittinger <cg@exept.de>
parents: 1865
diff changeset
  3481
1156
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3482
    ^ onlyInReceiver
1867
dad9e13fba4c comments
Claus Gittinger <cg@exept.de>
parents: 1865
diff changeset
  3483
dad9e13fba4c comments
Claus Gittinger <cg@exept.de>
parents: 1865
diff changeset
  3484
    "Modified: / 12-10-2006 / 22:07:12 / cg"
1156
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3485
!
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3486
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3487
onlyInReceiver:something
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3488
    onlyInReceiver := something.
3032
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3489
!
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3490
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3491
same
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3492
    ^ same
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3493
!
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3494
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3495
same:something
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3496
    same := something.
1156
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3497
! !
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3498
1869
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3499
!ChangeSet::DiffSet methodsFor:'merging'!
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3500
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3501
addDiffSet:anotherDiffset
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3502
    changed addAll:(anotherDiffset changed).
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3503
    onlyInReceiver addAll:(anotherDiffset onlyInReceiver).
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3504
    onlyInArg addAll:(anotherDiffset onlyInArg).
3032
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3505
    same addAll: (anotherDiffset same).
1869
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3506
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3507
    "Created: / 12-10-2006 / 22:49:30 / cg"
3032
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3508
    "Modified: / 19-03-2012 / 21:36:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1869
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3509
!
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3510
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3511
copy
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3512
    ^ self class new
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3513
        changed:changed copy
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3514
        onlyInReceiver:onlyInReceiver copy
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3515
        onlyInArg:onlyInArg copy
3032
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3516
        same:same copy
1869
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3517
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3518
    "Created: / 12-10-2006 / 22:50:56 / cg"
3032
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3519
    "Modified: / 19-03-2012 / 21:36:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1869
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3520
! !
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3521
2186
3cbd8cb9e36e removeAllVersionMethods in DiffSet
fm
parents: 2179
diff changeset
  3522
!ChangeSet::DiffSet methodsFor:'misc'!
3cbd8cb9e36e removeAllVersionMethods in DiffSet
fm
parents: 2179
diff changeset
  3523
3cbd8cb9e36e removeAllVersionMethods in DiffSet
fm
parents: 2179
diff changeset
  3524
removeAllVersionMethods
3cbd8cb9e36e removeAllVersionMethods in DiffSet
fm
parents: 2179
diff changeset
  3525
    changed := changed 
3cbd8cb9e36e removeAllVersionMethods in DiffSet
fm
parents: 2179
diff changeset
  3526
                    reject:[:pair |
3cbd8cb9e36e removeAllVersionMethods in DiffSet
fm
parents: 2179
diff changeset
  3527
                        pair first isMethodChangeForVersionMethod
3cbd8cb9e36e removeAllVersionMethods in DiffSet
fm
parents: 2179
diff changeset
  3528
                    ].
3cbd8cb9e36e removeAllVersionMethods in DiffSet
fm
parents: 2179
diff changeset
  3529
    onlyInReceiver := onlyInReceiver 
3cbd8cb9e36e removeAllVersionMethods in DiffSet
fm
parents: 2179
diff changeset
  3530
                    reject:[:chg |
3cbd8cb9e36e removeAllVersionMethods in DiffSet
fm
parents: 2179
diff changeset
  3531
                        chg isMethodChangeForVersionMethod
3cbd8cb9e36e removeAllVersionMethods in DiffSet
fm
parents: 2179
diff changeset
  3532
                    ].
3cbd8cb9e36e removeAllVersionMethods in DiffSet
fm
parents: 2179
diff changeset
  3533
    onlyInArg := onlyInArg 
3cbd8cb9e36e removeAllVersionMethods in DiffSet
fm
parents: 2179
diff changeset
  3534
                    reject:[:chg |
3cbd8cb9e36e removeAllVersionMethods in DiffSet
fm
parents: 2179
diff changeset
  3535
                        chg isMethodChangeForVersionMethod
3cbd8cb9e36e removeAllVersionMethods in DiffSet
fm
parents: 2179
diff changeset
  3536
                    ].
3cbd8cb9e36e removeAllVersionMethods in DiffSet
fm
parents: 2179
diff changeset
  3537
! !
3cbd8cb9e36e removeAllVersionMethods in DiffSet
fm
parents: 2179
diff changeset
  3538
1292
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
  3539
!ChangeSet::DiffSet methodsFor:'queries'!
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
  3540
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
  3541
isEmpty
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
  3542
    ^ changed isEmpty
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
  3543
    and:[ onlyInReceiver isEmpty
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
  3544
    and:[ onlyInArg isEmpty ] ]
1869
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3545
!
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3546
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3547
notEmpty
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3548
    ^ self isEmpty not
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3549
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3550
    "Created: / 12-10-2006 / 23:12:27 / cg"
1292
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
  3551
! !
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
  3552
1182
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3553
!ChangeSet::DolphinPACFileReader methodsFor:'reading-private'!
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3554
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3555
handleCategoriesForClass
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3556
    |category change|
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3557
2179
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3558
    [
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3559
        inputStream skipSeparators.
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3560
        category := inputStream nextChunk.
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3561
        category notEmpty
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3562
    ] whileTrue:[
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3563
        change := ClassCategoryChange new.
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3564
        change 
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3565
            className:className
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3566
            category:category.
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3567
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3568
        self addChange:change.
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3569
    ].
1182
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3570
    ^ true
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3571
!
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3572
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3573
handleCategoriesForMethod
2179
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3574
    |methodSelector categories change isPrivate isPublic category|
1182
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3575
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3576
    methodSelector := (arguments at:1) evaluate.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3577
    inputStream skipSeparators.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3578
    isPrivate := false.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3579
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3580
    categories := OrderedCollection new.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3581
    [
2179
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3582
        |done category |
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3583
1182
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3584
        category := inputStream nextChunk withoutSeparators.
2179
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3585
        done := category isEmpty.
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3586
        done ifFalse:[
1182
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3587
            categories add:category
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3588
        ].
2179
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3589
        done
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3590
    ] whileFalse.
1182
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3591
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3592
    categories size > 1 ifTrue:[
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3593
        isPrivate := categories includes:'private'.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3594
        categories remove:'private' ifAbsent:nil.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3595
    ].
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3596
    categories size > 1 ifTrue:[
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3597
        isPublic := categories includes:'public'.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3598
        categories remove:'public' ifAbsent:nil.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3599
    ].
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3600
"/    categories size > 1 ifTrue:[
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3601
"/        self halt.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3602
"/    ].
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3603
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3604
    category := categories first.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3605
    isPrivate ifTrue:[
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3606
        category := category , '-private'. 
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3607
    ].
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3608
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3609
    change := MethodCategoryChange new.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3610
    change 
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3611
        className:className
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3612
        selector:methodSelector
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3613
        category:category.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3614
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3615
    self addChange:change.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3616
    ^ true
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3617
!
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3618
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3619
processChange
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3620
    "given a parse-tree (from parsing some changes source/chunk),
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3621
     create changes and evaluate changeAction on each.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3622
     The block is invoked with the change and a lineNumberOrNil as
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3623
     arg; the lineNumber is only valid, if the underlying stream 
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3624
     provides line-numbers; otherwise, nil is passed."
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3625
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3626
    (selector == #'categoriesForClass') ifTrue:[
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3627
        ^ self handleCategoriesForClass.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3628
    ].
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3629
    (selector == #'categoriesFor:') ifTrue:[
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3630
        ^ self handleCategoriesForMethod.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3631
    ].
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3632
    selector == #'subclass:instanceVariableNames:classVariableNames:poolDictionaries:classInstanceVariableNames:' ifTrue:[
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3633
        ^ self handleClassDefinitionChange.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3634
    ].
2179
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3635
"/    selector == #'guid:' ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3636
"/        ^ self handleGUIDChange.
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3637
"/    ].
1182
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3638
    ^ super processChange
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3639
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3640
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3641
"/    selector == #named:superclass:indexedInstanceVariables:instanceVariableNames:classVariableNames:sharedPools:classInstanceVariableNames: ifTrue:[
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3642
"/        ^ self handleClassDefinitionChange.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3643
"/    ].
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3644
"/    (selector == #'key:value:') ifTrue:[
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3645
"/        (self checkReceiverIsGlobalNamed:'Annotation') ifTrue:[
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3646
"/            ^ self handleAnnotation.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3647
"/        ]
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3648
"/    ].
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3649
"/    selector == #'method' ifTrue:[
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3650
"/        ^ self handleMethodChange:false.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3651
"/    ].
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3652
"/    selector == #'classMethod' ifTrue:[
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3653
"/        ^ self handleMethodChange:true.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3654
"/    ].
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3655
"/
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3656
"/    selector == #'initializer' ifTrue:[
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3657
"/        ^ true
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3658
"/    ].
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3659
"/    selector == #'initialize' ifTrue:[
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3660
"/        ^ true
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3661
"/    ].
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3662
"/self halt.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3663
"/
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3664
"/    ^ false
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3665
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3666
    "Created: / 16.2.1998 / 13:42:40 / cg"
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3667
    "Modified: / 15.12.1999 / 00:29:06 / cg"
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3668
! !
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3669
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3670
!ChangeSet::SIFChangeFileReader methodsFor:'reading-private'!
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3671
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3672
handleAnnotation
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3673
    |key value lastChange change|
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3674
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3675
    key := (arguments at:1) evaluate.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3676
    value := (arguments at:2) evaluate.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3677
1422
6871068da880 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1421
diff changeset
  3678
    key = 'Prerequisite' ifTrue:[
6871068da880 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1421
diff changeset
  3679
"/        change := SIFPrerequisiteChange new prerequisiteFileName:value.
6871068da880 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1421
diff changeset
  3680
"/        self addChange:change.
6871068da880 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1421
diff changeset
  3681
        ^ true
6871068da880 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1421
diff changeset
  3682
    ].
6871068da880 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1421
diff changeset
  3683
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3684
    lastChange := changeSet last.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3685
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3686
    key = 'package' ifTrue:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3687
        change := ClassCategoryChange new className:(lastChange className) category:value.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3688
        self addChange:change.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3689
        ^ true
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3690
    ].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3691
    key = 'category' ifTrue:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3692
"/        change := MethodCategoryChange new className:(lastChange className) selector:(lastChange selector) category:value.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3693
"/        self addChange:change.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3694
        lastChange category:value.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3695
        ^ true
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3696
    ].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3697
    key = 'stamp' ifTrue:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3698
        "/ lastChange timeStamp:value.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3699
        ^ true
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3700
    ].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3701
    ^ false
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3702
!
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3703
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3704
handleClassDefinitionChange
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3705
    |nameSpace change|
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3706
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3707
    (self checkReceiverIsGlobalNamed:#Class) ifFalse:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3708
        self error:'unexpected receiver in classDefinition message' mayProceed:true.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3709
        ^ false.
1313
8aceccee1eaf *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1301
diff changeset
  3710
    ].
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3711
    className := (arguments at:1) evaluate.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3712
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3713
    nameSpace := Class nameSpaceQuerySignal query.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3714
    nameSpace ~~ Smalltalk ifTrue:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3715
        className := nameSpace name , '::' , className
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3716
    ].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3717
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3718
    change := ClassDefinitionChange new.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3719
    change className:className; source:(parseTree printString).
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3720
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3721
    change package:(Class packageQuerySignal query).
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3722
    self addChange:change.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3723
    ^ true
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3724
!
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3725
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3726
handleMethodChange:isMeta
1188
a4594193f884 Remove unused method variables
Stefan Vogel <sv@exept.de>
parents: 1187
diff changeset
  3727
    |categoryName methodSource change parser |
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3728
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3729
    className := self receiversClassName.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3730
    isMeta ifTrue:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3731
        className := className , ' class'
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3732
    ].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3733
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3734
    categoryName := 'uncategorized'.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3735
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3736
    inputStream skipSeparators.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3737
    lineNumber := inputStream lineNumber.
1209
f98d5eb855d3 code rewritten to be independent of stream zero-base
Claus Gittinger <cg@exept.de>
parents: 1200
diff changeset
  3738
    position := inputStream position1Based.
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3739
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3740
    methodSource := inputStream nextChunk.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3741
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3742
    parser := Parser
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3743
                parseMethodArgAndVarSpecification:methodSource 
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3744
                in:nil 
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3745
                ignoreErrors:true 
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3746
                ignoreWarnings:true
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3747
                parseBody:false.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3748
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3749
    parser isNil ifTrue:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3750
        "/ something wierd ...
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3751
        methodSelector := '????'.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3752
    ] ifFalse:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3753
        methodSelector := parser selector.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3754
    ].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3755
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3756
    change := MethodChange new.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3757
    change 
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3758
        className:className
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3759
        selector:methodSelector
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3760
        source:methodSource
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3761
        category:categoryName
1188
a4594193f884 Remove unused method variables
Stefan Vogel <sv@exept.de>
parents: 1187
diff changeset
  3762
        privacy:nil.
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3763
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3764
    self addChange:change.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3765
    ^ true
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3766
!
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3767
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3768
processChange
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3769
    "given a parse-tree (from parsing some changes source/chunk),
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3770
     create changes and evaluate changeAction on each.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3771
     The block is invoked with the change and a lineNumberOrNil as
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3772
     arg; the lineNumber is only valid, if the underlying stream 
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3773
     provides line-numbers; otherwise, nil is passed."
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3774
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3775
    (selector == #'interchangeVersion:') ifTrue:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3776
        ^ true
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3777
    ].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3778
    selector == #named:superclass:indexedInstanceVariables:instanceVariableNames:classVariableNames:sharedPools:classInstanceVariableNames: ifTrue:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3779
        ^ self handleClassDefinitionChange.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3780
    ].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3781
    (selector == #'key:value:') ifTrue:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3782
        (self checkReceiverIsGlobalNamed:'Annotation') ifTrue:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3783
            ^ self handleAnnotation.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3784
        ]
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3785
    ].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3786
    selector == #'method' ifTrue:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3787
        ^ self handleMethodChange:false.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3788
    ].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3789
    selector == #'classMethod' ifTrue:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3790
        ^ self handleMethodChange:true.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3791
    ].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3792
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3793
    selector == #'initializer' ifTrue:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3794
        ^ true
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3795
    ].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3796
    selector == #'initialize' ifTrue:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3797
        ^ true
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3798
    ].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3799
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3800
    ^ false
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3801
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3802
    "Created: / 16.2.1998 / 13:42:40 / cg"
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3803
    "Modified: / 15.12.1999 / 00:29:06 / cg"
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3804
! !
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3805
625
06f4ed35832b added #patches for ST80 compatibility
Claus Gittinger <cg@exept.de>
parents: 378
diff changeset
  3806
!ChangeSet class methodsFor:'documentation'!
100
d09e51d14901 project changeSet fixes
Claus Gittinger <cg@exept.de>
parents: 85
diff changeset
  3807
2179
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3808
version_CVS
3011
1997ff6e7e55 trunk branched into /branches/jv
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2745
diff changeset
  3809
    ^ '§Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.187 2012/01/24 17:39:37 vrany Exp §'
1997ff6e7e55 trunk branched into /branches/jv
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2745
diff changeset
  3810
3012
4f40b8304d54 Added InvalidChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3011
diff changeset
  3811
!
4f40b8304d54 Added InvalidChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3011
diff changeset
  3812
4f40b8304d54 Added InvalidChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3011
diff changeset
  3813
version_SVN
3043
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  3814
    ^ '$Id: ChangeSet.st 1910 2012-04-03 12:29:20Z vranyj1 $'
3012
4f40b8304d54 Added InvalidChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3011
diff changeset
  3815
! !