← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.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/builtins.py
234
234
    Additionally for directories, symlinks and files with a changed
235
235
    executable bit, Bazaar indicates their type using a trailing
236
236
    character: '/', '@' or '*' respectively. These decorations can be
237
 
    disabled using the '--no-decorate' option.
 
237
    disabled using the '--no-classify' option.
238
238
 
239
239
    To see ignored files use 'bzr ignored'.  For details on the
240
240
    changes to file texts, use 'bzr diff'.
271
271
                            short_name='V'),
272
272
                     Option('no-pending', help='Don\'t show pending merges.',
273
273
                           ),
274
 
                     Option('no-decorate',
275
 
                            help='Do not mark object type.',
 
274
                     Option('no-classify',
 
275
                            help='Do not mark object type using indicator.',
276
276
                           ),
277
277
                     ]
278
278
    aliases = ['st', 'stat']
283
283
    @display_command
284
284
    def run(self, show_ids=False, file_list=None, revision=None, short=False,
285
285
            versioned=False, no_pending=False, verbose=False,
286
 
            no_decorate=False):
 
286
            no_classify=False):
287
287
        from bzrlib.status import show_tree_status
288
288
 
289
289
        if revision and len(revision) > 2:
304
304
                         specific_files=relfile_list, revision=revision,
305
305
                         to_file=self.outf, short=short, versioned=versioned,
306
306
                         show_pending=(not no_pending), verbose=verbose,
307
 
                         no_decorate=no_decorate)
 
307
                         classify=not no_classify)
308
308
 
309
309
 
310
310
class cmd_cat_revision(Command):