Thank you Alex, a fix for that is in the way, but it needs some work yet, I will integrate it as soon as possible.��

A little clarification yet: we do not have a "three way diff"... or at least I am not aware of and a query in this list a few weeks ago raised no results. So using a 2-way diff there is no way to really show new code vs. old code. It will just show the differences between the two versions... in the case that one version is an ancestor of the other one, then the differences could be understood as "new code" vs. "old code" but that will not be allways the case. I will like to have a 3-way diff, but I am not sure that I will have time for that soon enough because we have defined other priorities.

In the meantime we are working on making a bit more flexible the current 2-way diff, so that we can decide which side to paint red and which one to paint green. (Yes I could have just swap the versions, but I preferred to have allways "my" code in the left... I think that once we fix the color issue it will be more intuitive.)

So the corrected version will work so:
- left is allways "my code", right is "their" code.
- red is old, green is new.

(Another improvement would be to put labels on top of it, but it also needs improving the diff widget. Now we have only one title for the morph, the information is there but is not so clear as I would liket to.)

Also we have problems with the highlihgting, because sometimes it is shifted one or two characters. I would like to fix it but... again, it takes time.


So, to sum up, the diff needs a lot of work yet.

2016-10-17 11:48 GMT+02:00 Aliaksei Syrel <alex.syrel@gmail.com>:
Diff has inverted colors (Red <-> Green) Almost every time have to stop and think why new code I just wrote will be removed ;)

GitHub: (new content is green)
Inline images 1

Iceberg: (new content is red, note also that last E character in LINE is not highlighted, but it should):
Inline images 2

Cheers,
Alex

On 16 October 2016 at 20:28, Aliaksei Syrel <alex.syrel@gmail.com> wrote:
Hi

I use Iceberg to load project in non-interactive mode and this is what I get with latest stable:

RETRY->BaselineOfIceberg An attempt to use interactive tools detected, while in non-interactive mode

Is there any reason that prevents Iceberg to be used in non-interactive mode, from command line for example?

Cheers,
Alex

On 15 October 2016 at 13:59, stepharo <stepharo@free.fr> wrote:
+ 1

This is on my todo�� :)


Le 13/10/16 �� 20:37, Tudor Girba a ��crit :

Hi Nicolas,

Great work!

I will test it again. I kindly ask everyone else to follow the call and test this release. Ideally, create a repository on GitHub and play with it.

It is important to get this piece as stable as possible to make Git part of the default Pharo experience.

Cheers,
Doru


On Oct 13, 2016, at 2:25 PM, Nicolas Passerini <npasserini@gmail.com> wrote:

Hi, we are releasing a new version of Iceberg, with several new features and bugfixes. I would't yet say that is 100% production ready, but it is close, so I want to invite you to test it and provide feedback.

You can install it by doing:

Metacello new
�� ��baseline: 'Iceberg';
�� ��repository: 'github://npasserini/iceberg';
�� ��load.

More installation instructions and documentation can be found at https://github.com/npasserini/iceberg.

Some of the new features in this version are:
- Allow to commit several packages together in the same commit.
- Show diffs for incoming and outgoing commits (i.e. before push/pull you can browse the difference between the remote and the local versions).
- New History view allows to see any commit in any branch and compare it to the current loaded version.
- Better support for interacting code loaded outside Iceberg (smaltalkhub, filetree, gitfiletree, etc).
- From the diff view, revert changes or browse them (i.e. open a Nautilus on the changed class/method).
- Automatically update presentations on code / repository changes.
- Integration with Metacello, i.e. after installing Iceberg you do something like

Metacello new

�� ��baseline: 'TaskIt'
;
�� ��repository: 'github://sbragagnolo/taskit'
;
�� ��load.


(By default) it will be loaded using iceberg (there is a setting to avoid it if you prefer traditional behavior.

- Improved handling of git errors.
- Improved performance for several operations.
- Improved documentation.
- ... and several bug fixes and other minor improvements (please look at https://github.com/npasserini/iceberg/milestone/7?closed=1 for more details).


Please do not hesitate to contact me if you have any doubts.
--
www.tudorgirba.com
www.feenk.com

"Reasonable is what we are accustomed with."