← 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-04 12:26:02 UTC
  • Revision ID: mbp@sourcefrog.net-20050704122602-69901910521e62c3
- check command checks that all inventory-ids are the same as in the revision.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
18
18
 
19
19
def show_status(branch, show_unchanged=False,
20
20
                specific_files=None,
21
 
                show_ids=False,
22
 
                to_file=None,
23
 
                show_pending=True):
 
21
                show_ids=False):
24
22
    """Display single-line status for non-ignored working files.
25
23
 
26
24
    show_all
28
26
 
29
27
    specific_files
30
28
        If set, only show the status of files in this list.
31
 
 
32
 
    to_file
33
 
        If set, write to this file (default stdout.)
34
29
    """
35
30
    import sys
36
 
    from bzrlib.delta import compare_trees
37
 
 
38
 
    if to_file == None:
39
 
        to_file = sys.stdout
 
31
    from bzrlib.diff import compare_trees
40
32
    
41
33
    branch.lock_read()
42
34
    try:
47
39
        delta = compare_trees(old, new, want_unchanged=show_unchanged,
48
40
                              specific_files=specific_files)
49
41
 
50
 
        delta.show(to_file,
51
 
                   show_ids=show_ids,
 
42
        delta.show(sys.stdout, show_ids=show_ids,
52
43
                   show_unchanged=show_unchanged)
53
44
 
54
45
        unknowns = new.unknowns()
60
51
                if path not in specific_files:
61
52
                    continue
62
53
            if not done_header:
63
 
                print >>to_file, 'unknown:'
 
54
                print 'unknown:'
64
55
                done_header = True
65
 
            print >>to_file, ' ', path
66
 
        if show_pending and len(branch.pending_merges()) > 0:
67
 
            print >>to_file, 'pending merges:'
68
 
            for merge in branch.pending_merges():
69
 
                print >> to_file, ' ', merge
 
56
            print ' ', path
70
57
    finally:
71
58
        branch.unlock()
72
59