Project

General

Profile

DevelopersProcess » History » Version 6

Dan Smith, 12/27/2012 07:46 AM

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
7
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/config@. 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
9
<pre>
10
[ui]
11
username = Joe Bob <joebob@gmail.com>
12
[extensions]
13
hgext.mq=
14
hgext.patchbomb=
15
[email]
16
from = Joe Bob <joebob@gmail.com>
17
method = smtp
18
19
[smtp]
20
host = smtp.gmail.com
21
</pre>
22
23 3 Dan Smith
h2. Bug Tracking
24
25
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.
26
27 1 Dan Smith
h2. Submitting a patch
28
29 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.
30
31
h3. Making a change
32
33
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:
34
35
<pre>
36
% hg status -mar
37
M chirp/ic2820.py
38
% hg diff
39
diff -r a132c837fd25 chirp/ic2820.py
40
--- a/chirp/ic2820.py   Mon Dec 24 08:17:19 2012 -0800
41
+++ b/chirp/ic2820.py   Mon Dec 24 08:56:29 2012 -0800
42
@@ -16,6 +16,8 @@
43
 from chirp import chirp_common, icf, util, directory
44
 from chirp import bitwise
45
 
46
+# Just added a comment
47
+
48
 MEM_FORMAT = """
49
 struct {
50
   u32  freq;
51
</pre>
52
53
The first command shows me that @chirp/ic2820.py@ has been modified, and the second shows me the actual changes that have been made.
54
55
h3. Soft-committing a Change
56
57
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 manage all of 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:
58
59
<pre>
60
% hg qnew -ef add_comment # Here I will be prompted to enter a commit message
61
% hg qapplied             # This shows that the patch is now applied
62
add_comment
63
</pre>
64
65
This example takes the changes I made above, and commits them into a new patch called @add_comment@. I can now look at the patch in its entirety, as well as add or remove it from my local tree:
66
67
<pre>
68
% hg export tip           # This will show me the whole patch, with the commit message
69
% hg qpop                 # Remove it from the tree
70
% hg qapplied             # This shows that no patches are applied
71
% hg qunapplied           # This shows that our patch is not applied
72
add_comment
73
% hg qpush                # This adds the patch back to the tree
74
% hg qapplied             # This shows that our patch is applied
75
add_comment
76
% hg qpop                 # This removes it again
77
% hg qdel add_comment     # This deletes it permanently
78
</pre>
79
80 4 Dan Smith
h3. Testing
81
82
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:
83
84
<pre>
85
% cd tests
86
% ./run_tests
87
</pre>
88
89
To run just a single driver's tests:
90
91
<pre>
92
% ./run_tests -d Icom_IC-2820H
93
</pre>
94
95
To run just a specific test:
96
97
<pre>
98
% ./run_tests -t Edges
99
</pre>
100
101
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 send a sample image to the development mailing list to accompany your patch submission.
102
103
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.
104
105 2 Dan Smith
h3. Sending a change
106
107
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:
108
109
<pre>
110
% hg export tip > add_comment.patch
111
</pre>
112
113
You can also configure the tool to email it directly, in which case you need only do:
114
115
<pre>
116
% hg email tip
117
</pre>
118
119
You will be prompted for the destination address.
120 3 Dan Smith
121
h2. Patch Guidelines
122
123
h3. The Commit Message
124
125
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. For example:
126
127
<pre>
128
[uv5r] Add support for firmware >= 291
129
</pre>
130
131
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.
132
133
h3. Scope
134
135
Guidelines:
136
137
 * Patches should be small and concise. Try to keep a single standing change to a single patch.
138
 * Don't fix several bugs in a single patch, unless there is a technical reason to do so.
139
 * Don't fix, cleanup, or change random whitespace in the patch unless that is the sole purpose of the patch.