← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Robert Collins
  • Date: 2008-09-02 05:28:37 UTC
  • mfrom: (3675 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3677.
  • Revision ID: robertc@robertcollins.net-20080902052837-ec3qlv41q5e7f6fl
Resolve conflicts with NEWS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
88
88
            self._real_bzrdir = BzrDir.open_from_transport(
89
89
                self.root_transport, _server_formats=False)
90
90
 
91
 
    def cloning_metadir(self):
 
91
    def cloning_metadir(self, stacked=False):
92
92
        self._ensure_real()
93
 
        return self._real_bzrdir.cloning_metadir()
 
93
        return self._real_bzrdir.cloning_metadir(stacked)
94
94
 
95
95
    def _translate_error(self, err, **context):
96
96
        _translate_error(err, bzrdir=self, **context)
1039
1039
        # destination
1040
1040
        from bzrlib import osutils
1041
1041
        import tarfile
1042
 
        import tempfile
1043
1042
        # TODO: Maybe a progress bar while streaming the tarball?
1044
1043
        note("Copying repository content as tarball...")
1045
1044
        tar_file = self._get_tarball('bz2')
1049
1048
        try:
1050
1049
            tar = tarfile.open('repository', fileobj=tar_file,
1051
1050
                mode='r|bz2')
1052
 
            tmpdir = tempfile.mkdtemp()
 
1051
            tmpdir = osutils.mkdtemp()
1053
1052
            try:
1054
1053
                _extract_tar(tar, tmpdir)
1055
1054
                tmp_bzrdir = BzrDir.open(tmpdir)
1593
1592
    def is_locked(self):
1594
1593
        return self._lock_count >= 1
1595
1594
 
 
1595
    @needs_read_lock
 
1596
    def revision_id_to_revno(self, revision_id):
 
1597
        self._ensure_real()
 
1598
        return self._real_branch.revision_id_to_revno(revision_id)
 
1599
 
1596
1600
    @needs_write_lock
1597
1601
    def set_last_revision_info(self, revno, revision_id):
1598
1602
        revision_id = ensure_null(revision_id)