/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 git
 
26
from bzrlib.plugins.git import lazy_check_versions
 
27
lazy_check_versions()
 
28
 
27
29
from bzrlib.plugins.git.branch import GitBranch
28
30
from bzrlib.plugins.git.errors import NoSuchRef
29
31
from bzrlib.plugins.git.dir import GitDir
35
37
import urllib
36
38
import urlparse
37
39
 
38
 
from dulwich.pack import PackData, Pack
 
40
import dulwich as git
 
41
from dulwich.pack import PackData, Pack, PackIndex
 
42
 
 
43
# Don't run any tests on GitSmartTransport as it is not intended to be 
 
44
# a full implementation of Transport
 
45
def get_test_permutations():
 
46
    return []
39
47
 
40
48
 
41
49
class GitSmartTransport(Transport):
89
97
    def open_repository(self):
90
98
        return RemoteGitRepository(self, self._lockfiles)
91
99
 
92
 
    def open_branch(self):
 
100
    def open_branch(self, _unsupported=False):
93
101
        repo = self.open_repository()
94
102
        # TODO: Support for multiple branches in one bzrdir in bzrlib!
95
103
        return RemoteGitBranch(self, repo, "HEAD", self._lockfiles)
98
106
        raise NotLocalUrl(self.transport.base)
99
107
 
100
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
 
101
127
class RemoteGitRepository(GitRepository):
102
128
 
103
129
    def __init__(self, gitdir, lockfiles):
108
134
        self._transport.fetch_pack(determine_wants, graph_walker, pack_data, 
109
135
            progress)
110
136
 
111
 
    def fetch_objects(self, determine_wants, graph_walker, progress=None):
 
137
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref, progress=None):
112
138
        fd, path = tempfile.mkstemp(suffix=".pack")
113
139
        self.fetch_pack(determine_wants, graph_walker, lambda x: os.write(fd, x), progress)
114
140
        os.close(fd)
115
 
        try:
116
 
            basename = path[:-len(".pack")]
117
 
            p = PackData(path)
118
 
            p.create_index_v2(basename+".idx")
119
 
            for o in Pack(basename).iterobjects():
120
 
                yield o
121
 
        finally:
122
 
            os.remove(path)
 
141
        if os.path.getsize(path) == 0:
 
142
            return {}
 
143
        return TemporaryPackIterator(path[:-len(".pack")], resolve_ext_ref)
123
144
 
124
145
 
125
146
class RemoteGitBranch(GitBranch):