ChangeSetDiff.st
author Claus Gittinger <cg@exept.de>
Mon, 20 Aug 2018 10:11:25 +0200
changeset 4346 6604af2f1554
parent 4206 f9fd49077c35
child 4386 2aaa979df793
permissions -rw-r--r--
#OTHER by cg class: FileBasedSourceCodeManager class removed: #version_FileRepository
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2407
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
     1
"
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
     2
 Copyright (c) 2007-2010 Jan Vrany, SWING Research Group,
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
     3
                           Czech Technical University in Prague
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
     4
 Copyright (c) 2009-2010 eXept Software AG
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
     5
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
     6
 Permission is hereby granted, free of charge, to any person
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
     7
 obtaining a copy of this software and associated documentation
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
     8
 files (the 'Software'), to deal in the Software without
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
     9
 restriction, including without limitation the rights to use,
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    10
 copy, modify, merge, publish, distribute, sublicense, and/or sell
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    11
 copies of the Software, and to permit persons to whom the
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    12
 Software is furnished to do so, subject to the following
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    13
 conditions:
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    14
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    15
 The above copyright notice and this permission notice shall be
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    16
 included in all copies or substantial portions of the Software.
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    17
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    18
 THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    19
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    20
 OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    21
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    22
 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    23
 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    24
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    25
 OTHER DEALINGS IN THE SOFTWARE.
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    26
"
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    27
"{ Package: 'stx:libbasic3' }"
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    28
4019
3efc1019f206 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 3693
diff changeset
    29
"{ NameSpace: Smalltalk }"
3efc1019f206 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 3693
diff changeset
    30
2407
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    31
Object subclass:#ChangeSetDiff
2878
6b43d308b5f7 Merged from SVN
vrany
parents: 2630
diff changeset
    32
	instanceVariableNames:'diffset same'
2407
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    33
	classVariableNames:''
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    34
	poolDictionaries:''
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    35
	category:'System-Changes-Diff'
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    36
!
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    37
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    38
!ChangeSetDiff class methodsFor:'documentation'!
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    39
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    40
copyright
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    41
"
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    42
 Copyright (c) 2007-2010 Jan Vrany, SWING Research Group,
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    43
                           Czech Technical University in Prague
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    44
 Copyright (c) 2009-2010 eXept Software AG
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    45
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    46
 Permission is hereby granted, free of charge, to any person
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    47
 obtaining a copy of this software and associated documentation
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    48
 files (the 'Software'), to deal in the Software without
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    49
 restriction, including without limitation the rights to use,
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    50
 copy, modify, merge, publish, distribute, sublicense, and/or sell
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    51
 copies of the Software, and to permit persons to whom the
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    52
 Software is furnished to do so, subject to the following
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    53
 conditions:
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    54
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    55
 The above copyright notice and this permission notice shall be
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    56
 included in all copies or substantial portions of the Software.
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    57
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    58
 THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    59
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    60
 OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    61
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    62
 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    63
 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    64
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    65
 OTHER DEALINGS IN THE SOFTWARE.
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    66
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    67
"
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    68
! !
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    69
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    70
!ChangeSetDiff class methodsFor:'instance creation'!
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    71
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    72
new
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    73
    ^ self basicNew initialize.
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    74
! !
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    75
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    76
!ChangeSetDiff class methodsFor:'utilities'!
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    77
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    78
versionA:changesetA versionB:changesetB 
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    79
    ^ (self new)
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    80
        versionA:changesetA versionB:changesetB;
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    81
        diffset
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    82
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    83
    "Created: / 02-11-2009 / 16:12:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    84
!
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    85
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    86
versionA:changesetA versionB:changesetB versionBase: versionBase 
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    87
    ^ (self new)
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    88
        versionA:changesetA versionB:changesetB versionBase: versionBase;
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    89
        diffset
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    90
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    91
    "Created: / 03-11-2009 / 07:58:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    92
! !
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    93
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    94
!ChangeSetDiff methodsFor:'accessing'!
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    95
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    96
diffset
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
    97
    ^ diffset
2878
6b43d308b5f7 Merged from SVN
vrany
parents: 2630
diff changeset
    98
!
6b43d308b5f7 Merged from SVN
vrany
parents: 2630
diff changeset
    99
6b43d308b5f7 Merged from SVN
vrany
parents: 2630
diff changeset
   100
same
6b43d308b5f7 Merged from SVN
vrany
parents: 2630
diff changeset
   101
    ^ same
2407
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
   102
! !
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
   103
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
   104
!ChangeSetDiff methodsFor:'diffing'!
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
   105
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
   106
