/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
1
 
# Copyright (C) 2007-2009 Jelmer Vernooij <jelmer@samba.org>
 
1
# Copyright (C) 2007-2008 Canonical Ltd
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 BzrError, NoSuchFile, NotLocalUrl
 
20
from bzrlib.errors import 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 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.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 []
 
38
from dulwich.pack import PackData, Pack
48
39
 
49
40
 
50
41
class GitSmartTransport(Transport):
57
48
        (self._host, self._port) = urllib.splitnport(hostport, git.protocol.TCP_GIT_PORT)
58
49
        self._client = _client
59
50
 
60
 
    def has(self, relpath):
61
 
        return False
62
 
 
63
51
    def _get_client(self):
64
52
        if self._client is not None:
65
53
            ret = self._client
66
54
            self._client = None
67
55
            return ret
68
 
        return git.client.TCPGitClient(self._host, self._port, thin_packs=False)
 
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:
72
60
            def progress(text):
73
61
                info("git: %s" % text)
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)
 
62
        self._get_client().fetch_pack(self._path, determine_wants, 
 
63
            graph_walker, pack_data, progress)
80
64
 
81
65
    def get(self, path):
82
66
        raise NoSuchFile(path)
105
89
    def open_repository(self):
106
90
        return RemoteGitRepository(self, self._lockfiles)
107
91
 
108
 
    def open_branch(self, _unsupported=False):
 
92
    def open_branch(self):
109
93
        repo = self.open_repository()
110
94
        # TODO: Support for multiple branches in one bzrdir in bzrlib!
111
95
        return RemoteGitBranch(self, repo, "HEAD", self._lockfiles)
114
98
        raise NotLocalUrl(self.transport.base)
115
99
 
116
100
 
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
 
 
141
101
class RemoteGitRepository(GitRepository):
142
102
 
143
103
    def __init__(self, gitdir, lockfiles):
148
108
        self._transport.fetch_pack(determine_wants, graph_walker, pack_data, 
149
109
            progress)
150
110
 
151
 
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref, progress=None):
 
111
    def fetch_objects(self, determine_wants, graph_walker, progress=None):
152
112
        fd, path = tempfile.mkstemp(suffix=".pack")
153
113
        self.fetch_pack(determine_wants, graph_walker, lambda x: os.write(fd, x), progress)
154
114
        os.close(fd)
155
 
        if os.path.getsize(path) == 0:
156
 
            return EmptyObjectStoreIterator()
157
 
        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)
158
123
 
159
124
 
160
125
class RemoteGitBranch(GitBranch):