DiffListUtility.st
author Claus Gittinger <cg@exept.de>
Mon, 14 Feb 2011 18:16:36 +0100
branchinitialV
changeset 9777 82d9e1236f1f
parent 9494 bc6540ee3987
child 12082 f5d2e51d6665
child 12123 4bde08cebd48
permissions -rw-r--r--
checkin from stx browser
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
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    54
!DiffListUtility class methodsFor:'defaults'!
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    55
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    56
diffCommand
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    57
    "return the diff-command (with argument placeHolders)"
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    58
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    59
    DiffCommandTemplate notNil ifTrue:[ ^ DiffCommandTemplate ].
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    60
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    61
    OperatingSystem isMSDOSlike ifTrue:[
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    62
        (OperatingSystem canExecuteCommand:'diff') ifFalse:[
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    63
            'DiffTextView [warning]: no diff command found (please download and unzip "UnxUtils.zip" from "unxutils.sourceforge.net")' infoPrintCR.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    64
            ^ nil
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    65
        ].
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    66
        ^ 'diff %1 %2'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    67
    ].
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    68
    ^ 'diff -b %1 %2'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    69
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    70
    "Modified: / 30.1.1998 / 12:12:49 / cg"
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    71
!
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    72
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    73
diffCommandTemplate:aCommandTemplateString
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    74
    "set the diff-command template"
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    75
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    76
    DiffCommandTemplate := aCommandTemplateString
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
!DiffListUtility class methodsFor:'private'!
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    80
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    81
saveForDiff:text as:filename
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    82
    |stream|
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    83
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    84
    [
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    85
        stream := filename writeStream.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    86
        text do:[:line |
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    87
            |lOut i|
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    88
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    89
            line notEmptyOrNil ifTrue:[
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    90
                lOut := line.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    91
                (line includes:Character return) ifTrue: [
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    92
                    (line endsWith:Character return) ifTrue:[
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    93
                        lOut := line copyWithoutLast:1.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    94
                    ] ifFalse:[
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    95
                        i := line indexOf:Character return.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    96
                        (line at:i+1) == Character nl ifTrue:[
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    97
                            "/ crnl endings
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    98
                            lOut := line copyReplaceString:(String crlf) withString:(String lf).
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    99
                        ] ifFalse:[
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   100
                            "/ cr endings
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   101
                            lOut := line copyReplaceAll:Character return with:Character nl.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   102
                        ].
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   103
                    ]
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   104
                ].
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   105
                lOut bitsPerCharacter > 8 ifTrue:[
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   106
                    (lOut first = (Character value:16rFEFF)) ifTrue:[
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   107
                        lOut := (lOut copyFrom:2) asSingleByteStringIfPossible.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   108
                    ].
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   109
                    lOut bitsPerCharacter > 8 ifTrue:[ 
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   110
                        lOut := lOut collect:[:ch | ch bitsPerCharacter > 8 
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   111
                                                        ifTrue:[ Character value:16rFF ]
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   112
                                                        ifFalse:[ ch ]].
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   113
                        lOut := lOut asSingleByteStringIfPossible.
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
                stream nextPutAll:lOut.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   117
            ].
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   118
            stream cr
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   119
        ].
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   120
    ] ensure:[
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   121
        stream close.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   122
    ].
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   123
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   124
    "Modified: / 22-10-2008 / 17:52:52 / cg"
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   125
! !
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   126
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   127
!DiffListUtility class methodsFor:'utilities'!
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   128
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   129
diffListFor:text1 and:text2
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   130
    "execute DiffCommand to get a list of diffs."
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   131
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   132
    "
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   133
     The returned list is in raw-diff output format, such as:
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   134
        1 : '1c1'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   135
        2 : '< hello world'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   136
        3 : '---'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   137
        4 : '> Hello World'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   138
        5 : '2a3'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   139
        6 : '> line2'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   140
        7 : '4d4'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   141
        8 : '< line4'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   142
    "
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   143
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   144
    |tmpFile1 tmpFile2 stream line 
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   145
     diffList diffTemplate diffCmd|
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   146
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   147
    diffTemplate := self diffCommand.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   148
    diffTemplate isNil ifTrue:[
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   149
        "/ self warn:'no diff command available'.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   150
        ^ nil
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   151
    ].
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   152
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   153
    text1 = text2 ifTrue:[
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   154
        "no diff"
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   155
        ^ #()
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   156
    ].
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
     save them texts in two temporary files ...
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   160
    "
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   161
    [
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   162
        self saveForDiff:text1 as:(tmpFile1 := Filename newTemporary).
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   163
        self saveForDiff:text2 as:(tmpFile2 := Filename newTemporary).
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   164
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   165
        "
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   166
         start diff on it ...
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   167
        "
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   168
        diffCmd := diffTemplate
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   169
                    bindWith:tmpFile1 asString
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   170
                    with:tmpFile2 asString.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   171
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   172
        stream := PipeStream readingFrom:diffCmd.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   173
        stream isNil ifTrue:[
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   174
            stream := PipeStream readingFrom:('support' , Filename separator , diffCmd).
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   175
            stream isNil ifTrue:[
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   176
                self error:'cannot execute diff' mayProceed:true.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   177
                ^ nil.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   178
            ]
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   179
        ].
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   180
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   181
        diffList := OrderedCollection new.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   182
        (stream readWaitWithTimeout:10) ifTrue:[
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   183
            "/ timeout
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   184
            stream close.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   185
            self error:'cannot execute diff (timeout)' mayProceed:true.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   186
            ^ nil.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   187
        ].
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   188
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   189
        [stream atEnd] whileFalse:[
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   190
            line := stream nextLine.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   191
            line notNil ifTrue:[diffList add:line]
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   192
        ].
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   193
        stream close.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   194
    ] ensure:[
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   195
        tmpFile1 notNil ifTrue:[ tmpFile1 delete ].
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   196
        tmpFile2 notNil ifTrue:[ tmpFile2 delete ].
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   197
    ].
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   198
    ^ diffList
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   199
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   200
    "
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   201
     self 
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   202
        diffListFor:#(
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   203
                        'hello world'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   204
                        'line1'
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
                        'line4'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   207
                    )
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   208
        and:        #(
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   209
                        'Hello World'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   210
                        'line1'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   211
                        'line2'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   212
                        'line3'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   213
                    )
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   214
    "
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   215
! !
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   216
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   217
!DiffListUtility class methodsFor:'documentation'!
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   218
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   219
version_CVS
9494
bc6540ee3987 changed: #documentation
Claus Gittinger <cg@exept.de>
parents: 9346
diff changeset
   220
    ^ '$Header: /cvs/stx/stx/libtool/DiffListUtility.st,v 1.3 2010-05-20 09:38:12 cg Exp $'
8933
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   221
! !