/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Robert Collins
  • Date: 2010-02-27 12:27:33 UTC
  • mto: This revision was merged to the branch mainline in revision 5061.
  • Revision ID: robertc@robertcollins.net-20100227122733-2o3me3fkk3pk36ns
``bzrlib.branchbuilder.BranchBuilder.build_snapshot`` now accepts a
``message_callback`` in the same way that commit does. (Robert Collins)

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
import bzrlib.mutabletree
56
57
from bzrlib.mutabletree import needs_tree_write_lock
57
58
from bzrlib.osutils import (
58
59
    file_kind,
567
568
            return _mod_revision.NULL_REVISION
568
569
 
569
570
    def lock_read(self):
570
 
        """See Branch.lock_read, and WorkingTree.unlock.
571
 
 
572
 
        :return: An object with an unlock method which will release the lock
573
 
            obtained.
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 self
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 self
615
610
 
616
611
    def lock_tree_write(self):
617
 
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
618
 
 
619
 
        :return: An object with an unlock method which will release the lock
620
 
            obtained.
621
 
        """
 
612
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
622
613
        self.branch.lock_read()
623
 
        return self._lock_self_write()
 
614
        self._lock_self_write()
624
615
 
625
616
    def lock_write(self):
626
 
        """See MutableTree.lock_write, and WorkingTree.unlock.
627
 
 
628
 
        :return: An object with an unlock method which will release the lock
629
 
            obtained.
630
 
        """
 
617
        """See MutableTree.lock_write, and WorkingTree.unlock."""
631
618
        self.branch.lock_write()
632
 
        return self._lock_self_write()
 
619
        self._lock_self_write()
633
620
 
634
621
    @needs_tree_write_lock
635
622
    def move(self, from_paths, to_dir, after=False):
1385
1372
 
1386
1373
 
1387
1374
class DirStateWorkingTreeFormat(WorkingTreeFormat3):
1388
 
 
1389
1375
    def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
1390
1376
                   accelerator_tree=None, hardlink=False):
1391
1377
        """See WorkingTreeFormat.initialize().
1846
1832
        entry = self._get_entry(file_id=file_id)[1]
1847
1833
        if entry is None:
1848
1834
            raise errors.NoSuchId(tree=self, file_id=file_id)
1849
 
        parent_index = self._get_parent_index()
1850
 
        return dirstate.DirState._minikind_to_kind[entry[parent_index][0]]
 
1835
        return dirstate.DirState._minikind_to_kind[entry[1][0]]
1851
1836
 
1852
1837
    def stored_kind(self, file_id):
1853
1838
        """See Tree.stored_kind"""
1873
1858
            return None
1874
1859
        return ie.executable
1875
1860
 
1876
 
    def is_locked(self):
1877
 
        return self._locked
1878
 
 
1879
1861
    def list_files(self, include_root=False, from_dir=None, recursive=True):
1880
1862
        # We use a standard implementation, because DirStateRevisionTree is
1881
1863
        # dealing with one of the parents of the current state
1894
1876
            yield path, 'V', entry.kind, entry.file_id, entry
1895
1877
 
1896
1878
    def lock_read(self):
1897
 
        """Lock the tree for a set of operations.
1898
 
 
1899
 
        :return: An object with an unlock method which will release the lock
1900
 
            obtained.
1901
 
        """
 
1879
        """Lock the tree for a set of operations."""
1902
1880
        if not self._locked:
1903
1881
            self._repository.lock_read()
1904
1882
            if self._dirstate._lock_token is None:
1905
1883
                self._dirstate.lock_read()
1906
1884
                self._dirstate_locked = True
1907
1885
        self._locked += 1
1908
 
        return self
1909
1886
 
1910
1887
    def _must_be_locked(self):
1911
1888
        if not self._locked: