← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

Merge lp:bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
68
68
    realpath,
69
69
    safe_unicode,
70
70
    )
 
71
from bzrlib.symbol_versioning import (
 
72
    deprecated_in,
 
73
    deprecated_method,
 
74
    )
71
75
from bzrlib.transport.local import LocalTransport
72
76
from bzrlib.tree import (
73
77
    InterTree,
255
259
 
256
260
        :return: an integer. -1 means never save.
257
261
        """
258
 
        # FIXME: We want a WorkingTreeStack here -- vila 20110812
259
 
        conf = config.BranchStack(self.branch)
 
262
        conf = self.get_config_stack()
260
263
        return conf.get('bzr.workingtree.worth_saving_limit')
261
264
 
262
265
    def filter_unversioned_files(self, paths):
415
418
                return link_or_sha1
416
419
        return None
417
420
 
418
 
    def _get_inventory(self):
 
421
    def _get_root_inventory(self):
419
422
        """Get the inventory for the tree. This is only valid within a lock."""
420
423
        if 'evil' in debug.debug_flags:
421
424
            trace.mutter_callsite(2,
426
429
        self._generate_inventory()
427
430
        return self._inventory
428
431
 
 
432
    @deprecated_method(deprecated_in((2, 5, 0)))
 
433
    def _get_inventory(self):
 
434
        return self.root_inventory
 
435
 
429
436
    inventory = property(_get_inventory,
430
437
                         doc="Inventory of this Tree")
431
438
 
 
439
    root_inventory = property(_get_root_inventory,
 
440
        "Root inventory of this tree")
 
441
 
432
442
    @needs_read_lock
433
443
    def get_parent_ids(self):
434
444
        """See Tree.get_parent_ids.
681
691
 
682
692
        if self._inventory is not None:
683
693
            update_inventory = True
684
 
            inv = self.inventory
 
694
            inv = self.root_inventory
685
695
            to_dir_id = to_entry[0][2]
686
696
            to_dir_ie = inv[to_dir_id]
687
697
        else:
1036
1046
 
1037
1047
        This is a meaningless operation for dirstate, but we obey it anyhow.
1038
1048
        """
1039
 
        return self.inventory
 
1049
        return self.root_inventory
1040
1050
 
1041
1051
    @needs_read_lock
1042
1052
    def revision_tree(self, revision_id):
1150
1160
                # _make_delta if we can't get the RevisionTree
1151
1161
                pass
1152
1162
            else:
1153
 
                delta = rev_tree.inventory._make_delta(basis_tree.inventory)
 
1163
                delta = rev_tree.root_inventory._make_delta(
 
1164
                    basis_tree.root_inventory)
1154
1165
                dirstate.update_basis_by_delta(delta, rev_id)
1155
1166
                updated = True
1156
1167
        if not updated:
1327
1338
        # being created.
1328
1339
        self._inventory = None
1329
1340
        # generate a delta,
1330
 
        delta = inv._make_delta(self.inventory)
 
1341
        delta = inv._make_delta(self.root_inventory)
1331
1342
        # and apply it.
1332
1343
        self.apply_inventory_delta(delta)
1333
1344
        if had_inventory:
1353
1364
            base_tree = trees[0][1]
1354
1365
        state = self.current_dirstate()
1355
1366
        # We don't support ghosts yet
1356
 
        state.set_state_from_scratch(base_tree.inventory, trees, [])
 
1367
        state.set_state_from_scratch(base_tree.root_inventory, trees, [])
1357
1368
 
1358
1369
 
1359
1370
class ContentFilterAwareSHA1Provider(dirstate.SHA1Provider):
1598
1609
        """Overrideable method to get a bzrdir for testing."""
1599
1610
        # please test against something that will let us do tree references
1600
1611
        return bzrdir.format_registry.make_bzrdir(
1601
 
            'dirstate-with-subtree')
 
1612
            'development-subtree')
1602
1613
 
1603
1614
    _matchingbzrdir = property(__get_matchingbzrdir)
1604
1615
 
1872
1883
 
1873
1884
    @needs_read_lock
1874
1885
    def get_file_revision(self, file_id):
1875
 
        return self.inventory[file_id].revision
 
1886
        inv, inv_file_id = self._unpack_file_id(file_id)
 
1887
        return inv[inv_file_id].revision
1876
1888
 
1877
1889
    def get_file(self, file_id, path=None):
1878
1890
        return StringIO(self.get_file_text(file_id))
1879
1891
 
1880
1892
    def get_file_size(self, file_id):
1881
1893
        """See Tree.get_file_size"""
1882
 
        return self.inventory[file_id].text_size
 
1894
        inv, inv_file_id = self._unpack_file_id(file_id)
 
1895
        return inv[inv_file_id].text_size
1883
1896
 
1884
1897
    def get_file_text(self, file_id, path=None):
1885
1898
        _, content = list(self.iter_files_bytes([(file_id, None)]))[0]
1886
1899
        return ''.join(content)
1887
1900
 
1888
1901
    def get_reference_revision(self, file_id, path=None):
1889
 
        return self.inventory[file_id].reference_revision
 
1902
        inv, inv_file_id = self._unpack_file_id(file_id)
 
1903
        return inv[inv_file_id].reference_revision
1890
1904
 
1891
1905
    def iter_files_bytes(self, desired_files):
1892
1906
        """See Tree.iter_files_bytes.
1916
1930
        """Return the revision id for this tree."""
1917
1931
        return self._revision_id
1918
1932
 
1919
 
    def _get_inventory(self):
 
1933
    def _get_root_inventory(self):
1920
1934
        if self._inventory is not None:
1921
1935
            return self._inventory
1922
1936
        self._must_be_locked()
1923
1937
        self._generate_inventory()
1924
1938
        return self._inventory
1925
1939
 
 
1940
    root_inventory = property(_get_root_inventory,
 
1941
                         doc="Inventory of this Tree")
 
1942
 
 
1943
    @deprecated_method(deprecated_in((2, 5, 0)))
 
1944
    def _get_inventory(self):
 
1945
        return self.root_inventory
 
1946
 
1926
1947
    inventory = property(_get_inventory,
1927
1948
                         doc="Inventory of this Tree")
1928
1949
 
1946
1967
 
1947
1968
    def path_content_summary(self, path):
1948
1969
        """See Tree.path_content_summary."""
1949
 
        id = self.inventory.path2id(path)
1950
 
        if id is None:
 
1970
        inv, inv_file_id = self._path2inv_file_id(path)
 
1971
        if inv_file_id is None:
1951
1972
            return ('missing', None, None, None)
1952
 
        entry = self._inventory[id]
 
1973
        entry = inv[inv_file_id]
1953
1974
        kind = entry.kind
1954
1975
        if kind == 'file':
1955
1976
            return (kind, entry.text_size, entry.executable, entry.text_sha1)
1959
1980
            return (kind, None, None, None)
1960
1981
 
1961
1982
    def is_executable(self, file_id, path=None):
1962
 
        ie = self.inventory[file_id]
 
1983
        inv, inv_file_id = self._unpack_file_id(file_id)
 
1984
        ie = inv[inv_file_id]
1963
1985
        if ie.kind != "file":
1964
1986
            return False
1965
1987
        return ie.executable
1970
1992
    def list_files(self, include_root=False, from_dir=None, recursive=True):
1971
1993
        # We use a standard implementation, because DirStateRevisionTree is
1972
1994
        # dealing with one of the parents of the current state
1973
 
        inv = self._get_inventory()
1974
1995
        if from_dir is None:
 
1996
            inv = self.root_inventory
1975
1997
            from_dir_id = None
1976
1998
        else:
1977
 
            from_dir_id = inv.path2id(from_dir)
 
1999
            inv, from_dir_id = self._path2inv_file_id(from_dir)
1978
2000
            if from_dir_id is None:
1979
2001
                # Directory not versioned
1980
2002
                return
 
2003
        # FIXME: Support nested trees
1981
2004
        entries = inv.iter_entries(from_dir=from_dir_id, recursive=recursive)
1982
2005
        if inv.root is not None and not include_root and from_dir is None:
1983
2006
            entries.next()
2033
2056
        # So for now, we just build up the parent inventory, and extract
2034
2057
        # it the same way RevisionTree does.
2035
2058
        _directory = 'directory'
2036
 
        inv = self._get_inventory()
 
2059
        inv = self._get_root_inventory()
2037
2060
        top_id = inv.path2id(prefix)
2038
2061
        if top_id is None:
2039
2062
            pending = []