/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.py

  • Committer: Jelmer Vernooij
  • Date: 2010-04-29 08:59:13 UTC
  • mfrom: (5193 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5218.
  • Revision ID: jelmer@samba.org-20100429085913-7208x0s3of34kehh
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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)
38
32
 
39
33
from cStringIO import StringIO
40
34
import os
174
168
        return ''
175
169
 
176
170
 
177
 
class WorkingTree(bzrlib.mutabletree.MutableTree):
 
171
class WorkingTree(bzrlib.mutabletree.MutableTree,
 
172
    bzrdir.ControlComponent):
178
173
    """Working copy tree.
179
174
 
180
175
    The inventory is held in the `Branch` working-inventory, and the
253
248
        self._rules_searcher = None
254
249
        self.views = self._make_views()
255
250
 
 
251
    @property
 
252
    def user_transport(self):
 
253
        return self.bzrdir.user_transport
 
254
 
 
255
    @property
 
256
    def control_transport(self):
 
257
        return self._transport
 
258
 
256
259
    def _detect_case_handling(self):
257
260
        wt_trans = self.bzrdir.get_workingtree_transport(None)
258
261
        try: