/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 tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
remote.py
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
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
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.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 []
39
48
 
40
49
 
41
50
class GitSmartTransport(Transport):
48
57
        (self._host, self._port) = urllib.splitnport(hostport, git.protocol.TCP_GIT_PORT)
49
58
        self._client = _client
50
59
 
 
60
    def has(self, relpath):
 
61
        return False
 
62
 
51
63
    def _get_client(self):
52
64
        if self._client is not None:
53
65
            ret = self._client
54
66
            self._client = None
55
67
            return ret
56
 
        return git.client.TCPGitClient(self._host, self._port)
 
68
        return git.client.TCPGitClient(self._host, self._port, thin_packs=False)
57
69
 
58
70
    def fetch_pack(self, determine_wants, graph_walker, pack_data, progress=None):
59
71
        if progress is None:
60
72
            def progress(text):
61
73
                info("git: %s" % text)
62
 
        self._get_client().fetch_pack(self._path, determine_wants, 
63
 
            graph_walker, pack_data, progress)
 
74
        client = self._get_client()
 
75
        try:
 
76
            client.fetch_pack(self._path, determine_wants, 
 
77
                graph_walker, pack_data, progress)
 
78
        except GitProtocolError, e:
 
79
            raise BzrError(e)
64
80
 
65
81
    def get(self, path):
66
82
        raise NoSuchFile(path)
89
105
    def open_repository(self):
90
106
        return RemoteGitRepository(self, self._lockfiles)
91
107
 
92
 
    def open_branch(self):
 
108
    def open_branch(self, _unsupported=False):
93
109
        repo = self.open_repository()
94
110
        # TODO: Support for multiple branches in one bzrdir in bzrlib!
95
111
        return RemoteGitBranch(self, repo, "HEAD", self._lockfiles)
98
114
        raise NotLocalUrl(self.transport.base)
99
115
 
100
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
 
101
141
class RemoteGitRepository(GitRepository):
102
142
 
103
143
    def __init__(self, gitdir, lockfiles):
108
148
        self._transport.fetch_pack(determine_wants, graph_walker, pack_data, 
109
149
            progress)
110
150
 
111
 
    def fetch_objects(self, determine_wants, graph_walker, progress=None):
 
151
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref, progress=None):
112
152
        fd, path = tempfile.mkstemp(suffix=".pack")
113
153
        self.fetch_pack(determine_wants, graph_walker, lambda x: os.write(fd, x), progress)
114
154
        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)
 
155
        if os.path.getsize(path) == 0:
 
156
            return EmptyObjectStoreIterator()
 
157
        return TemporaryPackIterator(path[:-len(".pack")], resolve_ext_ref)
123
158
 
124
159
 
125
160
class RemoteGitBranch(GitBranch):