Notice: this Wiki will be going read only early in 2024 and edits will no longer be possible. Please see: https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/wikis/Wiki-shutdown-plan for the plan.
Difference between revisions of "PTP/Gerrit"
< PTP
(→PTP Gerrit) |
|||
| Line 14: | Line 14: | ||
# The change is presumably documented in a bugzilla bug, e.g. https://bugs.eclipse.org/bugs/show_bug.cgi?id=407003 | # The change is presumably documented in a bugzilla bug, e.g. https://bugs.eclipse.org/bugs/show_bug.cgi?id=407003 | ||
# Go to the URL for the change (e.g. bug 407003 has a link to https://git.eclipse.org/r/#/q/status:open+project:ptp/org.eclipse.ptp,n,z which has 10 Gerrit patch sets(?) for this bug) - a patch set is a single commit? | # Go to the URL for the change (e.g. bug 407003 has a link to https://git.eclipse.org/r/#/q/status:open+project:ptp/org.eclipse.ptp,n,z which has 10 Gerrit patch sets(?) for this bug) - a patch set is a single commit? | ||
| − | # Open the Patch Set (e.g. open the top | + | # Open the Patch Set (e.g. open the top one in the list under the heading "File Path" for this bug 407003) |
| − | # Click on each file, | + | #* Patch set actions: |
| − | # The "Download" field on the main screen shows different ways of obtaining the changes in order to test in your local repo (from command line only | + | #** Click on each file to see e.g, a diff viewer of the changes, comparing old and new. Review the changes, add comments to the author in line if required |
| − | # On the main screen, click on the "Add Comment" button and add an overall comment on the change | + | #** To add an inline comment, click on the line number on the far right in the diff viewer |
| + | #** The "Download" field on the main screen shows different ways of obtaining the changes in order to test in your local repo (from command line only) | ||
| + | #*** Issue the command in the directory that is the location of the git repo. | ||
| + | #*** this will create a new branch for the changes, change the repo so this is the default branch, and your eclipse workspace will be changed to show that branch. | ||
| + | #** On the main screen, click on the "Add Comment" button and add an overall comment on the change | ||
# Using "Publish Comments" to add the comment | # Using "Publish Comments" to add the comment | ||
# If the change is rejected, the contributor can upload a new patch set, then the process is repeated | # If the change is rejected, the contributor can upload a new patch set, then the process is repeated | ||
Revision as of 15:35, 21 November 2013
PTP Gerrit
UNDER DEVELOPMENT
PART 1 - What PTP contributors (committers and others) need to do for the basic tasks
- Contributor add a proposed fix/patch to Gerrit
- Clone the repo
- Configure the repo to use Gerrit (modify or create a remote that uses port 29418 or git.eclipse.org/r
- Make changes
- Commit the changes (to local repo) making sure that the commit includes Signed-off-by and Change-Id lines#. Team>Remote>Push to Gerrit...
PART 2 - What a committer needs to do to pull a gerrit patch in, see its changes, and later commit it to the repo to get in the build.
- The change is presumably documented in a bugzilla bug, e.g. https://bugs.eclipse.org/bugs/show_bug.cgi?id=407003
- Go to the URL for the change (e.g. bug 407003 has a link to https://git.eclipse.org/r/#/q/status:open+project:ptp/org.eclipse.ptp,n,z which has 10 Gerrit patch sets(?) for this bug) - a patch set is a single commit?
- Open the Patch Set (e.g. open the top one in the list under the heading "File Path" for this bug 407003)
- Patch set actions:
- Click on each file to see e.g, a diff viewer of the changes, comparing old and new. Review the changes, add comments to the author in line if required
- To add an inline comment, click on the line number on the far right in the diff viewer
- The "Download" field on the main screen shows different ways of obtaining the changes in order to test in your local repo (from command line only)
- Issue the command in the directory that is the location of the git repo.
- this will create a new branch for the changes, change the repo so this is the default branch, and your eclipse workspace will be changed to show that branch.
- On the main screen, click on the "Add Comment" button and add an overall comment on the change
- Patch set actions:
- Using "Publish Comments" to add the comment
- If the change is rejected, the contributor can upload a new patch set, then the process is repeated
- If the change is accepted, sign off on the change by voting +2
- Once there is a +2 vote, use Publish and Submit to push the changes to the main repo
We also plan to add an auto build step so that hudson will automatically try to build with the change (and run tests too). If the build succeeds, hudson will vote on the change. The Gerrit-based build is separate from the build based on code committed to the repository.