← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

merge John Meinels http test server reliability patch

Show diffs side-by-side

added added

removed removed

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