DevelopersProcess

Version 22 (Dan Smith, 01/25/2017 03:49 pm)

1 1 Dan Smith
h1. CHIRP Development Process
2 6 Dan Smith
3 5 Dan Smith
{{>toc}}
4 6 Dan Smith
5 1 Dan Smith
h2. Mercurial Configuration
6 1 Dan Smith
7 15 Robert Terzi
Make sure that your mercurial tool is configured properly for CHIRP. This means having the correct username and email address specified, as well as the MQ extension enabled (for most cases). You can do this in your global mercurial configuration file, or in the one in the repository you're working on, which is @.hg/hgrc@ in the top level chirp.hg directory. You may also want to ensure that it has the patchbomb configuration enabled, which allows easy emailing out of mercurial itself. You probably want the following lines in your config file:
8 1 Dan Smith
9 1 Dan Smith
<pre>
10 1 Dan Smith
[ui]
11 1 Dan Smith
username = Joe Bob <joebob@gmail.com>
12 1 Dan Smith
[extensions]
13 1 Dan Smith
hgext.mq=
14 1 Dan Smith
hgext.patchbomb=
15 7 Dan Smith
16 1 Dan Smith
[email]
17 1 Dan Smith
from = Joe Bob <joebob@gmail.com>
18 1 Dan Smith
method = smtp
19 16 Tom Hayward
to = chirp_devel@intrepid.danplanet.com
20 1 Dan Smith
21 1 Dan Smith
[smtp]
22 1 Dan Smith
host = smtp.gmail.com
23 16 Tom Hayward
port = 587
24 16 Tom Hayward
tls = True
25 1 Dan Smith
</pre>
26 1 Dan Smith
27 13 Dan Smith
h2. Getting the code
28 13 Dan Smith
29 13 Dan Smith
<pre>
30 13 Dan Smith
hg clone http://d-rats.com/hg/chirp.hg
31 13 Dan Smith
cd chirp.hg
32 13 Dan Smith
</pre>
33 13 Dan Smith
34 3 Dan Smith
h2. Bug Tracking
35 3 Dan Smith
36 3 Dan Smith
All changes should have a bug created on the tracker before submission. The server hosting the repository will not allow changesets to be pushed that do not contain a bug number (see below). It is perfectly reasonable to create a bug, assign it to yourself, and then close it before sending the patch.
37 3 Dan Smith
38 1 Dan Smith
h2. Submitting a patch
39 1 Dan Smith
40 2 Dan Smith
Changes to CHIRP are welcome, but they should be in the correct format, and sent as a patch to the mailing list. The correct way to do this is to clone the upstream repository, make your changes there, and then soft-commit them as MQ patches to the tree. The following assumes you have cloned the repository and are in the resulting directory.
41 2 Dan Smith
42 14 Robert Terzi
You must include an Issue Number (#123) in the first line of the commit message to tie each patch to an issue for tracking purposes.
43 14 Robert Terzi
44 2 Dan Smith
h3. Making a change
45 2 Dan Smith
46 2 Dan Smith
Edit one of the files to make a change. For this example, I'll use @chirp/ic2820.py@. Assuming I have made a change, the following commands help me see what has been done:
47 2 Dan Smith
48 2 Dan Smith
<pre>
49 2 Dan Smith
% hg status -mar
50 2 Dan Smith
M chirp/ic2820.py
51 2 Dan Smith
% hg diff
52 2 Dan Smith
diff -r a132c837fd25 chirp/ic2820.py
53 2 Dan Smith
--- a/chirp/ic2820.py   Mon Dec 24 08:17:19 2012 -0800
54 2 Dan Smith
+++ b/chirp/ic2820.py   Mon Dec 24 08:56:29 2012 -0800
55 2 Dan Smith
@@ -16,6 +16,8 @@
56 2 Dan Smith
 from chirp import chirp_common, icf, util, directory
57 2 Dan Smith
 from chirp import bitwise
58 2 Dan Smith
 
59 2 Dan Smith
+# Just added a comment
60 2 Dan Smith
+
61 2 Dan Smith
 MEM_FORMAT = """
62 2 Dan Smith
 struct {
63 2 Dan Smith
   u32  freq;
64 2 Dan Smith
</pre>
65 2 Dan Smith
66 2 Dan Smith
The first command shows me that @chirp/ic2820.py@ has been modified, and the second shows me the actual changes that have been made.
67 2 Dan Smith
68 2 Dan Smith
h3. Soft-committing a Change
69 2 Dan Smith
70 11 Tom Hayward
You can commit a change directly to your tree, but it becomes a little more complicated to make changes to it if necessary, and it creates a fork when the change is actually accepted upstream. An easy way to mitigate this is to soft-commit your changes as MQ patches. Assuming you have made the change above, the following example shows the process for committing that into a patch:
71 2 Dan Smith
72 2 Dan Smith
<pre>
73 11 Tom Hayward
% hg qnew -ef mypatch     # Here an editor will open to compose a commit message
74 2 Dan Smith
% hg qapplied             # This shows that the patch is now applied
75 11 Tom Hayward
mypatch
76 2 Dan Smith
</pre>
77 2 Dan Smith
78 11 Tom Hayward
This example takes the changes I made above, and commits them into a new patch called @mypatch@. I can now look at the patch in its entirety, as well as add or remove it from my local tree:
79 2 Dan Smith
80 11 Tom Hayward
| Command | Description |
81 11 Tom Hayward
| @hg export tip@           | This will show me the whole patch, with the commit message |
82 14 Robert Terzi
| @hg export tip > mypatch.patch@ | This will save the patch, including commit message, to mypatch.patch. You can then attach this file to an email to chirp_devel for submission. |
83 15 Robert Terzi
| @hg email tip@   | If hg is correctly configured with your email address, name and SMTP server, it will automatically generate an email with the patch included. It will prompt you for the To: address. |
84 14 Robert Terzi
85 15 Robert Terzi
86 14 Robert Terzi
See "Sending a Change" below.
87 14 Robert Terzi
88 14 Robert Terzi
89 14 Robert Terzi
h3. Working with Patches (mq mercurial extension)
90 14 Robert Terzi
91 14 Robert Terzi
The following commands demonstrate how the mq extension to hg can be used for managing patches.
92 14 Robert Terzi
93 14 Robert Terzi
| Command | Description |
94 14 Robert Terzi
| @hg export tip@           | This will show me the whole patch, with the commit message |
95 11 Tom Hayward
| @hg export tip > mypatch.patch@ | This will save the patch, including commit message, to mypatch.patch. You can then attach this file to an email for submission. |
96 11 Tom Hayward
| @hg qpop@                 | Remove it from the tree |
97 11 Tom Hayward
| @hg qapplied@             | This shows that no patches are applied |
98 11 Tom Hayward
| @hg qunapplied
99 11 Tom Hayward
mypatch@                   | This shows that our patch is not applied |
100 11 Tom Hayward
| @hg qpush@                | This adds the patch back to the tree |
101 11 Tom Hayward
| @hg qapplied
102 11 Tom Hayward
mypatch@                   | This shows that our patch is applied |
103 11 Tom Hayward
| @hg qpop@                 | This removes it again |
104 11 Tom Hayward
| @hg qdel mypatch@         | This deletes it permanently |
105 20 Aaron P
| @hg strip --keep --rev .@  | Made an actual commit instead of using mq? This will unstage the last commit, similar to git reset --soft HEAD~1 |
106 2 Dan Smith
107 19 Aaron P
If this tool intrigues you, you can learn how to use it here: https://www.mercurial-scm.org/wiki/MqTutorial
108 12 Tom Hayward
109 4 Dan Smith
h3. Testing
110 4 Dan Smith
111 4 Dan Smith
CHIRP has a modest test suite used to validate driver behavior in the @tests/@ directory. Before submitting a patch, please ensure that all the tests run and pass (or at least pass as well as before you made the change). To run the whole set, do this:
112 4 Dan Smith
113 4 Dan Smith
<pre>
114 4 Dan Smith
% cd tests
115 4 Dan Smith
% ./run_tests
116 4 Dan Smith
</pre>
117 4 Dan Smith
118 8 Dan Smith
Note that on Windows, you probably want to run the script like this:
119 8 Dan Smith
120 8 Dan Smith
<pre>
121 9 Dan Smith
C:\Users\Foo\chirp.hg\tests> python run_tests
122 8 Dan Smith
</pre>
123 8 Dan Smith
124 4 Dan Smith
To run just a single driver's tests:
125 4 Dan Smith
126 4 Dan Smith
<pre>
127 4 Dan Smith
% ./run_tests -d Icom_IC-2820H
128 4 Dan Smith
</pre>
129 4 Dan Smith
130 4 Dan Smith
To run just a specific test:
131 4 Dan Smith
132 4 Dan Smith
<pre>
133 4 Dan Smith
% ./run_tests -t Edges
134 4 Dan Smith
</pre>
135 4 Dan Smith
136 18 Brian Dickman
If you are adding a new driver, you will need to add an image to the @tests/images/@ directory which is correctly named for your model. These do not communicate well in patch form, so just attach your test image to the issue on the tracker and send a heads-up to the devel list so it can be snagged into the repo.
137 4 Dan Smith
138 4 Dan Smith
Note: Please make sure that all the tests run, not just the one that affects your driver. Several of the drivers play off each other and sometimes changes to one will break another.
139 1 Dan Smith
140 15 Robert Terzi
h3. Sending a change
141 2 Dan Smith
142 2 Dan Smith
There are two ways to do this. First, you can export the patch to a text file and email it to the list with your normal mailer. This is how:
143 2 Dan Smith
144 2 Dan Smith
<pre>
145 2 Dan Smith
% hg export tip > add_comment.patch
146 2 Dan Smith
</pre>
147 2 Dan Smith
148 2 Dan Smith
You can also configure the tool to email it directly, in which case you need only do:
149 2 Dan Smith
150 2 Dan Smith
<pre>
151 2 Dan Smith
% hg email tip
152 2 Dan Smith
</pre>
153 3 Dan Smith
154 3 Dan Smith
You will be prompted for the destination address.
155 3 Dan Smith
156 22 Dan Smith
h2. Setting up *GMail* for patchbomb email
157 17 Brian Dickman
158 21 Dan Smith
If you have a gmail account, setup the port and TLS enable as shown above. You can use your regular gmail username and password if you have not enabled two-factor authentication.
159 17 Brian Dickman
160 22 Dan Smith
If it bugs you to have your gmail password in a text file (and it should), you can enroll in two-factor auth with google, but be aware that it will affect the usage of your account. You can enroll here:
161 17 Brian Dickman
162 17 Brian Dickman
https://myaccount.google.com/security/signinoptions/two-step-verification/enroll-welcome
163 17 Brian Dickman
164 21 Dan Smith
With TFA enabled, you can add app-specific passwords, like one for mercurial:
165 17 Brian Dickman
166 17 Brian Dickman
https://security.google.com/settings/security/apppasswords
167 17 Brian Dickman
168 17 Brian Dickman
With these steps complete, add the app-specific password to your hgrc, and you should be all set.
169 17 Brian Dickman
170 3 Dan Smith
h2. Patch Guidelines
171 3 Dan Smith
172 1 Dan Smith
h3. The Commit Message
173 3 Dan Smith
174 14 Robert Terzi
The commit message should have a first line that stands on its own and describes the patch briefly. If it pertains to a specific driver, put that driver's short name in brackets at the beginning. An issue number from the issue tracking system must be included to tie the submitted patch to an open issue. For example:
175 3 Dan Smith
176 3 Dan Smith
<pre>
177 14 Robert Terzi
[uv5r] Add support for firmware >= 291 Fixes #123
178 3 Dan Smith
</pre>
179 3 Dan Smith
180 3 Dan Smith
After the first line, more descriptive text may be added (and is appreciated) about what and why the change is being made. At the end, you must include a bug number in the format @#XXX@. This lets the system correlate changes to bugs, which helps during release time.
181 3 Dan Smith
182 3 Dan Smith
h3. Scope
183 3 Dan Smith
184 3 Dan Smith
Guidelines:
185 3 Dan Smith
186 3 Dan Smith
 * Patches should be small and concise. Try to keep a single standing change to a single patch.
187 3 Dan Smith
 * Don't fix several bugs in a single patch, unless there is a technical reason to do so.
188 3 Dan Smith
 * Don't fix, cleanup, or change random whitespace in the patch unless that is the sole purpose of the patch.