versionA:changesetA versionB:changesetB 
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
   107
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
   108
    self versionA:changesetA versionB:changesetB versionBase: nil
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
   109
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
   110
    "Created: / 31-10-2009 / 19:12:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
   111
    "Modified: / 02-11-2009 / 18:38:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
   112
!
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
   113
2630
deae273e56c3 changed: #versionA:versionB:versionBase: - fomatting && do not include version methods
vrany
parents: 2629
diff changeset
   114
versionA:a versionB:b versionBase:base 
deae273e56c3 changed: #versionA:versionB:versionBase: - fomatting && do not include version methods
vrany
parents: 2629
diff changeset
   115
    |ds diffsByClass include|
2407
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
   116
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
   117
    diffsByClass := Dictionary new.
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
   118
    ds := a diffSetsAgainst:b.
2878
6b43d308b5f7 Merged from SVN
vrany
parents: 2630
diff changeset
   119
    same := ds same.
6b43d308b5f7 Merged from SVN
vrany
parents: 2630
diff changeset
   120
2630
deae273e56c3 changed: #versionA:versionB:versionBase: - fomatting && do not include version methods
vrany
parents: 2629
diff changeset
   121
    include := [:chg | 
2878
6b43d308b5f7 Merged from SVN
vrany
parents: 2630
diff changeset
   122
            true"(AbstractSourceCodeManager isVersionMethodSelector:chg selector) not"
6b43d308b5f7 Merged from SVN
vrany
parents: 2630
diff changeset
   123
    ].
2629
4786ed332f59 changed: #versionA:versionB:versionBase:
Claus Gittinger <cg@exept.de>
parents: 2407
diff changeset
   124
    ds onlyInReceiver do:[:chg | 
3440
90518961cc11 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2878
diff changeset
   125
          (include value:chg) ifTrue:[
90518961cc11 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2878
diff changeset
   126
            (diffsByClass at:chg nonMetaClassName
2630
deae273e56c3 changed: #versionA:versionB:versionBase: - fomatting && do not include version methods
vrany
parents: 2629
diff changeset
   127
                ifAbsentPut:[ChangeSetDiffSet new name:chg nonMetaClassName]) 
deae273e56c3 changed: #versionA:versionB:versionBase: - fomatting && do not include version methods
vrany
parents: 2629
diff changeset
   128
                    add:(ChangeSetDiffEntry versionA:chg)
deae273e56c3 changed: #versionA:versionB:versionBase: - fomatting && do not include version methods
vrany
parents: 2629
diff changeset
   129
        ]
2629
4786ed332f59 changed: #versionA:versionB:versionBase:
Claus Gittinger <cg@exept.de>
parents: 2407
diff changeset
   130
    ].
4786ed332f59 changed: #versionA:versionB:versionBase:
Claus Gittinger <cg@exept.de>
parents: 2407
diff changeset
   131
    ds changed do:[:chgPair | 
3440
90518961cc11 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2878
diff changeset
   132
        | chg |
90518961cc11 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2878
diff changeset
   133
90518961cc11 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2878
diff changeset
   134
        chg := chgPair first ? chgPair second.
90518961cc11 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2878
diff changeset
   135
        (include value:chg) ifTrue:[
90518961cc11 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2878
diff changeset
   136
            (diffsByClass at:chg nonMetaClassName
90518961cc11 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2878
diff changeset
   137
                ifAbsentPut:[ChangeSetDiffSet new name:chg nonMetaClassName]) 
2630
deae273e56c3 changed: #versionA:versionB:versionBase: - fomatting && do not include version methods
vrany
parents: 2629
diff changeset
   138
                    add:(ChangeSetDiffEntry versionA:chgPair first versionB:chgPair second)
2629
4786ed332f59 changed: #versionA:versionB:versionBase:
Claus Gittinger <cg@exept.de>
parents: 2407
diff changeset
   139
        ]
4786ed332f59 changed: #versionA:versionB:versionBase:
Claus Gittinger <cg@exept.de>
parents: 2407
diff changeset
   140
    ].
4786ed332f59 changed: #versionA:versionB:versionBase:
Claus Gittinger <cg@exept.de>
parents: 2407
diff changeset
   141
    ds onlyInArg do:[:chg | 
2630
deae273e56c3 changed: #versionA:versionB:versionBase: - fomatting && do not include version methods
vrany
parents: 2629
diff changeset
   142
        (include value:chg) ifTrue:[
deae273e56c3 changed: #versionA:versionB:versionBase: - fomatting && do not include version methods
vrany
parents: 2629
diff changeset
   143
            (diffsByClass at:chg nonMetaClassName
deae273e56c3 changed: #versionA:versionB:versionBase: - fomatting && do not include version methods
vrany
parents: 2629
diff changeset
   144
                ifAbsentPut:[ChangeSetDiffSet new name:chg nonMetaClassName]) 
deae273e56c3 changed: #versionA:versionB:versionBase: - fomatting && do not include version methods
vrany
parents: 2629
diff changeset
   145
                    add:(ChangeSetDiffEntry versionB:chg)
deae273e56c3 changed: #versionA:versionB:versionBase: - fomatting && do not include version methods
vrany
parents: 2629
diff changeset
   146
        ]
2629
4786ed332f59 changed: #versionA:versionB:versionBase:
Claus Gittinger <cg@exept.de>
parents: 2407
diff changeset
   147
    ].
4786ed332f59 changed: #versionA:versionB:versionBase:
Claus Gittinger <cg@exept.de>
parents: 2407
diff changeset
   148
    base notNil ifTrue:[
2407
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
   149
        "Try to assign base version to each diff item"
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
   150
        "Sorry, we are using O^2 algorithm here, I'm too lazy now :-)"
2630
deae273e56c3 changed: #versionA:versionB:versionBase: - fomatting && do not include version methods
vrany
parents: 2629
diff changeset
   151
        diffsByClass do:[:diffs | 
deae273e56c3 changed: #versionA:versionB:versionBase: - fomatting && do not include version methods
vrany
parents: 2629
diff changeset
   152
            diffs do:[:diff | 
deae273e56c3 changed: #versionA:versionB:versionBase: - fomatting && do not include version methods
vrany
parents: 2629
diff changeset
   153
                |versionBase|
2629
4786ed332f59 changed: #versionA:versionB:versionBase:
Claus Gittinger <cg@exept.de>
parents: 2407
diff changeset
   154
2878
6b43d308b5f7 Merged from SVN
vrany
parents: 2630
diff changeset
   155
                versionBase := base detect:[:each | each isForSameAs:(diff versionA ? diff versionB)] ifNone:[nil].
6b43d308b5f7 Merged from SVN
vrany
parents: 2630
diff changeset
   156
6b43d308b5f7 Merged from SVN
vrany
parents: 2630
diff changeset
   157
                "/ only the category is different;
6b43d308b5f7 Merged from SVN
vrany
parents: 2630
diff changeset
   158
                "/ make it a MethodCategory changes.
6b43d308b5f7 Merged from SVN
vrany
parents: 2630
diff changeset
   159
                (versionBase notNil and:[versionBase isMethodCodeChange and:[
6b43d308b5f7 Merged from SVN
vrany
parents: 2630
diff changeset
   160
                    diff versionA notNil and:[diff versionA isMethodCategoryChange 
6b43d308b5f7 Merged from SVN
vrany
parents: 2630
diff changeset
   161
                        and:[diff versionA notNil  and:[diff versionB isMethodCategoryChange]]]]]) ifTrue:[
6b43d308b5f7 Merged from SVN
vrany
parents: 2630
diff changeset
   162
                            versionBase := MethodCategoryChange new
6b43d308b5f7 Merged from SVN
vrany
parents: 2630
diff changeset
   163
                                        className:versionBase className
6b43d308b5f7 Merged from SVN
vrany
parents: 2630
diff changeset
   164
                                        selector:versionBase selector
6b43d308b5f7 Merged from SVN
vrany
parents: 2630
diff changeset
   165
                                        category:versionBase methodCategory;
6b43d308b5f7 Merged from SVN
vrany
parents: 2630
diff changeset
   166
                                        origin: versionBase
6b43d308b5f7 Merged from SVN
vrany
parents: 2630
diff changeset
   167
                            ].
6b43d308b5f7 Merged from SVN
vrany
parents: 2630
diff changeset
   168
"/                versionBase isNil ifTrue:[
6b43d308b5f7 Merged from SVN
vrany
parents: 2630
diff changeset
   169
"/                    diff versionA isClassRemoveChangeOrMethodRemoveChange not ifTrue:[
6b43d308b5f7 Merged from SVN
vrany
parents: 2630
diff changeset
   170
"/                        versionBase := diff versionA asAntiChange
6b43d308b5f7 Merged from SVN
vrany
parents: 2630
diff changeset
   171
"/                    ] ifFalse:[
6b43d308b5f7 Merged from SVN
vrany
parents: 2630
diff changeset
   172
"/                        versionBase := diff versionA copy
6b43d308b5f7 Merged from SVN
vrany
parents: 2630
diff changeset
   173
"/                    ]
6b43d308b5f7 Merged from SVN
vrany
parents: 2630
diff changeset
   174
"/                ].
2630
deae273e56c3 changed: #versionA:versionB:versionBase: - fomatting && do not include version methods
vrany
parents: 2629
diff changeset
   175
                diff versionBase:versionBase.
2629
4786ed332f59 changed: #versionA:versionB:versionBase:
Claus Gittinger <cg@exept.de>
parents: 2407
diff changeset
   176
                diff automerge
4786ed332f59 changed: #versionA:versionB:versionBase:
Claus Gittinger <cg@exept.de>
parents: 2407
diff changeset
   177
            ]
4786ed332f59 changed: #versionA:versionB:versionBase:
Claus Gittinger <cg@exept.de>
parents: 2407
diff changeset
   178
        ]
4786ed332f59 changed: #versionA:versionB:versionBase:
Claus Gittinger <cg@exept.de>
parents: 2407
diff changeset
   179
    ].
2630
deae273e56c3 changed: #versionA:versionB:versionBase: - fomatting && do not include version methods
vrany
parents: 2629
diff changeset
   180
    diffsByClass size = 1 ifTrue:[
3693
eace8a8a86e6 class: ChangeSetDiff
Claus Gittinger <cg@exept.de>
parents: 3440
diff changeset
   181
        diffset addAll:diffsByClass anElement diffs
2630
deae273e56c3 changed: #versionA:versionB:versionBase: - fomatting && do not include version methods
vrany
parents: 2629
diff changeset
   182
    ] ifFalse:[
deae273e56c3 changed: #versionA:versionB:versionBase: - fomatting && do not include version methods
vrany
parents: 2629
diff changeset
   183
        diffset addAll:diffsByClass values
deae273e56c3 changed: #versionA:versionB:versionBase: - fomatting && do not include version methods
vrany
parents: 2629
diff changeset
   184
    ].
deae273e56c3 changed: #versionA:versionB:versionBase: - fomatting && do not include version methods
vrany
parents: 2629
diff changeset
   185
    diffset versionALabel:a name.
deae273e56c3 changed: #versionA:versionB:versionBase: - fomatting && do not include version methods
vrany
parents: 2629
diff changeset
   186
    diffset versionBLabel:b name.
2629
4786ed332f59 changed: #versionA:versionB:versionBase:
Claus Gittinger <cg@exept.de>
parents: 2407
diff changeset
   187
    base notNil ifTrue:[
2630
deae273e56c3 changed: #versionA:versionB:versionBase: - fomatting && do not include version methods
vrany
parents: 2629
diff changeset
   188
        diffset versionBaseLabel:base name.
2407
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
   189
    ].
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
   190
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
   191
    "Created: / 02-11-2009 / 16:17:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
4206
f9fd49077c35 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4019
diff changeset
   192
    "Modified: / 29-06-2011 / 08:22:49 / Jan Vrany"
3440
90518961cc11 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2878
diff changeset
   193
    "Modified: / 18-12-2013 / 21:05:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2407
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
   194
! !
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
   195
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
   196
!ChangeSetDiff methodsFor:'initialization'!
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
   197
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
   198
initialize
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
   199
    "Invoked when a new instance is created."
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
   200
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
   201
    "/ please change as required (and remove this comment)
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
   202
    diffset := ChangeSetDiffSet new.
2878
6b43d308b5f7 Merged from SVN
vrany
parents: 2630
diff changeset
   203
    same := ChangeSet new.
2407
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
   204
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
   205
    "/ super initialize.   -- commented since inherited method does nothing
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
   206
2878
6b43d308b5f7 Merged from SVN
vrany
parents: 2630
diff changeset
   207
    "Modified: / 19-03-2012 / 21:51:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2407
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
   208
! !
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
   209
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
   210
!ChangeSetDiff class methodsFor:'documentation'!
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
   211
4019
3efc1019f206 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 3693
diff changeset
   212
version_CVS
3efc1019f206 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 3693
diff changeset
   213
    ^ '$Header$'
3efc1019f206 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 3693
diff changeset
   214
!
3efc1019f206 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 3693
diff changeset
   215
2878
6b43d308b5f7 Merged from SVN
vrany
parents: 2630
diff changeset
   216
version_SVN
4019
3efc1019f206 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 3693
diff changeset
   217
    ^ '$Id$'
2407
239b5c4aef83 initial checkin
vrany
parents:
diff changeset
   218
! !
3440
90518961cc11 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2878
diff changeset
   219