← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Martin Pool
  • Date: 2010-08-13 08:09:53 UTC
  • mto: (5050.17.6 2.2)
  • mto: This revision was merged to the branch mainline in revision 5379.
  • Revision ID: mbp@sourcefrog.net-20100813080953-c00cm9l3qgu2flj9
Remove spuriously-resurrected test

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
61
61
    revisiontree,
62
62
    trace,
63
63
    transform,
 
64
    transport,
64
65
    ui,
65
66
    views,
66
67
    xml5,
67
68
    xml7,
68
69
    )
69
 
import bzrlib.branch
70
 
from bzrlib.transport import get_transport
71
70
from bzrlib.workingtree_4 import (
72
71
    WorkingTreeFormat4,
73
72
    WorkingTreeFormat5,
77
76
 
78
77
from bzrlib import symbol_versioning
79
78
from bzrlib.decorators import needs_read_lock, needs_write_lock
 
79
from bzrlib.lock import LogicalLockResult
80
80
from bzrlib.lockable_files import LockableFiles
81
81
from bzrlib.lockdir import LockDir
82
82
import bzrlib.mutabletree
176
176
 
177
177
    It is possible for a `WorkingTree` to have a filename which is
178
178
    not listed in the Inventory and vice versa.
 
179
 
 
180
    :ivar basedir: The root of the tree on disk. This is a unicode path object
 
181
        (as opposed to a URL).
179
182
    """
180
183
 
181
184
    # override this to set the strategy for storing views
368
371
                return True, None
369
372
            else:
370
373
                return True, tree
371
 
        transport = get_transport(location)
372
 
        iterator = bzrdir.BzrDir.find_bzrdirs(transport, evaluate=evaluate,
 
374
        t = transport.get_transport(location)
 
375
        iterator = bzrdir.BzrDir.find_bzrdirs(t, evaluate=evaluate,
373
376
                                              list_current=list_current)
374
 
        return [t for t in iterator if t is not None]
 
377
        return [tr for tr in iterator if tr is not None]
375
378
 
376
379
    # should be deprecated - this is slow and in any case treating them as a
377
380
    # container is (we now know) bad style -- mbp 20070302
462
465
        return (file_obj, stat_value)
463
466
 
464
467
    def get_file_text(self, file_id, path=None, filtered=True):
465
 
        return self.get_file(file_id, path=path, filtered=filtered).read()
 
468
        my_file = self.get_file(file_id, path=path, filtered=filtered)
 
469
        try:
 
470
            return my_file.read()
 
471
        finally:
 
472
            my_file.close()
466
473
 
467
474
    def get_file_byname(self, filename, filtered=True):
468
475
        path = self.abspath(filename)
522
529
 
523
530
        # Now we have the parents of this content
524
531
        annotator = self.branch.repository.texts.get_annotator()
525
 
        text = self.get_file(file_id).read()
 
532
        text = self.get_file_text(file_id)
526
533
        this_key =(file_id, default_revision)
527
534
        annotator.add_special_text(this_key, file_parent_keys, text)
528
535
        annotations = [(key[-1], line)
1798
1805
            raise errors.ObjectNotLocked(self)
1799
1806
 
1800
1807
    def lock_read(self):
1801
 
        """See Branch.lock_read, and WorkingTree.unlock."""
 
1808
        """Lock the tree for reading.
 
1809
 
 
1810
        This also locks the branch, and can be unlocked via self.unlock().
 
1811
 
 
1812
        :return: A bzrlib.lock.LogicalLockResult.
 
1813
        """
1802
1814
        if not self.is_locked():
1803
1815
            self._reset_data()
1804
1816
        self.branch.lock_read()
1805
1817
        try:
1806
 
            return self._control_files.lock_read()
 
1818
            self._control_files.lock_read()
 
1819
            return LogicalLockResult(self.unlock)
1807
1820
        except:
1808
1821
            self.branch.unlock()
1809
1822
            raise
1810
1823
 
1811
1824
    def lock_tree_write(self):
1812
 
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
 
1825
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
 
1826
 
 
1827
        :return: A bzrlib.lock.LogicalLockResult.
 
1828
        """
1813
1829
        if not self.is_locked():
1814
1830
            self._reset_data()
1815
1831
        self.branch.lock_read()
1816
1832
        try:
1817
 
            return self._control_files.lock_write()
 
1833
            self._control_files.lock_write()
 
1834
            return LogicalLockResult(self.unlock)
1818
1835
        except:
1819
1836
            self.branch.unlock()
1820
1837
            raise
1821
1838
 
1822
1839
    def lock_write(self):
1823
 
        """See MutableTree.lock_write, and WorkingTree.unlock."""
 
1840
        """See MutableTree.lock_write, and WorkingTree.unlock.
 
1841
 
 
1842
        :return: A bzrlib.lock.LogicalLockResult.
 
1843
        """
1824
1844
        if not self.is_locked():
1825
1845
            self._reset_data()
1826
1846
        self.branch.lock_write()
1827
1847
        try:
1828
 
            return self._control_files.lock_write()
 
1848
            self._control_files.lock_write()
 
1849
            return LogicalLockResult(self.unlock)
1829
1850
        except:
1830
1851
            self.branch.unlock()
1831
1852
            raise
1956
1977
        def recurse_directory_to_add_files(directory):
1957
1978
            # Recurse directory and add all files
1958
1979
            # so we can check if they have changed.
1959
 
            for parent_info, file_infos in\
1960
 
                self.walkdirs(directory):
 
1980
            for parent_info, file_infos in self.walkdirs(directory):
1961
1981
                for relpath, basename, kind, lstat, fileid, kind in file_infos:
1962
1982
                    # Is it versioned or ignored?
1963
1983
                    if self.path2id(relpath) or self.is_ignored(relpath):
1998
2018
                            # ... but not ignored
1999
2019
                            has_changed_files = True
2000
2020
                            break
2001
 
                    elif content_change and (kind[1] is not None):
2002
 
                        # Versioned and changed, but not deleted
 
2021
                    elif (content_change and (kind[1] is not None) and
 
2022
                            osutils.is_inside_any(files, path[1])):
 
2023
                        # Versioned and changed, but not deleted, and still
 
2024
                        # in one of the dirs to be deleted.
2003
2025
                        has_changed_files = True
2004
2026
                        break
2005
2027
 
2636
2658
 
2637
2659
        In Format2 WorkingTrees we have a single lock for the branch and tree
2638
2660
        so lock_tree_write() degrades to lock_write().
 
2661
 
 
2662
        :return: An object with an unlock method which will release the lock
 
2663
            obtained.
2639
2664
        """
2640
2665
        self.branch.lock_write()
2641
2666
        try:
2642
 
            return self._control_files.lock_write()
 
2667
            self._control_files.lock_write()
 
2668
            return self
2643
2669
        except:
2644
2670
            self.branch.unlock()
2645
2671
            raise