← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

merge up with HEAD and with test-fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
21
21
                show_ids=False,
22
22
                to_file=None,
23
23
                show_pending=True):
24
 
    """Display single-line status for non-ignored working files.
 
24
    """Display status for non-ignored working files.
25
25
 
26
 
    show_all
27
 
        If true, show unmodified files too.
 
26
    show_unchanged
 
27
        If set, includes unchanged files.
28
28
 
29
29
    specific_files
30
30
        If set, only show the status of files in this list.
31
31
 
 
32
    show_ids
 
33
        If set, includes each file's id.
 
34
 
32
35
    to_file
33
36
        If set, write to this file (default stdout.)
 
37
 
 
38
    show_pending
 
39
        If set, write pending merges.
34
40
    """
35
41
    import sys
36
42
    from bzrlib.delta import compare_trees