1223
1333
@needs_tree_write_lock
1224
1334
def _write_inventory(self, inv):
1225
1335
"""Write inventory as the current inventory."""
1226
assert not self._dirty, "attempting to write an inventory when the dirstate is dirty will cause data loss"
1227
self.current_dirstate().set_state_from_inventory(inv)
1228
self._make_dirty(reset_inventory=False)
1229
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)
1230
1350
self._inventory = inv
1234
class WorkingTreeFormat4(WorkingTreeFormat3):
1235
"""The first consolidated dirstate working tree format.
1238
- exists within a metadir controlling .bzr
1239
- includes an explicit version marker for the workingtree control
1240
files, separate from the BzrDir format
1241
- modifies the hash cache format
1242
- is new in bzr 0.15
1243
- uses a LockDir to guard access to it.
1246
upgrade_recommended = False
1248
def get_format_string(self):
1249
"""See WorkingTreeFormat.get_format_string()."""
1250
return "Bazaar Working Tree Format 4 (bzr 0.15)\n"
1252
def get_format_description(self):
1253
"""See WorkingTreeFormat.get_format_description()."""
1254
return "Working tree format 4"
1256
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):
1257
1480
"""See WorkingTreeFormat.initialize().
1259
1482
:param revision_id: allows creating a working tree at a different
1260
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,
1262
1491
These trees get an initial random root id, if their repository supports
1263
1492
rich root data, TREE_ROOT otherwise.
1265
revision_id = osutils.safe_revision_id(revision_id)
1266
1494
if not isinstance(a_bzrdir.transport, LocalTransport):
1267
1495
raise errors.NotLocalUrl(a_bzrdir.transport.base)
1268
1496
transport = a_bzrdir.get_workingtree_transport(self)
1269
1497
control_files = self._open_control_files(a_bzrdir)
1270
1498
control_files.create_lock()
1271
1499
control_files.lock_write()
1272
control_files.put_utf8('format', self.get_format_string())
1273
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()
1274
1506
if revision_id is None:
1275
1507
revision_id = branch.last_revision()
1276
1508
local_path = transport.local_abspath('dirstate')
1287
1519
wt.lock_tree_write()
1289
if revision_id in (None, NULL_REVISION):
1521
self._init_custom_control_files(wt)
1522
if revision_id in (None, _mod_revision.NULL_REVISION):
1290
1523
if branch.repository.supports_rich_root():
1291
1524
wt._set_root_id(generate_ids.gen_root_id())
1293
1526
wt._set_root_id(ROOT_ID)
1295
wt.set_last_revision(revision_id)
1297
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)]
1298
1543
basis.lock_read()
1299
# if the basis has a root id we have to use that; otherwise we use
1301
basis_root_id = basis.get_root_id()
1302
if basis_root_id is not None:
1303
wt._set_root_id(basis_root_id)
1545
wt.set_parent_trees(parents_list, allow_leftmost_as_ghost=True)
1305
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']:
1308
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))
1312
1598
def _open(self, a_bzrdir, control_files):
1313
1599
"""Open the tree itself.
1315
1601
:param a_bzrdir: the dir for the tree.
1316
1602
:param control_files: the control files for the tree.
1318
return WorkingTree4(a_bzrdir.root_transport.local_abspath('.'),
1604
return self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
1319
1605
branch=a_bzrdir.open_branch(),
1321
1607
_bzrdir=a_bzrdir,
1322
1608
_control_files=control_files)
1324
1610
def __get_matchingbzrdir(self):
1611
return self._get_matchingbzrdir()
1613
def _get_matchingbzrdir(self):
1614
"""Overrideable method to get a bzrdir for testing."""
1325
1615
# please test against something that will let us do tree references
1326
return bzrdir.format_registry.make_bzrdir(
1327
'dirstate-with-subtree')
1616
return controldir.format_registry.make_bzrdir(
1617
'development-subtree')
1329
1619
_matchingbzrdir = property(__get_matchingbzrdir)
1332
class DirStateRevisionTree(Tree):
1333
"""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.
1335
1710
def __init__(self, dirstate, revision_id, repository):
1336
1711
self._dirstate = dirstate
1337
self._revision_id = osutils.safe_revision_id(revision_id)
1712
self._revision_id = revision_id
1338
1713
self._repository = repository
1339
1714
self._inventory = None
1340
1715
self._locked = 0
1341
1716
self._dirstate_locked = False
1717
self._repo_supports_tree_reference = getattr(
1718
repository._format, "supports_tree_reference",
1343
1721
def __repr__(self):
1344
1722
return "<%s of %s in %s>" % \
1345
1723
(self.__class__.__name__, self._revision_id, self._dirstate)
1347
def annotate_iter(self, file_id):
1725
def annotate_iter(self, file_id,
1726
default_revision=_mod_revision.CURRENT_REVISION):
1348
1727
"""See Tree.annotate_iter"""
1349
w = self._repository.weave_store.get_weave(file_id,
1350
self._repository.get_transaction())
1351
return w.annotate_iter(self.inventory[file_id].revision)
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]
1353
1732
def _comparison_data(self, entry, path):
1354
1733
"""See Tree._comparison_data."""
1754
2241
if not found_versioned:
1755
2242
# none of the indexes was not 'absent' at all ids for this
1757
all_versioned = False
1759
if not all_versioned:
1760
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)
1761
2247
# -- remove redundancy in supplied specific_files to prevent over-scanning --
1762
search_specific_files = set()
1763
for path in specific_files:
1764
other_specific_files = specific_files.difference(set([path]))
1765
if not osutils.is_inside_any(other_specific_files, path):
1766
# this is a top level path, we must check it.
1767
search_specific_files.add(path)
1769
# compare source_index and target_index at or under each element of search_specific_files.
1770
# follow the following comparison table. Note that we only want to do diff operations when
1771
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1775
# Source | Target | disk | action
1776
# r | fdlt | | add source to search, add id path move and perform
1777
# | | | diff check on source-target
1778
# r | fdlt | a | dangling file that was present in the basis.
1780
# r | a | | add source to search
1782
# r | r | | this path is present in a non-examined tree, skip.
1783
# r | r | a | this path is present in a non-examined tree, skip.
1784
# a | fdlt | | add new id
1785
# a | fdlt | a | dangling locally added file, skip
1786
# a | a | | not present in either tree, skip
1787
# a | a | a | not present in any tree, skip
1788
# a | r | | not present in either tree at this path, skip as it
1789
# | | | may not be selected by the users list of paths.
1790
# a | r | a | not present in either tree at this path, skip as it
1791
# | | | may not be selected by the users list of paths.
1792
# fdlt | fdlt | | content in both: diff them
1793
# fdlt | fdlt | a | deleted locally, but not unversioned - show as deleted ?
1794
# fdlt | a | | unversioned: output deleted id for now
1795
# fdlt | a | a | unversioned and deleted: output deleted id
1796
# fdlt | r | | relocated in this tree, so add target to search.
1797
# | | | Dont diff, we will see an r,fd; pair when we reach
1798
# | | | this id at the other path.
1799
# fdlt | r | a | relocated in this tree, so add target to search.
1800
# | | | Dont diff, we will see an r,fd; pair when we reach
1801
# | | | this id at the other path.
1803
# for all search_indexs in each path at or under each element of
1804
# search_specific_files, if the detail is relocated: add the id, and add the
1805
# relocated path as one to search if its not searched already. If the
1806
# detail is not relocated, add the id.
1807
searched_specific_files = set()
1808
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1809
# Using a list so that we can access the values and change them in
1810
# nested scope. Each one is [path, file_id, entry]
1811
last_source_parent = [None, None]
1812
last_target_parent = [None, None]
2248
search_specific_files = osutils.minimum_path_selection(specific_files)
1814
2250
use_filesystem_for_exec = (sys.platform != 'win32')
1816
# Just a sentry, so that _process_entry can say that this
1817
# record is handled, but isn't interesting to process (unchanged)
1818
uninteresting = object()
1821
old_dirname_to_file_id = {}
1822
new_dirname_to_file_id = {}
1823
# TODO: jam 20070516 - Avoid the _get_entry lookup overhead by
1824
# keeping a cache of directories that we have seen.
1826
def _process_entry(entry, path_info):
1827
"""Compare an entry and real disk to generate delta information.
1829
:param path_info: top_relpath, basename, kind, lstat, abspath for
1830
the path of entry. If None, then the path is considered absent.
1831
(Perhaps we should pass in a concrete entry for this ?)
1832
Basename is returned as a utf8 string because we expect this
1833
tuple will be ignored, and don't want to take the time to
1835
:return: None if these don't match
1836
A tuple of information about the change, or
1837
the object 'uninteresting' if these match, but are
1838
basically identical.
1840
if source_index is None:
1841
source_details = NULL_PARENT_DETAILS
1843
source_details = entry[1][source_index]
1844
target_details = entry[1][target_index]
1845
target_minikind = target_details[0]
1846
if path_info is not None and target_minikind in 'fdlt':
1847
assert target_index == 0
1848
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
1849
stat_value=path_info[3])
1850
# The entry may have been modified by update_entry
1851
target_details = entry[1][target_index]
1852
target_minikind = target_details[0]
1855
file_id = entry[0][2]
1856
source_minikind = source_details[0]
1857
if source_minikind in 'fdltr' and target_minikind in 'fdlt':
1858
# claimed content in both: diff
1859
# r | fdlt | | add source to search, add id path move and perform
1860
# | | | diff check on source-target
1861
# r | fdlt | a | dangling file that was present in the basis.
1863
if source_minikind in 'r':
1864
# add the source to the search path to find any children it
1865
# has. TODO ? : only add if it is a container ?
1866
if not osutils.is_inside_any(searched_specific_files,
1868
search_specific_files.add(source_details[1])
1869
# generate the old path; this is needed for stating later
1871
old_path = source_details[1]
1872
old_dirname, old_basename = os.path.split(old_path)
1873
path = pathjoin(entry[0][0], entry[0][1])
1874
old_entry = state._get_entry(source_index,
1876
# update the source details variable to be the real
1878
source_details = old_entry[1][source_index]
1879
source_minikind = source_details[0]
1881
old_dirname = entry[0][0]
1882
old_basename = entry[0][1]
1883
old_path = path = None
1884
if path_info is None:
1885
# the file is missing on disk, show as removed.
1886
content_change = True
1890
# source and target are both versioned and disk file is present.
1891
target_kind = path_info[2]
1892
if target_kind == 'directory':
1894
old_path = path = pathjoin(old_dirname, old_basename)
1895
new_dirname_to_file_id[path] = file_id
1896
if source_minikind != 'd':
1897
content_change = True
1899
# directories have no fingerprint
1900
content_change = False
1902
elif target_kind == 'file':
1903
if source_minikind != 'f':
1904
content_change = True
1906
# We could check the size, but we already have the
1908
content_change = (link_or_sha1 != source_details[1])
1909
# Target details is updated at update_entry time
1910
if use_filesystem_for_exec:
1911
# We don't need S_ISREG here, because we are sure
1912
# we are dealing with a file.
1913
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
1915
target_exec = target_details[3]
1916
elif target_kind == 'symlink':
1917
if source_minikind != 'l':
1918
content_change = True
1920
content_change = (link_or_sha1 != source_details[1])
1922
elif target_kind == 'tree-reference':
1923
if source_minikind != 't':
1924
content_change = True
1926
content_change = False
1929
raise Exception, "unknown kind %s" % path_info[2]
1930
if source_minikind == 'd':
1932
old_path = path = pathjoin(old_dirname, old_basename)
1933
old_dirname_to_file_id[old_path] = file_id
1934
# parent id is the entry for the path in the target tree
1935
if old_dirname == last_source_parent[0]:
1936
source_parent_id = last_source_parent[1]
1939
source_parent_id = old_dirname_to_file_id[old_dirname]
1941
source_parent_entry = state._get_entry(source_index,
1942
path_utf8=old_dirname)
1943
source_parent_id = source_parent_entry[0][2]
1944
if source_parent_id == entry[0][2]:
1945
# This is the root, so the parent is None
1946
source_parent_id = None
1948
last_source_parent[0] = old_dirname
1949
last_source_parent[1] = source_parent_id
1950
new_dirname = entry[0][0]
1951
if new_dirname == last_target_parent[0]:
1952
target_parent_id = last_target_parent[1]
1955
target_parent_id = new_dirname_to_file_id[new_dirname]
1957
# TODO: We don't always need to do the lookup, because the
1958
# parent entry will be the same as the source entry.
1959
target_parent_entry = state._get_entry(target_index,
1960
path_utf8=new_dirname)
1961
assert target_parent_entry != (None, None), (
1962
"Could not find target parent in wt: %s\nparent of: %s"
1963
% (new_dirname, entry))
1964
target_parent_id = target_parent_entry[0][2]
1965
if target_parent_id == entry[0][2]:
1966
# This is the root, so the parent is None
1967
target_parent_id = None
1969
last_target_parent[0] = new_dirname
1970
last_target_parent[1] = target_parent_id
1972
source_exec = source_details[3]
1973
if (include_unchanged
1975
or source_parent_id != target_parent_id
1976
or old_basename != entry[0][1]
1977
or source_exec != target_exec
1979
if old_path is None:
1980
old_path = path = pathjoin(old_dirname, old_basename)
1981
old_path_u = utf8_decode(old_path)[0]
1984
old_path_u = utf8_decode(old_path)[0]
1985
if old_path == path:
1988
path_u = utf8_decode(path)[0]
1989
source_kind = _minikind_to_kind[source_minikind]
1990
return (entry[0][2],
1991
(old_path_u, path_u),
1994
(source_parent_id, target_parent_id),
1995
(utf8_decode(old_basename)[0], utf8_decode(entry[0][1])[0]),
1996
(source_kind, target_kind),
1997
(source_exec, target_exec))
1999
return uninteresting
2000
elif source_minikind in 'a' and target_minikind in 'fdlt':
2001
# looks like a new file
2002
if path_info is not None:
2003
path = pathjoin(entry[0][0], entry[0][1])
2004
# parent id is the entry for the path in the target tree
2005
# TODO: these are the same for an entire directory: cache em.
2006
parent_id = state._get_entry(target_index,
2007
path_utf8=entry[0][0])[0][2]
2008
if parent_id == entry[0][2]:
2010
if use_filesystem_for_exec:
2011
# We need S_ISREG here, because we aren't sure if this
2014
stat.S_ISREG(path_info[3].st_mode)
2015
and stat.S_IEXEC & path_info[3].st_mode)
2017
target_exec = target_details[3]
2018
return (entry[0][2],
2019
(None, utf8_decode(path)[0]),
2023
(None, utf8_decode(entry[0][1])[0]),
2024
(None, path_info[2]),
2025
(None, target_exec))
2027
# but its not on disk: we deliberately treat this as just
2028
# never-present. (Why ?! - RBC 20070224)
2030
elif source_minikind in 'fdlt' and target_minikind in 'a':
2031
# unversioned, possibly, or possibly not deleted: we dont care.
2032
# if its still on disk, *and* theres no other entry at this
2033
# path [we dont know this in this routine at the moment -
2034
# perhaps we should change this - then it would be an unknown.
2035
old_path = pathjoin(entry[0][0], entry[0][1])
2036
# parent id is the entry for the path in the target tree
2037
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
2038
if parent_id == entry[0][2]:
2040
return (entry[0][2],
2041
(utf8_decode(old_path)[0], None),
2045
(utf8_decode(entry[0][1])[0], None),
2046
(_minikind_to_kind[source_minikind], None),
2047
(source_details[3], None))
2048
elif source_minikind in 'fdlt' and target_minikind in 'r':
2049
# a rename; could be a true rename, or a rename inherited from
2050
# a renamed parent. TODO: handle this efficiently. Its not
2051
# common case to rename dirs though, so a correct but slow
2052
# implementation will do.
2053
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
2054
search_specific_files.add(target_details[1])
2055
elif source_minikind in 'ra' and target_minikind in 'ra':
2056
# neither of the selected trees contain this file,
2057
# so skip over it. This is not currently directly tested, but
2058
# is indirectly via test_too_much.TestCommands.test_conflicts.
2061
raise AssertionError("don't know how to compare "
2062
"source_minikind=%r, target_minikind=%r"
2063
% (source_minikind, target_minikind))
2064
## import pdb;pdb.set_trace()
2067
while search_specific_files:
2068
# TODO: the pending list should be lexically sorted? the
2069
# interface doesn't require it.
2070
current_root = search_specific_files.pop()
2071
current_root_unicode = current_root.decode('utf8')
2072
searched_specific_files.add(current_root)
2073
# process the entries for this containing directory: the rest will be
2074
# found by their parents recursively.
2075
root_entries = _entries_for_path(current_root)
2076
root_abspath = self.target.abspath(current_root_unicode)
2078
root_stat = os.lstat(root_abspath)
2080
if e.errno == errno.ENOENT:
2081
# the path does not exist: let _process_entry know that.
2082
root_dir_info = None
2084
# some other random error: hand it up.
2087
root_dir_info = ('', current_root,
2088
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
2090
if root_dir_info[2] == 'directory':
2091
if self.target._directory_is_tree_reference(
2092
current_root.decode('utf8')):
2093
root_dir_info = root_dir_info[:2] + \
2094
('tree-reference',) + root_dir_info[3:]
2096
if not root_entries and not root_dir_info:
2097
# this specified path is not present at all, skip it.
2099
path_handled = False
2100
for entry in root_entries:
2101
result = _process_entry(entry, root_dir_info)
2102
if result is not None:
2104
if result is not uninteresting:
2106
if want_unversioned and not path_handled and root_dir_info:
2107
new_executable = bool(
2108
stat.S_ISREG(root_dir_info[3].st_mode)
2109
and stat.S_IEXEC & root_dir_info[3].st_mode)
2111
(None, current_root_unicode),
2115
(None, splitpath(current_root_unicode)[-1]),
2116
(None, root_dir_info[2]),
2117
(None, new_executable)
2119
initial_key = (current_root, '', '')
2120
block_index, _ = state._find_block_index_from_key(initial_key)
2121
if block_index == 0:
2122
# we have processed the total root already, but because the
2123
# initial key matched it we should skip it here.
2125
if root_dir_info and root_dir_info[2] == 'tree-reference':
2126
current_dir_info = None
2128
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
2130
current_dir_info = dir_iterator.next()
2132
# on win32, python2.4 has e.errno == ERROR_DIRECTORY, but
2133
# python 2.5 has e.errno == EINVAL,
2134
# and e.winerror == ERROR_DIRECTORY
2135
e_winerror = getattr(e, 'winerror', None)
2136
win_errors = (ERROR_DIRECTORY, ERROR_PATH_NOT_FOUND)
2137
# there may be directories in the inventory even though
2138
# this path is not a file on disk: so mark it as end of
2140
if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
2141
current_dir_info = None
2142
elif (sys.platform == 'win32'
2143
and (e.errno in win_errors
2144
or e_winerror in win_errors)):
2145
current_dir_info = None
2149
if current_dir_info[0][0] == '':
2150
# remove .bzr from iteration
2151
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
2152
assert current_dir_info[1][bzr_index][0] == '.bzr'
2153
del current_dir_info[1][bzr_index]
2154
# walk until both the directory listing and the versioned metadata
2156
if (block_index < len(state._dirblocks) and
2157
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2158
current_block = state._dirblocks[block_index]
2160
current_block = None
2161
while (current_dir_info is not None or
2162
current_block is not None):
2163
if (current_dir_info and current_block
2164
and current_dir_info[0][0] != current_block[0]):
2165
if current_dir_info[0][0].split('/') < current_block[0].split('/'):
2166
# filesystem data refers to paths not covered by the dirblock.
2167
# this has two possibilities:
2168
# A) it is versioned but empty, so there is no block for it
2169
# B) it is not versioned.
2171
# if (A) then we need to recurse into it to check for
2172
# new unknown files or directories.
2173
# if (B) then we should ignore it, because we don't
2174
# recurse into unknown directories.
2176
while path_index < len(current_dir_info[1]):
2177
current_path_info = current_dir_info[1][path_index]
2178
if want_unversioned:
2179
if current_path_info[2] == 'directory':
2180
if self.target._directory_is_tree_reference(
2181
current_path_info[0].decode('utf8')):
2182
current_path_info = current_path_info[:2] + \
2183
('tree-reference',) + current_path_info[3:]
2184
new_executable = bool(
2185
stat.S_ISREG(current_path_info[3].st_mode)
2186
and stat.S_IEXEC & current_path_info[3].st_mode)
2188
(None, utf8_decode(current_path_info[0])[0]),
2192
(None, utf8_decode(current_path_info[1])[0]),
2193
(None, current_path_info[2]),
2194
(None, new_executable))
2195
# dont descend into this unversioned path if it is
2197
if current_path_info[2] in ('directory',
2199
del current_dir_info[1][path_index]
2203
# This dir info has been handled, go to the next
2205
current_dir_info = dir_iterator.next()
2206
except StopIteration:
2207
current_dir_info = None
2209
# We have a dirblock entry for this location, but there
2210
# is no filesystem path for this. This is most likely
2211
# because a directory was removed from the disk.
2212
# We don't have to report the missing directory,
2213
# because that should have already been handled, but we
2214
# need to handle all of the files that are contained
2216
for current_entry in current_block[1]:
2217
# entry referring to file not present on disk.
2218
# advance the entry only, after processing.
2219
result = _process_entry(current_entry, None)
2220
if result is not None:
2221
if result is not uninteresting:
2224
if (block_index < len(state._dirblocks) and
2225
osutils.is_inside(current_root,
2226
state._dirblocks[block_index][0])):
2227
current_block = state._dirblocks[block_index]
2229
current_block = None
2232
if current_block and entry_index < len(current_block[1]):
2233
current_entry = current_block[1][entry_index]
2235
current_entry = None
2236
advance_entry = True
2238
if current_dir_info and path_index < len(current_dir_info[1]):
2239
current_path_info = current_dir_info[1][path_index]
2240
if current_path_info[2] == 'directory':
2241
if self.target._directory_is_tree_reference(
2242
current_path_info[0].decode('utf8')):
2243
current_path_info = current_path_info[:2] + \
2244
('tree-reference',) + current_path_info[3:]
2246
current_path_info = None
2248
path_handled = False
2249
while (current_entry is not None or
2250
current_path_info is not None):
2251
if current_entry is None:
2252
# the check for path_handled when the path is adnvaced
2253
# will yield this path if needed.
2255
elif current_path_info is None:
2256
# no path is fine: the per entry code will handle it.
2257
result = _process_entry(current_entry, current_path_info)
2258
if result is not None:
2259
if result is not uninteresting:
2261
elif (current_entry[0][1] != current_path_info[1]
2262
or current_entry[1][target_index][0] in 'ar'):
2263
# The current path on disk doesn't match the dirblock
2264
# record. Either the dirblock is marked as absent, or
2265
# the file on disk is not present at all in the
2266
# dirblock. Either way, report about the dirblock
2267
# entry, and let other code handle the filesystem one.
2268
if current_path_info[1].split('/') < current_entry[0][1].split('/'):
2269
# extra file on disk: pass for now, but only
2270
# increment the path, not the entry
2271
advance_entry = False
2273
# entry referring to file not present on disk.
2274
# advance the entry only, after processing.
2275
result = _process_entry(current_entry, None)
2276
if result is not None:
2277
if result is not uninteresting:
2279
advance_path = False
2281
result = _process_entry(current_entry, current_path_info)
2282
if result is not None:
2284
if result is not uninteresting:
2286
if advance_entry and current_entry is not None:
2288
if entry_index < len(current_block[1]):
2289
current_entry = current_block[1][entry_index]
2291
current_entry = None
2293
advance_entry = True # reset the advance flaga
2294
if advance_path and current_path_info is not None:
2295
if not path_handled:
2296
# unversioned in all regards
2297
if want_unversioned:
2298
new_executable = bool(
2299
stat.S_ISREG(current_path_info[3].st_mode)
2300
and stat.S_IEXEC & current_path_info[3].st_mode)
2302
(None, utf8_decode(current_path_info[0])[0]),
2306
(None, utf8_decode(current_path_info[1])[0]),
2307
(None, current_path_info[2]),
2308
(None, new_executable))
2309
# dont descend into this unversioned path if it is
2311
if current_path_info[2] in ('directory'):
2312
del current_dir_info[1][path_index]
2314
# dont descend the disk iterator into any tree
2316
if current_path_info[2] == 'tree-reference':
2317
del current_dir_info[1][path_index]
2320
if path_index < len(current_dir_info[1]):
2321
current_path_info = current_dir_info[1][path_index]
2322
if current_path_info[2] == 'directory':
2323
if self.target._directory_is_tree_reference(
2324
current_path_info[0].decode('utf8')):
2325
current_path_info = current_path_info[:2] + \
2326
('tree-reference',) + current_path_info[3:]
2328
current_path_info = None
2329
path_handled = False
2331
advance_path = True # reset the advance flagg.
2332
if current_block is not None:
2334
if (block_index < len(state._dirblocks) and
2335
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2336
current_block = state._dirblocks[block_index]
2338
current_block = None
2339
if current_dir_info is not None:
2341
current_dir_info = dir_iterator.next()
2342
except StopIteration:
2343
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()
2347
2257
def is_compatible(source, target):
2348
2258
# the target must be a dirstate working tree
2349
if not isinstance(target, WorkingTree4):
2259
if not isinstance(target, DirStateWorkingTree):
2351
# the source must be a revtreee or dirstate rev tree.
2261
# the source must be a revtree or dirstate rev tree.
2352
2262
if not isinstance(source,
2353
2263
(revisiontree.RevisionTree, DirStateRevisionTree)):
2355
2265
# the source revid must be in the target dirstate
2356
if not (source._revision_id == NULL_REVISION or
2266
if not (source._revision_id == _mod_revision.NULL_REVISION or
2357
2267
source._revision_id in target.get_parent_ids()):
2358
# TODO: what about ghosts? it may well need to
2268
# TODO: what about ghosts? it may well need to
2359
2269
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
