~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/option.py

• browse files at revision 5190.1.1
• compare with another revision
• download diff
• download tarball
• view history from revision 5190.1.1

• reverse the comparison (5190.1.1 to 6170)
• stop comparing with revision 6170

Show diffs side-by-side

added

removed

bzrlib/option.py

25

25

from bzrlib import (

26

26

    errors,

27

27

    revisionspec,

28

 

    i18n,

29

28

    )

30

29

""")

31

30

 

277

276

        parser.add_option(action='callback',

278

277

                          callback=self._optparse_callback,

279

278

                          type='string', metavar=self.argname.upper(),

280

 

                          help=self.help, dest=self._param_name, default=[],

 

279

                          help=self.help, default=[],

281

280

                          *option_strings)

282

281

 

283

282

    def _optparse_callback(self, option, opt, value, parser):

313

312

 

314

313

    def __init__(self, name, help, registry=None, converter=None,

315

314

        value_switches=False, title=None, enum_switch=True,

316

 

        lazy_registry=None, short_name=None, short_value_switches=None):

 

315

        lazy_registry=None):

317

316

        """

318

317

        Constructor.

319

318

 

329

328

            which takes a value.

330

329

        :param lazy_registry: A tuple of (module name, attribute name) for a

331

330

            registry to be lazily loaded.

332

 

        :param short_name: The short name for the enum switch, if any

333

 

        :param short_value_switches: A dict mapping values to short names

334

331

        """

335

 

        Option.__init__(self, name, help, type=self.convert,

336

 

                        short_name=short_name)

 

332

        Option.__init__(self, name, help, type=self.convert)

337

333

        self._registry = registry

338

334

        if registry is None:

339

335

            if lazy_registry is None:

348

344

        self.converter = converter

349

345

        self.value_switches = value_switches

350

346

        self.enum_switch = enum_switch

351

 

        self.short_value_switches = short_value_switches

352

347

        self.title = title

353

348

        if self.title is None:

354

349

            self.title = name

392

387

                    help = optparse.SUPPRESS_HELP

393

388

                else:

394

389

                    help = self.registry.get_help(key)

395

 

                if (self.short_value_switches and

396

 

                    key in self.short_value_switches):

397

 

                    option_strings.append('-%s' %

398

 

                                          self.short_value_switches[key])

399

390

                parser.add_option(action='callback',

400

391

                              callback=self._optparse_value_callback(key),

401

392

                                  help=help,

431

422

 

432

423

    DEFAULT_VALUE = object()

433

424

 

434

 

    def __init__(self):

435

 

        optparse.OptionParser.__init__(self)

436

 

        self.formatter = GettextIndentedHelpFormatter()

437

 

 

438

425

    def error(self, message):

439

426

        raise errors.BzrCommandError(message)

440

427

 

441

428

 

442

 

class GettextIndentedHelpFormatter(optparse.IndentedHelpFormatter):

443

 

    """Adds gettext() call to format_option()"""

444

 

    def __init__(self):

445

 

        optparse.IndentedHelpFormatter.__init__(self)

446

 

 

447

 

    def format_option(self, option):

448

 

        """code taken from Python's optparse.py"""

449

 

        if option.help:

450

 

            option.help = i18n.gettext(option.help)

451

 

        return optparse.IndentedHelpFormatter.format_option(self, option)

452

 

 

453

 

 

454

429

def get_optparser(options):

455

430

    """Generate an optparse parser for bzrlib-style options"""

456

431

 

519

494

 

520

495

 

521

496

_merge_type_registry = MergeTypeRegistry()

 

497

_merge_type_registry.register_lazy('merge3', 'bzrlib.merge', 'Merge3Merger',

 

498

                                   "Native diff3-style merge")

522

499

_merge_type_registry.register_lazy('diff3', 'bzrlib.merge', 'Diff3Merger',

523

500

                                   "Merge using external diff3")

 

501

_merge_type_registry.register_lazy('weave', 'bzrlib.merge', 'WeaveMerger',

 

502

                                   "Weave-based merge")

524

503

_merge_type_registry.register_lazy('lca', 'bzrlib.merge', 'LCAMerger',

525

504

                                   "LCA-newness merge")

526

 

_merge_type_registry.register_lazy('merge3', 'bzrlib.merge', 'Merge3Merger',

527

 

                                   "Native diff3-style merge")

528

 

_merge_type_registry.register_lazy('weave', 'bzrlib.merge', 'WeaveMerger',

529

 

                                   "Weave-based merge")

530

505

 

531

506

# Declare the standard options

532

507

