/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: Martin Pool
  • Date: 2010-04-28 07:03:38 UTC
  • mfrom: (5188 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5189.
  • Revision ID: mbp@sourcefrog.net-20100428070338-2af8y3takgfkrkyp
merge news

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1132
1132
        else:
1133
1133
            revision_id = None
1134
1134
        if tree is not None and revision_id is None:
1135
 
            tree.check_changed_or_out_of_date(
1136
 
                strict, 'push_strict',
1137
 
                more_error='Use --no-strict to force the push.',
1138
 
                more_warning='Uncommitted changes will not be pushed.')
 
1135
            tree.warn_if_changed_or_out_of_date(
 
1136
                strict, 'push_strict', 'Use --no-strict to force the push.')
1139
1137
        # Get the stacked_on branch, if any
1140
1138
        if stacked_on is not None:
1141
1139
            stacked_on = urlutils.normalize_url(stacked_on)
2299
2297
                   help='Show changes made in each revision as a patch.'),
2300
2298
            Option('include-merges',
2301
2299
                   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
 
                   )
2306
2300
            ]
2307
2301
    encoding_type = 'replace'
2308
2302
 
2318
2312
            message=None,
2319
2313
            limit=None,
2320
2314
            show_diff=False,
2321
 
            include_merges=False,
2322
 
            exclude_common_ancestry=False,
2323
 
            ):
 
2315
            include_merges=False):
2324
2316
        from bzrlib.log import (
2325
2317
            Logger,
2326
2318
            make_log_request_dict,
2327
2319
            _get_info_for_log_files,
2328
2320
            )
2329
2321
        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')
2334
2322
        if include_merges:
2335
2323
            if levels is None:
2336
2324
                levels = 0
2429
2417
            direction=direction, specific_fileids=file_ids,
2430
2418
            start_revision=rev1, end_revision=rev2, limit=limit,
2431
2419
            message_search=message, delta_type=delta_type,
2432
 
            diff_type=diff_type, _match_using_deltas=match_using_deltas,
2433
 
            exclude_common_ancestry=exclude_common_ancestry,
2434
 
            )
 
2420
            diff_type=diff_type, _match_using_deltas=match_using_deltas)
2435
2421
        Logger(b, rqst).show(lf)
2436
2422
 
2437
2423
 
3073
3059
                         "the master branch until a normal commit "
3074
3060
                         "is performed."
3075
3061
                    ),
3076
 
             Option('show-diff', short_name='p',
 
3062
             Option('show-diff',
3077
3063
                    help='When no message is supplied, show the diff along'
3078
3064
                    ' with the status summary in the message editor.'),
3079
3065
             ]
4681
4667
 
4682
4668
class cmd_bind(Command):
4683
4669
    __doc__ = """Convert the current branch into a checkout of the supplied branch.
4684
 
    If no branch is supplied, rebind to the last bound location.
4685
4670
 
4686
4671
    Once converted into a checkout, commits must succeed on the master branch
4687
4672
    before they will be applied to the local branch.