/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

Fix branch cloning.

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
from bzrlib.plugins.git import git
29
27
from bzrlib.plugins.git.branch import GitBranch
30
28
from bzrlib.plugins.git.errors import NoSuchRef
31
29
from bzrlib.plugins.git.dir import GitDir
37
35
import urllib
38
36
import urlparse
39
37
 
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 []
 
38
from dulwich.pack import PackData, Pack
47
39
 
48
40
 
49
41
class GitSmartTransport(Transport):
61
53
            ret = self._client
62
54
            self._client = None
63
55
            return ret
64
 
        return git.client.TCPGitClient(self._host, self._port, 
65
 
            capabilities=["multi_ack", "side-band-64k", "ofs-delta", "side-band"])
 
56
        return git.client.TCPGitClient(self._host, self._port)
66
57
 
67
58
    def fetch_pack(self, determine_wants, graph_walker, pack_data, progress=None):
68
59
        if progress is None:
98
89
    def open_repository(self):
99
90
        return RemoteGitRepository(self, self._lockfiles)
100
91
 
101
 
    def open_branch(self, _unsupported=False):
 
92
    def open_branch(self):
102
93
        repo = self.open_repository()
103
94
        # TODO: Support for multiple branches in one bzrdir in bzrlib!
104
95
        return RemoteGitBranch(self, repo, "HEAD", self._lockfiles)
107
98
        raise NotLocalUrl(self.transport.base)
108
99
 
109
100
 
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
101
class RemoteGitRepository(GitRepository):
135
102
 
136
103
    def __init__(self, gitdir, lockfiles):
141
108
        self._transport.fetch_pack(determine_wants, graph_walker, pack_data, 
142
109
            progress)
143
110
 
144
 
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref, progress=None):
 
111
    def fetch_objects(self, determine_wants, graph_walker, progress=None):
145
112
        fd, path = tempfile.mkstemp(suffix=".pack")
146
113
        self.fetch_pack(determine_wants, graph_walker, lambda x: os.write(fd, x), progress)
147
114
        os.close(fd)
148
 
        if os.path.getsize(path) == 0:
149
 
            return EmptyObjectStoreIterator()
150
 
        return TemporaryPackIterator(path[:-len(".pack")], resolve_ext_ref)
 
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)
151
123
 
152
124
 
153
125
class RemoteGitBranch(GitBranch):