← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Patch Queue Manager
  • Date: 2012-03-12 12:35:59 UTC
  • mfrom: (6491.1.7 repo-verify-signatures)
  • Revision ID: pqm@pqm.ubuntu.com-20120312123559-g4tqzz3790kszu03
(jelmer) Various fixes for 'bzr verify-signatures'. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
22
22
WorkingTree.open(dir).
23
23
"""
24
24
 
 
25
from __future__ import absolute_import
 
26
 
25
27
from cStringIO import StringIO
26
28
import os
27
29
import sys
34
36
from bzrlib import (
35
37
    bzrdir,
36
38
    cache_utf8,
 
39
    config,
37
40
    conflicts as _mod_conflicts,
 
41
    controldir,
38
42
    debug,
39
43
    dirstate,
40
44
    errors,
54
58
from bzrlib.lock import LogicalLockResult
55
59
from bzrlib.lockable_files import LockableFiles
56
60
from bzrlib.lockdir import LockDir
57
 
from bzrlib.mutabletree import needs_tree_write_lock
 
61
from bzrlib.mutabletree import (
 
62
    MutableTree,
 
63
    needs_tree_write_lock,
 
64
    )
58
65
from bzrlib.osutils import (
59
66
    file_kind,
60
67
    isdir,
62
69
    realpath,
63
70
    safe_unicode,
64
71
    )
 
72
from bzrlib.symbol_versioning import (
 
73
    deprecated_in,
 
74
    deprecated_method,
 
75
    )
65
76
from bzrlib.transport.local import LocalTransport
66
77
from bzrlib.tree import (
67
78
    InterTree,
70
81
from bzrlib.workingtree import (
71
82
    InventoryWorkingTree,
72
83
    WorkingTree,
73
 
    WorkingTreeFormat,
 
84
    WorkingTreeFormatMetaDir,
74
85
    )
75
86
 
76
87
 
77
88
class DirStateWorkingTree(InventoryWorkingTree):
78
89
 
79
 
    _DEFAULT_WORTH_SAVING_LIMIT = 10
80
 
 
81
90
    def __init__(self, basedir,
82
91
                 branch,
83
92
                 _control_files=None,
251
260
 
252
261
        :return: an integer. -1 means never save.
253
262
        """
254
 
        config = self.branch.get_config()
255
 
        val = config.get_user_option('bzr.workingtree.worth_saving_limit')
256
 
        if val is None:
257
 
            val = self._DEFAULT_WORTH_SAVING_LIMIT
258
 
        else:
259
 
            try:
260
 
                val = int(val)
261
 
            except ValueError, e:
262
 
                trace.warning('Invalid config value for'
263
 
                              ' "bzr.workingtree.worth_saving_limit"'
264
 
                              ' value %r is not an integer.'
265
 
                              % (val,))
266
 
                val = self._DEFAULT_WORTH_SAVING_LIMIT
267
 
        return val
 
263
        conf = self.get_config_stack()
 
264
        return conf.get('bzr.workingtree.worth_saving_limit')
268
265
 
269
266
    def filter_unversioned_files(self, paths):
270
267
        """Filter out paths that are versioned.
422
419
                return link_or_sha1
423
420
        return None
424
421
 
425
 
    def _get_inventory(self):
 
422
    def _get_root_inventory(self):
426
423
        """Get the inventory for the tree. This is only valid within a lock."""
427
424
        if 'evil' in debug.debug_flags:
428
425
            trace.mutter_callsite(2,
433
430
        self._generate_inventory()
434
431
        return self._inventory
435
432
 
 
433
    @deprecated_method(deprecated_in((2, 5, 0)))
 
434
    def _get_inventory(self):
 
435
        return self.root_inventory
 
436
 
436
437
    inventory = property(_get_inventory,
437
438
                         doc="Inventory of this Tree")
438
439
 
 
440
    root_inventory = property(_get_root_inventory,
 
441
        "Root inventory of this tree")
 
442
 
439
443
    @needs_read_lock
440
444
    def get_parent_ids(self):
441
445
        """See Tree.get_parent_ids.
488
492
            return False # Missing entries are not executable
489
493
        return entry[1][0][3] # Executable?
490
494
 
491
 
    if not osutils.supports_executable():
492
 
        def is_executable(self, file_id, path=None):
493
 
            """Test if a file is executable or not.
 
495
    def is_executable(self, file_id, path=None):
 
496
        """Test if a file is executable or not.
494
497
 
495
 
            Note: The caller is expected to take a read-lock before calling this.
496
 
            """
 
498
        Note: The caller is expected to take a read-lock before calling this.
 
499
        """
 
