← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Aaron Bentley
  • Date: 2008-06-06 16:40:46 UTC
  • mfrom: (3482 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3483.
  • Revision ID: aaron@aaronbentley.com-20080606164046-ghbxplxuhtpcb9iz
Merge with bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
48
48
from bzrlib.revision import ensure_null, NULL_REVISION
49
49
from bzrlib.trace import mutter, note, warning
50
50
 
 
51
 
51
52
# Note: RemoteBzrDirFormat is in bzrdir.py
52
53
 
53
54
class RemoteBzrDir(BzrDir):
1257
1258
        self._lock_count = 0
1258
1259
        self._leave_lock = False
1259
1260
 
1260
 
    def _ensure_real_transport(self):
 
1261
    def _get_real_transport(self):
1261
1262
        # if we try vfs access, return the real branch's vfs transport
1262
1263
        self._ensure_real()
1263
1264
        return self._real_branch._transport
1264
1265
 
1265
 
    _transport = property(_ensure_real_transport)
 
1266
    _transport = property(_get_real_transport)
1266
1267
 
1267
1268
    def __str__(self):
1268
1269
        return "%s(%s)" % (self.__class__.__name__, self.base)
1564
1565
        self._ensure_real()
1565
1566
        return self._real_branch.set_push_location(location)
1566
1567
 
1567
 
    def update_revisions(self, other, stop_revision=None, overwrite=False):
 
1568
    def update_revisions(self, other, stop_revision=None, overwrite=False,
 
1569
                         graph=None):
1568
1570
        self._ensure_real()
1569
1571
        return self._real_branch.update_revisions(
1570
 
            other, stop_revision=stop_revision, overwrite=overwrite)
 
1572
            other, stop_revision=stop_revision, overwrite=overwrite,
 
1573
            graph=graph)
1571
1574
 
1572
1575
 
1573
1576
def _extract_tar(tar, to_dir):