ChangeSetDiffComponent.st
author Claus Gittinger <cg@exept.de>
Mon, 20 Aug 2018 10:11:25 +0200
changeset 4346 6604af2f1554
parent 4069 b9b7b32895f5
child 4074 533d1c715e83
child 4478 7ae834471dde
permissions -rw-r--r--
#OTHER by cg class: FileBasedSourceCodeManager class removed: #version_FileRepository
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2406
cf06c39b234c initial checkin
vrany
parents:
diff changeset
     1
"
cf06c39b234c initial checkin
vrany
parents:
diff changeset
     2
 Copyright (c) 2007-2010 Jan Vrany, SWING Research Group,
cf06c39b234c initial checkin
vrany
parents:
diff changeset
     3
                           Czech Technical University in Prague
cf06c39b234c initial checkin
vrany
parents:
diff changeset
     4
 Copyright (c) 2009-2010 eXept Software AG
cf06c39b234c initial checkin
vrany
parents:
diff changeset
     5
cf06c39b234c initial checkin
vrany
parents:
diff changeset
     6
 Permission is hereby granted, free of charge, to any person
cf06c39b234c initial checkin
vrany
parents:
diff changeset
     7
 obtaining a copy of this software and associated documentation
cf06c39b234c initial checkin
vrany
parents:
diff changeset
     8
 files (the 'Software'), to deal in the Software without
cf06c39b234c initial checkin
vrany
parents:
diff changeset
     9
 restriction, including without limitation the rights to use,
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    10
 copy, modify, merge, publish, distribute, sublicense, and/or sell
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    11
 copies of the Software, and to permit persons to whom the
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    12
 Software is furnished to do so, subject to the following
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    13
 conditions:
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    14
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    15
 The above copyright notice and this permission notice shall be
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    16
 included in all copies or substantial portions of the Software.
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    17
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    18
 THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    19
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    20
 OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    21
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    22
 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    23
 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    24
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    25
 OTHER DEALINGS IN THE SOFTWARE.
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    26
"
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    27
"{ Package: 'stx:libbasic3' }"
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    28
4017
e816f4b73919 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 3457
diff changeset
    29
"{ NameSpace: Smalltalk }"
e816f4b73919 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 3457
diff changeset
    30
2424
bc7e320cec40 Inherit from object, not Model (to fix dependencies)
vrany
parents: 2406
diff changeset
    31
Object subclass:#ChangeSetDiffComponent
2406
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    32
	instanceVariableNames:'parent'
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    33
	classVariableNames:''
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    34
	poolDictionaries:''
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    35
	category:'System-Changes-Diff'
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    36
!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    37
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    38
!ChangeSetDiffComponent class methodsFor:'documentation'!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    39
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    40
copyright
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    41
"
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    42
 Copyright (c) 2007-2010 Jan Vrany, SWING Research Group,
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    43
                           Czech Technical University in Prague
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    44
 Copyright (c) 2009-2010 eXept Software AG
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    45
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    46
 Permission is hereby granted, free of charge, to any person
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    47
 obtaining a copy of this software and associated documentation
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    48
 files (the 'Software'), to deal in the Software without
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    49
 restriction, including without limitation the rights to use,
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    50
 copy, modify, merge, publish, distribute, sublicense, and/or sell
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    51
 copies of the Software, and to permit persons to whom the
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    52
 Software is furnished to do so, subject to the following
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    53
 conditions:
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    54
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    55
 The above copyright notice and this permission notice shall be
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    56
 included in all copies or substantial portions of the Software.
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    57
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    58
 THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    59
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    60
 OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    61
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    62
 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    63
 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    64
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    65
 OTHER DEALINGS IN THE SOFTWARE.
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    66
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    67
"
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    68
! !
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    69
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    70
!ChangeSetDiffComponent methodsFor:'accessing'!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    71
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    72
changesetA
2643
vrany
parents: 2424
diff changeset
    73
    "Answers a changeset with containing all versionA changes"
vrany
parents: 2424
diff changeset
    74
    | cs |
2406
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    75
2643
vrany
parents: 2424
diff changeset
    76
    cs := ChangeSet new name: self versionALabel.
