ChangeSetDiffSet.st
author Stefan Vogel <sv@exept.de>
Wed, 18 Dec 2019 17:29:12 +0100
changeset 4533 d75502a4c955
parent 4477 20465f1f84c2
permissions -rw-r--r--
#BUGFIX by stefan class: MessageTracer class changed: #printObject:on: fix for ProtoObject
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4473
eb761c540467 #BUGFIX by exept
Claus Gittinger <cg@exept.de>
parents: 4020
diff changeset
     1
"{ Encoding: utf8 }"
eb761c540467 #BUGFIX by exept
Claus Gittinger <cg@exept.de>
parents: 4020
diff changeset
     2
2408
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
     3
"
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
     4
 Copyright (c) 2007-2010 Jan Vrany, SWING Research Group,
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
     5
                           Czech Technical University in Prague
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
     6
 Copyright (c) 2009-2010 eXept Software AG
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
     7
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
     8
 Permission is hereby granted, free of charge, to any person
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
     9
 obtaining a copy of this software and associated documentation
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    10
 files (the 'Software'), to deal in the Software without
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    11
 restriction, including without limitation the rights to use,
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    12
 copy, modify, merge, publish, distribute, sublicense, and/or sell
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    13
 copies of the Software, and to permit persons to whom the
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    14
 Software is furnished to do so, subject to the following
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    15
 conditions:
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    16
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    17
 The above copyright notice and this permission notice shall be
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    18
 included in all copies or substantial portions of the Software.
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    19
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    20
 THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    21
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    22
 OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    23
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    24
 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    25
 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    26
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    27
 OTHER DEALINGS IN THE SOFTWARE.
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    28
"
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    29
"{ Package: 'stx:libbasic3' }"
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    30
4020
888393a148bf #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 3462
diff changeset
    31
"{ NameSpace: Smalltalk }"
888393a148bf #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 3462
diff changeset
    32
2408
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    33
ChangeSetDiffComponent subclass:#ChangeSetDiffSet
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    34
	instanceVariableNames:'name versionALabel versionBLabel versionBaseLabel diffs'
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    35
	classVariableNames:''
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    36
	poolDictionaries:''
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    37
	category:'System-Changes-Diff'
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    38
!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    39
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    40
!ChangeSetDiffSet class methodsFor:'documentation'!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    41
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    42
copyright
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    43
"
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    44
 Copyright (c) 2007-2010 Jan Vrany, SWING Research Group,
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    45
                           Czech Technical University in Prague
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    46
 Copyright (c) 2009-2010 eXept Software AG
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    47
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    48
 Permission is hereby granted, free of charge, to any person
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    49
 obtaining a copy of this software and associated documentation
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    50
 files (the 'Software'), to deal in the Software without
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    51
 restriction, including without limitation the rights to use,
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    52
 copy, modify, merge, publish, distribute, sublicense, and/or sell
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    53
 copies of the Software, and to permit persons to whom the
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    54
 Software is furnished to do so, subject to the following
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    55
 conditions:
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    56
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    57
 The above copyright notice and this permission notice shall be
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    58
 included in all copies or substantial portions of the Software.
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    59
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    60
 THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    61
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    62
 OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    63
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    64
 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    65
 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    66
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    67
 OTHER DEALINGS IN THE SOFTWARE.
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    68
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    69
"
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    70
! !
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    71
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    72
!ChangeSetDiffSet class methodsFor:'instance creation'!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    73
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    74
new
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    75
    ^ self basicNew initialize.
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    76
! !
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    77
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    78
!ChangeSetDiffSet methodsFor:'accessing'!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    79
3462
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
    80
depth
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
    81
    | depth |
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
    82
    depth := 0.
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
    83
    diffs do:[:diff|
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
    84
        depth := depth max: diff depth
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
    85
    ].
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
    86
    ^depth + 1
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
    87
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
    88
    "Created: / 15-01-2013 / 11:27:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
    89
!
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
    90
2408
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    91
diffs
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    92
    ^ diffs
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    93
!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    94
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    95
flattened
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    96
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    97
    | flattened s |
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    98
    flattened := self copy.
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    99
    s := (OrderedCollection new: diffs size) writeStream.
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   100
    self flattenOn: s.
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   101
    flattened setDiffs: s contents.
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   102
    ^flattened
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   103
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   104
    "Created: / 05-12-2009 / 11:09:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   105
