1220
1333
@needs_tree_write_lock
1221
1334
def _write_inventory(self, inv):
1222
1335
"""Write inventory as the current inventory."""
1223
assert not self._dirty, "attempting to write an inventory when the dirstate is dirty will cause data loss"
1224
self.current_dirstate().set_state_from_inventory(inv)
1225
self._make_dirty(reset_inventory=False)
1226
if self._inventory is not None:
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
1350
self._inventory = inv
1231
class WorkingTreeFormat4(WorkingTreeFormat3):
1232
"""The first consolidated dirstate working tree format.
1235
- exists within a metadir controlling .bzr
1236
- includes an explicit version marker for the workingtree control
1237
files, separate from the BzrDir format
1238
- modifies the hash cache format
1239
- is new in bzr 0.15
1240
- uses a LockDir to guard access to it.
1243
upgrade_recommended = False
1245
def get_format_string(self):
1246
"""See WorkingTreeFormat.get_format_string()."""
1247
return "Bazaar Working Tree Format 4 (bzr 0.15)\n"
1249
def get_format_description(self):
1250
"""See WorkingTreeFormat.get_format_description()."""
1251
return "Working tree format 4"
1253
def initialize(self, a_bzrdir, revision_id=None):
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):
1254
1480
"""See WorkingTreeFormat.initialize().
1256
1482
:param revision_id: allows creating a working tree at a different
1257
revision than the branch is at.
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,
1259
1491
These trees get an initial random root id, if their repository supports
1260
1492
rich root data, TREE_ROOT otherwise.
1283
1519
wt.lock_tree_write()
1285
if revision_id in (None, NULL_REVISION):
1521
self._init_custom_control_files(wt)
1522
if revision_id in (None, _mod_revision.NULL_REVISION):
1286
1523
if branch.repository.supports_rich_root():
1287
1524
wt._set_root_id(generate_ids.gen_root_id())
1289
1526
wt._set_root_id(ROOT_ID)
1291
wt.set_last_revision(revision_id)
1293
basis = wt.basis_tree()
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)]
1294
1543
basis.lock_read()
1295
# if the basis has a root id we have to use that; otherwise we use
1297
basis_root_id = basis.get_root_id()
1298
if basis_root_id is not None:
1299
wt._set_root_id(basis_root_id)
1545
wt.set_parent_trees(parents_list, allow_leftmost_as_ghost=True)
1301
transform.build_tree(basis, wt)
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']:
1304
1571
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))
1308
1598
def _open(self, a_bzrdir, control_files):
1309
1599
"""Open the tree itself.
1311
1601
:param a_bzrdir: the dir for the tree.
1312
1602
:param control_files: the control files for the tree.
1314
return WorkingTree4(a_bzrdir.root_transport.local_abspath('.'),
1604
return self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
1315
1605
branch=a_bzrdir.open_branch(),
1317
1607
_bzrdir=a_bzrdir,
1318
1608
_control_files=control_files)
1320
1610
def __get_matchingbzrdir(self):
1611
return self._get_matchingbzrdir()
1613
def _get_matchingbzrdir(self):
1614
"""Overrideable method to get a bzrdir for testing."""
1321
1615
# please test against something that will let us do tree references
1322
return bzrdir.format_registry.make_bzrdir(
1323
'dirstate-with-subtree')
1616
return controldir.format_registry.make_bzrdir(
1617
'development-subtree')
1325
1619
_matchingbzrdir = property(__get_matchingbzrdir)
1328
class DirStateRevisionTree(Tree):
1329
"""A revision tree pulling the inventory from a dirstate."""
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.
1331
1710
def __init__(self, dirstate, revision_id, repository):
1332
1711
self._dirstate = dirstate
1789
2241
if not found_versioned:
1790
2242
# none of the indexes was not 'absent' at all ids for this
1792
all_versioned = False
1794
if not all_versioned:
1795
raise errors.PathsNotVersionedError(specific_files)
2244
not_versioned.append(path.decode('utf-8'))
2245
if len(not_versioned) > 0:
2246
raise errors.PathsNotVersionedError(not_versioned)
1796
2247
# -- remove redundancy in supplied specific_files to prevent over-scanning --
1797
search_specific_files = set()
1798
for path in specific_files:
1799
other_specific_files = specific_files.difference(set([path]))
1800
if not osutils.is_inside_any(other_specific_files, path):
1801
# this is a top level path, we must check it.
1802
search_specific_files.add(path)
1804
# compare source_index and target_index at or under each element of search_specific_files.
1805
# follow the following comparison table. Note that we only want to do diff operations when
1806
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1810
# Source | Target | disk | action
1811
# r | fdlt | | add source to search, add id path move and perform
1812
# | | | diff check on source-target
1813
# r | fdlt | a | dangling file that was present in the basis.
1815
# r | a | | add source to search
1817
# r | r | | this path is present in a non-examined tree, skip.
1818
# r | r | a | this path is present in a non-examined tree, skip.
1819
# a | fdlt | | add new id
1820
# a | fdlt | a | dangling locally added file, skip
1821
# a | a | | not present in either tree, skip
1822
# a | a | a | not present in any tree, skip
1823
# a | r | | not present in either tree at this path, skip as it
1824
# | | | may not be selected by the users list of paths.
1825
# a | r | a | not present in either tree at this path, skip as it
1826
# | | | may not be selected by the users list of paths.
1827
# fdlt | fdlt | | content in both: diff them
1828
# fdlt | fdlt | a | deleted locally, but not unversioned - show as deleted ?
1829
# fdlt | a | | unversioned: output deleted id for now
1830
# fdlt | a | a | unversioned and deleted: output deleted id
1831
# fdlt | r | | relocated in this tree, so add target to search.
1832
# | | | Dont diff, we will see an r,fd; pair when we reach
1833
# | | | this id at the other path.
1834
# fdlt | r | a | relocated in this tree, so add target to search.
1835
# | | | Dont diff, we will see an r,fd; pair when we reach
1836
# | | | this id at the other path.
1838
# for all search_indexs in each path at or under each element of
1839
# search_specific_files, if the detail is relocated: add the id, and add the
1840
# relocated path as one to search if its not searched already. If the
1841
# detail is not relocated, add the id.
1842
searched_specific_files = set()
1843
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1844
# Using a list so that we can access the values and change them in
1845
# nested scope. Each one is [path, file_id, entry]
1846
last_source_parent = [None, None]
1847
last_target_parent = [None, None]
2248
search_specific_files = osutils.minimum_path_selection(specific_files)
1849
2250
use_filesystem_for_exec = (sys.platform != 'win32')
1851
# Just a sentry, so that _process_entry can say that this
1852
# record is handled, but isn't interesting to process (unchanged)
1853
uninteresting = object()
1856
old_dirname_to_file_id = {}
1857
new_dirname_to_file_id = {}
1858
# TODO: jam 20070516 - Avoid the _get_entry lookup overhead by
1859
# keeping a cache of directories that we have seen.
1861
def _process_entry(entry, path_info):
1862
"""Compare an entry and real disk to generate delta information.
1864
:param path_info: top_relpath, basename, kind, lstat, abspath for
1865
the path of entry. If None, then the path is considered absent.
1866
(Perhaps we should pass in a concrete entry for this ?)
1867
Basename is returned as a utf8 string because we expect this
1868
tuple will be ignored, and don't want to take the time to
1870
:return: None if these don't match
1871
A tuple of information about the change, or
1872
the object 'uninteresting' if these match, but are
1873
basically identical.
1875
if source_index is None:
1876
source_details = NULL_PARENT_DETAILS
1878
source_details = entry[1][source_index]
1879
target_details = entry[1][target_index]
1880
target_minikind = target_details[0]
1881
if path_info is not None and target_minikind in 'fdlt':
1882
assert target_index == 0
1883
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
1884
stat_value=path_info[3])
1885
# The entry may have been modified by update_entry
1886
target_details = entry[1][target_index]
1887
target_minikind = target_details[0]
1890
file_id = entry[0][2]
1891
source_minikind = source_details[0]
1892
if source_minikind in 'fdltr' and target_minikind in 'fdlt':
1893
# claimed content in both: diff
1894
# r | fdlt | | add source to search, add id path move and perform
1895
# | | | diff check on source-target
1896
# r | fdlt | a | dangling file that was present in the basis.
1898
if source_minikind in 'r':
1899
# add the source to the search path to find any children it
1900
# has. TODO ? : only add if it is a container ?
1901
if not osutils.is_inside_any(searched_specific_files,
1903
search_specific_files.add(source_details[1])
1904
# generate the old path; this is needed for stating later
1906
old_path = source_details[1]
1907
old_dirname, old_basename = os.path.split(old_path)
1908
path = pathjoin(entry[0][0], entry[0][1])
1909
old_entry = state._get_entry(source_index,
1911
# update the source details variable to be the real
1913
source_details = old_entry[1][source_index]
1914
source_minikind = source_details[0]
1916
old_dirname = entry[0][0]
1917
old_basename = entry[0][1]
1918
old_path = path = None
1919
if path_info is None:
1920
# the file is missing on disk, show as removed.
1921
content_change = True
1925
# source and target are both versioned and disk file is present.
1926
target_kind = path_info[2]
1927
if target_kind == 'directory':
1929
old_path = path = pathjoin(old_dirname, old_basename)
1930
new_dirname_to_file_id[path] = file_id
1931
if source_minikind != 'd':
1932
content_change = True
1934
# directories have no fingerprint
1935
content_change = False
1937
elif target_kind == 'file':
1938
if source_minikind != 'f':
1939
content_change = True
1941
# We could check the size, but we already have the
1943
content_change = (link_or_sha1 != source_details[1])
1944
# Target details is updated at update_entry time
1945
if use_filesystem_for_exec:
1946
# We don't need S_ISREG here, because we are sure
1947
# we are dealing with a file.
1948
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
1950
target_exec = target_details[3]
1951
elif target_kind == 'symlink':
1952
if source_minikind != 'l':
1953
content_change = True
1955
content_change = (link_or_sha1 != source_details[1])
1957
elif target_kind == 'tree-reference':
1958
if source_minikind != 't':
1959
content_change = True
1961
content_change = False
1964
raise Exception, "unknown kind %s" % path_info[2]
1965
if source_minikind == 'd':
1967
old_path = path = pathjoin(old_dirname, old_basename)
1968
old_dirname_to_file_id[old_path] = file_id
1969
# parent id is the entry for the path in the target tree
1970
if old_dirname == last_source_parent[0]:
1971
source_parent_id = last_source_parent[1]
1974
source_parent_id = old_dirname_to_file_id[old_dirname]
1976
source_parent_entry = state._get_entry(source_index,
1977
path_utf8=old_dirname)
1978
source_parent_id = source_parent_entry[0][2]
1979
if source_parent_id == entry[0][2]:
1980
# This is the root, so the parent is None
1981
source_parent_id = None
1983
last_source_parent[0] = old_dirname
1984
last_source_parent[1] = source_parent_id
1985
new_dirname = entry[0][0]
1986
if new_dirname == last_target_parent[0]:
1987
target_parent_id = last_target_parent[1]
1990
target_parent_id = new_dirname_to_file_id[new_dirname]
1992
# TODO: We don't always need to do the lookup, because the
1993
# parent entry will be the same as the source entry.
1994
target_parent_entry = state._get_entry(target_index,
1995
path_utf8=new_dirname)
1996
assert target_parent_entry != (None, None), (
1997
"Could not find target parent in wt: %s\nparent of: %s"
1998
% (new_dirname, entry))
1999
target_parent_id = target_parent_entry[0][2]
2000
if target_parent_id == entry[0][2]:
2001
# This is the root, so the parent is None
2002
target_parent_id = None
2004
last_target_parent[0] = new_dirname
2005
last_target_parent[1] = target_parent_id
2007
source_exec = source_details[3]
2008
if (include_unchanged
2010
or source_parent_id != target_parent_id
2011
or old_basename != entry[0][1]
2012
or source_exec != target_exec
2014
if old_path is None:
2015
old_path = path = pathjoin(old_dirname, old_basename)
2016
old_path_u = utf8_decode(old_path)[0]
2019
old_path_u = utf8_decode(old_path)[0]
2020
if old_path == path:
2023
path_u = utf8_decode(path)[0]
2024
source_kind = _minikind_to_kind[source_minikind]
2025
return (entry[0][2],
2026
(old_path_u, path_u),
2029
(source_parent_id, target_parent_id),
2030
(utf8_decode(old_basename)[0], utf8_decode(entry[0][1])[0]),
2031
(source_kind, target_kind),
2032
(source_exec, target_exec))
2034
return uninteresting
2035
elif source_minikind in 'a' and target_minikind in 'fdlt':
2036
# looks like a new file
2037
if path_info is not None:
2038
path = pathjoin(entry[0][0], entry[0][1])
2039
# parent id is the entry for the path in the target tree
2040
# TODO: these are the same for an entire directory: cache em.
2041
parent_id = state._get_entry(target_index,
2042
path_utf8=entry[0][0])[0][2]
2043
if parent_id == entry[0][2]:
2045
if use_filesystem_for_exec:
2046
# We need S_ISREG here, because we aren't sure if this
2049
stat.S_ISREG(path_info[3].st_mode)
2050
and stat.S_IEXEC & path_info[3].st_mode)
2052
target_exec = target_details[3]
2053
return (entry[0][2],
2054
(None, utf8_decode(path)[0]),
2058
(None, utf8_decode(entry[0][1])[0]),
2059
(None, path_info[2]),
2060
(None, target_exec))
2062
# but its not on disk: we deliberately treat this as just
2063
# never-present. (Why ?! - RBC 20070224)
2065
elif source_minikind in 'fdlt' and target_minikind in 'a':
2066
# unversioned, possibly, or possibly not deleted: we dont care.
2067
# if its still on disk, *and* theres no other entry at this
2068
# path [we dont know this in this routine at the moment -
2069
# perhaps we should change this - then it would be an unknown.
2070
old_path = pathjoin(entry[0][0], entry[0][1])
2071
# parent id is the entry for the path in the target tree
2072
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
2073
if parent_id == entry[0][2]:
2075
return (entry[0][2],
2076
(utf8_decode(old_path)[0], None),
2080
(utf8_decode(entry[0][1])[0], None),
2081
(_minikind_to_kind[source_minikind], None),
2082
(source_details[3], None))
2083
elif source_minikind in 'fdlt' and target_minikind in 'r':
2084
# a rename; could be a true rename, or a rename inherited from
2085
# a renamed parent. TODO: handle this efficiently. Its not
2086
# common case to rename dirs though, so a correct but slow
2087
# implementation will do.
2088
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
2089
search_specific_files.add(target_details[1])
2090
elif source_minikind in 'ra' and target_minikind in 'ra':
2091
# neither of the selected trees contain this file,
2092
# so skip over it. This is not currently directly tested, but
2093
# is indirectly via test_too_much.TestCommands.test_conflicts.
2096
raise AssertionError("don't know how to compare "
2097
"source_minikind=%r, target_minikind=%r"
2098
% (source_minikind, target_minikind))
2099
## import pdb;pdb.set_trace()
2102
while search_specific_files:
2103
# TODO: the pending list should be lexically sorted? the
2104
# interface doesn't require it.
2105
current_root = search_specific_files.pop()
2106
current_root_unicode = current_root.decode('utf8')
2107
searched_specific_files.add(current_root)
2108
# process the entries for this containing directory: the rest will be
2109
# found by their parents recursively.
2110
root_entries = _entries_for_path(current_root)
2111
root_abspath = self.target.abspath(current_root_unicode)
2113
root_stat = os.lstat(root_abspath)
2115
if e.errno == errno.ENOENT:
2116
# the path does not exist: let _process_entry know that.
2117
root_dir_info = None
2119
# some other random error: hand it up.
2122
root_dir_info = ('', current_root,
2123
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
2125
if root_dir_info[2] == 'directory':
2126
if self.target._directory_is_tree_reference(
2127
current_root.decode('utf8')):
2128
root_dir_info = root_dir_info[:2] + \
2129
('tree-reference',) + root_dir_info[3:]
2131
if not root_entries and not root_dir_info:
2132
# this specified path is not present at all, skip it.
2134
path_handled = False
2135
for entry in root_entries:
2136
result = _process_entry(entry, root_dir_info)
2137
if result is not None:
2139
if result is not uninteresting:
2141
if want_unversioned and not path_handled and root_dir_info:
2142
new_executable = bool(
2143
stat.S_ISREG(root_dir_info[3].st_mode)
2144
and stat.S_IEXEC & root_dir_info[3].st_mode)
2146
(None, current_root_unicode),
2150
(None, splitpath(current_root_unicode)[-1]),
2151
(None, root_dir_info[2]),
2152
(None, new_executable)
2154
initial_key = (current_root, '', '')
2155
block_index, _ = state._find_block_index_from_key(initial_key)
2156
if block_index == 0:
2157
# we have processed the total root already, but because the
2158
# initial key matched it we should skip it here.
2160
if root_dir_info and root_dir_info[2] == 'tree-reference':
2161
current_dir_info = None
2163
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
2165
current_dir_info = dir_iterator.next()
2167
# on win32, python2.4 has e.errno == ERROR_DIRECTORY, but
2168
# python 2.5 has e.errno == EINVAL,
2169
# and e.winerror == ERROR_DIRECTORY
2170
e_winerror = getattr(e, 'winerror', None)
2171
win_errors = (ERROR_DIRECTORY, ERROR_PATH_NOT_FOUND)
2172
# there may be directories in the inventory even though
2173
# this path is not a file on disk: so mark it as end of
2175
if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
2176
current_dir_info = None
2177
elif (sys.platform == 'win32'
2178
and (e.errno in win_errors
2179
or e_winerror in win_errors)):
2180
current_dir_info = None
2184
if current_dir_info[0][0] == '':
2185
# remove .bzr from iteration
2186
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
2187
assert current_dir_info[1][bzr_index][0] == '.bzr'
2188
del current_dir_info[1][bzr_index]
2189
# walk until both the directory listing and the versioned metadata
2191
if (block_index < len(state._dirblocks) and
2192
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2193
current_block = state._dirblocks[block_index]
2195
current_block = None
2196
while (current_dir_info is not None or
2197
current_block is not None):
2198
if (current_dir_info and current_block
2199
and current_dir_info[0][0] != current_block[0]):
2200
if cmp_by_dirs(current_dir_info[0][0], current_block[0]) < 0:
2201
# filesystem data refers to paths not covered by the dirblock.
2202
# this has two possibilities:
2203
# A) it is versioned but empty, so there is no block for it
2204
# B) it is not versioned.
2206
# if (A) then we need to recurse into it to check for
2207
# new unknown files or directories.
2208
# if (B) then we should ignore it, because we don't
2209
# recurse into unknown directories.
2211
while path_index < len(current_dir_info[1]):
2212
current_path_info = current_dir_info[1][path_index]
2213
if want_unversioned:
2214
if current_path_info[2] == 'directory':
2215
if self.target._directory_is_tree_reference(
2216
current_path_info[0].decode('utf8')):
2217
current_path_info = current_path_info[:2] + \
2218
('tree-reference',) + current_path_info[3:]
2219
new_executable = bool(
2220
stat.S_ISREG(current_path_info[3].st_mode)
2221
and stat.S_IEXEC & current_path_info[3].st_mode)
2223
(None, utf8_decode(current_path_info[0])[0]),
2227
(None, utf8_decode(current_path_info[1])[0]),
2228
(None, current_path_info[2]),
2229
(None, new_executable))
2230
# dont descend into this unversioned path if it is
2232
if current_path_info[2] in ('directory',
2234
del current_dir_info[1][path_index]
2238
# This dir info has been handled, go to the next
2240
current_dir_info = dir_iterator.next()
2241
except StopIteration:
2242
current_dir_info = None
2244
# We have a dirblock entry for this location, but there
2245
# is no filesystem path for this. This is most likely
2246
# because a directory was removed from the disk.
2247
# We don't have to report the missing directory,
2248
# because that should have already been handled, but we
2249
# need to handle all of the files that are contained
2251
for current_entry in current_block[1]:
2252
# entry referring to file not present on disk.
2253
# advance the entry only, after processing.
2254
result = _process_entry(current_entry, None)
2255
if result is not None:
2256
if result is not uninteresting:
2259
if (block_index < len(state._dirblocks) and
2260
osutils.is_inside(current_root,
2261
state._dirblocks[block_index][0])):
2262
current_block = state._dirblocks[block_index]
2264
current_block = None
2267
if current_block and entry_index < len(current_block[1]):
2268
current_entry = current_block[1][entry_index]
2270
current_entry = None
2271
advance_entry = True
2273
if current_dir_info and path_index < len(current_dir_info[1]):
2274
current_path_info = current_dir_info[1][path_index]
2275
if current_path_info[2] == 'directory':
2276
if self.target._directory_is_tree_reference(
2277
current_path_info[0].decode('utf8')):
2278
current_path_info = current_path_info[:2] + \
2279
('tree-reference',) + current_path_info[3:]
2281
current_path_info = None
2283
path_handled = False
2284
while (current_entry is not None or
2285
current_path_info is not None):
2286
if current_entry is None:
2287
# the check for path_handled when the path is adnvaced
2288
# will yield this path if needed.
2290
elif current_path_info is None:
2291
# no path is fine: the per entry code will handle it.
2292
result = _process_entry(current_entry, current_path_info)
2293
if result is not None:
2294
if result is not uninteresting:
2296
elif (current_entry[0][1] != current_path_info[1]
2297
or current_entry[1][target_index][0] in 'ar'):
2298
# The current path on disk doesn't match the dirblock
2299
# record. Either the dirblock is marked as absent, or
2300
# the file on disk is not present at all in the
2301
# dirblock. Either way, report about the dirblock
2302
# entry, and let other code handle the filesystem one.
2304
# Compare the basename for these files to determine
2306
if current_path_info[1] < current_entry[0][1]:
2307
# extra file on disk: pass for now, but only
2308
# increment the path, not the entry
2309
advance_entry = False
2311
# entry referring to file not present on disk.
2312
# advance the entry only, after processing.
2313
result = _process_entry(current_entry, None)
2314
if result is not None:
2315
if result is not uninteresting:
2317
advance_path = False
2319
result = _process_entry(current_entry, current_path_info)
2320
if result is not None:
2322
if result is not uninteresting:
2324
if advance_entry and current_entry is not None:
2326
if entry_index < len(current_block[1]):
2327
current_entry = current_block[1][entry_index]
2329
current_entry = None
2331
advance_entry = True # reset the advance flaga
2332
if advance_path and current_path_info is not None:
2333
if not path_handled:
2334
# unversioned in all regards
2335
if want_unversioned:
2336
new_executable = bool(
2337
stat.S_ISREG(current_path_info[3].st_mode)
2338
and stat.S_IEXEC & current_path_info[3].st_mode)
2340
(None, utf8_decode(current_path_info[0])[0]),
2344
(None, utf8_decode(current_path_info[1])[0]),
2345
(None, current_path_info[2]),
2346
(None, new_executable))
2347
# dont descend into this unversioned path if it is
2349
if current_path_info[2] in ('directory'):
2350
del current_dir_info[1][path_index]
2352
# dont descend the disk iterator into any tree
2354
if current_path_info[2] == 'tree-reference':
2355
del current_dir_info[1][path_index]
2358
if path_index < len(current_dir_info[1]):
2359
current_path_info = current_dir_info[1][path_index]
2360
if current_path_info[2] == 'directory':
2361
if self.target._directory_is_tree_reference(
2362
current_path_info[0].decode('utf8')):
2363
current_path_info = current_path_info[:2] + \
2364
('tree-reference',) + current_path_info[3:]
2366
current_path_info = None
2367
path_handled = False
2369
advance_path = True # reset the advance flagg.
2370
if current_block is not None:
2372
if (block_index < len(state._dirblocks) and
2373
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2374
current_block = state._dirblocks[block_index]
2376
current_block = None
2377
if current_dir_info is not None:
2379
current_dir_info = dir_iterator.next()
2380
except StopIteration:
2381
current_dir_info = None
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()
2385
2257
def is_compatible(source, target):
2386
2258
# the target must be a dirstate working tree
2387
if not isinstance(target, WorkingTree4):
2259
if not isinstance(target, DirStateWorkingTree):
2389
# the source must be a revtreee or dirstate rev tree.
2261
# the source must be a revtree or dirstate rev tree.
2390
2262
if not isinstance(source,
2391
2263
(revisiontree.RevisionTree, DirStateRevisionTree)):
2393
2265
# the source revid must be in the target dirstate
2394
if not (source._revision_id == NULL_REVISION or
2266
if not (source._revision_id == _mod_revision.NULL_REVISION or
2395
2267
source._revision_id in target.get_parent_ids()):
2396
# TODO: what about ghosts? it may well need to
2268
# TODO: what about ghosts? it may well need to
2397
2269
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
