← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-05-21 13:36:51 UTC
  • mfrom: (5243.2.1 readdir_cleanup)
  • Revision ID: pqm@pqm.ubuntu.com-20100521133651-p62dndo2giy5ls21
(lifeless) Some cleanups to the readdir pyrex code for a little efficiency
 and to avoid compile warnings. (John A Meinel)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
1247
1247
        # have to change the legacy inventory too.
1248
1248
        if self._inventory is not None:
1249
1249
            for file_id in file_ids:
1250
 
                if self._inventory.has_id(file_id):
1251
 
                    self._inventory.remove_recursive_id(file_id)
 
1250
                self._inventory.remove_recursive_id(file_id)
1252
1251
 
1253
1252
    @needs_tree_write_lock
1254
1253
    def rename_one(self, from_rel, to_rel, after=False):
1738
1737
                elif kind == 'directory':
1739
1738
                    parent_ies[(dirname + '/' + name).strip('/')] = inv_entry
1740
1739
                elif kind == 'symlink':
 
1740
                    inv_entry.executable = False
 
1741
                    inv_entry.text_size = None
1741
1742
                    inv_entry.symlink_target = utf8_decode(fingerprint)[0]
1742
1743
                elif kind == 'tree-reference':
1743
1744
                    inv_entry.reference_revision = fingerprint or None