← 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-17 18:26:45 UTC
  • Revision ID: mbp@sourcefrog.net-20050717182642-9116d11beacc6bc5
- oops, set() is much faster than intset

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):
 
22
                to_file=None):
24
23
    """Display single-line status for non-ignored working files.
25
24
 
26
25
    show_all
33
32
        If set, write to this file (default stdout.)
34
33
    """
35
34
    import sys
36
 
    from bzrlib.delta import compare_trees
 
35
    from bzrlib.diff import compare_trees
37
36
 
38
37
    if to_file == None:
39
38
        to_file = sys.stdout
63
62
                print >>to_file, 'unknown:'
64
63
                done_header = True
65
64
            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
70
65
    finally:
71
66
        branch.unlock()
72
67