/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/smart/repository.py

Merge bzr.dev and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/repository.py
350
350
 
351
351
    def do_repository_request(self, repository, compression):
352
352
        from bzrlib import osutils
353
 
        repo_transport = repository.control_files._transport
354
353
        tmp_dirname, tmp_repo = self._copy_to_tempdir(repository)
355
354
        try:
356
355
            controldir_name = tmp_dirname + '/.bzr'
389
388
            dirname = dirname.encode(sys.getfilesystemencoding())
390
389
            # python's tarball module includes the whole path by default so
391
390
            # override it
392
 
            assert dirname.endswith('.bzr')
 
391
            if not dirname.endswith('.bzr'):
 
392
                raise ValueError(dirname)
393
393
            tarball.add(dirname, '.bzr') # recursive by default
394
394
        finally:
395
395
            tarball.close()
412
412
        pack = ContainerSerialiser()
413
413
        buffer.write(pack.begin())
414
414
        try:
415
 
            try:
416
 
                for name_tuple, bytes in stream:
417
 
                    buffer.write(pack.bytes_record(bytes, [name_tuple]))
418
 
            except:
419
 
                # Undo the lock_read that happens once the iterator from
420
 
                # get_data_stream is started.
421
 
                repository.unlock()
422
 
                raise
 
415
            for name_tuple, bytes in stream:
 
416
                buffer.write(pack.bytes_record(bytes, [name_tuple]))
423
417
        except errors.RevisionNotPresent, e:
424
418
            return FailedSmartServerResponse(('NoSuchRevision', e.revision_id))
425
419
        buffer.write(pack.end())