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