review pull request changes view

When reviewing a pull request, I see this in the changes view:

The tab title says

"left working copy / right incoming update"

but the code on the right side is what is current in my image

And I don't think "working copy" is the correct naming, as this view lets me diff changes within

that history, so it may be that none of this code is actually in my "working copy", no ?

On 1 Sep 2017, at 14:51, Nicolai Hess <[hidden email]> wrote:

2017-09-01 14:48 GMT+02:00 Nicolai Hess <[hidden email]>:

When reviewing a pull request, I see this in the changes view:

The tab title says

"left working copy / right incoming update"

but the code on the right side is what is current in my image

<grafik.png>

And I don't think "working copy" is the correct naming, as this view lets me diff changes within

that history, so it may be that none of this code is actually in my "working copy", no ?

BTW, this is extremly unstable, reviewing a pull request, crashes a lot (the vm)

on windows?

On 1 Sep 2017, at 15:50, Nicolai Hess <[hidden email]> wrote:

2017-09-01 15:03 GMT+02:00 Esteban Lorenzano <[hidden email]>:

On 1 Sep 2017, at 14:51, Nicolai Hess <[hidden email]> wrote:

2017-09-01 14:48 GMT+02:00 Nicolai Hess <[hidden email]>:

When reviewing a pull request, I see this in the changes view:

The tab title says

"left working copy / right incoming update"

but the code on the right side is what is current in my image

<grafik.png>

And I don't think "working copy" is the correct naming, as this view lets me diff changes within

that history, so it may be that none of this code is actually in my "working copy", no ?

BTW, this is extremly unstable, reviewing a pull request, crashes a lot (the vm)

on windows?

Yes,

attached a another crash.dmp (maybe it helps)

<crash.dmp>

can you tell me the PR you were analysing ?

Esteban

On 1 Sep 2017, at 16:02, Esteban Lorenzano <[hidden email]> wrote:

On 1 Sep 2017, at 15:50, Nicolai Hess <[hidden email]> wrote:

2017-09-01 15:03 GMT+02:00 Esteban Lorenzano <[hidden email]>:

On 1 Sep 2017, at 14:51, Nicolai Hess <[hidden email]> wrote:

2017-09-01 14:48 GMT+02:00 Nicolai Hess <[hidden email]>:

When reviewing a pull request, I see this in the changes view:

The tab title says

"left working copy / right incoming update"

but the code on the right side is what is current in my image

<grafik.png>

And I don't think "working copy" is the correct naming, as this view lets me diff changes within

that history, so it may be that none of this code is actually in my "working copy", no ?

BTW, this is extremly unstable, reviewing a pull request, crashes a lot (the vm)

on windows?

Yes,

attached a another crash.dmp (maybe it helps)

<crash.dmp>

can you tell me the PR you were analysing ?

ah, and btw… can you update with latest dev-0.5? I made some changes that may help there that I still do not merge into master.

Esteban

Esteban

When reviewing a pull request, I see this in the changes view:

The tab title says

"left working copy / right incoming update"

but the code on the right side is what is current in my image

And I don't think "working copy" is the correct naming, as this view lets me diff changes within

that history, so it may be that none of this code is actually in my "working copy", no ?

On Fri, Sep 1, 2017 at 4:26 PM, Nicolai Hess <[hidden email]> wrote:
>
>
>
> update what? pharo ?
>
>

You can update Iceberg by executing:

#('Iceberg-UI' 'Iceberg-Plugin' 'Iceberg-Metacello-Integration'
'Iceberg-Libgit' 'Iceberg' 'BaselineOfIceberg' 'LibGit-Core'
'BaselineOfLibGit')
do: [ :each | each asPackage removeFromSystem ].

Metacello new
  baseline: 'Iceberg';
  repository: 'github://pharo-vcs/iceberg:dev-0.5';
  load.

--
Cyril Ferlicot
https://ferlicot.fr

http://www.synectique.eu
2 rue Jacques Prévert 01,
59650 Villeneuve d'ascq France