_standard_option('help', short_name='h',

542

517

 

543

518

# Declare commonly used options

544

519

_global_option('all')

 

520

_global_option('overwrite', help='Ignore differences between branches and '

 

521

               'overwrite unconditionally.')

545

522

_global_option('basis', type=str)

546

523

_global_option('bound')

547

 

_global_option('change',

548

 

               type=_parse_change_str,

549

 

               short_name='c',

550

 

               param_name='revision',

551

 

               help='Select changes introduced by the specified revision. See also "help revisionspec".')

552

524

_global_option('diff-options', type=str)

553

 

_global_option('directory', short_name='d', type=unicode,

554

 

               help='Branch to operate on, instead of working directory')

555

 

_global_option('dry-run',

556

 

               help="Show what would be done, but don't actually do anything.")

557

 

_global_option('email')

558

525

_global_option('file', type=unicode, short_name='F')

559

526

_global_option('force')

560

527

_global_option('format', type=unicode)

561

528

_global_option('forward')

562

 

_global_option('kind', type=str)

563

 

_global_option('line', help='Use log format with one line per revision.'

564

 

               ' Same as --log-format line')

565

 

_global_registry_option('log-format', "Use specified log format.",

566

 

                        lazy_registry=('bzrlib.log', 'log_formatter_registry'),

567

 

                        value_switches=True, title='Log format',

568

 

                        short_value_switches={'short': 'S'})

569

 

_global_option('long', help='Use detailed log format.'

570

 

               ' Same as --log-format long',

571

 

               short_name='l')

572

 

_global_registry_option('merge-type', 'Select a particular merge algorithm.',

573

 

                        _merge_type_registry, value_switches=True,

574

 

                        title='Merge algorithm')

575

529

_global_option('message', type=unicode,

576

530

               short_name='m',

577

531

               help='Message string.')

578

 

_global_option('name-from-revision', help='The path name in the old tree.')

579

 

_global_option('no-backup')

580

532

_global_option('no-recurse')

581

 

_global_option('null', short_name='0',

582

 

                 help='Use an ASCII NUL (\\0) separator rather than '

583

 

                      'a newline.')

584

 

_global_option('overwrite', help='Ignore differences between branches and '

585

 

               'overwrite unconditionally.')

586

 

_global_option('pattern', type=str)

587

533

_global_option('profile',

588

534

               help='Show performance profiling information.')

589

 

_global_option('reprocess', help='Reprocess to reduce spurious conflicts.')

590

 

_global_option('remember', help='Remember the specified location as a'

591

 

               ' default.')

592

535

_global_option('revision',

593

536

               type=_parse_revision_str,

594

537

               short_name='r',

595

538

               help='See "help revisionspec" for details.')

596

 

_global_option('short', help='Use moderately short log format.'

597

 

               ' Same as --log-format short')

 

539

_global_option('change',

 

540

               type=_parse_change_str,

 

541

               short_name='c',

 

542

               param_name='revision',

 

543

               help='Select changes introduced by the specified revision. See also "help revisionspec".')

598

544

_global_option('show-ids',

599

545

               help='Show internal object ids.')

600

546

_global_option('timezone',

601

547

               type=str,

602

548

               help='Display timezone as local, original, or utc.')

603

 

_global_option('root', type=str)

604

549

_global_option('unbound')

 

550

_global_option('version')

 

551

_global_option('email')

605

552

_global_option('update')

606

 

_global_option('version')

 

553

_global_registry_option('log-format', "Use specified log format.",

 

554

                        lazy_registry=('bzrlib.log', 'log_formatter_registry'),

 

555

                        value_switches=True, title='Log format')

 

556

_global_option('long', help='Use detailed log format. Same as --log-format long',

 

557

               short_name='l')

 

558

_global_option('short', help='Use moderately short log format. Same as --log-format short')

 

559

_global_option('line', help='Use log format with one line per revision. Same as --log-format line')

 

560

_global_option('root', type=str)

 

561

_global_option('no-backup')

 

562

_global_registry_option('merge-type', 'Select a particular merge algorithm.',

 

563

                        _merge_type_registry, value_switches=True,

 

564

                        title='Merge algorithm')

 

565

_global_option('pattern', type=str)

 

566

_global_option('remember', help='Remember the specified location as a'

 

567

               ' default.')

 

568

_global_option('reprocess', help='Reprocess to reduce spurious conflicts.')

 

569

_global_option('kind', type=str)

 

570

_global_option('dry-run',

 

571

               help="Show what would be done, but don't actually do anything.")

 

572

_global_option('name-from-revision', help='The path name in the old tree.')

607

573

 

608

574

diff_writer_registry = _mod_registry.Registry()

609

575

diff_writer_registry.register('plain', lambda x: x, 'Plaintext diff output.')

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1