/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

Partially fix pull.

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
 
26
29
from bzrlib.plugins.git.branch import GitBranch
27
30
from bzrlib.plugins.git.errors import NoSuchRef
28
31
from bzrlib.plugins.git.dir import GitDir
35
38
import urlparse
36
39
 
37
40
import dulwich as git
38
 
from dulwich.pack import PackData, Pack
 
41
from dulwich.pack import PackData, Pack, PackIndex
39
42
 
40
43
# Don't run any tests on GitSmartTransport as it is not intended to be 
41
44
# a full implementation of Transport
58
61
            ret = self._client
59
62
            self._client = None
60
63
            return ret
61
 
        return git.client.TCPGitClient(self._host, self._port)
 
64
        return git.client.TCPGitClient(self._host, self._port, 
 
65
            capabilities=["multi_ack", "side-band-64k", "ofs-delta", "side-band"])
62
66
 
63
67
    def fetch_pack(self, determine_wants, graph_walker, pack_data, progress=None):
64
68
        if progress is None:
103
107
        raise NotLocalUrl(self.transport.base)
104
108
 
105
109
 
 
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
 
106
134
class RemoteGitRepository(GitRepository):
107
135
 
108
136
    def __init__(self, gitdir, lockfiles):
113
141
        self._transport.fetch_pack(determine_wants, graph_walker, pack_data, 
114
142
            progress)
115
143
 
116
 
    def fetch_objects(self, determine_wants, graph_walker, progress=None):
 
144
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref, progress=None):
117
145
        fd, path = tempfile.mkstemp(suffix=".pack")
118
146
        self.fetch_pack(determine_wants, graph_walker, lambda x: os.write(fd, x), progress)
119
147
        os.close(fd)
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())
 
148
        if os.path.getsize(path) == 0:
 
149
            return EmptyObjectStoreIterator()
 
150
        return TemporaryPackIterator(path[:-len(".pack")], resolve_ext_ref)
126
151
 
127
152
 
128
153
class RemoteGitBranch(GitBranch):