| Left: | ||
| Right: |
| LEFT | RIGHT |
|---|---|
| 1 # Easy dependency updating | 1 # Easy dependency updating |
| 2 | |
| 3 | |
| 4 | 2 |
| 5 ## Introduction | 3 ## Introduction |
| 6 | 4 |
| 7 This program is meant to ease the process of gathering information / | 5 This program is meant to ease the process of gathering information / |
| 8 preparing an issue on issues.adblockplus.org, in order to update a given | 6 preparing an issue on issues.adblockplus.org, in order to update a given |
|
kzar
2017/11/27 15:03:32
Maybe remove "on issues.adblockplus.org"?
| |
| 9 dependency. | 7 dependency. |
| 10 | 8 |
| 11 You can run this program to get a list of potentially included changes | 9 You can run this program to get a list of potentially included changes |
|
kzar
2017/11/27 15:03:31
Maybe reword this to "You can run this program to
| |
| 12 (represented by their commit messages). You can create a unified diff of all | 10 (represented by their commit messages). You can create a unified diff of all |
| 13 potentially included changes or you can create an issue body, which is supposed | 11 potentially included changes or you can create an issue body, which is supposed |
| 14 to be filed on https://issues.adblockplus.org. After filing an issue and hence | 12 to be filed on https://issues.adblockplus.org. After filing an issue and hence |
| 15 having a corresponding issue number, you can commit the necessary changes in | 13 having a corresponding issue number, you can commit the necessary changes in |
| 16 order to actually perform a dependency update. | 14 order to actually perform a dependency update. |
| 17 | 15 |
| 18 Since there won't be any way to bridge submodules / subrepositories between | 16 Since there won't be any way to bridge submodules / subrepositories between |
|
kzar
2017/11/27 15:03:30
Maybe add more context here? "In order to provide
| |
| 19 Git and Mercurial any time soon, we will stay dependent on a manual approach | 17 Git and Mercurial any time soon, we will stay dependent on a manual approach |
| 20 for mirroring these ourselves. | 18 for mirroring these ourselves. |
| 21 | 19 |
| 22 ## Requirements | 20 ## Requirements |
| 23 | 21 |
| 24 - [Python 2.7](https://www.python.org/download/releases/2.7/) | 22 - [Python 2.7](https://www.python.org/download/releases/2.7/) |
| 25 - [Git](https://git-scm.com/) | 23 - [Git](https://git-scm.com/) |
| 26 - [Mercurial](https://www.mercurial-scm.org/) | 24 - [Mercurial](https://www.mercurial-scm.org/) |
| 27 | 25 |
| 28 _(Please note, as soon as https://hg.adblockplus.org/buildtools/file/tip/ensure_ dependencies.py | 26 _(Please note, as soon as https://hg.adblockplus.org/buildtools/file/tip/ensure_ dependencies.py |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 135 --- a/.gitignore | 133 --- a/.gitignore |
| 136 +++ b/.gitignore | 134 +++ b/.gitignore |
| 137 @@ -1,3 +1,6 @@ | 135 @@ -1,3 +1,6 @@ |
| 138 *.pyc | 136 *.pyc |
| 139 *.pyo | 137 *.pyo |
| 140 /.tox | 138 /.tox |
| 141 +/.cache | 139 +/.cache |
| 142 +.coverage | 140 +.coverage |
| 143 | 141 |
| 144 ... | 142 ... |
| 145 ... | 143 ... |
|
kzar
2017/11/27 15:03:30
Nit: Duplicate ellipses.
| |
| 146 ``` | 144 ``` |
| 147 | 145 |
| 148 ### Commit all necessary changes (along with file updates done by ensure_depende ncies.py) to perform a dependency update | 146 ### Commit all necessary changes (along with file updates done by ensure_depende ncies.py) to perform a dependency update |
| 149 **Note**: You must have already created an issue and know the corresponding | 147 **Note**: You must have already created an issue and know the corresponding |
| 150 issue number for this | 148 issue number for this |
| 151 ``` | 149 ``` |
| 152 $ eyeo-depup commit buildtools 5698 | 150 $ eyeo-depup commit buildtools 5698 |
| 153 ``` | 151 ``` |
| 154 | 152 |
| 155 Result: | 153 Result: |
| (...skipping 25 matching lines...) Expand all Loading... | |
| 181 diff Create a unified diff of all changes | 179 diff Create a unified diff of all changes |
| 182 issue Render an issue body | 180 issue Render an issue body |
| 183 changes Generate a list of commits between two revisions | 181 changes Generate a list of commits between two revisions |
| 184 commit Update and commit a dependency change | 182 commit Update and commit a dependency change |
| 185 | 183 |
| 186 ``` | 184 ``` |
| 187 | 185 |
| 188 ### diff | 186 ### diff |
| 189 | 187 |
| 190 ``` | 188 ``` |
| 191 usage: eyeo-depup diff [-h] [-r NEW_REVISION] [-m LOCAL_MIRROR] [-f FILENAME] [- s] | 189 usage: eyeo-depup diff [-h] [-r NEW_REVISION] [-m LOCAL_MIRROR] [-f FILENAME] |
| 192 [-l] [-n UNIFIED_LINES] | 190 [-s] [-l] [-n UNIFIED_LINES] |
| 193 dependency | 191 dependency |
| 194 | 192 |
| 195 Invoke the current repository's VCS to generate a diff, containing all changes | 193 Invoke the current repository's VCS to generate a diff, containing all changes |
| 196 made between two revisions. | 194 made between two revisions. |
| 197 | 195 |
| 198 optional arguments: | 196 optional arguments: |
| 199 -h, --help show this help message and exit | 197 -h, --help show this help message and exit |
| 200 -n UNIFIED_LINES, --n-context-lines UNIFIED_LINES | 198 -n UNIFIED_LINES, --n-context-lines UNIFIED_LINES |
| 201 Number of unified context lines to be added to the | 199 Number of unified context lines to be added to the |
| 202 diff. Defaults to 16 (Used only with -d/--diff). | 200 diff. Defaults to 16 (Used only with -d/--diff). |
| 203 | 201 |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 219 Search https://issues.adblockplus.org for integration | 217 Search https://issues.adblockplus.org for integration |
| 220 notes associated with the included issue IDs. The | 218 notes associated with the included issue IDs. The |
| 221 results are written to STDERR. CAUTION: This is a very | 219 results are written to STDERR. CAUTION: This is a very |
| 222 network heavy operation. | 220 network heavy operation. |
| 223 | 221 |
| 224 ``` | 222 ``` |
| 225 | 223 |
| 226 ### changes | 224 ### changes |
| 227 | 225 |
| 228 ``` | 226 ``` |
| 229 usage: eyeo-depup changes [-h] [-r NEW_REVISION] [-m LOCAL_MIRROR] [-f FILENAME] | 227 usage: eyeo-depup changes [-h] [-r NEW_REVISION] [-m LOCAL_MIRROR] |
| 230 [-s] [-l] | 228 [-f FILENAME] [-s] [-l] |
| 231 dependency | 229 dependency |
| 232 | 230 |
| 233 Generate a list of commit hashes and commit messages between the dependency's | 231 Generate a list of commit hashes and commit messages between the dependency's |
| 234 current revision and a given new revision. | 232 current revision and a given new revision. |
| 235 | 233 |
| 236 optional arguments: | 234 optional arguments: |
| 237 -h, --help show this help message and exit | 235 -h, --help show this help message and exit |
| 238 | 236 |
| 239 dependency The dependency to be updated, as specified in the | 237 dependency The dependency to be updated, as specified in the |
| 240 dependencies file. | 238 dependencies file. |
| 241 -r NEW_REVISION, --revision NEW_REVISION | 239 -r NEW_REVISION, --revision NEW_REVISION |
| (...skipping 12 matching lines...) Expand all Loading... | |
| 254 Search https://issues.adblockplus.org for integration | 252 Search https://issues.adblockplus.org for integration |
| 255 notes associated with the included issue IDs. The | 253 notes associated with the included issue IDs. The |
| 256 results are written to STDERR. CAUTION: This is a very | 254 results are written to STDERR. CAUTION: This is a very |
| 257 network heavy operation. | 255 network heavy operation. |
| 258 | 256 |
| 259 ``` | 257 ``` |
| 260 | 258 |
| 261 ### issue | 259 ### issue |
| 262 | 260 |
| 263 ``` | 261 ``` |
| 264 usage: eyeo-depup issue [-h] [-r NEW_REVISION] [-m LOCAL_MIRROR] [-f FILENAME] [ -s] | 262 usage: eyeo-depup issue [-h] [-r NEW_REVISION] [-m LOCAL_MIRROR] [-f FILENAME] |
| 265 [-l] [-t TMPL_PATH] | 263 [-s] [-l] [-t TMPL_PATH] |
| 266 dependency | 264 dependency |
| 267 | 265 |
| 268 Render an issue subject and an issue body, according to the given template. | 266 Render an issue subject and an issue body, according to the given template. |
| 269 | 267 |
| 270 optional arguments: | 268 optional arguments: |
| 271 -h, --help show this help message and exit | 269 -h, --help show this help message and exit |
| 272 -t TMPL_PATH, --template TMPL_PATH | 270 -t TMPL_PATH, --template TMPL_PATH |
| 273 The template to use. Defaults to the provided | 271 The template to use. Defaults to the provided |
| 274 default.trac (Used only with -i/--issue). | 272 default.trac. |
| 275 | 273 |
| 276 dependency The dependency to be updated, as specified in the | 274 dependency The dependency to be updated, as specified in the |
| 277 dependencies file. | 275 dependencies file. |
| 278 -r NEW_REVISION, --revision NEW_REVISION | 276 -r NEW_REVISION, --revision NEW_REVISION |
| 279 The revision to update to. Defaults to the remote | 277 The revision to update to. Defaults to the remote |
| 280 master bookmark/branch. Must be accessible by the | 278 master bookmark/branch. Must be accessible by the |
| 281 dependency's vcs. | 279 dependency's vcs. |
| 282 -m LOCAL_MIRROR, --mirrored-repository LOCAL_MIRROR | 280 -m LOCAL_MIRROR, --mirrored-repository LOCAL_MIRROR |
| 283 Path to the local copy of a mirrored repository. Used | 281 Path to the local copy of a mirrored repository. Used |
| 284 to fetch the corresponding hash. If not given, the | 282 to fetch the corresponding hash. If not given, the |
| 285 source parsed from the dependencies file is used. | 283 source parsed from the dependencies file is used. |
| 286 -f FILENAME, --filename FILENAME | 284 -f FILENAME, --filename FILENAME |
| 287 When specified, write the subcommand's output to the | 285 When specified, write the subcommand's output to the |
| 288 given file, rather than to STDOUT. | 286 given file, rather than to STDOUT. |
| 289 -s, --skip-mirror Do not use any mirror. | 287 -s, --skip-mirror Do not use any mirror. |
| 290 -l, --lookup-integration-notes | 288 -l, --lookup-integration-notes |
| 291 Search https://issues.adblockplus.org for integration | 289 Search https://issues.adblockplus.org for integration |
| 292 notes associated with the included issue IDs. The | 290 notes associated with the included issue IDs. The |
| 293 results are written to STDERR. CAUTION: This is a very | 291 results are written to STDERR. CAUTION: This is a very |
| 294 network heavy operation. | 292 network heavy operation. |
| 295 | 293 |
| 296 ``` | 294 ``` |
| 297 | 295 |
| 298 ### commit | 296 ### commit |
| 299 | 297 |
| 300 ``` | 298 ``` |
| 301 usage: eyeo-depup commit [-h] [-r NEW_REVISION] [-m LOCAL_MIRROR] | 299 usage: eyeo-depup commit [-h] [-r NEW_REVISION] [-m LOCAL_MIRROR] |
| 302 dependency issue_number | 300 dependency issue_number |
| 303 | 301 |
| 304 Rewrite and commit a dependency file to the new revision. WARNING: This | 302 Rewrite and commit a dependency file to the new revision. WARNING: This |
| 305 actually changes your repository's history, use with care! | 303 actually changes your repository's history, use with care! |
| 306 | 304 |
| 307 positional arguments: | 305 positional arguments: |
| 308 issue_number The issue number, filed on | 306 issue_number The issue number, filed on |
| 309 https://issues.adblockplus.org | 307 https://issues.adblockplus.org |
| 310 | 308 |
| 311 optional arguments: | 309 optional arguments: |
| 312 -h, --help show this help message and exit | 310 -h, --help show this help message and exit |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 382 || {{ hg_hash }} || {{ git_hash }} || | 380 || {{ hg_hash }} || {{ git_hash }} || |
| 383 | 381 |
| 384 === Integration Notes === | 382 === Integration Notes === |
| 385 | 383 |
| 386 CHANGE ME! | 384 CHANGE ME! |
| 387 | 385 |
| 388 === Hints for testers === | 386 === Hints for testers === |
| 389 | 387 |
| 390 CHANGE ME! | 388 CHANGE ME! |
| 391 ``` | 389 ``` |
| LEFT | RIGHT |