DiffListUtility.st
author Jan Vrany <jan.vrany@fit.cvut.cz>
Fri, 08 Feb 2013 08:51:42 +0100
branchjv
changeset 12406 1fbd331e4489
parent 12401 4714b9640528
parent 12405 76f9a872362b
child 12431 9f0c59c742d5
permissions -rw-r--r--
Merged bf820ac5dfc8 and 76f9a872362b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
9346
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
     1
"
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
     2
 COPYRIGHT (c) 2009 by eXept Software AG
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
     3
              All Rights Reserved
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
     4
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
     5
 This software is furnished under a license and may be used
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
     6
 only in accordance with the terms of that license and with the
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
     7
 inclusion of the above copyright notice.   This software may not
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
     8
 be provided or otherwise made available to, or used by, any
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
     9
 other person.  No title to or ownership of the software is
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
    10
 hereby transferred.
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
    11
"
8933
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    12
"{ Package: 'stx:libtool' }"
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    13
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    14
Object subclass:#DiffListUtility
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    15
	instanceVariableNames:''
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    16
	classVariableNames:'DiffCommandTemplate'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    17
	poolDictionaries:''
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    18
	category:'Views-Text'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    19
!
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    20
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    21
!DiffListUtility class methodsFor:'documentation'!
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    22
9346
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
    23
copyright
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
    24
"
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
    25
 COPYRIGHT (c) 2009 by eXept Software AG
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
    26
              All Rights Reserved
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
    27
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
    28
 This software is furnished under a license and may be used
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
    29
 only in accordance with the terms of that license and with the
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
    30
 inclusion of the above copyright notice.   This software may not
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
    31
 be provided or otherwise made available to, or used by, any
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
    32
 other person.  No title to or ownership of the software is
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
    33
 hereby transferred.
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
    34
"
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
    35
!
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
    36
8933
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    37
documentation
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    38
"
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    39
    a utility to encapsulate access to the diff command
9494
bc6540ee3987 changed: #documentation
Claus Gittinger <cg@exept.de>
parents: 9346
diff changeset
    40
    (may also be a facade to a smalltalk-diff algorithm, eventually)
8933
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    41
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    42
    [author:]
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    43
        cg (cg@CG-PC)
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    44
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    45
    [instance variables:]
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    46
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    47
    [class variables:]
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    48
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    49
    [see also:]
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    50
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    51
"
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    52
! !
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    53
12405
76f9a872362b Merged 3efd83b86c07 and 1206aff1f11 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12314 12384
diff changeset
    54
8933
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    55
!DiffListUtility class methodsFor:'defaults'!
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    56
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    57
diffCommand
12358
a907159cf29e class: DiffListUtility
Claus Gittinger <cg@exept.de>
parents: 12082
diff changeset
    58
    "return the diff-command (with argument placeHolders).
a907159cf29e class: DiffListUtility
Claus Gittinger <cg@exept.de>
parents: 12082
diff changeset
    59
     By default, diff is used with windows, diff -b with Unix.
a907159cf29e class: DiffListUtility
Claus Gittinger <cg@exept.de>
parents: 12082
diff changeset
    60
     You can change this via the diffCommandTemplate"
8933
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    61
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    62
    DiffCommandTemplate notNil ifTrue:[ ^ DiffCommandTemplate ].
12358
a907159cf29e class: DiffListUtility
Claus Gittinger <cg@exept.de>
parents: 12082
diff changeset
    63
    ^ UserPreferences current externalDiffCommandTemplate
8933
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    64
!
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    65
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    66
diffCommandTemplate:aCommandTemplateString
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    67
    "set the diff-command template"
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    68
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    69
    DiffCommandTemplate := aCommandTemplateString
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    70
! !
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    71
12405
76f9a872362b Merged 3efd83b86c07 and 1206aff1f11 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12314 12384
diff changeset
    72
