1238
1141
self._inventory.remove_recursive_id(file_id)
1240
1143
@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
1144
def _write_inventory(self, inv):
1265
1145
"""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)
1146
assert not self._dirty, "attempting to write an inventory when the dirstate is dirty will cause data loss"
1147
self.current_dirstate().set_state_from_inventory(inv)
1148
self._make_dirty(reset_inventory=False)
1149
if self._inventory is not None:
1280
1150
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):
1154
class WorkingTreeFormat4(WorkingTreeFormat3):
1155
"""The first consolidated dirstate working tree format.
1158
- exists within a metadir controlling .bzr
1159
- includes an explicit version marker for the workingtree control
1160
files, separate from the BzrDir format
1161
- modifies the hash cache format
1162
- is new in bzr TODO FIXME SETBEFOREMERGE
1163
- uses a LockDir to guard access to it.
1166
supports_tree_reference = True
1168
def get_format_string(self):
1169
"""See WorkingTreeFormat.get_format_string()."""
1170
return "Bazaar Working Tree format 4\n"
1172
def get_format_description(self):
1173
"""See WorkingTreeFormat.get_format_description()."""
1174
return "Working tree format 4"
1176
def initialize(self, a_bzrdir, revision_id=None):
1377
1177
"""See WorkingTreeFormat.initialize().
1379
1179
:param revision_id: allows creating a working tree at a different
1380
1180
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.
1182
These trees get an initial random root id.
1184
revision_id = osutils.safe_revision_id(revision_id)
1391
1185
if not isinstance(a_bzrdir.transport, LocalTransport):
1392
1186
raise errors.NotLocalUrl(a_bzrdir.transport.base)
1393
1187
transport = a_bzrdir.get_workingtree_transport(self)
1394
1188
control_files = self._open_control_files(a_bzrdir)
1395
1189
control_files.create_lock()
1396
1190
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()
1191
control_files.put_utf8('format', self.get_format_string())
1192
branch = a_bzrdir.open_branch()
1403
1193
if revision_id is None:
1404
1194
revision_id = branch.last_revision()
1405
1195
local_path = transport.local_abspath('dirstate')
1406
1196
# write out new dirstate (must exist when we create the tree)
1407
1197
state = dirstate.DirState.initialize(local_path)
1410
wt = self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
1199
wt = WorkingTree4(a_bzrdir.root_transport.local_abspath('.'),
1413
1202
_bzrdir=a_bzrdir,
1414
1203
_control_files=control_files)
1416
1205
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)
1208
if revision_id in (None, NULL_REVISION):
1209
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)]
1211
wt.current_dirstate()._validate()
1212
wt.set_last_revision(revision_id)
1214
basis = wt.basis_tree()
1440
1215
basis.lock_read()
1442
wt.set_parent_trees(parents_list, allow_leftmost_as_ghost=True)
1216
# if the basis has a root id we have to use that; otherwise we use
1218
basis_root_id = basis.get_root_id()
1219
if basis_root_id is not None:
1220
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)
1222
transform.build_tree(basis, wt)
1466
1225
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
1229
def _open(self, a_bzrdir, control_files):
1480
1230
"""Open the tree itself.
1482
1232
:param a_bzrdir: the dir for the tree.
1483
1233
:param control_files: the control files for the tree.
1485
return self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
1235
return WorkingTree4(a_bzrdir.root_transport.local_abspath('.'),
1486
1236
branch=a_bzrdir.open_branch(),
1488
1238
_bzrdir=a_bzrdir,
1489
1239
_control_files=control_files)
1491
1241
def __get_matchingbzrdir(self):
1492
return self._get_matchingbzrdir()
1494
def _get_matchingbzrdir(self):
1495
"""Overrideable method to get a bzrdir for testing."""
1496
1242
# please test against something that will let us do tree references
1497
1243
return bzrdir.format_registry.make_bzrdir(
1498
1244
'dirstate-with-subtree')
2080
1673
if not found_versioned:
2081
1674
# 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)
1676
all_versioned = False
1678
if not all_versioned:
1679
raise errors.PathsNotVersionedError(specific_files)
2086
1680
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2087
search_specific_files = osutils.minimum_path_selection(specific_files)
1681
search_specific_files = set()
1682
for path in specific_files:
1683
other_specific_files = specific_files.difference(set([path]))
1684
if not osutils.is_inside_any(other_specific_files, path):
1685
# this is a top level path, we must check it.
1686
search_specific_files.add(path)
1688
# compare source_index and target_index at or under each element of search_specific_files.
1689
# follow the following comparison table. Note that we only want to do diff operations when
1690
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1694
# Source | Target | disk | action
1695
# r | fdlt | | add source to search, add id path move and perform
1696
# | | | diff check on source-target
1697
# r | fdlt | a | dangling file that was present in the basis.
1699
# r | a | | add source to search
1701
# r | r | | this path is present in a non-examined tree, skip.
1702
# r | r | a | this path is present in a non-examined tree, skip.
1703
# a | fdlt | | add new id
1704
# a | fdlt | a | dangling locally added file, skip
1705
# a | a | | not present in either tree, skip
1706
# a | a | a | not present in any tree, skip
1707
# a | r | | not present in either tree at this path, skip as it
1708
# | | | may not be selected by the users list of paths.
1709
# a | r | a | not present in either tree at this path, skip as it
1710
# | | | may not be selected by the users list of paths.
1711
# fdlt | fdlt | | content in both: diff them
1712
# fdlt | fdlt | a | deleted locally, but not unversioned - show as deleted ?
1713
# fdlt | a | | unversioned: output deleted id for now
1714
# fdlt | a | a | unversioned and deleted: output deleted id
1715
# fdlt | r | | relocated in this tree, so add target to search.
1716
# | | | Dont diff, we will see an r,fd; pair when we reach
1717
# | | | this id at the other path.
1718
# fdlt | r | a | relocated in this tree, so add target to search.
1719
# | | | Dont diff, we will see an r,fd; pair when we reach
1720
# | | | this id at the other path.
1722
# for all search_indexs in each path at or under each element of
1723
# search_specific_files, if the detail is relocated: add the id, and add the
1724
# relocated path as one to search if its not searched already. If the
1725
# detail is not relocated, add the id.
1726
searched_specific_files = set()
1727
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1728
# Using a list so that we can access the values and change them in
1729
# nested scope. Each one is [path, file_id, entry]
1730
last_source_parent = [None, None, None]
1731
last_target_parent = [None, None, None]
2089
1733
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()
1735
def _process_entry(entry, path_info):
1736
"""Compare an entry and real disk to generate delta information.
1738
:param path_info: top_relpath, basename, kind, lstat, abspath for
1739
the path of entry. If None, then the path is considered absent.
1740
(Perhaps we should pass in a concrete entry for this ?)
1741
Basename is returned as a utf8 string because we expect this
1742
tuple will be ignored, and don't want to take the time to
1745
# TODO: when a parent has been renamed, dont emit path renames for children,
1746
## if path_info[1] == 'sub':
1747
## import pdb;pdb.set_trace()
1748
if source_index is None:
1749
source_details = NULL_PARENT_DETAILS
1751
source_details = entry[1][source_index]
1752
target_details = entry[1][target_index]
1753
target_minikind = target_details[0]
1754
if path_info is not None and target_minikind in 'fdlt':
1755
assert target_index == 0
1756
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
1757
stat_value=path_info[3])
1758
# The entry may have been modified by update_entry
1759
target_details = entry[1][target_index]
1760
target_minikind = target_details[0]
1763
source_minikind = source_details[0]
1764
if source_minikind in 'fdltr' and target_minikind in 'fdlt':
1765
# claimed content in both: diff
1766
# r | fdlt | | add source to search, add id path move and perform
1767
# | | | diff check on source-target
1768
# r | fdlt | a | dangling file that was present in the basis.
1770
if source_minikind in 'r':
1771
# add the source to the search path to find any children it
1772
# has. TODO ? : only add if it is a container ?
1773
if not osutils.is_inside_any(searched_specific_files,
1775
search_specific_files.add(source_details[1])
1776
# generate the old path; this is needed for stating later
1778
old_path = source_details[1]
1779
old_dirname, old_basename = os.path.split(old_path)
1780
path = pathjoin(entry[0][0], entry[0][1])
1781
old_entry = state._get_entry(source_index,
1783
# update the source details variable to be the real
1785
source_details = old_entry[1][source_index]
1786
source_minikind = source_details[0]
1788
old_dirname = entry[0][0]
1789
old_basename = entry[0][1]
1790
old_path = path = pathjoin(old_dirname, old_basename)
1791
if path_info is None:
1792
# the file is missing on disk, show as removed.
1793
content_change = True
1797
# source and target are both versioned and disk file is present.
1798
target_kind = path_info[2]
1799
if target_kind == 'directory':
1800
if source_minikind != 'd':
1801
content_change = True
1803
# directories have no fingerprint
1804
content_change = False
1806
elif target_kind == 'file':
1807
if source_minikind != 'f':
1808
content_change = True
1810
# We could check the size, but we already have the
1812
content_change = (link_or_sha1 != source_details[1])
1813
# Target details is updated at update_entry time
1814
if use_filesystem_for_exec:
1815
# We don't need S_ISREG here, because we are sure
1816
# we are dealing with a file.
1817
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
1819
target_exec = target_details[3]
1820
elif target_kind == 'symlink':
1821
if source_minikind != 'l':
1822
content_change = True
1824
content_change = (link_or_sha1 != source_details[1])
1826
elif target_kind == 'tree-reference':
1827
if source_minikind != 't':
1828
content_change = True
1830
content_change = False
1833
raise Exception, "unknown kind %s" % path_info[2]
1834
# parent id is the entry for the path in the target tree
1835
if old_dirname == last_source_parent[0]:
1836
source_parent_id = last_source_parent[1]
1838
source_parent_entry = state._get_entry(source_index,
1839
path_utf8=old_dirname)
1840
source_parent_id = source_parent_entry[0][2]
1841
if source_parent_id == entry[0][2]:
1842
# This is the root, so the parent is None
1843
source_parent_id = None
1845
last_source_parent[0] = old_dirname
1846
last_source_parent[1] = source_parent_id
1847
last_source_parent[2] = source_parent_entry
1849
new_dirname = entry[0][0]
1850
if new_dirname == last_target_parent[0]:
1851
target_parent_id = last_target_parent[1]
1853
# TODO: We don't always need to do the lookup, because the
1854
# parent entry will be the same as the source entry.
1855
target_parent_entry = state._get_entry(target_index,
1856
path_utf8=new_dirname)
1857
target_parent_id = target_parent_entry[0][2]
1858
if target_parent_id == entry[0][2]:
1859
# This is the root, so the parent is None
1860
target_parent_id = None
1862
last_target_parent[0] = new_dirname
1863
last_target_parent[1] = target_parent_id
1864
last_target_parent[2] = target_parent_entry
1866
source_exec = source_details[3]
1867
return ((entry[0][2], (old_path, path), content_change,
1869
(source_parent_id, target_parent_id),
1870
(old_basename, entry[0][1]),
1871
(_minikind_to_kind[source_minikind], target_kind),
1872
(source_exec, target_exec)),)
1873
elif source_minikind in 'a' and target_minikind in 'fdlt':
1874
# looks like a new file
1875
if path_info is not None:
1876
path = pathjoin(entry[0][0], entry[0][1])
1877
# parent id is the entry for the path in the target tree
1878
# TODO: these are the same for an entire directory: cache em.
1879
parent_id = state._get_entry(target_index,
1880
path_utf8=entry[0][0])[0][2]
1881
if parent_id == entry[0][2]:
1883
if use_filesystem_for_exec:
1884
# We need S_ISREG here, because we aren't sure if this
1887
stat.S_ISREG(path_info[3].st_mode)
1888
and stat.S_IEXEC & path_info[3].st_mode)
1890
target_exec = target_details[3]
1891
return ((entry[0][2], (None, path), True,
1894
(None, entry[0][1]),
1895
(None, path_info[2]),
1896
(None, target_exec)),)
1898
# but its not on disk: we deliberately treat this as just
1899
# never-present. (Why ?! - RBC 20070224)
1901
elif source_minikind in 'fdlt' and target_minikind in 'a':
1902
# unversioned, possibly, or possibly not deleted: we dont care.
1903
# if its still on disk, *and* theres no other entry at this
1904
# path [we dont know this in this routine at the moment -
1905
# perhaps we should change this - then it would be an unknown.
1906
old_path = pathjoin(entry[0][0], entry[0][1])
1907
# parent id is the entry for the path in the target tree
1908
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
1909
if parent_id == entry[0][2]:
1911
return ((entry[0][2], (old_path, None), True,
1914
(entry[0][1], None),
1915
(_minikind_to_kind[source_minikind], None),
1916
(source_details[3], None)),)
1917
elif source_minikind in 'fdlt' and target_minikind in 'r':
1918
# a rename; could be a true rename, or a rename inherited from
1919
# a renamed parent. TODO: handle this efficiently. Its not
1920
# common case to rename dirs though, so a correct but slow
1921
# implementation will do.
1922
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
1923
search_specific_files.add(target_details[1])
1924
elif source_minikind in 'r' and target_minikind in 'r':
1925
# neither of the selected trees contain this file,
1926
# so skip over it. This is not currently directly tested, but
1927
# is indirectly via test_too_much.TestCommands.test_conflicts.
1930
raise AssertionError("don't know how to compare "
1931
"source_minikind=%r, target_minikind=%r"
1932
% (source_minikind, target_minikind))
1933
## import pdb;pdb.set_trace()
1935
while search_specific_files:
1936
# TODO: the pending list should be lexically sorted?
1937
current_root = search_specific_files.pop()
1938
searched_specific_files.add(current_root)
1939
# process the entries for this containing directory: the rest will be
1940
# found by their parents recursively.
1941
root_entries = _entries_for_path(current_root)
1942
root_abspath = self.target.abspath(current_root)
1944
root_stat = os.lstat(root_abspath)
1946
if e.errno == errno.ENOENT:
1947
# the path does not exist: let _process_entry know that.
1948
root_dir_info = None
1950
# some other random error: hand it up.
1953
root_dir_info = ('', current_root,
1954
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
1956
if root_dir_info[2] == 'directory':
1957
if self.target._directory_is_tree_reference(
1958
current_root.decode('utf8')):
1959
root_dir_info = root_dir_info[:2] + \
1960
('tree-reference',) + root_dir_info[3:]
1962
if not root_entries and not root_dir_info:
1963
# this specified path is not present at all, skip it.
1965
path_handled = False
1966
for entry in root_entries:
1967
for result in _process_entry(entry, root_dir_info):
1968
# this check should probably be outside the loop: one
1969
# 'iterate two trees' api, and then _iter_changes filters
1970
# unchanged pairs. - RBC 20070226
1972
if (include_unchanged
1973
or result[2] # content change
1974
or result[3][0] != result[3][1] # versioned status
1975
or result[4][0] != result[4][1] # parent id
1976
or result[5][0] != result[5][1] # name
1977
or result[6][0] != result[6][1] # kind
1978
or result[7][0] != result[7][1] # executable
1980
result = (result[0],
1981
((utf8_decode(result[1][0])[0]),
1982
utf8_decode(result[1][1])[0]),) + result[2:]
1984
if want_unversioned and not path_handled:
1985
new_executable = bool(
1986
stat.S_ISREG(root_dir_info[3].st_mode)
1987
and stat.S_IEXEC & root_dir_info[3].st_mode)
1988
yield (None, (None, current_root), True, (False, False),
1990
(None, splitpath(current_root)[-1]),
1991
(None, root_dir_info[2]), (None, new_executable))
1992
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
1993
initial_key = (current_root, '', '')
1994
block_index, _ = state._find_block_index_from_key(initial_key)
1995
if block_index == 0:
1996
# we have processed the total root already, but because the
1997
# initial key matched it we should skip it here.
2000
current_dir_info = dir_iterator.next()
2002
if e.errno in (errno.ENOENT, errno.ENOTDIR):
2003
# there may be directories in the inventory even though
2004
# this path is not a file on disk: so mark it as end of
2006
current_dir_info = None
2010
if current_dir_info[0][0] == '':
2011
# remove .bzr from iteration
2012
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
2013
assert current_dir_info[1][bzr_index][0] == '.bzr'
2014
del current_dir_info[1][bzr_index]
2015
# walk until both the directory listing and the versioned metadata
2016
# are exhausted. TODO: reevaluate this, perhaps we should stop when
2017
# the versioned data runs out.
2018
if (block_index < len(state._dirblocks) and
2019
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2020
current_block = state._dirblocks[block_index]
2022
current_block = None
2023
while (current_dir_info is not None or
2024
current_block is not None):
2025
if (current_dir_info and current_block
2026
and current_dir_info[0][0] != current_block[0]):
2027
if current_dir_info[0][0] < current_block[0] :
2028
# filesystem data refers to paths not covered by the dirblock.
2029
# this has two possibilities:
2030
# A) it is versioned but empty, so there is no block for it
2031
# B) it is not versioned.
2032
# in either case it was processed by the containing directories walk:
2033
# if it is root/foo, when we walked root we emitted it,
2034
# or if we ere given root/foo to walk specifically, we
2035
# emitted it when checking the walk-root entries
2036
# advance the iterator and loop - we dont need to emit it.
2038
current_dir_info = dir_iterator.next()
2039
except StopIteration:
2040
current_dir_info = None
2042
# We have a dirblock entry for this location, but there
2043
# is no filesystem path for this. This is most likely
2044
# because a directory was removed from the disk.
2045
# We don't have to report the missing directory,
2046
# because that should have already been handled, but we
2047
# need to handle all of the files that are contained
2049
for current_entry in current_block[1]:
2050
# entry referring to file not present on disk.
2051
# advance the entry only, after processing.
2052
for result in _process_entry(current_entry, None):
2053
# this check should probably be outside the loop: one
2054
# 'iterate two trees' api, and then _iter_changes filters
2055
# unchanged pairs. - RBC 20070226
2056
if (include_unchanged
2057
or result[2] # content change
2058
or result[3][0] != result[3][1] # versioned status
2059
or result[4][0] != result[4][1] # parent id
2060
or result[5][0] != result[5][1] # name
2061
or result[6][0] != result[6][1] # kind
2062
or result[7][0] != result[7][1] # executable
2064
result = (result[0],
2065
((utf8_decode(result[1][0])[0]),
2066
utf8_decode(result[1][1])[0]),) + result[2:]
2069
if (block_index < len(state._dirblocks) and
2070
osutils.is_inside(current_root,
2071
state._dirblocks[block_index][0])):
2072
current_block = state._dirblocks[block_index]
2074
current_block = None
2077
if current_block and entry_index < len(current_block[1]):
2078
current_entry = current_block[1][entry_index]
2080
current_entry = None
2081
advance_entry = True
2083
if current_dir_info and path_index < len(current_dir_info[1]):
2084
current_path_info = current_dir_info[1][path_index]
2085
if current_path_info[2] == 'directory':
2086
if self.target._directory_is_tree_reference(
2087
current_path_info[0].decode('utf8')):
2088
current_path_info = current_path_info[:2] + \
2089
('tree-reference',) + current_path_info[3:]
2091
current_path_info = None
2093
path_handled = False
2094
while (current_entry is not None or
2095
current_path_info is not None):
2096
if current_entry is None:
2097
# the check for path_handled when the path is adnvaced
2098
# will yield this path if needed.
2100
elif current_path_info is None:
2101
# no path is fine: the per entry code will handle it.
2102
for result in _process_entry(current_entry, current_path_info):
2103
# this check should probably be outside the loop: one
2104
# 'iterate two trees' api, and then _iter_changes filters
2105
# 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
elif current_entry[0][1] != current_path_info[1]:
2119
if current_path_info[1] < current_entry[0][1]:
2120
# extra file on disk: pass for now, but only
2121
# increment the path, not the entry
2122
# import pdb; pdb.set_trace()
2123
# print 'unversioned file'
2124
advance_entry = False
2126
# entry referring to file not present on disk.
2127
# advance the entry only, after processing.
2128
for result in _process_entry(current_entry, None):
2129
# this check should probably be outside the loop: one
2130
# 'iterate two trees' api, and then _iter_changes filters
2131
# unchanged pairs. - RBC 20070226
2133
if (include_unchanged
2134
or result[2] # content change
2135
or result[3][0] != result[3][1] # versioned status
2136
or result[4][0] != result[4][1] # parent id
2137
or result[5][0] != result[5][1] # name
2138
or result[6][0] != result[6][1] # kind
2139
or result[7][0] != result[7][1] # executable
2141
result = (result[0],
2142
((utf8_decode(result[1][0])[0]),
2143
utf8_decode(result[1][1])[0]),) + result[2:]
2145
advance_path = False
2147
for result in _process_entry(current_entry, current_path_info):
2148
# this check should probably be outside the loop: one
2149
# 'iterate two trees' api, and then _iter_changes filters
2150
# unchanged pairs. - RBC 20070226
2152
if (include_unchanged
2153
or result[2] # content change
2154
or result[3][0] != result[3][1] # versioned status
2155
or result[4][0] != result[4][1] # parent id
2156
or result[5][0] != result[5][1] # name
2157
or result[6][0] != result[6][1] # kind
2158
or result[7][0] != result[7][1] # executable
2160
result = (result[0],
2161
((utf8_decode(result[1][0])[0]),
2162
utf8_decode(result[1][1])[0]),) + result[2:]
2164
if advance_entry and current_entry is not None:
2166
if entry_index < len(current_block[1]):
2167
current_entry = current_block[1][entry_index]
2169
current_entry = None
2171
advance_entry = True # reset the advance flaga
2172
if advance_path and current_path_info is not None:
2173
if not path_handled:
2174
# unversioned in all regards
2175
if want_unversioned:
2176
new_executable = bool(
2177
stat.S_ISREG(current_path_info[3].st_mode)
2178
and stat.S_IEXEC & current_path_info[3].st_mode)
2179
if want_unversioned:
2180
yield (None, (None, current_path_info[0]),
2184
(None, current_path_info[1]),
2185
(None, current_path_info[2]),
2186
(None, new_executable))
2187
# dont descend into this unversioned path if it is
2189
if current_path_info[2] in (
2190
'directory', 'tree-referene'):
2191
del current_dir_info[1][path_index]
2194
if path_index < len(current_dir_info[1]):
2195
current_path_info = current_dir_info[1][path_index]
2196
if current_path_info[2] == 'directory':
2197
if self.target._directory_is_tree_reference(
2198
current_path_info[0].decode('utf8')):
2199
current_path_info = current_path_info[:2] + \
2200
('tree-reference',) + current_path_info[3:]
2202
current_path_info = None
2203
path_handled = False
2205
advance_path = True # reset the advance flagg.
2206
if current_block is not None:
2208
if (block_index < len(state._dirblocks) and
2209
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2210
current_block = state._dirblocks[block_index]
2212
current_block = None
2213
if current_dir_info is not None:
2215
current_dir_info = dir_iterator.next()
2216
except StopIteration:
2217
current_dir_info = None
2096
2221
def is_compatible(source, target):
2097
2222
# the target must be a dirstate working tree
2098
if not isinstance(target, DirStateWorkingTree):
2223
if not isinstance(target, WorkingTree4):
2100
# the source must be a revtree or dirstate rev tree.
2225
# the source must be a revtreee or dirstate rev tree.
2101
2226
if not isinstance(source,
2102
2227
(revisiontree.RevisionTree, DirStateRevisionTree)):
2104
2229
# the source revid must be in the target dirstate
2105
if not (source._revision_id == _mod_revision.NULL_REVISION or
2230
if not (source._revision_id == NULL_REVISION or
2106
2231
source._revision_id in target.get_parent_ids()):
2107
# TODO: what about ghosts? it may well need to
2232
# TODO: what about ghosts? it may well need to
2108
2233
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
