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
1630
if not found_versioned:
2081
1631
# 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)
1633
all_versioned = False
1635
if not all_versioned:
1636
raise errors.PathsNotVersionedError(specific_files)
2086
1637
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2087
search_specific_files = osutils.minimum_path_selection(specific_files)
1638
search_specific_files = set()
1639
for path in specific_files:
1640
other_specific_files = specific_files.difference(set([path]))
1641
if not osutils.is_inside_any(other_specific_files, path):
1642
# this is a top level path, we must check it.
1643
search_specific_files.add(path)
1645
# compare source_index and target_index at or under each element of search_specific_files.
1646
# follow the following comparison table. Note that we only want to do diff operations when
1647
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1651
# Source | Target | disk | action
1652
# r | fdlt | | add source to search, add id path move and perform
1653
# | | | diff check on source-target
1654
# r | fdlt | a | dangling file that was present in the basis.
1656
# r | a | | add source to search
1658
# r | r | | this path is present in a non-examined tree, skip.
1659
# r | r | a | this path is present in a non-examined tree, skip.
1660
# a | fdlt | | add new id
1661
# a | fdlt | a | dangling locally added file, skip
1662
# a | a | | not present in either tree, skip
1663
# a | a | a | not present in any tree, skip
1664
# a | r | | not present in either tree at this path, skip as it
1665
# | | | may not be selected by the users list of paths.
1666
# a | r | a | not present in either tree at this path, skip as it
1667
# | | | may not be selected by the users list of paths.
1668
# fdlt | fdlt | | content in both: diff them
1669
# fdlt | fdlt | a | deleted locally, but not unversioned - show as deleted ?
1670
# fdlt | a | | unversioned: output deleted id for now
1671
# fdlt | a | a | unversioned and deleted: output deleted id
1672
# fdlt | r | | relocated in this tree, so add target to search.
1673
# | | | Dont diff, we will see an r,fd; pair when we reach
1674
# | | | this id at the other path.
1675
# fdlt | r | a | relocated in this tree, so add target to search.
1676
# | | | Dont diff, we will see an r,fd; pair when we reach
1677
# | | | this id at the other path.
1679
# for all search_indexs in each path at or under each element of
1680
# search_specific_files, if the detail is relocated: add the id, and add the
1681
# relocated path as one to search if its not searched already. If the
1682
# detail is not relocated, add the id.
1683
searched_specific_files = set()
1684
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1685
# Using a list so that we can access the values and change them in
1686
# nested scope. Each one is [path, file_id, entry]
1687
last_source_parent = [None, None, None]
1688
last_target_parent = [None, None, None]
2089
1690
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()
1692
def _process_entry(entry, path_info):
1693
"""Compare an entry and real disk to generate delta information.
1695
:param path_info: top_relpath, basename, kind, lstat, abspath for
1696
the path of entry. If None, then the path is considered absent.
1697
(Perhaps we should pass in a concrete entry for this ?)
1698
Basename is returned as a utf8 string because we expect this
1699
tuple will be ignored, and don't want to take the time to
1702
# TODO: when a parent has been renamed, dont emit path renames for children,
1703
if source_index is None:
1704
source_details = NULL_PARENT_DETAILS
1706
source_details = entry[1][source_index]
1707
target_details = entry[1][target_index]
1708
target_minikind = target_details[0]
1709
if path_info is not None and target_minikind in 'fdl':
1710
assert target_index == 0
1711
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
1712
stat_value=path_info[3])
1713
# The entry may have been modified by update_entry
1714
target_details = entry[1][target_index]
1715
target_minikind = target_details[0]
1718
source_minikind = source_details[0]
1719
if source_minikind in 'fdltr' and target_minikind in 'fdlt':
1720
# claimed content in both: diff
1721
# r | fdlt | | add source to search, add id path move and perform
1722
# | | | diff check on source-target
1723
# r | fdlt | a | dangling file that was present in the basis.
1725
if source_minikind in 'r':
1726
# add the source to the search path to find any children it
1727
# has. TODO ? : only add if it is a container ?
1728
if not osutils.is_inside_any(searched_specific_files,
1730
search_specific_files.add(source_details[1])
1731
# generate the old path; this is needed for stating later
1733
old_path = source_details[1]
1734
old_dirname, old_basename = os.path.split(old_path)
1735
path = pathjoin(entry[0][0], entry[0][1])
1736
old_entry = state._get_entry(source_index,
1738
# update the source details variable to be the real
1740
source_details = old_entry[1][source_index]
1741
source_minikind = source_details[0]
1743
old_dirname = entry[0][0]
1744
old_basename = entry[0][1]
1745
old_path = path = pathjoin(old_dirname, old_basename)
1746
if path_info is None:
1747
# the file is missing on disk, show as removed.
1748
content_change = True
1752
# source and target are both versioned and disk file is present.
1753
target_kind = path_info[2]
1754
if target_kind == 'directory':
1755
if source_minikind != 'd':
1756
content_change = True
1758
# directories have no fingerprint
1759
content_change = False
1761
elif target_kind == 'file':
1762
if source_minikind != 'f':
1763
content_change = True
1765
# We could check the size, but we already have the
1767
content_change = (link_or_sha1 != source_details[1])
1768
# Target details is updated at update_entry time
1769
if use_filesystem_for_exec:
1770
# We don't need S_ISREG here, because we are sure
1771
# we are dealing with a file.
1772
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
1774
target_exec = target_details[3]
1775
elif target_kind == 'symlink':
1776
if source_minikind != 'l':
1777
content_change = True
1779
content_change = (link_or_sha1 != source_details[1])
1781
elif target_kind == 'tree-reference':
1782
if source_minikind != 't':
1783
content_change = True
1785
content_change = False
1787
raise Exception, "unknown kind %s" % path_info[2]
1788
# parent id is the entry for the path in the target tree
1789
if old_dirname == last_source_parent[0]:
1790
source_parent_id = last_source_parent[1]
1792
source_parent_entry = state._get_entry(source_index,
1793
path_utf8=old_dirname)
1794
source_parent_id = source_parent_entry[0][2]
1795
if source_parent_id == entry[0][2]:
1796
# This is the root, so the parent is None
1797
source_parent_id = None
1799
last_source_parent[0] = old_dirname
1800
last_source_parent[1] = source_parent_id
1801
last_source_parent[2] = source_parent_entry
1803
new_dirname = entry[0][0]
1804
if new_dirname == last_target_parent[0]:
1805
target_parent_id = last_target_parent[1]
1807
# TODO: We don't always need to do the lookup, because the
1808
# parent entry will be the same as the source entry.
1809
target_parent_entry = state._get_entry(target_index,
1810
path_utf8=new_dirname)
1811
target_parent_id = target_parent_entry[0][2]
1812
if target_parent_id == entry[0][2]:
1813
# This is the root, so the parent is None
1814
target_parent_id = None
1816
last_target_parent[0] = new_dirname
1817
last_target_parent[1] = target_parent_id
1818
last_target_parent[2] = target_parent_entry
1820
source_exec = source_details[3]
1821
return ((entry[0][2], (old_path, path), content_change,
1823
(source_parent_id, target_parent_id),
1824
(old_basename, entry[0][1]),
1825
(_minikind_to_kind[source_minikind], target_kind),
1826
(source_exec, target_exec)),)
1827
elif source_minikind in 'a' and target_minikind in 'fdlt':
1828
# looks like a new file
1829
if path_info is not None:
1830
path = pathjoin(entry[0][0], entry[0][1])
1831
# parent id is the entry for the path in the target tree
1832
# TODO: these are the same for an entire directory: cache em.
1833
parent_id = state._get_entry(target_index,
1834
path_utf8=entry[0][0])[0][2]
1835
if parent_id == entry[0][2]:
1837
if use_filesystem_for_exec:
1838
# We need S_ISREG here, because we aren't sure if this
1841
stat.S_ISREG(path_info[3].st_mode)
1842
and stat.S_IEXEC & path_info[3].st_mode)
1844
target_exec = target_details[3]
1845
return ((entry[0][2], (None, path), True,
1848
(None, entry[0][1]),
1849
(None, path_info[2]),
1850
(None, target_exec)),)
1852
# but its not on disk: we deliberately treat this as just
1853
# never-present. (Why ?! - RBC 20070224)
1855
elif source_minikind in 'fdlt' and target_minikind in 'a':
1856
# unversioned, possibly, or possibly not deleted: we dont care.
1857
# if its still on disk, *and* theres no other entry at this
1858
# path [we dont know this in this routine at the moment -
1859
# perhaps we should change this - then it would be an unknown.
1860
old_path = pathjoin(entry[0][0], entry[0][1])
1861
# parent id is the entry for the path in the target tree
1862
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
1863
if parent_id == entry[0][2]:
1865
return ((entry[0][2], (old_path, None), True,
1868
(entry[0][1], None),
1869
(_minikind_to_kind[source_minikind], None),
1870
(source_details[3], None)),)
1871
elif source_minikind in 'fdlt' and target_minikind in 'r':
1872
# a rename; could be a true rename, or a rename inherited from
1873
# a renamed parent. TODO: handle this efficiently. Its not
1874
# common case to rename dirs though, so a correct but slow
1875
# implementation will do.
1876
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
1877
search_specific_files.add(target_details[1])
1878
elif source_minikind in 'r' and target_minikind in 'r':
1879
# neither of the selected trees contain this file,
1880
# so skip over it. This is not currently directly tested, but
1881
# is indirectly via test_too_much.TestCommands.test_conflicts.
1884
print "*******", source_minikind, target_minikind
1885
import pdb;pdb.set_trace()
1887
while search_specific_files:
1888
# TODO: the pending list should be lexically sorted?
1889
current_root = search_specific_files.pop()
1890
searched_specific_files.add(current_root)
1891
# process the entries for this containing directory: the rest will be
1892
# found by their parents recursively.
1893
root_entries = _entries_for_path(current_root)
1894
root_abspath = self.target.abspath(current_root)
1896
root_stat = os.lstat(root_abspath)
1898
if e.errno == errno.ENOENT:
1899
# the path does not exist: let _process_entry know that.
1900
root_dir_info = None
1902
# some other random error: hand it up.
1905
root_dir_info = ('', current_root,
1906
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
1908
if not root_entries and not root_dir_info:
1909
# this specified path is not present at all, skip it.
1911
path_handled = False
1912
for entry in root_entries:
1913
for result in _process_entry(entry, root_dir_info):
1914
# this check should probably be outside the loop: one
1915
# 'iterate two trees' api, and then _iter_changes filters
1916
# unchanged pairs. - RBC 20070226
1918
if (include_unchanged
1919
or result[2] # content change
1920
or result[3][0] != result[3][1] # versioned status
1921
or result[4][0] != result[4][1] # parent id
1922
or result[5][0] != result[5][1] # name
1923
or result[6][0] != result[6][1] # kind
1924
or result[7][0] != result[7][1] # executable
1926
result = (result[0],
1927
((utf8_decode(result[1][0])[0]),
1928
utf8_decode(result[1][1])[0]),) + result[2:]
1930
if want_unversioned and not path_handled:
1931
new_executable = bool(
1932
stat.S_ISREG(root_dir_info[3].st_mode)
1933
and stat.S_IEXEC & root_dir_info[3].st_mode)
1934
yield (None, (None, current_root), True, (False, False),
1936
(None, splitpath(current_root)[-1]),
1937
(None, root_dir_info[2]), (None, new_executable))
1938
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
1939
initial_key = (current_root, '', '')
1940
block_index, _ = state._find_block_index_from_key(initial_key)
1941
if block_index == 0:
1942
# we have processed the total root already, but because the
1943
# initial key matched it we should skip it here.
1946
current_dir_info = dir_iterator.next()
1948
if e.errno in (errno.ENOENT, errno.ENOTDIR):
1949
# there may be directories in the inventory even though
1950
# this path is not a file on disk: so mark it as end of
1952
current_dir_info = None
1956
if current_dir_info[0][0] == '':
1957
# remove .bzr from iteration
1958
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
1959
assert current_dir_info[1][bzr_index][0] == '.bzr'
1960
del current_dir_info[1][bzr_index]
1961
# walk until both the directory listing and the versioned metadata
1962
# are exhausted. TODO: reevaluate this, perhaps we should stop when
1963
# the versioned data runs out.
1964
if (block_index < len(state._dirblocks) and
1965
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
1966
current_block = state._dirblocks[block_index]
1968
current_block = None
1969
while (current_dir_info is not None or
1970
current_block is not None):
1971
if (current_dir_info and current_block
1972
and current_dir_info[0][0] != current_block[0]):
1973
if current_dir_info[0][0] < current_block[0] :
1974
# import pdb; pdb.set_trace()
1975
# print 'unversioned dir'
1976
# filesystem data refers to paths not covered by the dirblock.
1977
# this has two possibilities:
1978
# A) it is versioned but empty, so there is no block for it
1979
# B) it is not versioned.
1980
# in either case it was processed by the containing directories walk:
1981
# if it is root/foo, when we walked root we emitted it,
1982
# or if we ere given root/foo to walk specifically, we
1983
# emitted it when checking the walk-root entries
1984
# advance the iterator and loop - we dont need to emit it.
1986
current_dir_info = dir_iterator.next()
1987
except StopIteration:
1988
current_dir_info = None
1990
# We have a dirblock entry for this location, but there
1991
# is no filesystem path for this. This is most likely
1992
# because a directory was removed from the disk.
1993
# We don't have to report the missing directory,
1994
# because that should have already been handled, but we
1995
# need to handle all of the files that are contained
1997
for current_entry in current_block[1]:
1998
# entry referring to file not present on disk.
1999
# advance the entry only, after processing.
2000
for result in _process_entry(current_entry, None):
2001
# this check should probably be outside the loop: one
2002
# 'iterate two trees' api, and then _iter_changes filters
2003
# unchanged pairs. - RBC 20070226
2004
if (include_unchanged
2005
or result[2] # content change
2006
or result[3][0] != result[3][1] # versioned status
2007
or result[4][0] != result[4][1] # parent id
2008
or result[5][0] != result[5][1] # name
2009
or result[6][0] != result[6][1] # kind
2010
or result[7][0] != result[7][1] # executable
2012
result = (result[0],
2013
((utf8_decode(result[1][0])[0]),
2014
utf8_decode(result[1][1])[0]),) + result[2:]
2017
if (block_index < len(state._dirblocks) and
2018
osutils.is_inside(current_root,
2019
state._dirblocks[block_index][0])):
2020
current_block = state._dirblocks[block_index]
2022
current_block = None
2025
if current_block and entry_index < len(current_block[1]):
2026
current_entry = current_block[1][entry_index]
2028
current_entry = None
2029
advance_entry = True
2031
if current_dir_info and path_index < len(current_dir_info[1]):
2032
current_path_info = current_dir_info[1][path_index]
2034
current_path_info = None
2036
path_handled = False
2037
while (current_entry is not None or
2038
current_path_info is not None):
2039
if current_entry is None:
2040
# the check for path_handled when the path is adnvaced
2041
# will yield this path if needed.
2043
elif current_path_info is None:
2044
# no path is fine: the per entry code will handle it.
2045
for result in _process_entry(current_entry, current_path_info):
2046
# this check should probably be outside the loop: one
2047
# 'iterate two trees' api, and then _iter_changes filters
2048
# unchanged pairs. - RBC 20070226
2049
if (include_unchanged
2050
or result[2] # content change
2051
or result[3][0] != result[3][1] # versioned status
2052
or result[4][0] != result[4][1] # parent id
2053
or result[5][0] != result[5][1] # name
2054
or result[6][0] != result[6][1] # kind
2055
or result[7][0] != result[7][1] # executable
2057
result = (result[0],
2058
((utf8_decode(result[1][0])[0]),
2059
utf8_decode(result[1][1])[0]),) + result[2:]
2061
elif current_entry[0][1] != current_path_info[1]:
2062
if current_path_info[1] < current_entry[0][1]:
2063
# extra file on disk: pass for now, but only
2064
# increment the path, not the entry
2065
# import pdb; pdb.set_trace()
2066
# print 'unversioned file'
2067
advance_entry = False
2069
# entry referring to file not present on disk.
2070
# advance the entry only, after processing.
2071
for result in _process_entry(current_entry, None):
2072
# this check should probably be outside the loop: one
2073
# 'iterate two trees' api, and then _iter_changes filters
2074
# unchanged pairs. - RBC 20070226
2076
if (include_unchanged
2077
or result[2] # content change
2078
or result[3][0] != result[3][1] # versioned status
2079
or result[4][0] != result[4][1] # parent id
2080
or result[5][0] != result[5][1] # name
2081
or result[6][0] != result[6][1] # kind
2082
or result[7][0] != result[7][1] # executable
2084
result = (result[0],
2085
((utf8_decode(result[1][0])[0]),
2086
utf8_decode(result[1][1])[0]),) + result[2:]
2088
advance_path = False
2090
for result in _process_entry(current_entry, current_path_info):
2091
# this check should probably be outside the loop: one
2092
# 'iterate two trees' api, and then _iter_changes filters
2093
# unchanged pairs. - RBC 20070226
2095
if (include_unchanged
2096
or result[2] # content change
2097
or result[3][0] != result[3][1] # versioned status
2098
or result[4][0] != result[4][1] # parent id
2099
or result[5][0] != result[5][1] # name
2100
or result[6][0] != result[6][1] # kind
2101
or result[7][0] != result[7][1] # executable
2103
result = (result[0],
2104
((utf8_decode(result[1][0])[0]),
2105
utf8_decode(result[1][1])[0]),) + result[2:]
2107
if advance_entry and current_entry is not None:
2109
if entry_index < len(current_block[1]):
2110
current_entry = current_block[1][entry_index]
2112
current_entry = None
2114
advance_entry = True # reset the advance flaga
2115
if advance_path and current_path_info is not None:
2116
if not path_handled:
2117
# unversioned in all regards
2118
if want_unversioned:
2119
new_executable = bool(
2120
stat.S_ISREG(current_path_info[3].st_mode)
2121
and stat.S_IEXEC & current_path_info[3].st_mode)
2122
if want_unversioned:
2123
yield (None, (None, current_path_info[0]),
2127
(None, current_path_info[1]),
2128
(None, current_path_info[2]),
2129
(None, new_executable))
2130
# dont descend into this unversioned path if it is
2132
if current_path_info[2] == 'directory':
2133
del current_dir_info[1][path_index]
2136
if path_index < len(current_dir_info[1]):
2137
current_path_info = current_dir_info[1][path_index]
2139
current_path_info = None
2140
path_handled = False
2142
advance_path = True # reset the advance flagg.
2143
if current_block is not None:
2145
if (block_index < len(state._dirblocks) and
2146
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2147
current_block = state._dirblocks[block_index]
2149
current_block = None
2150
if current_dir_info is not None:
2152
current_dir_info = dir_iterator.next()
2153
except StopIteration:
2154
current_dir_info = None
2096
2158
def is_compatible(source, target):
2097
2159
# the target must be a dirstate working tree
2098
if not isinstance(target, DirStateWorkingTree):
2160
if not isinstance(target, WorkingTree4):
2100
# the source must be a revtree or dirstate rev tree.
2162
# the source must be a revtreee or dirstate rev tree.
2101
2163
if not isinstance(source,
2102
2164
(revisiontree.RevisionTree, DirStateRevisionTree)):
2104
2166
# the source revid must be in the target dirstate
2105
if not (source._revision_id == _mod_revision.NULL_REVISION or
2167
if not (source._revision_id == NULL_REVISION or
2106
2168
source._revision_id in target.get_parent_ids()):
2107
# TODO: what about ghosts? it may well need to
2169
# TODO: what about ghosts? it may well need to
2108
2170
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