!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   106
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   107
merged
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   108
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   109
    ^diffs allSatisfy:[:e|e merged]
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   110
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   111
    "Created: / 24-11-2009 / 10:04:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   112
!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   113
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   114
name
2427
8a55734614cb Display number of changes
vrany
parents: 2408
diff changeset
   115
8a55734614cb Display number of changes
vrany
parents: 2408
diff changeset
   116
    ^ '%1 (%2)' bindWith: (name ? '<unnamed>') with: diffs size
2408
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   117
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   118
    "Modified: / 26-11-2009 / 16:26:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2427
8a55734614cb Display number of changes
vrany
parents: 2408
diff changeset
   119
    "Modified: / 07-07-2011 / 14:15:12 / jv"
2408
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   120
!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   121
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   122
name:aString
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   123
    name := aString.
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   124
!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   125
3462
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   126
nextEntryAfter: entry suchThat: predicate
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   127
    | found |
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   128
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   129
    entry isNil ifTrue:[ 
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   130
        self do:[:each|(predicate value: each) ifTrue:[^each]].
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   131
        ^nil
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   132
    ].
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   133
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   134
    found := false.
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   135
    self do:[:each|
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   136
        each == entry ifTrue:[
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   137
            found := true
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   138
        ] ifFalse:[
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   139
            (found and:[predicate value: each]) ifTrue:[ ^ each ]
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   140
        ].
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   141
    ].
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   142
    ^nil
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   143
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   144
    "Created: / 17-01-2013 / 13:00:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   145
    "Modified: / 17-01-2013 / 16:55:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   146
!
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   147
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   148
nextEntryBefore: entry suchThat: predicate
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   149
    | last |
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   150
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   151
    entry isNil ifTrue:[ 
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   152
        ^nil
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   153
    ].
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   154
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   155
    self do:[:each|
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   156
        each == entry ifTrue:[ ^ last ].
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   157
        (predicate value: each) ifTrue:[last := each].
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   158
    ].
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   159
    ^nil
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   160
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   161
    "Created: / 17-01-2013 / 16:57:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   162
!
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   163
2408
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   164
resolution
2627
ca1a4b2b0f53 changed:
Claus Gittinger <cg@exept.de>
parents: 2427
diff changeset
   165
    | changeset |
2408
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   166
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   167
    changeset := ChangeSet new.
2627
ca1a4b2b0f53 changed:
Claus Gittinger <cg@exept.de>
parents: 2427
diff changeset
   168
    self do:[:diff|
ca1a4b2b0f53 changed:
Claus Gittinger <cg@exept.de>
parents: 2427
diff changeset
   169
        diff versionMerged notNil ifTrue:[
ca1a4b2b0f53 changed:
Claus Gittinger <cg@exept.de>
parents: 2427
diff changeset
   170
            changeset add: diff versionMerged
ca1a4b2b0f53 changed:
Claus Gittinger <cg@exept.de>
parents: 2427
diff changeset
   171
        ]
ca1a4b2b0f53 changed:
Claus Gittinger <cg@exept.de>
parents: 2427
diff changeset
   172
    ].
2408
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   173
    ^changeset
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   174
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   175
    "Created: / 26-11-2009 / 08:44:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2627
ca1a4b2b0f53 changed:
Claus Gittinger <cg@exept.de>
parents: 2427
diff changeset
   176
    "Modified: / 29-11-2011 / 11:25:02 / cg"
2408
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   177
!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   178
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   179
versionALabel
2628
7a777cdf027f changed:
Claus Gittinger <cg@exept.de>
parents: 2627
diff changeset
   180
    ^ versionALabel ifNil:[parent ifNotNil:[parent versionALabel]]
2408
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   181
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   182
    "Modified: / 21-11-2009 / 07:50:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2628
7a777cdf027f changed:
Claus Gittinger <cg@exept.de>
parents: 2627
diff changeset
   183
    "Modified: / 29-11-2011 / 11:26:15 / cg"
2408
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   184
!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   185
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   186
versionALabel:aString
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   187
    versionALabel := aString.
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   188
!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   189
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   190
versionBLabel
2628
7a777cdf027f changed:
Claus Gittinger <cg@exept.de>
parents: 2627
diff changeset
   191
    ^ versionBLabel ifNil:[parent ifNotNil:[parent versionBLabel]]
