← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: John Arbash Meinel
  • Date: 2010-02-04 16:06:36 UTC
  • mfrom: (5007 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5023.
  • Revision ID: john@arbash-meinel.com-20100204160636-xqeuwz8bwt8bbts4
Merge bzr.dev 5007, resolve conflict, update NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
1
 
# Copyright (C) 2006, 2007, 2008, 2009 Canonical Ltd
 
1
# Copyright (C) 2006-2010 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
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()