← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/log.py

  • Committer: jelmer at samba
  • Date: 2011-10-11 12:01:51 UTC
  • mto: This revision was merged to the branch mainline in revision 6214.
  • Revision ID: jelmer@samba.org-20111011120151-l1aa35zasaocrev3
Fix tests and the like.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/log.py
65
65
lazy_import(globals(), """
66
66
 
67
67
from bzrlib import (
68
 
    bzrdir,
69
68
    config,
 
69
    controldir,
70
70
    diff,
71
71
    errors,
72
72
    foreign,
2026
2026
      branch will be read-locked.
2027
2027
    """
2028
2028
    from builtins import _get_revision_range
2029
 
    tree, b, path = bzrdir.BzrDir.open_containing_tree_or_branch(file_list[0])
 
2029
    tree, b, path = controldir.ControlDir.open_containing_tree_or_branch(
 
2030
        file_list[0])
2030
2031
    add_cleanup(b.lock_read().unlock)
2031
2032
    # XXX: It's damn messy converting a list of paths to relative paths when
2032
2033
    # those paths might be deleted ones, they might be on a case-insensitive