/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: John Arbash Meinel
  • Date: 2007-02-08 21:57:04 UTC
  • mfrom: (2273 +trunk) (2276 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2277.
  • Revision ID: john@arbash-meinel.com-20070208215704-87s4qnsjfqi4x83w
[merge] bzr.dev 2276

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1321
1321
        try:
1322
1322
            pp = ProgressPhase("Pull phase", 2, top_pb)
1323
1323
            pp.next_phase()
1324
 
            old_revision_history = self.branch.revision_history()
 
1324
            old_revision_info = self.branch.last_revision_info()
1325
1325
            basis_tree = self.basis_tree()
1326
1326
            count = self.branch.pull(source, overwrite, stop_revision)
1327
 
            new_revision_history = self.branch.revision_history()
1328
 
            if new_revision_history != old_revision_history:
 
1327
            new_revision_info = self.branch.last_revision_info()
 
1328
            if new_revision_info != old_revision_info:
1329
1329
                pp.next_phase()
1330
 
                if len(old_revision_history):
1331
 
                    other_revision = old_revision_history[-1]
1332
 
                else:
1333
 
                    other_revision = None
1334
1330
                repository = self.branch.repository
1335
1331
                pb = bzrlib.ui.ui_factory.nested_progress_bar()
1336
1332
                try:
1641
1637
        for f in files:
1642
1638
            fid = inv.path2id(f)
1643
1639
            if not fid:
1644
 
                # TODO: Perhaps make this just a warning, and continue?
1645
 
                # This tends to happen when 
1646
 
                raise errors.NotVersionedError(path=f)
1647
 
            if verbose:
1648
 
                # having remove it, it must be either ignored or unknown
1649
 
                if self.is_ignored(f):
1650
 
                    new_status = 'I'
1651
 
                else:
1652
 
                    new_status = '?'
1653
 
                textui.show_status(new_status, inv[fid].kind, f,
1654
 
                                   to_file=to_file)
1655
 
            del inv[fid]
 
1640
                note("%s is not versioned."%f)
 
1641
            else:
 
1642
                if verbose:
 
1643
                    # having remove it, it must be either ignored or unknown
 
1644
                    if self.is_ignored(f):
 
1645
                        new_status = 'I'
 
1646
                    else:
 
1647
                        new_status = '?'
 
1648
                    textui.show_status(new_status, inv[fid].kind, f,
 
1649
                                       to_file=to_file)
 
1650
                del inv[fid]
1656
1651
 
1657
1652
        self._write_inventory(inv)
1658
1653
 
1659
1654
    @needs_tree_write_lock
1660
1655
    def revert(self, filenames, old_tree=None, backups=True, 
1661
 
               pb=DummyProgress()):
 
1656
               pb=DummyProgress(), report_changes=False):
1662
1657
        from bzrlib.conflicts import resolve
1663
1658
        if old_tree is None:
1664
1659
            old_tree = self.basis_tree()
1665
 
        conflicts = transform.revert(self, old_tree, filenames, backups, pb)
 
1660
        conflicts = transform.revert(self, old_tree, filenames, backups, pb,
 
1661
                                     report_changes)
1666
1662
        if not len(filenames):
1667
1663
            self.set_parent_ids(self.get_parent_ids()[:1])
1668
1664
            resolve(self)