What if the decompiler fails? (Yes, there are a bunch of failing tests.)
What if the decompiler generates the same code for different input?

Levente

On Mon, 25 Jul 2016, commits at source.squeak.org wrote:

> Tim Felgentreff uploaded a new version of Monticello to project The Trunk:
> http://source.squeak.org/trunk/Monticello-tfel.637.mcz
>
> ==================== Summary ====================
>
> Name: Monticello-tfel.637
> Author: tfel
> Time: 25 July 2016, 3:24:24.996828 pm
> UUID: cf0d6af1-c703-5044-9c57-e798b0cf3abf
> Ancestors: Monticello-cmm.636
>
> add a button for rejecting all incoming conflicts that only change AST
>
> =============== Diff against Monticello-cmm.636 ===============
>
> Item was added:
> + ----- Method: MCConflict>>chooseSameAST (in category 'as yet unclassified') -----
> + chooseSameAST
> + 	| fromSrc toSrc |
> + 	(self definition isNil or: [self definition isMethodDefinition not])
> + 		ifTrue: [^ self].
> + 	fromSrc := (Parser new parse: operation fromSource class: nil class)
> + 		generate decompile asString.
> + 	toSrc := (Parser new parse: operation toSource class: nil class)
> + 		generate decompile asString.
> + 	fromSrc = toSrc ifTrue: [self chooseLocal].!
>
> Item was changed:
>  ----- Method: MCMergeBrowser>>buttonSpecs (in category 'as yet unclassified') -----
>  buttonSpecs
>  	^ #((Merge merge 'Proceed with the merge' canMerge)
>  		 (Cancel cancel 'Cancel the merge')
>  		('All Newer' chooseAllNewerConflicts 'Choose all newer conflict versions')
>  		('All Older' chooseAllOlderConflicts 'Choose all older conflict versions')
>  		('Rest Reject' chooseAllUnchosenLocal 'Choose local versions of all remaining conflicts')
>  		('Rest Accept' chooseAllUnchosenRemote 'Choose remote versions of all remaining conflicts')
> + 		('Accept same source' chooseAllSameAST 'Choose all local conflicting versions that have essentially the same code')
>  )!
>
> Item was added:
> + ----- Method: MCMergeBrowser>>chooseAllSameAST (in category 'as yet unclassified') -----
> + chooseAllSameAST
> + 	conflicts do: [ :ea |
> + 		ea chooseSameAST ].
> + 	self changed: #text; changed: #list.!
>
>
>