500
        if not self._supports_executable():
497
501
            entry = self._get_entry(file_id=file_id, path=path)
498
502
            if entry == (None, None):
499
503
                return False
500
504
            return entry[1][0][3]
501
 
 
502
 
        _is_executable_from_path_and_stat = \
503
 
            _is_executable_from_path_and_stat_from_basis
504
 
    else:
505
 
        def is_executable(self, file_id, path=None):
506
 
            """Test if a file is executable or not.
507
 
 
508
 
            Note: The caller is expected to take a read-lock before calling this.
509
 
            """
 
505
        else:
510
506
            self._must_be_locked()
511
507
            if not path:
512
508
                path = self.id2path(file_id)
696
692
 
697
693
        if self._inventory is not None:
698
694
            update_inventory = True
699
 
            inv = self.inventory
 
695
            inv = self.root_inventory
700
696
            to_dir_id = to_entry[0][2]
701
697
            to_dir_ie = inv[to_dir_id]
702
698
        else:
981
977
                    all_versioned = False
982
978
                    break
983
979
            if not all_versioned:
984
 
                raise errors.PathsNotVersionedError(paths)
 
980
                raise errors.PathsNotVersionedError(
 
981
                    [p.decode('utf-8') for p in paths])
985
982
        # -- remove redundancy in supplied paths to prevent over-scanning --
986
983
        search_paths = osutils.minimum_path_selection(paths)
987
984
        # sketch:
1036
1033
            found_dir_names = set(dir_name_id[:2] for dir_name_id in found)
1037
1034
            for dir_name in split_paths:
1038
1035
                if dir_name not in found_dir_names:
1039
 
                    raise errors.PathsNotVersionedError(paths)
 
1036
                    raise errors.PathsNotVersionedError(
 
1037
                        [p.decode('utf-8') for p in paths])
1040
1038
 
1041
1039
        for dir_name_id, trees_info in found.iteritems():
1042
1040
            for index in search_indexes:
1049
1047
 
1050
1048
        This is a meaningless operation for dirstate, but we obey it anyhow.
