1304
1163
# have to change the legacy inventory too.
1305
1164
if self._inventory is not None:
1306
1165
for file_id in file_ids:
1307
if self._inventory.has_id(file_id):
1308
self._inventory.remove_recursive_id(file_id)
1310
@needs_tree_write_lock
1311
def rename_one(self, from_rel, to_rel, after=False):
1312
"""See WorkingTree.rename_one"""
1314
super(DirStateWorkingTree, self).rename_one(from_rel, to_rel, after)
1316
@needs_tree_write_lock
1317
def apply_inventory_delta(self, changes):
1318
"""See MutableTree.apply_inventory_delta"""
1319
state = self.current_dirstate()
1320
state.update_by_delta(changes)
1321
self._make_dirty(reset_inventory=True)
1323
def update_basis_by_delta(self, new_revid, delta):
1324
"""See MutableTree.update_basis_by_delta."""
1325
if self.last_revision() == new_revid:
1326
raise AssertionError()
1327
self.current_dirstate().update_basis_by_delta(delta, new_revid)
1330
def _validate(self):
1331
self._dirstate._validate()
1166
self._inventory.remove_recursive_id(file_id)
1333
1168
@needs_tree_write_lock
1334
1169
def _write_inventory(self, inv):
1335
1170
"""Write inventory as the current inventory."""
1337
raise AssertionError("attempting to write an inventory when the "
1338
"dirstate is dirty will lose pending changes")
1339
had_inventory = self._inventory is not None
1340
# Setting self._inventory = None forces the dirstate to regenerate the
1341
# working inventory. We do this because self.inventory may be inv, or
1342
# may have been modified, and either case would prevent a clean delta
1344
self._inventory = None
1346
delta = inv._make_delta(self.root_inventory)
1348
self.apply_inventory_delta(delta)
1171
assert not self._dirty, "attempting to write an inventory when the dirstate is dirty will cause data loss"
1172
self.current_dirstate().set_state_from_inventory(inv)
1173
self._make_dirty(reset_inventory=False)
1174
if self._inventory is not None:
1350
1175
self._inventory = inv
1353
@needs_tree_write_lock
1354
def reset_state(self, revision_ids=None):
1355
"""Reset the state of the working tree.
1357
This does a hard-reset to a last-known-good state. This is a way to
1358
fix if something got corrupted (like the .bzr/checkout/dirstate file)
1360
if revision_ids is None:
1361
revision_ids = self.get_parent_ids()
1362
if not revision_ids:
1363
base_tree = self.branch.repository.revision_tree(
1364
_mod_revision.NULL_REVISION)
1367
trees = zip(revision_ids,
1368
self.branch.repository.revision_trees(revision_ids))
1369
base_tree = trees[0][1]
1370
state = self.current_dirstate()
1371
# We don't support ghosts yet
1372
state.set_state_from_scratch(base_tree.root_inventory, trees, [])
1375
class ContentFilterAwareSHA1Provider(dirstate.SHA1Provider):
1377
def __init__(self, tree):
1380
def sha1(self, abspath):
1381
"""See dirstate.SHA1Provider.sha1()."""
1382
filters = self.tree._content_filter_stack(
1383
self.tree.relpath(osutils.safe_unicode(abspath)))
1384
return _mod_filters.internal_size_sha_file_byname(abspath, filters)[1]
1386
def stat_and_sha1(self, abspath):
1387
"""See dirstate.SHA1Provider.stat_and_sha1()."""
1388
filters = self.tree._content_filter_stack(
1389
self.tree.relpath(osutils.safe_unicode(abspath)))
1390
file_obj = file(abspath, 'rb', 65000)
1392
statvalue = os.fstat(file_obj.fileno())
1394
file_obj = _mod_filters.filtered_input_file(file_obj, filters)
1395
sha1 = osutils.size_sha_file(file_obj)[1]
1398
return statvalue, sha1
1401
class ContentFilteringDirStateWorkingTree(DirStateWorkingTree):
1402
"""Dirstate working tree that supports content filtering.
1404
The dirstate holds the hash and size of the canonical form of the file,
1405
and most methods must return that.
1408
def _file_content_summary(self, path, stat_result):
1409
# This is to support the somewhat obsolete path_content_summary method
1410
# with content filtering: see
1411
# <https://bugs.launchpad.net/bzr/+bug/415508>.
1413
# If the dirstate cache is up to date and knows the hash and size,
1415
# Otherwise if there are no content filters, return the on-disk size
1416
# and leave the hash blank.
1417
# Otherwise, read and filter the on-disk file and use its size and
1420
# The dirstate doesn't store the size of the canonical form so we
1421
# can't trust it for content-filtered trees. We just return None.
1422
dirstate_sha1 = self._dirstate.sha1_from_stat(path, stat_result)
1423
executable = self._is_executable_from_path_and_stat(path, stat_result)
1424
return ('file', None, executable, dirstate_sha1)
1427
class WorkingTree4(DirStateWorkingTree):
1428
"""This is the Format 4 working tree.
1430
This differs from WorkingTree by:
1431
- Having a consolidated internal dirstate, stored in a
1432
randomly-accessible sorted file on disk.
1433
- Not having a regular inventory attribute. One can be synthesized
1434
on demand but this is expensive and should be avoided.
1436
This is new in bzr 0.15.
1440
class WorkingTree5(ContentFilteringDirStateWorkingTree):
1441
"""This is the Format 5 working tree.
1443
This differs from WorkingTree4 by:
1444
- Supporting content filtering.
1446
This is new in bzr 1.11.
1450
class WorkingTree6(ContentFilteringDirStateWorkingTree):
1451
"""This is the Format 6 working tree.
1453
This differs from WorkingTree5 by:
1454
- Supporting a current view that may mask the set of files in a tree
1455
impacted by most user operations.
1457
This is new in bzr 1.14.
1460
def _make_views(self):
1461
return views.PathBasedViews(self)
1464
class DirStateWorkingTreeFormat(WorkingTreeFormatMetaDir):
1466
missing_parent_conflicts = True
1468
supports_versioned_directories = True
1470
_lock_class = LockDir
1471
_lock_file_name = 'lock'
1473
def _open_control_files(self, a_bzrdir):
1474
transport = a_bzrdir.get_workingtree_transport(None)
1475
return LockableFiles(transport, self._lock_file_name,
1478
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
1479
accelerator_tree=None, hardlink=False):
1179
class WorkingTreeFormat4(WorkingTreeFormat3):
1180
"""The first consolidated dirstate working tree format.
1183
- exists within a metadir controlling .bzr
1184
- includes an explicit version marker for the workingtree control
1185
files, separate from the BzrDir format
1186
- modifies the hash cache format
1187
- is new in bzr 0.15
1188
- uses a LockDir to guard access to it.
1191
def get_format_string(self):
1192
"""See WorkingTreeFormat.get_format_string()."""
1193
return "Bazaar Working Tree Format 4 (bzr 0.15)\n"
1195
def get_format_description(self):
1196
"""See WorkingTreeFormat.get_format_description()."""
1197
return "Working tree format 4"
1199
def initialize(self, a_bzrdir, revision_id=None):
1480
1200
"""See WorkingTreeFormat.initialize().
1482
1202
:param revision_id: allows creating a working tree at a different
1483
revision than the branch is at.
1484
:param accelerator_tree: A tree which can be used for retrieving file
1485
contents more quickly than the revision tree, i.e. a workingtree.
1486
The revision tree will be used for cases where accelerator_tree's
1487
content is different.
1488
:param hardlink: If true, hard-link files from accelerator_tree,
1203
revision than the branch is at.
1491
These trees get an initial random root id, if their repository supports
1492
rich root data, TREE_ROOT otherwise.
1205
These trees get an initial random root id.
1207
revision_id = osutils.safe_revision_id(revision_id)
1494
1208
if not isinstance(a_bzrdir.transport, LocalTransport):
1495
1209
raise errors.NotLocalUrl(a_bzrdir.transport.base)
1496
1210
transport = a_bzrdir.get_workingtree_transport(self)
1497
1211
control_files = self._open_control_files(a_bzrdir)
1498
1212
control_files.create_lock()
1499
1213
control_files.lock_write()
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()
1214
control_files.put_utf8('format', self.get_format_string())
1215
branch = a_bzrdir.open_branch()
1506
1216
if revision_id is None:
1507
1217
revision_id = branch.last_revision()
1508
1218
local_path = transport.local_abspath('dirstate')
1509
1219
# write out new dirstate (must exist when we create the tree)
1510
1220
state = dirstate.DirState.initialize(local_path)
1513
wt = self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
1222
wt = WorkingTree4(a_bzrdir.root_transport.local_abspath('.'),
1516
1225
_bzrdir=a_bzrdir,
1517
1226
_control_files=control_files)
1519
1228
wt.lock_tree_write()
1521
self._init_custom_control_files(wt)
1522
if revision_id in (None, _mod_revision.NULL_REVISION):
1523
if branch.repository.supports_rich_root():
1524
wt._set_root_id(generate_ids.gen_root_id())
1526
wt._set_root_id(ROOT_ID)
1231
if revision_id in (None, NULL_REVISION):
1232
wt._set_root_id(generate_ids.gen_root_id())
1529
# frequently, we will get here due to branching. The accelerator
1530
# tree will be the tree from the branch, so the desired basis
1531
# tree will often be a parent of the accelerator tree.
1532
if accelerator_tree is not None:
1534
basis = accelerator_tree.revision_tree(revision_id)
1535
except errors.NoSuchRevision:
1538
basis = branch.repository.revision_tree(revision_id)
1539
if revision_id == _mod_revision.NULL_REVISION:
1542
parents_list = [(revision_id, basis)]
1234
wt.current_dirstate()._validate()
1235
wt.set_last_revision(revision_id)
1237
basis = wt.basis_tree()
1543
1238
basis.lock_read()
1545
wt.set_parent_trees(parents_list, allow_leftmost_as_ghost=True)
1239
# if the basis has a root id we have to use that; otherwise we use
1241
basis_root_id = basis.get_root_id()
1242
if basis_root_id is not None:
1243
wt._set_root_id(basis_root_id)
1547
# if the basis has a root id we have to use that; otherwise we
1548
# use a new random one
1549
basis_root_id = basis.get_root_id()
1550
if basis_root_id is not None:
1551
wt._set_root_id(basis_root_id)
1553
if wt.supports_content_filtering():
1554
# The original tree may not have the same content filters
1555
# applied so we can't safely build the inventory delta from
1557
delta_from_tree = False
1559
delta_from_tree = True
1560
# delta_from_tree is safe even for DirStateRevisionTrees,
1561
# because wt4.apply_inventory_delta does not mutate the input
1562
# inventory entries.
1563
transform.build_tree(basis, wt, accelerator_tree,
1565
delta_from_tree=delta_from_tree)
1566
for hook in MutableTree.hooks['post_build_tree']:
1245
transform.build_tree(basis, wt)
1571
1248
control_files.unlock()
1575
def _init_custom_control_files(self, wt):
1576
"""Subclasses with custom control files should override this method.
1578
The working tree and control files are locked for writing when this
1581
:param wt: the WorkingTree object
1584
def open(self, a_bzrdir, _found=False):
1585
"""Return the WorkingTree object for a_bzrdir
1587
_found is a private parameter, do not use it. It is used to indicate
1588
if format probing has already been done.
1591
# we are being called directly and must probe.
1592
raise NotImplementedError
1593
if not isinstance(a_bzrdir.transport, LocalTransport):
1594
raise errors.NotLocalUrl(a_bzrdir.transport.base)
1595
wt = self._open(a_bzrdir, self._open_control_files(a_bzrdir))
1598
1252
def _open(self, a_bzrdir, control_files):
1599
1253
"""Open the tree itself.
1601
1255
:param a_bzrdir: the dir for the tree.
1602
1256
:param control_files: the control files for the tree.
1604
return self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
1258
return WorkingTree4(a_bzrdir.root_transport.local_abspath('.'),
1605
1259
branch=a_bzrdir.open_branch(),
1607
1261
_bzrdir=a_bzrdir,
1608
1262
_control_files=control_files)
1610
1264
def __get_matchingbzrdir(self):
1611
return self._get_matchingbzrdir()
1613
def _get_matchingbzrdir(self):
1614
"""Overrideable method to get a bzrdir for testing."""
1615
1265
# please test against something that will let us do tree references
1616
return controldir.format_registry.make_bzrdir(
1617
'development-subtree')
1266
return bzrdir.format_registry.make_bzrdir(
1267
'dirstate-with-subtree')
1619
1269
_matchingbzrdir = property(__get_matchingbzrdir)
1622
class WorkingTreeFormat4(DirStateWorkingTreeFormat):
1623
"""The first consolidated dirstate working tree format.
1626
- exists within a metadir controlling .bzr
1627
- includes an explicit version marker for the workingtree control
1628
files, separate from the ControlDir format
1629
- modifies the hash cache format
1630
- is new in bzr 0.15
1631
- uses a LockDir to guard access to it.
1634
upgrade_recommended = False
1636
_tree_class = WorkingTree4
1639
def get_format_string(cls):
1640
"""See WorkingTreeFormat.get_format_string()."""
1641
return "Bazaar Working Tree Format 4 (bzr 0.15)\n"
1643
def get_format_description(self):
1644
"""See WorkingTreeFormat.get_format_description()."""
1645
return "Working tree format 4"
1648
class WorkingTreeFormat5(DirStateWorkingTreeFormat):
1649
"""WorkingTree format supporting content filtering.
1652
upgrade_recommended = False
1654
_tree_class = WorkingTree5
1657
def get_format_string(cls):
1658
"""See WorkingTreeFormat.get_format_string()."""
1659
return "Bazaar Working Tree Format 5 (bzr 1.11)\n"
1661
def get_format_description(self):
1662
"""See WorkingTreeFormat.get_format_description()."""
1663
return "Working tree format 5"
1665
def supports_content_filtering(self):
1669
class WorkingTreeFormat6(DirStateWorkingTreeFormat):
1670
"""WorkingTree format supporting views.
1673
upgrade_recommended = False
1675
_tree_class = WorkingTree6
1678
def get_format_string(cls):
1679
"""See WorkingTreeFormat.get_format_string()."""
1680
return "Bazaar Working Tree Format 6 (bzr 1.14)\n"
1682
def get_format_description(self):
1683
"""See WorkingTreeFormat.get_format_description()."""
1684
return "Working tree format 6"
1686
def _init_custom_control_files(self, wt):
1687
"""Subclasses with custom control files should override this method."""
1688
wt._transport.put_bytes('views', '', mode=wt.bzrdir._get_file_mode())
1690
def supports_content_filtering(self):
1693
def supports_views(self):
1696
def _get_matchingbzrdir(self):
1697
"""Overrideable method to get a bzrdir for testing."""
1698
# We use 'development-subtree' instead of '2a', because we have a
1699
# few tests that want to test tree references
1700
return bzrdir.format_registry.make_bzrdir('development-subtree')
1703
class DirStateRevisionTree(InventoryTree):
1704
"""A revision tree pulling the inventory from a dirstate.
1706
Note that this is one of the historical (ie revision) trees cached in the
1707
dirstate for easy access, not the workingtree.
1272
class DirStateRevisionTree(Tree):
1273
"""A revision tree pulling the inventory from a dirstate."""
1710
1275
def __init__(self, dirstate, revision_id, repository):
1711
1276
self._dirstate = dirstate
1712
self._revision_id = revision_id
1277
self._revision_id = osutils.safe_revision_id(revision_id)
1713
1278
self._repository = repository
1714
1279
self._inventory = None
1715
1280
self._locked = 0
1716
1281
self._dirstate_locked = False
1717
self._repo_supports_tree_reference = getattr(
1718
repository._format, "supports_tree_reference",
1721
1283
def __repr__(self):
1722
1284
return "<%s of %s in %s>" % \
1723
1285
(self.__class__.__name__, self._revision_id, self._dirstate)
1725
def annotate_iter(self, file_id,
1726
default_revision=_mod_revision.CURRENT_REVISION):
1287
def annotate_iter(self, file_id):
1727
1288
"""See Tree.annotate_iter"""
1728
text_key = (file_id, self.get_file_revision(file_id))
1729
annotations = self._repository.texts.annotate(text_key)
1730
return [(key[-1], line) for (key, line) in annotations]
1289
w = self._repository.weave_store.get_weave(file_id,
1290
self._repository.get_transaction())
1291
return w.annotate_iter(self.inventory[file_id].revision)
1732
1293
def _comparison_data(self, entry, path):
1733
1294
"""See Tree._comparison_data."""
2241
1694
if not found_versioned:
2242
1695
# none of the indexes was not 'absent' at all ids for this
2244
not_versioned.append(path.decode('utf-8'))
2245
if len(not_versioned) > 0:
2246
raise errors.PathsNotVersionedError(not_versioned)
1697
all_versioned = False
1699
if not all_versioned:
1700
raise errors.PathsNotVersionedError(specific_files)
2247
1701
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2248
search_specific_files = osutils.minimum_path_selection(specific_files)
1702
search_specific_files = set()
1703
for path in specific_files:
1704
other_specific_files = specific_files.difference(set([path]))
1705
if not osutils.is_inside_any(other_specific_files, path):
1706
# this is a top level path, we must check it.
1707
search_specific_files.add(path)
1709
# compare source_index and target_index at or under each element of search_specific_files.
1710
# follow the following comparison table. Note that we only want to do diff operations when
1711
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1715
# Source | Target | disk | action
1716
# r | fdlt | | add source to search, add id path move and perform
1717
# | | | diff check on source-target
1718
# r | fdlt | a | dangling file that was present in the basis.
1720
# r | a | | add source to search
1722
# r | r | | this path is present in a non-examined tree, skip.
1723
# r | r | a | this path is present in a non-examined tree, skip.
1724
# a | fdlt | | add new id
1725
# a | fdlt | a | dangling locally added file, skip
1726
# a | a | | not present in either tree, skip
1727
# a | a | a | not present in any tree, skip
1728
# a | r | | not present in either tree at this path, skip as it
1729
# | | | may not be selected by the users list of paths.
1730
# a | r | a | not present in either tree at this path, skip as it
1731
# | | | may not be selected by the users list of paths.
1732
# fdlt | fdlt | | content in both: diff them
1733
# fdlt | fdlt | a | deleted locally, but not unversioned - show as deleted ?
1734
# fdlt | a | | unversioned: output deleted id for now
1735
# fdlt | a | a | unversioned and deleted: output deleted id
1736
# fdlt | r | | relocated in this tree, so add target to search.
1737
# | | | Dont diff, we will see an r,fd; pair when we reach
1738
# | | | this id at the other path.
1739
# fdlt | r | a | relocated in this tree, so add target to search.
1740
# | | | Dont diff, we will see an r,fd; pair when we reach
1741
# | | | this id at the other path.
1743
# for all search_indexs in each path at or under each element of
1744
# search_specific_files, if the detail is relocated: add the id, and add the
1745
# relocated path as one to search if its not searched already. If the
1746
# detail is not relocated, add the id.
1747
searched_specific_files = set()
1748
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1749
# Using a list so that we can access the values and change them in
1750
# nested scope. Each one is [path, file_id, entry]
1751
last_source_parent = [None, None, None]
1752
last_target_parent = [None, None, None]
2250
1754
use_filesystem_for_exec = (sys.platform != 'win32')
2251
iter_changes = self.target._iter_changes(include_unchanged,
2252
use_filesystem_for_exec, search_specific_files, state,
2253
source_index, target_index, want_unversioned, self.target)
2254
return iter_changes.iter_changes()
1756
def _process_entry(entry, path_info):
1757
"""Compare an entry and real disk to generate delta information.
1759
:param path_info: top_relpath, basename, kind, lstat, abspath for
1760
the path of entry. If None, then the path is considered absent.
1761
(Perhaps we should pass in a concrete entry for this ?)
1762
Basename is returned as a utf8 string because we expect this
1763
tuple will be ignored, and don't want to take the time to
1766
if source_index is None:
1767
source_details = NULL_PARENT_DETAILS
1769
source_details = entry[1][source_index]
1770
target_details = entry[1][target_index]
1771
target_minikind = target_details[0]
1772
if path_info is not None and target_minikind in 'fdlt':
1773
assert target_index == 0
1774
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
1775
stat_value=path_info[3])
1776
# The entry may have been modified by update_entry
1777
target_details = entry[1][target_index]
1778
target_minikind = target_details[0]
1781
source_minikind = source_details[0]
1782
if source_minikind in 'fdltr' and target_minikind in 'fdlt':
1783
# claimed content in both: diff
1784
# r | fdlt | | add source to search, add id path move and perform
1785
# | | | diff check on source-target
1786
# r | fdlt | a | dangling file that was present in the basis.
1788
if source_minikind in 'r':
1789
# add the source to the search path to find any children it
1790
# has. TODO ? : only add if it is a container ?
1791
if not osutils.is_inside_any(searched_specific_files,
1793
search_specific_files.add(source_details[1])
1794
# generate the old path; this is needed for stating later
1796
old_path = source_details[1]
1797
old_dirname, old_basename = os.path.split(old_path)
1798
path = pathjoin(entry[0][0], entry[0][1])
1799
old_entry = state._get_entry(source_index,
1801
# update the source details variable to be the real
1803
source_details = old_entry[1][source_index]
1804
source_minikind = source_details[0]
1806
old_dirname = entry[0][0]
1807
old_basename = entry[0][1]
1808
old_path = path = pathjoin(old_dirname, old_basename)
1809
if path_info is None:
1810
# the file is missing on disk, show as removed.
1811
content_change = True
1815
# source and target are both versioned and disk file is present.
1816
target_kind = path_info[2]
1817
if target_kind == 'directory':
1818
if source_minikind != 'd':
1819
content_change = True
1821
# directories have no fingerprint
1822
content_change = False
1824
elif target_kind == 'file':
1825
if source_minikind != 'f':
1826
content_change = True
1828
# We could check the size, but we already have the
1830
content_change = (link_or_sha1 != source_details[1])
1831
# Target details is updated at update_entry time
1832
if use_filesystem_for_exec:
1833
# We don't need S_ISREG here, because we are sure
1834
# we are dealing with a file.
1835
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
1837
target_exec = target_details[3]
1838
elif target_kind == 'symlink':
1839
if source_minikind != 'l':
1840
content_change = True
1842
content_change = (link_or_sha1 != source_details[1])
1844
elif target_kind == 'tree-reference':
1845
if source_minikind != 't':
1846
content_change = True
1848
content_change = False
1851
raise Exception, "unknown kind %s" % path_info[2]
1852
# parent id is the entry for the path in the target tree
1853
if old_dirname == last_source_parent[0]:
1854
source_parent_id = last_source_parent[1]
1856
source_parent_entry = state._get_entry(source_index,
1857
path_utf8=old_dirname)
1858
source_parent_id = source_parent_entry[0][2]
1859
if source_parent_id == entry[0][2]:
1860
# This is the root, so the parent is None
1861
source_parent_id = None
1863
last_source_parent[0] = old_dirname
1864
last_source_parent[1] = source_parent_id
1865
last_source_parent[2] = source_parent_entry
1867
new_dirname = entry[0][0]
1868
if new_dirname == last_target_parent[0]:
1869
target_parent_id = last_target_parent[1]
1871
# TODO: We don't always need to do the lookup, because the
1872
# parent entry will be the same as the source entry.
1873
target_parent_entry = state._get_entry(target_index,
1874
path_utf8=new_dirname)
1875
target_parent_id = target_parent_entry[0][2]
1876
if target_parent_id == entry[0][2]:
1877
# This is the root, so the parent is None
1878
target_parent_id = None
1880
last_target_parent[0] = new_dirname
1881
last_target_parent[1] = target_parent_id
1882
last_target_parent[2] = target_parent_entry
1884
source_exec = source_details[3]
1885
return ((entry[0][2], (old_path, path), content_change,
1887
(source_parent_id, target_parent_id),
1888
(old_basename, entry[0][1]),
1889
(_minikind_to_kind[source_minikind], target_kind),
1890
(source_exec, target_exec)),)
1891
elif source_minikind in 'a' and target_minikind in 'fdlt':
1892
# looks like a new file
1893
if path_info is not None:
1894
path = pathjoin(entry[0][0], entry[0][1])
1895
# parent id is the entry for the path in the target tree
1896
# TODO: these are the same for an entire directory: cache em.
1897
parent_id = state._get_entry(target_index,
1898
path_utf8=entry[0][0])[0][2]
1899
if parent_id == entry[0][2]:
1901
if use_filesystem_for_exec:
1902
# We need S_ISREG here, because we aren't sure if this
1905
stat.S_ISREG(path_info[3].st_mode)
1906
and stat.S_IEXEC & path_info[3].st_mode)
1908
target_exec = target_details[3]
1909
return ((entry[0][2], (None, path), True,
1912
(None, entry[0][1]),
1913
(None, path_info[2]),
1914
(None, target_exec)),)
1916
# but its not on disk: we deliberately treat this as just
1917
# never-present. (Why ?! - RBC 20070224)
1919
elif source_minikind in 'fdlt' and target_minikind in 'a':
1920
# unversioned, possibly, or possibly not deleted: we dont care.
1921
# if its still on disk, *and* theres no other entry at this
1922
# path [we dont know this in this routine at the moment -
1923
# perhaps we should change this - then it would be an unknown.
1924
old_path = pathjoin(entry[0][0], entry[0][1])
1925
# parent id is the entry for the path in the target tree
1926
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
1927
if parent_id == entry[0][2]:
1929
return ((entry[0][2], (old_path, None), True,
1932
(entry[0][1], None),
1933
(_minikind_to_kind[source_minikind], None),
1934
(source_details[3], None)),)
1935
elif source_minikind in 'fdlt' and target_minikind in 'r':
1936
# a rename; could be a true rename, or a rename inherited from
1937
# a renamed parent. TODO: handle this efficiently. Its not
1938
# common case to rename dirs though, so a correct but slow
1939
# implementation will do.
1940
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
1941
search_specific_files.add(target_details[1])
1942
elif source_minikind in 'r' and target_minikind in 'r':
1943
# neither of the selected trees contain this file,
1944
# so skip over it. This is not currently directly tested, but
1945
# is indirectly via test_too_much.TestCommands.test_conflicts.
1948
raise AssertionError("don't know how to compare "
1949
"source_minikind=%r, target_minikind=%r"
1950
% (source_minikind, target_minikind))
1951
## import pdb;pdb.set_trace()
1953
while search_specific_files:
1954
# TODO: the pending list should be lexically sorted? the
1955
# interface doesn't require it.
1956
current_root = search_specific_files.pop()
1957
searched_specific_files.add(current_root)
1958
# process the entries for this containing directory: the rest will be
1959
# found by their parents recursively.
1960
root_entries = _entries_for_path(current_root)
1961
root_abspath = self.target.abspath(current_root)
1963
root_stat = os.lstat(root_abspath)
1965
if e.errno == errno.ENOENT:
1966
# the path does not exist: let _process_entry know that.
1967
root_dir_info = None
1969
# some other random error: hand it up.
1972
root_dir_info = ('', current_root,
1973
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
1975
if root_dir_info[2] == 'directory':
1976
if self.target._directory_is_tree_reference(
1977
current_root.decode('utf8')):
1978
root_dir_info = root_dir_info[:2] + \
1979
('tree-reference',) + root_dir_info[3:]
1981
if not root_entries and not root_dir_info:
1982
# this specified path is not present at all, skip it.
1984
path_handled = False
1985
for entry in root_entries:
1986
for result in _process_entry(entry, root_dir_info):
1987
# this check should probably be outside the loop: one
1988
# 'iterate two trees' api, and then _iter_changes filters
1989
# unchanged pairs. - RBC 20070226
1991
if (include_unchanged
1992
or result[2] # content change
1993
or result[3][0] != result[3][1] # versioned status
1994
or result[4][0] != result[4][1] # parent id
1995
or result[5][0] != result[5][1] # name
1996
or result[6][0] != result[6][1] # kind
1997
or result[7][0] != result[7][1] # executable
1999
result = (result[0],
2000
((utf8_decode(result[1][0])[0]),
2001
utf8_decode(result[1][1])[0]),) + result[2:]
2003
if want_unversioned and not path_handled:
2004
new_executable = bool(
2005
stat.S_ISREG(root_dir_info[3].st_mode)
2006
and stat.S_IEXEC & root_dir_info[3].st_mode)
2007
yield (None, (None, current_root), True, (False, False),
2009
(None, splitpath(current_root)[-1]),
2010
(None, root_dir_info[2]), (None, new_executable))
2011
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
2012
initial_key = (current_root, '', '')
2013
block_index, _ = state._find_block_index_from_key(initial_key)
2014
if block_index == 0:
2015
# we have processed the total root already, but because the
2016
# initial key matched it we should skip it here.
2019
current_dir_info = dir_iterator.next()
2021
if e.errno in (errno.ENOENT, errno.ENOTDIR):
2022
# there may be directories in the inventory even though
2023
# this path is not a file on disk: so mark it as end of
2025
current_dir_info = None
2029
if current_dir_info[0][0] == '':
2030
# remove .bzr from iteration
2031
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
2032
assert current_dir_info[1][bzr_index][0] == '.bzr'
2033
del current_dir_info[1][bzr_index]
2034
# walk until both the directory listing and the versioned metadata
2036
if (block_index < len(state._dirblocks) and
2037
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2038
current_block = state._dirblocks[block_index]
2040
current_block = None
2041
while (current_dir_info is not None or
2042
current_block is not None):
2043
if (current_dir_info and current_block
2044
and current_dir_info[0][0] != current_block[0]):
2045
if current_dir_info[0][0] < current_block[0] :
2046
# filesystem data refers to paths not covered by the dirblock.
2047
# this has two possibilities:
2048
# A) it is versioned but empty, so there is no block for it
2049
# B) it is not versioned.
2050
# in either case it was processed by the containing directories walk:
2051
# if it is root/foo, when we walked root we emitted it,
2052
# or if we ere given root/foo to walk specifically, we
2053
# emitted it when checking the walk-root entries
2054
# advance the iterator and loop - we dont need to emit it.
2056
current_dir_info = dir_iterator.next()
2057
except StopIteration:
2058
current_dir_info = None
2060
# We have a dirblock entry for this location, but there
2061
# is no filesystem path for this. This is most likely
2062
# because a directory was removed from the disk.
2063
# We don't have to report the missing directory,
2064
# because that should have already been handled, but we
2065
# need to handle all of the files that are contained
2067
for current_entry in current_block[1]:
2068
# entry referring to file not present on disk.
2069
# advance the entry only, after processing.
2070
for result in _process_entry(current_entry, None):
2071
# this check should probably be outside the loop: one
2072
# 'iterate two trees' api, and then _iter_changes filters
2073
# unchanged pairs. - RBC 20070226
2074
if (include_unchanged
2075
or result[2] # content change
2076
or result[3][0] != result[3][1] # versioned status
2077
or result[4][0] != result[4][1] # parent id
2078
or result[5][0] != result[5][1] # name
2079
or result[6][0] != result[6][1] # kind
2080
or result[7][0] != result[7][1] # executable
2082
result = (result[0],
2083
((utf8_decode(result[1][0])[0]),
2084
utf8_decode(result[1][1])[0]),) + result[2:]
2087
if (block_index < len(state._dirblocks) and
2088
osutils.is_inside(current_root,
2089
state._dirblocks[block_index][0])):
2090
current_block = state._dirblocks[block_index]
2092
current_block = None
2095
if current_block and entry_index < len(current_block[1]):
2096
current_entry = current_block[1][entry_index]
2098
current_entry = None
2099
advance_entry = True
2101
if current_dir_info and path_index < len(current_dir_info[1]):
2102
current_path_info = current_dir_info[1][path_index]
2103
if current_path_info[2] == 'directory':
2104
if self.target._directory_is_tree_reference(
2105
current_path_info[0].decode('utf8')):
2106
current_path_info = current_path_info[:2] + \
2107
('tree-reference',) + current_path_info[3:]
2109
current_path_info = None
2111
path_handled = False
2112
while (current_entry is not None or
2113
current_path_info is not None):
2114
if current_entry is None:
2115
# the check for path_handled when the path is adnvaced
2116
# will yield this path if needed.
2118
elif current_path_info is None:
2119
# no path is fine: the per entry code will handle it.
2120
for result in _process_entry(current_entry, current_path_info):
2121
# this check should probably be outside the loop: one
2122
# 'iterate two trees' api, and then _iter_changes filters
2123
# unchanged pairs. - RBC 20070226
2124
if (include_unchanged
2125
or result[2] # content change
2126
or result[3][0] != result[3][1] # versioned status
2127
or result[4][0] != result[4][1] # parent id
2128
or result[5][0] != result[5][1] # name
2129
or result[6][0] != result[6][1] # kind
2130
or result[7][0] != result[7][1] # executable
2132
result = (result[0],
2133
((utf8_decode(result[1][0])[0]),
2134
utf8_decode(result[1][1])[0]),) + result[2:]
2136
elif current_entry[0][1] != current_path_info[1]:
2137
if current_path_info[1] < current_entry[0][1]:
2138
# extra file on disk: pass for now, but only
2139
# increment the path, not the entry
2140
advance_entry = False
2142
# entry referring to file not present on disk.
2143
# advance the entry only, after processing.
2144
for result in _process_entry(current_entry, None):
2145
# this check should probably be outside the loop: one
2146
# 'iterate two trees' api, and then _iter_changes filters
2147
# unchanged pairs. - RBC 20070226
2149
if (include_unchanged
2150
or result[2] # content change
2151
or result[3][0] != result[3][1] # versioned status
2152
or result[4][0] != result[4][1] # parent id
2153
or result[5][0] != result[5][1] # name
2154
or result[6][0] != result[6][1] # kind
2155
or result[7][0] != result[7][1] # executable
2157
result = (result[0],
2158
((utf8_decode(result[1][0])[0]),
2159
utf8_decode(result[1][1])[0]),) + result[2:]
2161
advance_path = False
2163
for result in _process_entry(current_entry, current_path_info):
2164
# this check should probably be outside the loop: one
2165
# 'iterate two trees' api, and then _iter_changes filters
2166
# unchanged pairs. - RBC 20070226
2168
if (include_unchanged
2169
or result[2] # content change
2170
or result[3][0] != result[3][1] # versioned status
2171
or result[4][0] != result[4][1] # parent id
2172
or result[5][0] != result[5][1] # name
2173
or result[6][0] != result[6][1] # kind
2174
or result[7][0] != result[7][1] # executable
2176
result = (result[0],
2177
((utf8_decode(result[1][0])[0]),
2178
utf8_decode(result[1][1])[0]),) + result[2:]
2180
if advance_entry and current_entry is not None:
2182
if entry_index < len(current_block[1]):
2183
current_entry = current_block[1][entry_index]
2185
current_entry = None
2187
advance_entry = True # reset the advance flaga
2188
if advance_path and current_path_info is not None:
2189
if not path_handled:
2190
# unversioned in all regards
2191
if want_unversioned:
2192
new_executable = bool(
2193
stat.S_ISREG(current_path_info[3].st_mode)
2194
and stat.S_IEXEC & current_path_info[3].st_mode)
2195
if want_unversioned:
2196
yield (None, (None, current_path_info[0]),
2200
(None, current_path_info[1]),
2201
(None, current_path_info[2]),
2202
(None, new_executable))
2203
# dont descend into this unversioned path if it is
2205
if current_path_info[2] in (
2206
'directory', 'tree-referene'):
2207
del current_dir_info[1][path_index]
2210
if path_index < len(current_dir_info[1]):
2211
current_path_info = current_dir_info[1][path_index]
2212
if current_path_info[2] == 'directory':
2213
if self.target._directory_is_tree_reference(
2214
current_path_info[0].decode('utf8')):
2215
current_path_info = current_path_info[:2] + \
2216
('tree-reference',) + current_path_info[3:]
2218
current_path_info = None
2219
path_handled = False
2221
advance_path = True # reset the advance flagg.
2222
if current_block is not None:
2224
if (block_index < len(state._dirblocks) and
2225
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2226
current_block = state._dirblocks[block_index]
2228
current_block = None
2229
if current_dir_info is not None:
2231
current_dir_info = dir_iterator.next()
2232
except StopIteration:
2233
current_dir_info = None
2257
2237
def is_compatible(source, target):
2258
2238
# the target must be a dirstate working tree
2259
if not isinstance(target, DirStateWorkingTree):
2239
if not isinstance(target, WorkingTree4):
2261
# the source must be a revtree or dirstate rev tree.
2241
# the source must be a revtreee or dirstate rev tree.
2262
2242
if not isinstance(source,
2263
2243
(revisiontree.RevisionTree, DirStateRevisionTree)):
2265
2245
# the source revid must be in the target dirstate
2266
if not (source._revision_id == _mod_revision.NULL_REVISION or
2246
if not (source._revision_id == NULL_REVISION or
2267
2247
source._revision_id in target.get_parent_ids()):
2268
# TODO: what about ghosts? it may well need to
2248
# TODO: what about ghosts? it may well need to
2269
2249
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