8933
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    73
!DiffListUtility class methodsFor:'private'!
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    74
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    75
saveForDiff:text as:filename
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    76
    |stream|
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    77
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    78
    [
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    79
        stream := filename writeStream.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    80
        text do:[:line |
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    81
            |lOut i|
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    82
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    83
            line notEmptyOrNil ifTrue:[
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    84
                lOut := line.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    85
                (line includes:Character return) ifTrue: [
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    86
                    (line endsWith:Character return) ifTrue:[
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    87
                        lOut := line copyWithoutLast:1.
12384
60b956e6eb5f class: DiffListUtility
Claus Gittinger <cg@exept.de>
parents: 12358
diff changeset
    88
                    ].
60b956e6eb5f class: DiffListUtility
Claus Gittinger <cg@exept.de>
parents: 12358
diff changeset
    89
                ] ifFalse:[
60b956e6eb5f class: DiffListUtility
Claus Gittinger <cg@exept.de>
parents: 12358
diff changeset
    90
                    (line endsWith:(String crlf)) ifTrue: [
60b956e6eb5f class: DiffListUtility
Claus Gittinger <cg@exept.de>
parents: 12358
diff changeset
    91
                        lOut := line copyWithoutLast:2.
8933
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    92
                    ]
12384
60b956e6eb5f class: DiffListUtility
Claus Gittinger <cg@exept.de>
parents: 12358
diff changeset
    93
"/                        i := line indexOf:Character return.
60b956e6eb5f class: DiffListUtility
Claus Gittinger <cg@exept.de>
parents: 12358
diff changeset
    94
"/                        (line at:i+1) == Character nl ifTrue:[
60b956e6eb5f class: DiffListUtility
Claus Gittinger <cg@exept.de>
parents: 12358
diff changeset
    95
"/                            "/ crnl endings
60b956e6eb5f class: DiffListUtility
Claus Gittinger <cg@exept.de>
parents: 12358
diff changeset
    96
"/                            lOut := line copyReplaceString:(String crlf) withString:(String lf).
60b956e6eb5f class: DiffListUtility
Claus Gittinger <cg@exept.de>
parents: 12358
diff changeset
    97
"/                        ] ifFalse:[
60b956e6eb5f class: DiffListUtility
Claus Gittinger <cg@exept.de>
parents: 12358
diff changeset
    98
"/                            "/ cr endings
60b956e6eb5f class: DiffListUtility
Claus Gittinger <cg@exept.de>
parents: 12358
diff changeset
    99
"/                            lOut := line copyReplaceAll:(Character return) with:Character nl.
60b956e6eb5f class: DiffListUtility
Claus Gittinger <cg@exept.de>
parents: 12358
diff changeset
   100
"/                        ].
60b956e6eb5f class: DiffListUtility
Claus Gittinger <cg@exept.de>
parents: 12358
diff changeset
   101
"/                    ]
8933
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   102
                ].
12082
f5d2e51d6665 class: DiffListUtility
Stefan Vogel <sv@exept.de>
parents: 9494
diff changeset
   103
                lOut isWideString ifTrue:[
8933
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   104
                    (lOut first = (Character value:16rFEFF)) ifTrue:[
12082
f5d2e51d6665 class: DiffListUtility
Stefan Vogel <sv@exept.de>
parents: 9494
diff changeset
   105
                        lOut := (lOut copyFrom:2) asSingleByteStringReplaceInvalidWith:(Character value:16rFF).
8933
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   106
                    ].
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   107
                ].
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   108
                stream nextPutAll:lOut.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   109
            ].
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   110
            stream cr
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   111
        ].
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   112
    ] ensure:[
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   113
        stream close.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   114
    ].
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   115
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   116
    "Modified: / 22-10-2008 / 17:52:52 / cg"
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   117
! !
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   118
12405
76f9a872362b Merged 3efd83b86c07 and 1206aff1f11 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12314 12384
diff changeset
   119
