/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-02-14 03:16:54 UTC
  • mfrom: (7479.2.3 no-more-python2)
  • Revision ID: breezy.the.bot@gmail.com-20200214031654-bp1xtv2jr9nmhto3
Drop python2 support.

Merged from https://code.launchpad.net/~jelmer/brz/no-more-python2/+merge/378694

Show diffs side-by-side

added added

removed removed

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