/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 some bit of fetching.

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
28
from bzrlib.plugins.git.dir import GitDir
30
29
from bzrlib.plugins.git.foreign import ForeignBranch
31
30
from bzrlib.plugins.git.repository import GitFormat, GitRepository
32
31
 
33
 
import os
34
 
import tempfile
35
32
import urllib
36
33
import urlparse
37
34
 
38
 
from dulwich.pack import PackData, Pack
 
35
from dulwich.pack import PackData
39
36
 
40
37
 
41
38
class GitSmartTransport(Transport):
46
43
        assert scheme == "git"
47
44
        hostport, self._path = urllib.splithost(loc)
48
45
        (self._host, self._port) = urllib.splitnport(hostport, git.protocol.TCP_GIT_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)
 
46
        if _client is not None:
 
47
            self._client = _client
 
48
        else:
 
49
            self._client = git.client.TCPGitClient(self._host, self._port)
57
50
 
58
51
    def fetch_pack(self, determine_wants, graph_walker, pack_data, progress=None):
59
52
        if progress is None:
60
53
            def progress(text):
61
54
                info("git: %s" % text)
62
 
        self._get_client().fetch_pack(self._path, determine_wants, 
63
 
            graph_walker, pack_data, progress)
 
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)
 
62
        try:
 
63
            p = PackData(path)
 
64
            for o in p.iterobjects():
 
65
                yield o
 
66
        finally:
 
67
            os.remove(path)
64
68
 
65
69
    def get(self, path):
66
70
        raise NoSuchFile(path)
67
71
 
68
 
    def abspath(self, relpath):
69
 
        return urlutils.join(self.base, relpath)
70
 
 
71
72
    def clone(self, offset=None):
72
73
        """See Transport.clone()."""
73
74
        if offset is None:
108
109
        self._transport.fetch_pack(determine_wants, graph_walker, pack_data, 
109
110
            progress)
110
111
 
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)
123
 
 
124
112
 
125
113
class RemoteGitBranch(GitBranch):
126
114
 
127
115
    def __init__(self, bzrdir, repository, name, lockfiles):
128
116
        def determine_wants(heads):
129
 
            if not name in heads:
130
 
                raise NoSuchRef(name)
131
117
            self._ref = heads[name]
132
118
        bzrdir.root_transport.fetch_pack(determine_wants, None, lambda x: None, 
133
119
                             lambda x: mutter("git: %s" % x))
136
122
    def last_revision(self):
137
123
        return self.mapping.revision_id_foreign_to_bzr(self._ref)
138
124
 
139
 
    def _synchronize_history(self, destination, revision_id):
140
 
        """See Branch._synchronize_history()."""
141
 
        destination.generate_revision_history(self.last_revision())
142