[IMPORTANT] PHARO CONTRIBUTION PROCESS UPDATED! PLEASE READ!
Locked
123
123
Re: [IMPORTANT] PHARO CONTRIBUTION PROCESS UPDATED! PLEASE READ!
 
|
I clicked on pharo-project remote and I did fetch. thinking stupidly
that it will update my local repo. And I get the following .... and I do not understand whay I get 1965 not published. and I do not Then I siwtched branch and went back to development. and I should be able to now push to my remote. So I tried but I'm totally unsure if this is correct. On Sat, Dec 16, 2017 at 5:55 PM, Stephane Ducasse <[hidden email]> wrote: > Hi Esteban > > Now how can I maintain my fork up to date? > This is not in the tutorial and to me it was a major problem and a big > source of pain. > Stef > > On Sat, Dec 16, 2017 at 5:39 PM, Stephane Ducasse > <[hidden email]> wrote: >> I committed my code for issue 20861 and I do not understand what I see >> >> I do not understand why I get local changes with empty packages. :( >> >> Stef >> >> On Sat, Dec 16, 2017 at 5:32 PM, Stephane Ducasse >> <[hidden email]> wrote: >>> I did a little pass on the wiki to make the flow clearer >>> >>> >>> On Sat, Dec 16, 2017 at 5:26 PM, Stephane Ducasse >>> <[hidden email]> wrote: >>>> In the tutorial: >>>> >>>> - Put a little heading before >>>> >>>> "You need to add pharo repository as a remote >>>> ([hidden email]:pharo-project/pharo.git)." >>>> >>>> On Sat, Dec 16, 2017 at 5:25 PM, Stephane Ducasse >>>> <[hidden email]> wrote: >>>>> I double clicked and it did a massive amount of stuff and finally told >>>>> me that it is up to date. >>>>> >>>>> >>>>> On Sat, Dec 16, 2017 at 5:24 PM, Stephane Ducasse >>>>> <[hidden email]> wrote: >>>>>> OK so I restarted everything from scratch: >>>>>> - deleted my fork >>>>>> - reforked >>>>>> - clone pharo again >>>>>> - here is some feedback >>>>>> >>>>>> In the tutorial add /pharo + src in the screenshot >>>>>> >>>>>> >>>>>> Then when I add the local repository I get uncommited changes and I do >>>>>> not understand why? >>>>>> >>>>>> >>>>>> >>>>>> >>>>>> >>>>>> On Sat, Dec 16, 2017 at 9:57 AM, Esteban Lorenzano <[hidden email]> wrote: >>>>>>> >>>>>>> >>>>>>> On 16 Dec 2017, at 09:42, Alistair Grant <[hidden email]> wrote: >>>>>>> >>>>>>> Hi Esteban, >>>>>>> >>>>>>> On 16 December 2017 at 09:05, Esteban Lorenzano <[hidden email]> wrote: >>>>>>> >>>>>>> >>>>>>> >>>>>>> On 15 Dec 2017, at 17:37, Alistair Grant <[hidden email]> wrote: >>>>>>> >>>>>>> Hi Esteban, >>>>>>> >>>>>>> I had no problems following the process (Ubuntu 16.04, >>>>>>> Pharo7.0-32bit-e175bc2.image, fogbugz 20872). :-) >>>>>>> >>>>>>> I guess that you have already thought of this, but... Is there any >>>>>>> reason why we can't just put up a dialog asking for the user's github >>>>>>> credentials and fogbugz issue number and then automatically clone the >>>>>>> repository, configure the upstream remote and create the issue branch. >>>>>>> That would remove most of the remaining manual steps. >>>>>>> >>>>>>> I realise that it only works for option 1, although where people >>>>>>> configure a common pharo-local, it could check for a pre-existing >>>>>>> clone and use that one. >>>>>>> >>>>>>> >>>>>>> "I realise” means you tried and it didn’t work? >>>>>>> because in my tests it worked as good as the first one (I tested on >>>>>>> windows), but that may need to be “re-validated” :) >>>>>>> >>>>>>> Esteban >>>>>>> >>>>>>> >>>>>>> The contribution process works fine (even on linux :-)). >>>>>>> >>>>>>> The "I realise" paragraph is a comment on my suggestion to try and >>>>>>> reduce the number of manual steps required (and is actually wrong). >>>>>>> Just to rephrase (and extend) the suggestion, I think we could create >>>>>>> a single dialog that currently covers the following steps (from your >>>>>>> instructions): >>>>>>> >>>>>>> 1. Clone a fresh repository, or point to an existing repository. >>>>>>> 2. Tell Iceberg about pharo-project >>>>>>> 3. Create a new branch from the fogbugz issue >>>>>>> >>>>>>> >>>>>>> ah, I got lost in translation ;) >>>>>>> >>>>>>> Esteban >>>>>>> >>>>>>> >>>>>>> Cheers, >>>>>>> Alistair >>>>>>> >>>>>>> >>>>>>> >>>>>>> >>>>>>> Cheers, >>>>>>> Alistair >>>>>>> >>>>>>> On 14 December 2017 at 13:19, Esteban Lorenzano <[hidden email]> wrote: >>>>>>> >>>>>>> Hi! >>>>>>> >>>>>>> I’m working on simplifying the contribution process, after collecting >>>>>>> opinions/experiences last couple of months. >>>>>>> As you know, Pharo contribution process is still WIP and we aim to have it >>>>>>> as smooth as possible for Pharo 7.0 release. Now, after observe the idea of >>>>>>> the “system repositories” was a bad idea because it introduced extra and non >>>>>>> standard “path” to contribution, I managed to remove that to reestablish >>>>>>> “the regular way”: you will now need to add pharo repository just as any >>>>>>> other repository you add, by cloning or adding local repository. >>>>>>> >>>>>>> I took Guille’s doc and moved it to pharo project (it does not has sense to >>>>>>> have it living in a contributor’s repository when is so important). You can >>>>>>> find it here: >>>>>>> >>>>>>> https://github.com/pharo-project/pharo/wiki/Contribute-a-fix-to-Pharo >>>>>>> >>>>>>> This document is also updated to reveal this new process, please read it. >>>>>>> >>>>>>> How to update your startup scripts? >>>>>>> Some people has added startup scripts to easy the first part of >>>>>>> contribution. Instead enabling system repositories, etc. you now need to >>>>>>> replace that with this: >>>>>>> >>>>>>> (IceRepositoryCreator new >>>>>>> location: '/path/to/pharo-project/pharo' asFileReference; >>>>>>> subdirectory: 'src'; >>>>>>> createRepository) >>>>>>> register >>>>>>> >>>>>>> PLEASE, PLEASE, PLEASE… take a moment to read and try the document. Is very >>>>>>> important that document reflects new process and works reliable in different >>>>>>> scenarios (I validated it on macOS and Windows, and assumed it worked fine >>>>>>> on linux but you know… bad assumptions is the base of failure ;) ) >>>>>>> >>>>>>> I’m eager to hear your feedback and continue enhancing the process. >>>>>>> >>>>>>> (yes, Stef, I know UI is still cumbersome… I’m working on that :) ) >>>>>>> >>>>>>> cheers! >>>>>>> Esteban >>>>>>> >>>>>>> |
Screen Shot 2017-12-16 at 17.55.50.png (87K) |
|
In reply to this post by Stephane Ducasse-3
> On 16 Dec 2017, at 17:55, Stephane Ducasse <[hidden email]> wrote: > > Hi Esteban > > Now how can I maintain my fork up to date? there is a “synchronise repositories” option there, at the side of “create branch from fogbugz”. > This is not in the tutorial and to me it was a major problem and a big > source of pain. it is not there because you do not need it. when you “create branch from fogbugz”, it will take your image version and branch from there. Then, when you push to your remote, you will push correctly. There is no need to have syncd the forks to contribute… Now, if you do “synchronise repositories”, it will take what is in pharo-project/pharo/development branch and it will sync that with your pharo/development branch. But again… there is no need to do this to contribute. Esteban > Stef > > On Sat, Dec 16, 2017 at 5:39 PM, Stephane Ducasse > <[hidden email]> wrote: >> I committed my code for issue 20861 and I do not understand what I see >> >> I do not understand why I get local changes with empty packages. :( >> >> Stef >> >> On Sat, Dec 16, 2017 at 5:32 PM, Stephane Ducasse >> <[hidden email]> wrote: >>> I did a little pass on the wiki to make the flow clearer >>> >>> >>> On Sat, Dec 16, 2017 at 5:26 PM, Stephane Ducasse >>> <[hidden email]> wrote: >>>> In the tutorial: >>>> >>>> - Put a little heading before >>>> >>>> "You need to add pharo repository as a remote >>>> ([hidden email]:pharo-project/pharo.git)." >>>> >>>> On Sat, Dec 16, 2017 at 5:25 PM, Stephane Ducasse >>>> <[hidden email]> wrote: >>>>> I double clicked and it did a massive amount of stuff and finally told >>>>> me that it is up to date. >>>>> >>>>> >>>>> On Sat, Dec 16, 2017 at 5:24 PM, Stephane Ducasse >>>>> <[hidden email]> wrote: >>>>>> OK so I restarted everything from scratch: >>>>>> - deleted my fork >>>>>> - reforked >>>>>> - clone pharo again >>>>>> - here is some feedback >>>>>> >>>>>> In the tutorial add /pharo + src in the screenshot >>>>>> >>>>>> >>>>>> Then when I add the local repository I get uncommited changes and I do >>>>>> not understand why? >>>>>> >>>>>> >>>>>> >>>>>> >>>>>> >>>>>> On Sat, Dec 16, 2017 at 9:57 AM, Esteban Lorenzano <[hidden email]> wrote: >>>>>>> >>>>>>> >>>>>>> On 16 Dec 2017, at 09:42, Alistair Grant <[hidden email]> wrote: >>>>>>> >>>>>>> Hi Esteban, >>>>>>> >>>>>>> On 16 December 2017 at 09:05, Esteban Lorenzano <[hidden email]> wrote: >>>>>>> >>>>>>> >>>>>>> >>>>>>> On 15 Dec 2017, at 17:37, Alistair Grant <[hidden email]> wrote: >>>>>>> >>>>>>> Hi Esteban, >>>>>>> >>>>>>> I had no problems following the process (Ubuntu 16.04, >>>>>>> Pharo7.0-32bit-e175bc2.image, fogbugz 20872). :-) >>>>>>> >>>>>>> I guess that you have already thought of this, but... Is there any >>>>>>> reason why we can't just put up a dialog asking for the user's github >>>>>>> credentials and fogbugz issue number and then automatically clone the >>>>>>> repository, configure the upstream remote and create the issue branch. >>>>>>> That would remove most of the remaining manual steps. >>>>>>> >>>>>>> I realise that it only works for option 1, although where people >>>>>>> configure a common pharo-local, it could check for a pre-existing >>>>>>> clone and use that one. >>>>>>> >>>>>>> >>>>>>> "I realise” means you tried and it didn’t work? >>>>>>> because in my tests it worked as good as the first one (I tested on >>>>>>> windows), but that may need to be “re-validated” :) >>>>>>> >>>>>>> Esteban >>>>>>> >>>>>>> >>>>>>> The contribution process works fine (even on linux :-)). >>>>>>> >>>>>>> The "I realise" paragraph is a comment on my suggestion to try and >>>>>>> reduce the number of manual steps required (and is actually wrong). >>>>>>> Just to rephrase (and extend) the suggestion, I think we could create >>>>>>> a single dialog that currently covers the following steps (from your >>>>>>> instructions): >>>>>>> >>>>>>> 1. Clone a fresh repository, or point to an existing repository. >>>>>>> 2. Tell Iceberg about pharo-project >>>>>>> 3. Create a new branch from the fogbugz issue >>>>>>> >>>>>>> >>>>>>> ah, I got lost in translation ;) >>>>>>> >>>>>>> Esteban >>>>>>> >>>>>>> >>>>>>> Cheers, >>>>>>> Alistair >>>>>>> >>>>>>> >>>>>>> >>>>>>> >>>>>>> Cheers, >>>>>>> Alistair >>>>>>> >>>>>>> On 14 December 2017 at 13:19, Esteban Lorenzano <[hidden email]> wrote: >>>>>>> >>>>>>> Hi! >>>>>>> >>>>>>> I’m working on simplifying the contribution process, after collecting >>>>>>> opinions/experiences last couple of months. >>>>>>> As you know, Pharo contribution process is still WIP and we aim to have it >>>>>>> as smooth as possible for Pharo 7.0 release. Now, after observe the idea of >>>>>>> the “system repositories” was a bad idea because it introduced extra and non >>>>>>> standard “path” to contribution, I managed to remove that to reestablish >>>>>>> “the regular way”: you will now need to add pharo repository just as any >>>>>>> other repository you add, by cloning or adding local repository. >>>>>>> >>>>>>> I took Guille’s doc and moved it to pharo project (it does not has sense to >>>>>>> have it living in a contributor’s repository when is so important). You can >>>>>>> find it here: >>>>>>> >>>>>>> https://github.com/pharo-project/pharo/wiki/Contribute-a-fix-to-Pharo >>>>>>> >>>>>>> This document is also updated to reveal this new process, please read it. >>>>>>> >>>>>>> How to update your startup scripts? >>>>>>> Some people has added startup scripts to easy the first part of >>>>>>> contribution. Instead enabling system repositories, etc. you now need to >>>>>>> replace that with this: >>>>>>> >>>>>>> (IceRepositoryCreator new >>>>>>> location: '/path/to/pharo-project/pharo' asFileReference; >>>>>>> subdirectory: 'src'; >>>>>>> createRepository) >>>>>>> register >>>>>>> >>>>>>> PLEASE, PLEASE, PLEASE… take a moment to read and try the document. Is very >>>>>>> important that document reflects new process and works reliable in different >>>>>>> scenarios (I validated it on macOS and Windows, and assumed it worked fine >>>>>>> on linux but you know… bad assumptions is the base of failure ;) ) >>>>>>> >>>>>>> I’m eager to hear your feedback and continue enhancing the process. >>>>>>> >>>>>>> (yes, Stef, I know UI is still cumbersome… I’m working on that :) ) >>>>>>> >>>>>>> cheers! >>>>>>> Esteban >>>>>>> >>>>>>> > |
|
|
In reply to this post by Stephane Ducasse-3
> On 16 Dec 2017, at 17:39, Stephane Ducasse <[hidden email]> wrote: > > I committed my code for issue 20861 and I do not understand what I see > > I do not understand why I get local changes with empty packages. :( that’s a bug: there are no changes to commit (which is correct), but the refresh lets there the original packages. It is in the todo to correct this :) > > Stef > > On Sat, Dec 16, 2017 at 5:32 PM, Stephane Ducasse > <[hidden email]> wrote: >> I did a little pass on the wiki to make the flow clearer >> >> >> On Sat, Dec 16, 2017 at 5:26 PM, Stephane Ducasse >> <[hidden email]> wrote: >>> In the tutorial: >>> >>> - Put a little heading before >>> >>> "You need to add pharo repository as a remote >>> ([hidden email]:pharo-project/pharo.git)." >>> >>> On Sat, Dec 16, 2017 at 5:25 PM, Stephane Ducasse >>> <[hidden email]> wrote: >>>> I double clicked and it did a massive amount of stuff and finally told >>>> me that it is up to date. >>>> >>>> >>>> On Sat, Dec 16, 2017 at 5:24 PM, Stephane Ducasse >>>> <[hidden email]> wrote: >>>>> OK so I restarted everything from scratch: >>>>> - deleted my fork >>>>> - reforked >>>>> - clone pharo again >>>>> - here is some feedback >>>>> >>>>> In the tutorial add /pharo + src in the screenshot >>>>> >>>>> >>>>> Then when I add the local repository I get uncommited changes and I do >>>>> not understand why? >>>>> >>>>> >>>>> >>>>> >>>>> >>>>> On Sat, Dec 16, 2017 at 9:57 AM, Esteban Lorenzano <[hidden email]> wrote: >>>>>> >>>>>> >>>>>> On 16 Dec 2017, at 09:42, Alistair Grant <[hidden email]> wrote: >>>>>> >>>>>> Hi Esteban, >>>>>> >>>>>> On 16 December 2017 at 09:05, Esteban Lorenzano <[hidden email]> wrote: >>>>>> >>>>>> >>>>>> >>>>>> On 15 Dec 2017, at 17:37, Alistair Grant <[hidden email]> wrote: >>>>>> >>>>>> Hi Esteban, >>>>>> >>>>>> I had no problems following the process (Ubuntu 16.04, >>>>>> Pharo7.0-32bit-e175bc2.image, fogbugz 20872). :-) >>>>>> >>>>>> I guess that you have already thought of this, but... Is there any >>>>>> reason why we can't just put up a dialog asking for the user's github >>>>>> credentials and fogbugz issue number and then automatically clone the >>>>>> repository, configure the upstream remote and create the issue branch. >>>>>> That would remove most of the remaining manual steps. >>>>>> >>>>>> I realise that it only works for option 1, although where people >>>>>> configure a common pharo-local, it could check for a pre-existing >>>>>> clone and use that one. >>>>>> >>>>>> >>>>>> "I realise” means you tried and it didn’t work? >>>>>> because in my tests it worked as good as the first one (I tested on >>>>>> windows), but that may need to be “re-validated” :) >>>>>> >>>>>> Esteban >>>>>> >>>>>> >>>>>> The contribution process works fine (even on linux :-)). >>>>>> >>>>>> The "I realise" paragraph is a comment on my suggestion to try and >>>>>> reduce the number of manual steps required (and is actually wrong). >>>>>> Just to rephrase (and extend) the suggestion, I think we could create >>>>>> a single dialog that currently covers the following steps (from your >>>>>> instructions): >>>>>> >>>>>> 1. Clone a fresh repository, or point to an existing repository. >>>>>> 2. Tell Iceberg about pharo-project >>>>>> 3. Create a new branch from the fogbugz issue >>>>>> >>>>>> >>>>>> ah, I got lost in translation ;) >>>>>> >>>>>> Esteban >>>>>> >>>>>> >>>>>> Cheers, >>>>>> Alistair >>>>>> >>>>>> >>>>>> >>>>>> >>>>>> Cheers, >>>>>> Alistair >>>>>> >>>>>> On 14 December 2017 at 13:19, Esteban Lorenzano <[hidden email]> wrote: >>>>>> >>>>>> Hi! >>>>>> >>>>>> I’m working on simplifying the contribution process, after collecting >>>>>> opinions/experiences last couple of months. >>>>>> As you know, Pharo contribution process is still WIP and we aim to have it >>>>>> as smooth as possible for Pharo 7.0 release. Now, after observe the idea of >>>>>> the “system repositories” was a bad idea because it introduced extra and non >>>>>> standard “path” to contribution, I managed to remove that to reestablish >>>>>> “the regular way”: you will now need to add pharo repository just as any >>>>>> other repository you add, by cloning or adding local repository. >>>>>> >>>>>> I took Guille’s doc and moved it to pharo project (it does not has sense to >>>>>> have it living in a contributor’s repository when is so important). You can >>>>>> find it here: >>>>>> >>>>>> https://github.com/pharo-project/pharo/wiki/Contribute-a-fix-to-Pharo >>>>>> >>>>>> This document is also updated to reveal this new process, please read it. >>>>>> >>>>>> How to update your startup scripts? >>>>>> Some people has added startup scripts to easy the first part of >>>>>> contribution. Instead enabling system repositories, etc. you now need to >>>>>> replace that with this: >>>>>> >>>>>> (IceRepositoryCreator new >>>>>> location: '/path/to/pharo-project/pharo' asFileReference; >>>>>> subdirectory: 'src'; >>>>>> createRepository) >>>>>> register >>>>>> >>>>>> PLEASE, PLEASE, PLEASE… take a moment to read and try the document. Is very >>>>>> important that document reflects new process and works reliable in different >>>>>> scenarios (I validated it on macOS and Windows, and assumed it worked fine >>>>>> on linux but you know… bad assumptions is the base of failure ;) ) >>>>>> >>>>>> I’m eager to hear your feedback and continue enhancing the process. >>>>>> >>>>>> (yes, Stef, I know UI is still cumbersome… I’m working on that :) ) >>>>>> >>>>>> cheers! >>>>>> Esteban >>>>>> >>>>>> > <Screen Shot 2017-12-16 at 17.37.50.png> |
|
|
In reply to this post by Stephane Ducasse-3
> On 16 Dec 2017, at 17:32, Stephane Ducasse <[hidden email]> wrote: > > I did a little pass on the wiki to make the flow clearer cool! :) > > > On Sat, Dec 16, 2017 at 5:26 PM, Stephane Ducasse > <[hidden email]> wrote: >> In the tutorial: >> >> - Put a little heading before >> >> "You need to add pharo repository as a remote >> ([hidden email]:pharo-project/pharo.git)." >> >> On Sat, Dec 16, 2017 at 5:25 PM, Stephane Ducasse >> <[hidden email]> wrote: >>> I double clicked and it did a massive amount of stuff and finally told >>> me that it is up to date. >>> >>> >>> On Sat, Dec 16, 2017 at 5:24 PM, Stephane Ducasse >>> <[hidden email]> wrote: >>>> OK so I restarted everything from scratch: >>>> - deleted my fork >>>> - reforked >>>> - clone pharo again >>>> - here is some feedback >>>> >>>> In the tutorial add /pharo + src in the screenshot >>>> >>>> >>>> Then when I add the local repository I get uncommited changes and I do >>>> not understand why? >>>> >>>> >>>> >>>> >>>> >>>> On Sat, Dec 16, 2017 at 9:57 AM, Esteban Lorenzano <[hidden email]> wrote: >>>>> >>>>> >>>>> On 16 Dec 2017, at 09:42, Alistair Grant <[hidden email]> wrote: >>>>> >>>>> Hi Esteban, >>>>> >>>>> On 16 December 2017 at 09:05, Esteban Lorenzano <[hidden email]> wrote: >>>>> >>>>> >>>>> >>>>> On 15 Dec 2017, at 17:37, Alistair Grant <[hidden email]> wrote: >>>>> >>>>> Hi Esteban, >>>>> >>>>> I had no problems following the process (Ubuntu 16.04, >>>>> Pharo7.0-32bit-e175bc2.image, fogbugz 20872). :-) >>>>> >>>>> I guess that you have already thought of this, but... Is there any >>>>> reason why we can't just put up a dialog asking for the user's github >>>>> credentials and fogbugz issue number and then automatically clone the >>>>> repository, configure the upstream remote and create the issue branch. >>>>> That would remove most of the remaining manual steps. >>>>> >>>>> I realise that it only works for option 1, although where people >>>>> configure a common pharo-local, it could check for a pre-existing >>>>> clone and use that one. >>>>> >>>>> >>>>> "I realise” means you tried and it didn’t work? >>>>> because in my tests it worked as good as the first one (I tested on >>>>> windows), but that may need to be “re-validated” :) >>>>> >>>>> Esteban >>>>> >>>>> >>>>> The contribution process works fine (even on linux :-)). >>>>> >>>>> The "I realise" paragraph is a comment on my suggestion to try and >>>>> reduce the number of manual steps required (and is actually wrong). >>>>> Just to rephrase (and extend) the suggestion, I think we could create >>>>> a single dialog that currently covers the following steps (from your >>>>> instructions): >>>>> >>>>> 1. Clone a fresh repository, or point to an existing repository. >>>>> 2. Tell Iceberg about pharo-project >>>>> 3. Create a new branch from the fogbugz issue >>>>> >>>>> >>>>> ah, I got lost in translation ;) >>>>> >>>>> Esteban >>>>> >>>>> >>>>> Cheers, >>>>> Alistair >>>>> >>>>> >>>>> >>>>> >>>>> Cheers, >>>>> Alistair >>>>> >>>>> On 14 December 2017 at 13:19, Esteban Lorenzano <[hidden email]> wrote: >>>>> >>>>> Hi! >>>>> >>>>> I’m working on simplifying the contribution process, after collecting >>>>> opinions/experiences last couple of months. >>>>> As you know, Pharo contribution process is still WIP and we aim to have it >>>>> as smooth as possible for Pharo 7.0 release. Now, after observe the idea of >>>>> the “system repositories” was a bad idea because it introduced extra and non >>>>> standard “path” to contribution, I managed to remove that to reestablish >>>>> “the regular way”: you will now need to add pharo repository just as any >>>>> other repository you add, by cloning or adding local repository. >>>>> >>>>> I took Guille’s doc and moved it to pharo project (it does not has sense to >>>>> have it living in a contributor’s repository when is so important). You can >>>>> find it here: >>>>> >>>>> https://github.com/pharo-project/pharo/wiki/Contribute-a-fix-to-Pharo >>>>> >>>>> This document is also updated to reveal this new process, please read it. >>>>> >>>>> How to update your startup scripts? >>>>> Some people has added startup scripts to easy the first part of >>>>> contribution. Instead enabling system repositories, etc. you now need to >>>>> replace that with this: >>>>> >>>>> (IceRepositoryCreator new >>>>> location: '/path/to/pharo-project/pharo' asFileReference; >>>>> subdirectory: 'src'; >>>>> createRepository) >>>>> register >>>>> >>>>> PLEASE, PLEASE, PLEASE… take a moment to read and try the document. Is very >>>>> important that document reflects new process and works reliable in different >>>>> scenarios (I validated it on macOS and Windows, and assumed it worked fine >>>>> on linux but you know… bad assumptions is the base of failure ;) ) >>>>> >>>>> I’m eager to hear your feedback and continue enhancing the process. >>>>> >>>>> (yes, Stef, I know UI is still cumbersome… I’m working on that :) ) >>>>> >>>>> cheers! >>>>> Esteban >>>>> >>>>> > |
|
|
In reply to this post by Stephane Ducasse-3
> On 16 Dec 2017, at 17:24, Stephane Ducasse <[hidden email]> wrote: > > OK so I restarted everything from scratch: > - deleted my fork > - reforked > - clone pharo again > - here is some feedback > > In the tutorial add /pharo + src in the screenshot > > > Then when I add the local repository I get uncommited changes and I do > not understand why? this is also a bug (or something I still do not fully understand why it happens). This needs to be corrected with the new UI Esteban > > > > > > On Sat, Dec 16, 2017 at 9:57 AM, Esteban Lorenzano <[hidden email]> wrote: >> >> >> On 16 Dec 2017, at 09:42, Alistair Grant <[hidden email]> wrote: >> >> Hi Esteban, >> >> On 16 December 2017 at 09:05, Esteban Lorenzano <[hidden email]> wrote: >> >> >> >> On 15 Dec 2017, at 17:37, Alistair Grant <[hidden email]> wrote: >> >> Hi Esteban, >> >> I had no problems following the process (Ubuntu 16.04, >> Pharo7.0-32bit-e175bc2.image, fogbugz 20872). :-) >> >> I guess that you have already thought of this, but... Is there any >> reason why we can't just put up a dialog asking for the user's github >> credentials and fogbugz issue number and then automatically clone the >> repository, configure the upstream remote and create the issue branch. >> That would remove most of the remaining manual steps. >> >> I realise that it only works for option 1, although where people >> configure a common pharo-local, it could check for a pre-existing >> clone and use that one. >> >> >> "I realise” means you tried and it didn’t work? >> because in my tests it worked as good as the first one (I tested on >> windows), but that may need to be “re-validated” :) >> >> Esteban >> >> >> The contribution process works fine (even on linux :-)). >> >> The "I realise" paragraph is a comment on my suggestion to try and >> reduce the number of manual steps required (and is actually wrong). >> Just to rephrase (and extend) the suggestion, I think we could create >> a single dialog that currently covers the following steps (from your >> instructions): >> >> 1. Clone a fresh repository, or point to an existing repository. >> 2. Tell Iceberg about pharo-project >> 3. Create a new branch from the fogbugz issue >> >> >> ah, I got lost in translation ;) >> >> Esteban >> >> >> Cheers, >> Alistair >> >> >> >> >> Cheers, >> Alistair >> >> On 14 December 2017 at 13:19, Esteban Lorenzano <[hidden email]> wrote: >> >> Hi! >> >> I’m working on simplifying the contribution process, after collecting >> opinions/experiences last couple of months. >> As you know, Pharo contribution process is still WIP and we aim to have it >> as smooth as possible for Pharo 7.0 release. Now, after observe the idea of >> the “system repositories” was a bad idea because it introduced extra and non >> standard “path” to contribution, I managed to remove that to reestablish >> “the regular way”: you will now need to add pharo repository just as any >> other repository you add, by cloning or adding local repository. >> >> I took Guille’s doc and moved it to pharo project (it does not has sense to >> have it living in a contributor’s repository when is so important). You can >> find it here: >> >> https://github.com/pharo-project/pharo/wiki/Contribute-a-fix-to-Pharo >> >> This document is also updated to reveal this new process, please read it. >> >> How to update your startup scripts? >> Some people has added startup scripts to easy the first part of >> contribution. Instead enabling system repositories, etc. you now need to >> replace that with this: >> >> (IceRepositoryCreator new >> location: '/path/to/pharo-project/pharo' asFileReference; >> subdirectory: 'src'; >> createRepository) >> register >> >> PLEASE, PLEASE, PLEASE… take a moment to read and try the document. Is very >> important that document reflects new process and works reliable in different >> scenarios (I validated it on macOS and Windows, and assumed it worked fine >> on linux but you know… bad assumptions is the base of failure ;) ) >> >> I’m eager to hear your feedback and continue enhancing the process. >> >> (yes, Stef, I know UI is still cumbersome… I’m working on that :) ) >> >> cheers! >> Esteban >> >> > <Screen Shot 2017-12-16 at 17.23.53.png> |
Re: [IMPORTANT] PHARO CONTRIBUTION PROCESS UPDATED! PLEASE READ!
|
|
In reply to this post by EstebanLM
Sure I need because I stage my work. So I need something to be
integrated to use it. On Sat, Dec 16, 2017 at 6:53 PM, Esteban Lorenzano <[hidden email]> wrote: > > >> On 16 Dec 2017, at 17:55, Stephane Ducasse <[hidden email]> wrote: >> >> Hi Esteban >> >> Now how can I maintain my fork up to date? > > there is a “synchronise repositories” option there, at the side of “create branch from fogbugz”. > >> This is not in the tutorial and to me it was a major problem and a big >> source of pain. > > it is not there because you do not need it. > when you “create branch from fogbugz”, it will take your image version and branch from there. Then, when you push to your remote, you will push correctly. There is no need to have syncd the forks to contribute… > > Now, if you do “synchronise repositories”, it will take what is in pharo-project/pharo/development branch and it will sync that with your pharo/development branch. But again… there is no need to do this to contribute. > > Esteban > >> Stef >> >> On Sat, Dec 16, 2017 at 5:39 PM, Stephane Ducasse >> <[hidden email]> wrote: >>> I committed my code for issue 20861 and I do not understand what I see >>> >>> I do not understand why I get local changes with empty packages. :( >>> >>> Stef >>> >>> On Sat, Dec 16, 2017 at 5:32 PM, Stephane Ducasse >>> <[hidden email]> wrote: >>>> I did a little pass on the wiki to make the flow clearer >>>> >>>> >>>> On Sat, Dec 16, 2017 at 5:26 PM, Stephane Ducasse >>>> <[hidden email]> wrote: >>>>> In the tutorial: >>>>> >>>>> - Put a little heading before >>>>> >>>>> "You need to add pharo repository as a remote >>>>> ([hidden email]:pharo-project/pharo.git)." >>>>> >>>>> On Sat, Dec 16, 2017 at 5:25 PM, Stephane Ducasse >>>>> <[hidden email]> wrote: >>>>>> I double clicked and it did a massive amount of stuff and finally told >>>>>> me that it is up to date. >>>>>> >>>>>> >>>>>> On Sat, Dec 16, 2017 at 5:24 PM, Stephane Ducasse >>>>>> <[hidden email]> wrote: >>>>>>> OK so I restarted everything from scratch: >>>>>>> - deleted my fork >>>>>>> - reforked >>>>>>> - clone pharo again >>>>>>> - here is some feedback >>>>>>> >>>>>>> In the tutorial add /pharo + src in the screenshot >>>>>>> >>>>>>> >>>>>>> Then when I add the local repository I get uncommited changes and I do >>>>>>> not understand why? >>>>>>> >>>>>>> >>>>>>> >>>>>>> >>>>>>> >>>>>>> On Sat, Dec 16, 2017 at 9:57 AM, Esteban Lorenzano <[hidden email]> wrote: >>>>>>>> >>>>>>>> >>>>>>>> On 16 Dec 2017, at 09:42, Alistair Grant <[hidden email]> wrote: >>>>>>>> >>>>>>>> Hi Esteban, >>>>>>>> >>>>>>>> On 16 December 2017 at 09:05, Esteban Lorenzano <[hidden email]> wrote: >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> On 15 Dec 2017, at 17:37, Alistair Grant <[hidden email]> wrote: >>>>>>>> >>>>>>>> Hi Esteban, >>>>>>>> >>>>>>>> I had no problems following the process (Ubuntu 16.04, >>>>>>>> Pharo7.0-32bit-e175bc2.image, fogbugz 20872). :-) >>>>>>>> >>>>>>>> I guess that you have already thought of this, but... Is there any >>>>>>>> reason why we can't just put up a dialog asking for the user's github >>>>>>>> credentials and fogbugz issue number and then automatically clone the >>>>>>>> repository, configure the upstream remote and create the issue branch. >>>>>>>> That would remove most of the remaining manual steps. >>>>>>>> >>>>>>>> I realise that it only works for option 1, although where people >>>>>>>> configure a common pharo-local, it could check for a pre-existing >>>>>>>> clone and use that one. >>>>>>>> >>>>>>>> >>>>>>>> "I realise” means you tried and it didn’t work? >>>>>>>> because in my tests it worked as good as the first one (I tested on >>>>>>>> windows), but that may need to be “re-validated” :) >>>>>>>> >>>>>>>> Esteban >>>>>>>> >>>>>>>> >>>>>>>> The contribution process works fine (even on linux :-)). >>>>>>>> >>>>>>>> The "I realise" paragraph is a comment on my suggestion to try and >>>>>>>> reduce the number of manual steps required (and is actually wrong). >>>>>>>> Just to rephrase (and extend) the suggestion, I think we could create >>>>>>>> a single dialog that currently covers the following steps (from your >>>>>>>> instructions): >>>>>>>> >>>>>>>> 1. Clone a fresh repository, or point to an existing repository. >>>>>>>> 2. Tell Iceberg about pharo-project >>>>>>>> 3. Create a new branch from the fogbugz issue >>>>>>>> >>>>>>>> >>>>>>>> ah, I got lost in translation ;) >>>>>>>> >>>>>>>> Esteban >>>>>>>> >>>>>>>> >>>>>>>> Cheers, >>>>>>>> Alistair >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> Cheers, >>>>>>>> Alistair >>>>>>>> >>>>>>>> On 14 December 2017 at 13:19, Esteban Lorenzano <[hidden email]> wrote: >>>>>>>> >>>>>>>> Hi! >>>>>>>> >>>>>>>> I’m working on simplifying the contribution process, after collecting >>>>>>>> opinions/experiences last couple of months. >>>>>>>> As you know, Pharo contribution process is still WIP and we aim to have it >>>>>>>> as smooth as possible for Pharo 7.0 release. Now, after observe the idea of >>>>>>>> the “system repositories” was a bad idea because it introduced extra and non >>>>>>>> standard “path” to contribution, I managed to remove that to reestablish >>>>>>>> “the regular way”: you will now need to add pharo repository just as any >>>>>>>> other repository you add, by cloning or adding local repository. >>>>>>>> >>>>>>>> I took Guille’s doc and moved it to pharo project (it does not has sense to >>>>>>>> have it living in a contributor’s repository when is so important). You can >>>>>>>> find it here: >>>>>>>> >>>>>>>> https://github.com/pharo-project/pharo/wiki/Contribute-a-fix-to-Pharo >>>>>>>> >>>>>>>> This document is also updated to reveal this new process, please read it. >>>>>>>> >>>>>>>> How to update your startup scripts? >>>>>>>> Some people has added startup scripts to easy the first part of >>>>>>>> contribution. Instead enabling system repositories, etc. you now need to >>>>>>>> replace that with this: >>>>>>>> >>>>>>>> (IceRepositoryCreator new >>>>>>>> location: '/path/to/pharo-project/pharo' asFileReference; >>>>>>>> subdirectory: 'src'; >>>>>>>> createRepository) >>>>>>>> register >>>>>>>> >>>>>>>> PLEASE, PLEASE, PLEASE… take a moment to read and try the document. Is very >>>>>>>> important that document reflects new process and works reliable in different >>>>>>>> scenarios (I validated it on macOS and Windows, and assumed it worked fine >>>>>>>> on linux but you know… bad assumptions is the base of failure ;) ) >>>>>>>> >>>>>>>> I’m eager to hear your feedback and continue enhancing the process. >>>>>>>> >>>>>>>> (yes, Stef, I know UI is still cumbersome… I’m working on that :) ) >>>>>>>> >>>>>>>> cheers! >>>>>>>> Esteban >>>>>>>> >>>>>>>> >> > > |
Re: [IMPORTANT] PHARO CONTRIBUTION PROCESS UPDATED! PLEASE READ!
|
|
BTW I do not understand why I have changes that I do not do in my image
it displays the changes with a dot and the end. And also I do not get why the class comment get changed when I do not do anything. Do you experience the same? BTW I did the pull from pharo and push to my fork by hand to synchronise. So I will try the synchronise menu item. I saw it but did not dare to use it. On Sat, Dec 16, 2017 at 9:48 PM, Stephane Ducasse <[hidden email]> wrote: > Sure I need because I stage my work. So I need something to be > integrated to use it. > > On Sat, Dec 16, 2017 at 6:53 PM, Esteban Lorenzano <[hidden email]> wrote: >> >> >>> On 16 Dec 2017, at 17:55, Stephane Ducasse <[hidden email]> wrote: >>> >>> Hi Esteban >>> >>> Now how can I maintain my fork up to date? >> >> there is a “synchronise repositories” option there, at the side of “create branch from fogbugz”. >> >>> This is not in the tutorial and to me it was a major problem and a big >>> source of pain. >> >> it is not there because you do not need it. >> when you “create branch from fogbugz”, it will take your image version and branch from there. Then, when you push to your remote, you will push correctly. There is no need to have syncd the forks to contribute… >> >> Now, if you do “synchronise repositories”, it will take what is in pharo-project/pharo/development branch and it will sync that with your pharo/development branch. But again… there is no need to do this to contribute. >> >> Esteban >> >>> Stef >>> >>> On Sat, Dec 16, 2017 at 5:39 PM, Stephane Ducasse >>> <[hidden email]> wrote: >>>> I committed my code for issue 20861 and I do not understand what I see >>>> >>>> I do not understand why I get local changes with empty packages. :( >>>> >>>> Stef >>>> >>>> On Sat, Dec 16, 2017 at 5:32 PM, Stephane Ducasse >>>> <[hidden email]> wrote: >>>>> I did a little pass on the wiki to make the flow clearer >>>>> >>>>> >>>>> On Sat, Dec 16, 2017 at 5:26 PM, Stephane Ducasse >>>>> <[hidden email]> wrote: >>>>>> In the tutorial: >>>>>> >>>>>> - Put a little heading before >>>>>> >>>>>> "You need to add pharo repository as a remote >>>>>> ([hidden email]:pharo-project/pharo.git)." >>>>>> >>>>>> On Sat, Dec 16, 2017 at 5:25 PM, Stephane Ducasse >>>>>> <[hidden email]> wrote: >>>>>>> I double clicked and it did a massive amount of stuff and finally told >>>>>>> me that it is up to date. >>>>>>> >>>>>>> >>>>>>> On Sat, Dec 16, 2017 at 5:24 PM, Stephane Ducasse >>>>>>> <[hidden email]> wrote: >>>>>>>> OK so I restarted everything from scratch: >>>>>>>> - deleted my fork >>>>>>>> - reforked >>>>>>>> - clone pharo again >>>>>>>> - here is some feedback >>>>>>>> >>>>>>>> In the tutorial add /pharo + src in the screenshot >>>>>>>> >>>>>>>> >>>>>>>> Then when I add the local repository I get uncommited changes and I do >>>>>>>> not understand why? >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> On Sat, Dec 16, 2017 at 9:57 AM, Esteban Lorenzano <[hidden email]> wrote: >>>>>>>>> >>>>>>>>> >>>>>>>>> On 16 Dec 2017, at 09:42, Alistair Grant <[hidden email]> wrote: >>>>>>>>> >>>>>>>>> Hi Esteban, >>>>>>>>> >>>>>>>>> On 16 December 2017 at 09:05, Esteban Lorenzano <[hidden email]> wrote: >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> On 15 Dec 2017, at 17:37, Alistair Grant <[hidden email]> wrote: >>>>>>>>> >>>>>>>>> Hi Esteban, >>>>>>>>> >>>>>>>>> I had no problems following the process (Ubuntu 16.04, >>>>>>>>> Pharo7.0-32bit-e175bc2.image, fogbugz 20872). :-) >>>>>>>>> >>>>>>>>> I guess that you have already thought of this, but... Is there any >>>>>>>>> reason why we can't just put up a dialog asking for the user's github >>>>>>>>> credentials and fogbugz issue number and then automatically clone the >>>>>>>>> repository, configure the upstream remote and create the issue branch. >>>>>>>>> That would remove most of the remaining manual steps. >>>>>>>>> >>>>>>>>> I realise that it only works for option 1, although where people >>>>>>>>> configure a common pharo-local, it could check for a pre-existing >>>>>>>>> clone and use that one. >>>>>>>>> >>>>>>>>> >>>>>>>>> "I realise” means you tried and it didn’t work? >>>>>>>>> because in my tests it worked as good as the first one (I tested on >>>>>>>>> windows), but that may need to be “re-validated” :) >>>>>>>>> >>>>>>>>> Esteban >>>>>>>>> >>>>>>>>> >>>>>>>>> The contribution process works fine (even on linux :-)). >>>>>>>>> >>>>>>>>> The "I realise" paragraph is a comment on my suggestion to try and >>>>>>>>> reduce the number of manual steps required (and is actually wrong). >>>>>>>>> Just to rephrase (and extend) the suggestion, I think we could create >>>>>>>>> a single dialog that currently covers the following steps (from your >>>>>>>>> instructions): >>>>>>>>> >>>>>>>>> 1. Clone a fresh repository, or point to an existing repository. >>>>>>>>> 2. Tell Iceberg about pharo-project >>>>>>>>> 3. Create a new branch from the fogbugz issue >>>>>>>>> >>>>>>>>> >>>>>>>>> ah, I got lost in translation ;) >>>>>>>>> >>>>>>>>> Esteban >>>>>>>>> >>>>>>>>> >>>>>>>>> Cheers, >>>>>>>>> Alistair >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> Cheers, >>>>>>>>> Alistair >>>>>>>>> >>>>>>>>> On 14 December 2017 at 13:19, Esteban Lorenzano <[hidden email]> wrote: >>>>>>>>> >>>>>>>>> Hi! >>>>>>>>> >>>>>>>>> I’m working on simplifying the contribution process, after collecting >>>>>>>>> opinions/experiences last couple of months. >>>>>>>>> As you know, Pharo contribution process is still WIP and we aim to have it >>>>>>>>> as smooth as possible for Pharo 7.0 release. Now, after observe the idea of >>>>>>>>> the “system repositories” was a bad idea because it introduced extra and non >>>>>>>>> standard “path” to contribution, I managed to remove that to reestablish >>>>>>>>> “the regular way”: you will now need to add pharo repository just as any >>>>>>>>> other repository you add, by cloning or adding local repository. >>>>>>>>> >>>>>>>>> I took Guille’s doc and moved it to pharo project (it does not has sense to >>>>>>>>> have it living in a contributor’s repository when is so important). You can >>>>>>>>> find it here: >>>>>>>>> >>>>>>>>> https://github.com/pharo-project/pharo/wiki/Contribute-a-fix-to-Pharo >>>>>>>>> >>>>>>>>> This document is also updated to reveal this new process, please read it. >>>>>>>>> >>>>>>>>> How to update your startup scripts? >>>>>>>>> Some people has added startup scripts to easy the first part of >>>>>>>>> contribution. Instead enabling system repositories, etc. you now need to >>>>>>>>> replace that with this: >>>>>>>>> >>>>>>>>> (IceRepositoryCreator new >>>>>>>>> location: '/path/to/pharo-project/pharo' asFileReference; >>>>>>>>> subdirectory: 'src'; >>>>>>>>> createRepository) >>>>>>>>> register >>>>>>>>> >>>>>>>>> PLEASE, PLEASE, PLEASE… take a moment to read and try the document. Is very >>>>>>>>> important that document reflects new process and works reliable in different >>>>>>>>> scenarios (I validated it on macOS and Windows, and assumed it worked fine >>>>>>>>> on linux but you know… bad assumptions is the base of failure ;) ) >>>>>>>>> >>>>>>>>> I’m eager to hear your feedback and continue enhancing the process. >>>>>>>>> >>>>>>>>> (yes, Stef, I know UI is still cumbersome… I’m working on that :) ) >>>>>>>>> >>>>>>>>> cheers! >>>>>>>>> Esteban >>>>>>>>> >>>>>>>>> >>> >> >> |
Re: [IMPORTANT] PHARO CONTRIBUTION PROCESS UPDATED! PLEASE READ!
|
|
Hi. Full sync helps but now there are other changes which I did not do. 2017-12-16 21:50 GMT+01:00 Stephane Ducasse <[hidden email]>: BTW I do not understand why I have changes that I do not do in my image |
|
|
In reply to this post by EstebanLM
On 14 December 2017 at 20:19, Esteban Lorenzano <[hidden email]> wrote: Local Directory (default) = /home/ben/Pharo/images/FastTable-Pharo-7.0.0-alpha.build.402.sha.d5d4c99.arch.64bit-01/pharo-local/iceberg
with my pharo branch "22 commits behind pharo-project:master" From PharoLauncher, I created fresh latest image from Pharo-7.0.0-alpha.build.408.sha.5369e34.arch.64bit (btw, download took about 30 seconds which was reasonably good) Opened image WorldMenu > Iceberg Iceberg > Clone Repository Remote URL = [hidden email]:bencoman/pharo.git Code subdirectory = src <Create Repository> A bit disconcerting that for about 1.5 minutes the UI is frozen, but eventually "pharo" entry appears in IceBerg with... Name = *pharo Current branch = master Loaded version = fc92bbe (7 July 2017) Status = uncommitted changes Right-clicked on *pharo > Synchronise repository up popped dialog "Synchronising" on tab [Commit your changes] with about 800 changes with all items ticked. (btw, I clicked <Refresh Tree> all the changes are unticked, and only the three toplevel items GT-Spotter, Kernel & Reflectivity are ticked. Is that ideal? What is the typical use case of that button. Anyway, I close the dialog, and again right-click on *pharo > Synchronise repository) (btw, reviewing change here is nice.) A bit disconcerting that buttons <Commit onto master> and <Commit and push onto master> are both disabled so there is no action I can do from this default, so I proceed to [Push] tab. I'm feel unsure whether there should be some item listed under "New local commits to be published" (there are none) but pushing <Publish all> seems the only thing possible, so I do that. That seems to complete after 10 seconds, but still status = "Uncommitted changes" in the main Iceberg window. Opening a new IceBerg window shows the same thing. So what more do I need to do to get my Pharo repo "Up to date" ? cheers -ben |
|
|
On 5 January 2018 at 14:56, Ben Coman <[hidden email]> wrote:
<snip>
Thanks to Esteban's help, I learnt that you have to enter a commit message before the buttons are enabled (duh me!) Now given the Iceberg trouble with Ubuntu 64bit, I reverted to 32 bit and followed the wiki Contribute-a-fix-to-Pharo as closely as I could... $ mkdir -p ~/dev/Pharo/Contribute && cd ~/dev/Pharo/Contribute $ wget -O- get.pharo.org/70+vm | bash $ ./pharo-ui Pharo.image On github, I deleted my existing fork and reforked from pharo-project/pharo. My SSH keys were previously set up... $ ls -1 ~/.ssh id_rsa id_rsa.pub known_hosts $ $ ssh -T [hidden email] Hi bencoman! You've successfully authenticated, but GitHub does not provide shell access. In Pharo... World menu > Iceberg > Clone Repository Remote URL = [hidden email]:bencoman/pharo. Local Directory (default) = /home/ben/dev/Pharo/Contribute/pharo-local/iceberg Code subdirectory = src Clicked <Create Repository> Interesting that the created row "pharo" repository now defaults to the "development" branch. Previously it was defaulting to the "master" branch and part of my difficulty was trying to get onto the "up to date" development branch. This pharo "development" branch status has "uncommitted changes" so right-clicked "pharo" > Synchronise repository. The dialog that came up shows an empty "Local changes" tab. Because it didn't feel right to create a commit for empty changes, I was momentarily confused by this since this dialog covered the parent window where the repo status had changed to "up to date". Yay! [btw, Would it be possible (i.e. make sense) to avoid bringing up this dialog when there are empty changes and just display an #inform: message "No changes" ?] Clicked on [Remotes] tab > Add remote Remote name = pharo-project Remote url = [hidden email]:pharo-project/pharo.git Right clicked "pharo" > Pharo > Create new branch from Fogbugz issue... 20937 clicked <Create> Great! the main Iceberg window shows I've changed to that branch and its up to date. Made some changes. Right clicked on "pharo" > Synchronise... Entered commit comment and clicked <Commit onto 20937...> Clicked on [Push] tab > Publish all Github shows my commit. Yay! I can see it here... Now this is not complete but at the point where I'm seeking advise on how to approach the next step. Following the philosophy that PRs are not just for finished code but a good way to seek collaboration, back in Pharo... rightclicked on "pharo > Github > Create pull request... entered username & password The dialog defaults for "New pull request" looked okay, so clicked <Create a pull request> And I can see my PR here... Yay! Finally cracked it. The start of my first Pharo 7 contribution. I very much like this new workflow. thx esteban. A couple of things would make it even smoother. a. An option to save details of my personal fork to auto-fill the Create Repository dialog fields in a fresh image anywhere on my system. b. An menu item or button to auto-fill the pharo-project remote. Now hopefully someone familiar with FastTable can review my PR and discuss options to implement the next step for horizontal scrolling. cheers -ben |
Re: [IMPORTANT] PHARO CONTRIBUTION PROCESS UPDATED! PLEASE READ!
|
|
Hi Ben,
On 8 January 2018 at 17:34, Ben Coman <[hidden email]> wrote: > > [ snip ] > > A couple of things would make it even smoother. > a. An option to save details of my personal fork to auto-fill the Create > Repository dialog fields in a fresh image anywhere on my system. > b. An menu item or button to auto-fill the pharo-project remote. This is the script I used last time to reduce the number of manual steps. I haven't had a chance to validate it properly, but hopefully it will help. Run this in a clean image... | username pharoRepository | Author fullName: '<YourName>'. username := '<YourGitUsername>'. pharoRepository := (IceRepositoryCreator new remote: (IceRemote url: '[hidden email]:', username, '/pharo.git'); subdirectory: 'src'; createRepository) register. pharoRepository addRemote: (IceRemote name: 'pharo-project' url: '[hidden email]:pharo-project/pharo.git'). (IcePharoCreateBranchFromIssue on: pharoRepository) execute. 'Loaded pharo-core' inspect. > Now hopefully someone familiar with FastTable can review my PR > and discuss options to implement the next step for horizontal scrolling. > > cheers -ben |
|
|
this is done usually through startup actions. for example, I have: StartupPreferencesLoader default executeAtomicItems: { StartupAction name: 'Iceberg' code: [ Iceberg enableMetacelloIntegration: true. IceRepository shareRepositoriesBetweenImages: true; sharedRepositoriesLocationString: '/Users/esteban/Dev/Repository'. (IceRepositoryCreator new location: '/Users/esteban/Dev/Repository/pharo-project/pharo' asFileReference; subdirectory: 'src'; createRepository) register ] runOnce: true. }. (you put that in an “iceberg.st” in /Users/esteban/Library/Preferences/pharo/7.0 (or the equivalent for your platform, that you can find executing FileLocator preferences fullName) Esteban
|
Re: [IMPORTANT] PHARO CONTRIBUTION PROCESS UPDATED! PLEASE READ!
|
Administrator
|
In reply to this post by EstebanLM
EstebanLM wrote
> PLEASE, PLEASE, PLEASE… take a moment to read and try the document. I added my local pharo fork clone and got the red Morphic square of death in Iceberg. Closing and restarting Iceberg failed with: "LGit_GIT_ENOTFOUND: Object not found - no match for id (b98b37b641381ac07906c020bbc8b4675ed4027b)" Image ----- Pharo7.0alpha Build information: Pharo-7.0+alpha.build.414.sha.53eba9479e615417df06b782fc663e9a9407a404 (32 Bit) Unnamed Virtual Machine --------------- ~/Documents/Pharo/vms/70-x86/Pharo.app/Contents/MacOS/Pharo CoInterpreter VMMaker.oscog-eem.2265 uuid: 76b62109-629a-4c39-9641-67b53321df9a Aug 27 2017 StackToRegisterMappingCogit VMMaker.oscog-eem.2262 uuid: 8b531242-de02-48aa-b418-8d2dde0bec6c Aug 27 2017 VM: 201708271955 https://github.com/OpenSmalltalk/opensmalltalk-vm.git $ Date: Sun Aug 27 21:55:26 2017 +0200 $ Plugins: 201708271955 https://github.com/OpenSmalltalk/opensmalltalk-vm.git $ Mac OS X built on Aug 27 2017 20:27:09 UTC Compiler: 4.2.1 Compatible Apple LLVM 6.1.0 (clang-602.0.53) VMMaker versionString VM: 201708271955 https://github.com/OpenSmalltalk/opensmalltalk-vm.git $ Date: Sun Aug 27 21:55:26 2017 +0200 $ Plugins: 201708271955 https://github.com/OpenSmalltalk/opensmalltalk-vm.git $ CoInterpreter VMMaker.oscog-eem.2265 uuid: 76b62109-629a-4c39-9641-67b53321df9a Aug 27 2017 StackToRegisterMappingCogit VMMaker.oscog-eem.2262 uuid: 8b531242-de02-48aa-b418-8d2dde0bec6c Aug 27 2017 Operating System/Hardware ------------------------- Mac OS 1013.2 intel ----- Cheers, Sean -- Sent from: http://forum.world.st/Pharo-Smalltalk-Developers-f1294837.html
Cheers,
Sean |
Re: [IMPORTANT] PHARO CONTRIBUTION PROCESS UPDATED! PLEASE READ!
|
|
Hi Sean,
On 9 January 2018 at 05:00, Sean P. DeNigris <[hidden email]> wrote: > EstebanLM wrote >> PLEASE, PLEASE, PLEASE… take a moment to read and try the document. > > I added my local pharo fork clone and got the red Morphic square of death in > Iceberg. Closing and restarting Iceberg failed with: "LGit_GIT_ENOTFOUND: > Object not found - no match for id > (b98b37b641381ac07906c020bbc8b4675ed4027b)" I'm getting the LGit_GIT_ENOTFOUND when I load a clean image. The id appears to be the commit id from a different repository (in my case it happens to be the repository directly under the one with the error). I haven't looked in to this further yet, but the short term workaround is to reload all the packages in the repository with the error. Cheers, Alistair > Image > ----- > Pharo7.0alpha > Build information: > Pharo-7.0+alpha.build.414.sha.53eba9479e615417df06b782fc663e9a9407a404 (32 > Bit) > Unnamed > > Virtual Machine > --------------- > ~/Documents/Pharo/vms/70-x86/Pharo.app/Contents/MacOS/Pharo > CoInterpreter VMMaker.oscog-eem.2265 uuid: > 76b62109-629a-4c39-9641-67b53321df9a Aug 27 2017 > StackToRegisterMappingCogit VMMaker.oscog-eem.2262 uuid: > 8b531242-de02-48aa-b418-8d2dde0bec6c Aug 27 2017 > VM: 201708271955 https://github.com/OpenSmalltalk/opensmalltalk-vm.git $ > Date: Sun Aug 27 21:55:26 2017 +0200 $ Plugins: 201708271955 > https://github.com/OpenSmalltalk/opensmalltalk-vm.git $ > > Mac OS X built on Aug 27 2017 20:27:09 UTC Compiler: 4.2.1 Compatible Apple > LLVM 6.1.0 (clang-602.0.53) > VMMaker versionString VM: 201708271955 > https://github.com/OpenSmalltalk/opensmalltalk-vm.git $ Date: Sun Aug 27 > 21:55:26 2017 +0200 $ Plugins: 201708271955 > https://github.com/OpenSmalltalk/opensmalltalk-vm.git $ > CoInterpreter VMMaker.oscog-eem.2265 uuid: > 76b62109-629a-4c39-9641-67b53321df9a Aug 27 2017 > StackToRegisterMappingCogit VMMaker.oscog-eem.2262 uuid: > 8b531242-de02-48aa-b418-8d2dde0bec6c Aug 27 2017 > > Operating System/Hardware > ------------------------- > Mac OS 1013.2 intel > > > > > > ----- > Cheers, > Sean > -- > Sent from: http://forum.world.st/Pharo-Smalltalk-Developers-f1294837.html > |
|
|
> On 9 Jan 2018, at 08:22, Alistair Grant <[hidden email]> wrote: > > Hi Sean, > > On 9 January 2018 at 05:00, Sean P. DeNigris <[hidden email]> wrote: >> EstebanLM wrote >>> PLEASE, PLEASE, PLEASE… take a moment to read and try the document. >> >> I added my local pharo fork clone and got the red Morphic square of death in >> Iceberg. Closing and restarting Iceberg failed with: "LGit_GIT_ENOTFOUND: >> Object not found - no match for id >> (b98b37b641381ac07906c020bbc8b4675ed4027b)" > > I'm getting the LGit_GIT_ENOTFOUND when I load a clean image. The id > appears to be the commit id from a different repository (in my case it > happens to be the repository directly under the one with the error). Mmm. I think this is because your local clone is outdated. It should be fixed with a fetch. Esteban > > I haven't looked in to this further yet, but the short term workaround > is to reload all the packages in the repository with the error. > > Cheers, > Alistair > > > >> Image >> ----- >> Pharo7.0alpha >> Build information: >> Pharo-7.0+alpha.build.414.sha.53eba9479e615417df06b782fc663e9a9407a404 (32 >> Bit) >> Unnamed >> >> Virtual Machine >> --------------- >> ~/Documents/Pharo/vms/70-x86/Pharo.app/Contents/MacOS/Pharo >> CoInterpreter VMMaker.oscog-eem.2265 uuid: >> 76b62109-629a-4c39-9641-67b53321df9a Aug 27 2017 >> StackToRegisterMappingCogit VMMaker.oscog-eem.2262 uuid: >> 8b531242-de02-48aa-b418-8d2dde0bec6c Aug 27 2017 >> VM: 201708271955 https://github.com/OpenSmalltalk/opensmalltalk-vm.git $ >> Date: Sun Aug 27 21:55:26 2017 +0200 $ Plugins: 201708271955 >> https://github.com/OpenSmalltalk/opensmalltalk-vm.git $ >> >> Mac OS X built on Aug 27 2017 20:27:09 UTC Compiler: 4.2.1 Compatible Apple >> LLVM 6.1.0 (clang-602.0.53) >> VMMaker versionString VM: 201708271955 >> https://github.com/OpenSmalltalk/opensmalltalk-vm.git $ Date: Sun Aug 27 >> 21:55:26 2017 +0200 $ Plugins: 201708271955 >> https://github.com/OpenSmalltalk/opensmalltalk-vm.git $ >> CoInterpreter VMMaker.oscog-eem.2265 uuid: >> 76b62109-629a-4c39-9641-67b53321df9a Aug 27 2017 >> StackToRegisterMappingCogit VMMaker.oscog-eem.2262 uuid: >> 8b531242-de02-48aa-b418-8d2dde0bec6c Aug 27 2017 >> >> Operating System/Hardware >> ------------------------- >> Mac OS 1013.2 intel >> >> >> >> >> >> ----- >> Cheers, >> Sean >> -- >> Sent from: http://forum.world.st/Pharo-Smalltalk-Developers-f1294837.html >> > |
|
|
a fetch from pharo-project, I mean :)
|
Re: [IMPORTANT] PHARO CONTRIBUTION PROCESS UPDATED! PLEASE READ!
|
|
In reply to this post by EstebanLM
Hi Esteban,
On 9 January 2018 at 09:30, Esteban Lorenzano <[hidden email]> wrote: > > >> On 9 Jan 2018, at 08:22, Alistair Grant <[hidden email]> wrote: >> >> Hi Sean, >> >> On 9 January 2018 at 05:00, Sean P. DeNigris <[hidden email]> wrote: >>> EstebanLM wrote >>>> PLEASE, PLEASE, PLEASE… take a moment to read and try the document. >>> >>> I added my local pharo fork clone and got the red Morphic square of death in >>> Iceberg. Closing and restarting Iceberg failed with: "LGit_GIT_ENOTFOUND: >>> Object not found - no match for id >>> (b98b37b641381ac07906c020bbc8b4675ed4027b)" >> >> I'm getting the LGit_GIT_ENOTFOUND when I load a clean image. The id >> appears to be the commit id from a different repository (in my case it >> happens to be the repository directly under the one with the error). > > Mmm. I think this is because your local clone is outdated. > It should be fixed with a fetch. > > Esteban In my case it's because I have one package stored in two repositories. Oops. When the IceLoadedCode>>computeReferenceCommit is called it eventually calls MCWorkingCopy class>>forPackage: which then finds the package in the registry, but gets the package from the other repository. Cheers, Alistair |
Re: [IMPORTANT] PHARO CONTRIBUTION PROCESS UPDATED! PLEASE READ!
|
Administrator
|
In reply to this post by EstebanLM
EstebanLM wrote
>> Mmm. I think this is because your local clone is outdated. >> It should be fixed with a fetch… from pharo-project, I mean :) That worked. Thanks. Next problem: Iceberg is showing a massive number of changes when syncing with pharo fork on the dev branch at the same commit as the image. There doesn't seem to be a way to collapse the whole tree making it impossible to find the real changes. I assume it's that known bug where the first commit will sync the list, but not very user friendly! ----- Cheers, Sean -- Sent from: http://forum.world.st/Pharo-Smalltalk-Developers-f1294837.html
Cheers,
Sean |
Re: [IMPORTANT] PHARO CONTRIBUTION PROCESS UPDATED! PLEASE READ!
|
|
Hi, I followed the guide and everything is good. What I don't know is how to upgrade an external project already integrated in Pharo 7 (Epicea). I have new version 8.2.6. Cheers, Martín. On Tue, Jan 9, 2018 at 11:01 AM, Sean P. DeNigris <[hidden email]> wrote: EstebanLM wrote |
|
|
Hi Martin, What I do is 1. update local pharo repository on branch 'development' 2. add repository to Iceberg 3. create branch for phogbugz issue 4. make changes (e.g. load stuff from your project) 5. Note that you will have to handle addition and removal of packages separately: 5.1 addition: click 'add package' 5.2 removal: click 'remove package'. You will have to commit the removal from the command line, as Iceberg does not currently recognize removals as staged changes. I usually just make a second commit with the removal before I push everything. 6. Now the changes may not show up. But you can right click on the repository in Iceberg and select 'Synchronize full repository' 7. Select the changes you want to commit The rest you know, I guess ;) Cheers, Max On 16 January 2018 at 20:16:22, Martin Dias ([hidden email]) wrote:
|
«
Return to Pharo Smalltalk Developers
|
1 view|%1 views
| Free forum by Nabble | Edit this page |