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

  • Committer: Jelmer Vernooij
  • Date: 2017-08-31 05:37:51 UTC
  • mfrom: (6754.8.15 lock-context)
  • Revision ID: jelmer@jelmer.uk-20170831053751-9pem67h9hu2p8lg2
Merge lp:~jelmer/brz/lock-context.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/memorytree.py
25
25
 
26
26
from . import (
27
27
    errors,
 
28
    lock,
28
29
    mutabletree,
29
30
    revision as _mod_revision,
30
31
    )
186
187
                self.branch.lock_read()
187
188
                self._lock_mode = "r"
188
189
                self._populate_from_branch()
 
190
            return lock.LogicalLockResult(self.unlock)
189
191
        except:
190
192
            self._locks -= 1
191
193
            raise
203
205
        except:
204
206
            self._locks -= 1
205
207
            raise
 
208
        return lock.LogicalLockResult(self.unlock)
206
209
 
207
210
    def lock_write(self):
208
211
        """See MutableTree.lock_write()."""
214
217
                self._populate_from_branch()
215
218
            elif self._lock_mode == "r":
216
219
                raise errors.ReadOnlyError(self)
 
220
            return lock.LogicalLockResult(self.unlock)
217
221
        except:
218
222
            self._locks -= 1
219
223
            raise