DiffListUtility.st
author Claus Gittinger <cg@exept.de>
Mon, 20 Jan 2020 21:02:47 +0100
changeset 19422 c6ca1c3e0fd7
parent 18466 326bcf80428f
permissions -rw-r--r--
#REFACTORING by exept class: MultiViewToolApplication added: #askForFile:default:forSave:thenDo: changed: #askForFile:default:thenDo: #askForFile:thenDo: #menuSaveAllAs #menuSaveAs
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
18466
326bcf80428f #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 18140
diff changeset
     1
"{ Encoding: utf8 }"
326bcf80428f #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 18140
diff changeset
     2
9346
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
     3
"
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
     4
 COPYRIGHT (c) 2009 by eXept Software AG
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
     5
              All Rights Reserved
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
     6
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
     7
 This software is furnished under a license and may be used
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
     8
 only in accordance with the terms of that license and with the
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
     9
 inclusion of the above copyright notice.   This software may not
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
    10
 be provided or otherwise made available to, or used by, any
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
    11
 other person.  No title to or ownership of the software is
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
    12
 hereby transferred.
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
    13
"
8933
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    14
"{ Package: 'stx:libtool' }"
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    15
18025
b805418f6bdf #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 14334
diff changeset
    16
"{ NameSpace: Smalltalk }"
b805418f6bdf #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 14334
diff changeset
    17
8933
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    18
Object subclass:#DiffListUtility
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    19
	instanceVariableNames:''
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    20
	classVariableNames:'DiffCommandTemplate'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    21
	poolDictionaries:''
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    22
	category:'Views-Text'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    23
!
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    24
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    25
!DiffListUtility class methodsFor:'documentation'!
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    26
9346
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
    27
copyright
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
    28
"
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
    29
 COPYRIGHT (c) 2009 by eXept Software AG
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
    30
              All Rights Reserved
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
    31
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
    32
 This software is furnished under a license and may be used
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
    33
 only in accordance with the terms of that license and with the
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
    34
 inclusion of the above copyright notice.   This software may not
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
    35
 be provided or otherwise made available to, or used by, any
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
    36
 other person.  No title to or ownership of the software is
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
    37
 hereby transferred.
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
    38
"
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
    39
!
4a0b3584f5aa added: #copyright
Claus Gittinger <cg@exept.de>
parents: 8933
diff changeset
    40
8933
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    41
documentation
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    42
"
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    43
    a utility to encapsulate access to the diff command
9494
bc6540ee3987 changed: #documentation
Claus Gittinger <cg@exept.de>
parents: 9346
diff changeset
    44
    (may also be a facade to a smalltalk-diff algorithm, eventually)
8933
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    45
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    46
    [author:]
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    47
        cg (cg@CG-PC)
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    48
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    49
    [instance variables:]
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    50
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    51
    [class variables:]
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    52
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    53
    [see also:]
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    54
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    55
"
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    56
! !
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    57
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    58
!DiffListUtility class methodsFor:'defaults'!
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    59
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    60
diffCommand
12358
a907159cf29e class: DiffListUtility
Claus Gittinger <cg@exept.de>
parents: 12082
diff changeset
    61
    "return the diff-command (with argument placeHolders).
a907159cf29e class: DiffListUtility
Claus Gittinger <cg@exept.de>
parents: 12082
diff changeset
    62
     By default, diff is used with windows, diff -b with Unix.
a907159cf29e class: DiffListUtility
Claus Gittinger <cg@exept.de>
parents: 12082
diff changeset
    63
     You can change this via the diffCommandTemplate"
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
    DiffCommandTemplate notNil ifTrue:[ ^ DiffCommandTemplate ].
12358
a907159cf29e class: DiffListUtility
Claus Gittinger <cg@exept.de>
parents: 12082
diff changeset
    66
    ^ UserPreferences current externalDiffCommandTemplate
8933
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    67
!
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
    "set the diff-command template"
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    71
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    72
    DiffCommandTemplate := aCommandTemplateString
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    73
! !
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    74
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    75
!DiffListUtility class methodsFor:'private'!
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    76
18466
326bcf80428f #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 18140
diff changeset
    77