And how do I know if a pull request / change is already included ?

I looked at a pull request

and it seems this change is already in my image (a fresh image from 30.08 (Pharo7.0alpha.build.78.sha.35c21c3fac9b557eb38ec569fbbb109f2015c71a)

The pull request (https://api.github.com/repos/pharo-project/pharo/pulls/231) is  "open", but I can see the new code already in my image.

The diff view tells me, that the method

UITheme>>warningTextColor changes from

warningTextColor
    ^ Color yellow muchDarker

to

warningTextColor
    ^ Color yellow

But the method in the image already looks like this:

warningTextColor
    ^ Color yellow

 

2017-09-01 16:29 GMT+02:00 Cyril Ferlicot <[hidden email]>:

On Fri, Sep 1, 2017 at 4:26 PM, Nicolai Hess <[hidden email]> wrote:
>
>
>
> update what? pharo ?
>
>

You can update Iceberg by executing:

#('Iceberg-UI' 'Iceberg-Plugin' 'Iceberg-Metacello-Integration'
'Iceberg-Libgit' 'Iceberg' 'BaselineOfIceberg' 'LibGit-Core'
'BaselineOfLibGit')
do: [ :each | each asPackage removeFromSystem ].

Metacello new
  baseline: 'Iceberg';
  repository: 'github://pharo-vcs/iceberg:dev-0.5';
  load.

Ah, thanks. I will try it out and report back if the crashes still occur.

 

--
Cyril Ferlicot
https://ferlicot.fr

http://www.synectique.eu
2 rue Jacques Prévert 01,
59650 Villeneuve d'ascq France

Oh no!

Now iceberg shows an empty list. Where is the pharo repository gone ?

It took me a week to be at this point :(

I reenabled the setting "Include system repositories by default", but still, the window is empty:

How can I get back the system repository ?

On Fri, Sep 1, 2017 at 5:04 PM, Nicolai Hess <[hidden email]> wrote:

Oh no!

Now iceberg shows an empty list. Where is the pharo repository gone ?

It took me a week to be at this point :(

I reenabled the setting "Include system repositories by default", but still, the window is empty:

How can I get back the system repository ?

I'm not 100% sure but I think you just need to click on "add local repository", point the pharo clone and add src as subdirectory.  

--

Cyril Ferlicot
https://ferlicot.fr

http://www.synectique.eu
2 rue Jacques Prévert 01,
59650 Villeneuve d'ascq France

On 1 Sep 2017, at 17:06, Cyril Ferlicot <[hidden email]> wrote:

On Fri, Sep 1, 2017 at 5:04 PM, Nicolai Hess <[hidden email]> wrote:

Oh no!

Now iceberg shows an empty list. Where is the pharo repository gone ?

It took me a week to be at this point :(

I reenabled the setting "Include system repositories by default", but still, the window is empty:

<grafik.png>

How can I get back the system repository ?

I'm not 100% sure but I think you just need to click on "add local repository", point the pharo clone and add src as subdirectory.  

mmm no. 

Better: 

IceCommitInfo allInstances anyOne repository register.

(assuming anyOne will answer a pharo package)

Esteban

--

Cyril Ferlicot
https://ferlicot.fr

http://www.synectique.eu
2 rue Jacques Prévert 01,
59650 Villeneuve d'ascq France

2017-09-01 17:06 GMT+02:00 Cyril Ferlicot <[hidden email]>:

On Fri, Sep 1, 2017 at 5:04 PM, Nicolai Hess <[hidden email]> wrote:

Oh no!

Now iceberg shows an empty list. Where is the pharo repository gone ?

It took me a week to be at this point :(

I reenabled the setting "Include system repositories by default", but still, the window is empty:

How can I get back the system repository ?

I'm not 100% sure but I think you just need to click on "add local repository", point the pharo clone and add src as subdirectory.  

yes, seems to work.

 

--

Cyril Ferlicot
https://ferlicot.fr

http://www.synectique.eu
2 rue Jacques Prévert 01,
59650 Villeneuve d'ascq France