← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/log.py

Merge first-try into propagate-exceptions

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/log.py
86
86
    format_date,
87
87
    format_date_with_offset_in_original_timezone,
88
88
    get_terminal_encoding,
89
 
    re_compile_checked,
90
89
    terminal_width,
91
90
    )
92
91
from bzrlib.symbol_versioning import (
811
810
    """
812
811
    if search is None:
813
812
        return log_rev_iterator
814
 
    searchRE = re_compile_checked(search, re.IGNORECASE,
815
 
            'log message filter')
 
813
    searchRE = re.compile(search, re.IGNORECASE)
816
814
    return _filter_message_re(searchRE, log_rev_iterator)
817
815
 
818
816
 
2019
2017
      kind is one of values 'directory', 'file', 'symlink', 'tree-reference'.
2020
2018
      branch will be read-locked.
2021
2019
    """
2022
 
    from builtins import _get_revision_range, safe_relpath_files
 
2020
    from builtins import _get_revision_range
2023
2021
    tree, b, path = bzrdir.BzrDir.open_containing_tree_or_branch(file_list[0])
2024
2022
    add_cleanup(b.lock_read().unlock)
2025
2023
    # XXX: It's damn messy converting a list of paths to relative paths when
2031
2029
    # case of running log in a nested directory, assuming paths beyond the
2032
2030
    # first one haven't been deleted ...
2033
2031
    if tree:
2034
 
        relpaths = [path] + safe_relpath_files(tree, file_list[1:])
 
2032
        relpaths = [path] + tree.safe_relpath_files(file_list[1:])
2035
2033
    else:
2036
2034
        relpaths = [path] + file_list[1:]
2037
2035
    info_list = []