8933
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   120
!DiffListUtility class methodsFor:'utilities'!
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   121
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   122
diffListFor:text1 and:text2
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   123
    "execute DiffCommand to get a list of diffs."
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   124
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   125
    "
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   126
     The returned list is in raw-diff output format, such as:
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   127
        1 : '1c1'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   128
        2 : '< hello world'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   129
        3 : '---'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   130
        4 : '> Hello World'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   131
        5 : '2a3'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   132
        6 : '> line2'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   133
        7 : '4d4'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   134
        8 : '< line4'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   135
    "
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   136
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   137
    |tmpFile1 tmpFile2 stream line 
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   138
     diffList diffTemplate diffCmd|
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   139
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   140
    diffTemplate := self diffCommand.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   141
    diffTemplate isNil ifTrue:[
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   142
        "/ self warn:'no diff command available'.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   143
        ^ nil
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   144
    ].
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   145
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   146
    text1 = text2 ifTrue:[
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   147
        "no diff"
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   148
        ^ #()
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   149
    ].
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   150
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   151
    "
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   152
     save them texts in two temporary files ...
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   153
    "
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   154
    [
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   155
        self saveForDiff:text1 as:(tmpFile1 := Filename newTemporary).
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   156
        self saveForDiff:text2 as:(tmpFile2 := Filename newTemporary).
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   157
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   158
        "
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   159
         start diff on it ...
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   160
        "
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   161
        diffCmd := diffTemplate
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   162
                    bindWith:tmpFile1 asString
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   163
                    with:tmpFile2 asString.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   164
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   165
        stream := PipeStream readingFrom:diffCmd.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   166
        stream isNil ifTrue:[
12384
60b956e6eb5f class: DiffListUtility
Claus Gittinger <cg@exept.de>
parents: 12358
diff changeset
   167
            stream := PipeStream readingFrom:('support' asFilename / diffCmd).
8933
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   168
            stream isNil ifTrue:[
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   169
                self error:'cannot execute diff' mayProceed:true.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   170
                ^ nil.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   171
            ]
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   172
        ].
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   173
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   174
        diffList := OrderedCollection new.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   175
        (stream readWaitWithTimeout:10) ifTrue:[
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   176
            "/ timeout
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   177
            stream close.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   178
            self error:'cannot execute diff (timeout)' mayProceed:true.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   179
            ^ nil.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   180
        ].
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   181
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   182
        [stream atEnd] whileFalse:[
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   183
            line := stream nextLine.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   184
            line notNil ifTrue:[diffList add:line]
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   185
        ].
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   186
        stream close.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   187
    ] ensure:[
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   188
        tmpFile1 notNil ifTrue:[ tmpFile1 delete ].
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   189
        tmpFile2 notNil ifTrue:[ tmpFile2 delete ].
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   190
    ].
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   191
    ^ diffList
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   192
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   193
    "
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   194
     self 
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   195
        diffListFor:#(
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   196
                        'hello world'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   197
                        'line1'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   198
                        'line3'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   199
                        'line4'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   200
                    )
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   201
        and:        #(
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   202
                        'Hello World'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   203
                        'line1'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   204
                        'line2'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   205
                        'line3'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   206
                    )
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   207
    "
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   208
! !
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   209
12405
76f9a872362b Merged 3efd83b86c07 and 1206aff1f11 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12314 12384
diff changeset
   210
8933
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   211
!DiffListUtility class methodsFor:'documentation'!
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   212
12384
60b956e6eb5f class: DiffListUtility
Claus Gittinger <cg@exept.de>
parents: 12358
diff changeset
   213
version
60b956e6eb5f class: DiffListUtility
Claus Gittinger <cg@exept.de>
parents: 12358
diff changeset
   214
    ^ '$Header: /cvs/stx/stx/libtool/DiffListUtility.st,v 1.6 2013-02-01 15:13:18 cg Exp $'
60b956e6eb5f class: DiffListUtility
Claus Gittinger <cg@exept.de>
parents: 12358
diff changeset
   215
!
60b956e6eb5f class: DiffListUtility
Claus Gittinger <cg@exept.de>
parents: 12358
diff changeset
   216
8933
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   217
version_CVS
12384
60b956e6eb5f class: DiffListUtility
Claus Gittinger <cg@exept.de>
parents: 12358
diff changeset
   218
    ^ '$Header: /cvs/stx/stx/libtool/DiffListUtility.st,v 1.6 2013-02-01 15:13:18 cg Exp $'
12128
a7ff7d66ee85 Improvements in LintHighlighter, few fixes
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   219
!
a7ff7d66ee85 Improvements in LintHighlighter, few fixes
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   220
a7ff7d66ee85 Improvements in LintHighlighter, few fixes
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   221
version_SVN
12314
0cbf76168690 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   222
    ^ '$Id: DiffListUtility.st 8083 2013-01-14 11:48:37Z vranyj1 $'
8933
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   223
! !
12358
a907159cf29e class: DiffListUtility
Claus Gittinger <cg@exept.de>
parents: 12082
diff changeset
   224