← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/log.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-03-03 07:56:45 UTC
  • mfrom: (5695.1.1 merge-2.3-to-trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20110303075645-hncdmrbpczkxcvt4
(spiv) Merge lp:bzr/2.3 into lp:bzr,
 including fix for #726584. (Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/log.py
70
70
    diff,
71
71
    errors,
72
72
    foreign,
 
73
    osutils,
73
74
    repository as _mod_repository,
74
75
    revision as _mod_revision,
75
76
    revisionspec,
 
77
    trace,
76
78
    tsort,
77
79
    )
78
80
""")
83
85
from bzrlib.osutils import (
84
86
    format_date,
85
87
    format_date_with_offset_in_original_timezone,
86
 
    get_diff_header_encoding,
87
88
    get_terminal_encoding,
88
89
    terminal_width,
89
90
    )
431
432
        else:
432
433
            specific_files = None
433
434
        s = StringIO()
434
 
        path_encoding = get_diff_header_encoding()
 
435
        path_encoding = osutils.get_diff_header_encoding()
435
436
        diff.show_diff_trees(tree_1, tree_2, s, specific_files, old_label='',
436
437
            new_label='', path_encoding=path_encoding)
437
438
        return s.getvalue()