/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-02-03 23:21:15 UTC
  • mfrom: (7290.42.6 paramiko-compat)
  • Revision ID: breezy.the.bot@gmail.com-20200203232115-g7k11bhsfeiqcprv
Fix compatibility with newer versions of paramiko, which break on noise before keys in pem files.

Merged from https://code.launchpad.net/~jelmer/brz/paramiko-compat/+merge/378480

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/shelf_ui.py
16
16
 
17
17
from __future__ import absolute_import
18
18
 
19
 
import contextlib
20
19
import patiencediff
21
20
import shutil
22
21
import sys
26
25
 
27
26
from . import (
28
27
    builtins,
 
28
    cleanup,
29
29
    delta,
30
30
    diff,
31
31
    errors,
458
458
 
459
459
    def run(self):
460
460
        """Perform the unshelving operation."""
461
 
        with contextlib.ExitStack() as exit_stack:
 
461
        with cleanup.ExitStack() as exit_stack:
462
462
            exit_stack.enter_context(self.tree.lock_tree_write())
463
463
            if self.read_shelf:
464
464
                trace.note(gettext('Using changes with id "%d".') %