/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: Aaron Bentley
  • Date: 2009-03-08 23:40:12 UTC
  • mfrom: (4037.2.5 bzr.repo)
  • mto: This revision was merged to the branch mainline in revision 4092.
  • Revision ID: aaron@aaronbentley.com-20090308234012-vlyphxxye80fb8t0
Merge fast-fail from Aguilar.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
3367
3367
        allow_pending = True
3368
3368
        verified = 'inapplicable'
3369
3369
        tree = WorkingTree.open_containing(directory)[0]
 
3370
 
 
3371
        # die as quickly as possible if there are uncommitted changes
 
3372
        try:
 
3373
            basis_tree = tree.revision_tree(tree.last_revision())
 
3374
        except errors.NoSuchRevision:
 
3375
            basis_tree = tree.basis_tree()
 
3376
        changes = tree.changes_from(basis_tree)
 
3377
        if changes.has_changed():
 
3378
            raise errors.UncommittedChanges(tree)
 
3379
 
3370
3380
        view_info = _get_view_info_for_change_reporter(tree)
3371
3381
        change_reporter = delta._ChangeReporter(
3372
3382
            unversioned_filter=tree.is_ignored, view_info=view_info)
3425
3435
                                       merger.other_rev_id)
3426
3436
                    result.report(self.outf)
3427
3437
                    return 0
3428
 
            merger.check_basis(not force)
 
3438
            merger.check_basis(False)
3429
3439
            if preview:
3430
3440
                return self._do_preview(merger)
3431
3441
            else: