← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

  • Committer: Martin Pool
  • Date: 2005-07-22 19:44:09 UTC
  • Revision ID: mbp@sourcefrog.net-20050722194409-9f99ffe3d62cf8c0
- tidy up imports to use full module names

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
19
19
def show_status(branch, show_unchanged=False,
20
20
                specific_files=None,
21
21
                show_ids=False,
22
 
                to_file=None,
23
 
                show_pending=True):
24
 
    """Display status for non-ignored working files.
 
22
                to_file=None):
 
23
    """Display single-line status for non-ignored working files.
25
24
 
26
 
    show_unchanged
27
 
        If set, includes unchanged files.
 
25
    show_all
 
26
        If true, show unmodified files too.
28
27
 
29
28
    specific_files
30
29
        If set, only show the status of files in this list.
31
30
 
32
 
    show_ids
33
 
        If set, includes each file's id.
34
 
 
35
31
    to_file
36
32
        If set, write to this file (default stdout.)
37
 
 
38
 
    show_pending
39
 
        If set, write pending merges.
40
33
    """
41
34
    import sys
42
 
    from bzrlib.delta import compare_trees
 
35
    from bzrlib.diff import compare_trees
43
36
 
44
37
    if to_file == None:
45
38
        to_file = sys.stdout
69
62
                print >>to_file, 'unknown:'
70
63
                done_header = True
71
64
            print >>to_file, ' ', path
72
 
        if show_pending and len(branch.pending_merges()) > 0:
73
 
            print >>to_file, 'pending merges:'
74
 
            for merge in branch.pending_merges():
75
 
                print >> to_file, ' ', merge
76
65
    finally:
77
66
        branch.unlock()
78
67