From 9172f247be0d71c81386e7bce3f0d7048d715664 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phaneDucasse?= Date: Sat, 8 Oct 2016 13:08:01 +0200 Subject: [PATCH 1/2] Update README.md --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 15e3e23c6a..3caa7b682f 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,16 @@ # Git integration for Pharo -Iceberg is a set of tools that allow to handle git repositories directly from the Pharo image. Right now we support only git, but Iceberg is designed to allow other code versioning systems in the future. The final aim of Iceberg is to become the default repository for Pharo-core, allowing for smoother and faster integration of contributions, as well as better branch and version management. +Iceberg is a set of tools that allow one to handle git repositories directly from a Pharo image. Right now we support only git, but Iceberg is designed to allow other code versioning systems in the future. The final aim of Iceberg is to become the default repository manager for Pharo-core, allowing for smoother and faster integration of contributions, as well as better branch and version management. This is still a prototype and is not yet ready for production, but you are invited to try it and provide feedback. Right now it has been tested in linux and mac environments, it would be great if you can share your experience using Iceberg on your Windows computer. -## Instalation (for development) +## Installation (for development) ### Prerequisites - Latest Pharo 6.0 image. - Git v1.9.1 or later (we are working to remove this requirement in the near future) - An [SSH Key](https://help.github.com/articles/generating-an-ssh-key/) (again, not far from now this will not be mandatory any more ... but in this case I would still recommend to use an SSH Key as the preferred way to authenticate to your Github account.) ### Install Iceberg +Execute the following expression: ``` Metacello new baseline: 'Iceberg'; From ec8aa89b764f35f7d49c1b3dbf17a8b16361dfaf Mon Sep 17 00:00:00 2001 From: Pablo Tesone Date: Tue, 11 Oct 2016 11:16:27 +0200 Subject: [PATCH 2/2] Changing the selectionAction and selectionCondition to use enabledCondition. There is a problem in FastTable, but as soon I can fix it (publish the change) it will be working as a charm --- .../instance/selectionAction..st | 14 ++++++-------- .../instance/selectionCondition..st | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Iceberg.package/GLMGenericAction.extension/instance/selectionAction..st b/Iceberg.package/GLMGenericAction.extension/instance/selectionAction..st index 6b7d7716f7..8c58b2b076 100644 --- a/Iceberg.package/GLMGenericAction.extension/instance/selectionAction..st +++ b/Iceberg.package/GLMGenericAction.extension/instance/selectionAction..st @@ -3,11 +3,9 @@ selectionAction: actionSelector "action selector will be sent to the presentation selection. If it accepts one argument, the presentation will be sent." - ^ self action: [ :presentation | - (MessageSend - receiver: presentation selection - selector: actionSelector) - cull: presentation ]; - condition: [ :presentation | - "This is a minimal condition, that can be overriden (refined) later" - presentation selection notNil ]. + ^ self + action: [ :presentation | + presentation selection + ifNotNil: [ :sel | (MessageSend receiver: sel selector: actionSelector) cull: presentation ] ]; + enabledCondition: + [ :presentation | "This is a minimal condition, that can be overriden (refined) later" presentation selection notNil ] \ No newline at end of file diff --git a/Iceberg.package/GLMGenericAction.extension/instance/selectionCondition..st b/Iceberg.package/GLMGenericAction.extension/instance/selectionCondition..st index f5e0886f99..0e6967537f 100644 --- a/Iceberg.package/GLMGenericAction.extension/instance/selectionCondition..st +++ b/Iceberg.package/GLMGenericAction.extension/instance/selectionCondition..st @@ -3,6 +3,6 @@ selectionCondition: selectionCondition "selectionCondition can be anything that can respond #cull: such as a block or unary symbol. It will only be evaluated if the presentation has a (not nil) selected element." - ^ self condition: [ :presentation | + ^ self enabledCondition: [ :presentation | presentation selection notNil and: [ selectionCondition cull: presentation selection ]] \ No newline at end of file