Merge lp:~jelmer/brz/python3-grep-all into lp:brz
- python3-grep-all
- Merge into trunk
Proposed by
Jelmer Vernooij
| Status: | Merged |
|---|---|
| Approved by: | Jelmer Vernooij |
| Approved revision: | no longer in the source branch. |
| Merge reported by: | The Breezy Bot |
| Merged at revision: | not available |
| Proposed branch: | lp:~jelmer/brz/python3-grep-all |
| Merge into: | lp:brz |
| Prerequisite: | lp:~jelmer/brz/python3-blackbox |
| Diff against target: |
359 lines (+101/-35) 4 files modified
breezy/plugins/grep/cmds.py (+1/-1) breezy/plugins/grep/grep.py (+14/-16) breezy/plugins/grep/test_grep.py (+11/-5) python3.passing (+75/-13) |
| To merge this branch: | bzr merge lp:~jelmer/brz/python3-grep-all |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Martin Packman | Approve | ||
|
Review via email:
|
|||
Commit message
Fix all but one of the grep plugin tests on python 3.
Description of the change
Fix all but one of the grep plugin tests on python 3.
To post a comment you must log in.
Revision history for this message
| The Breezy Bot (the-breezy-bot) wrote : | # |
Merging failed
https:/
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'breezy/plugins/grep/cmds.py' | |||
| 2 | --- breezy/plugins/grep/cmds.py 2018-07-07 19:27:38 +0000 | |||
| 3 | +++ breezy/plugins/grep/cmds.py 2018-07-15 09:29:16 +0000 | |||
| 4 | @@ -203,7 +203,7 @@ | |||
| 5 | 203 | re_flags |= re.IGNORECASE | 203 | re_flags |= re.IGNORECASE |
| 6 | 204 | 204 | ||
| 7 | 205 | if not fixed_string: | 205 | if not fixed_string: |
| 9 | 206 | patternc = grep.compile_pattern(pattern, re_flags) | 206 | patternc = grep.compile_pattern(pattern.encode(grep._user_encoding), re_flags) |
| 10 | 207 | 207 | ||
| 11 | 208 | if color == 'always': | 208 | if color == 'always': |
| 12 | 209 | show_color = True | 209 | show_color = True |
| 13 | 210 | 210 | ||
| 14 | === modified file 'breezy/plugins/grep/grep.py' | |||
| 15 | --- breezy/plugins/grep/grep.py 2018-07-12 00:27:24 +0000 | |||
| 16 | +++ breezy/plugins/grep/grep.py 2018-07-15 09:29:16 +0000 | |||
| 17 | @@ -145,14 +145,13 @@ | |||
| 18 | 145 | self.opts = opts | 145 | self.opts = opts |
| 19 | 146 | self.outf = opts.outf | 146 | self.outf = opts.outf |
| 20 | 147 | if opts.show_color: | 147 | if opts.show_color: |
| 21 | 148 | pat = opts.pattern.encode(_user_encoding, 'replace') | ||
| 22 | 149 | if opts.fixed_string: | 148 | if opts.fixed_string: |
| 25 | 150 | self._old = pat | 149 | self._old = opts.pattern |
| 26 | 151 | self._new = color_string(pat, FG.BOLD_RED) | 150 | self._new = color_string(opts.pattern, FG.BOLD_RED) |
| 27 | 152 | self.get_writer = self._get_writer_fixed_highlighted | 151 | self.get_writer = self._get_writer_fixed_highlighted |
| 28 | 153 | else: | 152 | else: |
| 29 | 154 | flags = opts.patternc.flags | 153 | flags = opts.patternc.flags |
| 31 | 155 | self._sub = re.compile(pat.join(("((?:", ")+)")), flags).sub | 154 | self._sub = re.compile(opts.pattern.join(("((?:", ")+)")), flags).sub |
| 32 | 156 | self._highlight = color_string("\\1", FG.BOLD_RED) | 155 | self._highlight = color_string("\\1", FG.BOLD_RED) |
| 33 | 157 | self.get_writer = self._get_writer_regexp_highlighted | 156 | self.get_writer = self._get_writer_regexp_highlighted |
| 34 | 158 | else: | 157 | else: |
| 35 | @@ -260,8 +259,8 @@ | |||
| 36 | 260 | start_rev_tuple = (start_revid, start_revno, 0) | 259 | start_rev_tuple = (start_revid, start_revno, 0) |
| 37 | 261 | given_revs = [start_rev_tuple] | 260 | given_revs = [start_rev_tuple] |
| 38 | 262 | repo = branch.repository | 261 | repo = branch.repository |
| 41 | 263 | diff_pattern = re.compile("^[+\\-].*(" + opts.pattern + ")") | 262 | diff_pattern = re.compile(b"^[+\\-].*(" + opts.pattern.encode(_user_encoding) + b")") |
| 42 | 264 | file_pattern = re.compile("=== (modified|added|removed) file '.*'", re.UNICODE) | 263 | file_pattern = re.compile(b"=== (modified|added|removed) file '.*'") |
| 43 | 265 | outputter = _GrepDiffOutputter(opts) | 264 | outputter = _GrepDiffOutputter(opts) |
| 44 | 266 | writeline = outputter.get_writer() | 265 | writeline = outputter.get_writer() |
| 45 | 267 | writerevno = outputter.get_revision_header_writer() | 266 | writerevno = outputter.get_revision_header_writer() |
| 46 | @@ -282,7 +281,7 @@ | |||
| 47 | 282 | old_tree = repo.revision_tree(ancestor_id) | 281 | old_tree = repo.revision_tree(ancestor_id) |
| 48 | 283 | s = BytesIO() | 282 | s = BytesIO() |
| 49 | 284 | diff.show_diff_trees(old_tree, new_tree, s, | 283 | diff.show_diff_trees(old_tree, new_tree, s, |
| 51 | 285 | old_label=b'', new_label=b'') | 284 | old_label='', new_label='') |
| 52 | 286 | display_revno = True | 285 | display_revno = True |
| 53 | 287 | display_file = False | 286 | display_file = False |
| 54 | 288 | file_header = None | 287 | file_header = None |
| 55 | @@ -296,7 +295,7 @@ | |||
| 56 | 296 | writerevno("=== revno:%s ===" % (revno,)) | 295 | writerevno("=== revno:%s ===" % (revno,)) |
| 57 | 297 | display_revno = False | 296 | display_revno = False |
| 58 | 298 | if display_file: | 297 | if display_file: |
| 60 | 299 | writefileheader(" %s" % (file_header,)) | 298 | writefileheader(" %s" % (file_header.decode(file_encoding, 'replace'),)) |
| 61 | 300 | display_file = False | 299 | display_file = False |
| 62 | 301 | line = line.decode(file_encoding, 'replace') | 300 | line = line.decode(file_encoding, 'replace') |
| 63 | 302 | writeline(" %s" % (line,)) | 301 | writeline(" %s" % (line,)) |
| 64 | @@ -446,7 +445,7 @@ | |||
| 65 | 446 | if opts.files_with_matches or opts.files_without_match: | 445 | if opts.files_with_matches or opts.files_without_match: |
| 66 | 447 | # Optimize for wtree list-only as we don't need to read the | 446 | # Optimize for wtree list-only as we don't need to read the |
| 67 | 448 | # entire file | 447 | # entire file |
| 69 | 449 | with open(path_for_file, 'r', buffering=4096) as file: | 448 | with open(path_for_file, 'rb', buffering=4096) as file: |
| 70 | 450 | _file_grep_list_only_wtree(file, fp, opts, path_prefix) | 449 | _file_grep_list_only_wtree(file, fp, opts, path_prefix) |
| 71 | 451 | else: | 450 | else: |
| 72 | 452 | with open(path_for_file, 'rb') as f: | 451 | with open(path_for_file, 'rb') as f: |
| 73 | @@ -492,7 +491,7 @@ | |||
| 74 | 492 | 491 | ||
| 75 | 493 | def _file_grep_list_only_wtree(file, path, opts, path_prefix=None): | 492 | def _file_grep_list_only_wtree(file, path, opts, path_prefix=None): |
| 76 | 494 | # test and skip binary files | 493 | # test and skip binary files |
| 78 | 495 | if '\x00' in file.read(1024): | 494 | if b'\x00' in file.read(1024): |
| 79 | 496 | if opts.verbose: | 495 | if opts.verbose: |
| 80 | 497 | trace.warning("Binary file '%s' skipped.", path) | 496 | trace.warning("Binary file '%s' skipped.", path) |
| 81 | 498 | return | 497 | return |
| 82 | @@ -540,16 +539,15 @@ | |||
| 83 | 540 | no_line = opts.files_with_matches or opts.files_without_match | 539 | no_line = opts.files_with_matches or opts.files_without_match |
| 84 | 541 | 540 | ||
| 85 | 542 | if opts.show_color: | 541 | if opts.show_color: |
| 86 | 543 | pat = opts.pattern.encode(_user_encoding, 'replace') | ||
| 87 | 544 | if no_line: | 542 | if no_line: |
| 88 | 545 | self.get_writer = self._get_writer_plain | 543 | self.get_writer = self._get_writer_plain |
| 89 | 546 | elif opts.fixed_string: | 544 | elif opts.fixed_string: |
| 92 | 547 | self._old = pat | 545 | self._old = opts.pattern |
| 93 | 548 | self._new = color_string(pat, FG.BOLD_RED) | 546 | self._new = color_string(opts.pattern, FG.BOLD_RED) |
| 94 | 549 | self.get_writer = self._get_writer_fixed_highlighted | 547 | self.get_writer = self._get_writer_fixed_highlighted |
| 95 | 550 | else: | 548 | else: |
| 96 | 551 | flags = opts.patternc.flags | 549 | flags = opts.patternc.flags |
| 98 | 552 | self._sub = re.compile(pat.join(("((?:", ")+)")), flags).sub | 550 | self._sub = re.compile(opts.pattern.join(("((?:", ")+)")), flags).sub |
| 99 | 553 | self._highlight = color_string("\\1", FG.BOLD_RED) | 551 | self._highlight = color_string("\\1", FG.BOLD_RED) |
| 100 | 554 | self.get_writer = self._get_writer_regexp_highlighted | 552 | self.get_writer = self._get_writer_regexp_highlighted |
| 101 | 555 | path_start = FG.MAGENTA | 553 | path_start = FG.MAGENTA |
| 102 | @@ -648,7 +646,7 @@ | |||
| 103 | 648 | found = pattern in file_text | 646 | found = pattern in file_text |
| 104 | 649 | else: | 647 | else: |
| 105 | 650 | search = opts.patternc.search | 648 | search = opts.patternc.search |
| 107 | 651 | if "$" not in pattern: | 649 | if b"$" not in pattern: |
| 108 | 652 | found = search(file_text) is not None | 650 | found = search(file_text) is not None |
| 109 | 653 | else: | 651 | else: |
| 110 | 654 | for line in file_text.splitlines(): | 652 | for line in file_text.splitlines(): |
| 111 | @@ -685,7 +683,7 @@ | |||
| 112 | 685 | # standard cases, but perhaps could try and detect backtracking | 683 | # standard cases, but perhaps could try and detect backtracking |
| 113 | 686 | # patterns here and avoid whole text search in those cases | 684 | # patterns here and avoid whole text search in those cases |
| 114 | 687 | search = opts.patternc.search | 685 | search = opts.patternc.search |
| 116 | 688 | if "$" not in pattern: | 686 | if b"$" not in pattern: |
| 117 | 689 | # GZ 2010-06-05: Grr, re.MULTILINE can't save us when searching | 687 | # GZ 2010-06-05: Grr, re.MULTILINE can't save us when searching |
| 118 | 690 | # through revisions as bazaar returns binary mode | 688 | # through revisions as bazaar returns binary mode |
| 119 | 691 | # and trailing \r breaks $ as line ending match | 689 | # and trailing \r breaks $ as line ending match |
| 120 | 692 | 690 | ||
| 121 | === modified file 'breezy/plugins/grep/test_grep.py' | |||
| 122 | --- breezy/plugins/grep/test_grep.py 2018-07-07 17:57:42 +0000 | |||
| 123 | +++ breezy/plugins/grep/test_grep.py 2018-07-15 09:29:16 +0000 | |||
| 124 | @@ -21,6 +21,7 @@ | |||
| 125 | 21 | import unicodedata as ud | 21 | import unicodedata as ud |
| 126 | 22 | 22 | ||
| 127 | 23 | from ... import tests, osutils | 23 | from ... import tests, osutils |
| 128 | 24 | from ...sixish import PY3 | ||
| 129 | 24 | from ..._termcolor import color_string, FG | 25 | from ..._termcolor import color_string, FG |
| 130 | 25 | 26 | ||
| 131 | 26 | from ...tests.features import ( | 27 | from ...tests.features import ( |
| 132 | @@ -364,17 +365,23 @@ | |||
| 133 | 364 | nref = ud.normalize(u'NFC', u"file0.txt~1:line1\0file0.txt~1:line2\0file0.txt~1:line3\0") | 365 | nref = ud.normalize(u'NFC', u"file0.txt~1:line1\0file0.txt~1:line2\0file0.txt~1:line3\0") |
| 134 | 365 | 366 | ||
| 135 | 366 | out, err = self.run_bzr(['grep', '-r', 'last:1', '--null', 'line[1-3]']) | 367 | out, err = self.run_bzr(['grep', '-r', 'last:1', '--null', 'line[1-3]']) |
| 137 | 367 | nout = ud.normalize(u'NFC', out.decode('utf-8', 'ignore')) | 368 | if not PY3: |
| 138 | 369 | out = out.decode('utf-8', 'ignore') | ||
| 139 | 370 | nout = ud.normalize(u'NFC', out) | ||
| 140 | 368 | self.assertEqual(nout, nref) | 371 | self.assertEqual(nout, nref) |
| 141 | 369 | self.assertEqual(len(out.splitlines()), 1) | 372 | self.assertEqual(len(out.splitlines()), 1) |
| 142 | 370 | 373 | ||
| 143 | 371 | out, err = self.run_bzr(['grep', '-r', 'last:1', '-Z', 'line[1-3]']) | 374 | out, err = self.run_bzr(['grep', '-r', 'last:1', '-Z', 'line[1-3]']) |
| 145 | 372 | nout = ud.normalize(u'NFC', out.decode('utf-8', 'ignore')) | 375 | if not PY3: |
| 146 | 376 | out = out.decode('utf-8', 'ignore') | ||
| 147 | 377 | nout = ud.normalize(u'NFC', out) | ||
| 148 | 373 | self.assertEqual(nout, nref) | 378 | self.assertEqual(nout, nref) |
| 149 | 374 | self.assertEqual(len(out.splitlines()), 1) | 379 | self.assertEqual(len(out.splitlines()), 1) |
| 150 | 375 | 380 | ||
| 151 | 376 | out, err = self.run_bzr(['grep', '-r', 'last:1', '--null', 'line']) | 381 | out, err = self.run_bzr(['grep', '-r', 'last:1', '--null', 'line']) |
| 153 | 377 | nout = ud.normalize(u'NFC', out.decode('utf-8', 'ignore')) | 382 | if not PY3: |
| 154 | 383 | out = out.decode('utf-8', 'ignore') | ||
| 155 | 384 | nout = ud.normalize(u'NFC', out) | ||
| 156 | 378 | self.assertEqual(nout, nref) | 385 | self.assertEqual(nout, nref) |
| 157 | 379 | self.assertEqual(len(out.splitlines()), 1) | 386 | self.assertEqual(len(out.splitlines()), 1) |
| 158 | 380 | 387 | ||
| 159 | @@ -2248,6 +2255,5 @@ | |||
| 160 | 2248 | """grep -p with zero revisions.""" | 2255 | """grep -p with zero revisions.""" |
| 161 | 2249 | out, err = self.run_bzr(['init']) | 2256 | out, err = self.run_bzr(['init']) |
| 162 | 2250 | out, err = self.run_bzr(['grep', '--diff', 'foo'], 3) | 2257 | out, err = self.run_bzr(['grep', '--diff', 'foo'], 3) |
| 164 | 2251 | self.assertEqual(out, b'') | 2258 | self.assertEqual(out, '') |
| 165 | 2252 | self.assertContainsRe(err, "ERROR:.*revision.* does not exist in branch") | 2259 | self.assertContainsRe(err, "ERROR:.*revision.* does not exist in branch") |
| 166 | 2253 | |||
| 167 | 2254 | 2260 | ||
| 168 | === modified file 'python3.passing' | |||
| 169 | --- python3.passing 2018-07-14 19:36:48 +0000 | |||
| 170 | +++ python3.passing 2018-07-15 09:29:16 +0000 | |||
| 171 | @@ -638,11 +638,73 @@ | |||
| 172 | 638 | breezy.plugins.git.tests.test_workingtree.TreeDeltaFromGitChangesTests.test_empty | 638 | breezy.plugins.git.tests.test_workingtree.TreeDeltaFromGitChangesTests.test_empty |
| 173 | 639 | breezy.plugins.git.tests.test_workingtree.TreeDeltaFromGitChangesTests.test_missing | 639 | breezy.plugins.git.tests.test_workingtree.TreeDeltaFromGitChangesTests.test_missing |
| 174 | 640 | breezy.plugins.grep.test_grep.TestColorGrep.test_color_option | 640 | breezy.plugins.grep.test_grep.TestColorGrep.test_color_option |
| 175 | 641 | breezy.plugins.grep.test_grep.TestColorGrep.test_ver_basic_file | ||
| 176 | 642 | breezy.plugins.grep.test_grep.TestColorGrep.test_ver_matching_files | ||
| 177 | 643 | breezy.plugins.grep.test_grep.TestColorGrep.test_wtree_basic_file | ||
| 178 | 644 | breezy.plugins.grep.test_grep.TestColorGrep.test_wtree_matching_files | ||
| 179 | 645 | breezy.plugins.grep.test_grep.TestGrepDiff.test_grep_diff_basic | ||
| 180 | 646 | breezy.plugins.grep.test_grep.TestGrepDiff.test_grep_diff_color | ||
| 181 | 647 | breezy.plugins.grep.test_grep.TestGrepDiff.test_grep_diff_revision | ||
| 182 | 648 | breezy.plugins.grep.test_grep.TestGrepDiff.test_grep_diff_revision_range | ||
| 183 | 649 | breezy.plugins.grep.test_grep.TestGrepDiff.test_grep_norevs | ||
| 184 | 650 | breezy.plugins.grep.test_grep.TestGrep.test_basic_unknown_file | ||
| 185 | 641 | breezy.plugins.grep.test_grep.TestGrep.test_dotted_rev_grep | 651 | breezy.plugins.grep.test_grep.TestGrep.test_dotted_rev_grep |
| 186 | 652 | breezy.plugins.grep.test_grep.TestGrep.test_levels | ||
| 187 | 653 | breezy.plugins.grep.test_grep.TestGrep.test_multiple_wtree_files | ||
| 188 | 654 | breezy.plugins.grep.test_grep.TestGrep.test_no_tree | ||
| 189 | 655 | breezy.plugins.grep.test_grep.TestGrep.test_revno_basic_history_grep_file | ||
| 190 | 656 | breezy.plugins.grep.test_grep.TestGrep.test_revno_basic_history_grep_full | ||
| 191 | 657 | breezy.plugins.grep.test_grep.TestGrep.test_revno_range_basic_history_grep | ||
| 192 | 658 | breezy.plugins.grep.test_grep.TestGrep.test_revno_range_versioned_file_from_outside_dir | ||
| 193 | 659 | breezy.plugins.grep.test_grep.TestGrep.test_revno_range_versioned_file_in_dir | ||
| 194 | 660 | breezy.plugins.grep.test_grep.TestGrep.test_revno_versioned_file_in_dir | ||
| 195 | 661 | breezy.plugins.grep.test_grep.TestGrep.test_revspec | ||
| 196 | 662 | breezy.plugins.grep.test_grep.TestGrep.test_ver_basic_exclude | ||
| 197 | 663 | breezy.plugins.grep.test_grep.TestGrep.test_ver_basic_file | ||
| 198 | 664 | breezy.plugins.grep.test_grep.TestGrep.test_ver_basic_include | ||
| 199 | 665 | breezy.plugins.grep.test_grep.TestGrep.test_ver_files_with_matches | ||
| 200 | 666 | breezy.plugins.grep.test_grep.TestGrep.test_ver_files_without_matches | ||
| 201 | 667 | breezy.plugins.grep.test_grep.TestGrep.test_ver_multiple_files | ||
| 202 | 668 | breezy.plugins.grep.test_grep.TestGrep.test_ver_null_option | ||
| 203 | 642 | breezy.plugins.grep.test_grep.TestGrep.test_versioned_binary_file_grep | 669 | breezy.plugins.grep.test_grep.TestGrep.test_versioned_binary_file_grep |
| 204 | 670 | breezy.plugins.grep.test_grep.TestGrep.test_versioned_exclude_file_within_dir | ||
| 205 | 671 | breezy.plugins.grep.test_grep.TestGrep.test_versioned_exclude_from_outside_dir | ||
| 206 | 672 | breezy.plugins.grep.test_grep.TestGrep.test_versioned_file_in_dir_no_recursive | ||
| 207 | 673 | breezy.plugins.grep.test_grep.TestGrep.test_versioned_file_in_dir_recurse | ||
| 208 | 674 | breezy.plugins.grep.test_grep.TestGrep.test_versioned_files_from_outside_dir | ||
| 209 | 675 | breezy.plugins.grep.test_grep.TestGrep.test_versioned_files_from_outside_two_dirs | ||
| 210 | 676 | breezy.plugins.grep.test_grep.TestGrep.test_versioned_file_within_dir | ||
| 211 | 677 | breezy.plugins.grep.test_grep.TestGrep.test_versioned_file_within_dir_two_levels | ||
| 212 | 643 | breezy.plugins.grep.test_grep.TestGrep.test_versioned_from_root_fail | 678 | breezy.plugins.grep.test_grep.TestGrep.test_versioned_from_root_fail |
| 213 | 679 | breezy.plugins.grep.test_grep.TestGrep.test_versioned_from_root_pass | ||
| 214 | 680 | breezy.plugins.grep.test_grep.TestGrep.test_versioned_ignore_case_match | ||
| 215 | 681 | breezy.plugins.grep.test_grep.TestGrep.test_versioned_ignore_case_no_match | ||
| 216 | 682 | breezy.plugins.grep.test_grep.TestGrep.test_versioned_include_file_within_dir | ||
| 217 | 683 | breezy.plugins.grep.test_grep.TestGrep.test_versioned_include_from_outside_dir | ||
| 218 | 684 | breezy.plugins.grep.test_grep.TestGrep.test_versioned_with_line_number | ||
| 219 | 685 | breezy.plugins.grep.test_grep.TestGrep.test_workingtree_files_from_outside_dir | ||
| 220 | 686 | breezy.plugins.grep.test_grep.TestGrep.test_wtree_basic_exclude | ||
| 221 | 687 | breezy.plugins.grep.test_grep.TestGrep.test_wtree_basic_file | ||
| 222 | 688 | breezy.plugins.grep.test_grep.TestGrep.test_wtree_basic_include | ||
| 223 | 644 | breezy.plugins.grep.test_grep.TestGrep.test_wtree_binary_file_grep | 689 | breezy.plugins.grep.test_grep.TestGrep.test_wtree_binary_file_grep |
| 224 | 690 | breezy.plugins.grep.test_grep.TestGrep.test_wtree_exclude_file_within_dir | ||
| 225 | 691 | breezy.plugins.grep.test_grep.TestGrep.test_wtree_exclude_from_outside_dir | ||
| 226 | 692 | breezy.plugins.grep.test_grep.TestGrep.test_wtree_file_in_dir_no_recursive | ||
| 227 | 693 | breezy.plugins.grep.test_grep.TestGrep.test_wtree_file_in_dir_recurse | ||
| 228 | 694 | breezy.plugins.grep.test_grep.TestGrep.test_wtree_files_from_outside_dir | ||
| 229 | 695 | breezy.plugins.grep.test_grep.TestGrep.test_wtree_files_from_outside_two_dirs | ||
| 230 | 696 | breezy.plugins.grep.test_grep.TestGrep.test_wtree_files_with_matches | ||
| 231 | 697 | breezy.plugins.grep.test_grep.TestGrep.test_wtree_files_without_matches | ||
| 232 | 698 | breezy.plugins.grep.test_grep.TestGrep.test_wtree_file_within_dir | ||
| 233 | 699 | breezy.plugins.grep.test_grep.TestGrep.test_wtree_file_within_dir_two_levels | ||
| 234 | 645 | breezy.plugins.grep.test_grep.TestGrep.test_wtree_from_root_fail | 700 | breezy.plugins.grep.test_grep.TestGrep.test_wtree_from_root_fail |
| 235 | 701 | breezy.plugins.grep.test_grep.TestGrep.test_wtree_from_root_pass | ||
| 236 | 702 | breezy.plugins.grep.test_grep.TestGrep.test_wtree_ignore_case_match | ||
| 237 | 703 | breezy.plugins.grep.test_grep.TestGrep.test_wtree_ignore_case_no_match | ||
| 238 | 704 | breezy.plugins.grep.test_grep.TestGrep.test_wtree_include_file_within_dir | ||
| 239 | 705 | breezy.plugins.grep.test_grep.TestGrep.test_wtree_include_from_outside_dir | ||
| 240 | 706 | breezy.plugins.grep.test_grep.TestGrep.test_wtree_null_option | ||
| 241 | 707 | breezy.plugins.grep.test_grep.TestGrep.test_wtree_with_line_number | ||
| 242 | 646 | breezy.plugins.launchpad.test_account.CheckAccountTests.test_check_lp_login_no_ssh_keys | 708 | breezy.plugins.launchpad.test_account.CheckAccountTests.test_check_lp_login_no_ssh_keys |
| 243 | 647 | breezy.plugins.launchpad.test_account.CheckAccountTests.test_check_lp_login_no_user | 709 | breezy.plugins.launchpad.test_account.CheckAccountTests.test_check_lp_login_no_user |
| 244 | 648 | breezy.plugins.launchpad.test_account.CheckAccountTests.test_check_lp_login_valid_user | 710 | breezy.plugins.launchpad.test_account.CheckAccountTests.test_check_lp_login_valid_user |
| 245 | @@ -1212,14 +1274,14 @@ | |||
| 246 | 1212 | breezy.tests.blackbox.test_annotate.TestSimpleAnnotate.test_annotate_nonexistant_file | 1274 | breezy.tests.blackbox.test_annotate.TestSimpleAnnotate.test_annotate_nonexistant_file |
| 247 | 1213 | breezy.tests.blackbox.test_annotate.TestSimpleAnnotate.test_annotate_removed_file | 1275 | breezy.tests.blackbox.test_annotate.TestSimpleAnnotate.test_annotate_removed_file |
| 248 | 1214 | breezy.tests.blackbox.test_annotate.TestSimpleAnnotate.test_annotate_without_workingtree | 1276 | breezy.tests.blackbox.test_annotate.TestSimpleAnnotate.test_annotate_without_workingtree |
| 249 | 1215 | breezy.tests.blackbox.test_bound_branches.TestBind.test_bind_before_bound | ||
| 250 | 1216 | breezy.tests.blackbox.test_bound_branches.TestBind.test_bind_when_bound | ||
| 251 | 1217 | breezy.tests.blackbox.test_bound_branches.TestBoundBranches.test_bind_branch6 | ||
| 252 | 1218 | breezy.tests.blackbox.test_bisect.BisectTestCase.testLog | 1277 | breezy.tests.blackbox.test_bisect.BisectTestCase.testLog |
| 253 | 1219 | breezy.tests.blackbox.test_bisect.BisectTestCase.testMove | 1278 | breezy.tests.blackbox.test_bisect.BisectTestCase.testMove |
| 254 | 1220 | breezy.tests.blackbox.test_bisect.BisectTestCase.testRunScript | 1279 | breezy.tests.blackbox.test_bisect.BisectTestCase.testRunScript |
| 255 | 1221 | breezy.tests.blackbox.test_bisect.BisectTestCase.testWorkflow | 1280 | breezy.tests.blackbox.test_bisect.BisectTestCase.testWorkflow |
| 256 | 1222 | breezy.tests.blackbox.test_bisect.BisectTestCase.testWorkflowSubtree | 1281 | breezy.tests.blackbox.test_bisect.BisectTestCase.testWorkflowSubtree |
| 257 | 1282 | breezy.tests.blackbox.test_bound_branches.TestBind.test_bind_before_bound | ||
| 258 | 1283 | breezy.tests.blackbox.test_bound_branches.TestBind.test_bind_when_bound | ||
| 259 | 1284 | breezy.tests.blackbox.test_bound_branches.TestBoundBranches.test_bind_branch6 | ||
| 260 | 1223 | breezy.tests.blackbox.test_bound_branches.TestBoundBranches.test_bind_child_ahead | 1285 | breezy.tests.blackbox.test_bound_branches.TestBoundBranches.test_bind_child_ahead |
| 261 | 1224 | breezy.tests.blackbox.test_bound_branches.TestBoundBranches.test_bind_diverged | 1286 | breezy.tests.blackbox.test_bound_branches.TestBoundBranches.test_bind_diverged |
| 262 | 1225 | breezy.tests.blackbox.test_bound_branches.TestBoundBranches.test_bind_fail_if_missing | 1287 | breezy.tests.blackbox.test_bound_branches.TestBoundBranches.test_bind_fail_if_missing |
| 263 | @@ -1414,19 +1476,19 @@ | |||
| 264 | 1414 | breezy.tests.blackbox.test_debug.TestDebugOption.test_dash_derror | 1476 | breezy.tests.blackbox.test_debug.TestDebugOption.test_dash_derror |
| 265 | 1415 | breezy.tests.blackbox.test_debug.TestDebugOption.test_dash_dlock | 1477 | breezy.tests.blackbox.test_debug.TestDebugOption.test_dash_dlock |
| 266 | 1416 | breezy.tests.blackbox.test_deleted.TestDeleted.test_deleted_directory | 1478 | breezy.tests.blackbox.test_deleted.TestDeleted.test_deleted_directory |
| 267 | 1479 | breezy.tests.blackbox.test_diff.TestCheckoutDiff.test_diff_across_rename | ||
| 268 | 1417 | breezy.tests.blackbox.test_diff.TestCheckoutDiff.test_diff_illegal_revision_specifiers | 1480 | breezy.tests.blackbox.test_diff.TestCheckoutDiff.test_diff_illegal_revision_specifiers |
| 269 | 1418 | breezy.tests.blackbox.test_diff.TestCheckoutDiff.test_diff_nonexistent | 1481 | breezy.tests.blackbox.test_diff.TestCheckoutDiff.test_diff_nonexistent |
| 270 | 1419 | breezy.tests.blackbox.test_diff.TestCheckoutDiff.test_diff_nonexistent_revision | 1482 | breezy.tests.blackbox.test_diff.TestCheckoutDiff.test_diff_nonexistent_revision |
| 271 | 1420 | breezy.tests.blackbox.test_diff.TestCheckoutDiff.test_diff_unversioned | 1483 | breezy.tests.blackbox.test_diff.TestCheckoutDiff.test_diff_unversioned |
| 272 | 1421 | breezy.tests.blackbox.test_diff.TestCheckoutDiff.test_diff_using_and_format | 1484 | breezy.tests.blackbox.test_diff.TestCheckoutDiff.test_diff_using_and_format |
| 273 | 1422 | breezy.tests.blackbox.test_diff.TestDiffLabels.test_diff_label_renamed | 1485 | breezy.tests.blackbox.test_diff.TestDiffLabels.test_diff_label_renamed |
| 274 | 1486 | breezy.tests.blackbox.test_diff.TestDiff.test_diff_across_rename | ||
| 275 | 1423 | breezy.tests.blackbox.test_diff.TestDiff.test_diff_illegal_revision_specifiers | 1487 | breezy.tests.blackbox.test_diff.TestDiff.test_diff_illegal_revision_specifiers |
| 276 | 1424 | breezy.tests.blackbox.test_diff.TestDiff.test_diff_nonexistent | 1488 | breezy.tests.blackbox.test_diff.TestDiff.test_diff_nonexistent |
| 277 | 1425 | breezy.tests.blackbox.test_diff.TestDiff.test_diff_nonexistent_revision | 1489 | breezy.tests.blackbox.test_diff.TestDiff.test_diff_nonexistent_revision |
| 278 | 1426 | breezy.tests.blackbox.test_diff.TestDiff.test_diff_unversioned | 1490 | breezy.tests.blackbox.test_diff.TestDiff.test_diff_unversioned |
| 279 | 1427 | breezy.tests.blackbox.test_diff.TestDiff.test_diff_using_and_format | 1491 | breezy.tests.blackbox.test_diff.TestDiff.test_diff_using_and_format |
| 280 | 1428 | breezy.tests.blackbox.test_diff.TestCheckoutDiff.test_diff_across_rename | ||
| 281 | 1429 | breezy.tests.blackbox.test_diff.TestDiff.test_diff_across_rename | ||
| 282 | 1430 | breezy.tests.blackbox.test_diff.TestExternalDiff.test_external_diff_options_and_using | 1492 | breezy.tests.blackbox.test_diff.TestExternalDiff.test_external_diff_options_and_using |
| 283 | 1431 | breezy.tests.blackbox.test_dump_btree.TestDumpBtree.test_dump_empty_btree_raw_smoke | 1493 | breezy.tests.blackbox.test_dump_btree.TestDumpBtree.test_dump_empty_btree_raw_smoke |
| 284 | 1432 | breezy.tests.blackbox.test_dump_btree.TestDumpBtree.test_dump_empty_btree_smoke | 1494 | breezy.tests.blackbox.test_dump_btree.TestDumpBtree.test_dump_empty_btree_smoke |
| 285 | @@ -1543,10 +1605,11 @@ | |||
| 286 | 1543 | breezy.tests.blackbox.test_log.MainlineGhostTests.test_log_range | 1605 | breezy.tests.blackbox.test_log.MainlineGhostTests.test_log_range |
| 287 | 1544 | breezy.tests.blackbox.test_log.MainlineGhostTests.test_log_range_open_begin | 1606 | breezy.tests.blackbox.test_log.MainlineGhostTests.test_log_range_open_begin |
| 288 | 1545 | breezy.tests.blackbox.test_log.MainlineGhostTests.test_log_range_open_end | 1607 | breezy.tests.blackbox.test_log.MainlineGhostTests.test_log_range_open_end |
| 289 | 1546 | breezy.tests.blackbox.test_log.TestLogEncodings.test_log_handles_bad_encoding | ||
| 290 | 1547 | breezy.tests.blackbox.test_log.Test_GenerateAllRevisions.test_no_start_rev_id_with_end_rev_id_being_a_merge | 1608 | breezy.tests.blackbox.test_log.Test_GenerateAllRevisions.test_no_start_rev_id_with_end_rev_id_being_a_merge |
| 291 | 1548 | breezy.tests.blackbox.test_log.Test_GenerateAllRevisions.test_not_an_ancestor | 1609 | breezy.tests.blackbox.test_log.Test_GenerateAllRevisions.test_not_an_ancestor |
| 292 | 1549 | breezy.tests.blackbox.test_log.Test_GenerateAllRevisions.test_wrong_order | 1610 | breezy.tests.blackbox.test_log.Test_GenerateAllRevisions.test_wrong_order |
| 293 | 1611 | breezy.tests.blackbox.test_log.TestLogEncodings.test_log_handles_bad_encoding | ||
| 294 | 1612 | breezy.tests.blackbox.test_log.TestLogEncodings.test_log_handles_encoding | ||
| 295 | 1550 | breezy.tests.blackbox.test_log.TestLogErrors.test_log_bad_message_re | 1613 | breezy.tests.blackbox.test_log.TestLogErrors.test_log_bad_message_re |
| 296 | 1551 | breezy.tests.blackbox.test_log.TestLogErrors.test_log_change_incompatible_with_revision | 1614 | breezy.tests.blackbox.test_log.TestLogErrors.test_log_change_incompatible_with_revision |
| 297 | 1552 | breezy.tests.blackbox.test_log.TestLogErrors.test_log_change_nonexistent_dotted_revno | 1615 | breezy.tests.blackbox.test_log.TestLogErrors.test_log_change_nonexistent_dotted_revno |
| 298 | @@ -1563,7 +1626,6 @@ | |||
| 299 | 1563 | breezy.tests.blackbox.test_log.TestLogErrors.test_log_zero_begin_revspec | 1626 | breezy.tests.blackbox.test_log.TestLogErrors.test_log_zero_begin_revspec |
| 300 | 1564 | breezy.tests.blackbox.test_log.TestLogErrors.test_log_zero_end_revspec | 1627 | breezy.tests.blackbox.test_log.TestLogErrors.test_log_zero_end_revspec |
| 301 | 1565 | breezy.tests.blackbox.test_log.TestLogErrors.test_log_zero_revspec | 1628 | breezy.tests.blackbox.test_log.TestLogErrors.test_log_zero_revspec |
| 302 | 1566 | breezy.tests.blackbox.test_log.TestLogEncodings.test_log_handles_encoding | ||
| 303 | 1567 | breezy.tests.blackbox.test_log.TestLogExcludeCommonAncestry.test_exclude_common_ancestry_simple_revnos | 1629 | breezy.tests.blackbox.test_log.TestLogExcludeCommonAncestry.test_exclude_common_ancestry_simple_revnos |
| 304 | 1568 | breezy.tests.blackbox.test_log.TestLogFile.test_log_file1 | 1630 | breezy.tests.blackbox.test_log.TestLogFile.test_log_file1 |
| 305 | 1569 | breezy.tests.blackbox.test_log.TestLogFile.test_log_file2 | 1631 | breezy.tests.blackbox.test_log.TestLogFile.test_log_file2 |
| 306 | @@ -1639,8 +1701,8 @@ | |||
| 307 | 1639 | breezy.tests.blackbox.test_merge.TestMergeRevisionRange.test_merge_reversed_revision_range(whole-tree) | 1701 | breezy.tests.blackbox.test_merge.TestMergeRevisionRange.test_merge_reversed_revision_range(whole-tree) |
| 308 | 1640 | breezy.tests.blackbox.test_merge.TestMergeScript.test_merge_empty_branch | 1702 | breezy.tests.blackbox.test_merge.TestMergeScript.test_merge_empty_branch |
| 309 | 1641 | breezy.tests.blackbox.test_merge.TestMerge.test_conflict_leaves_base_this_other_files | 1703 | breezy.tests.blackbox.test_merge.TestMerge.test_conflict_leaves_base_this_other_files |
| 310 | 1704 | breezy.tests.blackbox.test_merge.TestMerge.test_directive_cherrypick | ||
| 311 | 1642 | breezy.tests.blackbox.test_merge.TestMerge.test_merge | 1705 | breezy.tests.blackbox.test_merge.TestMerge.test_merge |
| 312 | 1643 | breezy.tests.blackbox.test_merge.TestMerge.test_directive_cherrypick | ||
| 313 | 1644 | breezy.tests.blackbox.test_merge.TestMerge.test_merge_bundle | 1706 | breezy.tests.blackbox.test_merge.TestMerge.test_merge_bundle |
| 314 | 1645 | breezy.tests.blackbox.test_merge.TestMerge.test_merge_criss_cross | 1707 | breezy.tests.blackbox.test_merge.TestMerge.test_merge_criss_cross |
| 315 | 1646 | breezy.tests.blackbox.test_merge.TestMerge.test_merge_defaults_to_reprocess | 1708 | breezy.tests.blackbox.test_merge.TestMerge.test_merge_defaults_to_reprocess |
| 316 | @@ -1659,10 +1721,10 @@ | |||
| 317 | 1659 | breezy.tests.blackbox.test_merge.TestMerge.test_merge_with_missing_file | 1721 | breezy.tests.blackbox.test_merge.TestMerge.test_merge_with_missing_file |
| 318 | 1660 | breezy.tests.blackbox.test_merge.TestMerge.test_no_remember_dont_set_submit | 1722 | breezy.tests.blackbox.test_merge.TestMerge.test_no_remember_dont_set_submit |
| 319 | 1661 | breezy.tests.blackbox.test_merge.TestMerge.test_remember_sets_submit | 1723 | breezy.tests.blackbox.test_merge.TestMerge.test_remember_sets_submit |
| 320 | 1724 | breezy.tests.blackbox.test_merge.TestMerge.test_weave_cherrypick | ||
| 321 | 1725 | breezy.tests.blackbox.test_merge.TestMerge.test_weave_conflict_leaves_base_this_other_files | ||
| 322 | 1662 | breezy.tests.blackbox.test_missing.TestMissing.test_missing | 1726 | breezy.tests.blackbox.test_missing.TestMissing.test_missing |
| 323 | 1663 | breezy.tests.blackbox.test_missing.TestMissing.test_missing_check_last_location | 1727 | breezy.tests.blackbox.test_missing.TestMissing.test_missing_check_last_location |
| 324 | 1664 | breezy.tests.blackbox.test_merge.TestMerge.test_weave_cherrypick | ||
| 325 | 1665 | breezy.tests.blackbox.test_merge.TestMerge.test_weave_conflict_leaves_base_this_other_files | ||
| 326 | 1666 | breezy.tests.blackbox.test_missing.TestMissing.test_missing_directory | 1728 | breezy.tests.blackbox.test_missing.TestMissing.test_missing_directory |
| 327 | 1667 | breezy.tests.blackbox.test_missing.TestMissing.test_missing_quiet | 1729 | breezy.tests.blackbox.test_missing.TestMissing.test_missing_quiet |
| 328 | 1668 | breezy.tests.blackbox.test_missing.TestMissing.test_missing_tags | 1730 | breezy.tests.blackbox.test_missing.TestMissing.test_missing_tags |
| 329 | @@ -1910,8 +1972,8 @@ | |||
| 330 | 1910 | breezy.tests.blackbox.test_resolve.TestResolve.test_resolve_via_directory_option | 1972 | breezy.tests.blackbox.test_resolve.TestResolve.test_resolve_via_directory_option |
| 331 | 1911 | breezy.tests.blackbox.test_revert.TestRevert.test_revert | 1973 | breezy.tests.blackbox.test_revert.TestRevert.test_revert |
| 332 | 1912 | breezy.tests.blackbox.test_revert.TestRevert.test_revert_chatter | 1974 | breezy.tests.blackbox.test_revert.TestRevert.test_revert_chatter |
| 333 | 1975 | breezy.tests.blackbox.test_revert.TestRevert.test_revert_forget_merges | ||
| 334 | 1913 | breezy.tests.blackbox.test_revert.TestRevert.test_revert_in_checkout | 1976 | breezy.tests.blackbox.test_revert.TestRevert.test_revert_in_checkout |
| 335 | 1914 | breezy.tests.blackbox.test_revert.TestRevert.test_revert_forget_merges | ||
| 336 | 1915 | breezy.tests.blackbox.test_revert.TestRevert.test_revert_newly_added | 1977 | breezy.tests.blackbox.test_revert.TestRevert.test_revert_newly_added |
| 337 | 1916 | breezy.tests.blackbox.test_revert.TestRevert.test_revert_removing_file | 1978 | breezy.tests.blackbox.test_revert.TestRevert.test_revert_removing_file |
| 338 | 1917 | breezy.tests.blackbox.test_revision_history.TestRevisionHistory.test_revision_history | 1979 | breezy.tests.blackbox.test_revision_history.TestRevisionHistory.test_revision_history |
| 339 | @@ -1951,8 +2013,8 @@ | |||
| 340 | 1951 | breezy.tests.blackbox.test_selftest.TestOptions.test_transport_set_to_memory | 2013 | breezy.tests.blackbox.test_selftest.TestOptions.test_transport_set_to_memory |
| 341 | 1952 | breezy.tests.blackbox.test_selftest.TestOptions.test_transport_set_to_sftp | 2014 | breezy.tests.blackbox.test_selftest.TestOptions.test_transport_set_to_sftp |
| 342 | 1953 | breezy.tests.blackbox.test_send.TestSend.test_mailto_child_option | 2015 | breezy.tests.blackbox.test_send.TestSend.test_mailto_child_option |
| 343 | 2016 | breezy.tests.blackbox.test_send.TestSend.test_no_common_ancestor | ||
| 344 | 1954 | breezy.tests.blackbox.test_send.TestSend.test_nonexistant_branch | 2017 | breezy.tests.blackbox.test_send.TestSend.test_nonexistant_branch |
| 345 | 1955 | breezy.tests.blackbox.test_send.TestSend.test_no_common_ancestor | ||
| 346 | 1956 | breezy.tests.blackbox.test_serve.TestBzrServe.test_bzr_serve_dhpss | 2018 | breezy.tests.blackbox.test_serve.TestBzrServe.test_bzr_serve_dhpss |
| 347 | 1957 | breezy.tests.blackbox.test_serve.TestBzrServe.test_bzr_serve_inet_readonly | 2019 | breezy.tests.blackbox.test_serve.TestBzrServe.test_bzr_serve_inet_readonly |
| 348 | 1958 | breezy.tests.blackbox.test_serve.TestBzrServe.test_bzr_serve_inet_readwrite | 2020 | breezy.tests.blackbox.test_serve.TestBzrServe.test_bzr_serve_inet_readwrite |
| 349 | @@ -23942,9 +24004,9 @@ | |||
| 350 | 23942 | breezy.tests.test_repository.TestRepositoryPackCollection.test_all_packs_none | 24004 | breezy.tests.test_repository.TestRepositoryPackCollection.test_all_packs_none |
| 351 | 23943 | breezy.tests.test_repository.TestRepositoryPackCollection.test_all_packs_one | 24005 | breezy.tests.test_repository.TestRepositoryPackCollection.test_all_packs_one |
| 352 | 23944 | breezy.tests.test_repository.TestRepositoryPackCollection.test_all_packs_two | 24006 | breezy.tests.test_repository.TestRepositoryPackCollection.test_all_packs_two |
| 353 | 24007 | breezy.tests.test_repository.TestRepositoryPackCollection.test_autopack_reloads_and_stops | ||
| 354 | 23945 | breezy.tests.test_repository.TestRepositoryPackCollection.test__clear_obsolete_packs | 24008 | breezy.tests.test_repository.TestRepositoryPackCollection.test__clear_obsolete_packs |
| 355 | 23946 | breezy.tests.test_repository.TestRepositoryPackCollection.test__clear_obsolete_packs_preserve | 24009 | breezy.tests.test_repository.TestRepositoryPackCollection.test__clear_obsolete_packs_preserve |
| 356 | 23947 | breezy.tests.test_repository.TestRepositoryPackCollection.test_autopack_reloads_and_stops | ||
| 357 | 23948 | breezy.tests.test_repository.TestRepositoryPackCollection.test_ensure_loaded_unlocked | 24010 | breezy.tests.test_repository.TestRepositoryPackCollection.test_ensure_loaded_unlocked |
| 358 | 23949 | breezy.tests.test_repository.TestRepositoryPackCollection.test_get_pack_by_name | 24011 | breezy.tests.test_repository.TestRepositoryPackCollection.test_get_pack_by_name |
| 359 | 23950 | breezy.tests.test_repository.TestRepositoryPackCollection.test__max_pack_count | 24012 | breezy.tests.test_repository.TestRepositoryPackCollection.test__max_pack_count |
This is all a little messy and we probably need a better scheme for handling tree content, but seems okay for now.