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

  • Committer: Robert Collins
  • Date: 2009-09-28 03:36:45 UTC
  • mto: This revision was merged to the branch mainline in revision 4717.
  • Revision ID: robertc@robertcollins.net-20090928033645-aztpo1itop56o61h
Up the count slightly to allow for PQM slowness.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
1
 
# Copyright (C) 2007-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2008, 2009 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
 
from bzrlib.lock import LogicalLockResult
 
56
import bzrlib.mutabletree
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.
572
 
 
573
 
        :return: A bzrlib.lock.LogicalLockResult.
574
 
        """
 
571
        """See Branch.lock_read, and WorkingTree.unlock."""
575
572
        self.branch.lock_read()
576
573
        try:
577
574
            self._control_files.lock_read()
590
587
        except:
591
588
            self.branch.unlock()
592
589
            raise
593
 
        return LogicalLockResult(self.unlock)
594
590
 
595
591
    def _lock_self_write(self):
596
592
        """This should be called after the branch is locked."""
611
607
        except:
612
608
            self.branch.unlock()
613
609
            raise
614
 
        return LogicalLockResult(self.unlock)
615
610
 
616
611
    def lock_tree_write(self):
617
 
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
618
 
 
619
 
        :return: A bzrlib.lock.LogicalLockResult.
620
 
        """
 
612
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
621
613
        self.branch.lock_read()
622
 
        return self._lock_self_write()
 
614
        self._lock_self_write()
623
615
 
624
616
    def lock_write(self):
625
 
        """See MutableTree.lock_write, and WorkingTree.unlock.
626
 
 
627
 
        :return: A bzrlib.lock.LogicalLockResult.
628
 
        """
 
617
        """See MutableTree.lock_write, and WorkingTree.unlock."""
629
618
        self.branch.lock_write()
630
 
        return self._lock_self_write()
 
619
        self._lock_self_write()
631
620
 
632
621
    @needs_tree_write_lock
633
622
    def move(self, from_paths, to_dir, after=False):
1278
1267
        if self._dirty:
1279
1268
            raise AssertionError("attempting to write an inventory when the "
1280
1269
                "dirstate is dirty will lose pending changes")
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:
 
1270
        self.current_dirstate().set_state_from_inventory(inv)
 
1271
        self._make_dirty(reset_inventory=False)
 
1272
        if self._inventory is not None:
1292
1273
            self._inventory = inv
1293
1274
        self.flush()
1294
1275
 
1383
1364
 
1384
1365
 
1385
1366
class DirStateWorkingTreeFormat(WorkingTreeFormat3):
1386
 
 
1387
1367
    def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
1388
1368
                   accelerator_tree=None, hardlink=False):
1389
1369
        """See WorkingTreeFormat.initialize().
1459
1439
                if basis_root_id is not None:
1460
1440
                    wt._set_root_id(basis_root_id)
1461
1441
                    wt.flush()
 
1442
                # If content filtering is supported, do not use the accelerator
 
1443
                # tree - the cost of transforming the content both ways and
 
1444
                # checking for changed content can outweight the gains it gives.
 
1445
                # Note: do NOT move this logic up higher - using the basis from
 
1446
                # the accelerator tree is still desirable because that can save
 
1447
                # a minute or more of processing on large trees!
 
1448
                # The original tree may not have the same content filters
 
1449
                # applied so we can't safely build the inventory delta from
 
1450
                # the source tree.
1462
1451
                if wt.supports_content_filtering():
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.
 
1452
                    if hardlink:
 
1453
                        # see https://bugs.edge.launchpad.net/bzr/+bug/408193
 
1454
                        trace.warning("hardlinking working copy files is not currently "
 
1455
                            "supported in %r" % (wt,))
 
1456
                    accelerator_tree = None
1466
1457
                    delta_from_tree = False
1467
1458
                else:
1468
1459
                    delta_from_tree = True
1767
1758
            return None
1768
1759
        parent_index = self._get_parent_index()
1769
1760
        last_changed_revision = entry[1][parent_index][4]
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
 
1761
        return self._repository.get_revision(last_changed_revision).timestamp
1775
1762
 
1776
1763
    def get_file_sha1(self, file_id, path=None, stat_value=None):
1777
1764
        entry = self._get_entry(file_id=file_id, path=path)
1844
1831
        entry = self._get_entry(file_id=file_id)[1]
1845
1832
        if entry is None:
1846
1833
            raise errors.NoSuchId(tree=self, file_id=file_id)
1847
 
        parent_index = self._get_parent_index()
1848
 
        return dirstate.DirState._minikind_to_kind[entry[parent_index][0]]
 
1834
        return dirstate.DirState._minikind_to_kind[entry[1][0]]
1849
1835
 
1850
1836
    def stored_kind(self, file_id):
1851
1837
        """See Tree.stored_kind"""
1871
1857
            return None
1872
1858
        return ie.executable
1873
1859
 
1874
 
    def is_locked(self):
1875
 
        return self._locked
1876
 
 
1877
1860
    def list_files(self, include_root=False, from_dir=None, recursive=True):
1878
1861
        # We use a standard implementation, because DirStateRevisionTree is
1879
1862
        # dealing with one of the parents of the current state
1892
1875
            yield path, 'V', entry.kind, entry.file_id, entry
1893
1876
 
1894
1877
    def lock_read(self):
1895
 
        """Lock the tree for a set of operations.
1896
 
 
1897
 
        :return: A bzrlib.lock.LogicalLockResult.
1898
 
        """
 
1878
        """Lock the tree for a set of operations."""
1899
1879
        if not self._locked:
1900
1880
            self._repository.lock_read()
1901
1881
            if self._dirstate._lock_token is None:
1902
1882
                self._dirstate.lock_read()
1903
1883
                self._dirstate_locked = True
1904
1884
        self._locked += 1
1905
 
        return LogicalLockResult(self.unlock)
1906
1885
 
1907
1886
    def _must_be_locked(self):
1908
1887
        if not self._locked:
1998
1977
        return result
1999
1978
 
2000
1979
    @classmethod
2001
 
    def make_source_parent_tree_compiled_dirstate(klass, test_case, source,
2002
 
                                                  target):
 
1980
    def make_source_parent_tree_compiled_dirstate(klass, test_case, source, target):
2003
1981
        from bzrlib.tests.test__dirstate_helpers import \
2004
 
            compiled_dirstate_helpers_feature
2005
 
        test_case.requireFeature(compiled_dirstate_helpers_feature)
 
1982
            CompiledDirstateHelpersFeature
 
1983
        if not CompiledDirstateHelpersFeature.available():
 
1984
            from bzrlib.tests import UnavailableFeature
 
1985
            raise UnavailableFeature(CompiledDirstateHelpersFeature)
2006
1986
        from bzrlib._dirstate_helpers_pyx import ProcessEntryC
2007
1987
        result = klass.make_source_parent_tree(source, target)
2008
1988
        result[1]._iter_changes = ProcessEntryC
2039
2019
            output. An unversioned file is defined as one with (False, False)
2040
2020
            for the versioned pair.
2041
2021
        """
 
2022
        # NB: show_status depends on being able to pass in non-versioned files
 
2023
        # and report them as unknown
2042
2024
        # TODO: handle extra trees in the dirstate.
2043
2025
        if (extra_trees or specific_files == []):
2044
2026
            # we can't fast-path these cases (yet)