~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

Show diffs side-by-side

added added

removed removed

Lines of Context:
180
180
                view_str = views.view_display_str(view_files)
181
181
                note("Ignoring files outside view. View is %s" % view_str)
182
182
        return tree, file_list
183
 
    tree = WorkingTree.open_containing(file_list[0])[0]
 
183
    tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
184
184
    return tree, safe_relpath_files(tree, file_list, canonicalize,
185
185
        apply_view=apply_view)
186
186
 
2712
2712
                "NAME_PATTERN or --default-rules.")
2713
2713
        name_pattern_list = [globbing.normalize_pattern(p)
2714
2714
                             for p in name_pattern_list]
2715
 
        bad_patterns = ''
2716
 
        for p in name_pattern_list:
2717
 
            if not globbing.Globster.is_pattern_valid(p):
2718
 
                bad_patterns += ('\n  %s' % p)
2719
 
        if bad_patterns:
2720
 
            msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
2721
 
            ui.ui_factory.show_error(msg)
2722
 
            raise errors.InvalidPattern('')
2723
2715
        for name_pattern in name_pattern_list:
2724
2716
            if (name_pattern[0] == '/' or
2725
2717
                (len(name_pattern) > 1 and name_pattern[1] == ':')):