/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 object_store.py

  • Committer: Jelmer Vernooij
  • Date: 2018-03-02 01:59:40 UTC
  • mfrom: (0.200.1791 work)
  • mto: (0.200.1795 work)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@jelmer.uk-20180302015940-41gwnoymxc2go3bq
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
object_store.py
766
766
            pd.create_index_v2(path[:-5]+".idx", self.object_store.get_raw)
767
767
 
768
768
            p = Pack(path[:-5])
769
 
            self.repository.lock_write()
770
 
            try:
 
769
            with self.repository.lock_write():
771
770
                self.repository.start_write_group()
772
771
                try:
773
772
                    import_git_objects(self.repository, self.mapping,
778
777
                    raise
779
778
                else:
780
779
                    self.repository.commit_write_group()
781
 
            finally:
782
 
                self.repository.unlock()
783
780
        return f, commit
784
781
 
785
782
    # The pack isn't kept around anyway, so no point