equal
deleted
inserted
replaced
52 ! ! |
52 ! ! |
53 |
53 |
54 !DiffListUtility class methodsFor:'defaults'! |
54 !DiffListUtility class methodsFor:'defaults'! |
55 |
55 |
56 diffCommand |
56 diffCommand |
57 "return the diff-command (with argument placeHolders)" |
57 "return the diff-command (with argument placeHolders). |
|
58 By default, diff is used with windows, diff -b with Unix. |
|
59 You can change this via the diffCommandTemplate" |
58 |
60 |
59 DiffCommandTemplate notNil ifTrue:[ ^ DiffCommandTemplate ]. |
61 DiffCommandTemplate notNil ifTrue:[ ^ DiffCommandTemplate ]. |
60 |
62 |
61 OperatingSystem isMSDOSlike ifTrue:[ |
63 OperatingSystem isMSDOSlike ifTrue:[ |
62 (OperatingSystem canExecuteCommand:'diff') ifFalse:[ |
64 (OperatingSystem canExecuteCommand:'diff') ifFalse:[ |
63 'DiffTextView [warning]: no diff command found (please download and unzip "UnxUtils.zip" from "unxutils.sourceforge.net")' infoPrintCR. |
65 'DiffTextView [warning]: no diff command found (please download and unzip "UnxUtils.zip" from "unxutils.sourceforge.net")' infoPrintCR. |
64 ^ nil |
66 ]. |
65 ]. |
67 ]. |
66 ^ 'diff %1 %2' |
68 ^ UserPreferences current externalDiffCommandTemplate |
67 ]. |
|
68 ^ 'diff -b %1 %2' |
|
69 |
|
70 "Modified: / 30.1.1998 / 12:12:49 / cg" |
|
71 ! |
69 ! |
72 |
70 |
73 diffCommandTemplate:aCommandTemplateString |
71 diffCommandTemplate:aCommandTemplateString |
74 "set the diff-command template" |
72 "set the diff-command template" |
75 |
73 |
209 ! ! |
207 ! ! |
210 |
208 |
211 !DiffListUtility class methodsFor:'documentation'! |
209 !DiffListUtility class methodsFor:'documentation'! |
212 |
210 |
213 version_CVS |
211 version_CVS |
214 ^ '$Header: /cvs/stx/stx/libtool/DiffListUtility.st,v 1.4 2012-12-12 23:00:48 stefan Exp $' |
212 ^ '$Header: /cvs/stx/stx/libtool/DiffListUtility.st,v 1.5 2013-02-01 13:44:14 cg Exp $' |
215 ! ! |
213 ! ! |
|
214 |