/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):
56
48
        (self._host, self._port) = urllib.splitnport(hostport, git.protocol.TCP_GIT_PORT)
57
49
        self._client = _client
58
50
 
59
 
    def has(self, relpath):
60
 
        return False
61
 
 
62
51
    def _get_client(self):
63
52
        if self._client is not None:
64
53
            ret = self._client
65
54
            self._client = None
66
55
            return ret
67
 
        return git.client.TCPGitClient(self._host, self._port, 
68
 
            capabilities=["multi_ack", "side-band-64k", "ofs-delta", "side-band"])
 
56
        return git.client.TCPGitClient(self._host, self._port)
69
57
 
70
58
    def fetch_pack(self, determine_wants, graph_walker, pack_data, progress=None):
71
59
        if progress is None:
101
89
    def open_repository(self):
102
90
        return RemoteGitRepository(self, self._lockfiles)
103
91
 
104
 
    def open_branch(self, _unsupported=False):
 
92
    def open_branch(self):
105
93
        repo = self.open_repository()
106
94
        # TODO: Support for multiple branches in one bzrdir in bzrlib!
107
95
        return RemoteGitBranch(self, repo, "HEAD", self._lockfiles)
110
98
        raise NotLocalUrl(self.transport.base)
111
99
 
112
100
 
113
 
class EmptyObjectStoreIterator(dict):
114
 
 
115
 
    def iterobjects(self):
116
 
        return []
117
 
 
118
 
 
119
 
class TemporaryPackIterator(Pack):
120
 
 
121
 
    def __init__(self, path, resolve_ext_ref):
122
 
        self.resolve_ext_ref = resolve_ext_ref
123
 
        super(TemporaryPackIterator, self).__init__(path)
124
 
 
125
 
    @property
126
 
    def idx(self):
127
 
        if self._idx is None:
128
 
            self._data.create_index_v2(self._idx_path, self.resolve_ext_ref)
129
 
            self._idx = PackIndex(self._idx_path)
130
 
        return self._idx
131
 
 
132
 
    def __del__(self):
133
 
        os.remove(self._data_path)
134
 
        os.remove(self._idx_path)
135
 
 
136
 
 
137
101
class RemoteGitRepository(GitRepository):
138
102
 
139
103
    def __init__(self, gitdir, lockfiles):
144
108
        self._transport.fetch_pack(determine_wants, graph_walker, pack_data, 
145
109
            progress)
146
110
 
147
 
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref, progress=None):
 
111
    def fetch_objects(self, determine_wants, graph_walker, progress=None):
148
112
        fd, path = tempfile.mkstemp(suffix=".pack")
149
113
        self.fetch_pack(determine_wants, graph_walker, lambda x: os.write(fd, x), progress)
150
114
        os.close(fd)
151
 
        if os.path.getsize(path) == 0:
152
 
            return EmptyObjectStoreIterator()
153
 
        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)
154
123
 
155
124
 
156
125
class RemoteGitBranch(GitBranch):