← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Wouter van Heyst
  • Date: 2007-02-04 12:49:55 UTC
  • mfrom: (2245.5.1 bzr.rm_error_to_note)
  • mto: This revision was merged to the branch mainline in revision 2262.
  • Revision ID: larstiq@larstiq.dyndns.org-20070204124955-w2l163jtnw28i46n
Merge `bzr rm unversioned` fix. (Marius Kruger)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1637
1637
        for f in files:
1638
1638
            fid = inv.path2id(f)
1639
1639
            if not fid:
1640
 
                # TODO: Perhaps make this just a warning, and continue?
1641
 
                # This tends to happen when 
1642
 
                raise errors.NotVersionedError(path=f)
1643
 
            if verbose:
1644
 
                # having remove it, it must be either ignored or unknown
1645
 
                if self.is_ignored(f):
1646
 
                    new_status = 'I'
1647
 
                else:
1648
 
                    new_status = '?'
1649
 
                textui.show_status(new_status, inv[fid].kind, f,
1650
 
                                   to_file=to_file)
1651
 
            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]
1652
1651
 
1653
1652
        self._write_inventory(inv)
1654
1653