/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 pull from remote branches.

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
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.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 []
39
47
 
40
48
 
41
49
class GitSmartTransport(Transport):
53
61
            ret = self._client
54
62
            self._client = None
55
63
            return ret
56
 
        return git.client.TCPGitClient(self._host, self._port)
 
64
        return git.client.TCPGitClient(self._host, self._port, 
 
65
            capabilities=["multi_ack", "side-band-64k", "ofs-delta", "side-band"])
57
66
 
58
67
    def fetch_pack(self, determine_wants, graph_walker, pack_data, progress=None):
59
68
        if progress is None:
89
98
    def open_repository(self):
90
99
        return RemoteGitRepository(self, self._lockfiles)
91
100
 
92
 
    def open_branch(self):
 
101
    def open_branch(self, _unsupported=False):
93
102
        repo = self.open_repository()
94
103
        # TODO: Support for multiple branches in one bzrdir in bzrlib!
95
104
        return RemoteGitBranch(self, repo, "HEAD", self._lockfiles)
98
107
        raise NotLocalUrl(self.transport.base)
99
108
 
100
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)
 
132
 
 
133
 
101
134
class RemoteGitRepository(GitRepository):
102
135
 
103
136
    def __init__(self, gitdir, lockfiles):
108
141
        self._transport.fetch_pack(determine_wants, graph_walker, pack_data, 
109
142
            progress)
110
143
 
111
 
    def fetch_objects(self, determine_wants, graph_walker, progress=None):
 
144
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref, progress=None):
112
145
        fd, path = tempfile.mkstemp(suffix=".pack")
113
146
        self.fetch_pack(determine_wants, graph_walker, lambda x: os.write(fd, x), progress)
114
147
        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)
 
148
        if os.path.getsize(path) == 0:
 
149
            return EmptyObjectStoreIterator()
 
150
        return TemporaryPackIterator(path[:-len(".pack")], resolve_ext_ref)
123
151
 
124
152
 
125
153
class RemoteGitBranch(GitBranch):