Re: OFBiz contributions & Github Pull Requests

Hi all, In this thread we discussed improvements to the Contributing via Git and Github page in Confluence (see [1]). Some were then adamant that the page should have the WIP status referenced in the subject/title. However, since then the page hasn't changed. If nothing comes forward in the

Re: OFBiz contributions & Github Pull Requests

It seems you just removed the work in progess notes from the page without waiting for the review I've announced. The page should be marked as WIP until we agree on the processes described there, IMO. Thanks, Michael Am 22.02.20 um 08:59 schrieb Pierre Smits: @Michal, Your comments have

Re: OFBiz contributions & Github Pull Requests

@Michal, Your comments have been addressed and noted. You can continue to review, discuss and suggest changes... Met vriendelijke groet, Pierre Smits *Proud* *contributor* (but unfortunately without privileges)* of* Apache OFBiz , since 2008 *Apache Trafodion

Re: OFBiz contributions & Github Pull Requests

I made a comment just yesterday. The page needs review and this might take some time. Michael Am 21.02.20 um 09:20 schrieb Pierre Smits: Hi All, It seems feedback on the 'Contributing via Git and Github' page in our wiki has subsided. Shortly I will apply lazy consensus to remove its WiP

Re: OFBiz contributions & Github Pull Requests

Hi All, It seems feedback on the 'Contributing via Git and Github' page in our wiki has subsided. Shortly I will apply lazy consensus to remove its WiP status. Met vriendelijke groet, Pierre Smits *Proud* *contributor* (but unfortunately without privileges)* of* Apache OFBiz

Re: OFBiz contributions & Github Pull Requests

+1 Jacques Le 14/02/2020 à 12:29, Pierre Smits a écrit : Hi Nicolas, Your suggestion to show only open PRs is way better. I will update the page. Thanks! Best regards, Pierre Smits *Proud* *contributor* (but without privileges)* of* Apache OFBiz , since 2008

Re: OFBiz contributions & Github Pull Requests

Hi Nicolas, Your suggestion to show only open PRs is way better. I will update the page. Thanks! Best regards, Pierre Smits *Proud* *contributor* (but without privileges)* of* Apache OFBiz , since 2008 *Apache Trafodion , Vice

Re: OFBiz contributions & Github Pull Requests

