/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

Start working on 0.2.0.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2007-2008 Canonical Ltd
 
1
# Copyright (C) 2007-2009 Jelmer Vernooij <jelmer@samba.org>
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
import bzrlib
18
 
from bzrlib import urlutils
 
18
from bzrlib import branch, tag, urlutils
19
19
from bzrlib.bzrdir import BzrDir, BzrDirFormat
20
 
from bzrlib.errors import NoSuchFile, NotLocalUrl
 
20
from bzrlib.errors import BzrError, NoSuchFile, NotLocalUrl
21
21
from bzrlib.lockable_files import TransportLock
22
22
from bzrlib.repository import Repository
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
 
30
from bzrlib.plugins.git.errors import NoSuchRef
28
31
from bzrlib.plugins.git.dir import GitDir
29
32
from bzrlib.plugins.git.foreign import ForeignBranch
30
33
from bzrlib.plugins.git.repository import GitFormat, GitRepository
31
34
 
 
35
import os
 
36
import tempfile
32
37
import urllib
33
38
import urlparse
34
39
 
35
 
from dulwich.pack import PackData
 
40
import dulwich as git
 
41
from dulwich.errors import GitProtocolError
 
42
from dulwich.pack import PackData, Pack, PackIndex
 
43
 
 
44
# Don't run any tests on GitSmartTransport as it is not intended to be 
 
45
# a full implementation of Transport
 
46
def get_test_permutations():
 
47
    return []
36
48
 
37
49
 
38
50
class GitSmartTransport(Transport):
43
55
        assert scheme == "git"
44
56
        hostport, self._path = urllib.splithost(loc)
45
57
        (self._host, self._port) = urllib.splitnport(hostport, git.protocol.TCP_GIT_PORT)
46
 
        if _client is not None:
47
 
            self._client = _client
48
 
        else:
49
 
            self._client = git.client.TCPGitClient(self._host, self._port)
 
58
        self._client = _client
 
59
 
 
60
    def has(self, relpath):
 
61
        return False
 
62
 
 
63
    def _get_client(self):
 
64
        if self._client is not None:
 
65
            ret = self._client
 
66
            self._client = None
 
67
            return ret
 
68
        return git.client.TCPGitClient(self._host, self._port, thin_packs=False)
50
69
 
51
70
    def fetch_pack(self, determine_wants, graph_walker, pack_data, progress=None):
52
71
        if progress is None:
53
72
            def progress(text):
54
73
                info("git: %s" % text)
55
 
        self._client.fetch_pack(self._path, determine_wants, graph_walker, 
56
 
                pack_data, progress)
57
 
 
58
 
    def fetch_objects(self, determine_wants, graph_walker, progress=None):
59
 
        fd, path = tempfile.mkstemp(dir=self.pack_dir(), suffix=".pack")
60
 
        self.fetch_pack(determine_wants, graph_walker, lambda x: os.write(fd, x), progress)
61
 
        os.close(fd)
 
74
        client = self._get_client()
62
75
        try:
63
 
            p = PackData(path)
64
 
            for o in p.iterobjects():
65
 
                yield o
66
 
        finally:
67
 
            os.remove(path)
 
76
            client.fetch_pack(self._path, determine_wants, 
 
77
                graph_walker, pack_data, progress)
 
78
        except GitProtocolError, e:
 
79
            raise BzrError(e)
68
80
 
69
81
    def get(self, path):
70
82
        raise NoSuchFile(path)
71
83
 
 
84
    def abspath(self, relpath):
 
85
        return urlutils.join(self.base, relpath)
 
86
 
72
87
    def clone(self, offset=None):
73
88
        """See Transport.clone()."""
74
89
        if offset is None:
90
105
    def open_repository(self):
91
106
        return RemoteGitRepository(self, self._lockfiles)
92
107
 
93
 
    def open_branch(self):
 
108
    def open_branch(self, _unsupported=False):
94
109
        repo = self.open_repository()
95
110
        # TODO: Support for multiple branches in one bzrdir in bzrlib!
96
111
        return RemoteGitBranch(self, repo, "HEAD", self._lockfiles)
99
114
        raise NotLocalUrl(self.transport.base)
