← 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-09-13 05:22:41 UTC
  • Revision ID: mbp@sourcefrog.net-20050913052241-52dbd8e8ced620f6
- better BZR_DEBUG trace output

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
17
17
 
18
18
 
19
19
def show_status(branch, show_unchanged=False,
20
 
                file_list=None,
21
 
                show_ids=False):
 
20
                specific_files=None,
 
21
                show_ids=False,
 
22
                to_file=None,
 
23
                show_pending=True):
22
24
    """Display single-line status for non-ignored working files.
23
25
 
24
26
    show_all
25
27
        If true, show unmodified files too.
26
28
 
27
 
    file_list
 
29
    specific_files
28
30
        If set, only show the status of files in this list.
 
31
 
 
32
    to_file
 
33
        If set, write to this file (default stdout.)
29
34
    """
30
35
    import sys
31
 
    import diff
32
 
    
33
 
    branch._need_readlock()
34
 
    
35
 
    old = branch.basis_tree()
36
 
    new = branch.working_tree()
37
 
 
38
 
    if file_list:
39
 
        raise NotImplementedError("sorry, status on selected files is not implemented "
40
 
                                  "at the moment")
41
 
 
42
 
    delta = diff.compare_trees(old, new, want_unchanged=show_unchanged)
43
 
 
44
 
    delta.show(sys.stdout, show_ids=show_ids,
45
 
               show_unchanged=show_unchanged)
46
 
 
47
 
    unknowns = new.unknowns()
48
 
    done_header = False
49
 
    for path in unknowns:
50
 
        if not done_header:
51
 
            print 'unknown files:'
52
 
            done_header = True
53
 
        print ' ', path
 
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