Mercurial Mercurial > hg > stx-libtool / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
preexpand tabs in contents before sending it to diff
authorClaus Gittinger <cg@exept.de>
Wed, 05 May 1999 16:21:19 +0200
changeset 2140 1614b0a4dcd3
parent 2139 a18b0d2a958f
child 2141 1758f387ebe7
preexpand tabs in contents before sending it to diff
FBrowser.st file | annotate | diff | comparison | revisions
FileBrowser.st file | annotate | diff | comparison | revisions 
--- a/FBrowser.st	Tue May 04 20:56:20 1999 +0200
+++ b/FBrowser.st	Wed May 05 16:21:19 1999 +0200
@@ -2699,11 +2699,11 @@
     (sel size > 0
     and:[lastFileDiffDirectory notNil
     and:[lastFileDiffDirectory asFilename isDirectory]]) ifTrue:[
-	f := lastFileDiffDirectory asFilename construct:sel.
-	(f exists
-	and:[f isReadable]) ifTrue:[
-	    orgName1 := f name
-	]
+        f := lastFileDiffDirectory asFilename construct:sel.
+        (f exists
+        and:[f isReadable]) ifTrue:[
+            orgName1 := f name
+        ]
     ].
 
     name1 := orgName1 asValue.
@@ -2721,62 +2721,64 @@
     box showAtPointer.
 
     box accepted ifTrue:[
-	name1 := name1 value.
-	(name1 isNil or:[name1 isEmpty]) ifTrue:[
-	    text1 := subView contents.
-	    name1 := nil.
-	    l1 := 'browser contents'
-	] ifFalse:[
-	    name1 := currentDirectory filenameFor:name1.
-	    name1 isReadable ifFalse:[
-		nm := name1.
-		name1 exists ifFalse:[
-		    err := '%1 does not exist'.
-		] ifTrue:[
-		    err := '%1 is not readable'
-		].
-	    ].
-	    l1 := name1 pathName
-	].
-
-	name2 := currentDirectory filenameFor:name2 value.
-	err isNil ifTrue:[
-	    name2 isReadable ifFalse:[
-		nm := name2.
-		name2 exists ifFalse:[
-		    err := '%1 does not exist'.
-		] ifTrue:[
-		    err := '%1 is not readable'
-		].
-	    ].
-	].
-	err notNil ifTrue:[
-	    self warn:(resources string:err with:nm pathName).
-	    ^ self
-	].
-
-	self withWaitCursorDo:[
-	    (name1 notNil and:[name1 name ~= orgName1]) ifTrue:[
-		lastFileDiffDirectory := name1 directoryName
-	    ].
-	    name1 notNil ifTrue:[
-		text1 := name1 contents.
-	    ].
-	    text2 := name2 contents.
-	    text1 = text2 ifTrue:[
-		self information:'same contents'
-	    ] ifFalse:[
-		d := DiffTextView 
-			openOn:text1 label:l1
-			and:text2 label:name2 pathName.
-		d label:'file differences'.
-	    ]
-	]
+        name1 := name1 value.
+        (name1 isNil or:[name1 isEmpty]) ifTrue:[
+"/            text1 := subView contents.
+            text1 := subView list asStringCollection withTabs.
+            text1 := text1 collect:[:l | l isNil ifTrue:[' '] ifFalse:[l]].
+            name1 := nil.
+            l1 := 'browser contents'
+        ] ifFalse:[
+            name1 := currentDirectory filenameFor:name1.
+            name1 isReadable ifFalse:[
+                nm := name1.
+                name1 exists ifFalse:[
+                    err := '%1 does not exist'.
+                ] ifTrue:[
+                    err := '%1 is not readable'
+                ].
+            ].
+            l1 := name1 pathName
+        ].
+
+        name2 := currentDirectory filenameFor:name2 value.
+        err isNil ifTrue:[
+            name2 isReadable ifFalse:[
+                nm := name2.
+                name2 exists ifFalse:[
+                    err := '%1 does not exist'.
+                ] ifTrue:[
+                    err := '%1 is not readable'
+                ].
+            ].
+        ].
+        err notNil ifTrue:[
+            self warn:(resources string:err with:nm pathName).
+            ^ self
+        ].
+
+        self withWaitCursorDo:[
+            (name1 notNil and:[name1 name ~= orgName1]) ifTrue:[
+                lastFileDiffDirectory := name1 directoryName
+            ].
+            name1 notNil ifTrue:[
+                text1 := name1 contents.
+            ].
+            text2 := name2 contents.
+            text1 = text2 ifTrue:[
+                self information:'same contents'
+            ] ifFalse:[
+                d := DiffTextView 
+                        openOn:text1 label:l1
+                        and:text2 label:name2 pathName.
+                d label:'file differences'.
+            ]
+        ]
     ].
 
     "Created: / 7.12.1995 / 20:33:58 / cg"
     "Modified: / 18.9.1997 / 17:31:46 / stefan"
-    "Modified: / 25.8.1998 / 21:11:46 / cg"
+    "Modified: / 5.5.1999 / 16:04:10 / cg"
 !
 
 openEditor
