At file:///data/jelmer/bzr-svn/trunk/
------------------------------------------------------------
revno: 1972
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: trunk
timestamp: Mon 2008-11-10 05:49:30 +0100
message:
Fix another convert test.
modified:
convert.py svn2bzr.py-20051018015439-cb4563bff29e632d
tests/test_convert.py
test_convert.py-20060705203611-b1l0bapeku6foco0-1
=== modified file 'convert.py'
--- a/convert.py 2008-10-10 13:34:02 +0000
+++ b/convert.py 2008-11-10 04:49:30 +0000
@@ -185,7 +185,6 @@
revmetas = []
existing_branches = {}
pb = ui.ui_factory.nested_progress_bar()
- # FIXME: Use filter_branch
try:
for revmeta in
source_repos._revmeta_provider.iter_all_changes(layout, mapping,
to_revnum,
from_revnum,
@@ -204,6 +203,8 @@
finally:
pb.finished()
existing_branches = existing_branches.values()
+ if filter_branch is not None:
+ existing_branches = filter(filter_branch, existing_branches)
if create_shared_repo:
inter = InterRepository.get(source_repos, target_repos)
=== modified file 'tests/test_convert.py'
--- a/tests/test_convert.py 2008-10-02 21:18:28 +0000
+++ b/tests/test_convert.py 2008-11-10 04:49:30 +0000
@@ -158,7 +158,6 @@
convert_repository(oldrepos, "e", TrunkLayout(0),
create_shared_repo=True,
filter_branch=lambda branch:
branch.get_branch_path().endswith("somebranch"))
- newrepos = Repository.open("e")
self.assertTrue(os.path.exists("e/branches/somebranch"))
self.assertFalse(os.path.exists("e/branches/anotherbranch"))
--
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