100
115
 
101
116
 
 
117
class EmptyObjectStoreIterator(dict):
 
118
 
 
119
    def iterobjects(self):
 
120
        return []
 
121
 
 
122
 
 
123
class TemporaryPackIterator(Pack):
 
124
 
 
125
    def __init__(self, path, resolve_ext_ref):
 
126
        self.resolve_ext_ref = resolve_ext_ref
 
127
        super(TemporaryPackIterator, self).__init__(path)
 
128
 
 
129
    @property
 
130
    def idx(self):
 
131
        if self._idx is None:
 
132
            self._data.create_index_v2(self._idx_path, self.resolve_ext_ref)
 
133
            self._idx = PackIndex(self._idx_path)
 
134
        return self._idx
 
135
 
 
136
    def __del__(self):
 
137
        os.remove(self._data_path)
 
138
        os.remove(self._idx_path)
 
139
 
 
140
 
102
141
class RemoteGitRepository(GitRepository):
103
142
 
104
143
    def __init__(self, gitdir, lockfiles):
105
144
        GitRepository.__init__(self, gitdir, lockfiles)
 
145
        self._refs = None
 
146
 
 
147
    def get_refs(self):
 
148
        if self._refs is not None:
 
149
            return self._refs
 
150
        def determine_wants(heads):
 
151
            self._refs = heads
 
152
            return []
 
153
        self.bzrdir.root_transport.fetch_pack(determine_wants, None, 
 
154
            lambda x: None, lambda x: mutter("git: %s" % x))
 
155
        return self._refs
106
156
 
107
157
    def fetch_pack(self, determine_wants, graph_walker, pack_data, 
108
158
                   progress=None):
109
159
        self._transport.fetch_pack(determine_wants, graph_walker, pack_data, 
110
160
            progress)
111
161
 
 
162
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref, progress=None):
 
163
        fd, path = tempfile.mkstemp(suffix=".pack")
 
164
        self.fetch_pack(determine_wants, graph_walker, lambda x: os.write(fd, x), progress)
 
165
        os.close(fd)
 
166
        if os.path.getsize(path) == 0:
 
167
            return EmptyObjectStoreIterator()
 
168
        return TemporaryPackIterator(path[:-len(".pack")], resolve_ext_ref)
 
169
 
 
170
 
 
171
class RemoteGitTagDict(tag.BasicTags):
 
172
 
 
173
    def __init__(self, branch):
 
174
        self.branch = branch
 
175
        self.repository = branch.repository
 
176
 
 
177
    def get_tag_dict(self):
 
178
        ret = {}
 
179
        refs = self.repository.get_refs()
 
180
        for k,v in refs.iteritems():
 
181
            if k.startswith("refs/tags/") and not k.endswith("^{}"):
 
182
                v = refs.get(k+"^{}", v)
 
183
                ret[k[len("refs/tags/"):]] = self.branch.mapping.revision_id_foreign_to_bzr(v)
 
184
        return ret
 
185
 
 
186
    def set_tag(self, name, revid):
 
187
        # FIXME: Not supported yet, should do a push of a new ref
 
188
        raise NotImplementedError(self.set_tag)
 
189
 
112
190
 
113
191
class RemoteGitBranch(GitBranch):
114
192
 
115
193
    def __init__(self, bzrdir, repository, name, lockfiles):
116
 
        def determine_wants(heads):
117
 
            self._ref = heads[name]
118
 
        bzrdir.root_transport.fetch_pack(determine_wants, None, lambda x: None, 
119
 
                             lambda x: mutter("git: %s" % x))
 
194
        heads = repository.get_refs()
 
195
        if not name in heads:
 
196
            raise NoSuchRef(name)
 
197
        self._ref = heads[name]
120
198
        super(RemoteGitBranch, self).__init__(bzrdir, repository, name, self._ref, lockfiles)
121
199
 
122
200
    def last_revision(self):
123
201
        return self.mapping.revision_id_foreign_to_bzr(self._ref)
124
202
 
 
203
    def _synchronize_history(self, destination, revision_id):
 
204
        """See Branch._synchronize_history()."""
 
205
        destination.generate_revision_history(self.last_revision())
 
206