/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

Clean up trailing whitespace.

Show diffs side-by-side

added added

removed removed

Lines of Context:
remote.py
75
75
from dulwich.pack import load_pack_index
76
76
 
77
77
 
78
 
# Don't run any tests on GitSmartTransport as it is not intended to be 
 
78
# Don't run any tests on GitSmartTransport as it is not intended to be
79
79
# a full implementation of Transport
80
80
def get_test_permutations():
81
81
    return []
110
110
                info("git: %s" % text)
111
111
        client = self._get_client(thin_packs=False)
112
112
        try:
113
 
            return client.fetch_pack(self._get_path(), determine_wants, 
 
113
            return client.fetch_pack(self._get_path(), determine_wants,
114
114
                graph_walker, pack_data, progress)
115
115
        except GitProtocolError, e:
116
116
            raise BzrError(e)
118
118
    def send_pack(self, get_changed_refs, generate_pack_contents):
119
119
        client = self._get_client(thin_packs=False)
120
120
        try:
121
 
            return client.send_pack(self._get_path(), get_changed_refs, 
 
121
            return client.send_pack(self._get_path(), get_changed_refs,
122
122
                generate_pack_contents)
123
123
        except GitProtocolError, e:
124
124
            raise BzrError(e)
254
254
    def get_refs(self):
255
255
        if self._refs is not None:
256
256
            return self._refs
257
 
        self._refs = self.bzrdir.root_transport.fetch_pack(lambda x: [], None, 
 
257
        self._refs = self.bzrdir.root_transport.fetch_pack(lambda x: [], None,
258
258
            lambda x: None, lambda x: trace.mutter("git: %s" % x))
259
259
        return self._refs
260
260
 
261
 
    def fetch_pack(self, determine_wants, graph_walker, pack_data, 
 
261
    def fetch_pack(self, determine_wants, graph_walker, pack_data,
262
262
                   progress=None):
263
263
        return self._transport.fetch_pack(determine_wants, graph_walker,
264
264
                                          pack_data, progress)
266
266
    def send_pack(self, get_changed_refs, generate_pack_contents):
267
267
        return self._transport.send_pack(get_changed_refs, generate_pack_contents)
268
268
 
269
 
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref, progress=None):
 
269
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref,
 
270
                      progress=None):
270
271
        fd, path = tempfile.mkstemp(suffix=".pack")
271
 
        self.fetch_pack(determine_wants, graph_walker, lambda x: os.write(fd, x), progress)
 
272
        self.fetch_pack(determine_wants, graph_walker,
 
273
            lambda x: os.write(fd, x), progress)
272
274
        os.close(fd)
273
275
        if os.path.getsize(path) == 0:
274
276
            return EmptyObjectStoreIterator()
303
305
 
304
306
    def __init__(self, bzrdir, repository, name, lockfiles):
305
307
        self._ref = None
306
 
        super(RemoteGitBranch, self).__init__(bzrdir, repository, name, 
 
308
        super(RemoteGitBranch, self).__init__(bzrdir, repository, name,
307
309
                lockfiles)
308
310
 
309
311
    def revision_history(self):
333
335
    def _synchronize_history(self, destination, revision_id):
334
336
        """See Branch._synchronize_history()."""
335
337
        destination.generate_revision_history(self.last_revision())
336
 
 
 
338
 
337
339
    def get_push_location(self):
338
340
        return None
339
341