← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/log.py

  • Committer: Martin Pool
  • Date: 2010-07-21 09:58:42 UTC
  • mfrom: (4797.58.7 2.1)
  • mto: (5050.3.13 2.2)
  • mto: This revision was merged to the branch mainline in revision 5365.
  • Revision ID: mbp@canonical.com-20100721095842-hz0obu8gl0x05nty
merge up 2.1 to 2.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/log.py
2017
2017
      kind is one of values 'directory', 'file', 'symlink', 'tree-reference'.
2018
2018
      branch will be read-locked.
2019
2019
    """
2020
 
    from builtins import _get_revision_range
 
2020
    from builtins import _get_revision_range, safe_relpath_files
2021
2021
    tree, b, path = bzrdir.BzrDir.open_containing_tree_or_branch(file_list[0])
2022
2022
    add_cleanup(b.lock_read().unlock)
2023
2023
    # XXX: It's damn messy converting a list of paths to relative paths when
2029
2029
    # case of running log in a nested directory, assuming paths beyond the
2030
2030
    # first one haven't been deleted ...
2031
2031
    if tree:
2032
 
        relpaths = [path] + tree.safe_relpath_files(file_list[1:])
 
2032
        relpaths = [path] + safe_relpath_files(tree, file_list[1:])
2033
2033
    else:
2034
2034
        relpaths = [path] + file_list[1:]
2035
2035
    info_list = []