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