← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

Merge description into dont-add-conflict-helpers

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006, 2007, 2008, 2009 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
114
114
 
115
115
        self._probe_bzrdir()
116
116
 
117
 
    def __repr__(self):
118
 
        return '%s(%r)' % (self.__class__.__name__, self._client)
119
 
 
120
117
    def _probe_bzrdir(self):
121
118
        medium = self._client._medium
122
119
        path = self._path_for_remote_call(self._client)
1497
1494
        return self._real_repository.get_signature_text(revision_id)
1498
1495
 
1499
1496
    @needs_read_lock
1500
 
    def _get_inventory_xml(self, revision_id):
1501
 
        self._ensure_real()
1502
 
        return self._real_repository._get_inventory_xml(revision_id)
 
1497
    def get_inventory_xml(self, revision_id):
 
1498
        self._ensure_real()
 
1499
        return self._real_repository.get_inventory_xml(revision_id)
 
1500
 
 
1501
    def deserialise_inventory(self, revision_id, xml):
 
1502
        self._ensure_real()
 
1503
        return self._real_repository.deserialise_inventory(revision_id, xml)
1503
1504
 
1504
1505
    def reconcile(self, other=None, thorough=False):
1505
1506
        self._ensure_real()