← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/log.py

  • Committer: John Arbash Meinel
  • Date: 2009-10-29 21:13:16 UTC
  • mfrom: (4634.77.13 2.0)
  • mto: This revision was merged to the branch mainline in revision 4777.
  • Revision ID: john@arbash-meinel.com-20091029211316-d70fv1sxe2ev9rhy
Merge bzr.2.0 bringing in a bunch of small bugfixes.

Stuff like the ObjectNotLocked failures, reverting contents in the presence
of filters, etc.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/log.py
1846
1846
    :return: (branch, info_list, start_rev_info, end_rev_info) where
1847
1847
      info_list is a list of (relative_path, file_id, kind) tuples where
1848
1848
      kind is one of values 'directory', 'file', 'symlink', 'tree-reference'.
 
1849
      branch will be read-locked.
1849
1850
    """
1850
1851
    from builtins import _get_revision_range, safe_relpath_files
1851
1852
    tree, b, path = bzrdir.BzrDir.open_containing_tree_or_branch(file_list[0])
 
1853
    b.lock_read()
1852
1854
    # XXX: It's damn messy converting a list of paths to relative paths when
1853
1855
    # those paths might be deleted ones, they might be on a case-insensitive
1854
1856
    # filesystem and/or they might be in silly locations (like another branch).