/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

Merge the bulg of the fix for 320119 and fix NEWS entrieS

Show diffs side-by-side

added added

removed removed

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