1
# Copyright (C) 2007-2010 Canonical Ltd
1
# Copyright (C) 2005, 2006, 2007, 2008 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
1278
1288
if self._dirty:
1279
1289
raise AssertionError("attempting to write an inventory when the "
1280
1290
"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
1286
self._inventory = None
1288
delta = inv._make_delta(self.inventory)
1290
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:
1292
1294
self._inventory = inv
1319
1321
return statvalue, sha1
1322
class ContentFilteringDirStateWorkingTree(DirStateWorkingTree):
1323
"""Dirstate working tree that supports content filtering.
1325
The dirstate holds the hash and size of the canonical form of the file,
1326
and most methods must return that.
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.edge.launchpad.net/bzr/+bug/415508>.
1334
# If the dirstate cache is up to date and knows the hash and size,
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
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)
1348
1324
class WorkingTree4(DirStateWorkingTree):
1349
1325
"""This is the Format 4 working tree.
1385
1361
class DirStateWorkingTreeFormat(WorkingTreeFormat3):
1387
1362
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
1388
1363
accelerator_tree=None, hardlink=False):
1389
1364
"""See WorkingTreeFormat.initialize().
1428
1403
wt.lock_tree_write()
1430
1405
self._init_custom_control_files(wt)
1431
if revision_id in (None, _mod_revision.NULL_REVISION):
1406
if revision_id in (None, NULL_REVISION):
1432
1407
if branch.repository.supports_rich_root():
1433
1408
wt._set_root_id(generate_ids.gen_root_id())
1446
1421
if basis is None:
1447
1422
basis = branch.repository.revision_tree(revision_id)
1448
if revision_id == _mod_revision.NULL_REVISION:
1423
if revision_id == NULL_REVISION:
1449
1424
parents_list = []
1451
1426
parents_list = [(revision_id, basis)]
1459
1434
if basis_root_id is not None:
1460
1435
wt._set_root_id(basis_root_id)
1462
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
1466
delta_from_tree = False
1468
delta_from_tree = True
1469
1437
# delta_from_tree is safe even for DirStateRevisionTrees,
1470
1438
# because wt4.apply_inventory_delta does not mutate the input
1471
1439
# inventory entries.
1472
1440
transform.build_tree(basis, wt, accelerator_tree,
1474
delta_from_tree=delta_from_tree)
1441
hardlink=hardlink, delta_from_tree=True)
1587
1554
class DirStateRevisionTree(Tree):
1588
"""A revision tree pulling the inventory from a dirstate.
1590
Note that this is one of the historical (ie revision) trees cached in the
1591
dirstate for easy access, not the workingtree.
1555
"""A revision tree pulling the inventory from a dirstate."""
1594
1557
def __init__(self, dirstate, revision_id, repository):
1595
1558
self._dirstate = dirstate
1768
1731
parent_index = self._get_parent_index()
1769
1732
last_changed_revision = entry[1][parent_index][4]
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
1733
return self._repository.get_revision(last_changed_revision).timestamp
1776
1735
def get_file_sha1(self, file_id, path=None, stat_value=None):
1777
1736
entry = self._get_entry(file_id=file_id, path=path)
1844
1803
entry = self._get_entry(file_id=file_id)[1]
1845
1804
if entry is None:
1846
1805
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]]
1806
return dirstate.DirState._minikind_to_kind[entry[1][0]]
1850
1808
def stored_kind(self, file_id):
1851
1809
"""See Tree.stored_kind"""
1872
1830
return ie.executable
1874
def is_locked(self):
1877
def list_files(self, include_root=False, from_dir=None, recursive=True):
1832
def list_files(self, include_root=False):
1878
1833
# We use a standard implementation, because DirStateRevisionTree is
1879
1834
# dealing with one of the parents of the current state
1880
1835
inv = self._get_inventory()
1881
if from_dir is None:
1884
from_dir_id = inv.path2id(from_dir)
1885
if from_dir_id is None:
1886
# Directory not versioned
1888
entries = inv.iter_entries(from_dir=from_dir_id, recursive=recursive)
1889
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:
1891
1839
for path, entry in entries:
1892
1840
yield path, 'V', entry.kind, entry.file_id, entry
1894
1842
def lock_read(self):
1895
"""Lock the tree for a set of operations.
1897
:return: A bzrlib.lock.LogicalLockResult.
1843
"""Lock the tree for a set of operations."""
1899
1844
if not self._locked:
1900
1845
self._repository.lock_read()
1901
1846
if self._dirstate._lock_token is None:
1902
1847
self._dirstate.lock_read()
1903
1848
self._dirstate_locked = True
1904
1849
self._locked += 1
1905
return LogicalLockResult(self.unlock)
1907
1851
def _must_be_locked(self):
1908
1852
if not self._locked:
2001
def make_source_parent_tree_compiled_dirstate(klass, test_case, source,
1945
def make_source_parent_tree_compiled_dirstate(klass, test_case, source, target):
2003
1946
from bzrlib.tests.test__dirstate_helpers import \
2004
compiled_dirstate_helpers_feature
2005
test_case.requireFeature(compiled_dirstate_helpers_feature)
2006
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
2007
1952
result = klass.make_source_parent_tree(source, target)
2008
1953
result[1]._iter_changes = ProcessEntryC
2039
1984
output. An unversioned file is defined as one with (False, False)
2040
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
2042
1989
# TODO: handle extra trees in the dirstate.
2043
1990
if (extra_trees or specific_files == []):
2044
1991
# we can't fast-path these cases (yet)
2047
1994
require_versioned, want_unversioned=want_unversioned)
2048
1995
parent_ids = self.target.get_parent_ids()
2049
1996
if not (self.source._revision_id in parent_ids
2050
or self.source._revision_id == _mod_revision.NULL_REVISION):
1997
or self.source._revision_id == NULL_REVISION):
2051
1998
raise AssertionError(
2052
1999
"revision {%s} is not stored in {%s}, but %s "
2053
2000
"can only be used for trees stored in the dirstate"
2054
2001
% (self.source._revision_id, self.target, self.iter_changes))
2055
2002
target_index = 0
2056
if self.source._revision_id == _mod_revision.NULL_REVISION:
2003
if self.source._revision_id == NULL_REVISION:
2057
2004
source_index = None
2058
2005
indices = (target_index,)
2075
2022
specific_files = set([''])
2076
2023
# -- specific_files is now a utf8 path set --
2024
search_specific_files = set()
2078
2025
# -- get the state object and prepare it.
2079
2026
state = self.target.current_dirstate()
2080
2027
state._read_dirblocks_if_needed()
2081
2028
if require_versioned:
2082
2029
# -- check all supplied paths are versioned in a search tree. --
2030
all_versioned = True
2084
2031
for path in specific_files:
2085
2032
path_entries = state._entries_for_path(path)
2086
2033
if not path_entries:
2087
2034
# this specified path is not present at all: error
2088
not_versioned.append(path)
2035
all_versioned = False
2090
2037
found_versioned = False
2091
2038
# for each id at this path
2092
2039
for entry in path_entries:
2099
2046
if not found_versioned:
2100
2047
# none of the indexes was not 'absent' at all ids for this
2102
not_versioned.append(path)
2103
if len(not_versioned) > 0:
2104
raise errors.PathsNotVersionedError(not_versioned)
2049
all_versioned = False
2051
if not all_versioned:
2052
raise errors.PathsNotVersionedError(specific_files)
2105
2053
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2106
search_specific_files = osutils.minimum_path_selection(specific_files)
2054
for path in specific_files:
2055
other_specific_files = specific_files.difference(set([path]))
2056
if not osutils.is_inside_any(other_specific_files, path):
2057
# this is a top level path, we must check it.
2058
search_specific_files.add(path)
2108
2060
use_filesystem_for_exec = (sys.platform != 'win32')
2109
2061
iter_changes = self.target._iter_changes(include_unchanged,
2121
2073
(revisiontree.RevisionTree, DirStateRevisionTree)):
2123
2075
# the source revid must be in the target dirstate
2124
if not (source._revision_id == _mod_revision.NULL_REVISION or
2076
if not (source._revision_id == NULL_REVISION or
2125
2077
source._revision_id in target.get_parent_ids()):
2126
2078
# TODO: what about ghosts? it may well need to
2127
2079
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
