/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-05-20 02:57:52 UTC
  • mfrom: (4797.43.11 2.1)
  • mto: This revision was merged to the branch mainline in revision 5243.
  • Revision ID: robertc@robertcollins.net-20100520025752-dbfi4kx7y4ivtiff
Merge up from 2.0/2.1:

* Support Pyrex 0.9.9, required changing how we handle exceptions in Pyrex.
  (John Arbash Meinel, #582656)

* ``bzr clean-tree`` should not delete nested bzrdirs. Required for proper
  support of bzr-externals and scmproj plugins.
  (Alexander Belchenko, bug #572098)

* Reduce peak memory by one copy of compressed text.
  (John Arbash Meinel, #566940)

* Support Pyrex 0.9.9, required changing how we handle exceptions in Pyrex.
  (John Arbash Meinel, #582656)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/option.py
506
506
# Declare the standard options
507
507
_standard_option('help', short_name='h',
508
508
                 help='Show help message.')
 
509
_standard_option('null', short_name='0',
 
510
                 help='Use an ASCII NUL (\\0) separator rather than '
 
511
                      'a newline.')
509
512
_standard_option('usage',
510
513
                 help='Show usage message and options.')
511
514
_standard_option('verbose', short_name='v',
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.')