← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

  • Committer: Martin von Gagern
  • Date: 2011-06-01 12:53:56 UTC
  • mto: This revision was merged to the branch mainline in revision 6009.
  • Revision ID: martin.vgagern@gmx.net-20110601125356-lwozv2vecea6hxfz
Change from no_decorate to classify as name for the argument.

The command line switch remains as --no-classify, to keep backwards
compatibility.  Users are free to include --no-classify in an alias, and
still use --classify to change back.

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, no_decorate=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 no_decorate: Do not add special symbols for symlinks or
63
 
        modified metadata.
 
62
    :param classify: Add special symbols to indicate file kind.
64
63
    """
65
64
 
66
65
    if short:
79
78
        show_long_callback(to_file, delta, 
80
79
                           show_ids=show_ids,
81
80
                           show_unchanged=want_unchanged,
82
 
                           no_decorate=no_decorate)
 
81
                           classify=classify)
83
82
 
84
83
 
85
84
def show_tree_status(wt, show_unchanged=None,
91
90
                     short=False,
92
91
                     verbose=False,
93
92
                     versioned=False,
94
 
                     no_decorate=False,
 
93
                     classify=True,
95
94
                     show_long_callback=_mod_delta.report_delta):
96
95
    """Display summary of changes.
97
96
 
121
120
    :param verbose: If True, show all merged revisions, not just
122
121
        the merge tips
123
122
    :param versioned: If True, only shows versioned files.
124
 
    :param no_decorate: Do not add special symbols for symlinks or
125
 
        modified metadata.
 
123
    :param classify: Add special symbols to indicate file kind.
126
124
    :param show_long_callback: A callback: message = show_long_callback(to_file, delta, 
127
125
        show_ids, show_unchanged, indent, filter), only used with the long output
128
126
    """
166
164
            want_unversioned = not versioned
167
165
 
168
166
            # Reporter used for short outputs
169
 
            kind_marker = None
170
 
            if no_decorate:
171
 
                kind_marker = False
172
167
            reporter = _mod_delta._ChangeReporter(output_file=to_file,
173
 
                unversioned_filter=new.is_ignored, kind_marker=kind_marker)
 
168
                unversioned_filter=new.is_ignored, classify=classify)
174
169
            report_changes(to_file, old, new, specific_files, 
175
170
                           reporter, show_long_callback, 
176
171
                           short=short, want_unchanged=show_unchanged, 
177
172
                           want_unversioned=want_unversioned, show_ids=show_ids,
178
 
                           no_decorate=no_decorate)
 
173
                           classify=classify)
179
174
 
180
175
            # show the ignored files among specific files (i.e. show the files
181
176
            # identified from input that we choose to ignore).