/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 breezy/git/tests/test_push.py

  • Committer: Jelmer Vernooij
  • Date: 2019-03-04 00:16:27 UTC
  • mfrom: (7293 work)
  • mto: This revision was merged to the branch mainline in revision 7318.
  • Revision ID: jelmer@jelmer.uk-20190304001627-v6u7o6pf97tukhek
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
33
33
    BzrGitMappingExperimental,
34
34
    BzrGitMappingv1,
35
35
    )
36
 
from ..errors import NoPushSupport
37
36
from ..interrepo import (
38
37
    InterToGitRepository,
39
38
    )
44
43
    def setUp(self):
45
44
        super(InterToGitRepositoryTests, self).setUp()
46
45
        self.git_repo = self.make_repository("git",
47
 
                format=format_registry.make_controldir("git"))
 
46
                                             format=format_registry.make_controldir("git"))
48
47
        self.bzr_repo = self.make_repository("bzr", shared=True)
49
48
 
50
49
    def _get_interrepo(self, mapping=None):
64
63
 
65
64
    def test_pointless_fetch_refs(self):
66
65
        interrepo = self._get_interrepo(mapping=BzrGitMappingExperimental())
67
 
        revidmap, old_refs, new_refs = interrepo.fetch_refs(lambda x: {}, lossy=False)
68
 
        self.assertEqual(old_refs, {b'HEAD': (b'ref: refs/heads/master', None)})
 
66
        revidmap, old_refs, new_refs = interrepo.fetch_refs(
 
67
            lambda x: {}, lossy=False)
 
68
        self.assertEqual(old_refs, {b'HEAD': (
 
69
            b'ref: refs/heads/master', None)})
69
70
        self.assertEqual(new_refs, {})
70
71
 
71
72
    def test_pointless_lossy_fetch_refs(self):
72
 
        revidmap, old_refs, new_refs = self._get_interrepo().fetch_refs(lambda x: {}, lossy=True)
73
 
        self.assertEqual(old_refs, {b'HEAD': (b'ref: refs/heads/master', None)})
 
73
        revidmap, old_refs, new_refs = self._get_interrepo(
 
74
        ).fetch_refs(lambda x: {}, lossy=True)
 
75
        self.assertEqual(old_refs, {b'HEAD': (
 
76
            b'ref: refs/heads/master', None)})
74
77
        self.assertEqual(new_refs, {})
75
78
        self.assertEqual(revidmap, {})
76
79
 
85
88
        interrepo.source_store.lock_read()
86
89
        self.addCleanup(interrepo.source_store.unlock)
87
90
        self.assertEqual([],
88
 
                list(interrepo.missing_revisions([(None, b"unknown")])))
 
91
                         list(interrepo.missing_revisions([(None, b"unknown")])))
89
92
 
90
93
    def test_odd_rename(self):
91
94
        # Add initial revision to bzr branch.
103
106
 
104
107
        # Push bzr branch to git branch.
105
108
        def decide(x):
106
 
            return { b"refs/heads/master": (None, last_revid) }
 
109
            return {b"refs/heads/master": (None, last_revid)}
107
110
        interrepo = self._get_interrepo()
108
111
        revidmap, old_refs, new_refs = interrepo.fetch_refs(decide, lossy=True)
109
112
        gitid = revidmap[last_revid][0]