1234
1328
@needs_tree_write_lock
1235
1329
def _write_inventory(self, inv):
1236
1330
"""Write inventory as the current inventory."""
1237
assert not self._dirty, "attempting to write an inventory when the dirstate is dirty will cause data loss"
1238
self.current_dirstate().set_state_from_inventory(inv)
1239
self._make_dirty(reset_inventory=False)
1240
if self._inventory is not None:
1332
raise AssertionError("attempting to write an inventory when the "
1333
"dirstate is dirty will lose pending changes")
1334
had_inventory = self._inventory is not None
1335
# Setting self._inventory = None forces the dirstate to regenerate the
1336
# working inventory. We do this because self.inventory may be inv, or
1337
# may have been modified, and either case would prevent a clean delta
1339
self._inventory = None
1341
delta = inv._make_delta(self.root_inventory)
1343
self.apply_inventory_delta(delta)
1241
1345
self._inventory = inv
1245
class WorkingTreeFormat4(WorkingTreeFormat3):
1246
"""The first consolidated dirstate working tree format.
1249
- exists within a metadir controlling .bzr
1250
- includes an explicit version marker for the workingtree control
1251
files, separate from the BzrDir format
1252
- modifies the hash cache format
1253
- is new in bzr 0.15
1254
- uses a LockDir to guard access to it.
1257
upgrade_recommended = False
1259
def get_format_string(self):
1260
"""See WorkingTreeFormat.get_format_string()."""
1261
return "Bazaar Working Tree Format 4 (bzr 0.15)\n"
1263
def get_format_description(self):
1264
"""See WorkingTreeFormat.get_format_description()."""
1265
return "Working tree format 4"
1267
def initialize(self, a_bzrdir, revision_id=None):
1348
@needs_tree_write_lock
1349
def reset_state(self, revision_ids=None):
1350
"""Reset the state of the working tree.
1352
This does a hard-reset to a last-known-good state. This is a way to
1353
fix if something got corrupted (like the .bzr/checkout/dirstate file)
1355
if revision_ids is None:
1356
revision_ids = self.get_parent_ids()
1357
if not revision_ids:
1358
base_tree = self.branch.repository.revision_tree(
1359
_mod_revision.NULL_REVISION)
1362
trees = zip(revision_ids,
1363
self.branch.repository.revision_trees(revision_ids))
1364
base_tree = trees[0][1]
1365
state = self.current_dirstate()
1366
# We don't support ghosts yet
1367
state.set_state_from_scratch(base_tree.root_inventory, trees, [])
1370
class ContentFilterAwareSHA1Provider(dirstate.SHA1Provider):
1372
def __init__(self, tree):
1375
def sha1(self, abspath):
1376
"""See dirstate.SHA1Provider.sha1()."""
1377
filters = self.tree._content_filter_stack(
1378
self.tree.relpath(osutils.safe_unicode(abspath)))
1379
return _mod_filters.internal_size_sha_file_byname(abspath, filters)[1]
1381
def stat_and_sha1(self, abspath):
1382
"""See dirstate.SHA1Provider.stat_and_sha1()."""
1383
filters = self.tree._content_filter_stack(
1384
self.tree.relpath(osutils.safe_unicode(abspath)))
1385
file_obj = file(abspath, 'rb', 65000)
1387
statvalue = os.fstat(file_obj.fileno())
1389
file_obj = _mod_filters.filtered_input_file(file_obj, filters)
1390
sha1 = osutils.size_sha_file(file_obj)[1]
1393
return statvalue, sha1
1396
class ContentFilteringDirStateWorkingTree(DirStateWorkingTree):
1397
"""Dirstate working tree that supports content filtering.
1399
The dirstate holds the hash and size of the canonical form of the file,
1400
and most methods must return that.
1403
def _file_content_summary(self, path, stat_result):
1404
# This is to support the somewhat obsolete path_content_summary method
1405
# with content filtering: see
1406
# <https://bugs.launchpad.net/bzr/+bug/415508>.
1408
# If the dirstate cache is up to date and knows the hash and size,
1410
# Otherwise if there are no content filters, return the on-disk size
1411
# and leave the hash blank.
1412
# Otherwise, read and filter the on-disk file and use its size and
1415
# The dirstate doesn't store the size of the canonical form so we
1416
# can't trust it for content-filtered trees. We just return None.
1417
dirstate_sha1 = self._dirstate.sha1_from_stat(path, stat_result)
1418
executable = self._is_executable_from_path_and_stat(path, stat_result)
1419
return ('file', None, executable, dirstate_sha1)
1422
class WorkingTree4(DirStateWorkingTree):
1423
"""This is the Format 4 working tree.
1425
This differs from WorkingTree by:
1426
- Having a consolidated internal dirstate, stored in a
1427
randomly-accessible sorted file on disk.
1428
- Not having a regular inventory attribute. One can be synthesized
1429
on demand but this is expensive and should be avoided.
1431
This is new in bzr 0.15.
1435
class WorkingTree5(ContentFilteringDirStateWorkingTree):
1436
"""This is the Format 5 working tree.
1438
This differs from WorkingTree4 by:
1439
- Supporting content filtering.
1441
This is new in bzr 1.11.
1445
class WorkingTree6(ContentFilteringDirStateWorkingTree):
1446
"""This is the Format 6 working tree.
1448
This differs from WorkingTree5 by:
1449
- Supporting a current view that may mask the set of files in a tree
1450
impacted by most user operations.
1452
This is new in bzr 1.14.
1455
def _make_views(self):
1456
return views.PathBasedViews(self)
1459
class DirStateWorkingTreeFormat(WorkingTreeFormatMetaDir):
1461
missing_parent_conflicts = True
1463
supports_versioned_directories = True
1465
_lock_class = LockDir
1466
_lock_file_name = 'lock'
1468
def _open_control_files(self, a_bzrdir):
1469
transport = a_bzrdir.get_workingtree_transport(None)
1470
return LockableFiles(transport, self._lock_file_name,
1473
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
1474
accelerator_tree=None, hardlink=False):
1268
1475
"""See WorkingTreeFormat.initialize().
1270
1477
:param revision_id: allows creating a working tree at a different
1271
revision than the branch is at.
1478
revision than the branch is at.
1479
:param accelerator_tree: A tree which can be used for retrieving file
1480
contents more quickly than the revision tree, i.e. a workingtree.
1481
The revision tree will be used for cases where accelerator_tree's
1482
content is different.
1483
:param hardlink: If true, hard-link files from accelerator_tree,
1273
1486
These trees get an initial random root id, if their repository supports
1274
1487
rich root data, TREE_ROOT otherwise.
1276
revision_id = osutils.safe_revision_id(revision_id)
1277
1489
if not isinstance(a_bzrdir.transport, LocalTransport):
1278
1490
raise errors.NotLocalUrl(a_bzrdir.transport.base)
1279
1491
transport = a_bzrdir.get_workingtree_transport(self)
1280
1492
control_files = self._open_control_files(a_bzrdir)
1281
1493
control_files.create_lock()
1282
1494
control_files.lock_write()
1283
control_files.put_utf8('format', self.get_format_string())
1284
branch = a_bzrdir.open_branch()
1495
transport.put_bytes('format', self.as_string(),
1496
mode=a_bzrdir._get_file_mode())
1497
if from_branch is not None:
1498
branch = from_branch
1500
branch = a_bzrdir.open_branch()
1285
1501
if revision_id is None:
1286
1502
revision_id = branch.last_revision()
1287
1503
local_path = transport.local_abspath('dirstate')
1298
1514
wt.lock_tree_write()
1300
if revision_id in (None, NULL_REVISION):
1516
self._init_custom_control_files(wt)
1517
if revision_id in (None, _mod_revision.NULL_REVISION):
1301
1518
if branch.repository.supports_rich_root():
1302
1519
wt._set_root_id(generate_ids.gen_root_id())
1304
1521
wt._set_root_id(ROOT_ID)
1306
wt.set_last_revision(revision_id)
1308
basis = wt.basis_tree()
1524
# frequently, we will get here due to branching. The accelerator
1525
# tree will be the tree from the branch, so the desired basis
1526
# tree will often be a parent of the accelerator tree.
1527
if accelerator_tree is not None:
1529
basis = accelerator_tree.revision_tree(revision_id)
1530
except errors.NoSuchRevision:
1533
basis = branch.repository.revision_tree(revision_id)
1534
if revision_id == _mod_revision.NULL_REVISION:
1537
parents_list = [(revision_id, basis)]
1309
1538
basis.lock_read()
1310
# if the basis has a root id we have to use that; otherwise we use
1312
basis_root_id = basis.get_root_id()
1313
if basis_root_id is not None:
1314
wt._set_root_id(basis_root_id)
1540
wt.set_parent_trees(parents_list, allow_leftmost_as_ghost=True)
1316
transform.build_tree(basis, wt)
1542
# if the basis has a root id we have to use that; otherwise we
1543
# use a new random one
1544
basis_root_id = basis.get_root_id()
1545
if basis_root_id is not None:
1546
wt._set_root_id(basis_root_id)
1548
if wt.supports_content_filtering():
1549
# The original tree may not have the same content filters
1550
# applied so we can't safely build the inventory delta from
1552
delta_from_tree = False
1554
delta_from_tree = True
1555
# delta_from_tree is safe even for DirStateRevisionTrees,
1556
# because wt4.apply_inventory_delta does not mutate the input
1557
# inventory entries.
1558
transform.build_tree(basis, wt, accelerator_tree,
1560
delta_from_tree=delta_from_tree)
1561
for hook in MutableTree.hooks['post_build_tree']:
1319
1566
control_files.unlock()
1570
def _init_custom_control_files(self, wt):
1571
"""Subclasses with custom control files should override this method.
1573
The working tree and control files are locked for writing when this
1576
:param wt: the WorkingTree object
1579
def open(self, a_bzrdir, _found=False):
1580
"""Return the WorkingTree object for a_bzrdir
1582
_found is a private parameter, do not use it. It is used to indicate
1583
if format probing has already been done.
1586
# we are being called directly and must probe.
1587
raise NotImplementedError
1588
if not isinstance(a_bzrdir.transport, LocalTransport):
1589
raise errors.NotLocalUrl(a_bzrdir.transport.base)
1590
wt = self._open(a_bzrdir, self._open_control_files(a_bzrdir))
1323
1593
def _open(self, a_bzrdir, control_files):
1324
1594
"""Open the tree itself.
1326
1596
:param a_bzrdir: the dir for the tree.
1327
1597
:param control_files: the control files for the tree.
1329
return WorkingTree4(a_bzrdir.root_transport.local_abspath('.'),
1599
return self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
1330
1600
branch=a_bzrdir.open_branch(),
1332
1602
_bzrdir=a_bzrdir,
1333
1603
_control_files=control_files)
1335
1605
def __get_matchingbzrdir(self):
1606
return self._get_matchingbzrdir()
1608
def _get_matchingbzrdir(self):
1609
"""Overrideable method to get a bzrdir for testing."""
1336
1610
# please test against something that will let us do tree references
1337
1611
return bzrdir.format_registry.make_bzrdir(
1338
'dirstate-with-subtree')
1612
'development-subtree')
1340
1614
_matchingbzrdir = property(__get_matchingbzrdir)
1343
class DirStateRevisionTree(Tree):
1344
"""A revision tree pulling the inventory from a dirstate."""
1617
class WorkingTreeFormat4(DirStateWorkingTreeFormat):
1618
"""The first consolidated dirstate working tree format.
1621
- exists within a metadir controlling .bzr
1622
- includes an explicit version marker for the workingtree control
1623
files, separate from the ControlDir format
1624
- modifies the hash cache format
1625
- is new in bzr 0.15
1626
- uses a LockDir to guard access to it.
1629
upgrade_recommended = False
1631
_tree_class = WorkingTree4
1634
def get_format_string(cls):
1635
"""See WorkingTreeFormat.get_format_string()."""
1636
return "Bazaar Working Tree Format 4 (bzr 0.15)\n"
1638
def get_format_description(self):
1639
"""See WorkingTreeFormat.get_format_description()."""
1640
return "Working tree format 4"
1643
class WorkingTreeFormat5(DirStateWorkingTreeFormat):
1644
"""WorkingTree format supporting content filtering.
1647
upgrade_recommended = False
1649
_tree_class = WorkingTree5
1652
def get_format_string(cls):
1653
"""See WorkingTreeFormat.get_format_string()."""
1654
return "Bazaar Working Tree Format 5 (bzr 1.11)\n"
1656
def get_format_description(self):
1657
"""See WorkingTreeFormat.get_format_description()."""
1658
return "Working tree format 5"
1660
def supports_content_filtering(self):
1664
class WorkingTreeFormat6(DirStateWorkingTreeFormat):
1665
"""WorkingTree format supporting views.
1668
upgrade_recommended = False
1670
_tree_class = WorkingTree6
1673
def get_format_string(cls):
1674
"""See WorkingTreeFormat.get_format_string()."""
1675
return "Bazaar Working Tree Format 6 (bzr 1.14)\n"
1677
def get_format_description(self):
1678
"""See WorkingTreeFormat.get_format_description()."""
1679
return "Working tree format 6"
1681
def _init_custom_control_files(self, wt):
1682
"""Subclasses with custom control files should override this method."""
1683
wt._transport.put_bytes('views', '', mode=wt.bzrdir._get_file_mode())
1685
def supports_content_filtering(self):
1688
def supports_views(self):
1692
class DirStateRevisionTree(InventoryTree):
1693
"""A revision tree pulling the inventory from a dirstate.
1695
Note that this is one of the historical (ie revision) trees cached in the
1696
dirstate for easy access, not the workingtree.
1346
1699
def __init__(self, dirstate, revision_id, repository):
1347
1700
self._dirstate = dirstate
1348
self._revision_id = osutils.safe_revision_id(revision_id)
1701
self._revision_id = revision_id
1349
1702
self._repository = repository
1350
1703
self._inventory = None
1351
1704
self._locked = 0
1352
1705
self._dirstate_locked = False
1706
self._repo_supports_tree_reference = getattr(
1707
repository._format, "supports_tree_reference",
1354
1710
def __repr__(self):
1355
1711
return "<%s of %s in %s>" % \
1790
2215
if not found_versioned:
1791
2216
# none of the indexes was not 'absent' at all ids for this
1793
all_versioned = False
1795
if not all_versioned:
1796
raise errors.PathsNotVersionedError(specific_files)
2218
not_versioned.append(path.decode('utf-8'))
2219
if len(not_versioned) > 0:
2220
raise errors.PathsNotVersionedError(not_versioned)
1797
2221
# -- remove redundancy in supplied specific_files to prevent over-scanning --
1798
search_specific_files = set()
1799
for path in specific_files:
1800
other_specific_files = specific_files.difference(set([path]))
1801
if not osutils.is_inside_any(other_specific_files, path):
1802
# this is a top level path, we must check it.
1803
search_specific_files.add(path)
1805
# compare source_index and target_index at or under each element of search_specific_files.
1806
# follow the following comparison table. Note that we only want to do diff operations when
1807
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1811
# Source | Target | disk | action
1812
# r | fdlt | | add source to search, add id path move and perform
1813
# | | | diff check on source-target
1814
# r | fdlt | a | dangling file that was present in the basis.
1816
# r | a | | add source to search
1818
# r | r | | this path is present in a non-examined tree, skip.
1819
# r | r | a | this path is present in a non-examined tree, skip.
1820
# a | fdlt | | add new id
1821
# a | fdlt | a | dangling locally added file, skip
1822
# a | a | | not present in either tree, skip
1823
# a | a | a | not present in any tree, skip
1824
# a | r | | not present in either tree at this path, skip as it
1825
# | | | may not be selected by the users list of paths.
1826
# a | r | a | not present in either tree at this path, skip as it
1827
# | | | may not be selected by the users list of paths.
1828
# fdlt | fdlt | | content in both: diff them
1829
# fdlt | fdlt | a | deleted locally, but not unversioned - show as deleted ?
1830
# fdlt | a | | unversioned: output deleted id for now
1831
# fdlt | a | a | unversioned and deleted: output deleted id
1832
# fdlt | r | | relocated in this tree, so add target to search.
1833
# | | | Dont diff, we will see an r,fd; pair when we reach
1834
# | | | this id at the other path.
1835
# fdlt | r | a | relocated in this tree, so add target to search.
1836
# | | | Dont diff, we will see an r,fd; pair when we reach
1837
# | | | this id at the other path.
1839
# for all search_indexs in each path at or under each element of
1840
# search_specific_files, if the detail is relocated: add the id, and add the
1841
# relocated path as one to search if its not searched already. If the
1842
# detail is not relocated, add the id.
1843
searched_specific_files = set()
1844
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1845
# Using a list so that we can access the values and change them in
1846
# nested scope. Each one is [path, file_id, entry]
1847
last_source_parent = [None, None]
1848
last_target_parent = [None, None]
2222
search_specific_files = osutils.minimum_path_selection(specific_files)
1850
2224
use_filesystem_for_exec = (sys.platform != 'win32')
1852
# Just a sentry, so that _process_entry can say that this
1853
# record is handled, but isn't interesting to process (unchanged)
1854
uninteresting = object()
1857
old_dirname_to_file_id = {}
1858
new_dirname_to_file_id = {}
1859
# TODO: jam 20070516 - Avoid the _get_entry lookup overhead by
1860
# keeping a cache of directories that we have seen.
1862
def _process_entry(entry, path_info):
1863
"""Compare an entry and real disk to generate delta information.
1865
:param path_info: top_relpath, basename, kind, lstat, abspath for
1866
the path of entry. If None, then the path is considered absent.
1867
(Perhaps we should pass in a concrete entry for this ?)
1868
Basename is returned as a utf8 string because we expect this
1869
tuple will be ignored, and don't want to take the time to
1871
:return: None if these don't match
1872
A tuple of information about the change, or
1873
the object 'uninteresting' if these match, but are
1874
basically identical.
1876
if source_index is None:
1877
source_details = NULL_PARENT_DETAILS
1879
source_details = entry[1][source_index]
1880
target_details = entry[1][target_index]
1881
target_minikind = target_details[0]
1882
if path_info is not None and target_minikind in 'fdlt':
1883
assert target_index == 0
1884
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
1885
stat_value=path_info[3])
1886
# The entry may have been modified by update_entry
1887
target_details = entry[1][target_index]
1888
target_minikind = target_details[0]
1891
file_id = entry[0][2]
1892
source_minikind = source_details[0]
1893
if source_minikind in 'fdltr' and target_minikind in 'fdlt':
1894
# claimed content in both: diff
1895
# r | fdlt | | add source to search, add id path move and perform
1896
# | | | diff check on source-target
1897
# r | fdlt | a | dangling file that was present in the basis.
1899
if source_minikind in 'r':
1900
# add the source to the search path to find any children it
1901
# has. TODO ? : only add if it is a container ?
1902
if not osutils.is_inside_any(searched_specific_files,
1904
search_specific_files.add(source_details[1])
1905
# generate the old path; this is needed for stating later
1907
old_path = source_details[1]
1908
old_dirname, old_basename = os.path.split(old_path)
1909
path = pathjoin(entry[0][0], entry[0][1])
1910
old_entry = state._get_entry(source_index,
1912
# update the source details variable to be the real
1914
source_details = old_entry[1][source_index]
1915
source_minikind = source_details[0]
1917
old_dirname = entry[0][0]
1918
old_basename = entry[0][1]
1919
old_path = path = None
1920
if path_info is None:
1921
# the file is missing on disk, show as removed.
1922
content_change = True
1926
# source and target are both versioned and disk file is present.
1927
target_kind = path_info[2]
1928
if target_kind == 'directory':
1930
old_path = path = pathjoin(old_dirname, old_basename)
1931
new_dirname_to_file_id[path] = file_id
1932
if source_minikind != 'd':
1933
content_change = True
1935
# directories have no fingerprint
1936
content_change = False
1938
elif target_kind == 'file':
1939
if source_minikind != 'f':
1940
content_change = True
1942
# We could check the size, but we already have the
1944
content_change = (link_or_sha1 != source_details[1])
1945
# Target details is updated at update_entry time
1946
if use_filesystem_for_exec:
1947
# We don't need S_ISREG here, because we are sure
1948
# we are dealing with a file.
1949
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
1951
target_exec = target_details[3]
1952
elif target_kind == 'symlink':
1953
if source_minikind != 'l':
1954
content_change = True
1956
content_change = (link_or_sha1 != source_details[1])
1958
elif target_kind == 'tree-reference':
1959
if source_minikind != 't':
1960
content_change = True
1962
content_change = False
1965
raise Exception, "unknown kind %s" % path_info[2]
1966
if source_minikind == 'd':
1968
old_path = path = pathjoin(old_dirname, old_basename)
1969
old_dirname_to_file_id[old_path] = file_id
1970
# parent id is the entry for the path in the target tree
1971
if old_dirname == last_source_parent[0]:
1972
source_parent_id = last_source_parent[1]
1975
source_parent_id = old_dirname_to_file_id[old_dirname]
1977
source_parent_entry = state._get_entry(source_index,
1978
path_utf8=old_dirname)
1979
source_parent_id = source_parent_entry[0][2]
1980
if source_parent_id == entry[0][2]:
1981
# This is the root, so the parent is None
1982
source_parent_id = None
1984
last_source_parent[0] = old_dirname
1985
last_source_parent[1] = source_parent_id
1986
new_dirname = entry[0][0]
1987
if new_dirname == last_target_parent[0]:
1988
target_parent_id = last_target_parent[1]
1991
target_parent_id = new_dirname_to_file_id[new_dirname]
1993
# TODO: We don't always need to do the lookup, because the
1994
# parent entry will be the same as the source entry.
1995
target_parent_entry = state._get_entry(target_index,
1996
path_utf8=new_dirname)
1997
assert target_parent_entry != (None, None), (
1998
"Could not find target parent in wt: %s\nparent of: %s"
1999
% (new_dirname, entry))
2000
target_parent_id = target_parent_entry[0][2]
2001
if target_parent_id == entry[0][2]:
2002
# This is the root, so the parent is None
2003
target_parent_id = None
2005
last_target_parent[0] = new_dirname
2006
last_target_parent[1] = target_parent_id
2008
source_exec = source_details[3]
2009
if (include_unchanged
2011
or source_parent_id != target_parent_id
2012
or old_basename != entry[0][1]
2013
or source_exec != target_exec
2015
if old_path is None:
2016
old_path = path = pathjoin(old_dirname, old_basename)
2017
old_path_u = utf8_decode(old_path)[0]
2020
old_path_u = utf8_decode(old_path)[0]
2021
if old_path == path:
2024
path_u = utf8_decode(path)[0]
2025
source_kind = _minikind_to_kind[source_minikind]
2026
return (entry[0][2],
2027
(old_path_u, path_u),
2030
(source_parent_id, target_parent_id),
2031
(utf8_decode(old_basename)[0], utf8_decode(entry[0][1])[0]),
2032
(source_kind, target_kind),
2033
(source_exec, target_exec))
2035
return uninteresting
2036
elif source_minikind in 'a' and target_minikind in 'fdlt':
2037
# looks like a new file
2038
if path_info is not None:
2039
path = pathjoin(entry[0][0], entry[0][1])
2040
# parent id is the entry for the path in the target tree
2041
# TODO: these are the same for an entire directory: cache em.
2042
parent_id = state._get_entry(target_index,
2043
path_utf8=entry[0][0])[0][2]
2044
if parent_id == entry[0][2]:
2046
if use_filesystem_for_exec:
2047
# We need S_ISREG here, because we aren't sure if this
2050
stat.S_ISREG(path_info[3].st_mode)
2051
and stat.S_IEXEC & path_info[3].st_mode)
2053
target_exec = target_details[3]
2054
return (entry[0][2],
2055
(None, utf8_decode(path)[0]),
2059
(None, utf8_decode(entry[0][1])[0]),
2060
(None, path_info[2]),
2061
(None, target_exec))
2063
# but its not on disk: we deliberately treat this as just
2064
# never-present. (Why ?! - RBC 20070224)
2066
elif source_minikind in 'fdlt' and target_minikind in 'a':
2067
# unversioned, possibly, or possibly not deleted: we dont care.
2068
# if its still on disk, *and* theres no other entry at this
2069
# path [we dont know this in this routine at the moment -
2070
# perhaps we should change this - then it would be an unknown.
2071
old_path = pathjoin(entry[0][0], entry[0][1])
2072
# parent id is the entry for the path in the target tree
2073
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
2074
if parent_id == entry[0][2]:
2076
return (entry[0][2],
2077
(utf8_decode(old_path)[0], None),
2081
(utf8_decode(entry[0][1])[0], None),
2082
(_minikind_to_kind[source_minikind], None),
2083
(source_details[3], None))
2084
elif source_minikind in 'fdlt' and target_minikind in 'r':
2085
# a rename; could be a true rename, or a rename inherited from
2086
# a renamed parent. TODO: handle this efficiently. Its not
2087
# common case to rename dirs though, so a correct but slow
2088
# implementation will do.
2089
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
2090
search_specific_files.add(target_details[1])
2091
elif source_minikind in 'ra' and target_minikind in 'ra':
2092
# neither of the selected trees contain this file,
2093
# so skip over it. This is not currently directly tested, but
2094
# is indirectly via test_too_much.TestCommands.test_conflicts.
2097
raise AssertionError("don't know how to compare "
2098
"source_minikind=%r, target_minikind=%r"
2099
% (source_minikind, target_minikind))
2100
## import pdb;pdb.set_trace()
2103
while search_specific_files:
2104
# TODO: the pending list should be lexically sorted? the
2105
# interface doesn't require it.
2106
current_root = search_specific_files.pop()
2107
current_root_unicode = current_root.decode('utf8')
2108
searched_specific_files.add(current_root)
2109
# process the entries for this containing directory: the rest will be
2110
# found by their parents recursively.
2111
root_entries = _entries_for_path(current_root)
2112
root_abspath = self.target.abspath(current_root_unicode)
2114
root_stat = os.lstat(root_abspath)
2116
if e.errno == errno.ENOENT:
2117
# the path does not exist: let _process_entry know that.
2118
root_dir_info = None
2120
# some other random error: hand it up.
2123
root_dir_info = ('', current_root,
2124
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
2126
if root_dir_info[2] == 'directory':
2127
if self.target._directory_is_tree_reference(
2128
current_root.decode('utf8')):
2129
root_dir_info = root_dir_info[:2] + \
2130
('tree-reference',) + root_dir_info[3:]
2132
if not root_entries and not root_dir_info:
2133
# this specified path is not present at all, skip it.
2135
path_handled = False
2136
for entry in root_entries:
2137
result = _process_entry(entry, root_dir_info)
2138
if result is not None:
2140
if result is not uninteresting:
2142
if want_unversioned and not path_handled and root_dir_info:
2143
new_executable = bool(
2144
stat.S_ISREG(root_dir_info[3].st_mode)
2145
and stat.S_IEXEC & root_dir_info[3].st_mode)
2147
(None, current_root_unicode),
2151
(None, splitpath(current_root_unicode)[-1]),
2152
(None, root_dir_info[2]),
2153
(None, new_executable)
2155
initial_key = (current_root, '', '')
2156
block_index, _ = state._find_block_index_from_key(initial_key)
2157
if block_index == 0:
2158
# we have processed the total root already, but because the
2159
# initial key matched it we should skip it here.
2161
if root_dir_info and root_dir_info[2] == 'tree-reference':
2162
current_dir_info = None
2164
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
2166
current_dir_info = dir_iterator.next()
2168
# on win32, python2.4 has e.errno == ERROR_DIRECTORY, but
2169
# python 2.5 has e.errno == EINVAL,
2170
# and e.winerror == ERROR_DIRECTORY
2171
e_winerror = getattr(e, 'winerror', None)
2172
win_errors = (ERROR_DIRECTORY, ERROR_PATH_NOT_FOUND)
2173
# there may be directories in the inventory even though
2174
# this path is not a file on disk: so mark it as end of
2176
if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
2177
current_dir_info = None
2178
elif (sys.platform == 'win32'
2179
and (e.errno in win_errors
2180
or e_winerror in win_errors)):
2181
current_dir_info = None
2185
if current_dir_info[0][0] == '':
2186
# remove .bzr from iteration
2187
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
2188
assert current_dir_info[1][bzr_index][0] == '.bzr'
2189
del current_dir_info[1][bzr_index]
2190
# walk until both the directory listing and the versioned metadata
2192
if (block_index < len(state._dirblocks) and
2193
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2194
current_block = state._dirblocks[block_index]
2196
current_block = None
2197
while (current_dir_info is not None or
2198
current_block is not None):
2199
if (current_dir_info and current_block
2200
and current_dir_info[0][0] != current_block[0]):
2201
if cmp_by_dirs(current_dir_info[0][0], current_block[0]) < 0:
2202
# filesystem data refers to paths not covered by the dirblock.
2203
# this has two possibilities:
2204
# A) it is versioned but empty, so there is no block for it
2205
# B) it is not versioned.
2207
# if (A) then we need to recurse into it to check for
2208
# new unknown files or directories.
2209
# if (B) then we should ignore it, because we don't
2210
# recurse into unknown directories.
2212
while path_index < len(current_dir_info[1]):
2213
current_path_info = current_dir_info[1][path_index]
2214
if want_unversioned:
2215
if current_path_info[2] == 'directory':
2216
if self.target._directory_is_tree_reference(
2217
current_path_info[0].decode('utf8')):
2218
current_path_info = current_path_info[:2] + \
2219
('tree-reference',) + current_path_info[3:]
2220
new_executable = bool(
2221
stat.S_ISREG(current_path_info[3].st_mode)
2222
and stat.S_IEXEC & current_path_info[3].st_mode)
2224
(None, utf8_decode(current_path_info[0])[0]),
2228
(None, utf8_decode(current_path_info[1])[0]),
2229
(None, current_path_info[2]),
2230
(None, new_executable))
2231
# dont descend into this unversioned path if it is
2233
if current_path_info[2] in ('directory',
2235
del current_dir_info[1][path_index]
2239
# This dir info has been handled, go to the next
2241
current_dir_info = dir_iterator.next()
2242
except StopIteration:
2243
current_dir_info = None
2245
# We have a dirblock entry for this location, but there
2246
# is no filesystem path for this. This is most likely
2247
# because a directory was removed from the disk.
2248
# We don't have to report the missing directory,
2249
# because that should have already been handled, but we
2250
# need to handle all of the files that are contained
2252
for current_entry in current_block[1]:
2253
# entry referring to file not present on disk.
2254
# advance the entry only, after processing.
2255
result = _process_entry(current_entry, None)
2256
if result is not None:
2257
if result is not uninteresting:
2260
if (block_index < len(state._dirblocks) and
2261
osutils.is_inside(current_root,
2262
state._dirblocks[block_index][0])):
2263
current_block = state._dirblocks[block_index]
2265
current_block = None
2268
if current_block and entry_index < len(current_block[1]):
2269
current_entry = current_block[1][entry_index]
2271
current_entry = None
2272
advance_entry = True
2274
if current_dir_info and path_index < len(current_dir_info[1]):
2275
current_path_info = current_dir_info[1][path_index]
2276
if current_path_info[2] == 'directory':
2277
if self.target._directory_is_tree_reference(
2278
current_path_info[0].decode('utf8')):
2279
current_path_info = current_path_info[:2] + \
2280
('tree-reference',) + current_path_info[3:]
2282
current_path_info = None
2284
path_handled = False
2285
while (current_entry is not None or
2286
current_path_info is not None):
2287
if current_entry is None:
2288
# the check for path_handled when the path is adnvaced
2289
# will yield this path if needed.
2291
elif current_path_info is None:
2292
# no path is fine: the per entry code will handle it.
2293
result = _process_entry(current_entry, current_path_info)
2294
if result is not None:
2295
if result is not uninteresting:
2297
elif (current_entry[0][1] != current_path_info[1]
2298
or current_entry[1][target_index][0] in 'ar'):
2299
# The current path on disk doesn't match the dirblock
2300
# record. Either the dirblock is marked as absent, or
2301
# the file on disk is not present at all in the
2302
# dirblock. Either way, report about the dirblock
2303
# entry, and let other code handle the filesystem one.
2305
# Compare the basename for these files to determine
2307
if current_path_info[1] < current_entry[0][1]:
2308
# extra file on disk: pass for now, but only
2309
# increment the path, not the entry
2310
advance_entry = False
2312
# entry referring to file not present on disk.
2313
# advance the entry only, after processing.
2314
result = _process_entry(current_entry, None)
2315
if result is not None:
2316
if result is not uninteresting:
2318
advance_path = False
2320
result = _process_entry(current_entry, current_path_info)
2321
if result is not None:
2323
if result is not uninteresting:
2325
if advance_entry and current_entry is not None:
2327
if entry_index < len(current_block[1]):
2328
current_entry = current_block[1][entry_index]
2330
current_entry = None
2332
advance_entry = True # reset the advance flaga
2333
if advance_path and current_path_info is not None:
2334
if not path_handled:
2335
# unversioned in all regards
2336
if want_unversioned:
2337
new_executable = bool(
2338
stat.S_ISREG(current_path_info[3].st_mode)
2339
and stat.S_IEXEC & current_path_info[3].st_mode)
2341
(None, utf8_decode(current_path_info[0])[0]),
2345
(None, utf8_decode(current_path_info[1])[0]),
2346
(None, current_path_info[2]),
2347
(None, new_executable))
2348
# dont descend into this unversioned path if it is
2350
if current_path_info[2] in ('directory'):
2351
del current_dir_info[1][path_index]
2353
# dont descend the disk iterator into any tree
2355
if current_path_info[2] == 'tree-reference':
2356
del current_dir_info[1][path_index]
2359
if path_index < len(current_dir_info[1]):
2360
current_path_info = current_dir_info[1][path_index]
2361
if current_path_info[2] == 'directory':
2362
if self.target._directory_is_tree_reference(
2363
current_path_info[0].decode('utf8')):
2364
current_path_info = current_path_info[:2] + \
2365
('tree-reference',) + current_path_info[3:]
2367
current_path_info = None
2368
path_handled = False
2370
advance_path = True # reset the advance flagg.
2371
if current_block is not None:
2373
if (block_index < len(state._dirblocks) and
2374
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2375
current_block = state._dirblocks[block_index]
2377
current_block = None
2378
if current_dir_info is not None:
2380
current_dir_info = dir_iterator.next()
2381
except StopIteration:
2382
current_dir_info = None
2225
iter_changes = self.target._iter_changes(include_unchanged,
2226
use_filesystem_for_exec, search_specific_files, state,
2227
source_index, target_index, want_unversioned, self.target)
2228
return iter_changes.iter_changes()
2386
2231
def is_compatible(source, target):
2387
2232
# the target must be a dirstate working tree
2388
if not isinstance(target, WorkingTree4):
2233
if not isinstance(target, DirStateWorkingTree):
2390
# the source must be a revtreee or dirstate rev tree.
2235
# the source must be a revtree or dirstate rev tree.
2391
2236
if not isinstance(source,
2392
2237
(revisiontree.RevisionTree, DirStateRevisionTree)):
2394
2239
# the source revid must be in the target dirstate
2395
if not (source._revision_id == NULL_REVISION or
2240
if not (source._revision_id == _mod_revision.NULL_REVISION or
2396
2241
source._revision_id in target.get_parent_ids()):
2397
# TODO: what about ghosts? it may well need to
2242
# TODO: what about ghosts? it may well need to
2398
2243
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
