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