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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-05-06 03:06:18 UTC
  • mfrom: (7500.1.2 trunk-merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200506030618-131sjbc876q7on66
Merge the 3.1 branch.

Merged from https://code.launchpad.net/~jelmer/brz/trunk-merge-3.1/+merge/383481

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/workingtree.py
27
27
WorkingTree.open(dir).
28
28
"""
29
29
 
30
 
from __future__ import absolute_import
31
 
 
 
30
import contextlib
32
31
import errno
33
32
import os
34
33
import sys
41
40
import stat
42
41
 
43
42
from breezy import (
44
 
    cleanup,
45
43
    conflicts as _mod_conflicts,
46
44
    filters as _mod_filters,
47
45
    merge,
1002
1000
    def revert(self, filenames=None, old_tree=None, backups=True,
1003
1001
               pb=None, report_changes=False):
1004
1002
        from .conflicts import resolve
1005
 
        with cleanup.ExitStack() as exit_stack:
 
1003
        with contextlib.ExitStack() as exit_stack:
1006
1004
            exit_stack.enter_context(self.lock_tree_write())
1007
1005
            if old_tree is None:
1008
1006
                basis_tree = self.basis_tree()