1051
1049
        """
1052
 
        return self.inventory
 
1050
        return self.root_inventory
1053
1051
 
1054
1052
    @needs_read_lock
1055
1053
    def revision_tree(self, revision_id):
1163
1161
                # _make_delta if we can't get the RevisionTree
1164
1162
                pass
1165
1163
            else:
1166
 
                delta = rev_tree.inventory._make_delta(basis_tree.inventory)
 
1164
                delta = rev_tree.root_inventory._make_delta(
 
1165
                    basis_tree.root_inventory)
1167
1166
                dirstate.update_basis_by_delta(delta, rev_id)
1168
1167
                updated = True
1169
1168
        if not updated:
1340
1339
        # being created.
1341
1340
        self._inventory = None
1342
1341
        # generate a delta,
1343
 
        delta = inv._make_delta(self.inventory)
 
1342
        delta = inv._make_delta(self.root_inventory)
1344
1343
        # and apply it.
1345
1344
        self.apply_inventory_delta(delta)
1346
1345
        if had_inventory:
1366
1365
            base_tree = trees[0][1]
1367
1366
        state = self.current_dirstate()
1368
1367
        # We don't support ghosts yet
1369
 
        state.set_state_from_scratch(base_tree.inventory, trees, [])
 
1368
        state.set_state_from_scratch(base_tree.root_inventory, trees, [])
1370
1369
 
1371
1370
 
1372
1371
class ContentFilterAwareSHA1Provider(dirstate.SHA1Provider):
1458
1457
        return views.PathBasedViews(self)
1459
1458
 
1460
1459
 
1461
 
class DirStateWorkingTreeFormat(WorkingTreeFormat):
 
1460
class DirStateWorkingTreeFormat(WorkingTreeFormatMetaDir):
1462
1461
 
1463
1462
    missing_parent_conflicts = True
1464
1463
 
1494
1493
        control_files = self._open_control_files(a_bzrdir)
1495
1494
        control_files.create_lock()
1496
1495
        control_files.lock_write()
1497
 
        transport.put_bytes('format', self.get_format_string(),
 
1496
        transport.put_bytes('format', self.as_string(),
1498
1497
            mode=a_bzrdir._get_file_mode())
1499
1498
        if from_branch is not None:
1500
1499
            branch = from_branch
1560
1559
                transform.build_tree(basis, wt, accelerator_tree,
1561
1560
                                     hardlink=hardlink,
1562
1561
                                     delta_from_tree=delta_from_tree)
 
1562
                for hook in MutableTree.hooks['post_build_tree']:
 
1563
                    hook(wt)
1563
1564
            finally:
1564
1565
                basis.unlock()
1565
1566
        finally:
1608
1609
    def _get_matchingbzrdir(self):
1609
1610
        """Overrideable method to get a bzrdir for testing."""
1610
1611
        # please test against something that will let us do tree references
1611
 
        return bzrdir.format_registry.make_bzrdir(
1612
 
            'dirstate-with-subtree')
 
1612
        return controldir.format_registry.make_bzrdir(
 
1613
            'development-subtree')
1613
1614
 
1614
1615
    _matchingbzrdir = property(__get_matchingbzrdir)
1615
1616
 
1620
1621
    This format:
1621
1622
        - exists within a metadir controlling .bzr
1622
1623
        - includes an explicit version marker for the workingtree control
1623
 
          files, separate from the BzrDir format
 
1624
          files, separate from the ControlDir format
1624
1625
        - modifies the hash cache format
1625
1626
        - is new in bzr 0.15
1626
1627
        - uses a LockDir to guard access to it.
1630
1631
 
1631
1632
    _tree_class = WorkingTree4
1632
1633
 
1633
 
    def get_format_string(self):
 
1634
    @classmethod
 
1635
    def get_format_string(cls):
1634
1636
        """See WorkingTreeFormat.get_format_string()."""
1635
1637
        return "Bazaar Working Tree Format 4 (bzr 0.15)\n"
1636
1638
 
1647
1649
 
1648
1650
    _tree_class = WorkingTree5
1649
1651
 
1650
 
    def get_format_string(self):
 
1652
    @classmethod
 
1653
    def get_format_string(cls):
1651
1654
        """See WorkingTreeFormat.get_format_string()."""
1652
1655
        return "Bazaar Working Tree Format 5 (bzr 1.11)\n"
1653
1656
 
1667
1670
 
1668
1671
    _tree_class = WorkingTree6
1669
1672
 
1670
 
    def get_format_string(self):
 
1673
    @classmethod
 
1674
    def get_format_string(cls):
1671
1675
        """See WorkingTreeFormat.get_format_string()."""
1672
1676
        return "Bazaar Working Tree Format 6 (bzr 1.14)\n"
1673
1677
 
1861
1865
        # Make sure the file exists
1862
1866
        entry = self._get_entry(file_id, path=path)
1863
1867
        if entry == (None, None): # do we raise?
1864
 
            return None
 
1868
            raise errors.NoSuchId(self, file_id)
1865
1869
        parent_index = self._get_parent_index()
1866
1870
        last_changed_revision = entry[1][parent_index][4]
1867
1871
        try:
1880
1884
 
1881
1885
    @needs_read_lock
1882
1886
    def get_file_revision(self, file_id):
1883
 
        return self.inventory[file_id].revision
 
1887
        inv, inv_file_id = self._unpack_file_id(file_id)
 
1888
        return inv[inv_file_id].revision
1884
1889
 
1885
1890
    def get_file(self, file_id, path=None):
1886
1891
        return StringIO(self.get_file_text(file_id))
1887
1892
 
1888
1893
    def get_file_size(self, file_id):
1889
1894
        """See Tree.get_file_size"""
1890
 
        return self.inventory[file_id].text_size
 
1895
        inv, inv_file_id = self._unpack_file_id(file_id)
 
1896
        return inv[inv_file_id].text_size
1891
1897
 
1892
1898
    def get_file_text(self, file_id, path=None):
1893
1899
        _, content = list(self.iter_files_bytes([(file_id, None)]))[0]
1894
1900
        return ''.join(content)
1895
1901
 
1896
1902
    def get_reference_revision(self, file_id, path=None):
1897
 
        return self.inventory[file_id].reference_revision
 
1903
        inv, inv_file_id = self._unpack_file_id(file_id)
 
1904
        return inv[inv_file_id].reference_revision
1898
1905
 
1899
1906
    def iter_files_bytes(self, desired_files):
1900
1907
        """See Tree.iter_files_bytes.
1924
1931
        """Return the revision id for this tree."""
1925
1932
        return self._revision_id
1926
1933
 
1927
 
    def _get_inventory(self):
 
1934
    def _get_root_inventory(self):
1928
1935
        if self._inventory is not None:
1929
1936
            return self._inventory
1930
1937
        self._must_be_locked()
1931
1938
        self._generate_inventory()
1932
1939
        return self._inventory
1933
1940
 
 
1941
    root_inventory = property(_get_root_inventory,
 
1942
                         doc="Inventory of this Tree")
 
