← 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: 2011-08-04 13:30:30 UTC
  • mfrom: (6050 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6052.
  • Revision ID: jelmer@samba.org-20110804133030-uwo00unp8b0n782c
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
34
34
def report_changes(to_file, old, new, specific_files, 
35
35
                   show_short_reporter, show_long_callback, 
36
36
                   short=False, want_unchanged=False, 
37
 
                   want_unversioned=False, show_ids=False):
 
37
                   want_unversioned=False, show_ids=False, classify=True):
38
38
    """Display summary of changes.
39
39
 
40
40
    This compares two trees with regards to a list of files, and delegates 
59
59
        files.
60
60
    :param show_ids: If set, includes each file's id.
61
61
    :param want_unversioned: If False, only shows versioned files.
 
62
    :param classify: Add special symbols to indicate file kind.
62
63
    """
63
64
 
64
65
    if short:
76
77
            delta.unversioned if not new.is_ignored(unversioned[0])]
77
78
        show_long_callback(to_file, delta, 
78
79
                           show_ids=show_ids,
79
 
                           show_unchanged=want_unchanged)
 
80
                           show_unchanged=want_unchanged,
 
81
                           classify=classify)
80
82
 
81
83
 
82
84
def show_tree_status(wt, show_unchanged=None,
88
90
                     short=False,
89
91
                     verbose=False,
90
92
                     versioned=False,
 
93
                     classify=True,
91
94
                     show_long_callback=_mod_delta.report_delta):
92
95
    """Display summary of changes.
93
96
 
117
120
    :param verbose: If True, show all merged revisions, not just
118
121
        the merge tips
119
122
    :param versioned: If True, only shows versioned files.
 
123
    :param classify: Add special symbols to indicate file kind.
120
124
    :param show_long_callback: A callback: message = show_long_callback(to_file, delta, 
121
125
        show_ids, show_unchanged, indent, filter), only used with the long output
122
126
    """
161
165
 
162
166
            # Reporter used for short outputs
163
167
            reporter = _mod_delta._ChangeReporter(output_file=to_file,
164
 
                unversioned_filter=new.is_ignored)
 
168
                unversioned_filter=new.is_ignored, classify=classify)
165
169
            report_changes(to_file, old, new, specific_files, 
166
170
                           reporter, show_long_callback, 
167
171
                           short=short, want_unchanged=show_unchanged, 
168
 
                           want_unversioned=want_unversioned, show_ids=show_ids)
 
172
                           want_unversioned=want_unversioned, show_ids=show_ids,
 
173
                           classify=classify)
169
174
 
170
175
            # show the ignored files among specific files (i.e. show the files
171
176
            # identified from input that we choose to ignore). 
194
199
                    prefix = 'C  '
195
200
                else:
196
201
                    prefix = ' '
197
 
                to_file.write("%s %s\n" % (prefix, conflict))
 
202
                to_file.write("%s %s\n" % (prefix, unicode(conflict)))
198
203
            # Show files that were requested but don't exist (and are
199
204
            # not versioned).  We don't involve delta in this; these
200
205
            # paths are really the province of just the status