Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
16752 problems with new search function in FastTable https://pharo.fogbugz.com/f/cases/16752 16753 Invalidate ProtoObject https://pharo.fogbugz.com/f/cases/16753 15713 CommandLineUIManager>>#merge:informing: is not doing anything https://pharo.fogbugz.com/f/cases/15713 http://files.pharo.org/image/50/50380.zip
- Loading branch information
Jenkins Build Server
authored and
ci
committed
Oct 9, 2015
1 parent
b4f208c
commit a785f41
Showing
15 changed files
with
65 additions
and
41 deletions.
There are no files selected for viewing
2 changes: 1 addition & 1 deletion
2
Monticello.package/MCMergeResolutionRequest.class/instance/testing/hasConflicts.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| hasConflicts | ||
| ^ self merger conflicts isEmpty not | ||
| ^ self merger hasConflicts |
2 changes: 2 additions & 0 deletions
2
Monticello.package/MCMerger.class/instance/testing/hasConflicts.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| hasConflicts | ||
| ^ self conflicts notEmpty |
1 change: 1 addition & 0 deletions
1
Morphic-Widgets-FastTable.package/FTSearchFunction.class/instance/initialization/reset.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| reset |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 0 additions & 2 deletions
2
...xamples.package/ExecutionDisplayMorph.class/instance/as yet unclassified/noteExecution.st
This file was deleted.
Oops, something went wrong.
9 changes: 6 additions & 3 deletions
9
Reflectivity.package/MetaLink.class/instance/link api/condition_.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,10 @@ | ||
| condition: aCondition | ||
| condition:= aCondition. | ||
| nodes do: [ :node | | ||
| (node methodNode metaLinkOptionsFromClassAndMethod includes: #optionInlineCondition) ifTrue: [ self invalidate ] ]. | ||
| self optionInlineCondition ifTrue: [self invalidate]. | ||
| self optionInlineCondition ifTrue: [^self invalidate]. | ||
| nodes do: [ :node | | methodNode | | ||
| methodNode := node methodNode. | ||
| (methodNode metaLinkOptionsFromClassAndMethod includes: #optionInlineCondition) | ||
| ifTrue: [ methodNode method invalidate ] ]. | ||
|
|
||
|
|
||
|
|
9 changes: 6 additions & 3 deletions
9
Reflectivity.package/MetaLink.class/instance/link api/metaObject_.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,9 @@ | ||
| metaObject: anObject | ||
| metaObject := anObject. | ||
| nodes do: [ :node | | ||
| (node methodNode metaLinkOptionsFromClassAndMethod includes: #optionInlineMetaObject) ifTrue: [ self invalidate ] ]. | ||
| self optionInlineMetaObject ifTrue: [self invalidate]. | ||
| self optionInlineMetaObject ifTrue: [^self invalidate]. | ||
| nodes do: [ :node | | methodNode | | ||
| methodNode := node methodNode. | ||
| (methodNode metaLinkOptionsFromClassAndMethod includes: #optionInlineMetaObject) | ||
| ifTrue: [ methodNode method invalidate ] ]. | ||
|
|
||
|
|
4 changes: 0 additions & 4 deletions
4
Reflectivity.package/ReflectiveMethod.class/instance/invalidate/installCompiledMethod.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 5 additions & 0 deletions
5
Reflectivity.package/extension/ProtoObject/instance/metaLinkOptions.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| metaLinkOptions | ||
| ^{ | ||
| #isNil -> #( + optionCompileOnLinkInstallation). | ||
| #metaLinkOptions -> #( + optionCompileOnLinkInstallation) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 0 additions & 11 deletions
11
ScriptLoader50.package/ScriptLoader.class/instance/pharo - updates/update50379.st
This file was deleted.
Oops, something went wrong.
12 changes: 12 additions & 0 deletions
12
ScriptLoader50.package/ScriptLoader.class/instance/pharo - updates/update50380.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| update50380 | ||
| "self new update50380" | ||
| self withUpdateLog: '16752 problems with new search function in FastTable | ||
| https://pharo.fogbugz.com/f/cases/16752 | ||
| 16753 Invalidate ProtoObject | ||
| https://pharo.fogbugz.com/f/cases/16753 | ||
| 15713 CommandLineUIManager>>#merge:informing: is not doing anything | ||
| https://pharo.fogbugz.com/f/cases/15713'. | ||
| self loadTogether: self script50380 merge: false. | ||
| self flushCaches. |
10 changes: 8 additions & 2 deletions
10
ScriptLoader50.package/ScriptLoader.class/instance/public/commentForCurrentUpdate.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,9 @@ | ||
| commentForCurrentUpdate | ||
| ^ '16750 Update Spotter | ||
| https://pharo.fogbugz.com/f/cases/16750' | ||
| ^ '16752 problems with new search function in FastTable | ||
| https://pharo.fogbugz.com/f/cases/16752 | ||
| 16753 Invalidate ProtoObject | ||
| https://pharo.fogbugz.com/f/cases/16753 | ||
| 15713 CommandLineUIManager>>#merge:informing: is not doing anything | ||
| https://pharo.fogbugz.com/f/cases/15713' |
6 changes: 5 additions & 1 deletion
6
UIManager.package/CommandLineUIManager.class/instance/ui requests/merge_informing_.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,5 @@ | ||
| merge: merger informing: aString | ||
| merge: merger informing: aString | ||
| "Check for conflicts, if there are none, just continue. | ||
| Merger will accept all conflicts" | ||
| merger hasConflicts ifFalse: [ ^ self ]. | ||
| self abort: aString title: 'Conflict detected' |
5 changes: 5 additions & 0 deletions
5
UIManager.package/NonInteractiveUIManager.class/instance/ui requests/merge_informing_.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| merge: merger informing: aString | ||
| "Check for conflicts, if there are none, just continue. | ||
| Merger will accept all conflicts" | ||
| super merge: merger informing: aString. | ||
| merger hasConflicts ifTrue: [ self exitFailure ] |