saveForDiff:text on:stream
8933
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    78
    [
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    79
        text do:[:line |
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    80
            |lOut i|
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    81
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    82
            line notEmptyOrNil ifTrue:[
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    83
                lOut := line.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    84
                (line includes:Character return) ifTrue: [
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    85
                    (line endsWith:Character return) ifTrue:[
12717
dcde1443a6bb Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 12384
diff changeset
    86
                        lOut := line copyButLast:1.
12384
60b956e6eb5f class: DiffListUtility
Claus Gittinger <cg@exept.de>
parents: 12358
diff changeset
    87
                    ].
60b956e6eb5f class: DiffListUtility
Claus Gittinger <cg@exept.de>
parents: 12358
diff changeset
    88
                ] ifFalse:[
60b956e6eb5f class: DiffListUtility
Claus Gittinger <cg@exept.de>
parents: 12358
diff changeset
    89
                    (line endsWith:(String crlf)) ifTrue: [
12717
dcde1443a6bb Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 12384
diff changeset
    90
                        lOut := line copyButLast:2.
8933
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    91
                    ]
12384
60b956e6eb5f class: DiffListUtility
Claus Gittinger <cg@exept.de>
parents: 12358
diff changeset
    92
"/                        i := line indexOf:Character return.
60b956e6eb5f class: DiffListUtility
Claus Gittinger <cg@exept.de>
parents: 12358
diff changeset
    93
"/                        (line at:i+1) == Character nl ifTrue:[
60b956e6eb5f class: DiffListUtility
Claus Gittinger <cg@exept.de>
parents: 12358
diff changeset
    94
"/                            "/ crnl endings
60b956e6eb5f class: DiffListUtility
Claus Gittinger <cg@exept.de>
parents: 12358
diff changeset
    95
"/                            lOut := line copyReplaceString:(String crlf) withString:(String lf).
60b956e6eb5f class: DiffListUtility
Claus Gittinger <cg@exept.de>
parents: 12358
diff changeset
    96
"/                        ] ifFalse:[
60b956e6eb5f class: DiffListUtility
Claus Gittinger <cg@exept.de>
parents: 12358
diff changeset
    97
"/                            "/ cr endings
60b956e6eb5f class: DiffListUtility
Claus Gittinger <cg@exept.de>
parents: 12358
diff changeset
    98
"/                            lOut := line copyReplaceAll:(Character return) with:Character nl.
60b956e6eb5f class: DiffListUtility
Claus Gittinger <cg@exept.de>
parents: 12358
diff changeset
    99
"/                        ].
60b956e6eb5f class: DiffListUtility
Claus Gittinger <cg@exept.de>
parents: 12358
diff changeset
   100
"/                    ]
8933
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   101
                ].
12082
f5d2e51d6665 class: DiffListUtility
Stefan Vogel <sv@exept.de>
parents: 9494
diff changeset
   102
                lOut isWideString ifTrue:[
8933
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   103
                    (lOut first = (Character value:16rFEFF)) ifTrue:[
12082
f5d2e51d6665 class: DiffListUtility
Stefan Vogel <sv@exept.de>
parents: 9494
diff changeset
   104
                        lOut := (lOut copyFrom:2) asSingleByteStringReplaceInvalidWith:(Character value:16rFF).
8933
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   105
                    ].
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   106
                ].
13340
7a295f0992df class: DiffListUtility
Stefan Vogel <sv@exept.de>
parents: 12717
diff changeset
   107
                lOut printOn:stream.
8933
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   108
            ].
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   109
            stream cr
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   110
        ].
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   111
    ] ensure:[
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   112
        stream close.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   113
    ].
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   114
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   115
    "Modified: / 22-10-2008 / 17:52:52 / cg"
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   116
! !
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   117
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   118
!DiffListUtility class methodsFor:'utilities'!
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   119
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   120
diffListFor:text1 and:text2
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   121
    "execute DiffCommand to get a list of diffs."
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
     The returned list is in raw-diff output format, such as:
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   125
        1 : '1c1'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   126
        2 : '< hello world'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   127
        3 : '---'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   128
        4 : '> Hello World'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   129
        5 : '2a3'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   130
        6 : '> line2'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   131
        7 : '4d4'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   132
        8 : '< line4'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   133
    "
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   134
18466
326bcf80428f #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 18140
diff changeset
   135
    |stream line 
326bcf80428f #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 18140
diff changeset
   136
     diffList diffTemplate diffCmd tmpStream1 tmpStream2|
8933
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   137
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   138
    diffTemplate := self diffCommand.
