/breezy/unstable

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/unstable

« back to all changes in this revision

Viewing changes to breezy/delta.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-24 01:39:33 UTC
  • mfrom: (3815.3776.6)
  • Revision ID: jelmer@jelmer.uk-20170524013933-ir4y4tqtrsiz2ka2
New upstream snapshot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
16
16
 
17
17
from __future__ import absolute_import
18
18
 
19
 
from bzrlib import (
 
19
from breezy import (
20
20
    osutils,
21
21
    )
22
 
from bzrlib.trace import is_quiet
 
22
from .sixish import (
 
23
    StringIO,
 
24
    )
 
25
from .trace import is_quiet
23
26
 
24
27
 
25
28
class TreeDelta(object):
109
112
 
110
113
    def get_changes_as_text(self, show_ids=False, show_unchanged=False,
111
114
                            short_status=False):
112
 
        import StringIO
113
 
        output = StringIO.StringIO()
 
115
        output = StringIO()
114
116
        report_delta(output, self, short_status, show_ids, show_unchanged)
115
117
        return output.getvalue()
116
118
 
201
203
                output_file.write((fmt % args) + '\n')
202
204
        self.output = output
203
205
        if self.output is None:
204
 
            from bzrlib import trace
 
206
            from . import trace
205
207
            self.output = trace.note
206
208
        self.suppress_root_add = suppress_root_add
207
209
        self.modified_map = {'kind changed': 'K',