2408
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   192
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   193
    "Modified: / 21-11-2009 / 07:51:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2628
7a777cdf027f changed:
Claus Gittinger <cg@exept.de>
parents: 2627
diff changeset
   194
    "Modified: / 29-11-2011 / 11:26:19 / cg"
2408
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   195
!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   196
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   197
versionBLabel:aString
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   198
    versionBLabel := aString.
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   199
!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   200
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   201
versionBaseLabel
2628
7a777cdf027f changed:
Claus Gittinger <cg@exept.de>
parents: 2627
diff changeset
   202
    ^ versionBaseLabel ifNil:[parent ifNotNil:[parent versionBaseLabel]]
2408
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   203
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   204
    "Created: / 23-11-2009 / 22:54:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   205
    "Modified: / 24-11-2009 / 09:21:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2628
7a777cdf027f changed:
Claus Gittinger <cg@exept.de>
parents: 2627
diff changeset
   206
    "Modified (format): / 29-11-2011 / 11:26:37 / cg"
2408
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   207
!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   208
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   209
versionBaseLabel:aString
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   210
    versionBaseLabel := aString.
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   211
! !
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   212
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   213
!ChangeSetDiffSet methodsFor:'adding & removing'!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   214
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   215
add: anObject
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   216
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   217
    anObject parent: self.
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   218
    ^diffs add: anObject
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   219
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   220
    "Created: / 09-11-2009 / 12:36:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   221
    "Modified: / 10-11-2009 / 11:26:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   222
!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   223
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   224
addAll: aCollection
4477
20465f1f84c2 #QUALITY by exept
Claus Gittinger <cg@exept.de>
parents: 4473
diff changeset
   225
    "add aCollection at the end.
20465f1f84c2 #QUALITY by exept
Claus Gittinger <cg@exept.de>
parents: 4473
diff changeset
   226
     Returns the argument, aCollection"
2408
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   227
4477
20465f1f84c2 #QUALITY by exept
Claus Gittinger <cg@exept.de>
parents: 4473
diff changeset
   228
    aCollection do:[:e| self add:e].
20465f1f84c2 #QUALITY by exept
Claus Gittinger <cg@exept.de>
parents: 4473
diff changeset
   229
    ^ aCollection
2408
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   230
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   231
    "Created: / 10-11-2009 / 11:27:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   232
! !
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   233
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   234
!ChangeSetDiffSet methodsFor:'enumerating'!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   235
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   236
collect: aBlock
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   237
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   238
    ^diffs collect: aBlock
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   239
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   240
    "Created: / 10-11-2009 / 11:26:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   241
!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   242
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   243
do: aBlock
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   244
4473
eb761c540467 #BUGFIX by exept
Claus Gittinger <cg@exept.de>
parents: 4020
diff changeset
   245
    diffs do: [:each|each do:aBlock]
2408
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   246
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   247
    "Created: / 10-11-2009 / 11:26:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   248
    "Modified: / 25-11-2009 / 10:30:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   249
! !
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   250
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   251
!ChangeSetDiffSet methodsFor:'initialization'!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   252
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   253
initialize
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   254
    "Invoked when a new instance is created."
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   255
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   256
    "/ please change as required (and remove this comment)
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   257
    "/ name := nil.
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   258
    "/ versionALabel := nil.
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   259
    "/ versionBLabel := nil.
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   260
    diffs := OrderedCollection new:4.
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   261
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   262
    "/ super initialize.   -- commented since inherited method does nothing
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   263
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   264
    "Modified: / 10-11-2009 / 11:25:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   265
!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   266
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   267
setDiffs: aCollection
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   268
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   269
    diffs := aCollection
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   270
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   271
    "Created: / 05-12-2009 / 11:09:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   272
