1333
1224
@needs_tree_write_lock
1334
1225
def _write_inventory(self, inv):
1335
1226
"""Write inventory as the current inventory."""
1337
raise AssertionError("attempting to write an inventory when the "
1338
"dirstate is dirty will lose pending changes")
1339
had_inventory = self._inventory is not None
1340
# Setting self._inventory = None forces the dirstate to regenerate the
1341
# working inventory. We do this because self.inventory may be inv, or
1342
# may have been modified, and either case would prevent a clean delta
1344
self._inventory = None
1346
delta = inv._make_delta(self.root_inventory)
1348
self.apply_inventory_delta(delta)
1227
assert not self._dirty, ("attempting to write an inventory when the "
1228
"dirstate is dirty will cause data loss")
1229
self.current_dirstate().set_state_from_inventory(inv)
1230
self._make_dirty(reset_inventory=False)
1231
if self._inventory is not None:
1350
1232
self._inventory = inv
1353
@needs_tree_write_lock
1354
def reset_state(self, revision_ids=None):
1355
"""Reset the state of the working tree.
1357
This does a hard-reset to a last-known-good state. This is a way to
1358
fix if something got corrupted (like the .bzr/checkout/dirstate file)
1360
if revision_ids is None:
1361
revision_ids = self.get_parent_ids()
1362
if not revision_ids:
1363
base_tree = self.branch.repository.revision_tree(
1364
_mod_revision.NULL_REVISION)
1367
trees = zip(revision_ids,
1368
self.branch.repository.revision_trees(revision_ids))
1369
base_tree = trees[0][1]
1370
state = self.current_dirstate()
1371
# We don't support ghosts yet
1372
state.set_state_from_scratch(base_tree.root_inventory, trees, [])
1375
class ContentFilterAwareSHA1Provider(dirstate.SHA1Provider):
1377
def __init__(self, tree):
1380
def sha1(self, abspath):
1381
"""See dirstate.SHA1Provider.sha1()."""
1382
filters = self.tree._content_filter_stack(
1383
self.tree.relpath(osutils.safe_unicode(abspath)))
1384
return _mod_filters.internal_size_sha_file_byname(abspath, filters)[1]
1386
def stat_and_sha1(self, abspath):
1387
"""See dirstate.SHA1Provider.stat_and_sha1()."""
1388
filters = self.tree._content_filter_stack(
1389
self.tree.relpath(osutils.safe_unicode(abspath)))
1390
file_obj = file(abspath, 'rb', 65000)
1392
statvalue = os.fstat(file_obj.fileno())
1394
file_obj = _mod_filters.filtered_input_file(file_obj, filters)
1395
sha1 = osutils.size_sha_file(file_obj)[1]
1398
return statvalue, sha1
1401
class ContentFilteringDirStateWorkingTree(DirStateWorkingTree):
1402
"""Dirstate working tree that supports content filtering.
1404
The dirstate holds the hash and size of the canonical form of the file,
1405
and most methods must return that.
1408
def _file_content_summary(self, path, stat_result):
1409
# This is to support the somewhat obsolete path_content_summary method
1410
# with content filtering: see
1411
# <https://bugs.launchpad.net/bzr/+bug/415508>.
1413
# If the dirstate cache is up to date and knows the hash and size,
1415
# Otherwise if there are no content filters, return the on-disk size
1416
# and leave the hash blank.
1417
# Otherwise, read and filter the on-disk file and use its size and
1420
# The dirstate doesn't store the size of the canonical form so we
1421
# can't trust it for content-filtered trees. We just return None.
1422
dirstate_sha1 = self._dirstate.sha1_from_stat(path, stat_result)
1423
executable = self._is_executable_from_path_and_stat(path, stat_result)
1424
return ('file', None, executable, dirstate_sha1)
1427
class WorkingTree4(DirStateWorkingTree):
1428
"""This is the Format 4 working tree.
1430
This differs from WorkingTree by:
1431
- Having a consolidated internal dirstate, stored in a
1432
randomly-accessible sorted file on disk.
1433
- Not having a regular inventory attribute. One can be synthesized
1434
on demand but this is expensive and should be avoided.
1436
This is new in bzr 0.15.
1440
class WorkingTree5(ContentFilteringDirStateWorkingTree):
1441
"""This is the Format 5 working tree.
1443
This differs from WorkingTree4 by:
1444
- Supporting content filtering.
1446
This is new in bzr 1.11.
1450
class WorkingTree6(ContentFilteringDirStateWorkingTree):
1451
"""This is the Format 6 working tree.
1453
This differs from WorkingTree5 by:
1454
- Supporting a current view that may mask the set of files in a tree
1455
impacted by most user operations.
1457
This is new in bzr 1.14.
1460
def _make_views(self):
1461
return views.PathBasedViews(self)
1464
class DirStateWorkingTreeFormat(WorkingTreeFormatMetaDir):
1466
missing_parent_conflicts = True
1468
supports_versioned_directories = True
1470
_lock_class = LockDir
1471
_lock_file_name = 'lock'
1473
def _open_control_files(self, a_bzrdir):
1474
transport = a_bzrdir.get_workingtree_transport(None)
1475
return LockableFiles(transport, self._lock_file_name,
1478
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
1479
accelerator_tree=None, hardlink=False):
1236
class WorkingTreeFormat4(WorkingTreeFormat3):
1237
"""The first consolidated dirstate working tree format.
1240
- exists within a metadir controlling .bzr
1241
- includes an explicit version marker for the workingtree control
1242
files, separate from the BzrDir format
1243
- modifies the hash cache format
1244
- is new in bzr 0.15
1245
- uses a LockDir to guard access to it.
1248
upgrade_recommended = False
1250
def get_format_string(self):
1251
"""See WorkingTreeFormat.get_format_string()."""
1252
return "Bazaar Working Tree Format 4 (bzr 0.15)\n"
1254
def get_format_description(self):
1255
"""See WorkingTreeFormat.get_format_description()."""
1256
return "Working tree format 4"
1258
def initialize(self, a_bzrdir, revision_id=None, from_branch=None):
1480
1259
"""See WorkingTreeFormat.initialize().
1482
1261
:param revision_id: allows creating a working tree at a different
1483
revision than the branch is at.
1484
:param accelerator_tree: A tree which can be used for retrieving file
1485
contents more quickly than the revision tree, i.e. a workingtree.
1486
The revision tree will be used for cases where accelerator_tree's
1487
content is different.
1488
:param hardlink: If true, hard-link files from accelerator_tree,
1262
revision than the branch is at.
1491
1264
These trees get an initial random root id, if their repository supports
1492
1265
rich root data, TREE_ROOT otherwise.
1519
1291
wt.lock_tree_write()
1521
self._init_custom_control_files(wt)
1522
if revision_id in (None, _mod_revision.NULL_REVISION):
1293
if revision_id in (None, NULL_REVISION):
1523
1294
if branch.repository.supports_rich_root():
1524
1295
wt._set_root_id(generate_ids.gen_root_id())
1526
1297
wt._set_root_id(ROOT_ID)
1529
# frequently, we will get here due to branching. The accelerator
1530
# tree will be the tree from the branch, so the desired basis
1531
# tree will often be a parent of the accelerator tree.
1532
if accelerator_tree is not None:
1534
basis = accelerator_tree.revision_tree(revision_id)
1535
except errors.NoSuchRevision:
1538
basis = branch.repository.revision_tree(revision_id)
1539
if revision_id == _mod_revision.NULL_REVISION:
1542
parents_list = [(revision_id, basis)]
1299
wt.set_last_revision(revision_id)
1301
basis = wt.basis_tree()
1543
1302
basis.lock_read()
1545
wt.set_parent_trees(parents_list, allow_leftmost_as_ghost=True)
1303
# if the basis has a root id we have to use that; otherwise we use
1305
basis_root_id = basis.get_root_id()
1306
if basis_root_id is not None:
1307
wt._set_root_id(basis_root_id)
1547
# if the basis has a root id we have to use that; otherwise we
1548
# use a new random one
1549
basis_root_id = basis.get_root_id()
1550
if basis_root_id is not None:
1551
wt._set_root_id(basis_root_id)
1553
if wt.supports_content_filtering():
1554
# The original tree may not have the same content filters
1555
# applied so we can't safely build the inventory delta from
1557
delta_from_tree = False
1559
delta_from_tree = True
1560
# delta_from_tree is safe even for DirStateRevisionTrees,
1561
# because wt4.apply_inventory_delta does not mutate the input
1562
# inventory entries.
1563
transform.build_tree(basis, wt, accelerator_tree,
1565
delta_from_tree=delta_from_tree)
1566
for hook in MutableTree.hooks['post_build_tree']:
1309
transform.build_tree(basis, wt)
1571
1312
control_files.unlock()
1575
def _init_custom_control_files(self, wt):
1576
"""Subclasses with custom control files should override this method.
1578
The working tree and control files are locked for writing when this
1581
:param wt: the WorkingTree object
1584
def open(self, a_bzrdir, _found=False):
1585
"""Return the WorkingTree object for a_bzrdir
1587
_found is a private parameter, do not use it. It is used to indicate
1588
if format probing has already been done.
1591
# we are being called directly and must probe.
1592
raise NotImplementedError
1593
if not isinstance(a_bzrdir.transport, LocalTransport):
1594
raise errors.NotLocalUrl(a_bzrdir.transport.base)
1595
wt = self._open(a_bzrdir, self._open_control_files(a_bzrdir))
1598
1316
def _open(self, a_bzrdir, control_files):
1599
1317
"""Open the tree itself.
1601
1319
:param a_bzrdir: the dir for the tree.
1602
1320
:param control_files: the control files for the tree.
1604
return self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
1322
return WorkingTree4(a_bzrdir.root_transport.local_abspath('.'),
1605
1323
branch=a_bzrdir.open_branch(),
1607
1325
_bzrdir=a_bzrdir,
1608
1326
_control_files=control_files)
1610
1328
def __get_matchingbzrdir(self):
1611
return self._get_matchingbzrdir()
1613
def _get_matchingbzrdir(self):
1614
"""Overrideable method to get a bzrdir for testing."""
1615
1329
# please test against something that will let us do tree references
1616
return controldir.format_registry.make_bzrdir(
1617
'development-subtree')
1330
return bzrdir.format_registry.make_bzrdir(
1331
'dirstate-with-subtree')
1619
1333
_matchingbzrdir = property(__get_matchingbzrdir)
1622
class WorkingTreeFormat4(DirStateWorkingTreeFormat):
1623
"""The first consolidated dirstate working tree format.
1626
- exists within a metadir controlling .bzr
1627
- includes an explicit version marker for the workingtree control
1628
files, separate from the ControlDir format
1629
- modifies the hash cache format
1630
- is new in bzr 0.15
1631
- uses a LockDir to guard access to it.
1634
upgrade_recommended = False
1636
_tree_class = WorkingTree4
1639
def get_format_string(cls):
1640
"""See WorkingTreeFormat.get_format_string()."""
1641
return "Bazaar Working Tree Format 4 (bzr 0.15)\n"
1643
def get_format_description(self):
1644
"""See WorkingTreeFormat.get_format_description()."""
1645
return "Working tree format 4"
1648
class WorkingTreeFormat5(DirStateWorkingTreeFormat):
1649
"""WorkingTree format supporting content filtering.
1652
upgrade_recommended = False
1654
_tree_class = WorkingTree5
1657
def get_format_string(cls):
1658
"""See WorkingTreeFormat.get_format_string()."""
1659
return "Bazaar Working Tree Format 5 (bzr 1.11)\n"
1661
def get_format_description(self):
1662
"""See WorkingTreeFormat.get_format_description()."""
1663
return "Working tree format 5"
1665
def supports_content_filtering(self):
1669
class WorkingTreeFormat6(DirStateWorkingTreeFormat):
1670
"""WorkingTree format supporting views.
1673
upgrade_recommended = False
1675
_tree_class = WorkingTree6
1678
def get_format_string(cls):
1679
"""See WorkingTreeFormat.get_format_string()."""
1680
return "Bazaar Working Tree Format 6 (bzr 1.14)\n"
1682
def get_format_description(self):
1683
"""See WorkingTreeFormat.get_format_description()."""
1684
return "Working tree format 6"
1686
def _init_custom_control_files(self, wt):
1687
"""Subclasses with custom control files should override this method."""
1688
wt._transport.put_bytes('views', '', mode=wt.bzrdir._get_file_mode())
1690
def supports_content_filtering(self):
1693
def supports_views(self):
1696
def _get_matchingbzrdir(self):
1697
"""Overrideable method to get a bzrdir for testing."""
1698
# We use 'development-subtree' instead of '2a', because we have a
1699
# few tests that want to test tree references
1700
return bzrdir.format_registry.make_bzrdir('development-subtree')
1703
class DirStateRevisionTree(InventoryTree):
1704
"""A revision tree pulling the inventory from a dirstate.
1706
Note that this is one of the historical (ie revision) trees cached in the
1707
dirstate for easy access, not the workingtree.
1336
class DirStateRevisionTree(Tree):
1337
"""A revision tree pulling the inventory from a dirstate."""
1710
1339
def __init__(self, dirstate, revision_id, repository):
1711
1340
self._dirstate = dirstate
2241
1797
if not found_versioned:
2242
1798
# none of the indexes was not 'absent' at all ids for this
2244
not_versioned.append(path.decode('utf-8'))
2245
if len(not_versioned) > 0:
2246
raise errors.PathsNotVersionedError(not_versioned)
1800
all_versioned = False
1802
if not all_versioned:
1803
raise errors.PathsNotVersionedError(specific_files)
2247
1804
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2248
search_specific_files = osutils.minimum_path_selection(specific_files)
1805
search_specific_files = set()
1806
for path in specific_files:
1807
other_specific_files = specific_files.difference(set([path]))
1808
if not osutils.is_inside_any(other_specific_files, path):
1809
# this is a top level path, we must check it.
1810
search_specific_files.add(path)
1812
# compare source_index and target_index at or under each element of search_specific_files.
1813
# follow the following comparison table. Note that we only want to do diff operations when
1814
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1818
# Source | Target | disk | action
1819
# r | fdlt | | add source to search, add id path move and perform
1820
# | | | diff check on source-target
1821
# r | fdlt | a | dangling file that was present in the basis.
1823
# r | a | | add source to search
1825
# r | r | | this path is present in a non-examined tree, skip.
1826
# r | r | a | this path is present in a non-examined tree, skip.
1827
# a | fdlt | | add new id
1828
# a | fdlt | a | dangling locally added file, skip
1829
# a | a | | not present in either tree, skip
1830
# a | a | a | not present in any tree, skip
1831
# a | r | | not present in either tree at this path, skip as it
1832
# | | | may not be selected by the users list of paths.
1833
# a | r | a | not present in either tree at this path, skip as it
1834
# | | | may not be selected by the users list of paths.
1835
# fdlt | fdlt | | content in both: diff them
1836
# fdlt | fdlt | a | deleted locally, but not unversioned - show as deleted ?
1837
# fdlt | a | | unversioned: output deleted id for now
1838
# fdlt | a | a | unversioned and deleted: output deleted id
1839
# fdlt | r | | relocated in this tree, so add target to search.
1840
# | | | Dont diff, we will see an r,fd; pair when we reach
1841
# | | | this id at the other path.
1842
# fdlt | r | a | relocated in this tree, so add target to search.
1843
# | | | Dont diff, we will see an r,fd; pair when we reach
1844
# | | | this id at the other path.
1846
# for all search_indexs in each path at or under each element of
1847
# search_specific_files, if the detail is relocated: add the id, and add the
1848
# relocated path as one to search if its not searched already. If the
1849
# detail is not relocated, add the id.
1850
searched_specific_files = set()
1851
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1852
# Using a list so that we can access the values and change them in
1853
# nested scope. Each one is [path, file_id, entry]
1854
last_source_parent = [None, None]
1855
last_target_parent = [None, None]
2250
1857
use_filesystem_for_exec = (sys.platform != 'win32')
2251
iter_changes = self.target._iter_changes(include_unchanged,
2252
use_filesystem_for_exec, search_specific_files, state,
2253
source_index, target_index, want_unversioned, self.target)
2254
return iter_changes.iter_changes()
1859
# Just a sentry, so that _process_entry can say that this
1860
# record is handled, but isn't interesting to process (unchanged)
1861
uninteresting = object()
1864
old_dirname_to_file_id = {}
1865
new_dirname_to_file_id = {}
1866
# TODO: jam 20070516 - Avoid the _get_entry lookup overhead by
1867
# keeping a cache of directories that we have seen.
1869
def _process_entry(entry, path_info):
1870
"""Compare an entry and real disk to generate delta information.
1872
:param path_info: top_relpath, basename, kind, lstat, abspath for
1873
the path of entry. If None, then the path is considered absent.
1874
(Perhaps we should pass in a concrete entry for this ?)
1875
Basename is returned as a utf8 string because we expect this
1876
tuple will be ignored, and don't want to take the time to
1878
:return: None if these don't match
1879
A tuple of information about the change, or
1880
the object 'uninteresting' if these match, but are
1881
basically identical.
1883
if source_index is None:
1884
source_details = NULL_PARENT_DETAILS
1886
source_details = entry[1][source_index]
1887
target_details = entry[1][target_index]
1888
target_minikind = target_details[0]
1889
if path_info is not None and target_minikind in 'fdlt':
1890
assert target_index == 0
1891
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
1892
stat_value=path_info[3])
1893
# The entry may have been modified by update_entry
1894
target_details = entry[1][target_index]
1895
target_minikind = target_details[0]
1898
file_id = entry[0][2]
1899
source_minikind = source_details[0]
1900
if source_minikind in 'fdltr' and target_minikind in 'fdlt':
1901
# claimed content in both: diff
1902
# r | fdlt | | add source to search, add id path move and perform
1903
# | | | diff check on source-target
1904
# r | fdlt | a | dangling file that was present in the basis.
1906
if source_minikind in 'r':
1907
# add the source to the search path to find any children it
1908
# has. TODO ? : only add if it is a container ?
1909
if not osutils.is_inside_any(searched_specific_files,
1911
search_specific_files.add(source_details[1])
1912
# generate the old path; this is needed for stating later
1914
old_path = source_details[1]
1915
old_dirname, old_basename = os.path.split(old_path)
1916
path = pathjoin(entry[0][0], entry[0][1])
1917
old_entry = state._get_entry(source_index,
1919
# update the source details variable to be the real
1921
source_details = old_entry[1][source_index]
1922
source_minikind = source_details[0]
1924
old_dirname = entry[0][0]
1925
old_basename = entry[0][1]
1926
old_path = path = None
1927
if path_info is None:
1928
# the file is missing on disk, show as removed.
1929
content_change = True
1933
# source and target are both versioned and disk file is present.
1934
target_kind = path_info[2]
1935
if target_kind == 'directory':
1937
old_path = path = pathjoin(old_dirname, old_basename)
1938
new_dirname_to_file_id[path] = file_id
1939
if source_minikind != 'd':
1940
content_change = True
1942
# directories have no fingerprint
1943
content_change = False
1945
elif target_kind == 'file':
1946
if source_minikind != 'f':
1947
content_change = True
1949
# We could check the size, but we already have the
1951
content_change = (link_or_sha1 != source_details[1])
1952
# Target details is updated at update_entry time
1953
if use_filesystem_for_exec:
1954
# We don't need S_ISREG here, because we are sure
1955
# we are dealing with a file.
1956
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
1958
target_exec = target_details[3]
1959
elif target_kind == 'symlink':
1960
if source_minikind != 'l':
1961
content_change = True
1963
content_change = (link_or_sha1 != source_details[1])
1965
elif target_kind == 'tree-reference':
1966
if source_minikind != 't':
1967
content_change = True
1969
content_change = False
1972
raise Exception, "unknown kind %s" % path_info[2]
1973
if source_minikind == 'd':
1975
old_path = path = pathjoin(old_dirname, old_basename)
1976
old_dirname_to_file_id[old_path] = file_id
1977
# parent id is the entry for the path in the target tree
1978
if old_dirname == last_source_parent[0]:
1979
source_parent_id = last_source_parent[1]
1982
source_parent_id = old_dirname_to_file_id[old_dirname]
1984
source_parent_entry = state._get_entry(source_index,
1985
path_utf8=old_dirname)
1986
source_parent_id = source_parent_entry[0][2]
1987
if source_parent_id == entry[0][2]:
1988
# This is the root, so the parent is None
1989
source_parent_id = None
1991
last_source_parent[0] = old_dirname
1992
last_source_parent[1] = source_parent_id
1993
new_dirname = entry[0][0]
1994
if new_dirname == last_target_parent[0]:
1995
target_parent_id = last_target_parent[1]
1998
target_parent_id = new_dirname_to_file_id[new_dirname]
2000
# TODO: We don't always need to do the lookup, because the
2001
# parent entry will be the same as the source entry.
2002
target_parent_entry = state._get_entry(target_index,
2003
path_utf8=new_dirname)
2004
assert target_parent_entry != (None, None), (
2005
"Could not find target parent in wt: %s\nparent of: %s"
2006
% (new_dirname, entry))
2007
target_parent_id = target_parent_entry[0][2]
2008
if target_parent_id == entry[0][2]:
2009
# This is the root, so the parent is None
2010
target_parent_id = None
2012
last_target_parent[0] = new_dirname
2013
last_target_parent[1] = target_parent_id
2015
source_exec = source_details[3]
2016
if (include_unchanged
2018
or source_parent_id != target_parent_id
2019
or old_basename != entry[0][1]
2020
or source_exec != target_exec
2022
if old_path is None:
2023
old_path = path = pathjoin(old_dirname, old_basename)
2024
old_path_u = utf8_decode(old_path)[0]
2027
old_path_u = utf8_decode(old_path)[0]
2028
if old_path == path:
2031
path_u = utf8_decode(path)[0]
2032
source_kind = _minikind_to_kind[source_minikind]
2033
return (entry[0][2],
2034
(old_path_u, path_u),
2037
(source_parent_id, target_parent_id),
2038
(utf8_decode(old_basename)[0], utf8_decode(entry[0][1])[0]),
2039
(source_kind, target_kind),
2040
(source_exec, target_exec))
2042
return uninteresting
2043
elif source_minikind in 'a' and target_minikind in 'fdlt':
2044
# looks like a new file
2045
if path_info is not None:
2046
path = pathjoin(entry[0][0], entry[0][1])
2047
# parent id is the entry for the path in the target tree
2048
# TODO: these are the same for an entire directory: cache em.
2049
parent_id = state._get_entry(target_index,
2050
path_utf8=entry[0][0])[0][2]
2051
if parent_id == entry[0][2]:
2053
if use_filesystem_for_exec:
2054
# We need S_ISREG here, because we aren't sure if this
2057
stat.S_ISREG(path_info[3].st_mode)
2058
and stat.S_IEXEC & path_info[3].st_mode)
2060
target_exec = target_details[3]
2061
return (entry[0][2],
2062
(None, utf8_decode(path)[0]),
2066
(None, utf8_decode(entry[0][1])[0]),
2067
(None, path_info[2]),
2068
(None, target_exec))
2070
# but its not on disk: we deliberately treat this as just
2071
# never-present. (Why ?! - RBC 20070224)
2073
elif source_minikind in 'fdlt' and target_minikind in 'a':
2074
# unversioned, possibly, or possibly not deleted: we dont care.
2075
# if its still on disk, *and* theres no other entry at this
2076
# path [we dont know this in this routine at the moment -
2077
# perhaps we should change this - then it would be an unknown.
2078
old_path = pathjoin(entry[0][0], entry[0][1])
2079
# parent id is the entry for the path in the target tree
2080
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
2081
if parent_id == entry[0][2]:
2083
return (entry[0][2],
2084
(utf8_decode(old_path)[0], None),
2088
(utf8_decode(entry[0][1])[0], None),
2089
(_minikind_to_kind[source_minikind], None),
2090
(source_details[3], None))
2091
elif source_minikind in 'fdlt' and target_minikind in 'r':
2092
# a rename; could be a true rename, or a rename inherited from
2093
# a renamed parent. TODO: handle this efficiently. Its not
2094
# common case to rename dirs though, so a correct but slow
2095
# implementation will do.
2096
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
2097
search_specific_files.add(target_details[1])
2098
elif source_minikind in 'ra' and target_minikind in 'ra':
2099
# neither of the selected trees contain this file,
2100
# so skip over it. This is not currently directly tested, but
2101
# is indirectly via test_too_much.TestCommands.test_conflicts.
2104
raise AssertionError("don't know how to compare "
2105
"source_minikind=%r, target_minikind=%r"
2106
% (source_minikind, target_minikind))
2107
## import pdb;pdb.set_trace()
2110
while search_specific_files:
2111
# TODO: the pending list should be lexically sorted? the
2112
# interface doesn't require it.
2113
current_root = search_specific_files.pop()
2114
current_root_unicode = current_root.decode('utf8')
2115
searched_specific_files.add(current_root)
2116
# process the entries for this containing directory: the rest will be
2117
# found by their parents recursively.
2118
root_entries = _entries_for_path(current_root)
2119
root_abspath = self.target.abspath(current_root_unicode)
2121
root_stat = os.lstat(root_abspath)
2123
if e.errno == errno.ENOENT:
2124
# the path does not exist: let _process_entry know that.
2125
root_dir_info = None
2127
# some other random error: hand it up.
2130
root_dir_info = ('', current_root,
2131
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
2133
if root_dir_info[2] == 'directory':
2134
if self.target._directory_is_tree_reference(
2135
current_root.decode('utf8')):
2136
root_dir_info = root_dir_info[:2] + \
2137
('tree-reference',) + root_dir_info[3:]
2139
if not root_entries and not root_dir_info:
2140
# this specified path is not present at all, skip it.
2142
path_handled = False
2143
for entry in root_entries:
2144
result = _process_entry(entry, root_dir_info)
2145
if result is not None:
2147
if result is not uninteresting:
2149
if want_unversioned and not path_handled and root_dir_info:
2150
new_executable = bool(
2151
stat.S_ISREG(root_dir_info[3].st_mode)
2152
and stat.S_IEXEC & root_dir_info[3].st_mode)
2154
(None, current_root_unicode),
2158
(None, splitpath(current_root_unicode)[-1]),
2159
(None, root_dir_info[2]),
2160
(None, new_executable)
2162
initial_key = (current_root, '', '')
2163
block_index, _ = state._find_block_index_from_key(initial_key)
2164
if block_index == 0:
2165
# we have processed the total root already, but because the
2166
# initial key matched it we should skip it here.
2168
if root_dir_info and root_dir_info[2] == 'tree-reference':
2169
current_dir_info = None
2171
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
2173
current_dir_info = dir_iterator.next()
2175
# on win32, python2.4 has e.errno == ERROR_DIRECTORY, but
2176
# python 2.5 has e.errno == EINVAL,
2177
# and e.winerror == ERROR_DIRECTORY
2178
e_winerror = getattr(e, 'winerror', None)
2179
win_errors = (ERROR_DIRECTORY, ERROR_PATH_NOT_FOUND)
2180
# there may be directories in the inventory even though
2181
# this path is not a file on disk: so mark it as end of
2183
if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
2184
current_dir_info = None
2185
elif (sys.platform == 'win32'
2186
and (e.errno in win_errors
2187
or e_winerror in win_errors)):
2188
current_dir_info = None
2192
if current_dir_info[0][0] == '':
2193
# remove .bzr from iteration
2194
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
2195
assert current_dir_info[1][bzr_index][0] == '.bzr'
2196
del current_dir_info[1][bzr_index]
2197
# walk until both the directory listing and the versioned metadata
2199
if (block_index < len(state._dirblocks) and
2200
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2201
current_block = state._dirblocks[block_index]
2203
current_block = None
2204
while (current_dir_info is not None or
2205
current_block is not None):
2206
if (current_dir_info and current_block
2207
and current_dir_info[0][0] != current_block[0]):
2208
if cmp_by_dirs(current_dir_info[0][0], current_block[0]) < 0:
2209
# filesystem data refers to paths not covered by the dirblock.
2210
# this has two possibilities:
2211
# A) it is versioned but empty, so there is no block for it
2212
# B) it is not versioned.
2214
# if (A) then we need to recurse into it to check for
2215
# new unknown files or directories.
2216
# if (B) then we should ignore it, because we don't
2217
# recurse into unknown directories.
2219
while path_index < len(current_dir_info[1]):
2220
current_path_info = current_dir_info[1][path_index]
2221
if want_unversioned:
2222
if current_path_info[2] == 'directory':
2223
if self.target._directory_is_tree_reference(
2224
current_path_info[0].decode('utf8')):
2225
current_path_info = current_path_info[:2] + \
2226
('tree-reference',) + current_path_info[3:]
2227
new_executable = bool(
2228
stat.S_ISREG(current_path_info[3].st_mode)
2229
and stat.S_IEXEC & current_path_info[3].st_mode)
2231
(None, utf8_decode(current_path_info[0])[0]),
2235
(None, utf8_decode(current_path_info[1])[0]),
2236
(None, current_path_info[2]),
2237
(None, new_executable))
2238
# dont descend into this unversioned path if it is
2240
if current_path_info[2] in ('directory',
2242
del current_dir_info[1][path_index]
2246
# This dir info has been handled, go to the next
2248
current_dir_info = dir_iterator.next()
2249
except StopIteration:
2250
current_dir_info = None
2252
# We have a dirblock entry for this location, but there
2253
# is no filesystem path for this. This is most likely
2254
# because a directory was removed from the disk.
2255
# We don't have to report the missing directory,
2256
# because that should have already been handled, but we
2257
# need to handle all of the files that are contained
2259
for current_entry in current_block[1]:
2260
# entry referring to file not present on disk.
2261
# advance the entry only, after processing.
2262
result = _process_entry(current_entry, None)
2263
if result is not None:
2264
if result is not uninteresting:
2267
if (block_index < len(state._dirblocks) and
2268
osutils.is_inside(current_root,
2269
state._dirblocks[block_index][0])):
2270
current_block = state._dirblocks[block_index]
2272
current_block = None
2275
if current_block and entry_index < len(current_block[1]):
2276
current_entry = current_block[1][entry_index]
2278
current_entry = None
2279
advance_entry = True
2281
if current_dir_info and path_index < len(current_dir_info[1]):
2282
current_path_info = current_dir_info[1][path_index]
2283
if current_path_info[2] == 'directory':
2284
if self.target._directory_is_tree_reference(
2285
current_path_info[0].decode('utf8')):
2286
current_path_info = current_path_info[:2] + \
2287
('tree-reference',) + current_path_info[3:]
2289
current_path_info = None
2291
path_handled = False
2292
while (current_entry is not None or
2293
current_path_info is not None):
2294
if current_entry is None:
2295
# the check for path_handled when the path is adnvaced
2296
# will yield this path if needed.
2298
elif current_path_info is None:
2299
# no path is fine: the per entry code will handle it.
2300
result = _process_entry(current_entry, current_path_info)
2301
if result is not None:
2302
if result is not uninteresting:
2304
elif (current_entry[0][1] != current_path_info[1]
2305
or current_entry[1][target_index][0] in 'ar'):
2306
# The current path on disk doesn't match the dirblock
2307
# record. Either the dirblock is marked as absent, or
2308
# the file on disk is not present at all in the
2309
# dirblock. Either way, report about the dirblock
2310
# entry, and let other code handle the filesystem one.
2312
# Compare the basename for these files to determine
2314
if current_path_info[1] < current_entry[0][1]:
2315
# extra file on disk: pass for now, but only
2316
# increment the path, not the entry
2317
advance_entry = False
2319
# entry referring to file not present on disk.
2320
# advance the entry only, after processing.
2321
result = _process_entry(current_entry, None)
2322
if result is not None:
2323
if result is not uninteresting:
2325
advance_path = False
2327
result = _process_entry(current_entry, current_path_info)
2328
if result is not None:
2330
if result is not uninteresting:
2332
if advance_entry and current_entry is not None:
2334
if entry_index < len(current_block[1]):
2335
current_entry = current_block[1][entry_index]
2337
current_entry = None
2339
advance_entry = True # reset the advance flaga
2340
if advance_path and current_path_info is not None:
2341
if not path_handled:
2342
# unversioned in all regards
2343
if want_unversioned:
2344
new_executable = bool(
2345
stat.S_ISREG(current_path_info[3].st_mode)
2346
and stat.S_IEXEC & current_path_info[3].st_mode)
2348
(None, utf8_decode(current_path_info[0])[0]),
2352
(None, utf8_decode(current_path_info[1])[0]),
2353
(None, current_path_info[2]),
2354
(None, new_executable))
2355
# dont descend into this unversioned path if it is
2357
if current_path_info[2] in ('directory'):
2358
del current_dir_info[1][path_index]
2360
# dont descend the disk iterator into any tree
2362
if current_path_info[2] == 'tree-reference':
2363
del current_dir_info[1][path_index]
2366
if path_index < len(current_dir_info[1]):
2367
current_path_info = current_dir_info[1][path_index]
2368
if current_path_info[2] == 'directory':
2369
if self.target._directory_is_tree_reference(
2370
current_path_info[0].decode('utf8')):
2371
current_path_info = current_path_info[:2] + \
2372
('tree-reference',) + current_path_info[3:]
2374
current_path_info = None
2375
path_handled = False
2377
advance_path = True # reset the advance flagg.
2378
if current_block is not None:
2380
if (block_index < len(state._dirblocks) and
2381
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2382
current_block = state._dirblocks[block_index]
2384
current_block = None
2385
if current_dir_info is not None:
2387
current_dir_info = dir_iterator.next()
2388
except StopIteration:
2389
current_dir_info = None
2257
2393
def is_compatible(source, target):
2258
2394
# the target must be a dirstate working tree
2259
if not isinstance(target, DirStateWorkingTree):
2395
if not isinstance(target, WorkingTree4):
2261
# the source must be a revtree or dirstate rev tree.
2397
# the source must be a revtreee or dirstate rev tree.
2262
2398
if not isinstance(source,
2263
2399
(revisiontree.RevisionTree, DirStateRevisionTree)):
2265
2401
# the source revid must be in the target dirstate
2266
if not (source._revision_id == _mod_revision.NULL_REVISION or
2402
if not (source._revision_id == NULL_REVISION or
2267
2403
source._revision_id in target.get_parent_ids()):
2268
# TODO: what about ghosts? it may well need to
2404
# TODO: what about ghosts? it may well need to
2269
2405
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
