1
# Copyright (C) 2007-2010 Canonical Ltd
1
# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
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
29
29
from bzrlib.lazy_import import lazy_import
30
30
lazy_import(globals(), """
31
from bisect import bisect_left
33
from copy import deepcopy
35
42
from bzrlib import (
45
conflicts as _mod_conflicts,
43
55
revision as _mod_revision,
49
65
import bzrlib.branch
66
from bzrlib.transport import get_transport
70
from bzrlib import symbol_versioning
53
71
from bzrlib.decorators import needs_read_lock, needs_write_lock
54
72
from bzrlib.filters import filtered_input_file, internal_size_sha_file_byname
55
from bzrlib.inventory import Inventory, ROOT_ID, entry_factory
56
from bzrlib.lock import LogicalLockResult
73
from bzrlib.inventory import InventoryEntry, Inventory, ROOT_ID, entry_factory
74
import bzrlib.mutabletree
57
75
from bzrlib.mutabletree import needs_tree_write_lock
58
76
from bzrlib.osutils import (
65
from bzrlib.trace import mutter
86
from bzrlib.trace import mutter, note
66
87
from bzrlib.transport.local import LocalTransport
67
88
from bzrlib.tree import InterTree
89
from bzrlib.progress import DummyProgress, ProgressPhase
90
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
91
from bzrlib.rio import RioReader, rio_file, Stanza
92
from bzrlib.symbol_versioning import (deprecated_passed,
68
97
from bzrlib.tree import Tree
69
98
from bzrlib.workingtree import WorkingTree, WorkingTree3, WorkingTreeFormat3
435
464
return osutils.lexists(pathjoin(
436
465
self.basedir, row[0].decode('utf8'), row[1].decode('utf8')))
438
def has_or_had_id(self, file_id):
439
state = self.current_dirstate()
440
row, parents = self._get_entry(file_id=file_id)
441
return row is not None
444
468
def id2path(self, file_id):
445
469
"Convert a file-id to a path."
568
592
return _mod_revision.NULL_REVISION
570
594
def lock_read(self):
571
"""See Branch.lock_read, and WorkingTree.unlock.
573
:return: A bzrlib.lock.LogicalLockResult.
595
"""See Branch.lock_read, and WorkingTree.unlock."""
575
596
self.branch.lock_read()
577
598
self._control_files.lock_read()
612
632
self.branch.unlock()
614
return LogicalLockResult(self.unlock)
616
635
def lock_tree_write(self):
617
"""See MutableTree.lock_tree_write, and WorkingTree.unlock.
619
:return: A bzrlib.lock.LogicalLockResult.
636
"""See MutableTree.lock_tree_write, and WorkingTree.unlock."""
621
637
self.branch.lock_read()
622
return self._lock_self_write()
638
self._lock_self_write()
624
640
def lock_write(self):
625
"""See MutableTree.lock_write, and WorkingTree.unlock.
627
:return: A bzrlib.lock.LogicalLockResult.
641
"""See MutableTree.lock_write, and WorkingTree.unlock."""
629
642
self.branch.lock_write()
630
return self._lock_self_write()
643
self._lock_self_write()
632
645
@needs_tree_write_lock
633
646
def move(self, from_paths, to_dir, after=False):
703
716
from_entry = self._get_entry(path=from_rel)
704
717
if from_entry == (None, None):
705
718
raise errors.BzrMoveFailedError(from_rel,to_dir,
706
errors.NotVersionedError(path=from_rel))
719
errors.NotVersionedError(path=str(from_rel)))
708
721
from_id = from_entry[0][2]
709
722
to_rel = pathjoin(to_dir, from_tail)
1038
1051
def set_last_revision(self, new_revision):
1039
1052
"""Change the last revision in the working tree."""
1040
1053
parents = self.get_parent_ids()
1041
if new_revision in (_mod_revision.NULL_REVISION, None):
1054
if new_revision in (NULL_REVISION, None):
1042
1055
if len(parents) >= 2:
1043
1056
raise AssertionError(
1044
1057
"setting the last parent to none with a pending merge is "
1211
1224
# just forget the whole block.
1212
1225
entry_index = 0
1213
1226
while entry_index < len(block[1]):
1227
# Mark this file id as having been removed
1214
1228
entry = block[1][entry_index]
1215
if entry[1][0][0] in 'ar':
1216
# don't remove absent or renamed entries
1229
ids_to_unversion.discard(entry[0][2])
1230
if (entry[1][0][0] in 'ar' # don't remove absent or renamed
1232
or not state._make_absent(entry)):
1217
1233
entry_index += 1
1219
# Mark this file id as having been removed
1220
ids_to_unversion.discard(entry[0][2])
1221
if not state._make_absent(entry):
1222
# The block has not shrunk.
1224
1234
# go to the next block. (At the moment we dont delete empty
1226
1236
block_index += 1
1247
1257
# have to change the legacy inventory too.
1248
1258
if self._inventory is not None:
1249
1259
for file_id in file_ids:
1250
if self._inventory.has_id(file_id):
1251
self._inventory.remove_recursive_id(file_id)
1260
self._inventory.remove_recursive_id(file_id)
1253
1262
@needs_tree_write_lock
1254
1263
def rename_one(self, from_rel, to_rel, after=False):
1279
1288
if self._dirty:
1280
1289
raise AssertionError("attempting to write an inventory when the "
1281
1290
"dirstate is dirty will lose pending changes")
1282
had_inventory = self._inventory is not None
1283
# Setting self._inventory = None forces the dirstate to regenerate the
1284
# working inventory. We do this because self.inventory may be inv, or
1285
# may have been modified, and either case would prevent a clean delta
1287
self._inventory = None
1289
delta = inv._make_delta(self.inventory)
1291
self.apply_inventory_delta(delta)
1291
self.current_dirstate().set_state_from_inventory(inv)
1292
self._make_dirty(reset_inventory=False)
1293
if self._inventory is not None:
1293
1294
self._inventory = inv
1320
1321
return statvalue, sha1
1323
class ContentFilteringDirStateWorkingTree(DirStateWorkingTree):
1324
"""Dirstate working tree that supports content filtering.
1326
The dirstate holds the hash and size of the canonical form of the file,
1327
and most methods must return that.
1330
def _file_content_summary(self, path, stat_result):
1331
# This is to support the somewhat obsolete path_content_summary method
1332
# with content filtering: see
1333
# <https://bugs.launchpad.net/bzr/+bug/415508>.
1335
# If the dirstate cache is up to date and knows the hash and size,
1337
# Otherwise if there are no content filters, return the on-disk size
1338
# and leave the hash blank.
1339
# Otherwise, read and filter the on-disk file and use its size and
1342
# The dirstate doesn't store the size of the canonical form so we
1343
# can't trust it for content-filtered trees. We just return None.
1344
dirstate_sha1 = self._dirstate.sha1_from_stat(path, stat_result)
1345
executable = self._is_executable_from_path_and_stat(path, stat_result)
1346
return ('file', None, executable, dirstate_sha1)
1349
1324
class WorkingTree4(DirStateWorkingTree):
1350
1325
"""This is the Format 4 working tree.
1386
1361
class DirStateWorkingTreeFormat(WorkingTreeFormat3):
1388
1362
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
1389
1363
accelerator_tree=None, hardlink=False):
1390
1364
"""See WorkingTreeFormat.initialize().
1429
1403
wt.lock_tree_write()
1431
1405
self._init_custom_control_files(wt)
1432
if revision_id in (None, _mod_revision.NULL_REVISION):
1406
if revision_id in (None, NULL_REVISION):
1433
1407
if branch.repository.supports_rich_root():
1434
1408
wt._set_root_id(generate_ids.gen_root_id())
1447
1421
if basis is None:
1448
1422
basis = branch.repository.revision_tree(revision_id)
1449
if revision_id == _mod_revision.NULL_REVISION:
1423
if revision_id == NULL_REVISION:
1450
1424
parents_list = []
1452
1426
parents_list = [(revision_id, basis)]
1460
1434
if basis_root_id is not None:
1461
1435
wt._set_root_id(basis_root_id)
1463
if wt.supports_content_filtering():
1464
# The original tree may not have the same content filters
1465
# applied so we can't safely build the inventory delta from
1467
delta_from_tree = False
1469
delta_from_tree = True
1470
1437
# delta_from_tree is safe even for DirStateRevisionTrees,
1471
1438
# because wt4.apply_inventory_delta does not mutate the input
1472
1439
# inventory entries.
1473
1440
transform.build_tree(basis, wt, accelerator_tree,
1475
delta_from_tree=delta_from_tree)
1441
hardlink=hardlink, delta_from_tree=True)
1588
1554
class DirStateRevisionTree(Tree):
1589
"""A revision tree pulling the inventory from a dirstate.
1591
Note that this is one of the historical (ie revision) trees cached in the
1592
dirstate for easy access, not the workingtree.
1555
"""A revision tree pulling the inventory from a dirstate."""
1595
1557
def __init__(self, dirstate, revision_id, repository):
1596
1558
self._dirstate = dirstate
1738
1700
elif kind == 'directory':
1739
1701
parent_ies[(dirname + '/' + name).strip('/')] = inv_entry
1740
1702
elif kind == 'symlink':
1703
inv_entry.executable = False
1704
inv_entry.text_size = None
1741
1705
inv_entry.symlink_target = utf8_decode(fingerprint)[0]
1742
1706
elif kind == 'tree-reference':
1743
1707
inv_entry.reference_revision = fingerprint or None
1767
1731
parent_index = self._get_parent_index()
1768
1732
last_changed_revision = entry[1][parent_index][4]
1770
rev = self._repository.get_revision(last_changed_revision)
1771
except errors.NoSuchRevision:
1772
raise errors.FileTimestampUnavailable(self.id2path(file_id))
1773
return rev.timestamp
1733
return self._repository.get_revision(last_changed_revision).timestamp
1775
1735
def get_file_sha1(self, file_id, path=None, stat_value=None):
1776
1736
entry = self._get_entry(file_id=file_id, path=path)
1843
1803
entry = self._get_entry(file_id=file_id)[1]
1844
1804
if entry is None:
1845
1805
raise errors.NoSuchId(tree=self, file_id=file_id)
1846
parent_index = self._get_parent_index()
1847
return dirstate.DirState._minikind_to_kind[entry[parent_index][0]]
1806
return dirstate.DirState._minikind_to_kind[entry[1][0]]
1849
1808
def stored_kind(self, file_id):
1850
1809
"""See Tree.stored_kind"""
1871
1830
return ie.executable
1873
def is_locked(self):
1876
def list_files(self, include_root=False, from_dir=None, recursive=True):
1832
def list_files(self, include_root=False):
1877
1833
# We use a standard implementation, because DirStateRevisionTree is
1878
1834
# dealing with one of the parents of the current state
1879
1835
inv = self._get_inventory()
1880
if from_dir is None:
1883
from_dir_id = inv.path2id(from_dir)
1884
if from_dir_id is None:
1885
# Directory not versioned
1887
entries = inv.iter_entries(from_dir=from_dir_id, recursive=recursive)
1888
if inv.root is not None and not include_root and from_dir is None:
1836
entries = inv.iter_entries()
1837
if self.inventory.root is not None and not include_root:
1890
1839
for path, entry in entries:
1891
1840
yield path, 'V', entry.kind, entry.file_id, entry
1893
1842
def lock_read(self):
1894
"""Lock the tree for a set of operations.
1896
:return: A bzrlib.lock.LogicalLockResult.
1843
"""Lock the tree for a set of operations."""
1898
1844
if not self._locked:
1899
1845
self._repository.lock_read()
1900
1846
if self._dirstate._lock_token is None:
1901
1847
self._dirstate.lock_read()
1902
1848
self._dirstate_locked = True
1903
1849
self._locked += 1
1904
return LogicalLockResult(self.unlock)
1906
1851
def _must_be_locked(self):
1907
1852
if not self._locked:
2000
def make_source_parent_tree_compiled_dirstate(klass, test_case, source,
1945
def make_source_parent_tree_compiled_dirstate(klass, test_case, source, target):
2002
1946
from bzrlib.tests.test__dirstate_helpers import \
2003
compiled_dirstate_helpers_feature
2004
test_case.requireFeature(compiled_dirstate_helpers_feature)
2005
from bzrlib._dirstate_helpers_pyx import ProcessEntryC
1947
CompiledDirstateHelpersFeature
1948
if not CompiledDirstateHelpersFeature.available():
1949
from bzrlib.tests import UnavailableFeature
1950
raise UnavailableFeature(CompiledDirstateHelpersFeature)
1951
from bzrlib._dirstate_helpers_c import ProcessEntryC
2006
1952
result = klass.make_source_parent_tree(source, target)
2007
1953
result[1]._iter_changes = ProcessEntryC
2038
1984
output. An unversioned file is defined as one with (False, False)
2039
1985
for the versioned pair.
1987
# NB: show_status depends on being able to pass in non-versioned files
1988
# and report them as unknown
2041
1989
# TODO: handle extra trees in the dirstate.
2042
1990
if (extra_trees or specific_files == []):
2043
1991
# we can't fast-path these cases (yet)
2046
1994
require_versioned, want_unversioned=want_unversioned)
2047
1995
parent_ids = self.target.get_parent_ids()
2048
1996
if not (self.source._revision_id in parent_ids
2049
or self.source._revision_id == _mod_revision.NULL_REVISION):
1997
or self.source._revision_id == NULL_REVISION):
2050
1998
raise AssertionError(
2051
1999
"revision {%s} is not stored in {%s}, but %s "
2052
2000
"can only be used for trees stored in the dirstate"
2053
2001
% (self.source._revision_id, self.target, self.iter_changes))
2054
2002
target_index = 0
2055
if self.source._revision_id == _mod_revision.NULL_REVISION:
2003
if self.source._revision_id == NULL_REVISION:
2056
2004
source_index = None
2057
2005
indices = (target_index,)
2079
2027
state._read_dirblocks_if_needed()
2080
2028
if require_versioned:
2081
2029
# -- check all supplied paths are versioned in a search tree. --
2030
all_versioned = True
2083
2031
for path in specific_files:
2084
2032
path_entries = state._entries_for_path(path)
2085
2033
if not path_entries:
2086
2034
# this specified path is not present at all: error
2087
not_versioned.append(path)
2035
all_versioned = False
2089
2037
found_versioned = False
2090
2038
# for each id at this path
2091
2039
for entry in path_entries:
2098
2046
if not found_versioned:
2099
2047
# none of the indexes was not 'absent' at all ids for this
2101
not_versioned.append(path)
2102
if len(not_versioned) > 0:
2103
raise errors.PathsNotVersionedError(not_versioned)
2049
all_versioned = False
2051
if not all_versioned:
2052
raise errors.PathsNotVersionedError(specific_files)
2104
2053
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2105
2054
search_specific_files = osutils.minimum_path_selection(specific_files)
2120
2069
(revisiontree.RevisionTree, DirStateRevisionTree)):
2122
2071
# the source revid must be in the target dirstate
2123
if not (source._revision_id == _mod_revision.NULL_REVISION or
2072
if not (source._revision_id == NULL_REVISION or
2124
2073
source._revision_id in target.get_parent_ids()):
2125
2074
# TODO: what about ghosts? it may well need to
2126
2075
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