! !
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   273
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   274
!ChangeSetDiffSet methodsFor:'private'!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   275
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   276
flattenOn: stream
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   277
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   278
    diffs do:[:diff|diff flattenOn: stream]
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   279
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   280
    "Created: / 05-12-2009 / 11:07:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3462
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   281
!
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   282
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   283
sort:sortBlock
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   284
    "superclass ChangeSetDiffComponent says that I am responsible to implement this method"
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   285
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   286
    diffs sort: sortBlock.
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   287
    diffs do:[:e|e sort: sortBlock].
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   288
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   289
    "Modified: / 17-01-2013 / 14:18:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2408
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   290
! !
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   291
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   292
!ChangeSetDiffSet methodsFor:'testing'!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   293
3462
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   294
isConflict
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   295
    "Return true, if there is a conflict."
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   296
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   297
    ^ self diffs anySatisfy:[:e|e isConflict].
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   298
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   299
    "Created: / 01-08-2012 / 17:10:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   300
!
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   301
2408
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   302
isDiffSet
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   303
    ^ true
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   304
!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   305
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   306
isEmpty
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   307
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   308
    ^diffs isEmpty or:[diffs allSatisfy: [:diff|diff isEmpty]]
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   309
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   310
    "Created: / 25-11-2009 / 20:37:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   311
    "Modified: / 09-12-2009 / 17:43:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2879
236fd6f1434a Merged from SVN
vrany
parents: 2628
diff changeset
   312
!
236fd6f1434a Merged from SVN
vrany
parents: 2628
diff changeset
   313
3462
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   314
isForCopyrightMethod
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   315
    "Returns true, if this is an entry for #copyright method"
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   316
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   317
    ^diffs allSatisfy:[:each|each isForCopyrightMethod]
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   318
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   319
    "Created: / 01-08-2012 / 16:38:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   320
!
b4af88a682ec merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 3398
diff changeset
   321
2879
236fd6f1434a Merged from SVN
vrany
parents: 2628
diff changeset
   322
isForVersionMethod
236fd6f1434a Merged from SVN
vrany
parents: 2628
diff changeset
   323
    "Returns true, if this is an entry for version method"
236fd6f1434a Merged from SVN
vrany
parents: 2628
diff changeset
   324
236fd6f1434a Merged from SVN
vrany
parents: 2628
diff changeset
   325
    ^diffs allSatisfy:[:each|each isForVersionMethod]
236fd6f1434a Merged from SVN
vrany
parents: 2628
diff changeset
   326
236fd6f1434a Merged from SVN
vrany
parents: 2628
diff changeset
   327
    "Created: / 18-04-2012 / 19:05:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
236fd6f1434a Merged from SVN
vrany
parents: 2628
diff changeset
   328
!
236fd6f1434a Merged from SVN
vrany
parents: 2628
diff changeset
   329
236fd6f1434a Merged from SVN
vrany
parents: 2628
diff changeset
   330
isMerged
236fd6f1434a Merged from SVN
vrany
parents: 2628
diff changeset
   331
    "raise an error: must be redefined in concrete subclass(es)"
236fd6f1434a Merged from SVN
vrany
parents: 2628
diff changeset
   332
236fd6f1434a Merged from SVN
vrany
parents: 2628
diff changeset
   333
    ^ self diffs allSatisfy:[:e|e isMerged].
236fd6f1434a Merged from SVN
vrany
parents: 2628
diff changeset
   334
236fd6f1434a Merged from SVN
vrany
parents: 2628
diff changeset
   335
    "Created: / 19-03-2012 / 15:15:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2408
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   336
! !
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   337
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   338
!ChangeSetDiffSet class methodsFor:'documentation'!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   339
2628
7a777cdf027f changed:
Claus Gittinger <cg@exept.de>
parents: 2627
diff changeset
   340
version
4020
888393a148bf #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 3462
diff changeset
   341
    ^ '$Header$'
888393a148bf #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 3462
diff changeset
   342
!
888393a148bf #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 3462
diff changeset
   343
888393a148bf #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 3462
diff changeset
   344
version_CVS
888393a148bf #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 3462
diff changeset
   345
    ^ '$Header$'
2628
7a777cdf027f changed:
Claus Gittinger <cg@exept.de>
parents: 2627
diff changeset
   346
!
7a777cdf027f changed:
Claus Gittinger <cg@exept.de>
parents: 2627
diff changeset
   347
2879
236fd6f1434a Merged from SVN
vrany
parents: 2628
diff changeset
   348
version_SVN
4020
888393a148bf #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 3462
diff changeset
   349
    ^ '$Id$'
2408
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   350
! !
3398
2ae8b15cbf51 class: ChangeSetDiffSet
Claus Gittinger <cg@exept.de>
parents: 2879
diff changeset
   351