/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

Support user.signingkey configuration variable in .git/config.

Merged from https://code.launchpad.net/~jelmer/brz/local-git-key/+merge/381000

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
 
import contextlib
 
17
from __future__ import absolute_import
 
18
 
18
19
import patiencediff
19
20
import shutil
20
21
import sys
24
25
 
25
26
from . import (
26
27
    builtins,
 
28
    cleanup,
27
29
    delta,
28
30
    diff,
29
31
    errors,
456
458
 
457
459
    def run(self):
458
460
        """Perform the unshelving operation."""
459
 
        with contextlib.ExitStack() as exit_stack:
 
461
        with cleanup.ExitStack() as exit_stack:
460
462
            exit_stack.enter_context(self.tree.lock_tree_write())
461
463
            if self.read_shelf:
462
464
                trace.note(gettext('Using changes with id "%d".') %