/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-06 23:41:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506234135-yivbzczw1sejxnxc
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
expected to return an object which can be used to unlock them. This reduces
duplicate code when using cleanups. The previous 'tokens's returned by
``Branch.lock_write`` and ``Repository.lock_write`` are now attributes
on the result of the lock_write. ``repository.RepositoryWriteLockResult``
and ``branch.BranchWriteLockResult`` document this. (Robert Collins)

``log._get_info_for_log_files`` now takes an add_cleanup callable.
(Robert Collins)

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.')
512
509
_standard_option('usage',
513
510
                 help='Show usage message and options.')
514
511
_standard_option('verbose', short_name='v',
573
570
_global_option('dry-run',
574
571
               help="Show what would be done, but don't actually do anything.")
575
572
_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')
578
573
 
579
574
diff_writer_registry = _mod_registry.Registry()
580
575
diff_writer_registry.register('plain', lambda x: x, 'Plaintext diff output.')