Pharo 7 provisional HOWTO
Locked
123
123
 
|
Hi,
this mail describes how to start to send pull requests to Pharo 7 Github repository from Pharo 7. Preparations ===================== - you need to have a Github account and set SSH keys. See https://help.github.com/articles/connecting-to-github-with-ssh/ - create own pharo-project/pharo repository fork. Go to https://github.com/pharo-project/pharo, click on "Fork" button and follow the instructions Get Pharo 7 image ===================== The CI jobs for the Pharo 7 defelopment are currently not fully set and we still do not publish Pharo 7 image to files.pharo.org so you cannot get it using zero-conf scripts. But we have a provisional CI job that bootstraps the Pharo 7 image. There download a file named like Pharo7.0-32bit-hash.zip and decompress it. Unlike Pharo 6 images, the archive contains three files. Image, changes and sources. In Pharo 7 you have the sources file for every bootstrapped version. It has a commit hash in the name and it cannot be shared between different Pharo 7 imges, however it can be shared between images that were created as snapshots with the same bootstrapped image as ancestor. Create local clone ===================== You need a local clone of the Pharo repository. Because it contains a lot of small files, it is not a good idea to have own clone for every image. You can have only one and share them between images. But because of some current Monticello constraints you need to have the clone placed in the image directory in a folder with name 'pharo-core'. In this step we will clone the Pharo repository from pharo-project/pharo Github repository and add your fork as default pull target. We will update your fork repository to contain all latest commits from the Pharo repository in the branch named 'development'. For latest stable version (Pharo 6) we use the master branch. In the end we will checkout the repository to a particular commit from which the downloaded Pharo 7 image was bootstrapped. Imagine that you have a Pharo 7 image that is several days old and the development branch has already some commits that change code. If you would take this older image, checkout to the development branch and then do your commit, your would revert all changes done in not-loaded commits. The other option is to update your image to correspond to the repository latest commit which requires packages reloading. If you checkout to a particular commit, you are in detached HEAD state. In this state you cannot do commits directly. You need to firstly create new a new branch which we will do anyway. Evaluate the following code. This functionality will be later direct part of Iceberg UI. Do not forget to change the user name. username := 'YOUR-USER-NAME'. repository := IceRepositoryCreator new url: '[hidden email]:pharo-project/pharo.git'; location: ('pharo-core' asFileReference ensureCreateDirectory); subdirectory:'src'; createRepository. repository checkoutBranch: 'development'. repository register. fork := (IceRemote name: 'myFork' url: ('[hidden email]:{1}/pharo.git' format: {username})). repository addRemote: fork. repository pushRemote: fork. repository pullRemote: repository origin. "update fork" repository backend pullFrom: repository origin. "use this low-level form to prevent packages reloading" repository push. "checkout to the commit from which the image was bootstrapped" repository checkoutBranch: (SystemVersion current commitHash). Use already created clone ===================== This is alternative to the previous step. Let's suppose that you already have your local clone. You take some Pharo 7 image and you want to create commits. Then you need to create a symlink or move/copy the repository into your image directory. Remember, it must be named pharo-core (we do not use the name 'pharo' to avoid collision with VM executable). In this step we will register an existing Pharo repository clone, set your fork as the push target, update your fork and then switch to the particular commit. repository := IceRepositoryCreator new location: ('pharo-core' asFileReference); subdirectory:'src'; createRepository. repository register. fork := repository remotes detect: [ :remote | remote remoteName = #myFork ]. repository pushRemote: fork. repository pullRemote: repository origin. repository checkoutBranch: 'development'. repository backend pullFrom: repository origin. repository push. repository checkoutBranch: (SystemVersion current commitHash). Issue processing ===================== - create new case on FogBugz to get the issue number - open Iceberg and from the context menu on the 'pharo' repository do: Pharo - Create new branch from FogBugz issue, enter the issue ID and it will fill the full branch name for you - create your changes (you can do it before the creation of the branch too) - commit and push your changes in Iceberg, this way you will commit your branch to your fork repository. Remember that the Iceberg commit window has two buttons, one for local commit, the second for commit with immediate push. They can be very long because they contain the full branch (issue) name - in Iceberg in the 'pharo' repository context menu do: Pharo - Create pull request, fill your - fill your Github credentials - leave the PR title, comment is not required, check the pull request head and base. The base MUST be pharo-project/pharo development. Create the pull requests - go to https://github.com/pharo-project/pharo/pulls, check your pull requests and put URL of it into the issue record on FogBugz (as a comment). Resolve the issue as Fix review needed Cheers, -- Pavel |
Re: Pharo 7 provisional HOWTO
|
|
On Mon, Jun 26, 2017 at 12:14 PM, Pavel Krivanek
<[hidden email]> wrote: > Hi, > > this mail describes how to start to send pull requests to Pharo 7 Github > repository from Pharo 7. Thank you for the great explanation Pavel. > Preparations > ===================== > > - you need to have a Github account and set SSH keys. See > https://help.github.com/articles/connecting-to-github-with-ssh/ > - create own pharo-project/pharo repository fork. Go to > https://github.com/pharo-project/pharo, click on "Fork" button and follow > the instructions [ ... ] > Issue processing > ===================== > > - create new case on FogBugz to get the issue number > - open Iceberg and from the context menu on the 'pharo' repository do: Pharo > - Create new branch from FogBugz issue, enter the issue ID and it will fill > the full branch name for you > - create your changes (you can do it before the creation of the branch too) > - commit and push your changes in Iceberg, this way you will commit your > branch to your fork repository. Remember that the Iceberg commit window has > two buttons, one for local commit, the second for commit with immediate > push. They can be very long because they contain the full branch (issue) > name > - in Iceberg in the 'pharo' repository context menu do: Pharo - Create pull > request, fill your > - fill your Github credentials > - leave the PR title, comment is not required, check the pull request head > and base. The base MUST be pharo-project/pharo development. Create the pull > requests > - go to https://github.com/pharo-project/pharo/pulls, check your pull > requests and put URL of it into the issue record on FogBugz (as a comment). > Resolve the issue as Fix review needed It means, there is no PR without a corresponding FogBugz issue ? Regards, -- Serge Stinckwich UCN & UMI UMMISCO 209 (IRD/UPMC) Every DSL ends up being Smalltalk http://www.doesnotunderstand.org/ |
|
|
> On 27 Jun 2017, at 15:57, Serge Stinckwich <[hidden email]> wrote: > > On Mon, Jun 26, 2017 at 12:14 PM, Pavel Krivanek > <[hidden email]> wrote: >> Hi, >> >> this mail describes how to start to send pull requests to Pharo 7 Github >> repository from Pharo 7. > > Thank you for the great explanation Pavel. > >> Preparations >> ===================== >> >> - you need to have a Github account and set SSH keys. See >> https://help.github.com/articles/connecting-to-github-with-ssh/ >> - create own pharo-project/pharo repository fork. Go to >> https://github.com/pharo-project/pharo, click on "Fork" button and follow >> the instructions > > [ ... ] > >> Issue processing >> ===================== >> >> - create new case on FogBugz to get the issue number >> - open Iceberg and from the context menu on the 'pharo' repository do: Pharo >> - Create new branch from FogBugz issue, enter the issue ID and it will fill >> the full branch name for you >> - create your changes (you can do it before the creation of the branch too) >> - commit and push your changes in Iceberg, this way you will commit your >> branch to your fork repository. Remember that the Iceberg commit window has >> two buttons, one for local commit, the second for commit with immediate >> push. They can be very long because they contain the full branch (issue) >> name >> - in Iceberg in the 'pharo' repository context menu do: Pharo - Create pull >> request, fill your >> - fill your Github credentials >> - leave the PR title, comment is not required, check the pull request head >> and base. The base MUST be pharo-project/pharo development. Create the pull >> requests >> - go to https://github.com/pharo-project/pharo/pulls, check your pull >> requests and put URL of it into the issue record on FogBugz (as a comment). >> Resolve the issue as Fix review needed > > It means, there is no PR without a corresponding FogBugz issue ? it should not. same as before with SLICEs, there was no slice without issue :) Esteban > > Regards, > -- > Serge Stinckwich > UCN & UMI UMMISCO 209 (IRD/UPMC) > Every DSL ends up being Smalltalk > http://www.doesnotunderstand.org/ > |
Re: Pharo 7 provisional HOWTO
|
|
In reply to this post by SergeStinckwich
2017-06-27 15:57 GMT+02:00 Serge Stinckwich <[hidden email]>: On Mon, Jun 26, 2017 at 12:14 PM, Pavel Krivanek Yes, at least for code changes we would like to keep this relation. If it is a really trivial change in readme or something like that, we can accept no related issue record. Please prefer to comment the issues instead of PRs directly to have all information at one place. Cheers, -- Pavel
|
Re: Pharo 7 provisional HOWTO
|
|
On Tue, Jun 27, 2017 at 3:10 PM, Pavel Krivanek
<[hidden email]> wrote: > > > 2017-06-27 15:57 GMT+02:00 Serge Stinckwich <[hidden email]>: >> >> On Mon, Jun 26, 2017 at 12:14 PM, Pavel Krivanek >> <[hidden email]> wrote: >> > Hi, >> > >> > this mail describes how to start to send pull requests to Pharo 7 Github >> > repository from Pharo 7. >> >> Thank you for the great explanation Pavel. >> >> > Preparations >> > ===================== >> > >> > - you need to have a Github account and set SSH keys. See >> > https://help.github.com/articles/connecting-to-github-with-ssh/ >> > - create own pharo-project/pharo repository fork. Go to >> > https://github.com/pharo-project/pharo, click on "Fork" button and >> > follow >> > the instructions >> >> [ ... ] >> >> > Issue processing >> > ===================== >> > >> > - create new case on FogBugz to get the issue number >> > - open Iceberg and from the context menu on the 'pharo' repository do: >> > Pharo >> > - Create new branch from FogBugz issue, enter the issue ID and it will >> > fill >> > the full branch name for you >> > - create your changes (you can do it before the creation of the branch >> > too) >> > - commit and push your changes in Iceberg, this way you will commit your >> > branch to your fork repository. Remember that the Iceberg commit window >> > has >> > two buttons, one for local commit, the second for commit with immediate >> > push. They can be very long because they contain the full branch (issue) >> > name >> > - in Iceberg in the 'pharo' repository context menu do: Pharo - Create >> > pull >> > request, fill your >> > - fill your Github credentials >> > - leave the PR title, comment is not required, check the pull request >> > head >> > and base. The base MUST be pharo-project/pharo development. Create the >> > pull >> > requests >> > - go to https://github.com/pharo-project/pharo/pulls, check your pull >> > requests and put URL of it into the issue record on FogBugz (as a >> > comment). >> > Resolve the issue as Fix review needed >> >> It means, there is no PR without a corresponding FogBugz issue ? > > > Yes, at least for code changes we would like to keep this relation. If it is > a really trivial change in readme or something like that, we can accept no > related issue record. > Please prefer to comment the issues instead of PRs directly to have all > information at one place. Thank you Pavel for the explanation. Maybe in the future, it will make sense to put everything in the PR and use github issues. You will use CI travis builds for all PR ? Regards, -- Serge Stinckwich UCN & UMI UMMISCO 209 (IRD/UPMC) Every DSL ends up being Smalltalk http://www.doesnotunderstand.org/ |
Re: Pharo 7 provisional HOWTO
|
|
2017-06-27 16:17 GMT+02:00 Serge Stinckwich <[hidden email]>: On Tue, Jun 27, 2017 at 3:10 PM, Pavel Krivanek For now we will use FogBugz because it has a lot of nice features and good API. Maybe we will switch it in future but now we should not change too many things at once :-) For several reasons we now prefer to use own infrastructure for checking of PRs (mainly because of MacOS issues on Travis). But again, it can be changed in future. Cheers, -- Pavel
|
|
|
On Tue, Jun 27, 2017 at 10:35 PM, Pavel Krivanek <[hidden email]> wrote:
It would be interesting to see how this might fit in with our workflow... cheers -ben |
|
|
What is the benefit of the integration? I do not understand it from the given link. Thanks! Juraj
|
|
|
On Wed, Jun 28, 2017 at 3:46 PM, Juraj Kubelka <[hidden email]> wrote:
When you submit a PR on github, Fogbugz is automatically updated with a link to the PR. Presumably this makes it easier for people reviewing cases in Fogbugz to identify the slice to test. This is a better link... cheers -ben |
|
|
Hi all, Just to be clear, in Pharo 7, if I want to get some code integrated: - I *have to* use the pull request process described by Pavel OR - I *can* use the pull request process, but I can also use the old slice monticello process ? What is the answer to the first question now, and what will be the answer of this question in 6 months from now ? Thanks On Wed, Jun 28, 2017 at 3:42 PM, Ben Coman <[hidden email]> wrote:
|
Re: Pharo 7 provisional HOWTO
|
|
2017-06-28 17:06 GMT+02:00 Clément Bera <[hidden email]>:
You should use the pull request process. It is possible to create a standard slice BUT it must be done from Pharo 6 and then sent into Pharo60Inbox. And then you need to wait until somebody converts this slice to pull request. That means that it will be harder and harder to contribute this way because the code-base is moving. No slice will be integrated into Pharo 7 with the old process directly. Cheers, -- Pavel
|
Re: Pharo 7 provisional HOWTO
|
|
And if I only want to contribute by reviewing a fix. Do I have to go the git-path ? Or is there a way to just start up an image and load and review the change? Am 28.06.2017 5:26 nachm. schrieb "Pavel Krivanek" <[hidden email]>:
|
|
|
right now, you can review by going to github and seeing. I will add a “PR tool” to view/load PRs into an image, but that’s not ready. If someone wants to take a hit on it… the idea is to extend the github plugin with it :) cheers! Esteban
|
Re: Pharo 7 provisional HOWTO
|
|
What is the github plugin? an Iceberg Pharo code or a C plugin?
On Wed, Jun 28, 2017 at 6:25 PM, Esteban Lorenzano <[hidden email]> wrote: > > On 28 Jun 2017, at 18:21, Nicolai Hess <[hidden email]> wrote: > > And if I only want to contribute by reviewing a fix. Do I have to go the > git-path ? > Or is there a way to just start up an image and load and review the change? > > > right now, you can review by going to github and seeing. > I will add a “PR tool” to view/load PRs into an image, but that’s not ready. > If someone wants to take a hit on it… the idea is to extend the github > plugin with it :) > > cheers! > Esteban > > > Am 28.06.2017 5:26 nachm. schrieb "Pavel Krivanek" > <[hidden email]>: > > > > 2017-06-28 17:06 GMT+02:00 Clément Bera <[hidden email]>: >> >> Hi all, >> >> Just to be clear, in Pharo 7, if I want to get some code integrated: >> - I *have to* use the pull request process described by Pavel >> OR >> - I *can* use the pull request process, but I can also use the old slice >> monticello process >> ? >> >> What is the answer to the first question now, and what will be the answer >> of this question in 6 months from now ? > > > You should use the pull request process. > > It is possible to create a standard slice BUT it must be done from Pharo 6 > and then sent into Pharo60Inbox. And then you need to wait until somebody > converts this slice to pull request. That means that it will be harder and > harder to contribute this way because the code-base is moving. > > No slice will be integrated into Pharo 7 with the old process directly. > > Cheers, > -- Pavel > > >> >> >> Thanks >> >> >> On Wed, Jun 28, 2017 at 3:42 PM, Ben Coman <[hidden email]> wrote: >>> >>> >>> >>> On Wed, Jun 28, 2017 at 3:46 PM, Juraj Kubelka <[hidden email]> >>> wrote: >>>> >>>> >>>> El 28-06-2017, a las 02:57, Ben Coman <[hidden email]> escribió: >>>> >>>> >>>> >>>> On Tue, Jun 27, 2017 at 10:35 PM, Pavel Krivanek >>>> <[hidden email]> wrote: >>>>> >>>>> >>>>> >>>>> 2017-06-27 16:17 GMT+02:00 Serge Stinckwich >>>>> <[hidden email]>: >>>>>> >>>>>> On Tue, Jun 27, 2017 at 3:10 PM, Pavel Krivanek >>>>>> <[hidden email]> wrote: >>>>>> > >>>>>> > >>>>>> > 2017-06-27 15:57 GMT+02:00 Serge Stinckwich >>>>>> > <[hidden email]>: >>>>>> >> >>>>>> >> On Mon, Jun 26, 2017 at 12:14 PM, Pavel Krivanek >>>>>> >> <[hidden email]> wrote: >>>>>> >> > Hi, >>>>>> >> > >>>>>> >> > this mail describes how to start to send pull requests to Pharo 7 >>>>>> >> > Github >>>>>> >> > repository from Pharo 7. >>>>>> >> >>>>>> >> Thank you for the great explanation Pavel. >>>>>> >> >>>>>> >> > Preparations >>>>>> >> > ===================== >>>>>> >> > >>>>>> >> > - you need to have a Github account and set SSH keys. See >>>>>> >> > https://help.github.com/articles/connecting-to-github-with-ssh/ >>>>>> >> > - create own pharo-project/pharo repository fork. Go to >>>>>> >> > https://github.com/pharo-project/pharo, click on "Fork" button >>>>>> >> > and >>>>>> >> > follow >>>>>> >> > the instructions >>>>>> >> >>>>>> >> [ ... ] >>>>>> >> >>>>>> >> > Issue processing >>>>>> >> > ===================== >>>>>> >> > >>>>>> >> > - create new case on FogBugz to get the issue number >>>>>> >> > - open Iceberg and from the context menu on the 'pharo' >>>>>> >> > repository do: >>>>>> >> > Pharo >>>>>> >> > - Create new branch from FogBugz issue, enter the issue ID and it >>>>>> >> > will >>>>>> >> > fill >>>>>> >> > the full branch name for you >>>>>> >> > - create your changes (you can do it before the creation of the >>>>>> >> > branch >>>>>> >> > too) >>>>>> >> > - commit and push your changes in Iceberg, this way you will >>>>>> >> > commit your >>>>>> >> > branch to your fork repository. Remember that the Iceberg commit >>>>>> >> > window >>>>>> >> > has >>>>>> >> > two buttons, one for local commit, the second for commit with >>>>>> >> > immediate >>>>>> >> > push. They can be very long because they contain the full branch >>>>>> >> > (issue) >>>>>> >> > name >>>>>> >> > - in Iceberg in the 'pharo' repository context menu do: Pharo - >>>>>> >> > Create >>>>>> >> > pull >>>>>> >> > request, fill your >>>>>> >> > - fill your Github credentials >>>>>> >> > - leave the PR title, comment is not required, check the pull >>>>>> >> > request >>>>>> >> > head >>>>>> >> > and base. The base MUST be pharo-project/pharo development. >>>>>> >> > Create the >>>>>> >> > pull >>>>>> >> > requests >>>>>> >> > - go to https://github.com/pharo-project/pharo/pulls, check your >>>>>> >> > pull >>>>>> >> > requests and put URL of it into the issue record on FogBugz (as a >>>>>> >> > comment). >>>>>> >> > Resolve the issue as Fix review needed >>>>>> >> >>>>>> >> It means, there is no PR without a corresponding FogBugz issue ? >>>>>> > >>>>>> > >>>>>> > Yes, at least for code changes we would like to keep this relation. >>>>>> > If it is >>>>>> > a really trivial change in readme or something like that, we can >>>>>> > accept no >>>>>> > related issue record. >>>>>> > Please prefer to comment the issues instead of PRs directly to have >>>>>> > all >>>>>> > information at one place. >>>>>> >>>>>> Thank you Pavel for the explanation. >>>>>> >>>>>> Maybe in the future, it will make sense to put everything in the PR >>>>>> and use github issues. >>>>>> You will use CI travis builds for all PR ? >>>>> >>>>> >>>>> For now we will use FogBugz because it has a lot of nice features and >>>>> good API. Maybe we will switch it in future but now we should not change too >>>>> many things at once :-) >>>>> For several reasons we now prefer to use own infrastructure for >>>>> checking of PRs (mainly because of MacOS issues on Travis). But again, it >>>>> can be changed in future. >>>>> >>>> >>>> It would be interesting to see how this might fit in with our >>>> workflow... >>>> https://blog.fogcreek.com/fogbugz-github-integration/ >>>> >>>> >>>> >>>> What is the benefit of the integration? I do not understand it from the >>>> given link. >>>> >>> >>> When you submit a PR on github, Fogbugz is automatically updated with a >>> link to the PR. >>> Presumably this makes it easier for people reviewing cases in Fogbugz to >>> identify the slice to test. >>> This is a better link... >>> >>> https://blog.fogcreek.com/improved-github-integration-automatically-create-bug-events-with-commits/ >>> >>> cheers -ben >> >> > > > |
Re: Pharo 7 provisional HOWTO
|
|
It is an iceberg plugin. 100% Pharo Code, uses the github.com rest api. On 30 Jun 2017 09:25, "Stephane Ducasse" <[hidden email]> wrote: What is the github plugin? an Iceberg Pharo code or a C plugin? |
Re: Pharo 7 provisional HOWTO
|
|
In reply to this post by Pavel Krivanek-3
Hi pavel
Since I want to reuse my clone. I tried the following. But I have no idea about the name of my fork so I put the one of my fork = pharo and it seems that this is what should be done. Now when I execute this script I get 'You already have an Iceberg repository So hat should I do? Use already created clone ===================== repository := IceRepositoryCreator new location: ('pharo-core' asFileReference); subdirectory:'src'; createRepository. repository register. fork := repository remotes detect: [ :remote | remote remoteName = #pharo ]. repository pushRemote: fork. repository pullRemote: repository origin. repository checkoutBranch: 'development'. repository backend pullFrom: repository origin. repository push. repository checkoutBranch: (SystemVersion current commitHash). On Mon, Jun 26, 2017 at 1:14 PM, Pavel Krivanek <[hidden email]> wrote: > Hi, > > this mail describes how to start to send pull requests to Pharo 7 Github > repository from Pharo 7. > > Preparations > ===================== > > - you need to have a Github account and set SSH keys. See > https://help.github.com/articles/connecting-to-github-with-ssh/ > - create own pharo-project/pharo repository fork. Go to > https://github.com/pharo-project/pharo, click on "Fork" button and follow > the instructions > > Get Pharo 7 image > ===================== > > The CI jobs for the Pharo 7 defelopment are currently not fully set and we > still do not publish Pharo 7 image to files.pharo.org so you cannot get it > using zero-conf scripts. But we have a provisional CI job that bootstraps > the Pharo 7 image. > > https://ci.inria.fr/pharo/view/7.0/job/70-Bootstrap-32bit/ > > There download a file named like Pharo7.0-32bit-hash.zip and decompress it. > Unlike Pharo 6 images, the archive contains three files. Image, changes and > sources. In Pharo 7 you have the sources file for every bootstrapped > version. It has a commit hash in the name and it cannot be shared between > different Pharo 7 imges, however it can be shared between images that were > created as snapshots with the same bootstrapped image as ancestor. > > Create local clone > ===================== > > You need a local clone of the Pharo repository. Because it contains a lot of > small files, it is not a good idea to have own clone for every image. You > can have only one and share them between images. But because of some current > Monticello constraints you need to have the clone placed in the image > directory in a folder with name 'pharo-core'. > > In this step we will clone the Pharo repository from pharo-project/pharo > Github repository and add your fork as default pull target. We will update > your fork repository to contain all latest commits from the Pharo repository > in the branch named 'development'. For latest stable version (Pharo 6) we > use the master branch. > In the end we will checkout the repository to a particular commit from which > the downloaded Pharo 7 image was bootstrapped. Imagine that you have a Pharo > 7 image that is several days old and the development branch has already some > commits that change code. If you would take this older image, checkout to > the development branch and then do your commit, your would revert all > changes done in not-loaded commits. The other option is to update your image > to correspond to the repository latest commit which requires packages > reloading. > If you checkout to a particular commit, you are in detached HEAD state. In > this state you cannot do commits directly. You need to firstly create new a > new branch which we will do anyway. > > Evaluate the following code. This functionality will be later direct part of > Iceberg UI. Do not forget to change the user name. > > username := 'YOUR-USER-NAME'. > repository := IceRepositoryCreator new > url: '[hidden email]:pharo-project/pharo.git'; > location: ('pharo-core' asFileReference ensureCreateDirectory); > subdirectory:'src'; > createRepository. > repository checkoutBranch: 'development'. > repository register. > > fork := (IceRemote name: 'myFork' url: ('[hidden email]:{1}/pharo.git' > format: {username})). > repository addRemote: fork. > repository pushRemote: fork. > repository pullRemote: repository origin. > > "update fork" > repository backend pullFrom: repository origin. "use this low-level form to > prevent packages reloading" > repository push. > > "checkout to the commit from which the image was bootstrapped" > repository checkoutBranch: (SystemVersion current commitHash). > > Use already created clone > ===================== > > This is alternative to the previous step. Let's suppose that you already > have your local clone. You take some Pharo 7 image and you want to create > commits. Then you need to create a symlink or move/copy the repository into > your image directory. Remember, it must be named pharo-core (we do not use > the name 'pharo' to avoid collision with VM executable). > > In this step we will register an existing Pharo repository clone, set your > fork as the push target, update your fork and then switch to the particular > commit. > > repository := IceRepositoryCreator new > location: ('pharo-core' asFileReference); > subdirectory:'src'; > createRepository. > repository register. > > fork := repository remotes detect: [ :remote | remote remoteName = #myFork > ]. > repository pushRemote: fork. > repository pullRemote: repository origin. > > repository checkoutBranch: 'development'. > repository backend pullFrom: repository origin. > repository push. > > repository checkoutBranch: (SystemVersion current commitHash). > > Issue processing > ===================== > > - create new case on FogBugz to get the issue number > - open Iceberg and from the context menu on the 'pharo' repository do: Pharo > - Create new branch from FogBugz issue, enter the issue ID and it will fill > the full branch name for you > - create your changes (you can do it before the creation of the branch too) > - commit and push your changes in Iceberg, this way you will commit your > branch to your fork repository. Remember that the Iceberg commit window has > two buttons, one for local commit, the second for commit with immediate > push. They can be very long because they contain the full branch (issue) > name > - in Iceberg in the 'pharo' repository context menu do: Pharo - Create pull > request, fill your > - fill your Github credentials > - leave the PR title, comment is not required, check the pull request head > and base. The base MUST be pharo-project/pharo development. Create the pull > requests > - go to https://github.com/pharo-project/pharo/pulls, check your pull > requests and put URL of it into the issue record on FogBugz (as a comment). > Resolve the issue as Fix review needed > > Cheers, > -- Pavel > |
Re: Pharo 7 provisional HOWTO
|
|
The script in section "Use already created clone" is supposed to be used by a fresh Pharo 7 image. Maybe you are trying it on an image that already has the repository set? Even if I tried to use the name 'pharo' instead of 'myFork', the scripts work. Cheers, -- Pavel 2017-06-30 9:34 GMT+02:00 Stephane Ducasse <[hidden email]>: Hi pavel |
Re: Pharo 7 provisional HOWTO
|
|
No I did it from a freshly donwloaded image. Pharo7.0-32bit-70f3b57.zip
On Fri, Jun 30, 2017 at 9:47 AM, Pavel Krivanek <[hidden email]> wrote: > The script in section "Use already created clone" is supposed to be used by > a fresh Pharo 7 image. Maybe you are trying it on an image that already has > the repository set? Even if I tried to use the name 'pharo' instead of > 'myFork', the scripts work. > > Cheers, > -- Pavel > > > 2017-06-30 9:34 GMT+02:00 Stephane Ducasse <[hidden email]>: >> >> Hi pavel >> >> Since I want to reuse my clone. I tried the following. But I have no >> idea about the name of my fork so I put the one of my fork = pharo and >> it seems that this is what should be done. >> >> Now when I execute this script I get >> >> 'You already have an Iceberg repository >> >> So hat should I do? >> >> >> >> Use already created clone >> ===================== >> >> >> repository := IceRepositoryCreator new >> location: ('pharo-core' asFileReference); >> subdirectory:'src'; >> createRepository. >> repository register. >> >> fork := repository remotes detect: [ :remote | remote remoteName = #pharo >> ]. >> repository pushRemote: fork. >> repository pullRemote: repository origin. >> >> repository checkoutBranch: 'development'. >> repository backend pullFrom: repository origin. >> repository push. >> >> repository checkoutBranch: (SystemVersion current commitHash). >> >> On Mon, Jun 26, 2017 at 1:14 PM, Pavel Krivanek >> <[hidden email]> wrote: >> > Hi, >> > >> > this mail describes how to start to send pull requests to Pharo 7 Github >> > repository from Pharo 7. >> > >> > Preparations >> > ===================== >> > >> > - you need to have a Github account and set SSH keys. See >> > https://help.github.com/articles/connecting-to-github-with-ssh/ >> > - create own pharo-project/pharo repository fork. Go to >> > https://github.com/pharo-project/pharo, click on "Fork" button and >> > follow >> > the instructions >> > >> > Get Pharo 7 image >> > ===================== >> > >> > The CI jobs for the Pharo 7 defelopment are currently not fully set and >> > we >> > still do not publish Pharo 7 image to files.pharo.org so you cannot get >> > it >> > using zero-conf scripts. But we have a provisional CI job that >> > bootstraps >> > the Pharo 7 image. >> > >> > https://ci.inria.fr/pharo/view/7.0/job/70-Bootstrap-32bit/ >> > >> > There download a file named like Pharo7.0-32bit-hash.zip and decompress >> > it. >> > Unlike Pharo 6 images, the archive contains three files. Image, changes >> > and >> > sources. In Pharo 7 you have the sources file for every bootstrapped >> > version. It has a commit hash in the name and it cannot be shared >> > between >> > different Pharo 7 imges, however it can be shared between images that >> > were >> > created as snapshots with the same bootstrapped image as ancestor. >> > >> > Create local clone >> > ===================== >> > >> > You need a local clone of the Pharo repository. Because it contains a >> > lot of >> > small files, it is not a good idea to have own clone for every image. >> > You >> > can have only one and share them between images. But because of some >> > current >> > Monticello constraints you need to have the clone placed in the image >> > directory in a folder with name 'pharo-core'. >> > >> > In this step we will clone the Pharo repository from pharo-project/pharo >> > Github repository and add your fork as default pull target. We will >> > update >> > your fork repository to contain all latest commits from the Pharo >> > repository >> > in the branch named 'development'. For latest stable version (Pharo 6) >> > we >> > use the master branch. >> > In the end we will checkout the repository to a particular commit from >> > which >> > the downloaded Pharo 7 image was bootstrapped. Imagine that you have a >> > Pharo >> > 7 image that is several days old and the development branch has already >> > some >> > commits that change code. If you would take this older image, checkout >> > to >> > the development branch and then do your commit, your would revert all >> > changes done in not-loaded commits. The other option is to update your >> > image >> > to correspond to the repository latest commit which requires packages >> > reloading. >> > If you checkout to a particular commit, you are in detached HEAD state. >> > In >> > this state you cannot do commits directly. You need to firstly create >> > new a >> > new branch which we will do anyway. >> > >> > Evaluate the following code. This functionality will be later direct >> > part of >> > Iceberg UI. Do not forget to change the user name. >> > >> > username := 'YOUR-USER-NAME'. >> > repository := IceRepositoryCreator new >> > url: '[hidden email]:pharo-project/pharo.git'; >> > location: ('pharo-core' asFileReference ensureCreateDirectory); >> > subdirectory:'src'; >> > createRepository. >> > repository checkoutBranch: 'development'. >> > repository register. >> > >> > fork := (IceRemote name: 'myFork' url: ('[hidden email]:{1}/pharo.git' >> > format: {username})). >> > repository addRemote: fork. >> > repository pushRemote: fork. >> > repository pullRemote: repository origin. >> > >> > "update fork" >> > repository backend pullFrom: repository origin. "use this low-level form >> > to >> > prevent packages reloading" >> > repository push. >> > >> > "checkout to the commit from which the image was bootstrapped" >> > repository checkoutBranch: (SystemVersion current commitHash). >> > >> > Use already created clone >> > ===================== >> > >> > This is alternative to the previous step. Let's suppose that you already >> > have your local clone. You take some Pharo 7 image and you want to >> > create >> > commits. Then you need to create a symlink or move/copy the repository >> > into >> > your image directory. Remember, it must be named pharo-core (we do not >> > use >> > the name 'pharo' to avoid collision with VM executable). >> > >> > In this step we will register an existing Pharo repository clone, set >> > your >> > fork as the push target, update your fork and then switch to the >> > particular >> > commit. >> > >> > repository := IceRepositoryCreator new >> > location: ('pharo-core' asFileReference); >> > subdirectory:'src'; >> > createRepository. >> > repository register. >> > >> > fork := repository remotes detect: [ :remote | remote remoteName = >> > #myFork >> > ]. >> > repository pushRemote: fork. >> > repository pullRemote: repository origin. >> > >> > repository checkoutBranch: 'development'. >> > repository backend pullFrom: repository origin. >> > repository push. >> > >> > repository checkoutBranch: (SystemVersion current commitHash). >> > >> > Issue processing >> > ===================== >> > >> > - create new case on FogBugz to get the issue number >> > - open Iceberg and from the context menu on the 'pharo' repository do: >> > Pharo >> > - Create new branch from FogBugz issue, enter the issue ID and it will >> > fill >> > the full branch name for you >> > - create your changes (you can do it before the creation of the branch >> > too) >> > - commit and push your changes in Iceberg, this way you will commit your >> > branch to your fork repository. Remember that the Iceberg commit window >> > has >> > two buttons, one for local commit, the second for commit with immediate >> > push. They can be very long because they contain the full branch (issue) >> > name >> > - in Iceberg in the 'pharo' repository context menu do: Pharo - Create >> > pull >> > request, fill your >> > - fill your Github credentials >> > - leave the PR title, comment is not required, check the pull request >> > head >> > and base. The base MUST be pharo-project/pharo development. Create the >> > pull >> > requests >> > - go to https://github.com/pharo-project/pharo/pulls, check your pull >> > requests and put URL of it into the issue record on FogBugz (as a >> > comment). >> > Resolve the issue as Fix review needed >> > >> > Cheers, >> > -- Pavel >> > >> > |
Re: Pharo 7 provisional HOWTO
|
|
So I do not understand
Now if I do repository := IceRepositoryCreator new location: ('/Users/ducasse/Workspace/FirstCircle/ActiveResearch/Pharo/PharoCodeBase/pharo-core' asFileReference); subdirectory:'src'; createRepository. repository register. it works but doing it twice breaks. How can I get access to the repo? Because fork := repository remotes detect: [ :remote | remote remoteName = #pharo ]. Does not work :( And my github fork is name pharo I tried with 'pharo' but it failed too. "origin ([hidden email]:Ducasse/pharo.git)" "upstream ([hidden email]:pharo-project/pharo.git)" ;( On Fri, Jun 30, 2017 at 9:56 AM, Stephane Ducasse <[hidden email]> wrote: > No I did it from a freshly donwloaded image. Pharo7.0-32bit-70f3b57.zip > > On Fri, Jun 30, 2017 at 9:47 AM, Pavel Krivanek > <[hidden email]> wrote: >> The script in section "Use already created clone" is supposed to be used by >> a fresh Pharo 7 image. Maybe you are trying it on an image that already has >> the repository set? Even if I tried to use the name 'pharo' instead of >> 'myFork', the scripts work. >> >> Cheers, >> -- Pavel >> >> >> 2017-06-30 9:34 GMT+02:00 Stephane Ducasse <[hidden email]>: >>> >>> Hi pavel >>> >>> Since I want to reuse my clone. I tried the following. But I have no >>> idea about the name of my fork so I put the one of my fork = pharo and >>> it seems that this is what should be done. >>> >>> Now when I execute this script I get >>> >>> 'You already have an Iceberg repository >>> >>> So hat should I do? >>> >>> >>> >>> Use already created clone >>> ===================== >>> >>> >>> repository := IceRepositoryCreator new >>> location: ('pharo-core' asFileReference); >>> subdirectory:'src'; >>> createRepository. >>> repository register. >>> >>> fork := repository remotes detect: [ :remote | remote remoteName = #pharo >>> ]. >>> repository pushRemote: fork. >>> repository pullRemote: repository origin. >>> >>> repository checkoutBranch: 'development'. >>> repository backend pullFrom: repository origin. >>> repository push. >>> >>> repository checkoutBranch: (SystemVersion current commitHash). >>> >>> On Mon, Jun 26, 2017 at 1:14 PM, Pavel Krivanek >>> <[hidden email]> wrote: >>> > Hi, >>> > >>> > this mail describes how to start to send pull requests to Pharo 7 Github >>> > repository from Pharo 7. >>> > >>> > Preparations >>> > ===================== >>> > >>> > - you need to have a Github account and set SSH keys. See >>> > https://help.github.com/articles/connecting-to-github-with-ssh/ >>> > - create own pharo-project/pharo repository fork. Go to >>> > https://github.com/pharo-project/pharo, click on "Fork" button and >>> > follow >>> > the instructions >>> > >>> > Get Pharo 7 image >>> > ===================== >>> > >>> > The CI jobs for the Pharo 7 defelopment are currently not fully set and >>> > we >>> > still do not publish Pharo 7 image to files.pharo.org so you cannot get >>> > it >>> > using zero-conf scripts. But we have a provisional CI job that >>> > bootstraps >>> > the Pharo 7 image. >>> > >>> > https://ci.inria.fr/pharo/view/7.0/job/70-Bootstrap-32bit/ >>> > >>> > There download a file named like Pharo7.0-32bit-hash.zip and decompress >>> > it. >>> > Unlike Pharo 6 images, the archive contains three files. Image, changes >>> > and >>> > sources. In Pharo 7 you have the sources file for every bootstrapped >>> > version. It has a commit hash in the name and it cannot be shared >>> > between >>> > different Pharo 7 imges, however it can be shared between images that >>> > were >>> > created as snapshots with the same bootstrapped image as ancestor. >>> > >>> > Create local clone >>> > ===================== >>> > >>> > You need a local clone of the Pharo repository. Because it contains a >>> > lot of >>> > small files, it is not a good idea to have own clone for every image. >>> > You >>> > can have only one and share them between images. But because of some >>> > current >>> > Monticello constraints you need to have the clone placed in the image >>> > directory in a folder with name 'pharo-core'. >>> > >>> > In this step we will clone the Pharo repository from pharo-project/pharo >>> > Github repository and add your fork as default pull target. We will >>> > update >>> > your fork repository to contain all latest commits from the Pharo >>> > repository >>> > in the branch named 'development'. For latest stable version (Pharo 6) >>> > we >>> > use the master branch. >>> > In the end we will checkout the repository to a particular commit from >>> > which >>> > the downloaded Pharo 7 image was bootstrapped. Imagine that you have a >>> > Pharo >>> > 7 image that is several days old and the development branch has already >>> > some >>> > commits that change code. If you would take this older image, checkout >>> > to >>> > the development branch and then do your commit, your would revert all >>> > changes done in not-loaded commits. The other option is to update your >>> > image >>> > to correspond to the repository latest commit which requires packages >>> > reloading. >>> > If you checkout to a particular commit, you are in detached HEAD state. >>> > In >>> > this state you cannot do commits directly. You need to firstly create >>> > new a >>> > new branch which we will do anyway. >>> > >>> > Evaluate the following code. This functionality will be later direct >>> > part of >>> > Iceberg UI. Do not forget to change the user name. >>> > >>> > username := 'YOUR-USER-NAME'. >>> > repository := IceRepositoryCreator new >>> > url: '[hidden email]:pharo-project/pharo.git'; >>> > location: ('pharo-core' asFileReference ensureCreateDirectory); >>> > subdirectory:'src'; >>> > createRepository. >>> > repository checkoutBranch: 'development'. >>> > repository register. >>> > >>> > fork := (IceRemote name: 'myFork' url: ('[hidden email]:{1}/pharo.git' >>> > format: {username})). >>> > repository addRemote: fork. >>> > repository pushRemote: fork. >>> > repository pullRemote: repository origin. >>> > >>> > "update fork" >>> > repository backend pullFrom: repository origin. "use this low-level form >>> > to >>> > prevent packages reloading" >>> > repository push. >>> > >>> > "checkout to the commit from which the image was bootstrapped" >>> > repository checkoutBranch: (SystemVersion current commitHash). >>> > >>> > Use already created clone >>> > ===================== >>> > >>> > This is alternative to the previous step. Let's suppose that you already >>> > have your local clone. You take some Pharo 7 image and you want to >>> > create >>> > commits. Then you need to create a symlink or move/copy the repository >>> > into >>> > your image directory. Remember, it must be named pharo-core (we do not >>> > use >>> > the name 'pharo' to avoid collision with VM executable). >>> > >>> > In this step we will register an existing Pharo repository clone, set >>> > your >>> > fork as the push target, update your fork and then switch to the >>> > particular >>> > commit. >>> > >>> > repository := IceRepositoryCreator new >>> > location: ('pharo-core' asFileReference); >>> > subdirectory:'src'; >>> > createRepository. >>> > repository register. >>> > >>> > fork := repository remotes detect: [ :remote | remote remoteName = >>> > #myFork >>> > ]. >>> > repository pushRemote: fork. >>> > repository pullRemote: repository origin. >>> > >>> > repository checkoutBranch: 'development'. >>> > repository backend pullFrom: repository origin. >>> > repository push. >>> > >>> > repository checkoutBranch: (SystemVersion current commitHash). >>> > >>> > Issue processing >>> > ===================== >>> > >>> > - create new case on FogBugz to get the issue number >>> > - open Iceberg and from the context menu on the 'pharo' repository do: >>> > Pharo >>> > - Create new branch from FogBugz issue, enter the issue ID and it will >>> > fill >>> > the full branch name for you >>> > - create your changes (you can do it before the creation of the branch >>> > too) >>> > - commit and push your changes in Iceberg, this way you will commit your >>> > branch to your fork repository. Remember that the Iceberg commit window >>> > has >>> > two buttons, one for local commit, the second for commit with immediate >>> > push. They can be very long because they contain the full branch (issue) >>> > name >>> > - in Iceberg in the 'pharo' repository context menu do: Pharo - Create >>> > pull >>> > request, fill your >>> > - fill your Github credentials >>> > - leave the PR title, comment is not required, check the pull request >>> > head >>> > and base. The base MUST be pharo-project/pharo development. Create the >>> > pull >>> > requests >>> > - go to https://github.com/pharo-project/pharo/pulls, check your pull >>> > requests and put URL of it into the issue record on FogBugz (as a >>> > comment). >>> > Resolve the issue as Fix review needed >>> > >>> > Cheers, >>> > -- Pavel >>> > >>> >> |
Re: Pharo 7 provisional HOWTO
|
|
DoIt
^ repository remotes detect: [ :remote | self halt. remote remoteName = 'pharo' ] remote remoteName returns 'origin' and not the name of the fork so what is upstream? Pharo on github origin? the one local? Stef On Fri, Jun 30, 2017 at 10:04 AM, Stephane Ducasse <[hidden email]> wrote: > So I do not understand > > Now if I do > > repository := IceRepositoryCreator new > location: ('/Users/ducasse/Workspace/FirstCircle/ActiveResearch/Pharo/PharoCodeBase/pharo-core' > asFileReference); > subdirectory:'src'; > createRepository. > repository register. > > > it works but doing it twice breaks. How can I get access to the repo? > Because > fork := repository remotes detect: [ :remote | remote remoteName = #pharo ]. > > Does not work :( > And my github fork is name pharo I tried with 'pharo' but it failed too. > > > "origin ([hidden email]:Ducasse/pharo.git)" > > > "upstream ([hidden email]:pharo-project/pharo.git)" > > ;( > > > > > On Fri, Jun 30, 2017 at 9:56 AM, Stephane Ducasse > <[hidden email]> wrote: >> No I did it from a freshly donwloaded image. Pharo7.0-32bit-70f3b57.zip >> >> On Fri, Jun 30, 2017 at 9:47 AM, Pavel Krivanek >> <[hidden email]> wrote: >>> The script in section "Use already created clone" is supposed to be used by >>> a fresh Pharo 7 image. Maybe you are trying it on an image that already has >>> the repository set? Even if I tried to use the name 'pharo' instead of >>> 'myFork', the scripts work. >>> >>> Cheers, >>> -- Pavel >>> >>> >>> 2017-06-30 9:34 GMT+02:00 Stephane Ducasse <[hidden email]>: >>>> >>>> Hi pavel >>>> >>>> Since I want to reuse my clone. I tried the following. But I have no >>>> idea about the name of my fork so I put the one of my fork = pharo and >>>> it seems that this is what should be done. >>>> >>>> Now when I execute this script I get >>>> >>>> 'You already have an Iceberg repository >>>> >>>> So hat should I do? >>>> >>>> >>>> >>>> Use already created clone >>>> ===================== >>>> >>>> >>>> repository := IceRepositoryCreator new >>>> location: ('pharo-core' asFileReference); >>>> subdirectory:'src'; >>>> createRepository. >>>> repository register. >>>> >>>> fork := repository remotes detect: [ :remote | remote remoteName = #pharo >>>> ]. >>>> repository pushRemote: fork. >>>> repository pullRemote: repository origin. >>>> >>>> repository checkoutBranch: 'development'. >>>> repository backend pullFrom: repository origin. >>>> repository push. >>>> >>>> repository checkoutBranch: (SystemVersion current commitHash). >>>> >>>> On Mon, Jun 26, 2017 at 1:14 PM, Pavel Krivanek >>>> <[hidden email]> wrote: >>>> > Hi, >>>> > >>>> > this mail describes how to start to send pull requests to Pharo 7 Github >>>> > repository from Pharo 7. >>>> > >>>> > Preparations >>>> > ===================== >>>> > >>>> > - you need to have a Github account and set SSH keys. See >>>> > https://help.github.com/articles/connecting-to-github-with-ssh/ >>>> > - create own pharo-project/pharo repository fork. Go to >>>> > https://github.com/pharo-project/pharo, click on "Fork" button and >>>> > follow >>>> > the instructions >>>> > >>>> > Get Pharo 7 image >>>> > ===================== >>>> > >>>> > The CI jobs for the Pharo 7 defelopment are currently not fully set and >>>> > we >>>> > still do not publish Pharo 7 image to files.pharo.org so you cannot get >>>> > it >>>> > using zero-conf scripts. But we have a provisional CI job that >>>> > bootstraps >>>> > the Pharo 7 image. >>>> > >>>> > https://ci.inria.fr/pharo/view/7.0/job/70-Bootstrap-32bit/ >>>> > >>>> > There download a file named like Pharo7.0-32bit-hash.zip and decompress >>>> > it. >>>> > Unlike Pharo 6 images, the archive contains three files. Image, changes >>>> > and >>>> > sources. In Pharo 7 you have the sources file for every bootstrapped >>>> > version. It has a commit hash in the name and it cannot be shared >>>> > between >>>> > different Pharo 7 imges, however it can be shared between images that >>>> > were >>>> > created as snapshots with the same bootstrapped image as ancestor. >>>> > >>>> > Create local clone >>>> > ===================== >>>> > >>>> > You need a local clone of the Pharo repository. Because it contains a >>>> > lot of >>>> > small files, it is not a good idea to have own clone for every image. >>>> > You >>>> > can have only one and share them between images. But because of some >>>> > current >>>> > Monticello constraints you need to have the clone placed in the image >>>> > directory in a folder with name 'pharo-core'. >>>> > >>>> > In this step we will clone the Pharo repository from pharo-project/pharo >>>> > Github repository and add your fork as default pull target. We will >>>> > update >>>> > your fork repository to contain all latest commits from the Pharo >>>> > repository >>>> > in the branch named 'development'. For latest stable version (Pharo 6) >>>> > we >>>> > use the master branch. >>>> > In the end we will checkout the repository to a particular commit from >>>> > which >>>> > the downloaded Pharo 7 image was bootstrapped. Imagine that you have a >>>> > Pharo >>>> > 7 image that is several days old and the development branch has already >>>> > some >>>> > commits that change code. If you would take this older image, checkout >>>> > to >>>> > the development branch and then do your commit, your would revert all >>>> > changes done in not-loaded commits. The other option is to update your >>>> > image >>>> > to correspond to the repository latest commit which requires packages >>>> > reloading. >>>> > If you checkout to a particular commit, you are in detached HEAD state. >>>> > In >>>> > this state you cannot do commits directly. You need to firstly create >>>> > new a >>>> > new branch which we will do anyway. >>>> > >>>> > Evaluate the following code. This functionality will be later direct >>>> > part of >>>> > Iceberg UI. Do not forget to change the user name. >>>> > >>>> > username := 'YOUR-USER-NAME'. >>>> > repository := IceRepositoryCreator new >>>> > url: '[hidden email]:pharo-project/pharo.git'; >>>> > location: ('pharo-core' asFileReference ensureCreateDirectory); >>>> > subdirectory:'src'; >>>> > createRepository. >>>> > repository checkoutBranch: 'development'. >>>> > repository register. >>>> > >>>> > fork := (IceRemote name: 'myFork' url: ('[hidden email]:{1}/pharo.git' >>>> > format: {username})). >>>> > repository addRemote: fork. >>>> > repository pushRemote: fork. >>>> > repository pullRemote: repository origin. >>>> > >>>> > "update fork" >>>> > repository backend pullFrom: repository origin. "use this low-level form >>>> > to >>>> > prevent packages reloading" >>>> > repository push. >>>> > >>>> > "checkout to the commit from which the image was bootstrapped" >>>> > repository checkoutBranch: (SystemVersion current commitHash). >>>> > >>>> > Use already created clone >>>> > ===================== >>>> > >>>> > This is alternative to the previous step. Let's suppose that you already >>>> > have your local clone. You take some Pharo 7 image and you want to >>>> > create >>>> > commits. Then you need to create a symlink or move/copy the repository >>>> > into >>>> > your image directory. Remember, it must be named pharo-core (we do not >>>> > use >>>> > the name 'pharo' to avoid collision with VM executable). >>>> > >>>> > In this step we will register an existing Pharo repository clone, set >>>> > your >>>> > fork as the push target, update your fork and then switch to the >>>> > particular >>>> > commit. >>>> > >>>> > repository := IceRepositoryCreator new >>>> > location: ('pharo-core' asFileReference); >>>> > subdirectory:'src'; >>>> > createRepository. >>>> > repository register. >>>> > >>>> > fork := repository remotes detect: [ :remote | remote remoteName = >>>> > #myFork >>>> > ]. >>>> > repository pushRemote: fork. >>>> > repository pullRemote: repository origin. >>>> > >>>> > repository checkoutBranch: 'development'. >>>> > repository backend pullFrom: repository origin. >>>> > repository push. >>>> > >>>> > repository checkoutBranch: (SystemVersion current commitHash). >>>> > >>>> > Issue processing >>>> > ===================== >>>> > >>>> > - create new case on FogBugz to get the issue number >>>> > - open Iceberg and from the context menu on the 'pharo' repository do: >>>> > Pharo >>>> > - Create new branch from FogBugz issue, enter the issue ID and it will >>>> > fill >>>> > the full branch name for you >>>> > - create your changes (you can do it before the creation of the branch >>>> > too) >>>> > - commit and push your changes in Iceberg, this way you will commit your >>>> > branch to your fork repository. Remember that the Iceberg commit window >>>> > has >>>> > two buttons, one for local commit, the second for commit with immediate >>>> > push. They can be very long because they contain the full branch (issue) >>>> > name >>>> > - in Iceberg in the 'pharo' repository context menu do: Pharo - Create >>>> > pull >>>> > request, fill your >>>> > - fill your Github credentials >>>> > - leave the PR title, comment is not required, check the pull request >>>> > head >>>> > and base. The base MUST be pharo-project/pharo development. Create the >>>> > pull >>>> > requests >>>> > - go to https://github.com/pharo-project/pharo/pulls, check your pull >>>> > requests and put URL of it into the issue record on FogBugz (as a >>>> > comment). >>>> > Resolve the issue as Fix review needed >>>> > >>>> > Cheers, >>>> > -- Pavel >>>> > >>>> >>> |
«
Return to Pharo Smalltalk Developers
|
1 view|%1 views
| Free forum by Nabble | Edit this page |