← 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-05-27 02:57:50 UTC
  • Revision ID: mbp@sourcefrog.net-20050527025750-909876bea41d8db6
- new --diff-options to pass options through to external
  diff and turn it on

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
40
 
    
41
 
    branch.lock_read()
42
 
    try:
43
 
 
44
 
        old = branch.basis_tree()
45
 
        new = branch.working_tree()
46
 
 
47
 
        delta = compare_trees(old, new, want_unchanged=show_unchanged,
48
 
                              specific_files=specific_files)
49
 
 
50
 
        delta.show(to_file,
51
 
                   show_ids=show_ids,
52
 
                   show_unchanged=show_unchanged)
53
 
 
54
 
        unknowns = new.unknowns()
55
 
        done_header = False
56
 
        for path in unknowns:
57
 
            # FIXME: Should also match if the unknown file is within a
58
 
            # specified directory.
59
 
            if specific_files:
60
 
                if path not in specific_files:
61
 
                    continue
62
 
            if not done_header:
63
 
                print >>to_file, 'unknown:'
64
 
                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
70
 
    finally:
71
 
        branch.unlock()
72
 
        
 
31
    import diff
 
32
    
 
33
    branch._need_readlock()
 
34
    
 
35
    old = branch.basis_tree()
 
36
    new = branch.working_tree()
 
37
 
 
38
    delta = diff.compare_trees(old, new, want_unchanged=show_unchanged,
 
39
                               specific_files=specific_files)
 
40
 
 
41
    delta.show(sys.stdout, show_ids=show_ids,
 
42
               show_unchanged=show_unchanged)
 
43
 
 
44
    unknowns = new.unknowns()
 
45
    done_header = False
 
46
    for path in unknowns:
 
47
        # FIXME: Should also match if the unknown file is within a
 
48
        # specified directory.
 
49
        if specific_files:
 
50
            if path not in specific_files:
 
51
                continue
 
52
        if not done_header:
 
53
            print 'unknown:'
 
54
            done_header = True
 
55
        print ' ', path