/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/tests/test_diff.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/tests/test_diff.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
18
 
from io import BytesIO
19
17
import os
20
18
import re
21
19
import subprocess
23
21
import tempfile
24
22
 
25
23
from .. import (
 
24
    cleanup,
26
25
    diff,
27
26
    errors,
28
27
    osutils,
31
30
    revisiontree,
32
31
    tests,
33
32
    )
 
33
from ..sixish import (
 
34
    BytesIO,
 
35
    unichr,
 
36
    )
34
37
from ..tests import (
35
38
    features,
36
39
    EncodingAdapter,
1028
1031
 
1029
1032
    def call_gtabtd(self, path_list, revision_specs, old_url, new_url):
1030
1033
        """Call get_trees_and_branches_to_diff_locked."""
1031
 
        exit_stack = contextlib.ExitStack()
 
1034
        exit_stack = cleanup.ExitStack()
1032
1035
        self.addCleanup(exit_stack.close)
1033
1036
        return diff.get_trees_and_branches_to_diff_locked(
1034
1037
            path_list, revision_specs, old_url, new_url, exit_stack)