@@ -6600,5 +6602,5 @@
 !FileBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Attic/FBrowser.st,v 1.316 1999-05-04 18:56:20 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Attic/FBrowser.st,v 1.317 1999-05-05 14:21:19 cg Exp $'
 ! !
--- a/FileBrowser.st	Tue May 04 20:56:20 1999 +0200
+++ b/FileBrowser.st	Wed May 05 16:21:19 1999 +0200
@@ -2699,11 +2699,11 @@
     (sel size > 0
     and:[lastFileDiffDirectory notNil
     and:[lastFileDiffDirectory asFilename isDirectory]]) ifTrue:[
-	f := lastFileDiffDirectory asFilename construct:sel.
-	(f exists
-	and:[f isReadable]) ifTrue:[
-	    orgName1 := f name
-	]
+        f := lastFileDiffDirectory asFilename construct:sel.
+        (f exists
+        and:[f isReadable]) ifTrue:[
+            orgName1 := f name
+        ]
     ].
 
     name1 := orgName1 asValue.
@@ -2721,62 +2721,64 @@
     box showAtPointer.
 
     box accepted ifTrue:[
-	name1 := name1 value.
-	(name1 isNil or:[name1 isEmpty]) ifTrue:[
-	    text1 := subView contents.
-	    name1 := nil.
-	    l1 := 'browser contents'
-	] ifFalse:[
-	    name1 := currentDirectory filenameFor:name1.
-	    name1 isReadable ifFalse:[
-		nm := name1.
-		name1 exists ifFalse:[
-		    err := '%1 does not exist'.
-		] ifTrue:[
-		    err := '%1 is not readable'
-		].
-	    ].
-	    l1 := name1 pathName
-	].
-
-	name2 := currentDirectory filenameFor:name2 value.
-	err isNil ifTrue:[
-	    name2 isReadable ifFalse:[
-		nm := name2.
-		name2 exists ifFalse:[
-		    err := '%1 does not exist'.
-		] ifTrue:[
-		    err := '%1 is not readable'
-		].
-	    ].
-	].
-	err notNil ifTrue:[
-	    self warn:(resources string:err with:nm pathName).
-	    ^ self
-	].
-
-	self withWaitCursorDo:[
-	    (name1 notNil and:[name1 name ~= orgName1]) ifTrue:[
-		lastFileDiffDirectory := name1 directoryName
-	    ].
-	    name1 notNil ifTrue:[
-		text1 := name1 contents.
-	    ].
-	    text2 := name2 contents.
-	    text1 = text2 ifTrue:[
-		self information:'same contents'
-	    ] ifFalse:[
-		d := DiffTextView 
-			openOn:text1 label:l1
-			and:text2 label:name2 pathName.
-		d label:'file differences'.
-	    ]
-	]
+        name1 := name1 value.
+        (name1 isNil or:[name1 isEmpty]) ifTrue:[
+"/            text1 := subView contents.
+            text1 := subView list asStringCollection withTabs.
+            text1 := text1 collect:[:l | l isNil ifTrue:[' '] ifFalse:[l]].
+            name1 := nil.
+            l1 := 'browser contents'
+        ] ifFalse:[
+            name1 := currentDirectory filenameFor:name1.
+            name1 isReadable ifFalse:[
+                nm := name1.
+                name1 exists ifFalse:[
+                    err := '%1 does not exist'.
+                ] ifTrue:[
+                    err := '%1 is not readable'
+                ].
+            ].
+            l1 := name1 pathName
+        ].
+
+        name2 := currentDirectory filenameFor:name2 value.
+        err isNil ifTrue:[
+            name2 isReadable ifFalse:[
+                nm := name2.
+                name2 exists ifFalse:[
+                    err := '%1 does not exist'.
+                ] ifTrue:[
+                    err := '%1 is not readable'
+                ].
+            ].
+        ].
+        err notNil ifTrue:[
+            self warn:(resources string:err with:nm pathName).
+            ^ self
+        ].
+
+        self withWaitCursorDo:[
+            (name1 notNil and:[name1 name ~= orgName1]) ifTrue:[
+                lastFileDiffDirectory := name1 directoryName
+            ].
+            name1 notNil ifTrue:[
+                text1 := name1 contents.
+            ].
+            text2 := name2 contents.
+            text1 = text2 ifTrue:[
+                self information:'same contents'
+            ] ifFalse:[
+                d := DiffTextView 
+                        openOn:text1 label:l1
+                        and:text2 label:name2 pathName.
+                d label:'file differences'.
+            ]
+        ]
     ].
 
     "Created: / 7.12.1995 / 20:33:58 / cg"
     "Modified: / 18.9.1997 / 17:31:46 / stefan"
-    "Modified: / 25.8.1998 / 21:11:46 / cg"
+    "Modified: / 5.5.1999 / 16:04:10 / cg"
 !
 
 openEditor
@@ -6600,5 +6602,5 @@
 !FileBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.316 1999-05-04 18:56:20 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.317 1999-05-05 14:21:19 cg Exp $'
 ! !
hg/stx-libtool