1238
1125
self._inventory.remove_recursive_id(file_id)
1240
1127
@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
1128
def _write_inventory(self, inv):
1265
1129
"""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)
1130
assert not self._dirty, "attempting to write an inventory when the dirstate is dirty will cause data loss"
1131
self.current_dirstate().set_state_from_inventory(inv)
1132
self._make_dirty(reset_inventory=False)
1133
if self._inventory is not None:
1280
1134
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):
1138
class WorkingTreeFormat4(WorkingTreeFormat3):
1139
"""The first consolidated dirstate working tree format.
1142
- exists within a metadir controlling .bzr
1143
- includes an explicit version marker for the workingtree control
1144
files, separate from the BzrDir format
1145
- modifies the hash cache format
1146
- is new in bzr TODO FIXME SETBEFOREMERGE
1147
- uses a LockDir to guard access to it.
1150
supports_tree_reference = True
1152
def get_format_string(self):
1153
"""See WorkingTreeFormat.get_format_string()."""
1154
return "Bazaar Working Tree format 4\n"
1156
def get_format_description(self):
1157
"""See WorkingTreeFormat.get_format_description()."""
1158
return "Working tree format 4"
1160
def initialize(self, a_bzrdir, revision_id=None):
1377
1161
"""See WorkingTreeFormat.initialize().
1379
1163
:param revision_id: allows creating a working tree at a different
1380
1164
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.
1166
These trees get an initial random root id.
1168
revision_id = osutils.safe_revision_id(revision_id)
1391
1169
if not isinstance(a_bzrdir.transport, LocalTransport):
1392
1170
raise errors.NotLocalUrl(a_bzrdir.transport.base)
1393
1171
transport = a_bzrdir.get_workingtree_transport(self)
1394
1172
control_files = self._open_control_files(a_bzrdir)
1395
1173
control_files.create_lock()
1396
1174
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()
1175
control_files.put_utf8('format', self.get_format_string())
1176
branch = a_bzrdir.open_branch()
1403
1177
if revision_id is None:
1404
1178
revision_id = branch.last_revision()
1405
1179
local_path = transport.local_abspath('dirstate')
1406
1180
# write out new dirstate (must exist when we create the tree)
1407
1181
state = dirstate.DirState.initialize(local_path)
1410
wt = self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
1183
wt = WorkingTree4(a_bzrdir.root_transport.local_abspath('.'),
1413
1186
_bzrdir=a_bzrdir,
1414
1187
_control_files=control_files)
1416
1189
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)
1192
if revision_id in (None, NULL_REVISION):
1193
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)]
1195
wt.current_dirstate()._validate()
1196
wt.set_last_revision(revision_id)
1198
basis = wt.basis_tree()
1440
1199
basis.lock_read()
1442
wt.set_parent_trees(parents_list, allow_leftmost_as_ghost=True)
1200
# if the basis has a root id we have to use that; otherwise we use
1202
basis_root_id = basis.get_root_id()
1203
if basis_root_id is not None:
1204
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)
1206
transform.build_tree(basis, wt)
1466
1209
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
1213
def _open(self, a_bzrdir, control_files):
1480
1214
"""Open the tree itself.
1482
1216
:param a_bzrdir: the dir for the tree.
1483
1217
:param control_files: the control files for the tree.
1485
return self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
1219
return WorkingTree4(a_bzrdir.root_transport.local_abspath('.'),
1486
1220
branch=a_bzrdir.open_branch(),
1488
1222
_bzrdir=a_bzrdir,
1489
1223
_control_files=control_files)
1491
1225
def __get_matchingbzrdir(self):
1492
return self._get_matchingbzrdir()
1494
def _get_matchingbzrdir(self):
1495
"""Overrideable method to get a bzrdir for testing."""
1496
1226
# please test against something that will let us do tree references
1497
1227
return bzrdir.format_registry.make_bzrdir(
1498
1228
'dirstate-with-subtree')
2080
1654
if not found_versioned:
2081
1655
# 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)
1657
all_versioned = False
1659
if not all_versioned:
1660
raise errors.PathsNotVersionedError(specific_files)
2086
1661
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2087
search_specific_files = osutils.minimum_path_selection(specific_files)
1662
search_specific_files = set()
1663
for path in specific_files:
1664
other_specific_files = specific_files.difference(set([path]))
1665
if not osutils.is_inside_any(other_specific_files, path):
1666
# this is a top level path, we must check it.
1667
search_specific_files.add(path)
1669
# compare source_index and target_index at or under each element of search_specific_files.
1670
# follow the following comparison table. Note that we only want to do diff operations when
1671
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1675
# Source | Target | disk | action
1676
# r | fdlt | | add source to search, add id path move and perform
1677
# | | | diff check on source-target
1678
# r | fdlt | a | dangling file that was present in the basis.
1680
# r | a | | add source to search
1682
# r | r | | this path is present in a non-examined tree, skip.
1683
# r | r | a | this path is present in a non-examined tree, skip.
1684
# a | fdlt | | add new id
1685
# a | fdlt | a | dangling locally added file, skip
1686
# a | a | | not present in either tree, skip
1687
# a | a | a | not present in any tree, skip
1688
# a | r | | not present in either tree at this path, skip as it
1689
# | | | may not be selected by the users list of paths.
1690
# a | r | a | not present in either tree at this path, skip as it
1691
# | | | may not be selected by the users list of paths.
1692
# fdlt | fdlt | | content in both: diff them
1693
# fdlt | fdlt | a | deleted locally, but not unversioned - show as deleted ?
1694
# fdlt | a | | unversioned: output deleted id for now
1695
# fdlt | a | a | unversioned and deleted: output deleted id
1696
# fdlt | r | | relocated in this tree, so add target to search.
1697
# | | | Dont diff, we will see an r,fd; pair when we reach
1698
# | | | this id at the other path.
1699
# fdlt | r | a | relocated in this tree, so add target to search.
1700
# | | | Dont diff, we will see an r,fd; pair when we reach
1701
# | | | this id at the other path.
1703
# for all search_indexs in each path at or under each element of
1704
# search_specific_files, if the detail is relocated: add the id, and add the
1705
# relocated path as one to search if its not searched already. If the
1706
# detail is not relocated, add the id.
1707
searched_specific_files = set()
1708
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1709
# Using a list so that we can access the values and change them in
1710
# nested scope. Each one is [path, file_id, entry]
1711
last_source_parent = [None, None, None]
1712
last_target_parent = [None, None, None]
2089
1714
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()
1716
def _process_entry(entry, path_info):
1717
"""Compare an entry and real disk to generate delta information.
1719
:param path_info: top_relpath, basename, kind, lstat, abspath for
1720
the path of entry. If None, then the path is considered absent.
1721
(Perhaps we should pass in a concrete entry for this ?)
1722
Basename is returned as a utf8 string because we expect this
1723
tuple will be ignored, and don't want to take the time to
1726
# TODO: when a parent has been renamed, dont emit path renames for children,
1727
## if path_info[1] == 'sub':
1728
## import pdb;pdb.set_trace()
1729
if source_index is None:
1730
source_details = NULL_PARENT_DETAILS
1732
source_details = entry[1][source_index]
1733
target_details = entry[1][target_index]
1734
target_minikind = target_details[0]
1735
if path_info is not None and target_minikind in 'fdlt':
1736
assert target_index == 0
1737
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
1738
stat_value=path_info[3])
1739
# The entry may have been modified by update_entry
1740
target_details = entry[1][target_index]
1741
target_minikind = target_details[0]
1744
source_minikind = source_details[0]
1745
if source_minikind in 'fdltr' and target_minikind in 'fdlt':
1746
# claimed content in both: diff
1747
# r | fdlt | | add source to search, add id path move and perform
1748
# | | | diff check on source-target
1749
# r | fdlt | a | dangling file that was present in the basis.
1751
if source_minikind in 'r':
1752
# add the source to the search path to find any children it
1753
# has. TODO ? : only add if it is a container ?
1754
if not osutils.is_inside_any(searched_specific_files,
1756
search_specific_files.add(source_details[1])
1757
# generate the old path; this is needed for stating later
1759
old_path = source_details[1]
1760
old_dirname, old_basename = os.path.split(old_path)
1761
path = pathjoin(entry[0][0], entry[0][1])
1762
old_entry = state._get_entry(source_index,
1764
# update the source details variable to be the real
1766
source_details = old_entry[1][source_index]
1767
source_minikind = source_details[0]
1769
old_dirname = entry[0][0]
1770
old_basename = entry[0][1]
1771
old_path = path = pathjoin(old_dirname, old_basename)
1772
if path_info is None:
1773
# the file is missing on disk, show as removed.
1774
content_change = True
1778
# source and target are both versioned and disk file is present.
1779
target_kind = path_info[2]
1780
if target_kind == 'directory':
1781
if source_minikind != 'd':
1782
content_change = True
1784
# directories have no fingerprint
1785
content_change = False
1787
elif target_kind == 'file':
1788
if source_minikind != 'f':
1789
content_change = True
1791
# We could check the size, but we already have the
1793
content_change = (link_or_sha1 != source_details[1])
1794
# Target details is updated at update_entry time
1795
if use_filesystem_for_exec:
1796
# We don't need S_ISREG here, because we are sure
1797
# we are dealing with a file.
1798
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
1800
target_exec = target_details[3]
1801
elif target_kind == 'symlink':
1802
if source_minikind != 'l':
1803
content_change = True
1805
content_change = (link_or_sha1 != source_details[1])
1807
elif target_kind == 'tree-reference':
1808
if source_minikind != 't':
1809
content_change = True
1811
content_change = False
1814
raise Exception, "unknown kind %s" % path_info[2]
1815
# parent id is the entry for the path in the target tree
1816
if old_dirname == last_source_parent[0]:
1817
source_parent_id = last_source_parent[1]
1819
source_parent_entry = state._get_entry(source_index,
1820
path_utf8=old_dirname)
1821
source_parent_id = source_parent_entry[0][2]
1822
if source_parent_id == entry[0][2]:
1823
# This is the root, so the parent is None
1824
source_parent_id = None
1826
last_source_parent[0] = old_dirname
1827
last_source_parent[1] = source_parent_id
1828
last_source_parent[2] = source_parent_entry
1830
new_dirname = entry[0][0]
1831
if new_dirname == last_target_parent[0]:
1832
target_parent_id = last_target_parent[1]
1834
# TODO: We don't always need to do the lookup, because the
1835
# parent entry will be the same as the source entry.
1836
target_parent_entry = state._get_entry(target_index,
1837
path_utf8=new_dirname)
1838
target_parent_id = target_parent_entry[0][2]
1839
if target_parent_id == entry[0][2]:
1840
# This is the root, so the parent is None
1841
target_parent_id = None
1843
last_target_parent[0] = new_dirname
1844
last_target_parent[1] = target_parent_id
1845
last_target_parent[2] = target_parent_entry
1847
source_exec = source_details[3]
1848
return ((entry[0][2], (old_path, path), content_change,
1850
(source_parent_id, target_parent_id),
1851
(old_basename, entry[0][1]),
1852
(_minikind_to_kind[source_minikind], target_kind),
1853
(source_exec, target_exec)),)
1854
elif source_minikind in 'a' and target_minikind in 'fdlt':
1855
# looks like a new file
1856
if path_info is not None:
1857
path = pathjoin(entry[0][0], entry[0][1])
1858
# parent id is the entry for the path in the target tree
1859
# TODO: these are the same for an entire directory: cache em.
1860
parent_id = state._get_entry(target_index,
1861
path_utf8=entry[0][0])[0][2]
1862
if parent_id == entry[0][2]:
1864
if use_filesystem_for_exec:
1865
# We need S_ISREG here, because we aren't sure if this
1868
stat.S_ISREG(path_info[3].st_mode)
1869
and stat.S_IEXEC & path_info[3].st_mode)
1871
target_exec = target_details[3]
1872
return ((entry[0][2], (None, path), True,
1875
(None, entry[0][1]),
1876
(None, path_info[2]),
1877
(None, target_exec)),)
1879
# but its not on disk: we deliberately treat this as just
1880
# never-present. (Why ?! - RBC 20070224)
1882
elif source_minikind in 'fdlt' and target_minikind in 'a':
1883
# unversioned, possibly, or possibly not deleted: we dont care.
1884
# if its still on disk, *and* theres no other entry at this
1885
# path [we dont know this in this routine at the moment -
1886
# perhaps we should change this - then it would be an unknown.
1887
old_path = pathjoin(entry[0][0], entry[0][1])
1888
# parent id is the entry for the path in the target tree
1889
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
1890
if parent_id == entry[0][2]:
1892
return ((entry[0][2], (old_path, None), True,
1895
(entry[0][1], None),
1896
(_minikind_to_kind[source_minikind], None),
1897
(source_details[3], None)),)
1898
elif source_minikind in 'fdlt' and target_minikind in 'r':
1899
# a rename; could be a true rename, or a rename inherited from
1900
# a renamed parent. TODO: handle this efficiently. Its not
1901
# common case to rename dirs though, so a correct but slow
1902
# implementation will do.
1903
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
1904
search_specific_files.add(target_details[1])
1905
elif source_minikind in 'r' and target_minikind in 'r':
1906
# neither of the selected trees contain this file,
1907
# so skip over it. This is not currently directly tested, but
1908
# is indirectly via test_too_much.TestCommands.test_conflicts.
1911
raise AssertionError("don't know how to compare "
1912
"source_minikind=%r, target_minikind=%r"
1913
% (source_minikind, target_minikind))
1914
## import pdb;pdb.set_trace()
1916
while search_specific_files:
1917
# TODO: the pending list should be lexically sorted?
1918
current_root = search_specific_files.pop()
1919
searched_specific_files.add(current_root)
1920
# process the entries for this containing directory: the rest will be
1921
# found by their parents recursively.
1922
root_entries = _entries_for_path(current_root)
1923
root_abspath = self.target.abspath(current_root)
1925
root_stat = os.lstat(root_abspath)
1927
if e.errno == errno.ENOENT:
1928
# the path does not exist: let _process_entry know that.
1929
root_dir_info = None
1931
# some other random error: hand it up.
1934
root_dir_info = ('', current_root,
1935
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
1937
if root_dir_info[2] == 'directory':
1938
if self.target._directory_is_tree_reference(current_root):
1939
root_dir_info = root_dir_info[:2] + \
1940
('tree-reference',) + root_dir_info[3:]
1942
if not root_entries and not root_dir_info:
1943
# this specified path is not present at all, skip it.
1945
path_handled = False
1946
for entry in root_entries:
1947
for result in _process_entry(entry, root_dir_info):
1948
# this check should probably be outside the loop: one
1949
# 'iterate two trees' api, and then _iter_changes filters
1950
# unchanged pairs. - RBC 20070226
1952
if (include_unchanged
1953
or result[2] # content change
1954
or result[3][0] != result[3][1] # versioned status
1955
or result[4][0] != result[4][1] # parent id
1956
or result[5][0] != result[5][1] # name
1957
or result[6][0] != result[6][1] # kind
1958
or result[7][0] != result[7][1] # executable
1960
result = (result[0],
1961
((utf8_decode(result[1][0])[0]),
1962
utf8_decode(result[1][1])[0]),) + result[2:]
1964
if want_unversioned and not path_handled:
1965
new_executable = bool(
1966
stat.S_ISREG(root_dir_info[3].st_mode)
1967
and stat.S_IEXEC & root_dir_info[3].st_mode)
1968
yield (None, (None, current_root), True, (False, False),
1970
(None, splitpath(current_root)[-1]),
1971
(None, root_dir_info[2]), (None, new_executable))
1972
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
1973
initial_key = (current_root, '', '')
1974
block_index, _ = state._find_block_index_from_key(initial_key)
1975
if block_index == 0:
1976
# we have processed the total root already, but because the
1977
# initial key matched it we should skip it here.
1980
current_dir_info = dir_iterator.next()
1982
if e.errno in (errno.ENOENT, errno.ENOTDIR):
1983
# there may be directories in the inventory even though
1984
# this path is not a file on disk: so mark it as end of
1986
current_dir_info = None
1990
if current_dir_info[0][0] == '':
1991
# remove .bzr from iteration
1992
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
1993
assert current_dir_info[1][bzr_index][0] == '.bzr'
1994
del current_dir_info[1][bzr_index]
1995
# walk until both the directory listing and the versioned metadata
1996
# are exhausted. TODO: reevaluate this, perhaps we should stop when
1997
# the versioned data runs out.
1998
if (block_index < len(state._dirblocks) and
1999
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2000
current_block = state._dirblocks[block_index]
2002
current_block = None
2003
while (current_dir_info is not None or
2004
current_block is not None):
2005
if (current_dir_info and current_block
2006
and current_dir_info[0][0] != current_block[0]):
2007
if current_dir_info[0][0] < current_block[0] :
2008
# filesystem data refers to paths not covered by the dirblock.
2009
# this has two possibilities:
2010
# A) it is versioned but empty, so there is no block for it
2011
# B) it is not versioned.
2012
# in either case it was processed by the containing directories walk:
2013
# if it is root/foo, when we walked root we emitted it,
2014
# or if we ere given root/foo to walk specifically, we
2015
# emitted it when checking the walk-root entries
2016
# advance the iterator and loop - we dont need to emit it.
2018
current_dir_info = dir_iterator.next()
2019
except StopIteration:
2020
current_dir_info = None
2022
# We have a dirblock entry for this location, but there
2023
# is no filesystem path for this. This is most likely
2024
# because a directory was removed from the disk.
2025
# We don't have to report the missing directory,
2026
# because that should have already been handled, but we
2027
# need to handle all of the files that are contained
2029
for current_entry in current_block[1]:
2030
# entry referring to file not present on disk.
2031
# advance the entry only, after processing.
2032
for result in _process_entry(current_entry, None):
2033
# this check should probably be outside the loop: one
2034
# 'iterate two trees' api, and then _iter_changes filters
2035
# unchanged pairs. - RBC 20070226
2036
if (include_unchanged
2037
or result[2] # content change
2038
or result[3][0] != result[3][1] # versioned status
2039
or result[4][0] != result[4][1] # parent id
2040
or result[5][0] != result[5][1] # name
2041
or result[6][0] != result[6][1] # kind
2042
or result[7][0] != result[7][1] # executable
2044
result = (result[0],
2045
((utf8_decode(result[1][0])[0]),
2046
utf8_decode(result[1][1])[0]),) + result[2:]
2049
if (block_index < len(state._dirblocks) and
2050
osutils.is_inside(current_root,
2051
state._dirblocks[block_index][0])):
2052
current_block = state._dirblocks[block_index]
2054
current_block = None
2057
if current_block and entry_index < len(current_block[1]):
2058
current_entry = current_block[1][entry_index]
2060
current_entry = None
2061
advance_entry = True
2063
if current_dir_info and path_index < len(current_dir_info[1]):
2064
current_path_info = current_dir_info[1][path_index]
2065
if current_path_info[2] == 'directory':
2066
if self.target._directory_is_tree_reference(
2067
current_path_info[0]):
2068
current_path_info = current_path_info[:2] + \
2069
('tree-reference',) + current_path_info[3:]
2071
current_path_info = None
2073
path_handled = False
2074
while (current_entry is not None or
2075
current_path_info is not None):
2076
if current_entry is None:
2077
# the check for path_handled when the path is adnvaced
2078
# will yield this path if needed.
2080
elif current_path_info is None:
2081
# no path is fine: the per entry code will handle it.
2082
for result in _process_entry(current_entry, current_path_info):
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
2086
if (include_unchanged
2087
or result[2] # content change
2088
or result[3][0] != result[3][1] # versioned status
2089
or result[4][0] != result[4][1] # parent id
2090
or result[5][0] != result[5][1] # name
2091
or result[6][0] != result[6][1] # kind
2092
or result[7][0] != result[7][1] # executable
2094
result = (result[0],
2095
((utf8_decode(result[1][0])[0]),
2096
utf8_decode(result[1][1])[0]),) + result[2:]
2098
elif current_entry[0][1] != current_path_info[1]:
2099
if current_path_info[1] < current_entry[0][1]:
2100
# extra file on disk: pass for now, but only
2101
# increment the path, not the entry
2102
# import pdb; pdb.set_trace()
2103
# print 'unversioned file'
2104
advance_entry = False
2106
# entry referring to file not present on disk.
2107
# advance the entry only, after processing.
2108
for result in _process_entry(current_entry, None):
2109
# this check should probably be outside the loop: one
2110
# 'iterate two trees' api, and then _iter_changes filters
2111
# unchanged pairs. - RBC 20070226
2113
if (include_unchanged
2114
or result[2] # content change
2115
or result[3][0] != result[3][1] # versioned status
2116
or result[4][0] != result[4][1] # parent id
2117
or result[5][0] != result[5][1] # name
2118
or result[6][0] != result[6][1] # kind
2119
or result[7][0] != result[7][1] # executable
2121
result = (result[0],
2122
((utf8_decode(result[1][0])[0]),
2123
utf8_decode(result[1][1])[0]),) + result[2:]
2125
advance_path = False
2127
for result in _process_entry(current_entry, current_path_info):
2128
# this check should probably be outside the loop: one
2129
# 'iterate two trees' api, and then _iter_changes filters
2130
# unchanged pairs. - RBC 20070226
2132
if (include_unchanged
2133
or result[2] # content change
2134
or result[3][0] != result[3][1] # versioned status
2135
or result[4][0] != result[4][1] # parent id
2136
or result[5][0] != result[5][1] # name
2137
or result[6][0] != result[6][1] # kind
2138
or result[7][0] != result[7][1] # executable
2140
result = (result[0],
2141
((utf8_decode(result[1][0])[0]),
2142
utf8_decode(result[1][1])[0]),) + result[2:]
2144
if advance_entry and current_entry is not None:
2146
if entry_index < len(current_block[1]):
2147
current_entry = current_block[1][entry_index]
2149
current_entry = None
2151
advance_entry = True # reset the advance flaga
2152
if advance_path and current_path_info is not None:
2153
if not path_handled:
2154
# unversioned in all regards
2155
if want_unversioned:
2156
new_executable = bool(
2157
stat.S_ISREG(current_path_info[3].st_mode)
2158
and stat.S_IEXEC & current_path_info[3].st_mode)
2159
if want_unversioned:
2160
yield (None, (None, current_path_info[0]),
2164
(None, current_path_info[1]),
2165
(None, current_path_info[2]),
2166
(None, new_executable))
2167
# dont descend into this unversioned path if it is
2169
if current_path_info[2] in (
2170
'directory', 'tree-referene'):
2171
del current_dir_info[1][path_index]
2174
if path_index < len(current_dir_info[1]):
2175
current_path_info = current_dir_info[1][path_index]
2176
if current_path_info[2] == 'directory':
2177
if self.target._directory_is_tree_reference(
2178
current_path_info[0]):
2179
current_path_info = current_path_info[:2] + \
2180
('tree-reference',) + current_path_info[3:]
2182
current_path_info = None
2183
path_handled = False
2185
advance_path = True # reset the advance flagg.
2186
if current_block is not None:
2188
if (block_index < len(state._dirblocks) and
2189
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2190
current_block = state._dirblocks[block_index]
2192
current_block = None
2193
if current_dir_info is not None:
2195
current_dir_info = dir_iterator.next()
2196
except StopIteration:
2197
current_dir_info = None
2096
2201
def is_compatible(source, target):
2097
2202
# the target must be a dirstate working tree
2098
if not isinstance(target, DirStateWorkingTree):
2203
if not isinstance(target, WorkingTree4):
2100
# the source must be a revtree or dirstate rev tree.
2205
# the source must be a revtreee or dirstate rev tree.
2101
2206
if not isinstance(source,
2102
2207
(revisiontree.RevisionTree, DirStateRevisionTree)):
2104
2209
# the source revid must be in the target dirstate
2105
if not (source._revision_id == _mod_revision.NULL_REVISION or
2210
if not (source._revision_id == NULL_REVISION or
2106
2211
source._revision_id in target.get_parent_ids()):
2107
# TODO: what about ghosts? it may well need to
2212
# TODO: what about ghosts? it may well need to
2108
2213
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
