On 18.02.2014, at 23:21, Frank Shearar <frank.shearar at gmail.com> wrote:

> On 17 February 2014 22:35,  <commits at source.squeak.org> wrote:
>> Chris Muller uploaded a new version of Tests to project The Trunk:
>> http://source.squeak.org/trunk/Tests-cmm.290.mcz
>> 
>> ==================== Summary ====================
>> 
>> Name: Tests-cmm.290
>> Author: cmm
>> Time: 17 February 2014, 4:35:24.565 pm
>> UUID: f3fccfae-6baf-4093-ba62-e15ef110a687
>> Ancestors: Tests-cwp.289
>> 
>> Minor factoring.
>> 
>> =============== Diff against Tests-cwp.289 ===============
>> 
>> Item was changed:
>>  ----- Method: BlockLocalTemporariesRemovalTest>>assert:isChangedDuringParsingTo:withRemovalOfTemporariesNamed: (in category 'test helper') -----
>> + assert: someCode isChangedDuringParsingTo: someOtherCode withRemovalOfTemporariesNamed: someTempNames
>> - assert: someCode isChangedDuringParsingTo: someOtherCode withRemovalOfTemporariesNamed: someTempNames
>> -
>>        | failBlock |
>>        self sourceCode: someCode.
>> +       failBlock := [ self fail ].
>> +       [ self class
>> +               compile: self sourceCode
>> +               notifying: self
>> +               trailer: self class defaultMethodTrailer
>> +               ifFail: failBlock ]
>> -       failBlock := [self fail].
>> -       [self class
>> -                       compile: self sourceCode
>> -                       notifying: self
>> -                       trailer: self class defaultMethodTrailer
>> -                       ifFail: failBlock]
>>                on: UnusedVariable
>> +               do:
>> +                       [ : aNotification | aNotification openMenuIn:
>> +                               [ : options : emptyCollection : someText | aNotification resume:
>> +                                       (someTempNames anySatisfy:
>> +                                               [ : tempName | someText beginsWith: tempName ]) ] ].
>> -               do: [:aNotification | aNotification
>> -                               openMenuIn: [:options :emptyCollection :someText |
>> -                                       (someTempNames anySatisfy: [:tempName | someText startsWith: tempName])
>> -                                               ifTrue: [aNotification resume: true]
>> -                                               ifFalse: [aNotification resume: false]]].
>>        self assert: self sourceCode = someOtherCode!
> 
> Seriously, we need a better differ. If we pretty-printed the before &
> after I'd at least stand a chance of not going blind trying to find
> the change here. How difficult a change is it to SS? Surely a
> one-liner, to someone who knows the codebase (i.e., not me).

"MCDiffyTextBuilder>>writePatchFrom:to:"
 writePatchFrom: src to: dst
 	"src and dst are allowed to bi nil to represent a non-existent source or destination state" 
 	
 	| source target excess |
 	source := src ifNotNil: [self visitInFork: src] ifNil: [''].
 	target := dst ifNotNil: [self visitInFork: dst] ifNil: [''].
 	excess := source size + target size > 20000.
 	excess	ifTrue: [
 		"show at least header line"
 		source := source copyUpTo: Character cr.
 		target := target copyUpTo: Character cr ].
 	"there might have been no CR, check again"
 	source size + target size > 20000
 		ifFalse: [ 
-			stream nextPutAll: (TextDiffBuilder from: source to: target)
+			stream nextPutAll: (PrettyTextDiffBuilder from: source to: target)
 				buildTextPatch ].
 	"alert audience"
 	excess ifTrue: [
 		stream nextPutAll: '(excessive size, no diff calculated)'; cr ]

But I _really_ think we should _not_ do that :)

Best
	-Tobias

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 1625 bytes
Desc: Message signed with OpenPGP using GPGMail
Url : http://lists.squeakfoundation.org/pipermail/squeak-dev/attachments/20140218/5b1c924c/signature.pgp