1226
1333
@needs_tree_write_lock
1227
1334
def _write_inventory(self, inv):
1228
1335
"""Write inventory as the current inventory."""
1229
assert not self._dirty, "attempting to write an inventory when the dirstate is dirty will cause data loss"
1230
self.current_dirstate().set_state_from_inventory(inv)
1231
self._make_dirty(reset_inventory=False)
1232
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)
1233
1350
self._inventory = inv
1237
class WorkingTreeFormat4(WorkingTreeFormat3):
1238
"""The first consolidated dirstate working tree format.
1241
- exists within a metadir controlling .bzr
1242
- includes an explicit version marker for the workingtree control
1243
files, separate from the BzrDir format
1244
- modifies the hash cache format
1245
- is new in bzr 0.15
1246
- uses a LockDir to guard access to it.
1249
upgrade_recommended = False
1251
def get_format_string(self):
1252
"""See WorkingTreeFormat.get_format_string()."""
1253
return "Bazaar Working Tree Format 4 (bzr 0.15)\n"
1255
def get_format_description(self):
1256
"""See WorkingTreeFormat.get_format_description()."""
1257
return "Working tree format 4"
1259
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):
1260
1480
"""See WorkingTreeFormat.initialize().
1262
1482
:param revision_id: allows creating a working tree at a different
1263
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,
1265
1491
These trees get an initial random root id, if their repository supports
1266
1492
rich root data, TREE_ROOT otherwise.
1268
revision_id = osutils.safe_revision_id(revision_id)
1269
1494
if not isinstance(a_bzrdir.transport, LocalTransport):
1270
1495
raise errors.NotLocalUrl(a_bzrdir.transport.base)
1271
1496
transport = a_bzrdir.get_workingtree_transport(self)
1272
1497
control_files = self._open_control_files(a_bzrdir)
1273
1498
control_files.create_lock()
1274
1499
control_files.lock_write()
1275
control_files.put_utf8('format', self.get_format_string())
1276
branch = a_bzrdir.open_branch()
1500
transport.put_bytes('format', self.as_string(),
1501
mode=a_bzrdir._get_file_mode())
1502
if from_branch is not None:
1503
branch = from_branch
1505
branch = a_bzrdir.open_branch()
1277
1506
if revision_id is None:
1278
1507
revision_id = branch.last_revision()
1279
1508
local_path = transport.local_abspath('dirstate')
1290
1519
wt.lock_tree_write()
1292
if revision_id in (None, NULL_REVISION):
1521
self._init_custom_control_files(wt)
1522
if revision_id in (None, _mod_revision.NULL_REVISION):
1293
1523
if branch.repository.supports_rich_root():
1294
1524
wt._set_root_id(generate_ids.gen_root_id())
1296
1526
wt._set_root_id(ROOT_ID)
1298
wt.set_last_revision(revision_id)
1300
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)]
1301
1543
basis.lock_read()
1302
# if the basis has a root id we have to use that; otherwise we use
1304
basis_root_id = basis.get_root_id()
1305
if basis_root_id is not None:
1306
wt._set_root_id(basis_root_id)
1545
wt.set_parent_trees(parents_list, allow_leftmost_as_ghost=True)
1308
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']:
1311
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))
1315
1598
def _open(self, a_bzrdir, control_files):
1316
1599
"""Open the tree itself.
1318
1601
:param a_bzrdir: the dir for the tree.
1319
1602
:param control_files: the control files for the tree.
1321
return WorkingTree4(a_bzrdir.root_transport.local_abspath('.'),
1604
return self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
1322
1605
branch=a_bzrdir.open_branch(),
1324
1607
_bzrdir=a_bzrdir,
1325
1608
_control_files=control_files)
1327
1610
def __get_matchingbzrdir(self):
1611
return self._get_matchingbzrdir()
1613
def _get_matchingbzrdir(self):
1614
"""Overrideable method to get a bzrdir for testing."""
1328
1615
# please test against something that will let us do tree references
1329
return bzrdir.format_registry.make_bzrdir(
1330
'dirstate-with-subtree')
1616
return controldir.format_registry.make_bzrdir(
1617
'development-subtree')
1332
1619
_matchingbzrdir = property(__get_matchingbzrdir)
1335
class DirStateRevisionTree(Tree):
1336
"""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.
1338
1710
def __init__(self, dirstate, revision_id, repository):
1339
1711
self._dirstate = dirstate
1340
self._revision_id = osutils.safe_revision_id(revision_id)
1712
self._revision_id = revision_id
1341
1713
self._repository = repository
1342
1714
self._inventory = None
1343
1715
self._locked = 0
1344
1716
self._dirstate_locked = False
1717
self._repo_supports_tree_reference = getattr(
1718
repository._format, "supports_tree_reference",
1346
1721
def __repr__(self):
1347
1722
return "<%s of %s in %s>" % \
1768
2241
if not found_versioned:
1769
2242
# none of the indexes was not 'absent' at all ids for this
1771
all_versioned = False
1773
if not all_versioned:
1774
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)
1775
2247
# -- remove redundancy in supplied specific_files to prevent over-scanning --
1776
search_specific_files = set()
1777
for path in specific_files:
1778
other_specific_files = specific_files.difference(set([path]))
1779
if not osutils.is_inside_any(other_specific_files, path):
1780
# this is a top level path, we must check it.
1781
search_specific_files.add(path)
1783
# compare source_index and target_index at or under each element of search_specific_files.
1784
# follow the following comparison table. Note that we only want to do diff operations when
1785
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1789
# Source | Target | disk | action
1790
# r | fdlt | | add source to search, add id path move and perform
1791
# | | | diff check on source-target
1792
# r | fdlt | a | dangling file that was present in the basis.
1794
# r | a | | add source to search
1796
# r | r | | this path is present in a non-examined tree, skip.
1797
# r | r | a | this path is present in a non-examined tree, skip.
1798
# a | fdlt | | add new id
1799
# a | fdlt | a | dangling locally added file, skip
1800
# a | a | | not present in either tree, skip
1801
# a | a | a | not present in any tree, skip
1802
# a | r | | not present in either tree at this path, skip as it
1803
# | | | may not be selected by the users list of paths.
1804
# a | r | a | not present in either tree at this path, skip as it
1805
# | | | may not be selected by the users list of paths.
1806
# fdlt | fdlt | | content in both: diff them
1807
# fdlt | fdlt | a | deleted locally, but not unversioned - show as deleted ?
1808
# fdlt | a | | unversioned: output deleted id for now
1809
# fdlt | a | a | unversioned and deleted: output deleted id
1810
# fdlt | r | | relocated in this tree, so add target to search.
1811
# | | | Dont diff, we will see an r,fd; pair when we reach
1812
# | | | this id at the other path.
1813
# fdlt | r | a | relocated in this tree, so add target to search.
1814
# | | | Dont diff, we will see an r,fd; pair when we reach
1815
# | | | this id at the other path.
1817
# for all search_indexs in each path at or under each element of
1818
# search_specific_files, if the detail is relocated: add the id, and add the
1819
# relocated path as one to search if its not searched already. If the
1820
# detail is not relocated, add the id.
1821
searched_specific_files = set()
1822
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1823
# Using a list so that we can access the values and change them in
1824
# nested scope. Each one is [path, file_id, entry]
1825
last_source_parent = [None, None]
1826
last_target_parent = [None, None]
2248
search_specific_files = osutils.minimum_path_selection(specific_files)
1828
2250
use_filesystem_for_exec = (sys.platform != 'win32')
1830
# Just a sentry, so that _process_entry can say that this
1831
# record is handled, but isn't interesting to process (unchanged)
1832
uninteresting = object()
1835
old_dirname_to_file_id = {}
1836
new_dirname_to_file_id = {}
1837
# TODO: jam 20070516 - Avoid the _get_entry lookup overhead by
1838
# keeping a cache of directories that we have seen.
1840
def _process_entry(entry, path_info):
1841
"""Compare an entry and real disk to generate delta information.
1843
:param path_info: top_relpath, basename, kind, lstat, abspath for
1844
the path of entry. If None, then the path is considered absent.
1845
(Perhaps we should pass in a concrete entry for this ?)
1846
Basename is returned as a utf8 string because we expect this
1847
tuple will be ignored, and don't want to take the time to
1849
:return: None if these don't match
1850
A tuple of information about the change, or
1851
the object 'uninteresting' if these match, but are
1852
basically identical.
1854
if source_index is None:
1855
source_details = NULL_PARENT_DETAILS
1857
source_details = entry[1][source_index]
1858
target_details = entry[1][target_index]
1859
target_minikind = target_details[0]
1860
if path_info is not None and target_minikind in 'fdlt':
1861
assert target_index == 0
1862
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
1863
stat_value=path_info[3])
1864
# The entry may have been modified by update_entry
1865
target_details = entry[1][target_index]
1866
target_minikind = target_details[0]
1869
file_id = entry[0][2]
1870
source_minikind = source_details[0]
1871
if source_minikind in 'fdltr' and target_minikind in 'fdlt':
1872
# claimed content in both: diff
1873
# r | fdlt | | add source to search, add id path move and perform
1874
# | | | diff check on source-target
1875
# r | fdlt | a | dangling file that was present in the basis.
1877
if source_minikind in 'r':
1878
# add the source to the search path to find any children it
1879
# has. TODO ? : only add if it is a container ?
1880
if not osutils.is_inside_any(searched_specific_files,
1882
search_specific_files.add(source_details[1])
1883
# generate the old path; this is needed for stating later
1885
old_path = source_details[1]
1886
old_dirname, old_basename = os.path.split(old_path)
1887
path = pathjoin(entry[0][0], entry[0][1])
1888
old_entry = state._get_entry(source_index,
1890
# update the source details variable to be the real
1892
source_details = old_entry[1][source_index]
1893
source_minikind = source_details[0]
1895
old_dirname = entry[0][0]
1896
old_basename = entry[0][1]
1897
old_path = path = None
1898
if path_info is None:
1899
# the file is missing on disk, show as removed.
1900
content_change = True
1904
# source and target are both versioned and disk file is present.
1905
target_kind = path_info[2]
1906
if target_kind == 'directory':
1908
old_path = path = pathjoin(old_dirname, old_basename)
1909
new_dirname_to_file_id[path] = file_id
1910
if source_minikind != 'd':
1911
content_change = True
1913
# directories have no fingerprint
1914
content_change = False
1916
elif target_kind == 'file':
1917
if source_minikind != 'f':
1918
content_change = True
1920
# We could check the size, but we already have the
1922
content_change = (link_or_sha1 != source_details[1])
1923
# Target details is updated at update_entry time
1924
if use_filesystem_for_exec:
1925
# We don't need S_ISREG here, because we are sure
1926
# we are dealing with a file.
1927
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
1929
target_exec = target_details[3]
1930
elif target_kind == 'symlink':
1931
if source_minikind != 'l':
1932
content_change = True
1934
content_change = (link_or_sha1 != source_details[1])
1936
elif target_kind == 'tree-reference':
1937
if source_minikind != 't':
1938
content_change = True
1940
content_change = False
1943
raise Exception, "unknown kind %s" % path_info[2]
1944
if source_minikind == 'd':
1946
old_path = path = pathjoin(old_dirname, old_basename)
1947
old_dirname_to_file_id[old_path] = file_id
1948
# parent id is the entry for the path in the target tree
1949
if old_dirname == last_source_parent[0]:
1950
source_parent_id = last_source_parent[1]
1953
source_parent_id = old_dirname_to_file_id[old_dirname]
1955
source_parent_entry = state._get_entry(source_index,
1956
path_utf8=old_dirname)
1957
source_parent_id = source_parent_entry[0][2]
1958
if source_parent_id == entry[0][2]:
1959
# This is the root, so the parent is None
1960
source_parent_id = None
1962
last_source_parent[0] = old_dirname
1963
last_source_parent[1] = source_parent_id
1964
new_dirname = entry[0][0]
1965
if new_dirname == last_target_parent[0]:
1966
target_parent_id = last_target_parent[1]
1969
target_parent_id = new_dirname_to_file_id[new_dirname]
1971
# TODO: We don't always need to do the lookup, because the
1972
# parent entry will be the same as the source entry.
1973
target_parent_entry = state._get_entry(target_index,
1974
path_utf8=new_dirname)
1975
assert target_parent_entry != (None, None), (
1976
"Could not find target parent in wt: %s\nparent of: %s"
1977
% (new_dirname, entry))
1978
target_parent_id = target_parent_entry[0][2]
1979
if target_parent_id == entry[0][2]:
1980
# This is the root, so the parent is None
1981
target_parent_id = None
1983
last_target_parent[0] = new_dirname
1984
last_target_parent[1] = target_parent_id
1986
source_exec = source_details[3]
1987
if (include_unchanged
1989
or source_parent_id != target_parent_id
1990
or old_basename != entry[0][1]
1991
or source_exec != target_exec
1993
if old_path is None:
1994
old_path = path = pathjoin(old_dirname, old_basename)
1995
old_path_u = utf8_decode(old_path)[0]
1998
old_path_u = utf8_decode(old_path)[0]
1999
if old_path == path:
2002
path_u = utf8_decode(path)[0]
2003
source_kind = _minikind_to_kind[source_minikind]
2004
return (entry[0][2],
2005
(old_path_u, path_u),
2008
(source_parent_id, target_parent_id),
2009
(utf8_decode(old_basename)[0], utf8_decode(entry[0][1])[0]),
2010
(source_kind, target_kind),
2011
(source_exec, target_exec))
2013
return uninteresting
2014
elif source_minikind in 'a' and target_minikind in 'fdlt':
2015
# looks like a new file
2016
if path_info is not None:
2017
path = pathjoin(entry[0][0], entry[0][1])
2018
# parent id is the entry for the path in the target tree
2019
# TODO: these are the same for an entire directory: cache em.
2020
parent_id = state._get_entry(target_index,
2021
path_utf8=entry[0][0])[0][2]
2022
if parent_id == entry[0][2]:
2024
if use_filesystem_for_exec:
2025
# We need S_ISREG here, because we aren't sure if this
2028
stat.S_ISREG(path_info[3].st_mode)
2029
and stat.S_IEXEC & path_info[3].st_mode)
2031
target_exec = target_details[3]
2032
return (entry[0][2],
2033
(None, utf8_decode(path)[0]),
2037
(None, utf8_decode(entry[0][1])[0]),
2038
(None, path_info[2]),
2039
(None, target_exec))
2041
# but its not on disk: we deliberately treat this as just
2042
# never-present. (Why ?! - RBC 20070224)
2044
elif source_minikind in 'fdlt' and target_minikind in 'a':
2045
# unversioned, possibly, or possibly not deleted: we dont care.
2046
# if its still on disk, *and* theres no other entry at this
2047
# path [we dont know this in this routine at the moment -
2048
# perhaps we should change this - then it would be an unknown.
2049
old_path = pathjoin(entry[0][0], entry[0][1])
2050
# parent id is the entry for the path in the target tree
2051
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
2052
if parent_id == entry[0][2]:
2054
return (entry[0][2],
2055
(utf8_decode(old_path)[0], None),
2059
(utf8_decode(entry[0][1])[0], None),
2060
(_minikind_to_kind[source_minikind], None),
2061
(source_details[3], None))
2062
elif source_minikind in 'fdlt' and target_minikind in 'r':
2063
# a rename; could be a true rename, or a rename inherited from
2064
# a renamed parent. TODO: handle this efficiently. Its not
2065
# common case to rename dirs though, so a correct but slow
2066
# implementation will do.
2067
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
2068
search_specific_files.add(target_details[1])
2069
elif source_minikind in 'ra' and target_minikind in 'ra':
2070
# neither of the selected trees contain this file,
2071
# so skip over it. This is not currently directly tested, but
2072
# is indirectly via test_too_much.TestCommands.test_conflicts.
2075
raise AssertionError("don't know how to compare "
2076
"source_minikind=%r, target_minikind=%r"
2077
% (source_minikind, target_minikind))
2078
## import pdb;pdb.set_trace()
2081
while search_specific_files:
2082
# TODO: the pending list should be lexically sorted? the
2083
# interface doesn't require it.
2084
current_root = search_specific_files.pop()
2085
current_root_unicode = current_root.decode('utf8')
2086
searched_specific_files.add(current_root)
2087
# process the entries for this containing directory: the rest will be
2088
# found by their parents recursively.
2089
root_entries = _entries_for_path(current_root)
2090
root_abspath = self.target.abspath(current_root_unicode)
2092
root_stat = os.lstat(root_abspath)
2094
if e.errno == errno.ENOENT:
2095
# the path does not exist: let _process_entry know that.
2096
root_dir_info = None
2098
# some other random error: hand it up.
2101
root_dir_info = ('', current_root,
2102
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
2104
if root_dir_info[2] == 'directory':
2105
if self.target._directory_is_tree_reference(
2106
current_root.decode('utf8')):
2107
root_dir_info = root_dir_info[:2] + \
2108
('tree-reference',) + root_dir_info[3:]
2110
if not root_entries and not root_dir_info:
2111
# this specified path is not present at all, skip it.
2113
path_handled = False
2114
for entry in root_entries:
2115
result = _process_entry(entry, root_dir_info)
2116
if result is not None:
2118
if result is not uninteresting:
2120
if want_unversioned and not path_handled and root_dir_info:
2121
new_executable = bool(
2122
stat.S_ISREG(root_dir_info[3].st_mode)
2123
and stat.S_IEXEC & root_dir_info[3].st_mode)
2125
(None, current_root_unicode),
2129
(None, splitpath(current_root_unicode)[-1]),
2130
(None, root_dir_info[2]),
2131
(None, new_executable)
2133
initial_key = (current_root, '', '')
2134
block_index, _ = state._find_block_index_from_key(initial_key)
2135
if block_index == 0:
2136
# we have processed the total root already, but because the
2137
# initial key matched it we should skip it here.
2139
if root_dir_info and root_dir_info[2] == 'tree-reference':
2140
current_dir_info = None
2142
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
2144
current_dir_info = dir_iterator.next()
2146
# on win32, python2.4 has e.errno == ERROR_DIRECTORY, but
2147
# python 2.5 has e.errno == EINVAL,
2148
# and e.winerror == ERROR_DIRECTORY
2149
e_winerror = getattr(e, 'winerror', None)
2150
win_errors = (ERROR_DIRECTORY, ERROR_PATH_NOT_FOUND)
2151
# there may be directories in the inventory even though
2152
# this path is not a file on disk: so mark it as end of
2154
if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
2155
current_dir_info = None
2156
elif (sys.platform == 'win32'
2157
and (e.errno in win_errors
2158
or e_winerror in win_errors)):
2159
current_dir_info = None
2163
if current_dir_info[0][0] == '':
2164
# remove .bzr from iteration
2165
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
2166
assert current_dir_info[1][bzr_index][0] == '.bzr'
2167
del current_dir_info[1][bzr_index]
2168
# walk until both the directory listing and the versioned metadata
2170
if (block_index < len(state._dirblocks) and
2171
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2172
current_block = state._dirblocks[block_index]
2174
current_block = None
2175
while (current_dir_info is not None or
2176
current_block is not None):
2177
if (current_dir_info and current_block
2178
and current_dir_info[0][0] != current_block[0]):
2179
if cmp_by_dirs(current_dir_info[0][0], current_block[0]) < 0:
2180
# filesystem data refers to paths not covered by the dirblock.
2181
# this has two possibilities:
2182
# A) it is versioned but empty, so there is no block for it
2183
# B) it is not versioned.
2185
# if (A) then we need to recurse into it to check for
2186
# new unknown files or directories.
2187
# if (B) then we should ignore it, because we don't
2188
# recurse into unknown directories.
2190
while path_index < len(current_dir_info[1]):
2191
current_path_info = current_dir_info[1][path_index]
2192
if want_unversioned:
2193
if current_path_info[2] == 'directory':
2194
if self.target._directory_is_tree_reference(
2195
current_path_info[0].decode('utf8')):
2196
current_path_info = current_path_info[:2] + \
2197
('tree-reference',) + current_path_info[3:]
2198
new_executable = bool(
2199
stat.S_ISREG(current_path_info[3].st_mode)
2200
and stat.S_IEXEC & current_path_info[3].st_mode)
2202
(None, utf8_decode(current_path_info[0])[0]),
2206
(None, utf8_decode(current_path_info[1])[0]),
2207
(None, current_path_info[2]),
2208
(None, new_executable))
2209
# dont descend into this unversioned path if it is
2211
if current_path_info[2] in ('directory',
2213
del current_dir_info[1][path_index]
2217
# This dir info has been handled, go to the next
2219
current_dir_info = dir_iterator.next()
2220
except StopIteration:
2221
current_dir_info = None
2223
# We have a dirblock entry for this location, but there
2224
# is no filesystem path for this. This is most likely
2225
# because a directory was removed from the disk.
2226
# We don't have to report the missing directory,
2227
# because that should have already been handled, but we
2228
# need to handle all of the files that are contained
2230
for current_entry in current_block[1]:
2231
# entry referring to file not present on disk.
2232
# advance the entry only, after processing.
2233
result = _process_entry(current_entry, None)
2234
if result is not None:
2235
if result is not uninteresting:
2238
if (block_index < len(state._dirblocks) and
2239
osutils.is_inside(current_root,
2240
state._dirblocks[block_index][0])):
2241
current_block = state._dirblocks[block_index]
2243
current_block = None
2246
if current_block and entry_index < len(current_block[1]):
2247
current_entry = current_block[1][entry_index]
2249
current_entry = None
2250
advance_entry = True
2252
if current_dir_info and path_index < len(current_dir_info[1]):
2253
current_path_info = current_dir_info[1][path_index]
2254
if current_path_info[2] == 'directory':
2255
if self.target._directory_is_tree_reference(
2256
current_path_info[0].decode('utf8')):
2257
current_path_info = current_path_info[:2] + \
2258
('tree-reference',) + current_path_info[3:]
2260
current_path_info = None
2262
path_handled = False
2263
while (current_entry is not None or
2264
current_path_info is not None):
2265
if current_entry is None:
2266
# the check for path_handled when the path is adnvaced
2267
# will yield this path if needed.
2269
elif current_path_info is None:
2270
# no path is fine: the per entry code will handle it.
2271
result = _process_entry(current_entry, current_path_info)
2272
if result is not None:
2273
if result is not uninteresting:
2275
elif (current_entry[0][1] != current_path_info[1]
2276
or current_entry[1][target_index][0] in 'ar'):
2277
# The current path on disk doesn't match the dirblock
2278
# record. Either the dirblock is marked as absent, or
2279
# the file on disk is not present at all in the
2280
# dirblock. Either way, report about the dirblock
2281
# entry, and let other code handle the filesystem one.
2283
# Compare the basename for these files to determine
2285
if current_path_info[1] < current_entry[0][1]:
2286
# extra file on disk: pass for now, but only
2287
# increment the path, not the entry
2288
advance_entry = False
2290
# entry referring to file not present on disk.
2291
# advance the entry only, after processing.
2292
result = _process_entry(current_entry, None)
2293
if result is not None:
2294
if result is not uninteresting:
2296
advance_path = False
2298
result = _process_entry(current_entry, current_path_info)
2299
if result is not None:
2301
if result is not uninteresting:
2303
if advance_entry and current_entry is not None:
2305
if entry_index < len(current_block[1]):
2306
current_entry = current_block[1][entry_index]
2308
current_entry = None
2310
advance_entry = True # reset the advance flaga
2311
if advance_path and current_path_info is not None:
2312
if not path_handled:
2313
# unversioned in all regards
2314
if want_unversioned:
2315
new_executable = bool(
2316
stat.S_ISREG(current_path_info[3].st_mode)
2317
and stat.S_IEXEC & current_path_info[3].st_mode)
2319
(None, utf8_decode(current_path_info[0])[0]),
2323
(None, utf8_decode(current_path_info[1])[0]),
2324
(None, current_path_info[2]),
2325
(None, new_executable))
2326
# dont descend into this unversioned path if it is
2328
if current_path_info[2] in ('directory'):
2329
del current_dir_info[1][path_index]
2331
# dont descend the disk iterator into any tree
2333
if current_path_info[2] == 'tree-reference':
2334
del current_dir_info[1][path_index]
2337
if path_index < len(current_dir_info[1]):
2338
current_path_info = current_dir_info[1][path_index]
2339
if current_path_info[2] == 'directory':
2340
if self.target._directory_is_tree_reference(
2341
current_path_info[0].decode('utf8')):
2342
current_path_info = current_path_info[:2] + \
2343
('tree-reference',) + current_path_info[3:]
2345
current_path_info = None
2346
path_handled = False
2348
advance_path = True # reset the advance flagg.
2349
if current_block is not None:
2351
if (block_index < len(state._dirblocks) and
2352
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2353
current_block = state._dirblocks[block_index]
2355
current_block = None
2356
if current_dir_info is not None:
2358
current_dir_info = dir_iterator.next()
2359
except StopIteration:
2360
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()
2364
2257
def is_compatible(source, target):
2365
2258
# the target must be a dirstate working tree
2366
if not isinstance(target, WorkingTree4):
2259
if not isinstance(target, DirStateWorkingTree):
2368
# the source must be a revtreee or dirstate rev tree.
2261
# the source must be a revtree or dirstate rev tree.
2369
2262
if not isinstance(source,
2370
2263
(revisiontree.RevisionTree, DirStateRevisionTree)):
2372
2265
# the source revid must be in the target dirstate
2373
if not (source._revision_id == NULL_REVISION or
2266
if not (source._revision_id == _mod_revision.NULL_REVISION or
2374
2267
source._revision_id in target.get_parent_ids()):
2375
# TODO: what about ghosts? it may well need to
2268
# TODO: what about ghosts? it may well need to
2376
2269
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
