← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

Exclude more files from dumb-rsync upload

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
import sys
18
 
 
 
18
from bzrlib.osutils import is_inside_any
19
19
from bzrlib.delta import compare_trees
 
20
from bzrlib.log import line_log
20
21
from bzrlib.errors import NoSuchRevision
21
 
from bzrlib.log import line_log
22
 
from bzrlib.osutils import is_inside_any
23
 
 
24
 
# TODO: when showing single-line logs, truncate to the width of the terminal
25
 
# if known, but only if really going to the terminal (not into a file)
26
22
 
27
23
 
28
24
def show_status(branch, show_unchanged=False,
31
27
                to_file=None,
32
28
                show_pending=True,
33
29
                revision=None):
34
 
    """Display summary of changes.
35
 
 
36
 
    By default this compares the working tree to a previous revision. 
37
 
    If the revision argument is given, summarizes changes between the 
38
 
    working tree and another, or between two revisions.
39
 
 
40
 
    The result is written out as Unicode and to_file should be able 
41
 
    to encode that.
 
30
    """Display status for non-ignored working files.
42
31
 
43
32
    show_unchanged
44
33
        If set, includes unchanged files.
67
56
    try:
68
57
        new_is_working_tree = True
69
58
        if revision is None:
70
 
            new = branch.bzrdir.open_workingtree()
71
 
            old = new.basis_tree()
 
59
            old = branch.basis_tree()
 
60
            new = branch.working_tree()
72
61
        elif len(revision) > 0:
73
62
            try:
74
63
                rev_id = revision[0].in_history(branch).rev_id
75
 
                old = branch.repository.revision_tree(rev_id)
 
64
                old = branch.revision_tree(rev_id)
76
65
            except NoSuchRevision, e:
77
66
                raise BzrCommandError(str(e))
78
67
            if len(revision) > 1:
79
68
                try:
80
69
                    rev_id = revision[1].in_history(branch).rev_id
81
 
                    new = branch.repository.revision_tree(rev_id)
 
70
                    new = branch.revision_tree(rev_id)
82
71
                    new_is_working_tree = False
83
72
                except NoSuchRevision, e:
84
73
                    raise BzrCommandError(str(e))
85
74
            else:
86
 
                new = branch.bzrdir.open_workingtree()
 
75
                new = branch.working_tree()
87
76
                
 
77
 
88
78
        delta = compare_trees(old, new, want_unchanged=show_unchanged,
89
79
                              specific_files=specific_files)
 
80
 
90
81
        delta.show(to_file,
91
82
                   show_ids=show_ids,
92
83
                   show_unchanged=show_unchanged)
93
84
 
94
85
        if new_is_working_tree:
95
 
            list_paths('unknown', new.unknowns(), specific_files, to_file)
96
 
            list_paths('conflicts', new.iter_conflicts(), specific_files, to_file)
97
 
        if new_is_working_tree and show_pending:
98
 
            show_pending_merges(new, to_file)
 
86
            conflicts = new.iter_conflicts()
 
87
            unknowns = new.unknowns()
 
88
            list_paths('unknown', unknowns, specific_files, to_file)
 
89
            list_paths('conflicts', conflicts, specific_files, to_file)
 
90
            if show_pending and len(new.pending_merges()) > 0:
 
91
                print >>to_file, 'pending merges:'
 
92
                last_revision = branch.last_revision()
 
93
                if last_revision is not None:
 
94
                    ignore = set(branch.get_ancestry(last_revision))
 
95
                else:
 
96
                    ignore = set()
 
97
                for merge in new.pending_merges():
 
98
                    ignore.add(merge)
 
99
                    try:
 
100
                        m_revision = branch.get_revision(merge)
 
101
                        print >> to_file, ' ', line_log(m_revision, 77)
 
102
                        inner_merges = branch.get_ancestry(merge)
 
103
                        inner_merges.reverse()
 
104
                        for mmerge in inner_merges:
 
105
                            if mmerge in ignore:
 
106
                                continue
 
107
                            mm_revision = branch.get_revision(mmerge)
 
108
                            print >> to_file, '   ', line_log(mm_revision, 75)
 
109
                            ignore.add(mmerge)
 
110
                            
 
111
                    except NoSuchRevision:
 
112
                        print >> to_file, ' ', merge 
 
113
                        
99
114
    finally:
100
115
        branch.unlock()
101
 
 
102
 
def show_pending_merges(new, to_file):
103
 
    """Write out a display of pending merges in a working tree."""
104
 
    pending = new.pending_merges()
105
 
    branch = new.branch
106
 
    if len(pending) == 0:
107
 
        return
108
 
    print >>to_file, 'pending merges:'
109
 
    last_revision = branch.last_revision()
110
 
    if last_revision is not None:
111
 
        ignore = set(branch.repository.get_ancestry(last_revision))
112
 
    else:
113
 
        ignore = set()
114
 
    for merge in new.pending_merges():
115
 
        ignore.add(merge)
116
 
        try:
117
 
            m_revision = branch.repository.get_revision(merge)
118
 
            print >> to_file, ' ', line_log(m_revision, 77)
119
 
            inner_merges = branch.repository.get_ancestry(merge)
120
 
            inner_merges.reverse()
121
 
            for mmerge in inner_merges:
122
 
                if mmerge in ignore:
123
 
                    continue
124
 
                mm_revision = branch.repository.get_revision(mmerge)
125
 
                print >> to_file, '   ', line_log(mm_revision, 75)
126
 
                ignore.add(mmerge)
127
 
        except NoSuchRevision:
128
 
            print >> to_file, ' ', merge 
129
116
        
130
117
def list_paths(header, paths, specific_files, to_file):
131
118
    done_header = False