vrany
parents: 2424
diff changeset
    77
    self do:[:item|
3457
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
    78
        (item versionA notNil" and:[item versionMerged isClassDefinitionChange or:[item versionMerged isMethodCodeChange]]") ifTrue:[
2880
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
    79
            cs add: item versionA
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
    80
        ]
2643
vrany
parents: 2424
diff changeset
    81
    ].
vrany
parents: 2424
diff changeset
    82
    ^cs
vrany
parents: 2424
diff changeset
    83
3457
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
    84
    "Modified: / 18-12-2013 / 20:55:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2406
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    85
!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    86
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    87
changesetB
2880
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
    88
    "Answers a changeset with containing all versionA changes"
2643
vrany
parents: 2424
diff changeset
    89
    | cs |
2406
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    90
2643
vrany
parents: 2424
diff changeset
    91
    cs := ChangeSet new name: self versionBLabel.
vrany
parents: 2424
diff changeset
    92
    self do:[:item|
3457
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
    93
        (item versionB notNil" and:[item versionMerged isClassDefinitionChange or:[item versionMerged isMethodCodeChange]]") ifTrue:[
2880
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
    94
            cs add: item versionB
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
    95
        ]
2643
vrany
parents: 2424
diff changeset
    96
    ].
vrany
parents: 2424
diff changeset
    97
    ^cs
vrany
parents: 2424
diff changeset
    98
3457
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
    99
    "Modified: / 18-12-2013 / 20:55:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2880
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   100
!
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   101
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   102
changesetBase
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   103
    "Answers a changeset with containing all versionA changes"
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   104
    | cs |
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   105
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   106
    cs := ChangeSet new name: self versionBaseLabel.
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   107
    self do:[:item|
3457
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   108
        (item versionBase notNil" and:[item versionBase isClassDefinitionChange or:[item versionBase isMethodCodeChange]]") ifTrue:[
2880
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   109
            cs add: item versionBase
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   110
        ]
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   111
    ].
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   112
    ^cs
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   113
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   114
    "Created: / 20-03-2012 / 13:31:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3457
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   115
    "Modified: / 13-11-2013 / 11:47:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2880
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   116
!
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   117
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   118
changesetMerged
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   119
    "Answers a changeset with containing all versionA changes"
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   120
    | cs |
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   121
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   122
    cs := ChangeSet new name: 'Merged'.
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   123
    self do:[:item|
3457
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   124
        (item versionMerged notNil "and:[item versionMerged isClassDefinitionChange or:[item versionMerged isMethodCodeChange]]") ifTrue:[
2880
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   125
            cs add: item versionMerged
3457
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   126
        ]
2880
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   127
    ].
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   128
    ^cs
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   129
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   130
    "Created: / 20-03-2012 / 13:32:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3457
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   131
    "Modified: / 13-11-2013 / 11:47:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   132
!
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   133
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   134
depth
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   135
    "Return the depth if diff component hierarchy, 0 if there is no nesting at all"
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   136
    ^0
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   137
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   138
    "Created: / 15-01-2013 / 11:26:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2406
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   139
!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   140
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   141
diffs
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   142
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   143
    ^#()
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   144
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   145
    "Created: / 10-11-2009 / 11:29:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   146
!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   147
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   148
flattened
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   149
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   150
    ^ChangeSetDiffSet new add: self
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   151
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   152
    "Created: / 05-12-2009 / 11:07:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   153
!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   154
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   155
name
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   156
    "raise an error: must be redefined in concrete subclass(es)"
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   157
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   158
    ^ self subclassResponsibility
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   159
!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   160
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   161
parent
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   162
    ^ parent
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   163
!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   164
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   165
parent:aDiffSet
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   166
    parent := aDiffSet.
2643
vrany
parents: 2424
diff changeset
   167
!
vrany
parents: 2424
diff changeset
   168
vrany
parents: 2424
diff changeset
   169
versionALabel
vrany
parents: 2424
diff changeset
   170
    ^ parent versionALabel
vrany
parents: 2424
diff changeset
   171
vrany
parents: 2424
diff changeset
   172
    "Created: / 09-11-2009 / 12:38:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
vrany
parents: 2424
diff changeset
   173
