/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/workingtree.py

  • Committer: Aaron Bentley
  • Date: 2007-02-09 07:16:20 UTC
  • mfrom: (2272 +trunk)
  • mto: (2255.6.1 dirstate)
  • mto: This revision was merged to the branch mainline in revision 2322.
  • Revision ID: aaron.bentley@utoronto.ca-20070209071620-gp2n7vtjyb0f2x1e
Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1436
1436
        try:
1437
1437
            pp = ProgressPhase("Pull phase", 2, top_pb)
1438
1438
            pp.next_phase()
1439
 
            old_revision_history = self.branch.revision_history()
 
1439
            old_revision_info = self.branch.last_revision_info()
1440
1440
            basis_tree = self.basis_tree()
1441
1441
            count = self.branch.pull(source, overwrite, stop_revision)
1442
 
            new_revision_history = self.branch.revision_history()
1443
 
            if new_revision_history != old_revision_history:
 
1442
            new_revision_info = self.branch.last_revision_info()
 
1443
            if new_revision_info != old_revision_info:
1444
1444
                pp.next_phase()
1445
 
                if len(old_revision_history):
1446
 
                    other_revision = old_revision_history[-1]
1447
 
                else:
1448
 
                    other_revision = None
1449
1445
                repository = self.branch.repository
1450
1446
                pb = bzrlib.ui.ui_factory.nested_progress_bar()
1451
1447
                try:
1755
1751
        for f in files:
1756
1752
            fid = inv.path2id(f)
1757
1753
            if not fid:
1758
 
                # TODO: Perhaps make this just a warning, and continue?
1759
 
                # This tends to happen when 
1760
 
                raise errors.NotVersionedError(path=f)
1761
 
            if verbose:
1762
 
                # having remove it, it must be either ignored or unknown
1763
 
                if self.is_ignored(f):
1764
 
                    new_status = 'I'
1765
 
                else:
1766
 
                    new_status = '?'
1767
 
                textui.show_status(new_status, inv[fid].kind, f,
1768
 
                                   to_file=to_file)
1769
 
            del inv[fid]
 
1754
                note("%s is not versioned."%f)
 
1755
            else:
 
1756
                if verbose:
 
1757
                    # having remove it, it must be either ignored or unknown
 
1758
                    if self.is_ignored(f):
 
1759
                        new_status = 'I'
 
1760
                    else:
 
1761
                        new_status = '?'
 
1762
                    textui.show_status(new_status, inv[fid].kind, f,
 
1763
                                       to_file=to_file)
 
1764
                del inv[fid]
1770
1765
 
1771
1766
        self._write_inventory(inv)
1772
1767
 
1773
1768
    @needs_tree_write_lock
1774
1769
    def revert(self, filenames, old_tree=None, backups=True, 
1775
 
               pb=DummyProgress()):
 
1770
               pb=DummyProgress(), report_changes=False):
1776
1771
        from bzrlib.conflicts import resolve
1777
1772
        if old_tree is None:
1778
1773
            old_tree = self.basis_tree()
1779
 
        conflicts = transform.revert(self, old_tree, filenames, backups, pb)
 
1774
        conflicts = transform.revert(self, old_tree, filenames, backups, pb,
 
1775
                                     report_changes)
1780
1776
        if not len(filenames):
1781
1777
            self.set_parent_ids(self.get_parent_ids()[:1])
1782
1778
            resolve(self)