← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Martin Pool
  • Date: 2010-04-21 11:27:04 UTC
  • mto: This revision was merged to the branch mainline in revision 5189.
  • Revision ID: mbp@canonical.com-20100421112704-zijso22b6pdevrxy
Simplify various code to use user_url

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
 
            working_path = working.bzrdir.root_transport.base
508
 
            branch_path = working.branch.bzrdir.root_transport.base
509
 
            if working_path != branch_path:
 
507
            if working.user_url != working.branch.user_url:
510
508
                raise errors.BzrCommandError("You cannot remove the working tree"
511
509
                                             " from a lightweight checkout")
512
510