← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Vincent Ladeuil
  • Date: 2010-07-07 15:03:14 UTC
  • mto: (5355.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5356.
  • Revision ID: v.ladeuil+lp@free.fr-20100707150314-7i5po3dwg8umiv8x
Fix remaining sphinx_conf references.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
1
 
# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
 
1
# Copyright (C) 2007-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
53
53
from bzrlib.decorators import needs_read_lock, needs_write_lock
54
54
from bzrlib.filters import filtered_input_file, internal_size_sha_file_byname
55
55
from bzrlib.inventory import Inventory, ROOT_ID, entry_factory
56
 
import bzrlib.mutabletree
 
56
from bzrlib.lock import LogicalLockResult
57
57
from bzrlib.mutabletree import needs_tree_write_lock
58
58
from bzrlib.osutils import (
59
59
    file_kind,
568
568
            return _mod_revision.NULL_REVISION
569
569
 
570
570
    def lock_read(self):
571
 
        """See Branch.lock_read, and WorkingTree.unlock."""
 
571
        """See Branch.lock_read, and WorkingTree.unlock.
 
572
 
 
573
        :return: A bzrlib.lock.LogicalLockResult.
 
574
        """
572
575
        self.branch.lock_read()
573
576
        try:
574
577
            self._control_files.lock_read()
587
590
        except:
588
591
            self.branch.unlock()
589
592
            raise
 
593
        return LogicalLockResult(self.unlock)
590
594
 
591
595
    def _lock_self_write(self):
592
596
        """This should be called after the branch is locked."""
607
611
        except:
608
612
            self.branch.unlock()
609
613
            raise
 
614
        return LogicalLockResult(self.unlock)
610
615
 
611
616
    def lock_tree_write(self):
612
 
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
 
617
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
 
618
 
 
619
        :return: A bzrlib.lock.LogicalLockResult.
 
620
        """
613
621
        self.branch.lock_read()
614
 
        self._lock_self_write()
 
622
        return self._lock_self_write()
615
623
 
616
624
    def lock_write(self):
617
 
        """See MutableTree.lock_write, and WorkingTree.unlock."""
 
625
        """See MutableTree.lock_write, and WorkingTree.unlock.
 
626
 
 
627
        :return: A bzrlib.lock.LogicalLockResult.
 
628
        """
618
629
        self.branch.lock_write()
619
 
        self._lock_self_write()
 
630
        return self._lock_self_write()
620
631
 
621
632
    @needs_tree_write_lock
622
633
    def move(self, from_paths, to_dir, after=False):
1267
1278
        if self._dirty:
1268
1279
            raise AssertionError("attempting to write an inventory when the "
1269
1280
                "dirstate is dirty will lose pending changes")
1270
 
        self.current_dirstate().set_state_from_inventory(inv)
1271
 
        self._make_dirty(reset_inventory=False)
1272
 
        if self._inventory is not None:
 
1281
        had_inventory = self._inventory is not None
 
1282
        # Setting self._inventory = None forces the dirstate to regenerate the
 
1283
        # working inventory. We do this because self.inventory may be inv, or
 
1284
        # may have been modified, and either case would prevent a clean delta
 
1285
        # being created.
 
1286
        self._inventory = None
 
1287
        # generate a delta,
 
1288
        delta = inv._make_delta(self.inventory)
 
1289
        # and apply it.
 
1290
        self.apply_inventory_delta(delta)
 
1291
        if had_inventory:
1273
1292
            self._inventory = inv
1274
1293
        self.flush()
1275
1294
 
1300
1319
        return statvalue, sha1
1301
1320
 
1302
1321
 
 
1322
class ContentFilteringDirStateWorkingTree(DirStateWorkingTree):
 
1323
    """Dirstate working tree that supports content filtering.
 
1324
 
 
1325
    The dirstate holds the hash and size of the canonical form of the file, 
 
1326
    and most methods must return that.
 
1327
    """
 
1328
 
 
1329
    def _file_content_summary(self, path, stat_result):
 
1330
        # This is to support the somewhat obsolete path_content_summary method
 
1331
        # with content filtering: see
 
1332
        # <https://bugs.launchpad.net/bzr/+bug/415508>.
 
1333
        #
 
1334
        # If the dirstate cache is up to date and knows the hash and size,
 
1335
        # return that.
 
1336
        # Otherwise if there are no content filters, return the on-disk size
 
1337
        # and leave the hash blank.
 
1338
        # Otherwise, read and filter the on-disk file and use its size and
 
1339
        # hash.
 
1340
        #
 
1341
        # The dirstate doesn't store the size of the canonical form so we
 
1342
        # can't trust it for content-filtered trees.  We just return None.
 
1343
        dirstate_sha1 = self._dirstate.sha1_from_stat(path, stat_result)
 
1344
        executable = self._is_executable_from_path_and_stat(path, stat_result)
 
1345
        return ('file', None, executable, dirstate_sha1)
 
1346
 
 
1347
 
1303
1348
class WorkingTree4(DirStateWorkingTree):
1304
1349
    """This is the Format 4 working tree.
1305
1350
 
1313
1358
    """
1314
1359
 
1315
1360
 
1316
 
class WorkingTree5(DirStateWorkingTree):
 
1361
class WorkingTree5(ContentFilteringDirStateWorkingTree):
1317
1362
    """This is the Format 5 working tree.
1318
1363
 
1319
1364
    This differs from WorkingTree4 by:
1323
1368
    """
1324
1369
 
1325
1370
 
1326
 
class WorkingTree6(DirStateWorkingTree):
 
1371
class WorkingTree6(ContentFilteringDirStateWorkingTree):
1327
1372
    """This is the Format 6 working tree.
1328
1373
 
1329
1374
    This differs from WorkingTree5 by:
1338
1383
 
1339
1384
 
1340
1385
class DirStateWorkingTreeFormat(WorkingTreeFormat3):
 
1386
 
1341
1387
    def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
1342
1388
                   accelerator_tree=None, hardlink=False):
1343
1389
        """See WorkingTreeFormat.initialize().
1413
1459
                if basis_root_id is not None:
1414
1460
                    wt._set_root_id(basis_root_id)
1415
1461
                    wt.flush()
1416
 
                # If content filtering is supported, do not use the accelerator
1417
 
                # tree - the cost of transforming the content both ways and
1418
 
                # checking for changed content can outweight the gains it gives.
1419
 
                # Note: do NOT move this logic up higher - using the basis from
1420
 
                # the accelerator tree is still desirable because that can save
1421
 
                # a minute or more of processing on large trees!
1422
 
                # The original tree may not have the same content filters
1423
 
                # applied so we can't safely build the inventory delta from
1424
 
                # the source tree.
1425
1462
                if wt.supports_content_filtering():
1426
 
                    accelerator_tree = None
 
1463
                    # The original tree may not have the same content filters
 
1464
                    # applied so we can't safely build the inventory delta from
 
1465
                    # the source tree.
1427
1466
                    delta_from_tree = False
1428
1467
                else:
1429
1468
                    delta_from_tree = True
1546
1585
 
1547
1586
 
1548
1587
class DirStateRevisionTree(Tree):
1549
 
    """A revision tree pulling the inventory from a dirstate."""
 
1588
    """A revision tree pulling the inventory from a dirstate.
 
1589
    
 
1590
    Note that this is one of the historical (ie revision) trees cached in the
 
1591
    dirstate for easy access, not the workingtree.
 
1592
    """
1550
1593
 
1551
1594
    def __init__(self, dirstate, revision_id, repository):
1552
1595
        self._dirstate = dirstate
1724
1767
            return None
1725
1768
        parent_index = self._get_parent_index()
1726
1769
        last_changed_revision = entry[1][parent_index][4]
1727
 
        return self._repository.get_revision(last_changed_revision).timestamp
 
1770
        try:
 
1771
            rev = self._repository.get_revision(last_changed_revision)
 
1772
        except errors.NoSuchRevision:
 
1773
            raise errors.FileTimestampUnavailable(self.id2path(file_id))
 
1774
        return rev.timestamp
1728
1775
 
1729
1776
    def get_file_sha1(self, file_id, path=None, stat_value=None):
1730
1777
        entry = self._get_entry(file_id=file_id, path=path)
1797
1844
        entry = self._get_entry(file_id=file_id)[1]
1798
1845
        if entry is None:
1799
1846
            raise errors.NoSuchId(tree=self, file_id=file_id)
1800
 
        return dirstate.DirState._minikind_to_kind[entry[1][0]]
 
1847
        parent_index = self._get_parent_index()
 
1848
        return dirstate.DirState._minikind_to_kind[entry[parent_index][0]]
1801
1849
 
1802
1850
    def stored_kind(self, file_id):
1803
1851
        """See Tree.stored_kind"""
1823
1871
            return None
1824
1872
        return ie.executable
1825
1873
 
 
1874
    def is_locked(self):
 
1875
        return self._locked
 
1876
 
1826
1877
    def list_files(self, include_root=False, from_dir=None, recursive=True):
1827
1878
        # We use a standard implementation, because DirStateRevisionTree is
1828
1879
        # dealing with one of the parents of the current state
1841
1892
            yield path, 'V', entry.kind, entry.file_id, entry
1842
1893
 
1843
1894
    def lock_read(self):
1844
 
        """Lock the tree for a set of operations."""
 
1895
        """Lock the tree for a set of operations.
 
1896
 
 
1897
        :return: A bzrlib.lock.LogicalLockResult.
 
1898
        """
1845
1899
        if not self._locked:
1846
1900
            self._repository.lock_read()
1847
1901
            if self._dirstate._lock_token is None:
1848
1902
                self._dirstate.lock_read()
1849
1903
                self._dirstate_locked = True
1850
1904
        self._locked += 1
 
1905
        return LogicalLockResult(self.unlock)
1851
1906
 
1852
1907
    def _must_be_locked(self):
1853
1908
        if not self._locked:
1943
1998
        return result
1944
1999
 
1945
2000
    @classmethod
1946
 
    def make_source_parent_tree_compiled_dirstate(klass, test_case, source, target):
 
2001
    def make_source_parent_tree_compiled_dirstate(klass, test_case, source,
 
2002
                                                  target):
1947
2003
        from bzrlib.tests.test__dirstate_helpers import \
1948
 
            CompiledDirstateHelpersFeature
1949
 
        if not CompiledDirstateHelpersFeature.available():
1950
 
            from bzrlib.tests import UnavailableFeature
1951
 
            raise UnavailableFeature(CompiledDirstateHelpersFeature)
 
2004
            compiled_dirstate_helpers_feature
 
2005
        test_case.requireFeature(compiled_dirstate_helpers_feature)
1952
2006
        from bzrlib._dirstate_helpers_pyx import ProcessEntryC
1953
2007
        result = klass.make_source_parent_tree(source, target)
1954
2008
        result[1]._iter_changes = ProcessEntryC
1985
2039
            output. An unversioned file is defined as one with (False, False)
1986
2040
            for the versioned pair.
1987
2041
        """
1988
 
        # NB: show_status depends on being able to pass in non-versioned files
1989
 
        # and report them as unknown
1990
2042
        # TODO: handle extra trees in the dirstate.
1991
2043
        if (extra_trees or specific_files == []):
1992
2044
            # we can't fast-path these cases (yet)