← 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: 2010-02-17 17:11:16 UTC
  • mfrom: (4797.2.17 2.1)
  • mto: (4797.2.18 2.1)
  • mto: This revision was merged to the branch mainline in revision 5055.
  • Revision ID: john@arbash-meinel.com-20100217171116-h7t9223ystbnx5h8
merge bzr.2.1 in preparation for NEWS entry.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
53
53
from bzrlib.decorators import needs_read_lock, needs_write_lock
54
54
from bzrlib.filters import filtered_input_file, internal_size_sha_file_byname
55
55
from bzrlib.inventory import Inventory, ROOT_ID, entry_factory
56
 
from bzrlib.lock import LogicalLockResult
 
56
import bzrlib.mutabletree
57
57
from bzrlib.mutabletree import needs_tree_write_lock
58
58
from bzrlib.osutils import (
59
59
    file_kind,
568
568
            return _mod_revision.NULL_REVISION
569
569
 
570
570
    def lock_read(self):
571
 
        """See Branch.lock_read, and WorkingTree.unlock.
572
 
 
573
 
        :return: A bzrlib.lock.LogicalLockResult.
574
 
        """
 
571
        """See Branch.lock_read, and WorkingTree.unlock."""
575
572
        self.branch.lock_read()
576
573
        try:
577
574
            self._control_files.lock_read()
590
587
        except:
591
588
            self.branch.unlock()
592
589
            raise
593
 
        return LogicalLockResult(self.unlock)
594
590
 
595
591
    def _lock_self_write(self):
596
592
        """This should be called after the branch is locked."""
611
607
        except:
612
608
            self.branch.unlock()
613
609
            raise
614
 
        return LogicalLockResult(self.unlock)
615
610
 
616
611
    def lock_tree_write(self):
617
 
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
618
 
 
619
 
        :return: A bzrlib.lock.LogicalLockResult.
620
 
        """
 
612
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
621
613
        self.branch.lock_read()
622
 
        return self._lock_self_write()
 
614
        self._lock_self_write()
623
615
 
624
616
    def lock_write(self):
625
 
        """See MutableTree.lock_write, and WorkingTree.unlock.
626
 
 
627
 
        :return: A bzrlib.lock.LogicalLockResult.
628
 
        """
 
617
        """See MutableTree.lock_write, and WorkingTree.unlock."""
629
618
        self.branch.lock_write()
630
 
        return self._lock_self_write()
 
619
        self._lock_self_write()
631
620
 
632
621
    @needs_tree_write_lock
633
622
    def move(self, from_paths, to_dir, after=False):
1247
1236
        # have to change the legacy inventory too.
1248
1237
        if self._inventory is not None:
1249
1238
            for file_id in file_ids:
1250
 
                if self._inventory.has_id(file_id):
1251
 
                    self._inventory.remove_recursive_id(file_id)
 
1239
                self._inventory.remove_recursive_id(file_id)
1252
1240
 
1253
1241
    @needs_tree_write_lock
1254
1242
    def rename_one(self, from_rel, to_rel, after=False):
1330
1318
    def _file_content_summary(self, path, stat_result):
1331
1319
        # This is to support the somewhat obsolete path_content_summary method
1332
1320
        # with content filtering: see
1333
 
        # <https://bugs.launchpad.net/bzr/+bug/415508>.
 
1321
        # <https://bugs.edge.launchpad.net/bzr/+bug/415508>.
1334
1322
        #
1335
1323
        # If the dirstate cache is up to date and knows the hash and size,
1336
1324
        # return that.
1384
1372
 
1385
1373
 
1386
1374
class DirStateWorkingTreeFormat(WorkingTreeFormat3):
1387
 
 
1388
1375
    def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
1389
1376
                   accelerator_tree=None, hardlink=False):
1390
1377
        """See WorkingTreeFormat.initialize().
1738
1725
                elif kind == 'directory':
1739
1726
                    parent_ies[(dirname + '/' + name).strip('/')] = inv_entry
1740
1727
                elif kind == 'symlink':
 
1728
                    inv_entry.executable = False
 
1729
                    inv_entry.text_size = None
1741
1730
                    inv_entry.symlink_target = utf8_decode(fingerprint)[0]
1742
1731
                elif kind == 'tree-reference':
1743
1732
                    inv_entry.reference_revision = fingerprint or None
1843
1832
        entry = self._get_entry(file_id=file_id)[1]
1844
1833
        if entry is None:
1845
1834
            raise errors.NoSuchId(tree=self, file_id=file_id)
1846
 
        parent_index = self._get_parent_index()
1847
 
        return dirstate.DirState._minikind_to_kind[entry[parent_index][0]]
 
1835
        return dirstate.DirState._minikind_to_kind[entry[1][0]]
1848
1836
 
1849
1837
    def stored_kind(self, file_id):
1850
1838
        """See Tree.stored_kind"""
1870
1858
            return None
1871
1859
        return ie.executable
1872
1860
 
1873
 
    def is_locked(self):
1874
 
        return self._locked
1875
 
 
1876
1861
    def list_files(self, include_root=False, from_dir=None, recursive=True):
1877
1862
        # We use a standard implementation, because DirStateRevisionTree is
1878
1863
        # dealing with one of the parents of the current state
1891
1876
            yield path, 'V', entry.kind, entry.file_id, entry
1892
1877
 
1893
1878
    def lock_read(self):
1894
 
        """Lock the tree for a set of operations.
1895
 
 
1896
 
        :return: A bzrlib.lock.LogicalLockResult.
1897
 
        """
 
1879
        """Lock the tree for a set of operations."""
1898
1880
        if not self._locked:
1899
1881
            self._repository.lock_read()
1900
1882
            if self._dirstate._lock_token is None:
1901
1883
                self._dirstate.lock_read()
1902
1884
                self._dirstate_locked = True
1903
1885
        self._locked += 1
1904
 
        return LogicalLockResult(self.unlock)
1905
1886
 
1906
1887
    def _must_be_locked(self):
1907
1888
        if not self._locked: