1 // This file is part of the Doxygen Developer Manual
2 /** @page patchguide Patch Guidelines
4 @b NB! If you're behind a corporate wall with http only access to the
5 world, you can still use these instructions!
7 @b NB2! You can't send patches to the mailing list anymore at all. Nowadays
8 you are expected to send patches to the OpenOCD Gerrit GIT server for a
11 @section gerrit Submitting patches to the OpenOCD Gerrit server
13 OpenOCD is to some extent a "self service" open source project, so to
14 contribute, you must follow the standard procedures to have the best
15 possible chance to get your changes accepted.
17 The procedure to create a patch is essentially:
21 - send the changes to the Gerrit server for review
22 - correct the patch and re-send it according to review feedback
24 Your patch (or commit) should be a "good patch": focus it on a single
25 issue, and make it be easily reviewable. Don't make
26 it so large that it's hard to review; split large
27 patches into smaller ones. (That can also help
28 track down bugs later on.) All patches should
29 be "clean", which includes preserving the existing
30 coding style and updating documentation as needed.
32 Say in the commit message if it's a bugfix (describe the bug) or a new
33 feature. Don't expect patches to merge immediately
34 for the next release. Be ready to rework patches
35 in response to feedback.
37 Add yourself to the GPL copyright for non-trivial changes.
39 @section stepbystep Step by step procedure
41 -# Create a Gerrit account at: http://openocd.zylin.com
42 - On subsequent sign ins, use the full URL prefaced with 'http://'
43 For example: http://user_identifier.open_id_provider.com
44 -# Add a username to your profile.
45 After creating the Gerrit account and signing in, you will need to
46 add a username to your profile. To do this, go to 'Settings', and
47 add a username of your choice.
48 Your username will be required in step 3 and substituted wherever
49 the string 'USERNAME' is found.
50 -# Add an SSH public key following the directions on github:
51 https://help.github.com/articles/generating-ssh-keys
52 -# Clone the git repository, rather than just download the source:
54 git clone git://git.code.sf.net/p/openocd/code openocd
56 or if you have problems with the "git:" protocol, use
57 the slower http protocol:
59 git clone http://git.code.sf.net/p/openocd/code openocd
61 -# Set up Gerrit with your local repository. All this does it
62 to instruct git locally how to send off the changes.
63 -# Add a new remote to git using Gerrit username:
65 git remote add review ssh://USERNAME@openocd.zylin.com:29418/openocd.git
66 git config remote.review.push HEAD:refs/publish/master
70 git remote add review http://openocd.zylin.com/p/openocd.git
71 git config remote.review.push HEAD:refs/publish/master
73 -# You will need to install this hook, we will look into a better solution:
75 scp -p -P 29418 USERNAME@openocd.zylin.com:hooks/commit-msg .git/hooks/
79 wget http://openocd.zylin.com/tools/hooks/commit-msg
80 mv commit-msg .git/hooks
81 chmod +x .git/hooks/commit-msg
83 @b NOTE A script exists to simplify the two items above. execute:
85 tools/initial.sh <username>
87 With @<username@> being your Gerrit username.
88 -# Set up git with your name and email:
90 git config --global user.name "John Smith"
91 git config --global user.email "john@smith.org"
93 -# Work on your patches. Split the work into
94 multiple small patches that can be reviewed and
95 applied seperately and safely to the OpenOCD
99 work - edit files using your favorite editor.
100 run "git commit -s -a" to commit all changes.
101 run tools/checkpatch.sh to verify your patch style is ok.
104 @b TIP! use "git add ." before commit to add new files.
106 Comment template, notice the short first line w/topic. The topic field
107 should identify the main part or subsystem the patch touches. Check
108 git log for examples.
112 Longer comments over several lines, explaining (where applicable) the
113 reason for the patch and the general idea the solution is based on,
114 any major design decisions, etc...
118 -# Next you need to make sure that your patches
119 are on top of the latest stuff on the server and
120 that there are no conflicts:
122 git pull --rebase origin master
124 -# Send the patches to the Gerrit server for review:
128 -# Forgot something, want to add more? Just make the changes and do:
134 Further reading: http://www.coreboot.org/Git
136 @section timeline When can I expect my contribution to be committed?
138 The code review is intended to take as long as a week or two to allow
139 maintainers and contributors who work on OpenOCD only in their spare
140 time oportunity to perform a review and raise objections.
142 With Gerrit much of the urgency of getting things committed has been
143 removed as the work in progress is safely stored in Gerrit and
144 available if someone needs to build on your work before it is
145 submitted to the official repository.
147 Another factor that contributes to the desire for longer cool-off
148 times (the time a patch lies around without any further changes or
149 comments), it means that the chances of quality regression on the
150 master branch will be much reduced.
152 If a contributor pushes a patch, it is considered good form if another
153 contributor actually approves and submits that patch.
155 @section browsing Browsing Patches
156 All OpenOCD patches can be reviewed <a href="http://openocd.zylin.com/">here</a>.
159 This file contains the @ref patchguide page.