~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 08:22:24 UTC
  • mto: This revision was merged to the branch mainline in revision 6009.
  • Revision ID: martin.vgagern@gmx.net-20110601082224-jurvwsbmy9jarued
Make kind markers optional.

Show diffs side-by-side

added added

removed removed

Lines of Context:
231
231
    unknown
232
232
        Not versioned and not matching an ignore pattern.
233
233
 
234
 
    Additionally for directories, symlinks and files with an executable
235
 
    bit, Bazaar indicates their type using a trailing character: '/', '@'
236
 
    or '*' respectively.
 
234
    Additionally for directories, symlinks and files with a changed
 
235
    executable bit, Bazaar indicates their type using a trailing
 
236
    character: '/', '@' or '*' respectively. These decorations can be
 
237
    disabled using the '--no-decorate' option.
237
238
 
238
239
    To see ignored files use 'bzr ignored'.  For details on the
239
240
    changes to file texts, use 'bzr diff'.
270
271
                            short_name='V'),
271
272
                     Option('no-pending', help='Don\'t show pending merges.',
272
273
                           ),
 
274
                     Option('no-decorate',
 
275
                            help='Do not mark object type.',
 
276
                           ),
273
277
                     ]
274
278
    aliases = ['st', 'stat']
275
279
 
278
282
 
279
283
    @display_command
280
284
    def run(self, show_ids=False, file_list=None, revision=None, short=False,
281
 
            versioned=False, no_pending=False, verbose=False):
 
285
            versioned=False, no_pending=False, verbose=False,
 
286
            no_decorate=False):
282
287
        from bzrlib.status import show_tree_status
283
288
 
284
289
        if revision and len(revision) > 2:
298
303
        show_tree_status(tree, show_ids=show_ids,
299
304
                         specific_files=relfile_list, revision=revision,
300
305
                         to_file=self.outf, short=short, versioned=versioned,
301
 
                         show_pending=(not no_pending), verbose=verbose)
 
306
                         show_pending=(not no_pending), verbose=verbose,
 
307
                         no_decorate=no_decorate)
302
308
 
303
309
 
304
310
class cmd_cat_revision(Command):