!
vrany
parents: 2424
diff changeset
   174
vrany
parents: 2424
diff changeset
   175
versionBLabel
vrany
parents: 2424
diff changeset
   176
    ^ parent versionBLabel
vrany
parents: 2424
diff changeset
   177
vrany
parents: 2424
diff changeset
   178
    "Created: / 09-11-2009 / 12:38:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2880
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   179
!
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   180
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   181
versionBaseLabel
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   182
    ^ parent versionBaseLabel
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   183
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   184
    "Created: / 20-03-2012 / 13:31:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2406
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   185
! !
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   186
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   187
!ChangeSetDiffComponent methodsFor:'change & update'!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   188
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   189
changed: aspect with: param
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   190
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   191
    (aspect = #resolution and:[parent notNil])
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   192
        ifTrue:[parent changed: aspect with: param].
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   193
    super changed: aspect with: param.
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   194
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   195
    "Created: / 24-11-2009 / 12:58:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   196
! !
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   197
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   198
!ChangeSetDiffComponent methodsFor:'enumerating'!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   199
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   200
do: aBlock
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   201
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   202
    self subclassResponsibility
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   203
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   204
    "Created: / 25-11-2009 / 10:22:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   205
! !
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   206
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   207
!ChangeSetDiffComponent methodsFor:'printing & storing'!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   208
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   209
printOn:aStream
4069
b9b7b32895f5 #OTHER by mawalch
mawalch
parents: 4017
diff changeset
   210
    "append a printed representation of the receiver to the argument, aStream"
2406
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   211
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   212
    super printOn:aStream.
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   213
    aStream nextPut:$(.
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   214
    self name printOn: aStream.
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   215
    aStream nextPut:$).
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   216
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   217
    "Modified: / 26-11-2009 / 16:25:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   218
! !
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   219
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   220
!ChangeSetDiffComponent methodsFor:'private'!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   221
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   222
flattenOn: stream
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   223
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   224
    ^stream nextPut: self
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   225
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   226
    "Created: / 05-12-2009 / 11:06:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3457
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   227
!
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   228
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   229
sort
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   230
    self sort: [:a :b|a printString < b printString ].
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   231
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   232
    "Created: / 17-01-2013 / 13:56:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   233
!
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   234
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   235
sort: sortBlock
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   236
    self subclassResponsibility
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   237
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   238
    "Created: / 17-01-2013 / 13:57:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2406
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   239
! !
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   240
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   241
!ChangeSetDiffComponent methodsFor:'testing'!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   242
3457
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   243
isConflict
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   244
    "Return true, if there is a conflict."
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   245
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   246
    ^ self subclassResponsibility
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   247
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   248
    "Modified (comment): / 01-08-2012 / 17:11:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   249
!
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   250
2406
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   251
isDiffItem
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   252
    ^ false
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   253
!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   254
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   255
isDiffSet
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   256
    ^ false
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   257
!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   258
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   259
isEmpty
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   260
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   261
    ^false
2880
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   262
!
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   263
3457
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   264
isForCopyrightMethod
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   265
    "Returns true, if this is an entry for #copyright method"
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   266
    ^self subclassResponsibility
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   267
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   268
    "Created: / 01-08-2012 / 16:37:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   269
!
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   270
2880
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   271
isForVersionMethod
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   272
    "Returns true, if this is an entry for version method"
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   273
    ^self subclassResponsibility
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   274
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   275
    "Created: / 18-04-2012 / 19:04:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   276
!
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   277
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   278
isMerged
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   279
    "raise an error: must be redefined in concrete subclass(es)"
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   280
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   281
    ^ self subclassResponsibility
2406
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   282
! !
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   283
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   284
!ChangeSetDiffComponent class methodsFor:'documentation'!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   285
4017
e816f4b73919 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 3457
diff changeset
   286
version_CVS
e816f4b73919 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 3457
diff changeset
   287
    ^ '$Header$'
e816f4b73919 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 3457
diff changeset
   288
!
e816f4b73919 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 3457
diff changeset
   289
2880
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   290
version_SVN
4017
e816f4b73919 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 3457
diff changeset
   291
    ^ '$Id$'
2406
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   292
! !
3457
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   293