/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: Vincent Ladeuil
  • Date: 2010-04-28 07:10:36 UTC
  • mto: This revision was merged to the branch mainline in revision 5190.
  • Revision ID: v.ladeuil+lp@free.fr-20100428071036-rxmh2nfnh7h504d6
https://launchpad.net/bugs/320119
Fixed as per Andrew's review.

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)
3073
3073
                         "the master branch until a normal commit "
3074
3074
                         "is performed."
3075
3075
                    ),
3076
 
             Option('show-diff', short_name='p',
 
3076
             Option('show-diff',
3077
3077
                    help='When no message is supplied, show the diff along'
3078
3078
                    ' with the status summary in the message editor.'),
3079
3079
             ]
4681
4681
 
4682
4682
class cmd_bind(Command):
4683
4683
    __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
4684
 
4686
4685
    Once converted into a checkout, commits must succeed on the master branch
4687
4686
    before they will be applied to the local branch.