/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/git/workingtree.py

  • Committer: Jelmer Vernooij
  • Date: 2018-09-01 19:51:29 UTC
  • mfrom: (7092 work)
  • mto: This revision was merged to the branch mainline in revision 7093.
  • Revision ID: jelmer@jelmer.uk-20180901195129-lkw03xisqshepa0i
merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/workingtree.py
146
146
        return lock.LogicalLockResult(self.unlock)
147
147
 
148
148
    def _lock_write_tree(self):
149
 
        # TODO(jelmer): Actually create index.lock
150
149
        if not self._lock_mode:
151
150
            self._lock_mode = 'w'
152
151
            self._lock_count = 1
205
204
                    self._flush(self._index_file)
206
205
                    self._index_file.close()
207
206
                else:
208
 
                    # Somebody else already wrote the index file
209
 
                    # by calling .flush()
 
207
                    # Something else already triggered a write of the index
 
208
                    # file by calling .flush()
210
209
                    self._index_file.abort()
211
210
                self._index_file = None
212
211
            self._lock_mode = None