← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-04-28 09:40:23 UTC
  • mfrom: (5155.1.5 320119-exclude-ancestry)
  • Revision ID: pqm@pqm.ubuntu.com-20100428094023-7504mlou1qk28r9n
(vila) Add --exclude-common-ancestry log option (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2297
2297
                   help='Show changes made in each revision as a patch.'),
2298
2298
            Option('include-merges',
2299
2299
                   help='Show merged revisions like --levels 0 does.'),
 
2300
            Option('exclude-common-ancestry',
 
2301
                   help='Display only the revisions that are not part'
 
2302
                   ' of both ancestries (require -rX..Y)'
 
2303
                   )
2300
2304
            ]
2301
2305
    encoding_type = 'replace'
2302
2306
 
2312
2316
            message=None,
2313
2317
            limit=None,
2314
2318
            show_diff=False,
2315
 
            include_merges=False):
 
2319
            include_merges=False,
 
2320
            exclude_common_ancestry=False,
 
2321
            ):
2316
2322
        from bzrlib.log import (
2317
2323
            Logger,
2318
2324
            make_log_request_dict,
2319
2325
            _get_info_for_log_files,
2320
2326
            )
2321
2327
        direction = (forward and 'forward') or 'reverse'
 
2328
        if (exclude_common_ancestry
 
2329
            and (revision is None or len(revision) != 2)):
 
2330
            raise errors.BzrCommandError(
 
2331
                '--exclude-common-ancestry requires -r with two revisions')
2322
2332
        if include_merges:
2323
2333
            if levels is None:
2324
2334
                levels = 0
2417
2427
            direction=direction, specific_fileids=file_ids,
2418
2428
            start_revision=rev1, end_revision=rev2, limit=limit,
2419
2429
            message_search=message, delta_type=delta_type,
2420
 
            diff_type=diff_type, _match_using_deltas=match_using_deltas)
 
2430
            diff_type=diff_type, _match_using_deltas=match_using_deltas,
 
2431
            exclude_common_ancestry=exclude_common_ancestry,
 
2432
            )
2421
2433
        Logger(b, rqst).show(lf)
2422
2434
 
2423
2435