← 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-04-05 13:49:36 UTC
  • mfrom: (5753.2.4 lazyimport-scope)
  • Revision ID: pqm@pqm.ubuntu.com-20110405134936-0ys2p9oyxpsjqvh2
(jelmer) Remove unused lazy imports, fix two scope bugs. (Jelmer Vernooij)

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,
74
73
    repository as _mod_repository,
75
74
    revision as _mod_revision,
76
75
    revisionspec,
77
 
    trace,
78
76
    tsort,
79
77
    )
80
78
""")
85
83
from bzrlib.osutils import (
86
84
    format_date,
87
85
    format_date_with_offset_in_original_timezone,
 
86
    get_diff_header_encoding,
88
87
    get_terminal_encoding,
89
88
    terminal_width,
90
89
    )
432
431
        else:
433
432
            specific_files = None
434
433
        s = StringIO()
435
 
        path_encoding = osutils.get_diff_header_encoding()
 
434
        path_encoding = get_diff_header_encoding()
436
435
        diff.show_diff_trees(tree_1, tree_2, s, specific_files, old_label='',
437
436
            new_label='', path_encoding=path_encoding)
438
437
        return s.getvalue()