← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

Heikki Paajanen's status -r 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):
 
23
                show_pending=True,
 
24
                revision=None):
24
25
    """Display status for non-ignored working files.
25
26
 
26
27
    show_unchanged
37
38
 
38
39
    show_pending
39
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.
40
45
    """
41
46
    import sys
42
47
    from bzrlib.delta import compare_trees
46
51
    
47
52
    branch.lock_read()
48
53
    try:
49
 
 
50
 
        old = branch.basis_tree()
51
 
        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
                
52
74
 
53
75
        delta = compare_trees(old, new, want_unchanged=show_unchanged,
54
76
                              specific_files=specific_files)
57
79
                   show_ids=show_ids,
58
80
                   show_unchanged=show_unchanged)
59
81
 
60
 
        unknowns = new.unknowns()
61
 
        done_header = False
62
 
        for path in unknowns:
63
 
            # FIXME: Should also match if the unknown file is within a
64
 
            # specified directory.
65
 
            if specific_files:
66
 
                if path not in specific_files:
67
 
                    continue
68
 
            if not done_header:
69
 
                print >>to_file, 'unknown:'
70
 
                done_header = True
71
 
            print >>to_file, ' ', path
72
 
        if show_pending and len(branch.pending_merges()) > 0:
73
 
            print >>to_file, 'pending merges:'
74
 
            for merge in branch.pending_merges():
75
 
                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
76
99
    finally:
77
100
        branch.unlock()
78
101