Hi, On 31/01/2020 15:53, Pierre Smits wrote: > Pull Request available on Github can be seen in the local clone. In order > to have this working, the following line should be added to the git > configuration of the local clone: > > fetch = +refs/pull/*/head:refs/remotes/origin/pr/* > > >

Re: OFBiz contributions & Github Pull Requests

Currently, notifications regarding a PullRequest are only sent to a selected few in our community, nor do they appear to be referenced in the appropriate ticket(s). This is not a good thing as it deprives the rest of the community of the opportunity to collaborate. We should work to get this

Re: OFBiz contributions & Github Pull Requests

Thanks Daniel, I think the best (for now at least) is to follow the advices (WIP) of the special page we have for that in wiki[1] This is what I have in my local config: [remote "origin"]     url = https://gitbox.apache.org/repos/asf/ofbiz-framework.git     fetch =

Re: OFBiz contributions & Github Pull Requests

Currently, a change to the codebase and contributed through a PullRequest (and patch files too) need to be manually reviewed (vetted) and tested by privileged contributors. Fortunately with PullRequests, part of the vetting is done through the integration of Sonarcloud (see the comment in the PR,

Re: OFBiz contributions & Github Pull Requests

Hi Michael, Those are the commits from my feature branch, coming in as a consequence of merging my PR. I imagine merging PRs from contributors will always run into this issue. One possible solution would be for a committer to checkout the PR (branch), generate a patch file, and then apply the

Re: OFBiz contributions & Github Pull Requests

Hi Nicolas, your are correct, I checked the history again and this seems to work fine, using the committed date for the history. Thank you for the explanation. While checking I found another thing which confuses me: there are commits in the history which seem not to be from an OFBiz

Re: OFBiz contributions & Github Pull Requests

Hi, On 13/02/2020 08:03, Michael Brohl wrote: > There is one drawback with PR's I just noticed: the commits of the > pull requests will be written to the commit history using the > timestamp of the original commits. > > So if the commits were written a month ago and a committer merges in > the

Re: OFBiz contributions & Github Pull Requests

My preference is to lean on GitHub because it is an accepted and common way for ASF projects to get contributions and because it is very popular among contributors. There are still many details (including the one about PR mentioned by Michael) to fine tune but I am confident that we will find a

Re: OFBiz contributions & Github Pull Requests

There is one drawback with PR's I just noticed: the commits of the pull requests will be written to the commit history using the timestamp of the original commits. So if the commits were written a month ago and a committer merges in the codebase now, it appears in the history a month ago.

Re: OFBiz contributions & Github Pull Requests

One most important +1 for referencing Github over Gitbox is that Pull Requests are not synced into git-box. Therefore committers can't check that out that PR from the gitbox repo into a test branch in their local clone. When preferring gitbox over Github the project is - in essence - saying: if

Re: OFBiz contributions & Github Pull Requests

Hi, I have modified the title to make it more clear (Confluence does not like special chars, like &, (, ),  you name it...) https://cwiki.apache.org/confluence/display/OFBIZ/Contributing+via+Git+and+Github++-+WIP I have added a warning about plugins inside framework (no auto sync). I added

Re: OFBiz contributions & Github Pull Requests

Hi All, I have completed the first draft of the Contributing via Git & Github (WIP) page. And it is now available for review. Please review and let the community know what you think needs to be: 1. added 2.

Re: OFBiz contributions & Github Pull Requests

Pull Requests can be handled in the local development of the committer the same way as patch files. Whereas a committer would create a new test branch in his local clone and apply a patch file to evaluate the changes, the process regarding Pull Request can be considered as easier. Pull Request

Re: OFBiz contributions & Github Pull Requests

Nice thread and sharing :) I retain that the must important idea is keep the historic commit with high quality. My vision is we can let all contributer to create some PR with a "bad" branch quality, this permit to follow the historic link to this PR. The merge on trunk will be done with the

Re: OFBiz contributions & Github Pull Requests

Thank you, Jacopo, for bringing forward the approach of Apache RocketMQ. I will add that reference to the Contributing via Git & Github (WIP) page so that it isn't forgotten. Best regards, Pierre Smits *Apache

Re: OFBiz contributions & Github Pull Requests

I am happy we are having this conversation because, once finalized, we will optimize our usage of Git (and GitHub)! On this topic, I like the workflow and the documentation provided by one of the other Apache project, RocketQM: https://rocketmq.apache.org/docs/pull-request/ In my opinion we

Re: OFBiz contributions & Github Pull Requests

Dealing with pull requests in your local git environment can be done in an easy way, by adding following line to the OFBiz remotes: fetch = +refs/pull/*/head:refs/remotes/origin/pr/* preferably before the standard fetch line (fetch = +refs/heads/*:refs/remotes/origin/*). This way you can

Re: OFBiz contributions & Github Pull Requests

Michael Brohl writes: > I really don't want to see all kinds of exotic messages coming up in > our commit history. > > If the workflow allows rejecting a pull request because of bad commit > messages or maybe a hundred commits for a change, I would also be fine > with it. > > My main point is

Re: OFBiz contributions & Github Pull Requests

From y experience, if we want to be easy, pull/3 is good others are not. But please, let's wait investigating Github PR templates before discussing this further Jacques Le 30/01/2020 à 16:35, Pierre Smits a écrit : I inadvertently posted wrong links. See as an example the messages of the

Re: OFBiz contributions & Github Pull Requests

I mean squashing in the sense of pulling several commits together in a single commit (with a quality commit message). This could also be a diff which is applied as a patch manually. I am not just referring to the GitHub function. I really don't want to see all kinds of exotic messages coming

Re: OFBiz contributions & Github Pull Requests

I inadvertently posted wrong links. See as an example the messages of the commit I have in pull request #2 in ofbiz-plugins (https://github.com/apache/ofbiz-plugins/pull/2). This should be: See as an example the messages of the commit I have in pull request #2 in ofbiz-plugins

Re: OFBiz contributions & Github Pull Requests

At 1st glance, based on my experience with squashing I tend to agree Jacques Le 30/01/2020 à 16:04, Pierre Smits a écrit : Having 'quality commit message' should not pose a problem when contributors (authors) apply the template for their commit message. See as an example the messages of the

Re: OFBiz contributions & Github Pull Requests

Having 'quality commit message' should not pose a problem when contributors (authors) apply the template for their commit message. See as an example the messages of the commit I have in pull request #2 in ofbiz-plugins (https://github.com/apache/ofbiz-plugins/pull/2). The question is whether a

Re: OFBiz contributions & Github Pull Requests

Just a quick thought because I currently cannot dig deeper: We should also have a workflow (or better: requirement) to either write quality commit messages for every commit or squash changes and have a quality commit message for the resulting commit. If people do a lot of commits during their

Re: OFBiz contributions & Github Pull Requests

Thank you Pierre and Daniel, I have to reviewed things in detail, but the Github PR templates could be a workflow changer Jacques Le 30/01/2020 à 15:12, Pierre Smits a écrit : Thanks Daniel, This could indeed be useful. The project already has a template for the commit message (see

Re: OFBiz contributions & Github Pull Requests

Thanks Daniel, This could indeed be useful. The project already has a template for the commit message (see https://cwiki.apache.org/confluence/display/OFBIZ/OFBiz+commit+message+template), which is currently used by all committers. Working through/via Git (and pull requests via Github) indicates

Re: OFBiz contributions & Github Pull Requests

Hello Pierre, Its not something I've worked with before, but git commit message templates might help here. >From a quick scan of the git documentation it seems that the config.template configuration item can be used to specify a file to use as a template. (

Re: OFBiz contributions & Github Pull Requests

FWIW: I have started a related WIP page in confluence, to capture all relating aspects/issues. See https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=145724011 Best regards, Pierre Smits *Apache Trafodion , Vice President* *Apache Directory

OFBiz contributions & Github Pull Requests

Hi All, Recently we saw some postings in various threads how to deal with commits from contributors coming via pull requests in Github. If I understand it correctly, the issue we're dealing with has to do with the commit message (as defined in