← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

  • Committer: Jelmer Vernooij
  • Date: 2010-04-30 11:35:43 UTC
  • mfrom: (5195 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5197.
  • Revision ID: jelmer@samba.org-20100430113543-tiqqhmqa3d8no4iu
merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
30
30
# if known, but only if really going to the terminal (not into a file)
31
31
 
32
32
 
 
33
def report_changes(to_file, old, new, specific_files, 
 
34
                   show_short_reporter, show_long_callback, 
 
35
                   short=False, want_unchanged=False, 
 
36
                   want_unversioned=False, show_ids=False):
 
37
    """Display summary of changes.
 
38
 
 
39
    This compares two trees with regards to a list of files, and delegates 
 
40
    the display to underlying elements.
 
41
 
 
42
    For short output, it creates an iterator on all changes, and lets a given
 
43
    reporter display these changes.
 
44
 
 
45
    For stantard output, it creates a delta of the changes, and forwards it
 
46
    to a callback
 
47
 
 
48
    :param to_file: If set, write to this file (default stdout.)
 
49
    :param old: Start tree for the comparison
 
50
    :param end: End tree for the comparison
 
51
    :param specific_files: If set, a list of filenames whose status should be
 
52
        shown.  It is an error to give a filename that is not in the working
 
53
        tree, or in the working inventory or in the basis inventory.
 
54
    :param show_short_reporter: Reporter in charge of display for short output
 
55
    :param show_long_callback: Callback in charge of display for normal output
 
56
    :param short: If True, gives short SVN-style status lines.
 
57
    :param want_unchanged: Deprecated parameter. If set, includes unchanged
 
58
        files.
 
59
    :param show_ids: If set, includes each file's id.
 
60
    :param want_unversioned: If False, only shows versioned files.
 
61
    """
 
62
 
 
63
    if short:
 
64
        changes = new.iter_changes(old, want_unchanged, specific_files,
 
65
            require_versioned=False, want_unversioned=want_unversioned)
 
66
        _mod_delta.report_changes(changes, show_short_reporter)
 
67
        
 
68
    else:
 
69
        delta = new.changes_from(old, want_unchanged=want_unchanged,
 
70
                              specific_files=specific_files,
 
71
                              want_unversioned=want_unversioned)
 
72
        # filter out unknown files. We may want a tree method for
 
73
        # this
 
74
        delta.unversioned = [unversioned for unversioned in
 
75
            delta.unversioned if not new.is_ignored(unversioned[0])]
 
76
        show_long_callback(to_file, delta, 
 
77
                           show_ids=show_ids,
 
78
                           show_unchanged=want_unchanged)
 
79
 
 
80
 
33
81
def show_tree_status(wt, show_unchanged=None,
34
82
                     specific_files=None,
35
83
                     show_ids=False,
38
86
                     revision=None,
39
87
                     short=False,
40
88
                     verbose=False,
41
 
                     versioned=False):
 
89
                     versioned=False,
 
90
                     show_long_callback=_mod_delta.report_delta):
42
91
    """Display summary of changes.
43
92
 
44
93
    By default this compares the working tree to a previous revision.
67
116
    :param verbose: If True, show all merged revisions, not just
68
117
        the merge tips
69
118
    :param versioned: If True, only shows versioned files.
 
119
    :param show_long_callback: A callback: message = show_long_callback(to_file, delta, 
 
120
        show_ids, show_unchanged, indent, filter), only used with the long output
70
121
    """
71
122
    if show_unchanged is not None:
72
123
        warn("show_tree_status with show_unchanged has been deprecated "
102
153
            specific_files, nonexistents \
103
154
                = _filter_nonexistent(specific_files, old, new)
104
155
            want_unversioned = not versioned
105
 
            if short:
106
 
                changes = new.iter_changes(old, show_unchanged, specific_files,
107
 
                    require_versioned=False, want_unversioned=want_unversioned)
108
 
                reporter = _mod_delta._ChangeReporter(output_file=to_file,
109
 
                    unversioned_filter=new.is_ignored)
110
 
                _mod_delta.report_changes(changes, reporter)
111
 
            else:
112
 
                delta = new.changes_from(old, want_unchanged=show_unchanged,
113
 
                                      specific_files=specific_files,
114
 
                                      want_unversioned=want_unversioned)
115
 
                # filter out unknown files. We may want a tree method for
116
 
                # this
117
 
                delta.unversioned = [unversioned for unversioned in
118
 
                    delta.unversioned if not new.is_ignored(unversioned[0])]
119
 
                delta.show(to_file,
120
 
                           show_ids=show_ids,
121
 
                           show_unchanged=show_unchanged,
122
 
                           short_status=False)
 
156
 
 
157
            # Reporter used for short outputs
 
158
            reporter = _mod_delta._ChangeReporter(output_file=to_file,
 
159
                unversioned_filter=new.is_ignored)
 
160
            report_changes(to_file, old, new, specific_files, 
 
161
                           reporter, show_long_callback, 
 
162
                           short=short, want_unchanged=show_unchanged, 
 
163
                           want_unversioned=want_unversioned, show_ids=show_ids)
 
164
 
 
165
            # show the ignored files among specific files (i.e. show the files
 
166
            # identified from input that we choose to ignore). 
 
167
            if specific_files is not None:
 
168
                # Ignored files is sorted because specific_files is already sorted
 
169
                ignored_files = [specific for specific in
 
170
                    specific_files if new.is_ignored(specific)]
 
171
                if len(ignored_files) > 0 and not short:
 
172
                    to_file.write("ignored:\n")
 
173
                    prefix = ' '
 
174
                else:
 
175
                    prefix = 'I  '
 
176
                for ignored_file in ignored_files:
 
177
                    to_file.write("%s %s\n" % (prefix, ignored_file))
 
178
 
123
179
            # show the new conflicts only for now. XXX: get them from the
124
180
            # delta.
125
181
            conflicts = new.conflicts()