← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

  • Committer: Robert Collins
  • Date: 2005-10-06 12:14:01 UTC
  • mfrom: (1393.1.67)
  • Revision ID: robertc@robertcollins.net-20051006121401-ce87bcb93909bbdf
merge martins latest

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
 
    """Display single-line status for non-ignored working files.
 
21
                show_ids=False,
 
22
                to_file=None,
 
23
                show_pending=True,
 
24
                revision=None):
 
25
    """Display status for non-ignored working files.
23
26
 
24
 
    show_all
25
 
        If true, show unmodified files too.
 
27
    show_unchanged
 
28
        If set, includes unchanged files.
26
29
 
27
30
    specific_files
28
31
        If set, only show the status of files in this list.
 
32
 
 
33
    show_ids
 
34
        If set, includes each file's id.
 
35
 
 
36
    to_file
 
37
        If set, write to this file (default stdout.)
 
38
 
 
39
    show_pending
 
40
        If set, write pending merges.
 
41
 
 
42
    revision
 
43
        If None the compare latest revision with working tree
 
44
        If one revision show compared it with working tree.
 
45
        If two revisions show status between first and second.
29
46
    """
30
47
    import sys
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
 
48
    from bzrlib.osutils import is_inside_any
 
49
    from bzrlib.delta import compare_trees
 
50
 
 
51
    if to_file == None:
 
52
        to_file = sys.stdout
 
53
    
 
54
    branch.lock_read()
 
55
    try:
 
56
        new_is_working_tree = True
 
57
        if revision is None:
 
58
            old = branch.basis_tree()
 
59
            new = branch.working_tree()
 
60
        elif len(revision) > 0:
 
61
            try:
 
62
                rev_id = revision[0].in_history(branch).rev_id
 
63
                old = branch.revision_tree(rev_id)
 
64
            except NoSuchRevision, e:
 
65
                raise BzrCommandError(str(e))
 
66
            if len(revision) > 1:
 
67
                try:
 
68
                    rev_id = revision[1].in_history(branch).rev_id
 
69
                    new = branch.revision_tree(rev_id)
 
70
                    new_is_working_tree = False
 
71
                except NoSuchRevision, e:
 
72
                    raise BzrCommandError(str(e))
 
73
            else:
 
74
                new = branch.working_tree()
 
75
                
 
76
 
 
77
        delta = compare_trees(old, new, want_unchanged=show_unchanged,
 
78
                              specific_files=specific_files)
 
79
 
 
80
        delta.show(to_file,
 
81
                   show_ids=show_ids,
 
82
                   show_unchanged=show_unchanged)
 
83
 
 
84
        if new_is_working_tree:
 
85
            unknowns = new.unknowns()
 
86
            done_header = False
 
87
            for path in unknowns:
 
88
                if specific_files and not is_inside_any(specific_files, path):
 
89
                    continue
 
90
                if not done_header:
 
91
                    print >>to_file, 'unknown:'
 
92
                    done_header = True
 
93
                print >>to_file, ' ', path
 
94
            if show_pending and len(branch.pending_merges()) > 0:
 
95
                print >>to_file, 'pending merges:'
 
96
                for merge in branch.pending_merges():
 
97
                    print >> to_file, ' ', merge
 
98
    finally:
 
99
        branch.unlock()
 
100