1238
1108
self._inventory.remove_recursive_id(file_id)
1240
1110
@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
1111
def _write_inventory(self, inv):
1265
1112
"""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)
1113
assert not self._dirty, "attempting to write an inventory when the dirstate is dirty will cause data loss"
1114
self.current_dirstate().set_state_from_inventory(inv)
1115
self._make_dirty(reset_inventory=False)
1116
if self._inventory is not None:
1280
1117
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):
1121
class WorkingTreeFormat4(WorkingTreeFormat3):
1122
"""The first consolidated dirstate working tree format.
1125
- exists within a metadir controlling .bzr
1126
- includes an explicit version marker for the workingtree control
1127
files, separate from the BzrDir format
1128
- modifies the hash cache format
1129
- is new in bzr TODO FIXME SETBEFOREMERGE
1130
- uses a LockDir to guard access to it.
1133
supports_tree_reference = True
1135
def get_format_string(self):
1136
"""See WorkingTreeFormat.get_format_string()."""
1137
return "Bazaar Working Tree format 4\n"
1139
def get_format_description(self):
1140
"""See WorkingTreeFormat.get_format_description()."""
1141
return "Working tree format 4"
1143
def initialize(self, a_bzrdir, revision_id=None):
1377
1144
"""See WorkingTreeFormat.initialize().
1379
1146
:param revision_id: allows creating a working tree at a different
1380
1147
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.
1149
These trees get an initial random root id.
1151
revision_id = osutils.safe_revision_id(revision_id)
1391
1152
if not isinstance(a_bzrdir.transport, LocalTransport):
1392
1153
raise errors.NotLocalUrl(a_bzrdir.transport.base)
1393
1154
transport = a_bzrdir.get_workingtree_transport(self)
1394
1155
control_files = self._open_control_files(a_bzrdir)
1395
1156
control_files.create_lock()
1396
1157
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()
1158
control_files.put_utf8('format', self.get_format_string())
1159
branch = a_bzrdir.open_branch()
1403
1160
if revision_id is None:
1404
1161
revision_id = branch.last_revision()
1405
1162
local_path = transport.local_abspath('dirstate')
1406
1163
# write out new dirstate (must exist when we create the tree)
1407
1164
state = dirstate.DirState.initialize(local_path)
1410
wt = self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
1166
wt = WorkingTree4(a_bzrdir.root_transport.local_abspath('.'),
1413
1169
_bzrdir=a_bzrdir,
1414
1170
_control_files=control_files)
1416
1172
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)
1175
if revision_id in (None, NULL_REVISION):
1176
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:
1439
parents_list = [(revision_id, basis)]
1178
wt.current_dirstate()._validate()
1179
wt.set_last_revision(revision_id)
1181
basis = wt.basis_tree()
1440
1182
basis.lock_read()
1442
wt.set_parent_trees(parents_list, allow_leftmost_as_ghost=True)
1183
# if the basis has a root id we have to use that; otherwise we use
1185
basis_root_id = basis.get_root_id()
1186
if basis_root_id is not None:
1187
wt._set_root_id(basis_root_id)
1444
# if the basis has a root id we have to use that; otherwise we
1445
# use a new random one
1446
basis_root_id = basis.get_root_id()
1447
if basis_root_id is not None:
1448
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)
1189
transform.build_tree(basis, wt)
1466
1192
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
1196
def _open(self, a_bzrdir, control_files):
1480
1197
"""Open the tree itself.
1482
1199
:param a_bzrdir: the dir for the tree.
1483
1200
:param control_files: the control files for the tree.
1485
return self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
1202
return WorkingTree4(a_bzrdir.root_transport.local_abspath('.'),
1486
1203
branch=a_bzrdir.open_branch(),
1488
1205
_bzrdir=a_bzrdir,
1489
1206
_control_files=control_files)
1491
1208
def __get_matchingbzrdir(self):
1492
return self._get_matchingbzrdir()
1494
def _get_matchingbzrdir(self):
1495
"""Overrideable method to get a bzrdir for testing."""
1496
1209
# please test against something that will let us do tree references
1497
1210
return bzrdir.format_registry.make_bzrdir(
1498
1211
'dirstate-with-subtree')
2080
1637
if not found_versioned:
2081
1638
# 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)
1640
all_versioned = False
1642
if not all_versioned:
1643
raise errors.PathsNotVersionedError(specific_files)
2086
1644
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2087
search_specific_files = osutils.minimum_path_selection(specific_files)
1645
search_specific_files = set()
1646
for path in specific_files:
1647
other_specific_files = specific_files.difference(set([path]))
1648
if not osutils.is_inside_any(other_specific_files, path):
1649
# this is a top level path, we must check it.
1650
search_specific_files.add(path)
1652
# compare source_index and target_index at or under each element of search_specific_files.
1653
# follow the following comparison table. Note that we only want to do diff operations when
1654
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1658
# Source | Target | disk | action
1659
# r | fdlt | | add source to search, add id path move and perform
1660
# | | | diff check on source-target
1661
# r | fdlt | a | dangling file that was present in the basis.
1663
# r | a | | add source to search
1665
# r | r | | this path is present in a non-examined tree, skip.
1666
# r | r | a | this path is present in a non-examined tree, skip.
1667
# a | fdlt | | add new id
1668
# a | fdlt | a | dangling locally added file, skip
1669
# a | a | | not present in either tree, skip
1670
# a | a | a | not present in any tree, skip
1671
# a | r | | not present in either tree at this path, skip as it
1672
# | | | may not be selected by the users list of paths.
1673
# a | r | a | not present in either tree at this path, skip as it
1674
# | | | may not be selected by the users list of paths.
1675
# fdlt | fdlt | | content in both: diff them
1676
# fdlt | fdlt | a | deleted locally, but not unversioned - show as deleted ?
1677
# fdlt | a | | unversioned: output deleted id for now
1678
# fdlt | a | a | unversioned and deleted: output deleted id
1679
# fdlt | r | | relocated in this tree, so add target to search.
1680
# | | | Dont diff, we will see an r,fd; pair when we reach
1681
# | | | this id at the other path.
1682
# fdlt | r | a | relocated in this tree, so add target to search.
1683
# | | | Dont diff, we will see an r,fd; pair when we reach
1684
# | | | this id at the other path.
1686
# for all search_indexs in each path at or under each element of
1687
# search_specific_files, if the detail is relocated: add the id, and add the
1688
# relocated path as one to search if its not searched already. If the
1689
# detail is not relocated, add the id.
1690
searched_specific_files = set()
1691
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1692
# Using a list so that we can access the values and change them in
1693
# nested scope. Each one is [path, file_id, entry]
1694
last_source_parent = [None, None, None]
1695
last_target_parent = [None, None, None]
2089
1697
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()
1699
def _process_entry(entry, path_info):
1700
"""Compare an entry and real disk to generate delta information.
1702
:param path_info: top_relpath, basename, kind, lstat, abspath for
1703
the path of entry. If None, then the path is considered absent.
1704
(Perhaps we should pass in a concrete entry for this ?)
1705
Basename is returned as a utf8 string because we expect this
1706
tuple will be ignored, and don't want to take the time to
1709
# TODO: when a parent has been renamed, dont emit path renames for children,
1710
## if path_info[1] == 'sub':
1711
## import pdb;pdb.set_trace()
1712
if source_index is None:
1713
source_details = NULL_PARENT_DETAILS
1715
source_details = entry[1][source_index]
1716
target_details = entry[1][target_index]
1717
target_minikind = target_details[0]
1718
if path_info is not None and target_minikind in 'fdlt':
1719
assert target_index == 0
1720
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
1721
stat_value=path_info[3])
1722
# The entry may have been modified by update_entry
1723
target_details = entry[1][target_index]
1724
target_minikind = target_details[0]
1727
source_minikind = source_details[0]
1728
if source_minikind in 'fdltr' and target_minikind in 'fdlt':
1729
# claimed content in both: diff
1730
# r | fdlt | | add source to search, add id path move and perform
1731
# | | | diff check on source-target
1732
# r | fdlt | a | dangling file that was present in the basis.
1734
if source_minikind in 'r':
1735
# add the source to the search path to find any children it
1736
# has. TODO ? : only add if it is a container ?
1737
if not osutils.is_inside_any(searched_specific_files,
1739
search_specific_files.add(source_details[1])
1740
# generate the old path; this is needed for stating later
1742
old_path = source_details[1]
1743
old_dirname, old_basename = os.path.split(old_path)
1744
path = pathjoin(entry[0][0], entry[0][1])
1745
old_entry = state._get_entry(source_index,
1747
# update the source details variable to be the real
1749
source_details = old_entry[1][source_index]
1750
source_minikind = source_details[0]
1752
old_dirname = entry[0][0]
1753
old_basename = entry[0][1]
1754
old_path = path = pathjoin(old_dirname, old_basename)
1755
if path_info is None:
1756
# the file is missing on disk, show as removed.
1757
content_change = True
1761
# source and target are both versioned and disk file is present.
1762
target_kind = path_info[2]
1763
if target_kind == 'directory':
1764
if source_minikind != 'd':
1765
content_change = True
1767
# directories have no fingerprint
1768
content_change = False
1770
elif target_kind == 'file':
1771
if source_minikind != 'f':
1772
content_change = True
1774
# We could check the size, but we already have the
1776
content_change = (link_or_sha1 != source_details[1])
1777
# Target details is updated at update_entry time
1778
if use_filesystem_for_exec:
1779
# We don't need S_ISREG here, because we are sure
1780
# we are dealing with a file.
1781
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
1783
target_exec = target_details[3]
1784
elif target_kind == 'symlink':
1785
if source_minikind != 'l':
1786
content_change = True
1788
content_change = (link_or_sha1 != source_details[1])
1790
elif target_kind == 'tree-reference':
1791
if source_minikind != 't':
1792
content_change = True
1794
content_change = False
1796
raise Exception, "unknown kind %s" % path_info[2]
1797
# parent id is the entry for the path in the target tree
1798
if old_dirname == last_source_parent[0]:
1799
source_parent_id = last_source_parent[1]
1801
source_parent_entry = state._get_entry(source_index,
1802
path_utf8=old_dirname)
1803
source_parent_id = source_parent_entry[0][2]
1804
if source_parent_id == entry[0][2]:
1805
# This is the root, so the parent is None
1806
source_parent_id = None
1808
last_source_parent[0] = old_dirname
1809
last_source_parent[1] = source_parent_id
1810
last_source_parent[2] = source_parent_entry
1812
new_dirname = entry[0][0]
1813
if new_dirname == last_target_parent[0]:
1814
target_parent_id = last_target_parent[1]
1816
# TODO: We don't always need to do the lookup, because the
1817
# parent entry will be the same as the source entry.
1818
target_parent_entry = state._get_entry(target_index,
1819
path_utf8=new_dirname)
1820
target_parent_id = target_parent_entry[0][2]
1821
if target_parent_id == entry[0][2]:
1822
# This is the root, so the parent is None
1823
target_parent_id = None
1825
last_target_parent[0] = new_dirname
1826
last_target_parent[1] = target_parent_id
1827
last_target_parent[2] = target_parent_entry
1829
source_exec = source_details[3]
1830
return ((entry[0][2], (old_path, path), content_change,
1832
(source_parent_id, target_parent_id),
1833
(old_basename, entry[0][1]),
1834
(_minikind_to_kind[source_minikind], target_kind),
1835
(source_exec, target_exec)),)
1836
elif source_minikind in 'a' and target_minikind in 'fdlt':
1837
# looks like a new file
1838
if path_info is not None:
1839
path = pathjoin(entry[0][0], entry[0][1])
1840
# parent id is the entry for the path in the target tree
1841
# TODO: these are the same for an entire directory: cache em.
1842
parent_id = state._get_entry(target_index,
1843
path_utf8=entry[0][0])[0][2]
1844
if parent_id == entry[0][2]:
1846
if use_filesystem_for_exec:
1847
# We need S_ISREG here, because we aren't sure if this
1850
stat.S_ISREG(path_info[3].st_mode)
1851
and stat.S_IEXEC & path_info[3].st_mode)
1853
target_exec = target_details[3]
1854
return ((entry[0][2], (None, path), True,
1857
(None, entry[0][1]),
1858
(None, path_info[2]),
1859
(None, target_exec)),)
1861
# but its not on disk: we deliberately treat this as just
1862
# never-present. (Why ?! - RBC 20070224)
1864
elif source_minikind in 'fdlt' and target_minikind in 'a':
1865
# unversioned, possibly, or possibly not deleted: we dont care.
1866
# if its still on disk, *and* theres no other entry at this
1867
# path [we dont know this in this routine at the moment -
1868
# perhaps we should change this - then it would be an unknown.
1869
old_path = pathjoin(entry[0][0], entry[0][1])
1870
# parent id is the entry for the path in the target tree
1871
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
1872
if parent_id == entry[0][2]:
1874
return ((entry[0][2], (old_path, None), True,
1877
(entry[0][1], None),
1878
(_minikind_to_kind[source_minikind], None),
1879
(source_details[3], None)),)
1880
elif source_minikind in 'fdlt' and target_minikind in 'r':
1881
# a rename; could be a true rename, or a rename inherited from
1882
# a renamed parent. TODO: handle this efficiently. Its not
1883
# common case to rename dirs though, so a correct but slow
1884
# implementation will do.
1885
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
1886
search_specific_files.add(target_details[1])
1887
elif source_minikind in 'r' and target_minikind in 'r':
1888
# neither of the selected trees contain this file,
1889
# so skip over it. This is not currently directly tested, but
1890
# is indirectly via test_too_much.TestCommands.test_conflicts.
1893
raise AssertionError("don't know how to compare "
1894
"source_minikind=%r, target_minikind=%r"
1895
% (source_minikind, target_minikind))
1896
## import pdb;pdb.set_trace()
1898
while search_specific_files:
1899
# TODO: the pending list should be lexically sorted?
1900
current_root = search_specific_files.pop()
1901
searched_specific_files.add(current_root)
1902
# process the entries for this containing directory: the rest will be
1903
# found by their parents recursively.
1904
root_entries = _entries_for_path(current_root)
1905
root_abspath = self.target.abspath(current_root)
1907
root_stat = os.lstat(root_abspath)
1909
if e.errno == errno.ENOENT:
1910
# the path does not exist: let _process_entry know that.
1911
root_dir_info = None
1913
# some other random error: hand it up.
1916
root_dir_info = ('', current_root,
1917
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
1919
if not root_entries and not root_dir_info:
1920
# this specified path is not present at all, skip it.
1922
path_handled = False
1923
for entry in root_entries:
1924
for result in _process_entry(entry, root_dir_info):
1925
# this check should probably be outside the loop: one
1926
# 'iterate two trees' api, and then _iter_changes filters
1927
# unchanged pairs. - RBC 20070226
1929
if (include_unchanged
1930
or result[2] # content change
1931
or result[3][0] != result[3][1] # versioned status
1932
or result[4][0] != result[4][1] # parent id
1933
or result[5][0] != result[5][1] # name
1934
or result[6][0] != result[6][1] # kind
1935
or result[7][0] != result[7][1] # executable
1937
result = (result[0],
1938
((utf8_decode(result[1][0])[0]),
1939
utf8_decode(result[1][1])[0]),) + result[2:]
1941
if want_unversioned and not path_handled:
1942
new_executable = bool(
1943
stat.S_ISREG(root_dir_info[3].st_mode)
1944
and stat.S_IEXEC & root_dir_info[3].st_mode)
1945
yield (None, (None, current_root), True, (False, False),
1947
(None, splitpath(current_root)[-1]),
1948
(None, root_dir_info[2]), (None, new_executable))
1949
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
1950
initial_key = (current_root, '', '')
1951
block_index, _ = state._find_block_index_from_key(initial_key)
1952
if block_index == 0:
1953
# we have processed the total root already, but because the
1954
# initial key matched it we should skip it here.
1957
current_dir_info = dir_iterator.next()
1959
if e.errno in (errno.ENOENT, errno.ENOTDIR):
1960
# there may be directories in the inventory even though
1961
# this path is not a file on disk: so mark it as end of
1963
current_dir_info = None
1967
if current_dir_info[0][0] == '':
1968
# remove .bzr from iteration
1969
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
1970
assert current_dir_info[1][bzr_index][0] == '.bzr'
1971
del current_dir_info[1][bzr_index]
1972
# walk until both the directory listing and the versioned metadata
1973
# are exhausted. TODO: reevaluate this, perhaps we should stop when
1974
# the versioned data runs out.
1975
if (block_index < len(state._dirblocks) and
1976
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
1977
current_block = state._dirblocks[block_index]
1979
current_block = None
1980
while (current_dir_info is not None or
1981
current_block is not None):
1982
if (current_dir_info and current_block
1983
and current_dir_info[0][0] != current_block[0]):
1984
if current_dir_info[0][0] < current_block[0] :
1985
# import pdb; pdb.set_trace()
1986
# print 'unversioned dir'
1987
# filesystem data refers to paths not covered by the dirblock.
1988
# this has two possibilities:
1989
# A) it is versioned but empty, so there is no block for it
1990
# B) it is not versioned.
1991
# in either case it was processed by the containing directories walk:
1992
# if it is root/foo, when we walked root we emitted it,
1993
# or if we ere given root/foo to walk specifically, we
1994
# emitted it when checking the walk-root entries
1995
# advance the iterator and loop - we dont need to emit it.
1997
current_dir_info = dir_iterator.next()
1998
except StopIteration:
1999
current_dir_info = None
2001
# We have a dirblock entry for this location, but there
2002
# is no filesystem path for this. This is most likely
2003
# because a directory was removed from the disk.
2004
# We don't have to report the missing directory,
2005
# because that should have already been handled, but we
2006
# need to handle all of the files that are contained
2008
for current_entry in current_block[1]:
2009
# entry referring to file not present on disk.
2010
# advance the entry only, after processing.
2011
for result in _process_entry(current_entry, None):
2012
# this check should probably be outside the loop: one
2013
# 'iterate two trees' api, and then _iter_changes filters
2014
# unchanged pairs. - RBC 20070226
2015
if (include_unchanged
2016
or result[2] # content change
2017
or result[3][0] != result[3][1] # versioned status
2018
or result[4][0] != result[4][1] # parent id
2019
or result[5][0] != result[5][1] # name
2020
or result[6][0] != result[6][1] # kind
2021
or result[7][0] != result[7][1] # executable
2023
result = (result[0],
2024
((utf8_decode(result[1][0])[0]),
2025
utf8_decode(result[1][1])[0]),) + result[2:]
2028
if (block_index < len(state._dirblocks) and
2029
osutils.is_inside(current_root,
2030
state._dirblocks[block_index][0])):
2031
current_block = state._dirblocks[block_index]
2033
current_block = None
2036
if current_block and entry_index < len(current_block[1]):
2037
current_entry = current_block[1][entry_index]
2039
current_entry = None
2040
advance_entry = True
2042
if current_dir_info and path_index < len(current_dir_info[1]):
2043
current_path_info = current_dir_info[1][path_index]
2045
current_path_info = None
2047
path_handled = False
2048
while (current_entry is not None or
2049
current_path_info is not None):
2050
if current_entry is None:
2051
# the check for path_handled when the path is adnvaced
2052
# will yield this path if needed.
2054
elif current_path_info is None:
2055
# no path is fine: the per entry code will handle it.
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
2060
if (include_unchanged
2061
or result[2] # content change
2062
or result[3][0] != result[3][1] # versioned status
2063
or result[4][0] != result[4][1] # parent id
2064
or result[5][0] != result[5][1] # name
2065
or result[6][0] != result[6][1] # kind
2066
or result[7][0] != result[7][1] # executable
2068
result = (result[0],
2069
((utf8_decode(result[1][0])[0]),
2070
utf8_decode(result[1][1])[0]),) + result[2:]
2072
elif current_entry[0][1] != current_path_info[1]:
2073
if current_path_info[1] < current_entry[0][1]:
2074
# extra file on disk: pass for now, but only
2075
# increment the path, not the entry
2076
# import pdb; pdb.set_trace()
2077
# print 'unversioned file'
2078
advance_entry = False
2080
# entry referring to file not present on disk.
2081
# advance the entry only, after processing.
2082
for result in _process_entry(current_entry, None):
2083
# this check should probably be outside the loop: one
2084
# 'iterate two trees' api, and then _iter_changes filters
2085
# unchanged pairs. - RBC 20070226
2087
if (include_unchanged
2088
or result[2] # content change
2089
or result[3][0] != result[3][1] # versioned status
2090
or result[4][0] != result[4][1] # parent id
2091
or result[5][0] != result[5][1] # name
2092
or result[6][0] != result[6][1] # kind
2093
or result[7][0] != result[7][1] # executable
2095
result = (result[0],
2096
((utf8_decode(result[1][0])[0]),
2097
utf8_decode(result[1][1])[0]),) + result[2:]
2099
advance_path = False
2101
for result in _process_entry(current_entry, current_path_info):
2102
# this check should probably be outside the loop: one
2103
# 'iterate two trees' api, and then _iter_changes filters
2104
# unchanged pairs. - RBC 20070226
2106
if (include_unchanged
2107
or result[2] # content change
2108
or result[3][0] != result[3][1] # versioned status
2109
or result[4][0] != result[4][1] # parent id
2110
or result[5][0] != result[5][1] # name
2111
or result[6][0] != result[6][1] # kind
2112
or result[7][0] != result[7][1] # executable
2114
result = (result[0],
2115
((utf8_decode(result[1][0])[0]),
2116
utf8_decode(result[1][1])[0]),) + result[2:]
2118
if advance_entry and current_entry is not None:
2120
if entry_index < len(current_block[1]):
2121
current_entry = current_block[1][entry_index]
2123
current_entry = None
2125
advance_entry = True # reset the advance flaga
2126
if advance_path and current_path_info is not None:
2127
if not path_handled:
2128
# unversioned in all regards
2129
if want_unversioned:
2130
new_executable = bool(
2131
stat.S_ISREG(current_path_info[3].st_mode)
2132
and stat.S_IEXEC & current_path_info[3].st_mode)
2133
if want_unversioned:
2134
yield (None, (None, current_path_info[0]),
2138
(None, current_path_info[1]),
2139
(None, current_path_info[2]),
2140
(None, new_executable))
2141
# dont descend into this unversioned path if it is
2143
if current_path_info[2] == 'directory':
2144
del current_dir_info[1][path_index]
2147
if path_index < len(current_dir_info[1]):
2148
current_path_info = current_dir_info[1][path_index]
2150
current_path_info = None
2151
path_handled = False
2153
advance_path = True # reset the advance flagg.
2154
if current_block is not None:
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
if current_dir_info is not None:
2163
current_dir_info = dir_iterator.next()
2164
except StopIteration:
2165
current_dir_info = None
2096
2169
def is_compatible(source, target):
2097
2170
# the target must be a dirstate working tree
2098
if not isinstance(target, DirStateWorkingTree):
2171
if not isinstance(target, WorkingTree4):
2100
# the source must be a revtree or dirstate rev tree.
2173
# the source must be a revtreee or dirstate rev tree.
2101
2174
if not isinstance(source,
2102
2175
(revisiontree.RevisionTree, DirStateRevisionTree)):
2104
2177
# the source revid must be in the target dirstate
2105
if not (source._revision_id == _mod_revision.NULL_REVISION or
2178
if not (source._revision_id == NULL_REVISION or
2106
2179
source._revision_id in target.get_parent_ids()):
2107
# TODO: what about ghosts? it may well need to
2180
# TODO: what about ghosts? it may well need to
2108
2181
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
