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