← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

  • Committer: Aaron Bentley
  • Date: 2005-10-03 19:50:36 UTC
  • mfrom: (1399)
  • mto: (1185.25.1)
  • mto: This revision was merged to the branch mainline in revision 1419.
  • Revision ID: abentley@panoramicfeedback.com-20051003195036-28dbd56f0e852b08
Merged latest from Robert Collins

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
38
38
 
39
39
    show_pending
40
40
        If set, write pending merges.
 
41
 
41
42
    revision
42
43
        If None the compare latest revision with working tree
43
44
        If one revision show compared it with working tree.
44
45
        If two revisions show status between first and second.
45
46
    """
46
47
    import sys
 
48
    from bzrlib.osutils import is_inside_any
47
49
    from bzrlib.delta import compare_trees
48
50
 
49
51
    if to_file == None:
83
85
            unknowns = new.unknowns()
84
86
            done_header = False
85
87
            for path in unknowns:
86
 
                # FIXME: Should also match if the unknown file is within a
87
 
                # specified directory.
88
 
                if specific_files:
89
 
                    if path not in specific_files:
90
 
                        continue
 
88
                if specific_files and not is_inside_any(specific_files, path):
 
89
                    continue
91
90
                if not done_header:
92
91
                    print >>to_file, 'unknown:'
93
92
                    done_header = True