← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/log.py

https://launchpad.net/bugs/819604
Merge the fix for bug #819604 into trunk, resolve conflicts.

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,
68
69
    config,
69
 
    controldir,
70
70
    diff,
71
71
    errors,
72
72
    foreign,
105
105
    last_ie = None
106
106
    last_path = None
107
107
    revno = 1
108
 
    graph = branch.repository.get_graph()
109
 
    history = list(graph.iter_lefthand_ancestry(branch.last_revision(),
110
 
        [_mod_revision.NULL_REVISION]))
111
 
    for revision_id in reversed(history):
 
108
    for revision_id in branch.revision_history():
112
109
        this_inv = branch.repository.get_inventory(revision_id)
113
110
        if this_inv.has_id(file_id):
114
111
            this_ie = this_inv[file_id]
2029
2026
      branch will be read-locked.
2030
2027
    """
2031
2028
    from builtins import _get_revision_range
2032
 
    tree, b, path = controldir.ControlDir.open_containing_tree_or_branch(
2033
 
        file_list[0])
 
2029
    tree, b, path = bzrdir.BzrDir.open_containing_tree_or_branch(file_list[0])
2034
2030
    add_cleanup(b.lock_read().unlock)
2035
2031
    # XXX: It's damn messy converting a list of paths to relative paths when
2036
2032
    # those paths might be deleted ones, they might be on a case-insensitive