/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-13 20:33:57 UTC
  • mfrom: (2283 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2294.
  • Revision ID: john@arbash-meinel.com-20070213203357-b7yg41mi9sk6cqd0
[merge] bzr.dev 2283
resolve conflicts in moved repository formats
small issue with osutils.contains_whitespace()

Show diffs side-by-side

added added

removed removed

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