/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

Partially fix pull.

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 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
 
31
from bzrlib.plugins.git.dir import GitDir
28
32
from bzrlib.plugins.git.foreign import ForeignBranch
29
33
from bzrlib.plugins.git.repository import GitFormat, GitRepository
30
34
 
 
35
import os
 
36
import tempfile
31
37
import urllib
32
38
import urlparse
33
39
 
 
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 []
 
47
 
34
48
 
35
49
class GitSmartTransport(Transport):
36
50
 
40
54
        assert scheme == "git"
41
55
        hostport, self._path = urllib.splithost(loc)
42
56
        (self._host, self._port) = urllib.splitnport(hostport, git.protocol.TCP_GIT_PORT)
43
 
        if _client is not None:
44
 
            self._client = _client
45
 
        else:
46
 
            self._client = git.client.TCPGitClient(self._host, self._port)
 
57
        self._client = _client
 
58
 
 
59
    def _get_client(self):
 
60
        if self._client is not None:
 
61
            ret = self._client
 
62
            self._client = None
 
63
            return ret
 
64
        return git.client.TCPGitClient(self._host, self._port, 
 
65
            capabilities=["multi_ack", "side-band-64k", "ofs-delta", "side-band"])
47
66
 
48
67
    def fetch_pack(self, determine_wants, graph_walker, pack_data, progress=None):
49
68
        if progress is None:
50
69
            def progress(text):
51
70
                info("git: %s" % text)
52
 
        self._client.fetch_pack(self._path, determine_wants, graph_walker, 
53
 
                pack_data, progress)
 
71
        self._get_client().fetch_pack(self._path, determine_wants, 
 
72
            graph_walker, pack_data, progress)
54
73
 
55
74
    def get(self, path):
56
75
        raise NoSuchFile(path)
57
76
 
 
77
    def abspath(self, relpath):
 
78
        return urlutils.join(self.base, relpath)
 
79
 
58
80
    def clone(self, offset=None):
59
81
        """See Transport.clone()."""
60
82
        if offset is None:
65
87
        return GitSmartTransport(newurl, self._client)
66
88
 
67
89
 
68
 
class RemoteGitDir(BzrDir):
 
90
class RemoteGitDir(GitDir):
69
91
 
70
92
    def __init__(self, transport, lockfiles, format):
71
93
        self._format = format
73
95
        self.transport = transport
74
96
        self._lockfiles = lockfiles
75
97
 
76
 
    def is_supported(self):
77
 
        return True
78
 
 
79
98
    def open_repository(self):
80
99
        return RemoteGitRepository(self, self._lockfiles)
81
100
 
82
 
    def open_branch(self):
 
101
    def open_branch(self, _unsupported=False):
83
102
        repo = self.open_repository()
84
103
        # TODO: Support for multiple branches in one bzrdir in bzrlib!
85
104
        return RemoteGitBranch(self, repo, "HEAD", self._lockfiles)
87
106
    def open_workingtree(self):
88
107
        raise NotLocalUrl(self.transport.base)
89
108
 
90
 
    def cloning_metadir(self, stacked=False):
91
 
        """Produce a metadir suitable for cloning with."""
92
 
        if stacked:
93
 
            return bzrlib.bzrdir.format_registry.make_bzrdir("1.6.1-rich-root")
94
 
        else:
95
 
            return bzrlib.bzrdir.format_registry.make_bzrdir("rich-root-pack")
 
109
 
 
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)
96
132
 
97
133
 
98
134
class RemoteGitRepository(GitRepository):
100
136
    def __init__(self, gitdir, lockfiles):
101
137
        GitRepository.__init__(self, gitdir, lockfiles)
102
138
 
103
 
    def fetch_pack(self, determine_wants, graph_walker, pack_data):
104
 
        self._transport.fetch_pack(determine_wants, graph_walker, pack_data)
 
139
    def fetch_pack(self, determine_wants, graph_walker, pack_data, 
 
140
                   progress=None):
 
141
        self._transport.fetch_pack(determine_wants, graph_walker, pack_data, 
 
142
            progress)
 
143
 
 
144
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref, progress=None):
 
145
        fd, path = tempfile.mkstemp(suffix=".pack")
 
146
        self.fetch_pack(determine_wants, graph_walker, lambda x: os.write(fd, x), progress)
 
147
        os.close(fd)
 
148
        if os.path.getsize(path) == 0:
 
149
            return EmptyObjectStoreIterator()
 
150
        return TemporaryPackIterator(path[:-len(".pack")], resolve_ext_ref)
105
151
 
106
152
 
107
153
class RemoteGitBranch(GitBranch):
108
154
 
109
155
    def __init__(self, bzrdir, repository, name, lockfiles):
110
156
        def determine_wants(heads):
 
157
            if not name in heads:
 
158
                raise NoSuchRef(name)
111
159
            self._ref = heads[name]
112
160
        bzrdir.root_transport.fetch_pack(determine_wants, None, lambda x: None, 
113
161
                             lambda x: mutter("git: %s" % x))
114
162
        super(RemoteGitBranch, self).__init__(bzrdir, repository, name, self._ref, lockfiles)
115
163
 
116
164
    def last_revision(self):
117
 
        return self._ref
 
165
        return self.mapping.revision_id_foreign_to_bzr(self._ref)
 
166
 
 
167
    def _synchronize_history(self, destination, revision_id):
 
168
        """See Branch._synchronize_history()."""
 
169
        destination.generate_revision_history(self.last_revision())
 
170