← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Robert Collins
  • Date: 2010-02-28 10:08:29 UTC
  • mto: This revision was merged to the branch mainline in revision 5062.
  • Revision ID: robertc@robertcollins.net-20100228100829-nroa3qp8zi8jwxke
* bzr now has a ``.testr.conf`` file in its source tree configured
  appropriately for running tests with Testrepository
  (``https://launchpad.net/testrepository``). (Robert Collins)

* Documentation about testing with ``subunit`` has been tweaked.
  (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
29
29
WorkingTree.open(dir).
30
30
"""
31
31
 
 
32
# TODO: Give the workingtree sole responsibility for the working inventory;
 
33
# remove the variable and references to it from the branch.  This may require
 
34
# updating the commit code so as to update the inventory within the working
 
35
# copy, and making sure there's only one WorkingTree for any directory on disk.
 
36
# At the moment they may alias the inventory and have old copies of it in
 
37
# memory.  (Now done? -- mbp 20060309)
32
38
 
33
39
from cStringIO import StringIO
34
40
import os
95
101
from bzrlib.filters import filtered_input_file
96
102
from bzrlib.trace import mutter, note
97
103
from bzrlib.transport.local import LocalTransport
 
104
from bzrlib.progress import ProgressPhase
98
105
from bzrlib.revision import CURRENT_REVISION
99
106
from bzrlib.rio import RioReader, rio_file, Stanza
100
107
from bzrlib.symbol_versioning import (
167
174
        return ''
168
175
 
169
176
 
170
 
class WorkingTree(bzrlib.mutabletree.MutableTree,
171
 
    bzrdir.ControlComponent):
 
177
class WorkingTree(bzrlib.mutabletree.MutableTree):
172
178
    """Working copy tree.
173
179
 
174
180
    The inventory is held in the `Branch` working-inventory, and the
247
253
        self._rules_searcher = None
248
254
        self.views = self._make_views()
249
255
 
250
 
    @property
251
 
    def user_transport(self):
252
 
        return self.bzrdir.user_transport
253
 
 
254
 
    @property
255
 
    def control_transport(self):
256
 
        return self._transport
257
 
 
258
256
    def _detect_case_handling(self):
259
257
        wt_trans = self.bzrdir.get_workingtree_transport(None)
260
258
        try:
1096
1094
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
1097
1095
        if tree_transport.base != branch_transport.base:
1098
1096
            tree_bzrdir = format.initialize_on_transport(tree_transport)
1099
 
            branch.BranchReferenceFormat().initialize(tree_bzrdir,
1100
 
                target_branch=new_branch)
 
1097
            branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1101
1098
        else:
1102
1099
            tree_bzrdir = branch_bzrdir
1103
1100
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1141
1138
        This does not include files that have been deleted in this
1142
1139
        tree. Skips the control directory.
1143
1140
 
1144
 
        :param include_root: if True, return an entry for the root
 
1141
        :param include_root: if True, do not return an entry for the root
1145
1142
        :param from_dir: start from this directory or None for the root
1146
1143
        :param recursive: whether to recurse into subdirectories or not
1147
1144
        """
1798
1795
            raise errors.ObjectNotLocked(self)
1799
1796
 
1800
1797
    def lock_read(self):
1801
 
        """Lock the tree for reading.
1802
 
 
1803
 
        This also locks the branch, and can be unlocked via self.unlock().
1804
 
 
1805
 
        :return: An object with an unlock method which will release the lock
1806
 
            obtained.
1807
 
        """
 
1798
        """See Branch.lock_read, and WorkingTree.unlock."""
1808
1799
        if not self.is_locked():
1809
1800
            self._reset_data()
1810
1801
        self.branch.lock_read()
1811
1802
        try:
1812
 
            self._control_files.lock_read()
1813
 
            return self
 
1803
            return self._control_files.lock_read()
1814
1804
        except:
1815
1805
            self.branch.unlock()
1816
1806
            raise
1817
1807
 
1818
1808
    def lock_tree_write(self):
1819
 
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
1820
 
 
1821
 
        :return: An object with an unlock method which will release the lock
1822
 
            obtained.
1823
 
        """
 
1809
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1824
1810
        if not self.is_locked():
1825
1811
            self._reset_data()
1826
1812
        self.branch.lock_read()
1827
1813
        try:
1828
 
            self._control_files.lock_write()
1829
 
            return self
 
1814
            return self._control_files.lock_write()
1830
1815
        except:
1831
1816
            self.branch.unlock()
1832
1817
            raise
1833
1818
 
1834
1819
    def lock_write(self):
1835
 
        """See MutableTree.lock_write, and WorkingTree.unlock.
1836
 
 
1837
 
        :return: An object with an unlock method which will release the lock
1838
 
            obtained.
1839
 
        """
 
1820
        """See MutableTree.lock_write, and WorkingTree.unlock."""
1840
1821
        if not self.is_locked():
1841
1822
            self._reset_data()
1842
1823
        self.branch.lock_write()
1843
1824
        try:
1844
 
            self._control_files.lock_write()
1845
 
            return self
 
1825
            return self._control_files.lock_write()
1846
1826
        except:
1847
1827
            self.branch.unlock()
1848
1828
            raise
2277
2257
            last_rev = _mod_revision.NULL_REVISION
2278
2258
        if revision is None:
2279
2259
            revision = self.branch.last_revision()
 
2260
        else:
 
2261
            if revision not in self.branch.revision_history():
 
2262
                raise errors.NoSuchRevision(self.branch, revision)
2280
2263
 
2281
2264
        old_tip = old_tip or _mod_revision.NULL_REVISION
2282
2265
 
2653
2636
 
2654
2637
        In Format2 WorkingTrees we have a single lock for the branch and tree
2655
2638
        so lock_tree_write() degrades to lock_write().
2656
 
 
2657
 
        :return: An object with an unlock method which will release the lock
2658
 
            obtained.
2659
2639
        """
2660
2640
        self.branch.lock_write()
2661
2641
        try:
2662
 
            self._control_files.lock_write()
2663
 
            return self
 
2642
            return self._control_files.lock_write()
2664
2643
        except:
2665
2644
            self.branch.unlock()
2666
2645
            raise