/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 remote.py

Merge new dulwich; fetching objects from local repository works now; they aren't converted yet though.

Show diffs side-by-side

added added

removed removed

Lines of Context:
remote.py
25
25
 
26
26
from bzrlib.plugins.git import git
27
27
from bzrlib.plugins.git.branch import GitBranch
28
 
from bzrlib.plugins.git.dir import GitDir
29
28
from bzrlib.plugins.git.foreign import ForeignBranch
30
29
from bzrlib.plugins.git.repository import GitFormat, GitRepository
31
30
 
79
78
        return GitSmartTransport(newurl, self._client)
80
79
 
81
80
 
82
 
class RemoteGitDir(GitDir):
 
81
class RemoteGitDir(BzrDir):
83
82
 
84
83
    def __init__(self, transport, lockfiles, format):
85
84
        self._format = format
87
86
        self.transport = transport
88
87
        self._lockfiles = lockfiles
89
88
 
 
89
    def is_supported(self):
 
90
        return True
 
91
 
90
92
    def open_repository(self):
91
93
        return RemoteGitRepository(self, self._lockfiles)
92
94
 
98
100
    def open_workingtree(self):
99
101
        raise NotLocalUrl(self.transport.base)
100
102
 
 
103
    def cloning_metadir(self, stacked=False):
 
104
        """Produce a metadir suitable for cloning with."""
 
105
        if stacked:
 
106
            return bzrlib.bzrdir.format_registry.make_bzrdir("1.6.1-rich-root")
 
107
        else:
 
108
            return bzrlib.bzrdir.format_registry.make_bzrdir("rich-root-pack")
 
109
 
101
110
 
102
111
class RemoteGitRepository(GitRepository):
103
112
 
104
113
    def __init__(self, gitdir, lockfiles):
105
114
        GitRepository.__init__(self, gitdir, lockfiles)
106
115
 
107
 
    def fetch_pack(self, determine_wants, graph_walker, pack_data, 
108
 
                   progress=None):
109
 
        self._transport.fetch_pack(determine_wants, graph_walker, pack_data, 
110
 
            progress)
 
116
    def fetch_pack(self, determine_wants, graph_walker, pack_data, progress=None):
 
117
        self._transport.fetch_pack(determine_wants, graph_walker, pack_data, progress)
111
118
 
112
119
 
113
120
class RemoteGitBranch(GitBranch):
122
129
    def last_revision(self):
123
130
        return self.mapping.revision_id_foreign_to_bzr(self._ref)
124
131
 
 
132
 
 
133