← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Martin Pool
  • Date: 2005-03-13 05:22:51 UTC
  • Revision ID: mbp@sourcefrog.net-20050313052251-2bf004cb96b39933
When removing files, new status should be I or ?, not D

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
300
300
        if isinstance(files, types.StringTypes):
301
301
            files = [files]
302
302
        
303
 
        inv = self.read_working_inventory()
 
303
        tree = self.working_tree()
 
304
        inv = tree.inventory
304
305
 
305
306
        # do this before any modifications
306
307
        for f in files:
309
310
                bailout("cannot remove unversioned file %s" % quotefn(f))
310
311
            mutter("remove inventory entry %s {%s}" % (quotefn(f), fid))
311
312
            if verbose:
312
 
                show_status('D', inv[fid].kind, quotefn(f))
 
313
                # having remove it, it must be either ignored or unknown
 
314
                if tree.is_ignored(f):
 
315
                    new_status = 'I'
 
316
                else:
 
317
                    new_status = '?'
 
318
                show_status(new_status, inv[fid].kind, quotefn(f))
313
319
            del inv[fid]
314
320
 
315
321
        self._write_inventory(inv)