1238
1098
self._inventory.remove_recursive_id(file_id)
1240
1100
@needs_tree_write_lock
1241
def rename_one(self, from_rel, to_rel, after=False):
1242
"""See WorkingTree.rename_one"""
1244
WorkingTree.rename_one(self, from_rel, to_rel, after)
1246
@needs_tree_write_lock
1247
def apply_inventory_delta(self, changes):
1248
"""See MutableTree.apply_inventory_delta"""
1249
state = self.current_dirstate()
1250
state.update_by_delta(changes)
1251
self._make_dirty(reset_inventory=True)
1253
def update_basis_by_delta(self, new_revid, delta):
1254
"""See MutableTree.update_basis_by_delta."""
1255
if self.last_revision() == new_revid:
1256
raise AssertionError()
1257
self.current_dirstate().update_basis_by_delta(delta, new_revid)
1260
def _validate(self):
1261
self._dirstate._validate()
1263
@needs_tree_write_lock
1264
1101
def _write_inventory(self, inv):
1265
1102
"""Write inventory as the current inventory."""
1267
raise AssertionError("attempting to write an inventory when the "
1268
"dirstate is dirty will lose pending changes")
1269
had_inventory = self._inventory is not None
1270
# Setting self._inventory = None forces the dirstate to regenerate the
1271
# working inventory. We do this because self.inventory may be inv, or
1272
# may have been modified, and either case would prevent a clean delta
1274
self._inventory = None
1276
delta = inv._make_delta(self.inventory)
1278
self.apply_inventory_delta(delta)
1103
assert not self._dirty, "attempting to write an inventory when the dirstate is dirty will cause data loss"
1104
self.current_dirstate().set_state_from_inventory(inv)
1105
self._make_dirty(reset_inventory=False)
1106
if self._inventory is not None:
1280
1107
self._inventory = inv
1284
class ContentFilterAwareSHA1Provider(dirstate.SHA1Provider):
1286
def __init__(self, tree):
1289
def sha1(self, abspath):
1290
"""See dirstate.SHA1Provider.sha1()."""
1291
filters = self.tree._content_filter_stack(
1292
self.tree.relpath(osutils.safe_unicode(abspath)))
1293
return internal_size_sha_file_byname(abspath, filters)[1]
1295
def stat_and_sha1(self, abspath):
1296
"""See dirstate.SHA1Provider.stat_and_sha1()."""
1297
filters = self.tree._content_filter_stack(
1298
self.tree.relpath(osutils.safe_unicode(abspath)))
1299
file_obj = file(abspath, 'rb', 65000)
1301
statvalue = os.fstat(file_obj.fileno())
1303
file_obj = filtered_input_file(file_obj, filters)
1304
sha1 = osutils.size_sha_file(file_obj)[1]
1307
return statvalue, sha1
1310
class ContentFilteringDirStateWorkingTree(DirStateWorkingTree):
1311
"""Dirstate working tree that supports content filtering.
1313
The dirstate holds the hash and size of the canonical form of the file,
1314
and most methods must return that.
1317
def _file_content_summary(self, path, stat_result):
1318
# This is to support the somewhat obsolete path_content_summary method
1319
# with content filtering: see
1320
# <https://bugs.edge.launchpad.net/bzr/+bug/415508>.
1322
# If the dirstate cache is up to date and knows the hash and size,
1324
# Otherwise if there are no content filters, return the on-disk size
1325
# and leave the hash blank.
1326
# Otherwise, read and filter the on-disk file and use its size and
1329
# The dirstate doesn't store the size of the canonical form so we
1330
# can't trust it for content-filtered trees. We just return None.
1331
dirstate_sha1 = self._dirstate.sha1_from_stat(path, stat_result)
1332
executable = self._is_executable_from_path_and_stat(path, stat_result)
1333
return ('file', None, executable, dirstate_sha1)
1336
class WorkingTree4(DirStateWorkingTree):
1337
"""This is the Format 4 working tree.
1339
This differs from WorkingTree3 by:
1340
- Having a consolidated internal dirstate, stored in a
1341
randomly-accessible sorted file on disk.
1342
- Not having a regular inventory attribute. One can be synthesized
1343
on demand but this is expensive and should be avoided.
1345
This is new in bzr 0.15.
1349
class WorkingTree5(ContentFilteringDirStateWorkingTree):
1350
"""This is the Format 5 working tree.
1352
This differs from WorkingTree4 by:
1353
- Supporting content filtering.
1355
This is new in bzr 1.11.
1359
class WorkingTree6(ContentFilteringDirStateWorkingTree):
1360
"""This is the Format 6 working tree.
1362
This differs from WorkingTree5 by:
1363
- Supporting a current view that may mask the set of files in a tree
1364
impacted by most user operations.
1366
This is new in bzr 1.14.
1369
def _make_views(self):
1370
return views.PathBasedViews(self)
1373
class DirStateWorkingTreeFormat(WorkingTreeFormat3):
1375
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
1376
accelerator_tree=None, hardlink=False):
1111
class WorkingTreeFormat4(WorkingTreeFormat3):
1112
"""The first consolidated dirstate working tree format.
1115
- exists within a metadir controlling .bzr
1116
- includes an explicit version marker for the workingtree control
1117
files, separate from the BzrDir format
1118
- modifies the hash cache format
1119
- is new in bzr TODO FIXME SETBEFOREMERGE
1120
- uses a LockDir to guard access to it.
1123
supports_tree_reference = True
1125
def get_format_string(self):
1126
"""See WorkingTreeFormat.get_format_string()."""
1127
return "Bazaar Working Tree format 4\n"
1129
def get_format_description(self):
1130
"""See WorkingTreeFormat.get_format_description()."""
1131
return "Working tree format 4"
1133
def initialize(self, a_bzrdir, revision_id=None):
1377
1134
"""See WorkingTreeFormat.initialize().
1379
1136
:param revision_id: allows creating a working tree at a different
1380
1137
revision than the branch is at.
1381
:param accelerator_tree: A tree which can be used for retrieving file
1382
contents more quickly than the revision tree, i.e. a workingtree.
1383
The revision tree will be used for cases where accelerator_tree's
1384
content is different.
1385
:param hardlink: If true, hard-link files from accelerator_tree,
1388
These trees get an initial random root id, if their repository supports
1389
rich root data, TREE_ROOT otherwise.
1139
These trees get an initial random root id.
1141
revision_id = osutils.safe_revision_id(revision_id)
1391
1142
if not isinstance(a_bzrdir.transport, LocalTransport):
1392
1143
raise errors.NotLocalUrl(a_bzrdir.transport.base)
1393
1144
transport = a_bzrdir.get_workingtree_transport(self)
1394
1145
control_files = self._open_control_files(a_bzrdir)
1395
1146
control_files.create_lock()
1396
1147
control_files.lock_write()
1397
transport.put_bytes('format', self.get_format_string(),
1398
mode=a_bzrdir._get_file_mode())
1399
if from_branch is not None:
1400
branch = from_branch
1402
branch = a_bzrdir.open_branch()
1148
control_files.put_utf8('format', self.get_format_string())
1149
branch = a_bzrdir.open_branch()
1403
1150
if revision_id is None:
1404
1151
revision_id = branch.last_revision()
1405
1152
local_path = transport.local_abspath('dirstate')
1406
1153
# write out new dirstate (must exist when we create the tree)
1407
1154
state = dirstate.DirState.initialize(local_path)
1410
wt = self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
1156
wt = WorkingTree4(a_bzrdir.root_transport.local_abspath('.'),
1413
1159
_bzrdir=a_bzrdir,
1414
1160
_control_files=control_files)
1416
1162
wt.lock_tree_write()
1418
self._init_custom_control_files(wt)
1419
if revision_id in (None, _mod_revision.NULL_REVISION):
1420
if branch.repository.supports_rich_root():
1421
wt._set_root_id(generate_ids.gen_root_id())
1423
wt._set_root_id(ROOT_ID)
1165
if revision_id in (None, NULL_REVISION):
1166
wt._set_root_id(generate_ids.gen_root_id())
1426
# frequently, we will get here due to branching. The accelerator
1427
# tree will be the tree from the branch, so the desired basis
1428
# tree will often be a parent of the accelerator tree.
1429
if accelerator_tree is not None:
1431
basis = accelerator_tree.revision_tree(revision_id)
1432
except errors.NoSuchRevision:
1435
basis = branch.repository.revision_tree(revision_id)
1436
if revision_id == _mod_revision.NULL_REVISION:
1168
wt.current_dirstate()._validate()
1439
parents_list = [(revision_id, basis)]
1442
wt.set_parent_trees(parents_list, allow_leftmost_as_ghost=True)
1170
wt.set_last_revision(revision_id)
1444
# if the basis has a root id we have to use that; otherwise we
1445
# use a new random one
1172
basis = wt.basis_tree()
1174
state = wt.current_dirstate()
1176
# if the basis has a root id we have to use that; otherwise we use
1446
1178
basis_root_id = basis.get_root_id()
1447
1179
if basis_root_id is not None:
1448
1181
wt._set_root_id(basis_root_id)
1450
if wt.supports_content_filtering():
1451
# The original tree may not have the same content filters
1452
# applied so we can't safely build the inventory delta from
1454
delta_from_tree = False
1456
delta_from_tree = True
1457
# delta_from_tree is safe even for DirStateRevisionTrees,
1458
# because wt4.apply_inventory_delta does not mutate the input
1459
# inventory entries.
1460
transform.build_tree(basis, wt, accelerator_tree,
1462
delta_from_tree=delta_from_tree)
1183
transform.build_tree(basis, wt)
1466
1186
control_files.unlock()
1470
def _init_custom_control_files(self, wt):
1471
"""Subclasses with custom control files should override this method.
1473
The working tree and control files are locked for writing when this
1476
:param wt: the WorkingTree object
1479
1190
def _open(self, a_bzrdir, control_files):
1480
1191
"""Open the tree itself.
1482
1193
:param a_bzrdir: the dir for the tree.
1483
1194
:param control_files: the control files for the tree.
1485
return self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
1196
return WorkingTree4(a_bzrdir.root_transport.local_abspath('.'),
1486
1197
branch=a_bzrdir.open_branch(),
1488
1199
_bzrdir=a_bzrdir,
1489
1200
_control_files=control_files)
1491
1202
def __get_matchingbzrdir(self):
1492
return self._get_matchingbzrdir()
1494
def _get_matchingbzrdir(self):
1495
"""Overrideable method to get a bzrdir for testing."""
1496
1203
# please test against something that will let us do tree references
1497
1204
return bzrdir.format_registry.make_bzrdir(
1498
'dirstate-with-subtree')
1205
'experimental-reference-dirstate')
1500
1207
_matchingbzrdir = property(__get_matchingbzrdir)
1503
class WorkingTreeFormat4(DirStateWorkingTreeFormat):
1504
"""The first consolidated dirstate working tree format.
1507
- exists within a metadir controlling .bzr
1508
- includes an explicit version marker for the workingtree control
1509
files, separate from the BzrDir format
1510
- modifies the hash cache format
1511
- is new in bzr 0.15
1512
- uses a LockDir to guard access to it.
1515
upgrade_recommended = False
1517
_tree_class = WorkingTree4
1519
def get_format_string(self):
1520
"""See WorkingTreeFormat.get_format_string()."""
1521
return "Bazaar Working Tree Format 4 (bzr 0.15)\n"
1523
def get_format_description(self):
1524
"""See WorkingTreeFormat.get_format_description()."""
1525
return "Working tree format 4"
1528
class WorkingTreeFormat5(DirStateWorkingTreeFormat):
1529
"""WorkingTree format supporting content filtering.
1532
upgrade_recommended = False
1534
_tree_class = WorkingTree5
1536
def get_format_string(self):
1537
"""See WorkingTreeFormat.get_format_string()."""
1538
return "Bazaar Working Tree Format 5 (bzr 1.11)\n"
1540
def get_format_description(self):
1541
"""See WorkingTreeFormat.get_format_description()."""
1542
return "Working tree format 5"
1544
def supports_content_filtering(self):
1548
class WorkingTreeFormat6(DirStateWorkingTreeFormat):
1549
"""WorkingTree format supporting views.
1552
upgrade_recommended = False
1554
_tree_class = WorkingTree6
1556
def get_format_string(self):
1557
"""See WorkingTreeFormat.get_format_string()."""
1558
return "Bazaar Working Tree Format 6 (bzr 1.14)\n"
1560
def get_format_description(self):
1561
"""See WorkingTreeFormat.get_format_description()."""
1562
return "Working tree format 6"
1564
def _init_custom_control_files(self, wt):
1565
"""Subclasses with custom control files should override this method."""
1566
wt._transport.put_bytes('views', '', mode=wt.bzrdir._get_file_mode())
1568
def supports_content_filtering(self):
1571
def supports_views(self):
1575
1210
class DirStateRevisionTree(Tree):
1576
"""A revision tree pulling the inventory from a dirstate.
1578
Note that this is one of the historical (ie revision) trees cached in the
1579
dirstate for easy access, not the workingtree.
1211
"""A revision tree pulling the inventory from a dirstate."""
1582
1213
def __init__(self, dirstate, revision_id, repository):
1583
1214
self._dirstate = dirstate
1584
self._revision_id = revision_id
1215
self._revision_id = osutils.safe_revision_id(revision_id)
1585
1216
self._repository = repository
1586
1217
self._inventory = None
1587
1218
self._locked = 0
1588
1219
self._dirstate_locked = False
1589
self._repo_supports_tree_reference = getattr(
1590
repository._format, "supports_tree_reference",
1594
return "<%s of %s in %s>" % \
1595
(self.__class__.__name__, self._revision_id, self._dirstate)
1597
def annotate_iter(self, file_id,
1598
default_revision=_mod_revision.CURRENT_REVISION):
1221
def annotate_iter(self, file_id):
1599
1222
"""See Tree.annotate_iter"""
1600
text_key = (file_id, self.inventory[file_id].revision)
1601
annotations = self._repository.texts.annotate(text_key)
1602
return [(key[-1], line) for (key, line) in annotations]
1223
w = self._repository.weave_store.get_weave(file_id,
1224
self._repository.get_transaction())
1225
return w.annotate_iter(self.inventory[file_id].revision)
1604
def _get_ancestors(self, default_revision):
1605
return set(self._repository.get_ancestry(self._revision_id,
1607
1227
def _comparison_data(self, entry, path):
1608
"""See Tree._comparison_data."""
1609
1228
if entry is None:
1610
1229
return None, False, None
1611
1230
# trust the entry as RevisionTree does, but this may not be
2080
1615
if not found_versioned:
2081
1616
# none of the indexes was not 'absent' at all ids for this
2083
not_versioned.append(path)
2084
if len(not_versioned) > 0:
2085
raise errors.PathsNotVersionedError(not_versioned)
1618
all_versioned = False
1620
if not all_versioned:
1621
raise errors.PathsNotVersionedError(specific_files)
2086
1622
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2087
search_specific_files = osutils.minimum_path_selection(specific_files)
2089
use_filesystem_for_exec = (sys.platform != 'win32')
2090
iter_changes = self.target._iter_changes(include_unchanged,
2091
use_filesystem_for_exec, search_specific_files, state,
2092
source_index, target_index, want_unversioned, self.target)
2093
return iter_changes.iter_changes()
1623
search_specific_files = set()
1624
for path in specific_files:
1625
other_specific_files = specific_files.difference(set([path]))
1626
if not osutils.is_inside_any(other_specific_files, path):
1627
# this is a top level path, we must check it.
1628
search_specific_files.add(path)
1630
# compare source_index and target_index at or under each element of search_specific_files.
1631
# follow the following comparison table. Note that we only want to do diff operations when
1632
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1636
# Source | Target | disk | action
1637
# r | fdl | | add source to search, add id path move and perform
1638
# | | | diff check on source-target
1639
# r | fdl | a | dangling file that was present in the basis.
1641
# r | a | | add source to search
1643
# r | r | | this path is present in a non-examined tree, skip.
1644
# r | r | a | this path is present in a non-examined tree, skip.
1645
# a | fdl | | add new id
1646
# a | fdl | a | dangling locally added file, skip
1647
# a | a | | not present in either tree, skip
1648
# a | a | a | not present in any tree, skip
1649
# a | r | | not present in either tree at this path, skip as it
1650
# | | | may not be selected by the users list of paths.
1651
# a | r | a | not present in either tree at this path, skip as it
1652
# | | | may not be selected by the users list of paths.
1653
# fdl | fdl | | content in both: diff them
1654
# fdl | fdl | a | deleted locally, but not unversioned - show as deleted ?
1655
# fdl | a | | unversioned: output deleted id for now
1656
# fdl | a | a | unversioned and deleted: output deleted id
1657
# fdl | r | | relocated in this tree, so add target to search.
1658
# | | | Dont diff, we will see an r,fd; pair when we reach
1659
# | | | this id at the other path.
1660
# fdl | r | a | relocated in this tree, so add target to search.
1661
# | | | Dont diff, we will see an r,fd; pair when we reach
1662
# | | | this id at the other path.
1664
# for all search_indexs in each path at or under each element of
1665
# search_specific_files, if the detail is relocated: add the id, and add the
1666
# relocated path as one to search if its not searched already. If the
1667
# detail is not relocated, add the id.
1668
searched_specific_files = set()
1669
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1670
# Using a list so that we can access the values and change them in
1671
# nested scope. Each one is [path, file_id, entry]
1672
last_source_parent = [None, None, None]
1673
last_target_parent = [None, None, None]
1675
def _process_entry(entry, path_info):
1676
"""Compare an entry and real disk to generate delta information.
1678
:param path_info: top_relpath, basename, kind, lstat, abspath for
1679
the path of entry. If None, then the path is considered absent.
1680
(Perhaps we should pass in a concrete entry for this ?)
1681
Basename is returned as a utf8 string because we expect this
1682
tuple will be ignored, and don't want to take the time to
1685
# TODO: when a parent has been renamed, dont emit path renames for children,
1686
if source_index is None:
1687
source_details = NULL_PARENT_DETAILS
1689
source_details = entry[1][source_index]
1690
target_details = entry[1][target_index]
1691
target_minikind = target_details[0]
1692
if path_info is not None and target_minikind in 'fdl':
1693
assert target_index == 0
1694
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
1695
stat_value=path_info[3])
1696
# The entry may have been modified by update_entry
1697
target_details = entry[1][target_index]
1698
target_minikind = target_details[0]
1701
source_minikind = source_details[0]
1702
if source_minikind in 'fdlr' and target_minikind in 'fdl':
1703
# claimed content in both: diff
1704
# r | fdl | | add source to search, add id path move and perform
1705
# | | | diff check on source-target
1706
# r | fdl | a | dangling file that was present in the basis.
1708
if source_minikind in 'r':
1709
# add the source to the search path to find any children it
1710
# has. TODO ? : only add if it is a container ?
1711
if not osutils.is_inside_any(searched_specific_files,
1713
search_specific_files.add(source_details[1])
1714
# generate the old path; this is needed for stating later
1716
old_path = source_details[1]
1717
old_dirname, old_basename = os.path.split(old_path)
1718
path = pathjoin(entry[0][0], entry[0][1])
1719
old_entry = state._get_entry(source_index,
1721
# update the source details variable to be the real
1723
source_details = old_entry[1][source_index]
1724
source_minikind = source_details[0]
1726
old_dirname = entry[0][0]
1727
old_basename = entry[0][1]
1728
old_path = path = pathjoin(old_dirname, old_basename)
1729
if path_info is None:
1730
# the file is missing on disk, show as removed.
1731
old_path = pathjoin(entry[0][0], entry[0][1])
1732
content_change = True
1736
# source and target are both versioned and disk file is present.
1737
target_kind = path_info[2]
1738
if target_kind == 'directory':
1739
if source_minikind != 'd':
1740
content_change = True
1742
# directories have no fingerprint
1743
content_change = False
1745
elif target_kind == 'file':
1746
if source_minikind != 'f':
1747
content_change = True
1749
# We could check the size, but we already have the
1751
content_change = (link_or_sha1 != source_details[1])
1752
# Target details is updated at update_entry time
1754
stat.S_ISREG(path_info[3].st_mode)
1755
and stat.S_IEXEC & path_info[3].st_mode)
1756
elif target_kind == 'symlink':
1757
if source_minikind != 'l':
1758
content_change = True
1760
content_change = (link_or_sha1 != source_details[1])
1763
raise Exception, "unknown kind %s" % path_info[2]
1764
# parent id is the entry for the path in the target tree
1765
if old_dirname == last_source_parent[0]:
1766
source_parent_id = last_source_parent[1]
1768
source_parent_entry = state._get_entry(source_index,
1769
path_utf8=old_dirname)
1770
source_parent_id = source_parent_entry[0][2]
1771
if source_parent_id == entry[0][2]:
1772
# This is the root, so the parent is None
1773
source_parent_id = None
1775
last_source_parent[0] = old_dirname
1776
last_source_parent[1] = source_parent_id
1777
last_source_parent[2] = source_parent_entry
1779
new_dirname = entry[0][0]
1780
if new_dirname == last_target_parent[0]:
1781
target_parent_id = last_target_parent[1]
1783
# TODO: We don't always need to do the lookup, because the
1784
# parent entry will be the same as the source entry.
1785
target_parent_entry = state._get_entry(target_index,
1786
path_utf8=new_dirname)
1787
target_parent_id = target_parent_entry[0][2]
1788
if target_parent_id == entry[0][2]:
1789
# This is the root, so the parent is None
1790
target_parent_id = None
1792
last_target_parent[0] = new_dirname
1793
last_target_parent[1] = target_parent_id
1794
last_target_parent[2] = target_parent_entry
1796
source_exec = source_details[3]
1797
return ((entry[0][2], path, content_change,
1799
(source_parent_id, target_parent_id),
1800
(old_basename, entry[0][1]),
1801
(_minikind_to_kind[source_minikind], target_kind),
1802
(source_exec, target_exec)),)
1803
elif source_minikind in 'a' and target_minikind in 'fdl':
1804
# looks like a new file
1805
if path_info is not None:
1806
path = pathjoin(entry[0][0], entry[0][1])
1807
# parent id is the entry for the path in the target tree
1808
# TODO: these are the same for an entire directory: cache em.
1809
parent_id = state._get_entry(target_index,
1810
path_utf8=entry[0][0])[0][2]
1811
if parent_id == entry[0][2]:
1814
stat.S_ISREG(path_info[3].st_mode)
1815
and stat.S_IEXEC & path_info[3].st_mode)
1816
return ((entry[0][2], path, True,
1819
(None, entry[0][1]),
1820
(None, path_info[2]),
1821
(None, target_exec)),)
1823
# but its not on disk: we deliberately treat this as just
1824
# never-present. (Why ?! - RBC 20070224)
1826
elif source_minikind in 'fdl' and target_minikind in 'a':
1827
# unversioned, possibly, or possibly not deleted: we dont care.
1828
# if its still on disk, *and* theres no other entry at this
1829
# path [we dont know this in this routine at the moment -
1830
# perhaps we should change this - then it would be an unknown.
1831
old_path = pathjoin(entry[0][0], entry[0][1])
1832
# parent id is the entry for the path in the target tree
1833
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
1834
if parent_id == entry[0][2]:
1836
return ((entry[0][2], old_path, True,
1839
(entry[0][1], None),
1840
(_minikind_to_kind[source_minikind], None),
1841
(source_details[3], None)),)
1842
elif source_minikind in 'fdl' and target_minikind in 'r':
1843
# a rename; could be a true rename, or a rename inherited from
1844
# a renamed parent. TODO: handle this efficiently. Its not
1845
# common case to rename dirs though, so a correct but slow
1846
# implementation will do.
1847
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
1848
search_specific_files.add(target_details[1])
1849
elif source_minikind in 'r' and target_minikind in 'r':
1850
# neither of the selected trees contain this file,
1851
# so skip over it. This is not currently directly tested, but
1852
# is indirectly via test_too_much.TestCommands.test_conflicts.
1855
print "*******", source_minikind, target_minikind
1856
import pdb;pdb.set_trace()
1858
while search_specific_files:
1859
# TODO: the pending list should be lexically sorted?
1860
current_root = search_specific_files.pop()
1861
searched_specific_files.add(current_root)
1862
# process the entries for this containing directory: the rest will be
1863
# found by their parents recursively.
1864
root_entries = _entries_for_path(current_root)
1865
root_abspath = self.target.abspath(current_root)
1867
root_stat = os.lstat(root_abspath)
1869
if e.errno == errno.ENOENT:
1870
# the path does not exist: let _process_entry know that.
1871
root_dir_info = None
1873
# some other random error: hand it up.
1876
root_dir_info = ('', current_root,
1877
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
1879
if not root_entries and not root_dir_info:
1880
# this specified path is not present at all, skip it.
1882
path_handled = False
1883
for entry in root_entries:
1884
for result in _process_entry(entry, root_dir_info):
1885
# this check should probably be outside the loop: one
1886
# 'iterate two trees' api, and then _iter_changes filters
1887
# unchanged pairs. - RBC 20070226
1889
if (include_unchanged
1890
or result[2] # content change
1891
or result[3][0] != result[3][1] # versioned status
1892
or result[4][0] != result[4][1] # parent id
1893
or result[5][0] != result[5][1] # name
1894
or result[6][0] != result[6][1] # kind
1895
or result[7][0] != result[7][1] # executable
1897
result = (result[0],
1898
utf8_decode(result[1])[0]) + result[2:]
1900
if want_unversioned and not path_handled:
1901
new_executable = bool(
1902
stat.S_ISREG(root_dir_info[3].st_mode)
1903
and stat.S_IEXEC & root_dir_info[3].st_mode)
1904
yield (None, current_root, True, (False, False), (None, None),
1905
(None, splitpath(current_root)[-1]),
1906
(None, root_dir_info[2]), (None, new_executable))
1907
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
1908
initial_key = (current_root, '', '')
1909
block_index, _ = state._find_block_index_from_key(initial_key)
1910
if block_index == 0:
1911
# we have processed the total root already, but because the
1912
# initial key matched it we should skip it here.
1915
current_dir_info = dir_iterator.next()
1917
if e.errno in (errno.ENOENT, errno.ENOTDIR):
1918
# there may be directories in the inventory even though
1919
# this path is not a file on disk: so mark it as end of
1921
current_dir_info = None
1925
if current_dir_info[0][0] == '':
1926
# remove .bzr from iteration
1927
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
1928
assert current_dir_info[1][bzr_index][0] == '.bzr'
1929
del current_dir_info[1][bzr_index]
1930
# walk until both the directory listing and the versioned metadata
1931
# are exhausted. TODO: reevaluate this, perhaps we should stop when
1932
# the versioned data runs out.
1933
if (block_index < len(state._dirblocks) and
1934
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
1935
current_block = state._dirblocks[block_index]
1937
current_block = None
1938
while (current_dir_info is not None or
1939
current_block is not None):
1940
if (current_dir_info and current_block
1941
and current_dir_info[0][0] != current_block[0]):
1942
if current_dir_info[0][0] < current_block[0] :
1943
# import pdb; pdb.set_trace()
1944
# print 'unversioned dir'
1945
# filesystem data refers to paths not covered by the dirblock.
1946
# this has two possibilities:
1947
# A) it is versioned but empty, so there is no block for it
1948
# B) it is not versioned.
1949
# in either case it was processed by the containing directories walk:
1950
# if it is root/foo, when we walked root we emitted it,
1951
# or if we ere given root/foo to walk specifically, we
1952
# emitted it when checking the walk-root entries
1953
# advance the iterator and loop - we dont need to emit it.
1955
current_dir_info = dir_iterator.next()
1956
except StopIteration:
1957
current_dir_info = None
1959
# We have a dirblock entry for this location, but there
1960
# is no filesystem path for this. This is most likely
1961
# because a directory was removed from the disk.
1962
# We don't have to report the missing directory,
1963
# because that should have already been handled, but we
1964
# need to handle all of the files that are contained
1966
for current_entry in current_block[1]:
1967
# entry referring to file not present on disk.
1968
# advance the entry only, after processing.
1969
for result in _process_entry(current_entry, None):
1970
# this check should probably be outside the loop: one
1971
# 'iterate two trees' api, and then _iter_changes filters
1972
# unchanged pairs. - RBC 20070226
1973
if (include_unchanged
1974
or result[2] # content change
1975
or result[3][0] != result[3][1] # versioned status
1976
or result[4][0] != result[4][1] # parent id
1977
or result[5][0] != result[5][1] # name
1978
or result[6][0] != result[6][1] # kind
1979
or result[7][0] != result[7][1] # executable
1981
result = (result[0],
1982
utf8_decode(result[1])[0]) + result[2:]
1985
if (block_index < len(state._dirblocks) and
1986
osutils.is_inside(current_root,
1987
state._dirblocks[block_index][0])):
1988
current_block = state._dirblocks[block_index]
1990
current_block = None
1993
if current_block and entry_index < len(current_block[1]):
1994
current_entry = current_block[1][entry_index]
1996
current_entry = None
1997
advance_entry = True
1999
if current_dir_info and path_index < len(current_dir_info[1]):
2000
current_path_info = current_dir_info[1][path_index]
2002
current_path_info = None
2004
path_handled = False
2005
while (current_entry is not None or
2006
current_path_info is not None):
2007
if current_entry is None:
2008
# the check for path_handled when the path is adnvaced
2009
# will yield this path if needed.
2011
elif current_path_info is None:
2012
# no path is fine: the per entry code will handle it.
2013
for result in _process_entry(current_entry, current_path_info):
2014
# this check should probably be outside the loop: one
2015
# 'iterate two trees' api, and then _iter_changes filters
2016
# unchanged pairs. - RBC 20070226
2017
if (include_unchanged
2018
or result[2] # content change
2019
or result[3][0] != result[3][1] # versioned status
2020
or result[4][0] != result[4][1] # parent id
2021
or result[5][0] != result[5][1] # name
2022
or result[6][0] != result[6][1] # kind
2023
or result[7][0] != result[7][1] # executable
2025
result = (result[0],
2026
utf8_decode(result[1])[0]) + result[2:]
2028
elif current_entry[0][1] != current_path_info[1]:
2029
if current_path_info[1] < current_entry[0][1]:
2030
# extra file on disk: pass for now, but only
2031
# increment the path, not the entry
2032
# import pdb; pdb.set_trace()
2033
# print 'unversioned file'
2034
advance_entry = False
2036
# entry referring to file not present on disk.
2037
# advance the entry only, after processing.
2038
for result in _process_entry(current_entry, None):
2039
# this check should probably be outside the loop: one
2040
# 'iterate two trees' api, and then _iter_changes filters
2041
# unchanged pairs. - RBC 20070226
2043
if (include_unchanged
2044
or result[2] # content change
2045
or result[3][0] != result[3][1] # versioned status
2046
or result[4][0] != result[4][1] # parent id
2047
or result[5][0] != result[5][1] # name
2048
or result[6][0] != result[6][1] # kind
2049
or result[7][0] != result[7][1] # executable
2051
result = (result[0],
2052
utf8_decode(result[1])[0]) + result[2:]
2054
advance_path = False
2056
for result in _process_entry(current_entry, current_path_info):
2057
# this check should probably be outside the loop: one
2058
# 'iterate two trees' api, and then _iter_changes filters
2059
# unchanged pairs. - RBC 20070226
2061
if (include_unchanged
2062
or result[2] # content change
2063
or result[3][0] != result[3][1] # versioned status
2064
or result[4][0] != result[4][1] # parent id
2065
or result[5][0] != result[5][1] # name
2066
or result[6][0] != result[6][1] # kind
2067
or result[7][0] != result[7][1] # executable
2069
result = (result[0],
2070
utf8_decode(result[1])[0]) + result[2:]
2072
if advance_entry and current_entry is not None:
2074
if entry_index < len(current_block[1]):
2075
current_entry = current_block[1][entry_index]
2077
current_entry = None
2079
advance_entry = True # reset the advance flaga
2080
if advance_path and current_path_info is not None:
2081
if not path_handled:
2082
# unversioned in all regards
2083
if want_unversioned:
2084
new_executable = bool(
2085
stat.S_ISREG(current_path_info[3].st_mode)
2086
and stat.S_IEXEC & current_path_info[3].st_mode)
2087
if want_unversioned:
2088
yield (None, current_path_info[0], True,
2091
(None, current_path_info[1]),
2092
(None, current_path_info[2]),
2093
(None, new_executable))
2094
# dont descend into this unversioned path if it is
2096
if current_path_info[2] == 'directory':
2097
del current_dir_info[1][path_index]
2100
if path_index < len(current_dir_info[1]):
2101
current_path_info = current_dir_info[1][path_index]
2103
current_path_info = None
2104
path_handled = False
2106
advance_path = True # reset the advance flagg.
2107
if current_block is not None:
2109
if (block_index < len(state._dirblocks) and
2110
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2111
current_block = state._dirblocks[block_index]
2113
current_block = None
2114
if current_dir_info is not None:
2116
current_dir_info = dir_iterator.next()
2117
except StopIteration:
2118
current_dir_info = None
2096
2122
def is_compatible(source, target):
2097
2123
# the target must be a dirstate working tree
2098
if not isinstance(target, DirStateWorkingTree):
2124
if not isinstance(target, WorkingTree4):
2100
# the source must be a revtree or dirstate rev tree.
2126
# the source must be a revtreee or dirstate rev tree.
2101
2127
if not isinstance(source,
2102
2128
(revisiontree.RevisionTree, DirStateRevisionTree)):
2104
2130
# the source revid must be in the target dirstate
2105
if not (source._revision_id == _mod_revision.NULL_REVISION or
2131
if not (source._revision_id == NULL_REVISION or
2106
2132
source._revision_id in target.get_parent_ids()):
2107
# TODO: what about ghosts? it may well need to
2133
# TODO: what about ghosts? it may well need to
2108
2134
# check for them explicitly.
2112
2138
InterTree.register_optimiser(InterDirStateTree)
2115
class Converter3to4(object):
2116
"""Perform an in-place upgrade of format 3 to format 4 trees."""
2119
self.target_format = WorkingTreeFormat4()
2121
def convert(self, tree):
2122
# lock the control files not the tree, so that we dont get tree
2123
# on-unlock behaviours, and so that noone else diddles with the
2124
# tree during upgrade.
2125
tree._control_files.lock_write()
2127
tree.read_working_inventory()
2128
self.create_dirstate_data(tree)
2129
self.update_format(tree)
2130
self.remove_xml_files(tree)
2132
tree._control_files.unlock()
2134
def create_dirstate_data(self, tree):
2135
"""Create the dirstate based data for tree."""
2136
local_path = tree.bzrdir.get_workingtree_transport(None
2137
).local_abspath('dirstate')
2138
state = dirstate.DirState.from_tree(tree, local_path)
2142
def remove_xml_files(self, tree):
2143
"""Remove the oldformat 3 data."""
2144
transport = tree.bzrdir.get_workingtree_transport(None)
2145
for path in ['basis-inventory-cache', 'inventory', 'last-revision',
2146
'pending-merges', 'stat-cache']:
2148
transport.delete(path)
2149
except errors.NoSuchFile:
2150
# some files are optional - just deal.
2153
def update_format(self, tree):
2154
"""Change the format marker."""
2155
tree._transport.put_bytes('format',
2156
self.target_format.get_format_string(),
2157
mode=tree.bzrdir._get_file_mode())
2160
class Converter4to5(object):
2161
"""Perform an in-place upgrade of format 4 to format 5 trees."""
2164
self.target_format = WorkingTreeFormat5()
2166
def convert(self, tree):
2167
# lock the control files not the tree, so that we don't get tree
2168
# on-unlock behaviours, and so that no-one else diddles with the
2169
# tree during upgrade.
2170
tree._control_files.lock_write()
2172
self.update_format(tree)
2174
tree._control_files.unlock()
2176
def update_format(self, tree):
2177
"""Change the format marker."""
2178
tree._transport.put_bytes('format',
2179
self.target_format.get_format_string(),
2180
mode=tree.bzrdir._get_file_mode())
2183
class Converter4or5to6(object):
2184
"""Perform an in-place upgrade of format 4 or 5 to format 6 trees."""
2187
self.target_format = WorkingTreeFormat6()
2189
def convert(self, tree):
2190
# lock the control files not the tree, so that we don't get tree
2191
# on-unlock behaviours, and so that no-one else diddles with the
2192
# tree during upgrade.
2193
tree._control_files.lock_write()
2195
self.init_custom_control_files(tree)
2196
self.update_format(tree)
2198
tree._control_files.unlock()
2200
def init_custom_control_files(self, tree):
2201
"""Initialize custom control files."""
2202
tree._transport.put_bytes('views', '',
2203
mode=tree.bzrdir._get_file_mode())
2205
def update_format(self, tree):
2206
"""Change the format marker."""
2207
tree._transport.put_bytes('format',
2208
self.target_format.get_format_string(),
2209
mode=tree.bzrdir._get_file_mode())
added
removed
bzrlib/workingtree_4.py
