Merge lp:~jelmer/brz/python3-unversion into lp:brz

Proposed by Jelmer Vernooij on 2018-08-14
Status: Merged
Approved by: Jelmer Vernooij on 2018-08-20
Approved revision: 7068
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/python3-unversion
Merge into: lp:brz
Prerequisite: lp:~jelmer/brz/python-bundle
Diff against target: 81 lines (+20/-4)
2 files modified
breezy/bzr/workingtree_4.py (+4/-4)
python3.passing (+16/-0)
To merge this branch: bzr merge lp:~jelmer/brz/python3-unversion
Reviewer Review Type Date Requested Status
Martin Packman 2018-08-14 Approve on 2018-08-20
Review via email: mp+353131@code.launchpad.net

Commit message

Fix some unversion tests on Python 3.

Description of the change

Fix some unversion tests on Python 3.

(another ~17 tests)

To post a comment you must log in.
Martin Packman (gz) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'breezy/bzr/workingtree_4.py'
--- breezy/bzr/workingtree_4.py 2018-08-05 21:31:40 +0000
+++ breezy/bzr/workingtree_4.py 2018-08-14 22:32:34 +0000
@@ -1233,7 +1233,7 @@
1233 # walk the state marking unversioned things as absent.1233 # walk the state marking unversioned things as absent.
1234 # if there are any un-unversioned ids at the end, raise1234 # if there are any un-unversioned ids at the end, raise
1235 for key, details in state._dirblocks[0][1]:1235 for key, details in state._dirblocks[0][1]:
1236 if (details[0][0] not in ('a', 'r') and # absent or relocated1236 if (details[0][0] not in (b'a', b'r') and # absent or relocated
1237 key[2] in ids_to_unversion):1237 key[2] in ids_to_unversion):
1238 # I haven't written the code to unversion / yet - it should be1238 # I haven't written the code to unversion / yet - it should be
1239 # supported.1239 # supported.
@@ -1261,7 +1261,7 @@
1261 entry_index = 01261 entry_index = 0
1262 while entry_index < len(block[1]):1262 while entry_index < len(block[1]):
1263 entry = block[1][entry_index]1263 entry = block[1][entry_index]
1264 if entry[1][0][0] in 'ar':1264 if entry[1][0][0] in (b'a', b'r'):
1265 # don't remove absent or renamed entries1265 # don't remove absent or renamed entries
1266 entry_index += 11266 entry_index += 1
1267 else:1267 else:
@@ -1277,13 +1277,13 @@
1277 entry_index = 01277 entry_index = 0
1278 while entry_index < len(block[1]):1278 while entry_index < len(block[1]):
1279 entry = block[1][entry_index]1279 entry = block[1][entry_index]
1280 if (entry[1][0][0] in ('a', 'r') or # absent, relocated1280 if (entry[1][0][0] in (b'a', b'r') or # absent, relocated
1281 # ^ some parent row.1281 # ^ some parent row.
1282 entry[0][2] not in ids_to_unversion):1282 entry[0][2] not in ids_to_unversion):
1283 # ^ not an id to unversion1283 # ^ not an id to unversion
1284 entry_index += 11284 entry_index += 1
1285 continue1285 continue
1286 if entry[1][0][0] == 'd':1286 if entry[1][0][0] == b'd':
1287 paths_to_unversion.add(pathjoin(entry[0][0], entry[0][1]))1287 paths_to_unversion.add(pathjoin(entry[0][0], entry[0][1]))
1288 if not state._make_absent(entry):1288 if not state._make_absent(entry):
1289 entry_index += 11289 entry_index += 1
12901290
=== modified file 'python3.passing'
--- python3.passing 2018-08-08 02:10:06 +0000
+++ python3.passing 2018-08-14 22:32:34 +0000
@@ -21418,6 +21418,10 @@
21418breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_after_conflicted_merge(GitWorkingTreeFormat)21418breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_after_conflicted_merge(GitWorkingTreeFormat)
21419breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_after_conflicted_merge(WorkingTreeFormat2)21419breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_after_conflicted_merge(WorkingTreeFormat2)
21420breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_after_conflicted_merge(WorkingTreeFormat3)21420breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_after_conflicted_merge(WorkingTreeFormat3)
21421breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_after_conflicted_merge(WorkingTreeFormat4)
21422breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_after_conflicted_merge(WorkingTreeFormat5)
21423breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_after_conflicted_merge(WorkingTreeFormat6)
21424breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_after_conflicted_merge(WorkingTreeFormat6,remote)
21421breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_missing_file(GitWorkingTreeFormat)21425breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_missing_file(GitWorkingTreeFormat)
21422breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_missing_file(WorkingTreeFormat2)21426breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_missing_file(WorkingTreeFormat2)
21423breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_missing_file(WorkingTreeFormat3)21427breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_missing_file(WorkingTreeFormat3)
@@ -21428,6 +21432,10 @@
21428breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_parent_and_child_renamed_bug_187207(GitWorkingTreeFormat)21432breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_parent_and_child_renamed_bug_187207(GitWorkingTreeFormat)
21429breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_parent_and_child_renamed_bug_187207(WorkingTreeFormat2)21433breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_parent_and_child_renamed_bug_187207(WorkingTreeFormat2)
21430breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_parent_and_child_renamed_bug_187207(WorkingTreeFormat3)21434breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_parent_and_child_renamed_bug_187207(WorkingTreeFormat3)
21435breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_parent_and_child_renamed_bug_187207(WorkingTreeFormat4)
21436breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_parent_and_child_renamed_bug_187207(WorkingTreeFormat5)
21437breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_parent_and_child_renamed_bug_187207(WorkingTreeFormat6)
21438breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_parent_and_child_renamed_bug_187207(WorkingTreeFormat6,remote)
21431breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_renamed(GitWorkingTreeFormat)21439breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_renamed(GitWorkingTreeFormat)
21432breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_renamed(WorkingTreeFormat2)21440breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_renamed(WorkingTreeFormat2)
21433breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_renamed(WorkingTreeFormat3)21441breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_renamed(WorkingTreeFormat3)
@@ -21452,9 +21460,17 @@
21452breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_subtree_and_children(GitWorkingTreeFormat)21460breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_subtree_and_children(GitWorkingTreeFormat)
21453breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_subtree_and_children(WorkingTreeFormat2)21461breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_subtree_and_children(WorkingTreeFormat2)
21454breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_subtree_and_children(WorkingTreeFormat3)21462breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_subtree_and_children(WorkingTreeFormat3)
21463breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_subtree_and_children(WorkingTreeFormat4)
21464breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_subtree_and_children(WorkingTreeFormat5)
21465breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_subtree_and_children(WorkingTreeFormat6)
21466breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_subtree_and_children(WorkingTreeFormat6,remote)
21455breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_subtree(GitWorkingTreeFormat)21467breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_subtree(GitWorkingTreeFormat)
21456breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_subtree(WorkingTreeFormat2)21468breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_subtree(WorkingTreeFormat2)
21457breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_subtree(WorkingTreeFormat3)21469breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_subtree(WorkingTreeFormat3)
21470breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_subtree(WorkingTreeFormat4)
21471breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_subtree(WorkingTreeFormat5)
21472breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_subtree(WorkingTreeFormat6)
21473breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_subtree(WorkingTreeFormat6,remote)
21458breezy.tests.per_workingtree.test_views.TestTreeViews.test_check_path_in_view(GitWorkingTreeFormat)21474breezy.tests.per_workingtree.test_views.TestTreeViews.test_check_path_in_view(GitWorkingTreeFormat)
21459breezy.tests.per_workingtree.test_views.TestTreeViews.test_check_path_in_view(WorkingTreeFormat2)21475breezy.tests.per_workingtree.test_views.TestTreeViews.test_check_path_in_view(WorkingTreeFormat2)
21460breezy.tests.per_workingtree.test_views.TestTreeViews.test_check_path_in_view(WorkingTreeFormat3)21476breezy.tests.per_workingtree.test_views.TestTreeViews.test_check_path_in_view(WorkingTreeFormat3)

Subscribers

People subscribed via source and target branches