Merge lp:~gz/brz/lint_W1_W2_W3 into lp:brz
- lint_W1_W2_W3
- Merge into trunk
Proposed by
Martin Packman
Status: | Merged |
---|---|
Approved by: | Martin Packman |
Approved revision: | no longer in the source branch. |
Merge reported by: | The Breezy Bot |
Merged at revision: | not available |
Proposed branch: | lp:~gz/brz/lint_W1_W2_W3 |
Merge into: | lp:brz |
Diff against target: |
688 lines (+69/-77) 41 files modified
apport/source_brz.py (+3/-3) breezy/bzr/bzrdir.py (+1/-1) breezy/bzr/dirstate.py (+2/-2) breezy/bzr/index.py (+1/-1) breezy/bzr/inventory.py (+1/-1) breezy/bzr/workingtree_4.py (+1/-1) breezy/config.py (+2/-2) breezy/counted_lock.py (+2/-2) breezy/diff.py (+2/-2) breezy/foreign.py (+1/-1) breezy/globbing.py (+3/-3) breezy/help_topics/__init__.py (+4/-4) breezy/plugins/bash_completion/bashcomp.py (+1/-1) breezy/plugins/fastimport/cmds.py (+1/-1) breezy/plugins/launchpad/__init__.py (+1/-1) breezy/plugins/upload/__init__.py (+2/-2) breezy/repository.py (+1/-1) breezy/tests/blackbox/test_uncommit.py (+1/-1) breezy/tests/per_controldir_colo/__init__.py (+1/-1) breezy/tests/per_controldir_colo/test_unsupported.py (+1/-1) breezy/tests/per_foreign_vcs/test_branch.py (+2/-2) breezy/tests/scenarios.py (+1/-1) breezy/tests/script.py (+1/-1) breezy/tests/test_gpg.py (+2/-2) breezy/tests/test_help.py (+9/-9) breezy/tests/test_script.py (+8/-9) breezy/transform.py (+1/-1) breezy/transport/__init__.py (+1/-1) breezy/transport/log.py (+1/-1) breezy/transport/trace.py (+1/-1) breezy/tree.py (+1/-1) doc/en/conf.py (+0/-1) profile_imports.py (+0/-1) setup.cfg (+0/-4) tools/brz_epydoc_uid.py (+0/-1) tools/check-newsbugs.py (+1/-1) tools/generate_docs.py (+2/-2) tools/generate_release_notes.py (+1/-1) tools/riodemo.py (+3/-3) tools/rst2html.py (+1/-1) tools/win32/brz_postinstall.py (+1/-1) |
To merge this branch: | bzr merge lp:~gz/brz/lint_W1_W2_W3 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jelmer Vernooij | Approve | ||
Review via email: mp+358968@code.launchpad.net |
Commit message
Fix remaining whitespace lint in codebase
Description of the change
Fix remaining whitespace lint in codebase
Enables rules W191, W291, W293, and W391 for flake8.
To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) : | # |
review:
Approve
Revision history for this message
The Breezy Bot (the-breezy-bot) wrote : | # |
Revision history for this message
Jelmer Vernooij (jelmer) wrote : | # |
Significant whitespace? (:
On November 18, 2018 8:44:05 PM UTC, The Breezy Bot <email address hidden> wrote:
>Running landing tests failed
>https:/
>--
>https:/
>You are reviewing the proposed merge of lp:~gz/brz/lint_W1_W2_W3 into
>lp:brz.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'apport/source_brz.py' | |||
2 | --- apport/source_brz.py 2017-07-30 16:59:50 +0000 | |||
3 | +++ apport/source_brz.py 2018-11-20 21:26:00 +0000 | |||
4 | @@ -24,7 +24,7 @@ | |||
5 | 24 | if line == '\n': | 24 | if line == '\n': |
6 | 25 | blanks += 1 | 25 | blanks += 1 |
7 | 26 | brz_log_tail.append(line) | 26 | brz_log_tail.append(line) |
9 | 27 | if blanks >= 2: | 27 | if blanks >= 2: |
10 | 28 | break | 28 | break |
11 | 29 | 29 | ||
12 | 30 | brz_log_tail.reverse() | 30 | brz_log_tail.reverse() |
13 | @@ -36,7 +36,7 @@ | |||
14 | 36 | if 'BrzPlugins' not in report: | 36 | if 'BrzPlugins' not in report: |
15 | 37 | # may already be present in-process | 37 | # may already be present in-process |
16 | 38 | report['BrzPlugins'] = command_output(['brz', 'plugins', '-v']) | 38 | report['BrzPlugins'] = command_output(['brz', 'plugins', '-v']) |
18 | 39 | 39 | ||
19 | 40 | # by default assume brz crashes are upstream bugs; this relies on | 40 | # by default assume brz crashes are upstream bugs; this relies on |
20 | 41 | # having a brz entry under /etc/apport/crashdb.conf.d/ | 41 | # having a brz entry under /etc/apport/crashdb.conf.d/ |
21 | 42 | report['CrashDB'] = 'brz' | 42 | report['CrashDB'] = 'brz' |
22 | @@ -49,5 +49,5 @@ | |||
23 | 49 | #attach_file_if_exists(report, | 49 | #attach_file_if_exists(report, |
24 | 50 | # os.path.join(dot_brz, 'locations.conf', 'BrzLocations') | 50 | # os.path.join(dot_brz, 'locations.conf', 'BrzLocations') |
25 | 51 | 51 | ||
27 | 52 | 52 | ||
28 | 53 | # vim: expandtab shiftwidth=4 | 53 | # vim: expandtab shiftwidth=4 |
29 | 54 | 54 | ||
30 | === modified file 'breezy/bzr/bzrdir.py' | |||
31 | --- breezy/bzr/bzrdir.py 2018-11-16 18:33:17 +0000 | |||
32 | +++ breezy/bzr/bzrdir.py 2018-11-20 21:26:00 +0000 | |||
33 | @@ -669,7 +669,7 @@ | |||
34 | 669 | 669 | ||
35 | 670 | This is true IF and ONLY IF the filename is part of the namespace | 670 | This is true IF and ONLY IF the filename is part of the namespace |
36 | 671 | reserved for bzr control dirs. Currently this is the '.bzr' directory | 671 | reserved for bzr control dirs. Currently this is the '.bzr' directory |
38 | 672 | in the root of the root_transport. | 672 | in the root of the root_transport. |
39 | 673 | """ | 673 | """ |
40 | 674 | # this might be better on the BzrDirFormat class because it refers to | 674 | # this might be better on the BzrDirFormat class because it refers to |
41 | 675 | # all the possible bzrdir disk formats. | 675 | # all the possible bzrdir disk formats. |
42 | 676 | 676 | ||
43 | === modified file 'breezy/bzr/dirstate.py' | |||
44 | --- breezy/bzr/dirstate.py 2018-11-12 01:41:38 +0000 | |||
45 | +++ breezy/bzr/dirstate.py 2018-11-20 21:26:00 +0000 | |||
46 | @@ -28,7 +28,7 @@ | |||
47 | 28 | WHOLE_NUMBER = {digit}, digit; | 28 | WHOLE_NUMBER = {digit}, digit; |
48 | 29 | BOOLEAN = "y" | "n"; | 29 | BOOLEAN = "y" | "n"; |
49 | 30 | REVISION_ID = a non-empty utf8 string; | 30 | REVISION_ID = a non-empty utf8 string; |
51 | 31 | 31 | ||
52 | 32 | dirstate format = header line, full checksum, row count, parent details, | 32 | dirstate format = header line, full checksum, row count, parent details, |
53 | 33 | ghost_details, entries; | 33 | ghost_details, entries; |
54 | 34 | header line = "#bazaar dirstate flat format 3", NL; | 34 | header line = "#bazaar dirstate flat format 3", NL; |
55 | @@ -3578,7 +3578,7 @@ | |||
56 | 3578 | """Compare an entry and real disk to generate delta information. | 3578 | """Compare an entry and real disk to generate delta information. |
57 | 3579 | 3579 | ||
58 | 3580 | :param path_info: top_relpath, basename, kind, lstat, abspath for | 3580 | :param path_info: top_relpath, basename, kind, lstat, abspath for |
60 | 3581 | the path of entry. If None, then the path is considered absent in | 3581 | the path of entry. If None, then the path is considered absent in |
61 | 3582 | the target (Perhaps we should pass in a concrete entry for this ?) | 3582 | the target (Perhaps we should pass in a concrete entry for this ?) |
62 | 3583 | Basename is returned as a utf8 string because we expect this | 3583 | Basename is returned as a utf8 string because we expect this |
63 | 3584 | tuple will be ignored, and don't want to take the time to | 3584 | tuple will be ignored, and don't want to take the time to |
64 | 3585 | 3585 | ||
65 | === modified file 'breezy/bzr/index.py' | |||
66 | --- breezy/bzr/index.py 2018-11-12 01:41:38 +0000 | |||
67 | +++ breezy/bzr/index.py 2018-11-20 21:26:00 +0000 | |||
68 | @@ -310,7 +310,7 @@ | |||
69 | 310 | def finish(self): | 310 | def finish(self): |
70 | 311 | """Finish the index. | 311 | """Finish the index. |
71 | 312 | 312 | ||
73 | 313 | :returns: cBytesIO holding the full context of the index as it | 313 | :returns: cBytesIO holding the full context of the index as it |
74 | 314 | should be written to disk. | 314 | should be written to disk. |
75 | 315 | """ | 315 | """ |
76 | 316 | lines = [_SIGNATURE] | 316 | lines = [_SIGNATURE] |
77 | 317 | 317 | ||
78 | === modified file 'breezy/bzr/inventory.py' | |||
79 | --- breezy/bzr/inventory.py 2018-11-16 11:37:47 +0000 | |||
80 | +++ breezy/bzr/inventory.py 2018-11-20 21:26:00 +0000 | |||
81 | @@ -1480,7 +1480,7 @@ | |||
82 | 1480 | 1480 | ||
83 | 1481 | if given [foo-id] we will include | 1481 | if given [foo-id] we will include |
84 | 1482 | TREE_ROOT as interesting parents | 1482 | TREE_ROOT as interesting parents |
86 | 1483 | and | 1483 | and |
87 | 1484 | foo-id, baz-id, frob-id, fringle-id | 1484 | foo-id, baz-id, frob-id, fringle-id |
88 | 1485 | As interesting ids. | 1485 | As interesting ids. |
89 | 1486 | """ | 1486 | """ |
90 | 1487 | 1487 | ||
91 | === modified file 'breezy/bzr/workingtree_4.py' | |||
92 | --- breezy/bzr/workingtree_4.py 2018-11-16 18:33:17 +0000 | |||
93 | +++ breezy/bzr/workingtree_4.py 2018-11-20 21:26:00 +0000 | |||
94 | @@ -1403,7 +1403,7 @@ | |||
95 | 1403 | class ContentFilteringDirStateWorkingTree(DirStateWorkingTree): | 1403 | class ContentFilteringDirStateWorkingTree(DirStateWorkingTree): |
96 | 1404 | """Dirstate working tree that supports content filtering. | 1404 | """Dirstate working tree that supports content filtering. |
97 | 1405 | 1405 | ||
99 | 1406 | The dirstate holds the hash and size of the canonical form of the file, | 1406 | The dirstate holds the hash and size of the canonical form of the file, |
100 | 1407 | and most methods must return that. | 1407 | and most methods must return that. |
101 | 1408 | """ | 1408 | """ |
102 | 1409 | 1409 | ||
103 | 1410 | 1410 | ||
104 | === modified file 'breezy/config.py' | |||
105 | --- breezy/config.py 2018-11-16 12:08:41 +0000 | |||
106 | +++ breezy/config.py 2018-11-20 21:26:00 +0000 | |||
107 | @@ -2105,7 +2105,7 @@ | |||
108 | 2105 | :param override_existing: Raise KeyErorr if False and something has | 2105 | :param override_existing: Raise KeyErorr if False and something has |
109 | 2106 | already been registered for that key. If True, ignore if there | 2106 | already been registered for that key. If True, ignore if there |
110 | 2107 | is an existing key (always register the new value). | 2107 | is an existing key (always register the new value). |
112 | 2108 | :param fallback: Whether this credential store should be | 2108 | :param fallback: Whether this credential store should be |
113 | 2109 | used as fallback. | 2109 | used as fallback. |
114 | 2110 | """ | 2110 | """ |
115 | 2111 | return super(CredentialStoreRegistry, | 2111 | return super(CredentialStoreRegistry, |
116 | @@ -2125,7 +2125,7 @@ | |||
117 | 2125 | :param override_existing: If True, replace the existing object | 2125 | :param override_existing: If True, replace the existing object |
118 | 2126 | with the new one. If False, if there is already something | 2126 | with the new one. If False, if there is already something |
119 | 2127 | registered with the same key, raise a KeyError | 2127 | registered with the same key, raise a KeyError |
121 | 2128 | :param fallback: Whether this credential store should be | 2128 | :param fallback: Whether this credential store should be |
122 | 2129 | used as fallback. | 2129 | used as fallback. |
123 | 2130 | """ | 2130 | """ |
124 | 2131 | return super(CredentialStoreRegistry, self).register_lazy( | 2131 | return super(CredentialStoreRegistry, self).register_lazy( |
125 | 2132 | 2132 | ||
126 | === modified file 'breezy/counted_lock.py' | |||
127 | --- breezy/counted_lock.py 2018-11-11 04:08:32 +0000 | |||
128 | +++ breezy/counted_lock.py 2018-11-20 21:26:00 +0000 | |||
129 | @@ -29,7 +29,7 @@ | |||
130 | 29 | This can be used with any object that provides a basic Lock interface, | 29 | This can be used with any object that provides a basic Lock interface, |
131 | 30 | including LockDirs and OS file locks. | 30 | including LockDirs and OS file locks. |
132 | 31 | 31 | ||
134 | 32 | :ivar _token: While a write lock is held, this is the token | 32 | :ivar _token: While a write lock is held, this is the token |
135 | 33 | for it. | 33 | for it. |
136 | 34 | """ | 34 | """ |
137 | 35 | 35 | ||
138 | @@ -81,7 +81,7 @@ | |||
139 | 81 | 81 | ||
140 | 82 | If the lock was originally acquired in read mode this will fail. | 82 | If the lock was originally acquired in read mode this will fail. |
141 | 83 | 83 | ||
143 | 84 | :param token: If given and the lock is already held, | 84 | :param token: If given and the lock is already held, |
144 | 85 | then validate that we already hold the real | 85 | then validate that we already hold the real |
145 | 86 | lock with this token. | 86 | lock with this token. |
146 | 87 | 87 | ||
147 | 88 | 88 | ||
148 | === modified file 'breezy/diff.py' | |||
149 | --- breezy/diff.py 2018-11-16 18:33:17 +0000 | |||
150 | +++ breezy/diff.py 2018-11-20 21:26:00 +0000 | |||
151 | @@ -447,10 +447,10 @@ | |||
152 | 447 | :param to_file: The output stream. | 447 | :param to_file: The output stream. |
153 | 448 | :param specific_files: Include only changes to these files - None for all | 448 | :param specific_files: Include only changes to these files - None for all |
154 | 449 | changes. | 449 | changes. |
156 | 450 | :param external_diff_options: If set, use an external GNU diff and pass | 450 | :param external_diff_options: If set, use an external GNU diff and pass |
157 | 451 | these options. | 451 | these options. |
158 | 452 | :param extra_trees: If set, more Trees to use for looking up file ids | 452 | :param extra_trees: If set, more Trees to use for looking up file ids |
160 | 453 | :param path_encoding: If set, the path will be encoded as specified, | 453 | :param path_encoding: If set, the path will be encoded as specified, |
161 | 454 | otherwise is supposed to be utf8 | 454 | otherwise is supposed to be utf8 |
162 | 455 | :param format_cls: Formatter class (DiffTree subclass) | 455 | :param format_cls: Formatter class (DiffTree subclass) |
163 | 456 | """ | 456 | """ |
164 | 457 | 457 | ||
165 | === modified file 'breezy/foreign.py' | |||
166 | --- breezy/foreign.py 2018-11-16 12:08:41 +0000 | |||
167 | +++ breezy/foreign.py 2018-11-20 21:26:00 +0000 | |||
168 | @@ -145,7 +145,7 @@ | |||
169 | 145 | """Serialize a foreign revision id for this VCS. | 145 | """Serialize a foreign revision id for this VCS. |
170 | 146 | 146 | ||
171 | 147 | :param foreign_revid: Foreign revision id | 147 | :param foreign_revid: Foreign revision id |
173 | 148 | :return: Bytestring with serialized revid, will not contain any | 148 | :return: Bytestring with serialized revid, will not contain any |
174 | 149 | newlines. | 149 | newlines. |
175 | 150 | """ | 150 | """ |
176 | 151 | raise NotImplementedError(self.serialize_foreign_revid) | 151 | raise NotImplementedError(self.serialize_foreign_revid) |
177 | 152 | 152 | ||
178 | === modified file 'breezy/globbing.py' | |||
179 | --- breezy/globbing.py 2018-11-12 01:41:38 +0000 | |||
180 | +++ breezy/globbing.py 2018-11-20 21:26:00 +0000 | |||
181 | @@ -297,9 +297,9 @@ | |||
182 | 297 | """A Globster that supports exception patterns. | 297 | """A Globster that supports exception patterns. |
183 | 298 | 298 | ||
184 | 299 | Exceptions are ignore patterns prefixed with '!'. Exception | 299 | Exceptions are ignore patterns prefixed with '!'. Exception |
188 | 300 | patterns take precedence over regular patterns and cause a | 300 | patterns take precedence over regular patterns and cause a |
189 | 301 | matching filename to return None from the match() function. | 301 | matching filename to return None from the match() function. |
190 | 302 | Patterns using a '!!' prefix are highest precedence, and act | 302 | Patterns using a '!!' prefix are highest precedence, and act |
191 | 303 | as regular ignores. '!!' patterns are useful to establish ignores | 303 | as regular ignores. '!!' patterns are useful to establish ignores |
192 | 304 | that apply under paths specified by '!' exception patterns. | 304 | that apply under paths specified by '!' exception patterns. |
193 | 305 | """ | 305 | """ |
194 | 306 | 306 | ||
195 | === modified file 'breezy/help_topics/__init__.py' | |||
196 | --- breezy/help_topics/__init__.py 2018-11-11 04:08:32 +0000 | |||
197 | +++ breezy/help_topics/__init__.py 2018-11-20 21:26:00 +0000 | |||
198 | @@ -526,10 +526,10 @@ | |||
199 | 526 | repository (a shared repository). Branches can be copied and merged. | 526 | repository (a shared repository). Branches can be copied and merged. |
200 | 527 | 527 | ||
201 | 528 | In addition, one branch may be bound to another one. Binding to another | 528 | In addition, one branch may be bound to another one. Binding to another |
206 | 529 | branch indicates that commits which happen in this branch must also | 529 | branch indicates that commits which happen in this branch must also |
207 | 530 | happen in the other branch. Breezy ensures consistency by not allowing | 530 | happen in the other branch. Breezy ensures consistency by not allowing |
208 | 531 | commits when the two branches are out of date. In order for a commit | 531 | commits when the two branches are out of date. In order for a commit |
209 | 532 | to succeed, it may be necessary to update the current branch using | 532 | to succeed, it may be necessary to update the current branch using |
210 | 533 | ``brz update``. | 533 | ``brz update``. |
211 | 534 | 534 | ||
212 | 535 | Related commands:: | 535 | Related commands:: |
213 | 536 | 536 | ||
214 | === modified file 'breezy/plugins/bash_completion/bashcomp.py' | |||
215 | --- breezy/plugins/bash_completion/bashcomp.py 2018-11-16 11:54:55 +0000 | |||
216 | +++ breezy/plugins/bash_completion/bashcomp.py 2018-11-20 21:26:00 +0000 | |||
217 | @@ -422,7 +422,7 @@ | |||
218 | 422 | This command generates a shell function which can be used by bash to | 422 | This command generates a shell function which can be used by bash to |
219 | 423 | automatically complete the currently typed command when the user presses | 423 | automatically complete the currently typed command when the user presses |
220 | 424 | the completion key (usually tab). | 424 | the completion key (usually tab). |
222 | 425 | 425 | ||
223 | 426 | Commonly used like this: | 426 | Commonly used like this: |
224 | 427 | eval "`brz bash-completion`" | 427 | eval "`brz bash-completion`" |
225 | 428 | """ | 428 | """ |
226 | 429 | 429 | ||
227 | === modified file 'breezy/plugins/fastimport/cmds.py' | |||
228 | --- breezy/plugins/fastimport/cmds.py 2018-11-11 04:08:32 +0000 | |||
229 | +++ breezy/plugins/fastimport/cmds.py 2018-11-20 21:26:00 +0000 | |||
230 | @@ -85,7 +85,7 @@ | |||
231 | 85 | bzr fast-import project.fi project.bzr | 85 | bzr fast-import project.fi project.bzr |
232 | 86 | 86 | ||
233 | 87 | Numerous commands are provided for generating a fast-import file | 87 | Numerous commands are provided for generating a fast-import file |
235 | 88 | to use as input. | 88 | to use as input. |
236 | 89 | To specify standard input as the input stream, use a | 89 | To specify standard input as the input stream, use a |
237 | 90 | source name of '-' (instead of project.fi). If the source name | 90 | source name of '-' (instead of project.fi). If the source name |
238 | 91 | ends in '.gz', it is assumed to be compressed in gzip format. | 91 | ends in '.gz', it is assumed to be compressed in gzip format. |
239 | 92 | 92 | ||
240 | === modified file 'breezy/plugins/launchpad/__init__.py' | |||
241 | --- breezy/plugins/launchpad/__init__.py 2018-11-11 04:08:32 +0000 | |||
242 | +++ breezy/plugins/launchpad/__init__.py 2018-11-20 21:26:00 +0000 | |||
243 | @@ -17,7 +17,7 @@ | |||
244 | 17 | """Launchpad.net integration plugin for Bazaar. | 17 | """Launchpad.net integration plugin for Bazaar. |
245 | 18 | 18 | ||
246 | 19 | This plugin provides facilities for working with Bazaar branches that are | 19 | This plugin provides facilities for working with Bazaar branches that are |
248 | 20 | hosted on Launchpad (http://launchpad.net). It provides a directory service | 20 | hosted on Launchpad (http://launchpad.net). It provides a directory service |
249 | 21 | for referring to Launchpad branches using the "lp:" prefix. For example, | 21 | for referring to Launchpad branches using the "lp:" prefix. For example, |
250 | 22 | lp:bzr refers to the Bazaar's main development branch and | 22 | lp:bzr refers to the Bazaar's main development branch and |
251 | 23 | lp:~username/project/branch-name can be used to refer to a specific branch. | 23 | lp:~username/project/branch-name can be used to refer to a specific branch. |
252 | 24 | 24 | ||
253 | === modified file 'breezy/plugins/upload/__init__.py' | |||
254 | --- breezy/plugins/upload/__init__.py 2018-11-11 04:08:32 +0000 | |||
255 | +++ breezy/plugins/upload/__init__.py 2018-11-20 21:26:00 +0000 | |||
256 | @@ -32,7 +32,7 @@ | |||
257 | 32 | 32 | ||
258 | 33 | brz upload -r X sftp://user@host/location/on/webserver | 33 | brz upload -r X sftp://user@host/location/on/webserver |
259 | 34 | 34 | ||
261 | 35 | bzr-upload, just as brz does, will remember the location where you upload the | 35 | bzr-upload, just as brz does, will remember the location where you upload the |
262 | 36 | first time, so you don't need to specify it every time. | 36 | first time, so you don't need to specify it every time. |
263 | 37 | 37 | ||
264 | 38 | If you need to re-upload the whole working tree for some reason, you can: | 38 | If you need to re-upload the whole working tree for some reason, you can: |
265 | @@ -107,7 +107,7 @@ | |||
266 | 107 | It is possible to upload to a remote location from another remote location by | 107 | It is possible to upload to a remote location from another remote location by |
267 | 108 | specifying it with the --directory option: | 108 | specifying it with the --directory option: |
268 | 109 | 109 | ||
270 | 110 | brz upload sftp://public.example.com --directory sftp://private.example.com | 110 | brz upload sftp://public.example.com --directory sftp://private.example.com |
271 | 111 | 111 | ||
272 | 112 | This, together with --auto, can be used to upload when you push to your | 112 | This, together with --auto, can be used to upload when you push to your |
273 | 113 | central branch, rather than when you commit to your local branch. | 113 | central branch, rather than when you commit to your local branch. |
274 | 114 | 114 | ||
275 | === modified file 'breezy/repository.py' | |||
276 | --- breezy/repository.py 2018-11-11 04:08:32 +0000 | |||
277 | +++ breezy/repository.py 2018-11-20 21:26:00 +0000 | |||
278 | @@ -1144,7 +1144,7 @@ | |||
279 | 1144 | :param callback_refs: A dict of check-refs to resolve and callback | 1144 | :param callback_refs: A dict of check-refs to resolve and callback |
280 | 1145 | the check/_check method on the items listed as wanting the ref. | 1145 | the check/_check method on the items listed as wanting the ref. |
281 | 1146 | see breezy.check. | 1146 | see breezy.check. |
283 | 1147 | :param check_repo: If False do not check the repository contents, just | 1147 | :param check_repo: If False do not check the repository contents, just |
284 | 1148 | calculate the data callback_refs requires and call them back. | 1148 | calculate the data callback_refs requires and call them back. |
285 | 1149 | """ | 1149 | """ |
286 | 1150 | return self._check(revision_ids=revision_ids, callback_refs=callback_refs, | 1150 | return self._check(revision_ids=revision_ids, callback_refs=callback_refs, |
287 | 1151 | 1151 | ||
288 | === modified file 'breezy/tests/blackbox/test_uncommit.py' | |||
289 | --- breezy/tests/blackbox/test_uncommit.py 2018-07-17 21:50:43 +0000 | |||
290 | +++ breezy/tests/blackbox/test_uncommit.py 2018-11-20 21:26:00 +0000 | |||
291 | @@ -237,7 +237,7 @@ | |||
292 | 237 | script = ScriptRunner() | 237 | script = ScriptRunner() |
293 | 238 | script.run_script(self, """ | 238 | script.run_script(self, """ |
294 | 239 | $ cd tree | 239 | $ cd tree |
296 | 240 | $ brz uncommit --force | 240 | $ brz uncommit --force |
297 | 241 | 2 ... | 241 | 2 ... |
298 | 242 | second commit | 242 | second commit |
299 | 243 | ... | 243 | ... |
300 | 244 | 244 | ||
301 | === modified file 'breezy/tests/per_controldir_colo/__init__.py' | |||
302 | --- breezy/tests/per_controldir_colo/__init__.py 2018-11-11 04:08:32 +0000 | |||
303 | +++ breezy/tests/per_controldir_colo/__init__.py 2018-11-20 21:26:00 +0000 | |||
304 | @@ -18,7 +18,7 @@ | |||
305 | 18 | """BzrDir implementation tests for colocated branch support. | 18 | """BzrDir implementation tests for colocated branch support. |
306 | 19 | 19 | ||
307 | 20 | These tests check the conformance of the colocated branches support. | 20 | These tests check the conformance of the colocated branches support. |
309 | 21 | All bzrdir formats are tested - those that do not suppport colocated branches | 21 | All bzrdir formats are tested - those that do not suppport colocated branches |
310 | 22 | have the test_unsupported tests run; the others have the test_supported tests | 22 | have the test_unsupported tests run; the others have the test_supported tests |
311 | 23 | run. | 23 | run. |
312 | 24 | """ | 24 | """ |
313 | 25 | 25 | ||
314 | === modified file 'breezy/tests/per_controldir_colo/test_unsupported.py' | |||
315 | --- breezy/tests/per_controldir_colo/test_unsupported.py 2018-11-11 04:08:32 +0000 | |||
316 | +++ breezy/tests/per_controldir_colo/test_unsupported.py 2018-11-20 21:26:00 +0000 | |||
317 | @@ -16,7 +16,7 @@ | |||
318 | 16 | 16 | ||
319 | 17 | """Tests for bazaar control directories that do not support colocated branches. | 17 | """Tests for bazaar control directories that do not support colocated branches. |
320 | 18 | 18 | ||
322 | 19 | Colocated branch support is optional, and when it is not supported the methods | 19 | Colocated branch support is optional, and when it is not supported the methods |
323 | 20 | and attributes colocated branch support added should fail in known ways. | 20 | and attributes colocated branch support added should fail in known ways. |
324 | 21 | """ | 21 | """ |
325 | 22 | 22 | ||
326 | 23 | 23 | ||
327 | === modified file 'breezy/tests/per_foreign_vcs/test_branch.py' | |||
328 | --- breezy/tests/per_foreign_vcs/test_branch.py 2018-11-11 04:08:32 +0000 | |||
329 | +++ breezy/tests/per_foreign_vcs/test_branch.py 2018-11-20 21:26:00 +0000 | |||
330 | @@ -49,8 +49,8 @@ | |||
331 | 49 | class ForeignBranchTests(TestCaseWithTransport): | 49 | class ForeignBranchTests(TestCaseWithTransport): |
332 | 50 | """Basic tests for foreign branch implementations. | 50 | """Basic tests for foreign branch implementations. |
333 | 51 | 51 | ||
336 | 52 | These tests mainly make sure that the implementation covers the required | 52 | These tests mainly make sure that the implementation covers the required |
337 | 53 | bits of the API and returns reasonable values. | 53 | bits of the API and returns reasonable values. |
338 | 54 | """ | 54 | """ |
339 | 55 | branch_factory = None # Set to an instance of ForeignBranchFactory by scenario | 55 | branch_factory = None # Set to an instance of ForeignBranchFactory by scenario |
340 | 56 | 56 | ||
341 | 57 | 57 | ||
342 | === modified file 'breezy/tests/scenarios.py' | |||
343 | --- breezy/tests/scenarios.py 2017-05-23 14:08:03 +0000 | |||
344 | +++ breezy/tests/scenarios.py 2018-11-20 21:26:00 +0000 | |||
345 | @@ -46,7 +46,7 @@ | |||
346 | 46 | def multiply_tests_by_their_scenarios(some_tests, into_suite): | 46 | def multiply_tests_by_their_scenarios(some_tests, into_suite): |
347 | 47 | """Multiply the tests in the given suite by their declared scenarios. | 47 | """Multiply the tests in the given suite by their declared scenarios. |
348 | 48 | 48 | ||
350 | 49 | Each test must have a 'scenarios' attribute which is a list of | 49 | Each test must have a 'scenarios' attribute which is a list of |
351 | 50 | (name, params) pairs. | 50 | (name, params) pairs. |
352 | 51 | 51 | ||
353 | 52 | :param some_tests: TestSuite or Test. | 52 | :param some_tests: TestSuite or Test. |
354 | 53 | 53 | ||
355 | === modified file 'breezy/tests/script.py' | |||
356 | --- breezy/tests/script.py 2018-11-11 04:08:32 +0000 | |||
357 | +++ breezy/tests/script.py 2018-11-20 21:26:00 +0000 | |||
358 | @@ -142,7 +142,7 @@ | |||
359 | 142 | 142 | ||
360 | 143 | :param args: The command line arguments | 143 | :param args: The command line arguments |
361 | 144 | 144 | ||
363 | 145 | :return: A tuple containing: | 145 | :return: A tuple containing: |
364 | 146 | - The file name redirected from or None | 146 | - The file name redirected from or None |
365 | 147 | - The file name redirected to or None | 147 | - The file name redirected to or None |
366 | 148 | - The mode to open the output file or None | 148 | - The mode to open the output file or None |
367 | 149 | 149 | ||
368 | === modified file 'breezy/tests/test_gpg.py' | |||
369 | --- breezy/tests/test_gpg.py 2018-11-11 04:08:32 +0000 | |||
370 | +++ breezy/tests/test_gpg.py 2018-11-20 21:26:00 +0000 | |||
371 | @@ -342,13 +342,13 @@ | |||
372 | 342 | self.import_keys() | 342 | self.import_keys() |
373 | 343 | content = b"""-----BEGIN PGP SIGNED MESSAGE----- | 343 | content = b"""-----BEGIN PGP SIGNED MESSAGE----- |
374 | 344 | Hash: SHA1 | 344 | Hash: SHA1 |
376 | 345 | 345 | ||
377 | 346 | bazaar-ng testament short form 1 | 346 | bazaar-ng testament short form 1 |
378 | 347 | revision-id: test@example.com-20110801100657-f1dr1nompeex723z | 347 | revision-id: test@example.com-20110801100657-f1dr1nompeex723z |
379 | 348 | sha1: 59ab434be4c2d5d646dee84f514aa09e1b72feeb | 348 | sha1: 59ab434be4c2d5d646dee84f514aa09e1b72feeb |
380 | 349 | -----BEGIN PGP SIGNATURE----- | 349 | -----BEGIN PGP SIGNATURE----- |
381 | 350 | Version: GnuPG v1.4.10 (GNU/Linux) | 350 | Version: GnuPG v1.4.10 (GNU/Linux) |
383 | 351 | 351 | ||
384 | 352 | iJwEAQECAAYFAk42esUACgkQHOJve0+NFRPc5wP7BoZkzBU8JaHMLv/LmqLr0sUz | 352 | iJwEAQECAAYFAk42esUACgkQHOJve0+NFRPc5wP7BoZkzBU8JaHMLv/LmqLr0sUz |
385 | 353 | zuE51ofZZ19L7KVtQWsOi4jFy0fi4A5TFwO8u9SOfoREGvkw292Uty9subSouK5/ | 353 | zuE51ofZZ19L7KVtQWsOi4jFy0fi4A5TFwO8u9SOfoREGvkw292Uty9subSouK5/ |
386 | 354 | mFmDOYPQ+O83zWgYZsBmMJWYDZ+X9I6XXZSbPtV/7XyTjaxtl5uRnDVJjg+AzKvD | 354 | mFmDOYPQ+O83zWgYZsBmMJWYDZ+X9I6XXZSbPtV/7XyTjaxtl5uRnDVJjg+AzKvD |
387 | 355 | 355 | ||
388 | === modified file 'breezy/tests/test_help.py' | |||
389 | --- breezy/tests/test_help.py 2018-11-11 04:08:32 +0000 | |||
390 | +++ breezy/tests/test_help.py 2018-11-20 21:26:00 +0000 | |||
391 | @@ -204,12 +204,12 @@ | |||
392 | 204 | """Concise help text excludes the descriptive sections.""" | 204 | """Concise help text excludes the descriptive sections.""" |
393 | 205 | class cmd_Demo(commands.Command): | 205 | class cmd_Demo(commands.Command): |
394 | 206 | __doc__ = """A sample command. | 206 | __doc__ = """A sample command. |
396 | 207 | 207 | ||
397 | 208 | Blah blah blah. | 208 | Blah blah blah. |
398 | 209 | 209 | ||
399 | 210 | :Examples: | 210 | :Examples: |
400 | 211 | Example 1:: | 211 | Example 1:: |
402 | 212 | 212 | ||
403 | 213 | cmd arg1 | 213 | cmd arg1 |
404 | 214 | """ | 214 | """ |
405 | 215 | cmd = cmd_Demo() | 215 | cmd = cmd_Demo() |
406 | @@ -429,7 +429,7 @@ | |||
407 | 429 | # The help formatter expect the class name to start with 'cmd_' | 429 | # The help formatter expect the class name to start with 'cmd_' |
408 | 430 | class cmd_Demo(commands.Command): | 430 | class cmd_Demo(commands.Command): |
409 | 431 | __doc__ = """A sample command. | 431 | __doc__ = """A sample command. |
411 | 432 | 432 | ||
412 | 433 | Blah blah blah. | 433 | Blah blah blah. |
413 | 434 | 434 | ||
414 | 435 | :Formats: | 435 | :Formats: |
415 | @@ -437,7 +437,7 @@ | |||
416 | 437 | 437 | ||
417 | 438 | :Examples: | 438 | :Examples: |
418 | 439 | Example 1:: | 439 | Example 1:: |
420 | 440 | 440 | ||
421 | 441 | cmd arg1 | 441 | cmd arg1 |
422 | 442 | 442 | ||
423 | 443 | :Tips: | 443 | :Tips: |
424 | @@ -455,18 +455,18 @@ | |||
425 | 455 | }} | 455 | }} |
426 | 456 | Description: | 456 | Description: |
427 | 457 | zz{{zz{{Blah blah blah.}} | 457 | zz{{zz{{Blah blah blah.}} |
429 | 458 | 458 | ||
430 | 459 | }}:Formats: | 459 | }}:Formats: |
431 | 460 | zz{{Interesting stuff about formats.}} | 460 | zz{{Interesting stuff about formats.}} |
433 | 461 | 461 | ||
434 | 462 | Examples: | 462 | Examples: |
435 | 463 | zz{{Example 1::}} | 463 | zz{{Example 1::}} |
437 | 464 | 464 | ||
438 | 465 | zz{{cmd arg1}} | 465 | zz{{cmd arg1}} |
440 | 466 | 466 | ||
441 | 467 | Tips: | 467 | Tips: |
442 | 468 | zz{{Clever things to keep in mind.}} | 468 | zz{{Clever things to keep in mind.}} |
444 | 469 | 469 | ||
445 | 470 | ''', | 470 | ''', |
446 | 471 | cmd_Demo()) | 471 | cmd_Demo()) |
447 | 472 | 472 | ||
448 | 473 | 473 | ||
449 | === modified file 'breezy/tests/test_script.py' | |||
450 | --- breezy/tests/test_script.py 2018-11-11 04:08:32 +0000 | |||
451 | +++ breezy/tests/test_script.py 2018-11-20 21:26:00 +0000 | |||
452 | @@ -44,8 +44,8 @@ | |||
453 | 44 | def test_trim_blank_lines(self): | 44 | def test_trim_blank_lines(self): |
454 | 45 | """Blank lines are respected, but trimmed at the start and end. | 45 | """Blank lines are respected, but trimmed at the start and end. |
455 | 46 | 46 | ||
458 | 47 | Python triple-quoted syntax is going to give stubby/empty blank lines | 47 | Python triple-quoted syntax is going to give stubby/empty blank lines |
459 | 48 | right at the start and the end. These are cut off so that callers don't | 48 | right at the start and the end. These are cut off so that callers don't |
460 | 49 | need special syntax to avoid them. | 49 | need special syntax to avoid them. |
461 | 50 | 50 | ||
462 | 51 | However we do want to be able to match commands that emit blank lines. | 51 | However we do want to be able to match commands that emit blank lines. |
463 | @@ -186,7 +186,7 @@ | |||
464 | 186 | """) | 186 | """) |
465 | 187 | 187 | ||
466 | 188 | def test_null_output_matches_option(self): | 188 | def test_null_output_matches_option(self): |
468 | 189 | """If you want null output to be a wild card, you can pass | 189 | """If you want null output to be a wild card, you can pass |
469 | 190 | null_output_matches_anything to run_script""" | 190 | null_output_matches_anything to run_script""" |
470 | 191 | self.run_script( | 191 | self.run_script( |
471 | 192 | """ | 192 | """ |
472 | @@ -628,12 +628,11 @@ | |||
473 | 628 | 628 | ||
474 | 629 | def test_dont_shelve(self): | 629 | def test_dont_shelve(self): |
475 | 630 | # We intentionally provide no input here to test EOF | 630 | # We intentionally provide no input here to test EOF |
482 | 631 | self.run_script(""" | 631 | self.run_script(( |
483 | 632 | $ brz shelve -m 'shelve bar' | 632 | "$ brz shelve -m 'shelve bar'\n" |
484 | 633 | 2>Shelve? ([y]es, [N]o, [f]inish, [q]uit): | 633 | "2>Shelve? ([y]es, [N]o, [f]inish, [q]uit): \n" |
485 | 634 | 2>No changes to shelve. | 634 | "2>No changes to shelve.\n" |
486 | 635 | """, | 635 | ), null_output_matches_anything=True) |
481 | 636 | null_output_matches_anything=True) | ||
487 | 637 | self.run_script(""" | 636 | self.run_script(""" |
488 | 638 | $ brz st | 637 | $ brz st |
489 | 639 | modified: | 638 | modified: |
490 | 640 | 639 | ||
491 | === modified file 'breezy/transform.py' | |||
492 | --- breezy/transform.py 2018-11-16 23:21:31 +0000 | |||
493 | +++ breezy/transform.py 2018-11-20 21:26:00 +0000 | |||
494 | @@ -604,7 +604,7 @@ | |||
495 | 604 | 604 | ||
496 | 605 | :param name: The basename of the file. | 605 | :param name: The basename of the file. |
497 | 606 | 606 | ||
499 | 607 | :param target_id: The directory trans_id where the backup should | 607 | :param target_id: The directory trans_id where the backup should |
500 | 608 | be placed. | 608 | be placed. |
501 | 609 | """ | 609 | """ |
502 | 610 | known_children = self.by_parent().get(target_id, []) | 610 | known_children = self.by_parent().get(target_id, []) |
503 | 611 | 611 | ||
504 | === modified file 'breezy/transport/__init__.py' | |||
505 | --- breezy/transport/__init__.py 2018-11-17 16:53:10 +0000 | |||
506 | +++ breezy/transport/__init__.py 2018-11-20 21:26:00 +0000 | |||
507 | @@ -265,7 +265,7 @@ | |||
508 | 265 | def fdatasync(self): | 265 | def fdatasync(self): |
509 | 266 | """Force data out to physical disk if possible. | 266 | """Force data out to physical disk if possible. |
510 | 267 | 267 | ||
512 | 268 | :raises TransportNotPossible: If this transport has no way to | 268 | :raises TransportNotPossible: If this transport has no way to |
513 | 269 | flush to disk. | 269 | flush to disk. |
514 | 270 | """ | 270 | """ |
515 | 271 | raise errors.TransportNotPossible( | 271 | raise errors.TransportNotPossible( |
516 | 272 | 272 | ||
517 | === modified file 'breezy/transport/log.py' | |||
518 | --- breezy/transport/log.py 2018-11-11 04:08:32 +0000 | |||
519 | +++ breezy/transport/log.py 2018-11-20 21:26:00 +0000 | |||
520 | @@ -36,7 +36,7 @@ | |||
521 | 36 | 36 | ||
522 | 37 | Not all operations are logged yet. | 37 | Not all operations are logged yet. |
523 | 38 | 38 | ||
525 | 39 | See also TransportTraceDecorator, that records a machine-readable log in | 39 | See also TransportTraceDecorator, that records a machine-readable log in |
526 | 40 | memory for eg testing. | 40 | memory for eg testing. |
527 | 41 | """ | 41 | """ |
528 | 42 | 42 | ||
529 | 43 | 43 | ||
530 | === modified file 'breezy/transport/trace.py' | |||
531 | --- breezy/transport/trace.py 2018-11-11 04:08:32 +0000 | |||
532 | +++ breezy/transport/trace.py 2018-11-20 21:26:00 +0000 | |||
533 | @@ -36,7 +36,7 @@ | |||
534 | 36 | operation please add a test to the tests of this transport, for the logging | 36 | operation please add a test to the tests of this transport, for the logging |
535 | 37 | of the operation you want logged. | 37 | of the operation you want logged. |
536 | 38 | 38 | ||
538 | 39 | See also TransportLogDecorator, that records a machine-readable log in | 39 | See also TransportLogDecorator, that records a machine-readable log in |
539 | 40 | memory for eg testing. | 40 | memory for eg testing. |
540 | 41 | """ | 41 | """ |
541 | 42 | 42 | ||
542 | 43 | 43 | ||
543 | === modified file 'breezy/tree.py' | |||
544 | --- breezy/tree.py 2018-11-16 18:40:46 +0000 | |||
545 | +++ breezy/tree.py 2018-11-20 21:26:00 +0000 | |||
546 | @@ -290,7 +290,7 @@ | |||
547 | 290 | :param path: A relative path within the tree. | 290 | :param path: A relative path within the tree. |
548 | 291 | :return: A tuple containing kind, size, exec, sha1-or-link. | 291 | :return: A tuple containing kind, size, exec, sha1-or-link. |
549 | 292 | Kind is always present (see tree.kind()). | 292 | Kind is always present (see tree.kind()). |
551 | 293 | size is present if kind is file and the size of the | 293 | size is present if kind is file and the size of the |
552 | 294 | canonical form can be cheaply determined, None otherwise. | 294 | canonical form can be cheaply determined, None otherwise. |
553 | 295 | exec is None unless kind is file and the platform supports the 'x' | 295 | exec is None unless kind is file and the platform supports the 'x' |
554 | 296 | bit. | 296 | bit. |
555 | 297 | 297 | ||
556 | === modified file 'doc/en/conf.py' | |||
557 | --- doc/en/conf.py 2018-11-18 02:43:52 +0000 | |||
558 | +++ doc/en/conf.py 2018-11-20 21:26:00 +0000 | |||
559 | @@ -103,4 +103,3 @@ | |||
560 | 103 | # Miscellaneous | 103 | # Miscellaneous |
561 | 104 | 'user-reference/readme', | 104 | 'user-reference/readme', |
562 | 105 | ] | 105 | ] |
563 | 106 | |||
564 | 107 | 106 | ||
565 | === modified file 'profile_imports.py' | |||
566 | --- profile_imports.py 2018-11-16 18:35:30 +0000 | |||
567 | +++ profile_imports.py 2018-11-20 21:26:00 +0000 | |||
568 | @@ -202,4 +202,3 @@ | |||
569 | 202 | """Remove the import and regex compile timing hooks.""" | 202 | """Remove the import and regex compile timing hooks.""" |
570 | 203 | __builtins__['__import__'] = _real_import | 203 | __builtins__['__import__'] = _real_import |
571 | 204 | re._compile = _real_compile | 204 | re._compile = _real_compile |
572 | 205 | |||
573 | 206 | 205 | ||
574 | === modified file 'setup.cfg' | |||
575 | --- setup.cfg 2018-11-18 20:59:41 +0000 | |||
576 | +++ setup.cfg 2018-11-20 21:26:00 +0000 | |||
577 | @@ -31,10 +31,6 @@ | |||
578 | 31 | F812 | 31 | F812 |
579 | 32 | F821 | 32 | F821 |
580 | 33 | F841 | 33 | F841 |
581 | 34 | W191 | ||
582 | 35 | W291 | ||
583 | 36 | W293 | ||
584 | 37 | W391 | ||
585 | 38 | W503 | 34 | W503 |
586 | 39 | W504 | 35 | W504 |
587 | 40 | W605 | 36 | W605 |
588 | 41 | 37 | ||
589 | === modified file 'tools/brz_epydoc_uid.py' | |||
590 | --- tools/brz_epydoc_uid.py 2017-05-21 18:10:28 +0000 | |||
591 | +++ tools/brz_epydoc_uid.py 2018-11-20 21:26:00 +0000 | |||
592 | @@ -40,4 +40,3 @@ | |||
593 | 40 | 40 | ||
594 | 41 | 41 | ||
595 | 42 | _ScopeReplacer._should_proxy = True | 42 | _ScopeReplacer._should_proxy = True |
596 | 43 | |||
597 | 44 | 43 | ||
598 | === modified file 'tools/check-newsbugs.py' | |||
599 | --- tools/check-newsbugs.py 2018-11-16 12:54:47 +0000 | |||
600 | +++ tools/check-newsbugs.py 2018-11-20 21:26:00 +0000 | |||
601 | @@ -1,5 +1,5 @@ | |||
602 | 1 | #!/usr/bin/python | 1 | #!/usr/bin/python |
604 | 2 | # Simple script that will check which bugs mentioned in NEWS | 2 | # Simple script that will check which bugs mentioned in NEWS |
605 | 3 | # are not yet marked Fix Released in Launchpad | 3 | # are not yet marked Fix Released in Launchpad |
606 | 4 | 4 | ||
607 | 5 | import getopt, re, sys | 5 | import getopt, re, sys |
608 | 6 | 6 | ||
609 | === modified file 'tools/generate_docs.py' | |||
610 | --- tools/generate_docs.py 2018-11-16 13:15:40 +0000 | |||
611 | +++ tools/generate_docs.py 2018-11-20 21:26:00 +0000 | |||
612 | @@ -25,7 +25,7 @@ | |||
613 | 25 | bash_completion bash completion script | 25 | bash_completion bash completion script |
614 | 26 | ... | 26 | ... |
615 | 27 | 27 | ||
617 | 28 | Examples: | 28 | Examples: |
618 | 29 | 29 | ||
619 | 30 | python generated-docs.py man | 30 | python generated-docs.py man |
620 | 31 | python generated-docs.py bash_completion | 31 | python generated-docs.py bash_completion |
621 | @@ -99,7 +99,7 @@ | |||
622 | 99 | def print_extended_help(option, opt, value, parser): | 99 | def print_extended_help(option, opt, value, parser): |
623 | 100 | """ Program help examples | 100 | """ Program help examples |
624 | 101 | 101 | ||
626 | 102 | Prints out the examples stored in the docstring. | 102 | Prints out the examples stored in the docstring. |
627 | 103 | 103 | ||
628 | 104 | """ | 104 | """ |
629 | 105 | sys.stdout.write(__doc__ % {"prog": sys.argv[0]}) | 105 | sys.stdout.write(__doc__ % {"prog": sys.argv[0]}) |
630 | 106 | 106 | ||
631 | === modified file 'tools/generate_release_notes.py' | |||
632 | --- tools/generate_release_notes.py 2018-11-18 02:43:52 +0000 | |||
633 | +++ tools/generate_release_notes.py 2018-11-20 21:26:00 +0000 | |||
634 | @@ -58,7 +58,7 @@ | |||
635 | 58 | 58 | ||
636 | 59 | def natural_sort_key(file_name): | 59 | def natural_sort_key(file_name): |
637 | 60 | """Split 'aaa-N.MMbbb' into ('aaa-', N, '.' MM, 'bbb') | 60 | """Split 'aaa-N.MMbbb' into ('aaa-', N, '.' MM, 'bbb') |
639 | 61 | 61 | ||
640 | 62 | e.g. 1.10b1 will sort as greater than 1.2:: | 62 | e.g. 1.10b1 will sort as greater than 1.2:: |
641 | 63 | 63 | ||
642 | 64 | >>> natural_sort_key('brz-1.10b1.txt') > natural_sort_key('brz-1.2.txt') | 64 | >>> natural_sort_key('brz-1.10b1.txt') > natural_sort_key('brz-1.2.txt') |
643 | 65 | 65 | ||
644 | === modified file 'tools/riodemo.py' | |||
645 | --- tools/riodemo.py 2018-06-29 15:36:29 +0000 | |||
646 | +++ tools/riodemo.py 2018-11-20 21:26:00 +0000 | |||
647 | @@ -2,12 +2,12 @@ | |||
648 | 2 | 2 | ||
649 | 3 | 3 | ||
650 | 4 | # \subsection{Example usage} | 4 | # \subsection{Example usage} |
653 | 5 | # | 5 | # |
654 | 6 | # \textbf{XXX:} Move these to object serialization code. | 6 | # \textbf{XXX:} Move these to object serialization code. |
655 | 7 | 7 | ||
656 | 8 | def write_revision(writer, revision): | 8 | def write_revision(writer, revision): |
657 | 9 | s = Stanza(revision=revision.revision_id, | 9 | s = Stanza(revision=revision.revision_id, |
659 | 10 | committer=revision.committer, | 10 | committer=revision.committer, |
660 | 11 | timezone=long(revision.timezone), | 11 | timezone=long(revision.timezone), |
661 | 12 | timestamp=long(revision.timestamp), | 12 | timestamp=long(revision.timestamp), |
662 | 13 | inventory_sha1=revision.inventory_sha1, | 13 | inventory_sha1=revision.inventory_sha1, |
663 | 14 | 14 | ||
664 | === modified file 'tools/rst2html.py' | |||
665 | --- tools/rst2html.py 2008-07-17 01:08:21 +0000 | |||
666 | +++ tools/rst2html.py 2018-11-20 21:26:00 +0000 | |||
667 | @@ -25,7 +25,7 @@ | |||
668 | 25 | # python-docutils 0.4-4 -- so monkeypatch in a better pattern | 25 | # python-docutils 0.4-4 -- so monkeypatch in a better pattern |
669 | 26 | # | 26 | # |
670 | 27 | # This is a bit gross to patch because all this is built up at load time. | 27 | # This is a bit gross to patch because all this is built up at load time. |
672 | 28 | Body.pats['optname'] = r'[a-zA-Z0-9][a-zA-Z0-9._-]*' | 28 | Body.pats['optname'] = r'[a-zA-Z0-9][a-zA-Z0-9._-]*' |
673 | 29 | Body.pats['longopt'] = r'(--|/)%(optname)s([ =]%(optarg)s)?' % Body.pats | 29 | Body.pats['longopt'] = r'(--|/)%(optname)s([ =]%(optarg)s)?' % Body.pats |
674 | 30 | Body.pats['option'] = r'(%(shortopt)s|%(longopt)s)' % Body.pats | 30 | Body.pats['option'] = r'(%(shortopt)s|%(longopt)s)' % Body.pats |
675 | 31 | Body.patterns['option_marker'] = r'%(option)s(, %(option)s)*( +| ?$)' % Body.pats | 31 | Body.patterns['option_marker'] = r'%(option)s(, %(option)s)*( +| ?$)' % Body.pats |
676 | 32 | 32 | ||
677 | === modified file 'tools/win32/brz_postinstall.py' | |||
678 | --- tools/win32/brz_postinstall.py 2018-11-18 12:18:44 +0000 | |||
679 | +++ tools/win32/brz_postinstall.py 2018-11-20 21:26:00 +0000 | |||
680 | @@ -283,7 +283,7 @@ | |||
681 | 283 | f.write(i) | 283 | f.write(i) |
682 | 284 | else: | 284 | else: |
683 | 285 | print('*** Remove line <%s> from autoexec.bat' % pattern) | 285 | print('*** Remove line <%s> from autoexec.bat' % pattern) |
685 | 286 | 286 | ||
686 | 287 | elif add_path and not found: | 287 | elif add_path and not found: |
687 | 288 | backup_autoexec_bat(abat, abak, dry_run) | 288 | backup_autoexec_bat(abat, abak, dry_run) |
688 | 289 | if not dry_run: | 289 | if not dry_run: |
Running landing tests failed /ci.breezy- vcs.org/ job/brz/ job/brz- land/98/
https:/