/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/shelf_ui.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/shelf_ui.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
from __future__ import absolute_import
18
 
 
 
17
import contextlib
19
18
import patiencediff
20
19
import shutil
21
20
import sys
25
24
 
26
25
from . import (
27
26
    builtins,
28
 
    cleanup,
29
27
    delta,
30
28
    diff,
31
29
    errors,
458
456
 
459
457
    def run(self):
460
458
        """Perform the unshelving operation."""
461
 
        with cleanup.ExitStack() as exit_stack:
 
459
        with contextlib.ExitStack() as exit_stack:
462
460
            exit_stack.enter_context(self.tree.lock_tree_write())
463
461
            if self.read_shelf:
464
462
                trace.note(gettext('Using changes with id "%d".') %