/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

Cope with newer *system* dulwich

Show diffs side-by-side

added added

removed removed

Lines of Context:
remote.py
23
23
from bzrlib.trace import info
24
24
from bzrlib.transport import Transport
25
25
 
26
 
from bzrlib.plugins.git import lazy_check_versions
27
 
lazy_check_versions()
28
 
 
29
26
from bzrlib.plugins.git.branch import GitBranch
30
27
from bzrlib.plugins.git.errors import NoSuchRef
31
28
from bzrlib.plugins.git.dir import GitDir
38
35
import urlparse
39
36
 
40
37
import dulwich as git
41
 
from dulwich.pack import PackData, Pack, PackIndex
 
38
from dulwich.pack import PackData, Pack
42
39
 
43
40
# Don't run any tests on GitSmartTransport as it is not intended to be 
44
41
# a full implementation of Transport
61
58
            ret = self._client
62
59
            self._client = None
63
60
            return ret
64
 
        return git.client.TCPGitClient(self._host, self._port, 
65
 
            capabilities=["multi_ack", "side-band-64k", "ofs-delta", "side-band"])
 
61
        return git.client.TCPGitClient(self._host, self._port)
66
62
 
67
63
    def fetch_pack(self, determine_wants, graph_walker, pack_data, progress=None):
68
64
        if progress is None:
107
103
        raise NotLocalUrl(self.transport.base)
108
104
 
109
105
 
110
 
class EmptyObjectStoreIterator(dict):
111
 
 
112
 
    def iterobjects(self):
113
 
        return []
114
 
 
115
 
 
116
 
class TemporaryPackIterator(Pack):
117
 
 
118
 
    def __init__(self, path, resolve_ext_ref):
119
 
        self.resolve_ext_ref = resolve_ext_ref
120
 
        super(TemporaryPackIterator, self).__init__(path)
121
 
 
122
 
    @property
123
 
    def idx(self):
124
 
        if self._idx is None:
125
 
            self._data.create_index_v2(self._idx_path, self.resolve_ext_ref)
126
 
            self._idx = PackIndex(self._idx_path)
127
 
        return self._idx
128
 
 
129
 
    def __del__(self):
130
 
        os.remove(self._data_path)
131
 
        os.remove(self._idx_path)
132
 
 
133
 
 
134
106
class RemoteGitRepository(GitRepository):
135
107
 
136
108
    def __init__(self, gitdir, lockfiles):
141
113
        self._transport.fetch_pack(determine_wants, graph_walker, pack_data, 
142
114
            progress)
143
115
 
144
 
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref, progress=None):
 
116
    def fetch_objects(self, determine_wants, graph_walker, progress=None):
145
117
        fd, path = tempfile.mkstemp(suffix=".pack")
146
118
        self.fetch_pack(determine_wants, graph_walker, lambda x: os.write(fd, x), progress)
147
119
        os.close(fd)
148
 
        if os.path.getsize(path) == 0:
149
 
            return EmptyObjectStoreIterator()
150
 
        return TemporaryPackIterator(path[:-len(".pack")], resolve_ext_ref)
 
120
        basename = path[:-len(".pack")]
 
121
        p = PackData(path)
 
122
        p.create_index_v2(basename+".idx")
 
123
        pack = Pack(basename)
 
124
        os.remove(path)
 
125
        return (len(p), pack.iterobjects())
151
126
 
152
127
 
153
128
class RemoteGitBranch(GitBranch):