← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
1497
1497
        return self._real_repository.get_signature_text(revision_id)
1498
1498
 
1499
1499
    @needs_read_lock
1500
 
    def get_inventory_xml(self, revision_id):
 
1500
    def _get_inventory_xml(self, revision_id):
1501
1501
        self._ensure_real()
1502
 
        return self._real_repository.get_inventory_xml(revision_id)
 
1502
        return self._real_repository._get_inventory_xml(revision_id)
1503
1503
 
1504
 
    def deserialise_inventory(self, revision_id, xml):
 
1504
    def _deserialise_inventory(self, revision_id, xml):
1505
1505
        self._ensure_real()
1506
 
        return self._real_repository.deserialise_inventory(revision_id, xml)
 
1506
        return self._real_repository._deserialise_inventory(revision_id, xml)
1507
1507
 
1508
1508
    def reconcile(self, other=None, thorough=False):
1509
1509
        self._ensure_real()