/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/plugins/weave_fmt/workingtree.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/plugins/weave_fmt/workingtree.py
21
21
from ... import (
22
22
    conflicts as _mod_conflicts,
23
23
    errors,
 
24
    lock,
24
25
    osutils,
25
26
    revision as _mod_revision,
26
27
    transform,
180
181
        """
181
182
        self.branch.lock_write()
182
183
        try:
183
 
            self._control_files.lock_write()
184
 
            return self
 
184
            token = self._control_files.lock_write()
 
185
            return lock.LogicalLockResult(self.unlock, token)
185
186
        except:
186
187
            self.branch.unlock()
187
188
            raise