/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/option.py

  • Committer: Robert Collins
  • Date: 2010-06-21 22:29:38 UTC
  • mfrom: (5230.1.5 340394-encoding-option)
  • mto: This revision was merged to the branch mainline in revision 5317.
  • Revision ID: robertc@robertcollins.net-20100621222938-2ca4dybx3c55huhn
Polish and adjust news for Martin's output_encoding branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/option.py
530
530
               short_name='m',
531
531
               help='Message string.')
532
532
_global_option('no-recurse')
 
533
_global_option('null', short_name='0',
 
534
                 help='Use an ASCII NUL (\\0) separator rather than '
 
535
                      'a newline.')
533
536
_global_option('profile',
534
537
               help='Show performance profiling information.')
535
538
_global_option('revision',
570
573
_global_option('dry-run',
571
574
               help="Show what would be done, but don't actually do anything.")
572
575
_global_option('name-from-revision', help='The path name in the old tree.')
 
576
_global_option('directory', short_name='d', type=unicode,
 
577
               help='Branch to operate on, instead of working directory')
573
578
 
574
579
diff_writer_registry = _mod_registry.Registry()
575
580
diff_writer_registry.register('plain', lambda x: x, 'Plaintext diff output.')