14334
e54a95bfa77b class: DiffListUtility
Stefan Vogel <sv@exept.de>
parents: 13340
diff changeset
   139
    diffTemplate isEmptyOrNil ifTrue:[
8933
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   140
        "/ self warn:'no diff command available'.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   141
        ^ nil
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
    text1 = text2 ifTrue:[
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   145
        "no diff"
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   146
        ^ #()
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   147
    ].
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
     save them texts in two temporary files ...
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   151
    "
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   152
    [
18466
326bcf80428f #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 18140
diff changeset
   153
        self saveForDiff:text1 on:(tmpStream1 := FileStream newTemporary).
326bcf80428f #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 18140
diff changeset
   154
        self saveForDiff:text2 on:(tmpStream2 := FileStream newTemporary).
326bcf80428f #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 18140
diff changeset
   155
        tmpStream1 close.   
326bcf80428f #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 18140
diff changeset
   156
        tmpStream2 close.
8933
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
18466
326bcf80428f #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 18140
diff changeset
   162
                    bindWith:tmpStream1 pathName
326bcf80428f #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 18140
diff changeset
   163
                    with:tmpStream2 pathName.
8933
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:[
14334
e54a95bfa77b class: DiffListUtility
Stefan Vogel <sv@exept.de>
parents: 13340
diff changeset
   167
            "this code is not reached in win32.
e54a95bfa77b class: DiffListUtility
Stefan Vogel <sv@exept.de>
parents: 13340
diff changeset
   168
             PipeStream starts a cmd.exe, which is always successful
e54a95bfa77b class: DiffListUtility
Stefan Vogel <sv@exept.de>
parents: 13340
diff changeset
   169
             at the first place and fails later"
18466
326bcf80428f #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 18140
diff changeset
   170
            stream := PipeStream readingFrom:('support' asFilename constructString:diffCmd).
8933
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   171
            stream isNil ifTrue:[
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   172
                self error:'cannot execute diff' mayProceed:true.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   173
                ^ nil.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   174
            ]
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   175
        ].
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   176
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   177
        diffList := OrderedCollection new.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   178
        (stream readWaitWithTimeout:10) ifTrue:[
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   179
            "/ timeout
18140
1e791dffc7c1 #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 18025
diff changeset
   180
            stream abortAndClose.
1e791dffc7c1 #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 18025
diff changeset
   181
            self error:'cannot execute diff (timeout)' mayProceed:true.
8933
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   182
            ^ nil.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   183
        ].
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   184
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   185
        [stream atEnd] whileFalse:[
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   186
            line := stream nextLine.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   187
            line notNil ifTrue:[diffList add:line]
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 close.
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   190
    ] ensure:[
18466
326bcf80428f #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 18140
diff changeset
   191
        tmpStream1 notNil ifTrue:[ tmpStream1 fileName remove ].
326bcf80428f #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 18140
diff changeset
   192
        tmpStream2 notNil ifTrue:[ tmpStream2 fileName remove ].
8933
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   193
    ].
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   194
    ^ diffList
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   195
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   196
    "
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   197
     self 
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   198
        diffListFor:#(
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   199
                        'hello world'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   200
                        'line1'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   201
                        'line3'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   202
                        'line4'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   203
                    )
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   204
        and:        #(
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   205
                        'Hello World'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   206
                        'line1'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   207
                        'line2'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   208
                        'line3'
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   209
                    )
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   210
    "
18140
1e791dffc7c1 #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 18025
diff changeset
   211
1e791dffc7c1 #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 18025
diff changeset
   212
    "Modified: / 22-05-2018 / 18:18:34 / Stefan Vogel"
8933
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
!DiffListUtility class methodsFor:'documentation'!
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   216
12384
60b956e6eb5f class: DiffListUtility
Claus Gittinger <cg@exept.de>
parents: 12358
diff changeset
   217
version
18025
b805418f6bdf #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 14334
diff changeset
   218
    ^ '$Header$'
12384
60b956e6eb5f class: DiffListUtility
Claus Gittinger <cg@exept.de>
parents: 12358
diff changeset
   219
!
60b956e6eb5f class: DiffListUtility
Claus Gittinger <cg@exept.de>
parents: 12358
diff changeset
   220
8933
94e708e9f812 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   221
version_CVS
18025
b805418f6bdf #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 14334
diff changeset
   222
    ^ '$Header$'
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