/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 thin-pack work.

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
103
106
        raise NotLocalUrl(self.transport.base)
104
107
 
105
108
 
 
109
class TemporaryPackIterator(Pack):
 
110
 
 
111
    def __init__(self, path, resolve_ext_ref):
 
112
        self.resolve_ext_ref = resolve_ext_ref
 
113
        super(TemporaryPackIterator, self).__init__(path)
 
114
 
 
115
    @property
 
116
    def idx(self):
 
117
        if self._idx is None:
 
118
            self._data.create_index_v2(self._idx_path, self.resolve_ext_ref)
 
119
            self._idx = PackIndex(self._idx_path)
 
120
        return self._idx
 
121
 
 
122
    def __del__(self):
 
123
        os.remove(self._data_path)
 
124
        os.remove(self._idx_path)
 
125
 
 
126
 
106
127
class RemoteGitRepository(GitRepository):
107
128
 
108
129
    def __init__(self, gitdir, lockfiles):
113
134
        self._transport.fetch_pack(determine_wants, graph_walker, pack_data, 
114
135
            progress)
115
136
 
116
 
    def fetch_objects(self, determine_wants, graph_walker, progress=None):
 
137
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref, progress=None):
117
138
        fd, path = tempfile.mkstemp(suffix=".pack")
118
139
        self.fetch_pack(determine_wants, graph_walker, lambda x: os.write(fd, x), progress)
119
140
        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())
 
141
        if os.path.getsize(path) == 0:
 
142
            return {}
 
143
        return TemporaryPackIterator(path[:-len(".pack")], resolve_ext_ref)
126
144
 
127
145
 
128
146
class RemoteGitBranch(GitBranch):