/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

  • Committer: Robert Collins
  • Date: 2010-02-28 10:08:29 UTC
  • mto: This revision was merged to the branch mainline in revision 5062.
  • Revision ID: robertc@robertcollins.net-20100228100829-nroa3qp8zi8jwxke
* bzr now has a ``.testr.conf`` file in its source tree configured
  appropriately for running tests with Testrepository
  (``https://launchpad.net/testrepository``). (Robert Collins)

* Documentation about testing with ``subunit`` has been tweaked.
  (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/repository.py
392
392
        if token == '':
393
393
            token = None
394
394
        try:
395
 
            token = repository.lock_write(token=token).repository_token
 
395
            token = repository.lock_write(token=token)
396
396
        except errors.LockContention, e:
397
397
            return FailedSmartServerResponse(('LockContention',))
398
398
        except errors.UnlockableTransport:
502
502
    yield pack_writer.begin()
503
503
    yield pack_writer.bytes_record(src_format.network_name(), '')
504
504
    for substream_type, substream in stream:
 
505
        if substream_type == 'inventory-deltas':
 
506
            # This doesn't feel like the ideal place to issue this warning;
 
507
            # however we don't want to do it in the Repository that's
 
508
            # generating the stream, because that might be on the server.
 
509
            # Instead we try to observe it as the stream goes by.
 
510
            ui.ui_factory.warn_cross_format_fetch(src_format,
 
511
                '(remote)')
505
512
        for record in substream:
506
513
            if record.storage_kind in ('chunked', 'fulltext'):
507
514
                serialised = record_to_fulltext_bytes(record)