/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 breezy/bundle/serializer/v4.py

  • Committer: Martin
  • Date: 2018-06-30 22:18:39 UTC
  • mfrom: (7010 work)
  • mto: This revision was merged to the branch mainline in revision 7012.
  • Revision ID: gzlist@googlemail.com-20180630221839-98zi78xwcggestse
Merge trunk to fix conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bundle/serializer/v4.py
468
468
            all into memory at once.  Reading it into memory all at once is
469
469
            (currently) faster.
470
470
        """
471
 
        repository.lock_write()
472
 
        try:
 
471
        with repository.lock_write():
473
472
            ri = RevisionInstaller(self.get_bundle_reader(stream_input),
474
473
                                   self._serializer, repository)
475
474
            return ri.install()
476
 
        finally:
477
 
            repository.unlock()
478
475
 
479
476
    def get_merge_request(self, target_repo):
480
477
        """Provide data for performing a merge