641
|
1 |
"
|
|
2 |
Copyright (c) 2007-2010 Jan Vrany
|
|
3 |
Copyright (c) 2009-2010 eXept Software AG
|
|
4 |
|
|
5 |
Permission is hereby granted, free of charge, to any person
|
|
6 |
obtaining a copy of this software and associated documentation
|
|
7 |
files (the 'Software'), to deal in the Software without
|
|
8 |
restriction, including without limitation the rights to use,
|
|
9 |
copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
10 |
copies of the Software, and to permit persons to whom the
|
|
11 |
Software is furnished to do so, subject to the following
|
|
12 |
conditions:
|
|
13 |
|
|
14 |
The above copyright notice and this permission notice shall be
|
|
15 |
included in all copies or substantial portions of the Software.
|
|
16 |
|
|
17 |
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
|
|
18 |
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
|
19 |
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
20 |
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
|
21 |
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
|
22 |
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
23 |
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
24 |
OTHER DEALINGS IN THE SOFTWARE.
|
|
25 |
"
|
|
26 |
"{ Package: 'stx:libsvn' }"
|
|
27 |
|
|
28 |
"{ NameSpace: SVN }"
|
|
29 |
|
|
30 |
ExternalMergeTool subclass:#KDiff3
|
|
31 |
instanceVariableNames:''
|
|
32 |
classVariableNames:''
|
|
33 |
poolDictionaries:''
|
|
34 |
category:'SVN-Diff-External'
|
|
35 |
!
|
|
36 |
|
|
37 |
!KDiff3 class methodsFor:'documentation'!
|
|
38 |
|
|
39 |
copyright
|
|
40 |
"
|
|
41 |
Copyright (c) 2007-2010 Jan Vrany
|
|
42 |
Copyright (c) 2009-2010 eXept Software AG
|
|
43 |
|
|
44 |
Permission is hereby granted, free of charge, to any person
|
|
45 |
obtaining a copy of this software and associated documentation
|
|
46 |
files (the 'Software'), to deal in the Software without
|
|
47 |
restriction, including without limitation the rights to use,
|
|
48 |
copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
49 |
copies of the Software, and to permit persons to whom the
|
|
50 |
Software is furnished to do so, subject to the following
|
|
51 |
conditions:
|
|
52 |
|
|
53 |
The above copyright notice and this permission notice shall be
|
|
54 |
included in all copies or substantial portions of the Software.
|
|
55 |
|
|
56 |
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
|
|
57 |
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
|
58 |
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
59 |
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
|
60 |
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
|
61 |
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
62 |
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
63 |
OTHER DEALINGS IN THE SOFTWARE.
|
|
64 |
|
|
65 |
"
|
|
66 |
! !
|
|
67 |
|
|
68 |
!KDiff3 class methodsFor:'testing'!
|
|
69 |
|
|
70 |
isAvailable
|
|
71 |
|
|
72 |
^OperatingSystem canExecuteCommand: 'kdiff3'
|
|
73 |
! !
|
|
74 |
|
|
75 |
!KDiff3 methodsFor:'private'!
|
|
76 |
|
|
77 |
runExternalProgram
|
|
78 |
|
|
79 |
OperatingSystem
|
|
80 |
executeCommand:
|
|
81 |
(String streamContents:
|
|
82 |
[:cmd|
|
|
83 |
cmd
|
|
84 |
nextPutAll: 'kdiff3'; space;
|
|
85 |
nextPutAll: '-m'; space;
|
|
86 |
nextPutAll: '-o merged.txt'; space;
|
|
87 |
nextPutAll: '-L'; space; nextPut:$'; nextPutAll: self labelA; nextPut:$'; space;
|
|
88 |
nextPutAll: '-L'; space; nextPut:$'; nextPutAll: self labelB; nextPut:$'; space;
|
|
89 |
nextPutAll: '-L'; space; nextPut:$'; nextPutAll: self labelC; nextPut:$'; space;
|
|
90 |
nextPutAll: 'a.txt'; space;
|
|
91 |
nextPutAll: 'b.txt'; space;
|
|
92 |
nextPutAll: 'c.txt'])
|
|
93 |
inDirectory: tempDir pathName
|
|
94 |
! !
|
|
95 |
|
|
96 |
!KDiff3 class methodsFor:'documentation'!
|
|
97 |
|
|
98 |
version
|
|
99 |
^ '$Header$'
|
|
100 |
!
|
|
101 |
|
|
102 |
version_CVS
|
|
103 |
^ '$Header$'
|
|
104 |
!
|
|
105 |
|
|
106 |
version_SVN
|
|
107 |
^ '§Id: SVN__KDiff3.st 350 2011-07-07 18:42:56Z vranyj1 §'
|
|
108 |
! !
|