/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/builtins.py

  • Committer: Marius Kruger
  • Date: 2009-01-01 22:08:22 UTC
  • mto: (3969.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 3970.
  • Revision ID: amanic@gmail.com-20090101220822-iopb8ag69ie4auno
* fix some indentation anomalies in cmd_missing
* note that the `missing` revision filters are inclusive
* some minor white space cleanups
* add some param docstrings for missing.find_unmerged

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
3458
3458
    _see_also = ['merge', 'pull']
3459
3459
    takes_args = ['other_branch?']
3460
3460
    takes_options = [
3461
 
            Option('reverse', 'Reverse the order of revisions.'),
3462
 
            Option('mine-only',
3463
 
                   'Display changes in the local branch only.'),
3464
 
            Option('this' , 'Same as --mine-only.'),
3465
 
            Option('theirs-only',
3466
 
                   'Display changes in the remote branch only.'),
3467
 
            Option('other', 'Same as --theirs-only.'),
3468
 
            'log-format',
3469
 
            'show-ids',
3470
 
            'verbose',
3471
 
             custom_help('revision',
3472
 
                 help='Filter on local branch revisions. '
3473
 
                    'See "help revisionspec" for details.'),
3474
 
             Option('other-revision',
3475
 
               type=_parse_revision_str,
3476
 
               short_name='o',
3477
 
               help='Filter on other branch revisions. '
3478
 
                'See "help revisionspec" for details.'),
3479
 
            Option('include-merges', 'Show merged revisions.'),
3480
 
            ]
 
3461
        Option('reverse', 'Reverse the order of revisions.'),
 
3462
        Option('mine-only',
 
3463
               'Display changes in the local branch only.'),
 
3464
        Option('this' , 'Same as --mine-only.'),
 
3465
        Option('theirs-only',
 
3466
               'Display changes in the remote branch only.'),
 
3467
        Option('other', 'Same as --theirs-only.'),
 
3468
        'log-format',
 
3469
        'show-ids',
 
3470
        'verbose',
 
3471
        custom_help('revision',
 
3472
             help='Filter on local branch revisions (inclusive). '
 
3473
                'See "help revisionspec" for details.'),
 
3474
        Option('other-revision',
 
3475
            type=_parse_revision_str,
 
3476
            short_name='o',
 
3477
            help='Filter on other branch revisions (inclusive). '
 
3478
                'See "help revisionspec" for details.'),
 
3479
        Option('include-merges', 'Show merged revisions.'),
 
3480
        ]
3481
3481
    encoding_type = 'replace'
3482
3482
 
3483
3483
    @display_command
3537
3537
                    backward=not reverse,
3538
3538
                    include_merges=include_merges,
3539
3539
                    local_revid_range=local_revid_range,
3540
 
                    remote_revid_range= remote_revid_range)
 
3540
                    remote_revid_range=remote_revid_range)
3541
3541
 
3542
3542
                if log_format is None:
3543
3543
                    registry = log.log_formatter_registry