/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
25
25
 
26
26
from bzrlib.plugins.git import git
27
27
from bzrlib.plugins.git.branch import GitBranch
 
28
from bzrlib.plugins.git.errors import NoSuchRef
 
29
from bzrlib.plugins.git.dir import GitDir
28
30
from bzrlib.plugins.git.foreign import ForeignBranch
29
31
from bzrlib.plugins.git.repository import GitFormat, GitRepository
30
32
 
 
33
import os
 
34
import tempfile
31
35
import urllib
32
36
import urlparse
33
37
 
 
38
from dulwich.pack import PackData, Pack
 
39
 
34
40
 
35
41
class GitSmartTransport(Transport):
36
42
 
40
46
        assert scheme == "git"
41
47
        hostport, self._path = urllib.splithost(loc)
42
48
        (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)
 
49
        self._client = _client
 
50
 
 
51
    def _get_client(self):
 
52
        if self._client is not None:
 
53
            ret = self._client
 
54
            self._client = None
 
55
            return ret
 
56
        return git.client.TCPGitClient(self._host, self._port)
47
57
 
48
58
    def fetch_pack(self, determine_wants, graph_walker, pack_data, progress=None):
49
59
        if progress is None:
50
60
            def progress(text):
51
61
                info("git: %s" % text)
52
 
        self._client.fetch_pack(self._path, determine_wants, graph_walker, 
53
 
                pack_data, progress)
 
62
        self._get_client().fetch_pack(self._path, determine_wants, 
 
63
            graph_walker, pack_data, progress)
54
64
 
55
65
    def get(self, path):
56
66
        raise NoSuchFile(path)
57
67
 
 
68
    def abspath(self, relpath):
 
69
        return urlutils.join(self.base, relpath)
 
70
 
58
71
    def clone(self, offset=None):
59
72
        """See Transport.clone()."""
60
73
        if offset is None:
65
78
        return GitSmartTransport(newurl, self._client)
66
79
 
67
80
 
68
 
class RemoteGitDir(BzrDir):
 
81
class RemoteGitDir(GitDir):
69
82
 
70
83
    def __init__(self, transport, lockfiles, format):
71
84
        self._format = format
73
86
        self.transport = transport
74
87
        self._lockfiles = lockfiles
75
88
 
76
 
    def is_supported(self):
77
 
        return True
78
 
 
79
89
    def open_repository(self):
80
90
        return RemoteGitRepository(self, self._lockfiles)
81
91
 
87
97
    def open_workingtree(self):
88
98
        raise NotLocalUrl(self.transport.base)
89
99
 
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")
96
 
 
97
100
 
98
101
class RemoteGitRepository(GitRepository):
99
102
 
100
103
    def __init__(self, gitdir, lockfiles):
101
104
        GitRepository.__init__(self, gitdir, lockfiles)
102
105
 
103
 
    def fetch_pack(self, determine_wants, graph_walker, pack_data):
104
 
        self._transport.fetch_pack(determine_wants, graph_walker, pack_data)
 
106
    def fetch_pack(self, determine_wants, graph_walker, pack_data, 
 
107
                   progress=None):
 
108
        self._transport.fetch_pack(determine_wants, graph_walker, pack_data, 
 
109
            progress)
 
110
 
 
111
    def fetch_objects(self, determine_wants, graph_walker, progress=None):
 
112
        fd, path = tempfile.mkstemp(suffix=".pack")
 
113
        self.fetch_pack(determine_wants, graph_walker, lambda x: os.write(fd, x), progress)
 
114
        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)
105
123
 
106
124
 
107
125
class RemoteGitBranch(GitBranch):
108
126
 
109
127
    def __init__(self, bzrdir, repository, name, lockfiles):
110
128
        def determine_wants(heads):
 
129
            if not name in heads:
 
130
                raise NoSuchRef(name)
111
131
            self._ref = heads[name]
112
132
        bzrdir.root_transport.fetch_pack(determine_wants, None, lambda x: None, 
113
133
                             lambda x: mutter("git: %s" % x))
114
134
        super(RemoteGitBranch, self).__init__(bzrdir, repository, name, self._ref, lockfiles)
115
135
 
116
136
    def last_revision(self):
117
 
        return self._ref
 
137
        return self.mapping.revision_id_foreign_to_bzr(self._ref)
 
138
 
 
139
    def _synchronize_history(self, destination, revision_id):
 
140
        """See Branch._synchronize_history()."""
 
141
        destination.generate_revision_history(self.last_revision())
 
142