/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

Only chown() the .bzr.log when creating it, fixing NEWS entry to put it under 2.2b3

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
504
504
                if (working.has_changes()):
505
505
                    raise errors.UncommittedChanges(working)
506
506
 
507
 
            if working.user_url != working.branch.user_url:
 
507
            working_path = working.bzrdir.root_transport.base
 
508
            branch_path = working.branch.bzrdir.root_transport.base
 
509
            if working_path != branch_path:
508
510
                raise errors.BzrCommandError("You cannot remove the working tree"
509
511
                                             " from a lightweight checkout")
510
512
 
1132
1134
        else:
1133
1135
            revision_id = None
1134
1136
        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.')
 
1137
            tree.warn_if_changed_or_out_of_date(
 
1138
                strict, 'push_strict', 'Use --no-strict to force the push.')
1139
1139
        # Get the stacked_on branch, if any
1140
1140
        if stacked_on is not None:
1141
1141
            stacked_on = urlutils.normalize_url(stacked_on)
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
 
                   )
2306
2302
            ]
2307
2303
    encoding_type = 'replace'
2308
2304
 
2318
2314
            message=None,
2319
2315
            limit=None,
2320
2316
            show_diff=False,
2321
 
            include_merges=False,
2322
 
            exclude_common_ancestry=False,
2323
 
            ):
 
2317
            include_merges=False):
2324
2318
        from bzrlib.log import (
2325
2319
            Logger,
2326
2320
            make_log_request_dict,
2327
2321
            _get_info_for_log_files,
2328
2322
            )
2329
2323
        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
2324
        if include_merges:
2335
2325
            if levels is None:
2336
2326
                levels = 0
2429
2419
            direction=direction, specific_fileids=file_ids,
2430
2420
            start_revision=rev1, end_revision=rev2, limit=limit,
2431
2421
            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
 
            )
 
2422
            diff_type=diff_type, _match_using_deltas=match_using_deltas)
2435
2423
        Logger(b, rqst).show(lf)
2436
2424
 
2437
2425
 
3073
3061
                         "the master branch until a normal commit "
3074
3062
                         "is performed."
3075
3063
                    ),
3076
 
             Option('show-diff', short_name='p',
 
3064
             Option('show-diff',
3077
3065
                    help='When no message is supplied, show the diff along'
3078
3066
                    ' with the status summary in the message editor.'),
3079
3067
             ]
4681
4669
 
4682
4670
class cmd_bind(Command):
4683
4671
    __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
4672
 
4686
4673
    Once converted into a checkout, commits must succeed on the master branch
4687
4674
    before they will be applied to the local branch.