1252
1173
self._inventory.remove_recursive_id(file_id)
1254
1175
@needs_tree_write_lock
1255
def rename_one(self, from_rel, to_rel, after=False):
1256
"""See WorkingTree.rename_one"""
1258
WorkingTree.rename_one(self, from_rel, to_rel, after)
1260
@needs_tree_write_lock
1261
def apply_inventory_delta(self, changes):
1262
"""See MutableTree.apply_inventory_delta"""
1263
state = self.current_dirstate()
1264
state.update_by_delta(changes)
1265
self._make_dirty(reset_inventory=True)
1267
def update_basis_by_delta(self, new_revid, delta):
1268
"""See MutableTree.update_basis_by_delta."""
1269
if self.last_revision() == new_revid:
1270
raise AssertionError()
1271
self.current_dirstate().update_basis_by_delta(delta, new_revid)
1274
def _validate(self):
1275
self._dirstate._validate()
1277
@needs_tree_write_lock
1278
1176
def _write_inventory(self, inv):
1279
1177
"""Write inventory as the current inventory."""
1281
raise AssertionError("attempting to write an inventory when the "
1282
"dirstate is dirty will lose pending changes")
1283
had_inventory = self._inventory is not None
1284
# Setting self._inventory = None forces the dirstate to regenerate the
1285
# working inventory. We do this because self.inventory may be inv, or
1286
# may have been modified, and either case would prevent a clean delta
1288
self._inventory = None
1290
delta = inv._make_delta(self.inventory)
1292
self.apply_inventory_delta(delta)
1178
assert not self._dirty, "attempting to write an inventory when the dirstate is dirty will cause data loss"
1179
self.current_dirstate().set_state_from_inventory(inv)
1180
self._make_dirty(reset_inventory=False)
1181
if self._inventory is not None:
1294
1182
self._inventory = inv
1298
class ContentFilterAwareSHA1Provider(dirstate.SHA1Provider):
1300
def __init__(self, tree):
1303
def sha1(self, abspath):
1304
"""See dirstate.SHA1Provider.sha1()."""
1305
filters = self.tree._content_filter_stack(
1306
self.tree.relpath(osutils.safe_unicode(abspath)))
1307
return internal_size_sha_file_byname(abspath, filters)[1]
1309
def stat_and_sha1(self, abspath):
1310
"""See dirstate.SHA1Provider.stat_and_sha1()."""
1311
filters = self.tree._content_filter_stack(
1312
self.tree.relpath(osutils.safe_unicode(abspath)))
1313
file_obj = file(abspath, 'rb', 65000)
1315
statvalue = os.fstat(file_obj.fileno())
1317
file_obj = filtered_input_file(file_obj, filters)
1318
sha1 = osutils.size_sha_file(file_obj)[1]
1321
return statvalue, sha1
1324
class ContentFilteringDirStateWorkingTree(DirStateWorkingTree):
1325
"""Dirstate working tree that supports content filtering.
1327
The dirstate holds the hash and size of the canonical form of the file,
1328
and most methods must return that.
1331
def _file_content_summary(self, path, stat_result):
1332
# This is to support the somewhat obsolete path_content_summary method
1333
# with content filtering: see
1334
# <https://bugs.edge.launchpad.net/bzr/+bug/415508>.
1336
# If the dirstate cache is up to date and knows the hash and size,
1338
# Otherwise if there are no content filters, return the on-disk size
1339
# and leave the hash blank.
1340
# Otherwise, read and filter the on-disk file and use its size and
1343
# The dirstate doesn't store the size of the canonical form so we
1344
# can't trust it for content-filtered trees. We just return None.
1345
dirstate_sha1 = self._dirstate.sha1_from_stat(path, stat_result)
1346
executable = self._is_executable_from_path_and_stat(path, stat_result)
1347
return ('file', None, executable, dirstate_sha1)
1350
class WorkingTree4(DirStateWorkingTree):
1351
"""This is the Format 4 working tree.
1353
This differs from WorkingTree3 by:
1354
- Having a consolidated internal dirstate, stored in a
1355
randomly-accessible sorted file on disk.
1356
- Not having a regular inventory attribute. One can be synthesized
1357
on demand but this is expensive and should be avoided.
1359
This is new in bzr 0.15.
1363
class WorkingTree5(ContentFilteringDirStateWorkingTree):
1364
"""This is the Format 5 working tree.
1366
This differs from WorkingTree4 by:
1367
- Supporting content filtering.
1369
This is new in bzr 1.11.
1373
class WorkingTree6(ContentFilteringDirStateWorkingTree):
1374
"""This is the Format 6 working tree.
1376
This differs from WorkingTree5 by:
1377
- Supporting a current view that may mask the set of files in a tree
1378
impacted by most user operations.
1380
This is new in bzr 1.14.
1383
def _make_views(self):
1384
return views.PathBasedViews(self)
1387
class DirStateWorkingTreeFormat(WorkingTreeFormat3):
1389
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
1390
accelerator_tree=None, hardlink=False):
1186
class WorkingTreeFormat4(WorkingTreeFormat3):
1187
"""The first consolidated dirstate working tree format.
1190
- exists within a metadir controlling .bzr
1191
- includes an explicit version marker for the workingtree control
1192
files, separate from the BzrDir format
1193
- modifies the hash cache format
1194
- is new in bzr 0.15
1195
- uses a LockDir to guard access to it.
1198
def get_format_string(self):
1199
"""See WorkingTreeFormat.get_format_string()."""
1200
return "Bazaar Working Tree Format 4 (bzr 0.15)\n"
1202
def get_format_description(self):
1203
"""See WorkingTreeFormat.get_format_description()."""
1204
return "Working tree format 4"
1206
def initialize(self, a_bzrdir, revision_id=None):
1391
1207
"""See WorkingTreeFormat.initialize().
1393
1209
:param revision_id: allows creating a working tree at a different
1394
1210
revision than the branch is at.
1395
:param accelerator_tree: A tree which can be used for retrieving file
1396
contents more quickly than the revision tree, i.e. a workingtree.
1397
The revision tree will be used for cases where accelerator_tree's
1398
content is different.
1399
:param hardlink: If true, hard-link files from accelerator_tree,
1402
These trees get an initial random root id, if their repository supports
1403
rich root data, TREE_ROOT otherwise.
1212
These trees get an initial random root id.
1214
revision_id = osutils.safe_revision_id(revision_id)
1405
1215
if not isinstance(a_bzrdir.transport, LocalTransport):
1406
1216
raise errors.NotLocalUrl(a_bzrdir.transport.base)
1407
1217
transport = a_bzrdir.get_workingtree_transport(self)
1408
1218
control_files = self._open_control_files(a_bzrdir)
1409
1219
control_files.create_lock()
1410
1220
control_files.lock_write()
1411
transport.put_bytes('format', self.get_format_string(),
1412
mode=a_bzrdir._get_file_mode())
1413
if from_branch is not None:
1414
branch = from_branch
1416
branch = a_bzrdir.open_branch()
1221
control_files.put_utf8('format', self.get_format_string())
1222
branch = a_bzrdir.open_branch()
1417
1223
if revision_id is None:
1418
1224
revision_id = branch.last_revision()
1419
1225
local_path = transport.local_abspath('dirstate')
1420
1226
# write out new dirstate (must exist when we create the tree)
1421
1227
state = dirstate.DirState.initialize(local_path)
1424
wt = self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
1229
wt = WorkingTree4(a_bzrdir.root_transport.local_abspath('.'),
1427
1232
_bzrdir=a_bzrdir,
1428
1233
_control_files=control_files)
1430
1235
wt.lock_tree_write()
1432
self._init_custom_control_files(wt)
1433
if revision_id in (None, _mod_revision.NULL_REVISION):
1434
if branch.repository.supports_rich_root():
1435
wt._set_root_id(generate_ids.gen_root_id())
1437
wt._set_root_id(ROOT_ID)
1238
if revision_id in (None, NULL_REVISION):
1239
wt._set_root_id(generate_ids.gen_root_id())
1440
# frequently, we will get here due to branching. The accelerator
1441
# tree will be the tree from the branch, so the desired basis
1442
# tree will often be a parent of the accelerator tree.
1443
if accelerator_tree is not None:
1445
basis = accelerator_tree.revision_tree(revision_id)
1446
except errors.NoSuchRevision:
1449
basis = branch.repository.revision_tree(revision_id)
1450
if revision_id == _mod_revision.NULL_REVISION:
1453
parents_list = [(revision_id, basis)]
1241
wt.current_dirstate()._validate()
1242
wt.set_last_revision(revision_id)
1244
basis = wt.basis_tree()
1454
1245
basis.lock_read()
1456
wt.set_parent_trees(parents_list, allow_leftmost_as_ghost=True)
1246
# if the basis has a root id we have to use that; otherwise we use
1248
basis_root_id = basis.get_root_id()
1249
if basis_root_id is not None:
1250
wt._set_root_id(basis_root_id)
1458
# if the basis has a root id we have to use that; otherwise we
1459
# use a new random one
1460
basis_root_id = basis.get_root_id()
1461
if basis_root_id is not None:
1462
wt._set_root_id(basis_root_id)
1464
if wt.supports_content_filtering():
1465
# The original tree may not have the same content filters
1466
# applied so we can't safely build the inventory delta from
1468
delta_from_tree = False
1470
delta_from_tree = True
1471
# delta_from_tree is safe even for DirStateRevisionTrees,
1472
# because wt4.apply_inventory_delta does not mutate the input
1473
# inventory entries.
1474
transform.build_tree(basis, wt, accelerator_tree,
1476
delta_from_tree=delta_from_tree)
1252
transform.build_tree(basis, wt)
1480
1255
control_files.unlock()
1484
def _init_custom_control_files(self, wt):
1485
"""Subclasses with custom control files should override this method.
1487
The working tree and control files are locked for writing when this
1490
:param wt: the WorkingTree object
1493
1259
def _open(self, a_bzrdir, control_files):
1494
1260
"""Open the tree itself.
1496
1262
:param a_bzrdir: the dir for the tree.
1497
1263
:param control_files: the control files for the tree.
1499
return self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
1265
return WorkingTree4(a_bzrdir.root_transport.local_abspath('.'),
1500
1266
branch=a_bzrdir.open_branch(),
1502
1268
_bzrdir=a_bzrdir,
1503
1269
_control_files=control_files)
1505
1271
def __get_matchingbzrdir(self):
1506
return self._get_matchingbzrdir()
1508
def _get_matchingbzrdir(self):
1509
"""Overrideable method to get a bzrdir for testing."""
1510
1272
# please test against something that will let us do tree references
1511
1273
return bzrdir.format_registry.make_bzrdir(
1512
1274
'dirstate-with-subtree')
2102
1701
if not found_versioned:
2103
1702
# none of the indexes was not 'absent' at all ids for this
2105
not_versioned.append(path)
2106
if len(not_versioned) > 0:
2107
raise errors.PathsNotVersionedError(not_versioned)
1704
all_versioned = False
1706
if not all_versioned:
1707
raise errors.PathsNotVersionedError(specific_files)
2108
1708
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2109
search_specific_files = osutils.minimum_path_selection(specific_files)
1709
search_specific_files = set()
1710
for path in specific_files:
1711
other_specific_files = specific_files.difference(set([path]))
1712
if not osutils.is_inside_any(other_specific_files, path):
1713
# this is a top level path, we must check it.
1714
search_specific_files.add(path)
1716
# compare source_index and target_index at or under each element of search_specific_files.
1717
# follow the following comparison table. Note that we only want to do diff operations when
1718
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1722
# Source | Target | disk | action
1723
# r | fdlt | | add source to search, add id path move and perform
1724
# | | | diff check on source-target
1725
# r | fdlt | a | dangling file that was present in the basis.
1727
# r | a | | add source to search
1729
# r | r | | this path is present in a non-examined tree, skip.
1730
# r | r | a | this path is present in a non-examined tree, skip.
1731
# a | fdlt | | add new id
1732
# a | fdlt | a | dangling locally added file, skip
1733
# a | a | | not present in either tree, skip
1734
# a | a | a | not present in any tree, skip
1735
# a | r | | not present in either tree at this path, skip as it
1736
# | | | may not be selected by the users list of paths.
1737
# a | r | a | not present in either tree at this path, skip as it
1738
# | | | may not be selected by the users list of paths.
1739
# fdlt | fdlt | | content in both: diff them
1740
# fdlt | fdlt | a | deleted locally, but not unversioned - show as deleted ?
1741
# fdlt | a | | unversioned: output deleted id for now
1742
# fdlt | a | a | unversioned and deleted: output deleted id
1743
# fdlt | r | | relocated in this tree, so add target to search.
1744
# | | | Dont diff, we will see an r,fd; pair when we reach
1745
# | | | this id at the other path.
1746
# fdlt | r | a | relocated in this tree, so add target to search.
1747
# | | | Dont diff, we will see an r,fd; pair when we reach
1748
# | | | this id at the other path.
1750
# for all search_indexs in each path at or under each element of
1751
# search_specific_files, if the detail is relocated: add the id, and add the
1752
# relocated path as one to search if its not searched already. If the
1753
# detail is not relocated, add the id.
1754
searched_specific_files = set()
1755
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1756
# Using a list so that we can access the values and change them in
1757
# nested scope. Each one is [path, file_id, entry]
1758
last_source_parent = [None, None, None]
1759
last_target_parent = [None, None, None]
2111
1761
use_filesystem_for_exec = (sys.platform != 'win32')
2112
iter_changes = self.target._iter_changes(include_unchanged,
2113
use_filesystem_for_exec, search_specific_files, state,
2114
source_index, target_index, want_unversioned, self.target)
2115
return iter_changes.iter_changes()
1763
def _process_entry(entry, path_info):
1764
"""Compare an entry and real disk to generate delta information.
1766
:param path_info: top_relpath, basename, kind, lstat, abspath for
1767
the path of entry. If None, then the path is considered absent.
1768
(Perhaps we should pass in a concrete entry for this ?)
1769
Basename is returned as a utf8 string because we expect this
1770
tuple will be ignored, and don't want to take the time to
1773
if source_index is None:
1774
source_details = NULL_PARENT_DETAILS
1776
source_details = entry[1][source_index]
1777
target_details = entry[1][target_index]
1778
target_minikind = target_details[0]
1779
if path_info is not None and target_minikind in 'fdlt':
1780
assert target_index == 0
1781
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
1782
stat_value=path_info[3])
1783
# The entry may have been modified by update_entry
1784
target_details = entry[1][target_index]
1785
target_minikind = target_details[0]
1788
source_minikind = source_details[0]
1789
if source_minikind in 'fdltr' and target_minikind in 'fdlt':
1790
# claimed content in both: diff
1791
# r | fdlt | | add source to search, add id path move and perform
1792
# | | | diff check on source-target
1793
# r | fdlt | a | dangling file that was present in the basis.
1795
if source_minikind in 'r':
1796
# add the source to the search path to find any children it
1797
# has. TODO ? : only add if it is a container ?
1798
if not osutils.is_inside_any(searched_specific_files,
1800
search_specific_files.add(source_details[1])
1801
# generate the old path; this is needed for stating later
1803
old_path = source_details[1]
1804
old_dirname, old_basename = os.path.split(old_path)
1805
path = pathjoin(entry[0][0], entry[0][1])
1806
old_entry = state._get_entry(source_index,
1808
# update the source details variable to be the real
1810
source_details = old_entry[1][source_index]
1811
source_minikind = source_details[0]
1813
old_dirname = entry[0][0]
1814
old_basename = entry[0][1]
1815
old_path = path = pathjoin(old_dirname, old_basename)
1816
if path_info is None:
1817
# the file is missing on disk, show as removed.
1818
content_change = True
1822
# source and target are both versioned and disk file is present.
1823
target_kind = path_info[2]
1824
if target_kind == 'directory':
1825
if source_minikind != 'd':
1826
content_change = True
1828
# directories have no fingerprint
1829
content_change = False
1831
elif target_kind == 'file':
1832
if source_minikind != 'f':
1833
content_change = True
1835
# We could check the size, but we already have the
1837
content_change = (link_or_sha1 != source_details[1])
1838
# Target details is updated at update_entry time
1839
if use_filesystem_for_exec:
1840
# We don't need S_ISREG here, because we are sure
1841
# we are dealing with a file.
1842
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
1844
target_exec = target_details[3]
1845
elif target_kind == 'symlink':
1846
if source_minikind != 'l':
1847
content_change = True
1849
content_change = (link_or_sha1 != source_details[1])
1851
elif target_kind == 'tree-reference':
1852
if source_minikind != 't':
1853
content_change = True
1855
content_change = False
1858
raise Exception, "unknown kind %s" % path_info[2]
1859
# parent id is the entry for the path in the target tree
1860
if old_dirname == last_source_parent[0]:
1861
source_parent_id = last_source_parent[1]
1863
source_parent_entry = state._get_entry(source_index,
1864
path_utf8=old_dirname)
1865
source_parent_id = source_parent_entry[0][2]
1866
if source_parent_id == entry[0][2]:
1867
# This is the root, so the parent is None
1868
source_parent_id = None
1870
last_source_parent[0] = old_dirname
1871
last_source_parent[1] = source_parent_id
1872
last_source_parent[2] = source_parent_entry
1873
new_dirname = entry[0][0]
1874
if new_dirname == last_target_parent[0]:
1875
target_parent_id = last_target_parent[1]
1877
# TODO: We don't always need to do the lookup, because the
1878
# parent entry will be the same as the source entry.
1879
target_parent_entry = state._get_entry(target_index,
1880
path_utf8=new_dirname)
1881
target_parent_id = target_parent_entry[0][2]
1882
if target_parent_id == entry[0][2]:
1883
# This is the root, so the parent is None
1884
target_parent_id = None
1886
last_target_parent[0] = new_dirname
1887
last_target_parent[1] = target_parent_id
1888
last_target_parent[2] = target_parent_entry
1890
source_exec = source_details[3]
1891
return ((entry[0][2], (old_path, path), content_change,
1893
(source_parent_id, target_parent_id),
1894
(old_basename, entry[0][1]),
1895
(_minikind_to_kind[source_minikind], target_kind),
1896
(source_exec, target_exec)),)
1897
elif source_minikind in 'a' and target_minikind in 'fdlt':
1898
# looks like a new file
1899
if path_info is not None:
1900
path = pathjoin(entry[0][0], entry[0][1])
1901
# parent id is the entry for the path in the target tree
1902
# TODO: these are the same for an entire directory: cache em.
1903
parent_id = state._get_entry(target_index,
1904
path_utf8=entry[0][0])[0][2]
1905
if parent_id == entry[0][2]:
1907
if use_filesystem_for_exec:
1908
# We need S_ISREG here, because we aren't sure if this
1911
stat.S_ISREG(path_info[3].st_mode)
1912
and stat.S_IEXEC & path_info[3].st_mode)
1914
target_exec = target_details[3]
1915
return ((entry[0][2], (None, path), True,
1918
(None, entry[0][1]),
1919
(None, path_info[2]),
1920
(None, target_exec)),)
1922
# but its not on disk: we deliberately treat this as just
1923
# never-present. (Why ?! - RBC 20070224)
1925
elif source_minikind in 'fdlt' and target_minikind in 'a':
1926
# unversioned, possibly, or possibly not deleted: we dont care.
1927
# if its still on disk, *and* theres no other entry at this
1928
# path [we dont know this in this routine at the moment -
1929
# perhaps we should change this - then it would be an unknown.
1930
old_path = pathjoin(entry[0][0], entry[0][1])
1931
# parent id is the entry for the path in the target tree
1932
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
1933
if parent_id == entry[0][2]:
1935
return ((entry[0][2], (old_path, None), True,
1938
(entry[0][1], None),
1939
(_minikind_to_kind[source_minikind], None),
1940
(source_details[3], None)),)
1941
elif source_minikind in 'fdlt' and target_minikind in 'r':
1942
# a rename; could be a true rename, or a rename inherited from
1943
# a renamed parent. TODO: handle this efficiently. Its not
1944
# common case to rename dirs though, so a correct but slow
1945
# implementation will do.
1946
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
1947
search_specific_files.add(target_details[1])
1948
elif source_minikind in 'ra' and target_minikind in 'ra':
1949
# neither of the selected trees contain this file,
1950
# so skip over it. This is not currently directly tested, but
1951
# is indirectly via test_too_much.TestCommands.test_conflicts.
1954
raise AssertionError("don't know how to compare "
1955
"source_minikind=%r, target_minikind=%r"
1956
% (source_minikind, target_minikind))
1957
## import pdb;pdb.set_trace()
1960
while search_specific_files:
1961
# TODO: the pending list should be lexically sorted? the
1962
# interface doesn't require it.
1963
current_root = search_specific_files.pop()
1964
searched_specific_files.add(current_root)
1965
# process the entries for this containing directory: the rest will be
1966
# found by their parents recursively.
1967
root_entries = _entries_for_path(current_root)
1968
root_abspath = self.target.abspath(current_root)
1970
root_stat = os.lstat(root_abspath)
1972
if e.errno == errno.ENOENT:
1973
# the path does not exist: let _process_entry know that.
1974
root_dir_info = None
1976
# some other random error: hand it up.
1979
root_dir_info = ('', current_root,
1980
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
1982
if root_dir_info[2] == 'directory':
1983
if self.target._directory_is_tree_reference(
1984
current_root.decode('utf8')):
1985
root_dir_info = root_dir_info[:2] + \
1986
('tree-reference',) + root_dir_info[3:]
1988
if not root_entries and not root_dir_info:
1989
# this specified path is not present at all, skip it.
1991
path_handled = False
1992
for entry in root_entries:
1993
for result in _process_entry(entry, root_dir_info):
1994
# this check should probably be outside the loop: one
1995
# 'iterate two trees' api, and then _iter_changes filters
1996
# unchanged pairs. - RBC 20070226
1998
if (include_unchanged
1999
or result[2] # content change
2000
or result[3][0] != result[3][1] # versioned status
2001
or result[4][0] != result[4][1] # parent id
2002
or result[5][0] != result[5][1] # name
2003
or result[6][0] != result[6][1] # kind
2004
or result[7][0] != result[7][1] # executable
2006
result = (result[0],
2007
((utf8_decode(result[1][0])[0]),
2008
utf8_decode(result[1][1])[0]),) + result[2:]
2010
if want_unversioned and not path_handled:
2011
new_executable = bool(
2012
stat.S_ISREG(root_dir_info[3].st_mode)
2013
and stat.S_IEXEC & root_dir_info[3].st_mode)
2014
yield (None, (None, current_root), True, (False, False),
2016
(None, splitpath(current_root)[-1]),
2017
(None, root_dir_info[2]), (None, new_executable))
2018
initial_key = (current_root, '', '')
2019
block_index, _ = state._find_block_index_from_key(initial_key)
2020
if block_index == 0:
2021
# we have processed the total root already, but because the
2022
# initial key matched it we should skip it here.
2024
if root_dir_info and root_dir_info[2] == 'tree-reference':
2025
current_dir_info = None
2027
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
2029
current_dir_info = dir_iterator.next()
2031
if e.errno in (errno.ENOENT, errno.ENOTDIR):
2032
# there may be directories in the inventory even though
2033
# this path is not a file on disk: so mark it as end of
2035
current_dir_info = None
2039
if current_dir_info[0][0] == '':
2040
# remove .bzr from iteration
2041
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
2042
assert current_dir_info[1][bzr_index][0] == '.bzr'
2043
del current_dir_info[1][bzr_index]
2044
# walk until both the directory listing and the versioned metadata
2046
if (block_index < len(state._dirblocks) and
2047
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2048
current_block = state._dirblocks[block_index]
2050
current_block = None
2051
while (current_dir_info is not None or
2052
current_block is not None):
2053
if (current_dir_info and current_block
2054
and current_dir_info[0][0] != current_block[0]):
2055
if current_dir_info[0][0] < current_block[0] :
2056
# filesystem data refers to paths not covered by the dirblock.
2057
# this has two possibilities:
2058
# A) it is versioned but empty, so there is no block for it
2059
# B) it is not versioned.
2060
# in either case it was processed by the containing directories walk:
2061
# if it is root/foo, when we walked root we emitted it,
2062
# or if we ere given root/foo to walk specifically, we
2063
# emitted it when checking the walk-root entries
2064
# advance the iterator and loop - we dont need to emit it.
2066
current_dir_info = dir_iterator.next()
2067
except StopIteration:
2068
current_dir_info = None
2070
# We have a dirblock entry for this location, but there
2071
# is no filesystem path for this. This is most likely
2072
# because a directory was removed from the disk.
2073
# We don't have to report the missing directory,
2074
# because that should have already been handled, but we
2075
# need to handle all of the files that are contained
2077
for current_entry in current_block[1]:
2078
# entry referring to file not present on disk.
2079
# advance the entry only, after processing.
2080
for result in _process_entry(current_entry, None):
2081
# this check should probably be outside the loop: one
2082
# 'iterate two trees' api, and then _iter_changes filters
2083
# unchanged pairs. - RBC 20070226
2084
if (include_unchanged
2085
or result[2] # content change
2086
or result[3][0] != result[3][1] # versioned status
2087
or result[4][0] != result[4][1] # parent id
2088
or result[5][0] != result[5][1] # name
2089
or result[6][0] != result[6][1] # kind
2090
or result[7][0] != result[7][1] # executable
2092
result = (result[0],
2093
((utf8_decode(result[1][0])[0]),
2094
utf8_decode(result[1][1])[0]),) + result[2:]
2097
if (block_index < len(state._dirblocks) and
2098
osutils.is_inside(current_root,
2099
state._dirblocks[block_index][0])):
2100
current_block = state._dirblocks[block_index]
2102
current_block = None
2105
if current_block and entry_index < len(current_block[1]):
2106
current_entry = current_block[1][entry_index]
2108
current_entry = None
2109
advance_entry = True
2111
if current_dir_info and path_index < len(current_dir_info[1]):
2112
current_path_info = current_dir_info[1][path_index]
2113
if current_path_info[2] == 'directory':
2114
if self.target._directory_is_tree_reference(
2115
current_path_info[0].decode('utf8')):
2116
current_path_info = current_path_info[:2] + \
2117
('tree-reference',) + current_path_info[3:]
2119
current_path_info = None
2121
path_handled = False
2122
while (current_entry is not None or
2123
current_path_info is not None):
2124
if current_entry is None:
2125
# the check for path_handled when the path is adnvaced
2126
# will yield this path if needed.
2128
elif current_path_info is None:
2129
# no path is fine: the per entry code will handle it.
2130
for result in _process_entry(current_entry, current_path_info):
2131
# this check should probably be outside the loop: one
2132
# 'iterate two trees' api, and then _iter_changes filters
2133
# unchanged pairs. - RBC 20070226
2134
if (include_unchanged
2135
or result[2] # content change
2136
or result[3][0] != result[3][1] # versioned status
2137
or result[4][0] != result[4][1] # parent id
2138
or result[5][0] != result[5][1] # name
2139
or result[6][0] != result[6][1] # kind
2140
or result[7][0] != result[7][1] # executable
2142
result = (result[0],
2143
((utf8_decode(result[1][0])[0]),
2144
utf8_decode(result[1][1])[0]),) + result[2:]
2146
elif current_entry[0][1] != current_path_info[1]:
2147
if current_path_info[1] < current_entry[0][1]:
2148
# extra file on disk: pass for now, but only
2149
# increment the path, not the entry
2150
advance_entry = False
2152
# entry referring to file not present on disk.
2153
# advance the entry only, after processing.
2154
for result in _process_entry(current_entry, None):
2155
# this check should probably be outside the loop: one
2156
# 'iterate two trees' api, and then _iter_changes filters
2157
# unchanged pairs. - RBC 20070226
2159
if (include_unchanged
2160
or result[2] # content change
2161
or result[3][0] != result[3][1] # versioned status
2162
or result[4][0] != result[4][1] # parent id
2163
or result[5][0] != result[5][1] # name
2164
or result[6][0] != result[6][1] # kind
2165
or result[7][0] != result[7][1] # executable
2167
result = (result[0],
2168
((utf8_decode(result[1][0])[0]),
2169
utf8_decode(result[1][1])[0]),) + result[2:]
2171
advance_path = False
2173
for result in _process_entry(current_entry, current_path_info):
2174
# this check should probably be outside the loop: one
2175
# 'iterate two trees' api, and then _iter_changes filters
2176
# unchanged pairs. - RBC 20070226
2178
if (include_unchanged
2179
or result[2] # content change
2180
or result[3][0] != result[3][1] # versioned status
2181
or result[4][0] != result[4][1] # parent id
2182
or result[5][0] != result[5][1] # name
2183
or result[6][0] != result[6][1] # kind
2184
or result[7][0] != result[7][1] # executable
2186
result = (result[0],
2187
((utf8_decode(result[1][0])[0]),
2188
utf8_decode(result[1][1])[0]),) + result[2:]
2190
if advance_entry and current_entry is not None:
2192
if entry_index < len(current_block[1]):
2193
current_entry = current_block[1][entry_index]
2195
current_entry = None
2197
advance_entry = True # reset the advance flaga
2198
if advance_path and current_path_info is not None:
2199
if not path_handled:
2200
# unversioned in all regards
2201
if want_unversioned:
2202
new_executable = bool(
2203
stat.S_ISREG(current_path_info[3].st_mode)
2204
and stat.S_IEXEC & current_path_info[3].st_mode)
2205
if want_unversioned:
2206
yield (None, (None, current_path_info[0]),
2210
(None, current_path_info[1]),
2211
(None, current_path_info[2]),
2212
(None, new_executable))
2213
# dont descend into this unversioned path if it is
2215
if current_path_info[2] in ('directory'):
2216
del current_dir_info[1][path_index]
2218
# dont descend the disk iterator into any tree
2220
if current_path_info[2] == 'tree-reference':
2221
del current_dir_info[1][path_index]
2224
if path_index < len(current_dir_info[1]):
2225
current_path_info = current_dir_info[1][path_index]
2226
if current_path_info[2] == 'directory':
2227
if self.target._directory_is_tree_reference(
2228
current_path_info[0].decode('utf8')):
2229
current_path_info = current_path_info[:2] + \
2230
('tree-reference',) + current_path_info[3:]
2232
current_path_info = None
2233
path_handled = False
2235
advance_path = True # reset the advance flagg.
2236
if current_block is not None:
2238
if (block_index < len(state._dirblocks) and
2239
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2240
current_block = state._dirblocks[block_index]
2242
current_block = None
2243
if current_dir_info is not None:
2245
current_dir_info = dir_iterator.next()
2246
except StopIteration:
2247
current_dir_info = None
2118
2251
def is_compatible(source, target):
2119
2252
# the target must be a dirstate working tree
2120
if not isinstance(target, DirStateWorkingTree):
2253
if not isinstance(target, WorkingTree4):
2122
# the source must be a revtree or dirstate rev tree.
2255
# the source must be a revtreee or dirstate rev tree.
2123
2256
if not isinstance(source,
2124
2257
(revisiontree.RevisionTree, DirStateRevisionTree)):
2126
2259
# the source revid must be in the target dirstate
2127
if not (source._revision_id == _mod_revision.NULL_REVISION or
2260
if not (source._revision_id == NULL_REVISION or
2128
2261
source._revision_id in target.get_parent_ids()):
2129
# TODO: what about ghosts? it may well need to
2262
# TODO: what about ghosts? it may well need to
2130
2263
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