1943
 
 
1944
    @deprecated_method(deprecated_in((2, 5, 0)))
 
1945
    def _get_inventory(self):
 
1946
        return self.root_inventory
 
1947
 
1934
1948
    inventory = property(_get_inventory,
1935
1949
                         doc="Inventory of this Tree")
1936
1950
 
1954
1968
 
1955
1969
    def path_content_summary(self, path):
1956
1970
        """See Tree.path_content_summary."""
1957
 
        id = self.inventory.path2id(path)
1958
 
        if id is None:
 
1971
        inv, inv_file_id = self._path2inv_file_id(path)
 
1972
        if inv_file_id is None:
1959
1973
            return ('missing', None, None, None)
1960
 
        entry = self._inventory[id]
 
1974
        entry = inv[inv_file_id]
1961
1975
        kind = entry.kind
1962
1976
        if kind == 'file':
1963
1977
            return (kind, entry.text_size, entry.executable, entry.text_sha1)
1967
1981
            return (kind, None, None, None)
1968
1982
 
1969
1983
    def is_executable(self, file_id, path=None):
1970
 
        ie = self.inventory[file_id]
 
1984
        inv, inv_file_id = self._unpack_file_id(file_id)
 
1985
        ie = inv[inv_file_id]
1971
1986
        if ie.kind != "file":
1972
1987
            return False
1973
1988
        return ie.executable
1978
1993
    def list_files(self, include_root=False, from_dir=None, recursive=True):
1979
1994
        # We use a standard implementation, because DirStateRevisionTree is
1980
1995
        # dealing with one of the parents of the current state
1981
 
        inv = self._get_inventory()
1982
1996
        if from_dir is None:
 
1997
            inv = self.root_inventory
1983
1998
            from_dir_id = None
1984
1999
        else:
1985
 
            from_dir_id = inv.path2id(from_dir)
 
2000
            inv, from_dir_id = self._path2inv_file_id(from_dir)
1986
2001
            if from_dir_id is None:
1987
2002
                # Directory not versioned
1988
2003
                return
 
2004
        # FIXME: Support nested trees
1989
2005
        entries = inv.iter_entries(from_dir=from_dir_id, recursive=recursive)
1990
2006
        if inv.root is not None and not include_root and from_dir is None:
1991
2007
            entries.next()
2041
2057
        # So for now, we just build up the parent inventory, and extract
2042
2058
        # it the same way RevisionTree does.
2043
2059
        _directory = 'directory'
2044
 
        inv = self._get_inventory()
 
2060
        inv = self._get_root_inventory()
2045
2061
        top_id = inv.path2id(prefix)
2046
2062
        if top_id is None:
2047
2063
            pending = []
2186
2202
                path_entries = state._entries_for_path(path)
2187
2203
                if not path_entries:
2188
2204
                    # this specified path is not present at all: error
2189
 
                    not_versioned.append(path)
 
2205
                    not_versioned.append(path.decode('utf-8'))
2190
2206
                    continue
2191
2207
                found_versioned = False
2192
2208
                # for each id at this path
2200
2216
                if not found_versioned:
2201
2217
                    # none of the indexes was not 'absent' at all ids for this
2202
2218
                    # path.
2203
 
                    not_versioned.append(path)
 
2219
                    not_versioned.append(path.decode('utf-8'))
2204
2220
            if len(not_versioned) > 0:
2205
2221
                raise errors.PathsNotVersionedError(not_versioned)
2206
2222
        # -- remove redundancy in supplied specific_files to prevent over-scanning --
2273
2289
    def update_format(self, tree):
2274
2290
        """Change the format marker."""
2275
2291
        tree._transport.put_bytes('format',
2276
 
            self.target_format.get_format_string(),
 
2292
            self.target_format.as_string(),
2277
2293
            mode=tree.bzrdir._get_file_mode())
2278
2294
 
2279
2295
 
2296
2312
    def update_format(self, tree):
2297
2313
        """Change the format marker."""
2298
2314
        tree._transport.put_bytes('format',
2299
 
            self.target_format.get_format_string(),
 
2315
            self.target_format.as_string(),
2300
2316
            mode=tree.bzrdir._get_file_mode())
2301
2317
 
2302
2318
 
2325
2341
    def update_format(self, tree):
2326
2342
        """Change the format marker."""
2327
2343
        tree._transport.put_bytes('format',
2328
 
            self.target_format.get_format_string(),
 
2344
            self.target_format.as_string(),
2329
2345
            mode=tree.bzrdir._get_file_mode())