/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

  • Committer: Jelmer Vernooij
  • Date: 2009-03-08 16:32:01 UTC
  • mto: (0.200.245 trunk)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@samba.org-20090308163201-46z7fm019kn430zn
Cope with new fetch_spec argument.

Show diffs side-by-side

added added

removed removed

Lines of Context:
remote.py
17
17
import bzrlib
18
18
from bzrlib import 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, 
 
69
            capabilities=["multi_ack", "side-band-64k", "ofs-delta", "side-band"])
50
70
 
51
71
    def fetch_pack(self, determine_wants, graph_walker, pack_data, progress=None):
52
72
        if progress is None:
53
73
            def progress(text):
54
74
                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)
 
75
        client = self._get_client()
62
76
        try:
63
 
            p = PackData(path)
64
 
            for o in p.iterobjects():
65
 
                yield o
66
 
        finally:
67
 
            os.remove(path)
 
77
            client.fetch_pack(self._path, determine_wants, 
 
78
                graph_walker, pack_data, progress)
 
79
        except GitProtocolError, e:
 
80
            raise BzrError(e)
68
81
 
69
82
    def get(self, path):
70
83
        raise NoSuchFile(path)
71
84
 
 
85
    def abspath(self, relpath):
 
86
        return urlutils.join(self.base, relpath)
 
87
 
72
88
    def clone(self, offset=None):
73
89
        """See Transport.clone()."""
74
90
        if offset is None:
90
106
    def open_repository(self):
91
107
        return RemoteGitRepository(self, self._lockfiles)
92
108
 
93
 
    def open_branch(self):
 
109
    def open_branch(self, _unsupported=False):
94
110
        repo = self.open_repository()
95
111
        # TODO: Support for multiple branches in one bzrdir in bzrlib!
96
112
        return RemoteGitBranch(self, repo, "HEAD", self._lockfiles)
99
115
        raise NotLocalUrl(self.transport.base)
100
116
 
101
117
 
 
118
class EmptyObjectStoreIterator(dict):
 
119
 
 
120
    def iterobjects(self):
 
121
        return []
 
122
 
 
123
 
 
124
class TemporaryPackIterator(Pack):
 
125
 
 
126
    def __init__(self, path, resolve_ext_ref):
 
127
        self.resolve_ext_ref = resolve_ext_ref
 
128
        super(TemporaryPackIterator, self).__init__(path)
 
129
 
 
130
    @property
 
131
    def idx(self):
 
132
        if self._idx is None:
 
133
            self._data.create_index_v2(self._idx_path, self.resolve_ext_ref)
 
134
            self._idx = PackIndex(self._idx_path)
 
135
        return self._idx
 
136
 
 
137
    def __del__(self):
 
138
        os.remove(self._data_path)
 
139
        os.remove(self._idx_path)
 
140
 
 
141
 
102
142
class RemoteGitRepository(GitRepository):
103
143
 
104
144
    def __init__(self, gitdir, lockfiles):
109
149
        self._transport.fetch_pack(determine_wants, graph_walker, pack_data, 
110
150
            progress)
111
151
 
 
152
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref, progress=None):
 
153
        fd, path = tempfile.mkstemp(suffix=".pack")
 
154
        self.fetch_pack(determine_wants, graph_walker, lambda x: os.write(fd, x), progress)
 
155
        os.close(fd)
 
156
        if os.path.getsize(path) == 0:
 
157
            return EmptyObjectStoreIterator()
 
158
        return TemporaryPackIterator(path[:-len(".pack")], resolve_ext_ref)
 
159
 
112
160
 
113
161
class RemoteGitBranch(GitBranch):
114
162
 
115
163
    def __init__(self, bzrdir, repository, name, lockfiles):
116
164
        def determine_wants(heads):
 
165
            if not name in heads:
 
166
                raise NoSuchRef(name)
117
167
            self._ref = heads[name]
118
168
        bzrdir.root_transport.fetch_pack(determine_wants, None, lambda x: None, 
119
169
                             lambda x: mutter("git: %s" % x))
122
172
    def last_revision(self):
123
173
        return self.mapping.revision_id_foreign_to_bzr(self._ref)
124
174
 
 
175
    def _synchronize_history(self, destination, revision_id):
 
176
        """See Branch._synchronize_history()."""
 
177
        destination.generate_revision_history(self.last_revision())
 
178