← 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-11 06:12:44 UTC
  • Revision ID: mbp@sourcefrog.net-20050511061244-b0eed343857f10d3
- remove dead code for cmd_compare_trees
- compare_trees new parameter want_unchanged to avoid allocating
  strings if not needed

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
 
                specific_files=None,
21
 
                show_ids=False,
22
 
                to_file=None):
 
20
                file_list=None,
 
21
                show_ids=False):
23
22
    """Display single-line status for non-ignored working files.
24
23
 
25
24
    show_all
26
25
        If true, show unmodified files too.
27
26
 
28
 
    specific_files
 
27
    file_list
29
28
        If set, only show the status of files in this list.
30
 
 
31
 
    to_file
32
 
        If set, write to this file (default stdout.)
33
29
    """
34
30
    import sys
35
 
    from bzrlib.delta import compare_trees
36
 
 
37
 
    if to_file == None:
38
 
        to_file = sys.stdout
39
 
    
40
 
    branch.lock_read()
41
 
    try:
42
 
 
43
 
        old = branch.basis_tree()
44
 
        new = branch.working_tree()
45
 
 
46
 
        delta = compare_trees(old, new, want_unchanged=show_unchanged,
47
 
                              specific_files=specific_files)
48
 
 
49
 
        delta.show(to_file,
50
 
                   show_ids=show_ids,
51
 
                   show_unchanged=show_unchanged)
52
 
 
53
 
        unknowns = new.unknowns()
54
 
        done_header = False
55
 
        for path in unknowns:
56
 
            # FIXME: Should also match if the unknown file is within a
57
 
            # specified directory.
58
 
            if specific_files:
59
 
                if path not in specific_files:
60
 
                    continue
61
 
            if not done_header:
62
 
                print >>to_file, 'unknown:'
63
 
                done_header = True
64
 
            print >>to_file, ' ', path
65
 
    finally:
66
 
        branch.unlock()
67
 
        
 
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