/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to tests/test_push.py

Merge changes to avoid inventories.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_push.py
17
17
 
18
18
"""Tests for pushing revisions from Bazaar into Git."""
19
19
 
20
 
from bzrlib import (
21
 
    errors,
22
 
    )
23
20
from bzrlib.bzrdir import (
24
21
    format_registry,
25
22
    )
30
27
    TestCaseWithTransport,
31
28
    )
32
29
 
 
30
from bzrlib.plugins.git.mapping import (
 
31
    BzrGitMappingExperimental,
 
32
    BzrGitMappingv1,
 
33
    )
 
34
from bzrlib.plugins.git.errors import NoPushSupport
33
35
from bzrlib.plugins.git.push import (
34
36
    InterToGitRepository,
35
37
    )
41
43
        super(InterToGitRepositoryTests, self).setUp()
42
44
        self.git_repo = self.make_repository("git",
43
45
                format=format_registry.make_bzrdir("git"))
44
 
        self.bzr_repo = self.make_repository("bzr")
 
46
        self.bzr_repo = self.make_repository("bzr", shared=True)
 
47
 
 
48
    def _get_interrepo(self, mapping=None):
45
49
        self.bzr_repo.lock_read()
46
50
        self.addCleanup(self.bzr_repo.unlock)
47
 
        self.interrepo = InterRepository.get(self.bzr_repo, self.git_repo)
 
51
        interrepo = InterRepository.get(self.bzr_repo, self.git_repo)
 
52
        if mapping is not None:
 
53
            interrepo.mapping = mapping
 
54
        return interrepo
48
55
 
49
56
    def test_instance(self):
50
 
        self.assertIsInstance(self.interrepo, InterToGitRepository)
 
57
        self.assertIsInstance(self._get_interrepo(), InterToGitRepository)
 
58
 
 
59
    def test_pointless_fetch_refs_old_mapping(self):
 
60
        interrepo = self._get_interrepo(mapping=BzrGitMappingv1())
 
61
        self.assertRaises(NoPushSupport, interrepo.fetch_refs, lambda x: {}, lossy=False)
51
62
 
52
63
    def test_pointless_fetch_refs(self):
53
 
        old_refs, new_refs = self.interrepo.fetch_refs(lambda x: x)
54
 
        self.assertEquals(old_refs, new_refs)
 
64
        interrepo = self._get_interrepo(mapping=BzrGitMappingExperimental())
 
65
        revidmap, old_refs, new_refs = interrepo.fetch_refs(lambda x: {}, lossy=False)
 
66
        self.assertEquals(old_refs, {})
 
67
        self.assertEquals(new_refs, {})
55
68
 
56
 
    def test_pointless_dfetch_refs(self):
57
 
        revidmap, old_refs, new_refs = self.interrepo.dfetch_refs(lambda x: x)
58
 
        self.assertEquals(old_refs, new_refs)
 
69
    def test_pointless_lossy_fetch_refs(self):
 
70
        revidmap, old_refs, new_refs = self._get_interrepo().fetch_refs(lambda x: {}, lossy=True)
 
71
        self.assertEquals(old_refs, {})
 
72
        self.assertEquals(new_refs, {})
59
73
        self.assertEquals(revidmap, {})
60
74
 
61
75
    def test_pointless_missing_revisions(self):
62
 
        self.assertEquals([], list(self.interrepo.missing_revisions([])))
 
76
        interrepo = self._get_interrepo()
 
77
        interrepo.source_store.lock_read()
 
78
        self.addCleanup(interrepo.source_store.unlock)
 
79
        self.assertEquals([], list(interrepo.missing_revisions([])))
63
80
 
64
81
    def test_missing_revisions_unknown_stop_rev(self):
 
82
        interrepo = self._get_interrepo()
 
83
        interrepo.source_store.lock_read()
 
84
        self.addCleanup(interrepo.source_store.unlock)
65
85
        self.assertEquals([],
66
 
                list(self.interrepo.missing_revisions([(None, "unknown")])))
 
86
                list(interrepo.missing_revisions([(None, "unknown")])))
 
87
 
 
88
    def test_odd_rename(self):
 
89
        # Add initial revision to bzr branch.
 
90
        branch = self.bzr_repo.bzrdir.create_branch()
 
91
        tree = branch.bzrdir.create_workingtree()
 
92
        self.build_tree(["bzr/bar/", "bzr/bar/foobar"])
 
93
        tree.add(["bar", "bar/foobar"])
 
94
        tree.commit("initial")
 
95
 
 
96
        # Add new directory and perform move in bzr branch.
 
97
        self.build_tree(["bzr/baz/"])
 
98
        tree.add(["baz"])
 
99
        tree.rename_one("bar", "baz/IrcDotNet")
 
100
        last_revid = tree.commit("rename")
 
101
 
 
102
        # Push bzr branch to git branch.
 
103
        def decide(x):
 
104
            return { "refs/heads/master": (None, last_revid) }
 
105
        interrepo = self._get_interrepo()
 
106
        revidmap, old_refs, new_refs = interrepo.fetch_refs(decide, lossy=True)
 
107
        gitid = revidmap[last_revid][0]
 
108
        store = self.git_repo._git.object_store
 
109
        commit = store[gitid]
 
110
        tree = store[commit.tree]
 
111
        tree.check()
 
112
        self.expectFailure("fails with KeyError (bug 818318)",
 
113
            self.assertTrue, tree["baz"][1] in store)
 
114
        baz = store[tree["baz"][1]]
 
115
        baz.check()
 
116
        ircdotnet = store[baz["IrcDotNet"][1]]
 
117
        ircdotnet.check()
 
118
        foobar = store[ircdotnet["foobar"][1]]
 
119
        foobar.check()