← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: John Arbash Meinel
  • Date: 2011-01-12 01:01:53 UTC
  • mfrom: (5597 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5599.
  • Revision ID: john@arbash-meinel.com-20110112010153-op19823r9e6hy7u6
Merge bzr.dev 5597 to resolve NEWS, aka bzr-2.3.txt

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
 
                self._inventory.remove_recursive_id(file_id)
 
1250
                if self._inventory.has_id(file_id):
 
1251
                    self._inventory.remove_recursive_id(file_id)
1251
1252
 
1252
1253
    @needs_tree_write_lock
1253
1254
    def rename_one(self, from_rel, to_rel, after=False):
1737
1738
                elif kind == 'directory':
1738
1739
                    parent_ies[(dirname + '/' + name).strip('/')] = inv_entry
1739
1740
                elif kind == 'symlink':
1740
 
                    inv_entry.executable = False
1741
 
                    inv_entry.text_size = None
1742
1741
                    inv_entry.symlink_target = utf8_decode(fingerprint)[0]
1743
1742
                elif kind == 'tree-reference':
1744
1743
                    inv_entry.reference_revision = fingerprint or None
1868
1867
    def is_executable(self, file_id, path=None):
1869
1868
        ie = self.inventory[file_id]
1870
1869
        if ie.kind != "file":
1871
 
            return None
 
1870
            return False
1872
1871
        return ie.executable
1873
1872
 
1874
1873
    def is_locked(self):