1238
1204
self._inventory.remove_recursive_id(file_id)
1240
1206
@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
1207
def _write_inventory(self, inv):
1265
1208
"""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)
1209
assert not self._dirty, "attempting to write an inventory when the dirstate is dirty will cause data loss"
1210
self.current_dirstate().set_state_from_inventory(inv)
1211
self._make_dirty(reset_inventory=False)
1212
if self._inventory is not None:
1280
1213
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):
1217
class WorkingTreeFormat4(WorkingTreeFormat3):
1218
"""The first consolidated dirstate working tree format.
1221
- exists within a metadir controlling .bzr
1222
- includes an explicit version marker for the workingtree control
1223
files, separate from the BzrDir format
1224
- modifies the hash cache format
1225
- is new in bzr 0.15
1226
- uses a LockDir to guard access to it.
1229
def get_format_string(self):
1230
"""See WorkingTreeFormat.get_format_string()."""
1231
return "Bazaar Working Tree Format 4 (bzr 0.15)\n"
1233
def get_format_description(self):
1234
"""See WorkingTreeFormat.get_format_description()."""
1235
return "Working tree format 4"
1237
def initialize(self, a_bzrdir, revision_id=None):
1377
1238
"""See WorkingTreeFormat.initialize().
1379
1240
:param revision_id: allows creating a working tree at a different
1380
1241
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.
1243
These trees get an initial random root id.
1245
revision_id = osutils.safe_revision_id(revision_id)
1391
1246
if not isinstance(a_bzrdir.transport, LocalTransport):
1392
1247
raise errors.NotLocalUrl(a_bzrdir.transport.base)
1393
1248
transport = a_bzrdir.get_workingtree_transport(self)
1394
1249
control_files = self._open_control_files(a_bzrdir)
1395
1250
control_files.create_lock()
1396
1251
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()
1252
control_files.put_utf8('format', self.get_format_string())
1253
branch = a_bzrdir.open_branch()
1403
1254
if revision_id is None:
1404
1255
revision_id = branch.last_revision()
1405
1256
local_path = transport.local_abspath('dirstate')
1406
1257
# write out new dirstate (must exist when we create the tree)
1407
1258
state = dirstate.DirState.initialize(local_path)
1410
wt = self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
1260
wt = WorkingTree4(a_bzrdir.root_transport.local_abspath('.'),
1413
1263
_bzrdir=a_bzrdir,
1414
1264
_control_files=control_files)
1416
1266
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)
1269
if revision_id in (None, NULL_REVISION):
1270
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)]
1272
wt.current_dirstate()._validate()
1273
wt.set_last_revision(revision_id)
1275
basis = wt.basis_tree()
1440
1276
basis.lock_read()
1442
wt.set_parent_trees(parents_list, allow_leftmost_as_ghost=True)
1277
# if the basis has a root id we have to use that; otherwise we use
1279
basis_root_id = basis.get_root_id()
1280
if basis_root_id is not None:
1281
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)
1283
transform.build_tree(basis, wt)
1466
1286
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
1290
def _open(self, a_bzrdir, control_files):
1480
1291
"""Open the tree itself.
1482
1293
:param a_bzrdir: the dir for the tree.
1483
1294
:param control_files: the control files for the tree.
1485
return self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
1296
return WorkingTree4(a_bzrdir.root_transport.local_abspath('.'),
1486
1297
branch=a_bzrdir.open_branch(),
1488
1299
_bzrdir=a_bzrdir,
1489
1300
_control_files=control_files)
1491
1302
def __get_matchingbzrdir(self):
1492
return self._get_matchingbzrdir()
1494
def _get_matchingbzrdir(self):
1495
"""Overrideable method to get a bzrdir for testing."""
1496
1303
# please test against something that will let us do tree references
1497
1304
return bzrdir.format_registry.make_bzrdir(
1498
1305
'dirstate-with-subtree')
2080
1732
if not found_versioned:
2081
1733
# 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)
1735
all_versioned = False
1737
if not all_versioned:
1738
raise errors.PathsNotVersionedError(specific_files)
2086
1739
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2087
search_specific_files = osutils.minimum_path_selection(specific_files)
1740
search_specific_files = set()
1741
for path in specific_files:
1742
other_specific_files = specific_files.difference(set([path]))
1743
if not osutils.is_inside_any(other_specific_files, path):
1744
# this is a top level path, we must check it.
1745
search_specific_files.add(path)
1747
# compare source_index and target_index at or under each element of search_specific_files.
1748
# follow the following comparison table. Note that we only want to do diff operations when
1749
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1753
# Source | Target | disk | action
1754
# r | fdlt | | add source to search, add id path move and perform
1755
# | | | diff check on source-target
1756
# r | fdlt | a | dangling file that was present in the basis.
1758
# r | a | | add source to search
1760
# r | r | | this path is present in a non-examined tree, skip.
1761
# r | r | a | this path is present in a non-examined tree, skip.
1762
# a | fdlt | | add new id
1763
# a | fdlt | a | dangling locally added file, skip
1764
# a | a | | not present in either tree, skip
1765
# a | a | a | not present in any tree, skip
1766
# a | r | | not present in either tree at this path, skip as it
1767
# | | | may not be selected by the users list of paths.
1768
# a | r | a | not present in either tree at this path, skip as it
1769
# | | | may not be selected by the users list of paths.
1770
# fdlt | fdlt | | content in both: diff them
1771
# fdlt | fdlt | a | deleted locally, but not unversioned - show as deleted ?
1772
# fdlt | a | | unversioned: output deleted id for now
1773
# fdlt | a | a | unversioned and deleted: output deleted id
1774
# fdlt | r | | relocated in this tree, so add target to search.
1775
# | | | Dont diff, we will see an r,fd; pair when we reach
1776
# | | | this id at the other path.
1777
# fdlt | r | a | relocated in this tree, so add target to search.
1778
# | | | Dont diff, we will see an r,fd; pair when we reach
1779
# | | | this id at the other path.
1781
# for all search_indexs in each path at or under each element of
1782
# search_specific_files, if the detail is relocated: add the id, and add the
1783
# relocated path as one to search if its not searched already. If the
1784
# detail is not relocated, add the id.
1785
searched_specific_files = set()
1786
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1787
# Using a list so that we can access the values and change them in
1788
# nested scope. Each one is [path, file_id, entry]
1789
last_source_parent = [None, None, None]
1790
last_target_parent = [None, None, None]
2089
1792
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()
1794
def _process_entry(entry, path_info):
1795
"""Compare an entry and real disk to generate delta information.
1797
:param path_info: top_relpath, basename, kind, lstat, abspath for
1798
the path of entry. If None, then the path is considered absent.
1799
(Perhaps we should pass in a concrete entry for this ?)
1800
Basename is returned as a utf8 string because we expect this
1801
tuple will be ignored, and don't want to take the time to
1804
if source_index is None:
1805
source_details = NULL_PARENT_DETAILS
1807
source_details = entry[1][source_index]
1808
target_details = entry[1][target_index]
1809
target_minikind = target_details[0]
1810
if path_info is not None and target_minikind in 'fdlt':
1811
assert target_index == 0
1812
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
1813
stat_value=path_info[3])
1814
# The entry may have been modified by update_entry
1815
target_details = entry[1][target_index]
1816
target_minikind = target_details[0]
1819
source_minikind = source_details[0]
1820
if source_minikind in 'fdltr' and target_minikind in 'fdlt':
1821
# claimed content in both: diff
1822
# r | fdlt | | add source to search, add id path move and perform
1823
# | | | diff check on source-target
1824
# r | fdlt | a | dangling file that was present in the basis.
1826
if source_minikind in 'r':
1827
# add the source to the search path to find any children it
1828
# has. TODO ? : only add if it is a container ?
1829
if not osutils.is_inside_any(searched_specific_files,
1831
search_specific_files.add(source_details[1])
1832
# generate the old path; this is needed for stating later
1834
old_path = source_details[1]
1835
old_dirname, old_basename = os.path.split(old_path)
1836
path = pathjoin(entry[0][0], entry[0][1])
1837
old_entry = state._get_entry(source_index,
1839
# update the source details variable to be the real
1841
source_details = old_entry[1][source_index]
1842
source_minikind = source_details[0]
1844
old_dirname = entry[0][0]
1845
old_basename = entry[0][1]
1846
old_path = path = pathjoin(old_dirname, old_basename)
1847
if path_info is None:
1848
# the file is missing on disk, show as removed.
1849
content_change = True
1853
# source and target are both versioned and disk file is present.
1854
target_kind = path_info[2]
1855
if target_kind == 'directory':
1856
if source_minikind != 'd':
1857
content_change = True
1859
# directories have no fingerprint
1860
content_change = False
1862
elif target_kind == 'file':
1863
if source_minikind != 'f':
1864
content_change = True
1866
# We could check the size, but we already have the
1868
content_change = (link_or_sha1 != source_details[1])
1869
# Target details is updated at update_entry time
1870
if use_filesystem_for_exec:
1871
# We don't need S_ISREG here, because we are sure
1872
# we are dealing with a file.
1873
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
1875
target_exec = target_details[3]
1876
elif target_kind == 'symlink':
1877
if source_minikind != 'l':
1878
content_change = True
1880
content_change = (link_or_sha1 != source_details[1])
1882
elif target_kind == 'tree-reference':
1883
if source_minikind != 't':
1884
content_change = True
1886
content_change = False
1889
raise Exception, "unknown kind %s" % path_info[2]
1890
# parent id is the entry for the path in the target tree
1891
if old_dirname == last_source_parent[0]:
1892
source_parent_id = last_source_parent[1]
1894
source_parent_entry = state._get_entry(source_index,
1895
path_utf8=old_dirname)
1896
source_parent_id = source_parent_entry[0][2]
1897
if source_parent_id == entry[0][2]:
1898
# This is the root, so the parent is None
1899
source_parent_id = None
1901
last_source_parent[0] = old_dirname
1902
last_source_parent[1] = source_parent_id
1903
last_source_parent[2] = source_parent_entry
1904
new_dirname = entry[0][0]
1905
if new_dirname == last_target_parent[0]:
1906
target_parent_id = last_target_parent[1]
1908
# TODO: We don't always need to do the lookup, because the
1909
# parent entry will be the same as the source entry.
1910
target_parent_entry = state._get_entry(target_index,
1911
path_utf8=new_dirname)
1912
target_parent_id = target_parent_entry[0][2]
1913
if target_parent_id == entry[0][2]:
1914
# This is the root, so the parent is None
1915
target_parent_id = None
1917
last_target_parent[0] = new_dirname
1918
last_target_parent[1] = target_parent_id
1919
last_target_parent[2] = target_parent_entry
1921
source_exec = source_details[3]
1922
return ((entry[0][2], (old_path, path), content_change,
1924
(source_parent_id, target_parent_id),
1925
(old_basename, entry[0][1]),
1926
(_minikind_to_kind[source_minikind], target_kind),
1927
(source_exec, target_exec)),)
1928
elif source_minikind in 'a' and target_minikind in 'fdlt':
1929
# looks like a new file
1930
if path_info is not None:
1931
path = pathjoin(entry[0][0], entry[0][1])
1932
# parent id is the entry for the path in the target tree
1933
# TODO: these are the same for an entire directory: cache em.
1934
parent_id = state._get_entry(target_index,
1935
path_utf8=entry[0][0])[0][2]
1936
if parent_id == entry[0][2]:
1938
if use_filesystem_for_exec:
1939
# We need S_ISREG here, because we aren't sure if this
1942
stat.S_ISREG(path_info[3].st_mode)
1943
and stat.S_IEXEC & path_info[3].st_mode)
1945
target_exec = target_details[3]
1946
return ((entry[0][2], (None, path), True,
1949
(None, entry[0][1]),
1950
(None, path_info[2]),
1951
(None, target_exec)),)
1953
# but its not on disk: we deliberately treat this as just
1954
# never-present. (Why ?! - RBC 20070224)
1956
elif source_minikind in 'fdlt' and target_minikind in 'a':
1957
# unversioned, possibly, or possibly not deleted: we dont care.
1958
# if its still on disk, *and* theres no other entry at this
1959
# path [we dont know this in this routine at the moment -
1960
# perhaps we should change this - then it would be an unknown.
1961
old_path = pathjoin(entry[0][0], entry[0][1])
1962
# parent id is the entry for the path in the target tree
1963
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
1964
if parent_id == entry[0][2]:
1966
return ((entry[0][2], (old_path, None), True,
1969
(entry[0][1], None),
1970
(_minikind_to_kind[source_minikind], None),
1971
(source_details[3], None)),)
1972
elif source_minikind in 'fdlt' and target_minikind in 'r':
1973
# a rename; could be a true rename, or a rename inherited from
1974
# a renamed parent. TODO: handle this efficiently. Its not
1975
# common case to rename dirs though, so a correct but slow
1976
# implementation will do.
1977
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
1978
search_specific_files.add(target_details[1])
1979
elif source_minikind in 'ra' and target_minikind in 'ra':
1980
# neither of the selected trees contain this file,
1981
# so skip over it. This is not currently directly tested, but
1982
# is indirectly via test_too_much.TestCommands.test_conflicts.
1985
raise AssertionError("don't know how to compare "
1986
"source_minikind=%r, target_minikind=%r"
1987
% (source_minikind, target_minikind))
1988
## import pdb;pdb.set_trace()
1991
while search_specific_files:
1992
# TODO: the pending list should be lexically sorted? the
1993
# interface doesn't require it.
1994
current_root = search_specific_files.pop()
1995
current_root_unicode = current_root.decode('utf8')
1996
searched_specific_files.add(current_root)
1997
# process the entries for this containing directory: the rest will be
1998
# found by their parents recursively.
1999
root_entries = _entries_for_path(current_root)
2000
root_abspath = self.target.abspath(current_root_unicode)
2002
root_stat = os.lstat(root_abspath)
2004
if e.errno == errno.ENOENT:
2005
# the path does not exist: let _process_entry know that.
2006
root_dir_info = None
2008
# some other random error: hand it up.
2011
root_dir_info = ('', current_root,
2012
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
2014
if root_dir_info[2] == 'directory':
2015
if self.target._directory_is_tree_reference(
2016
current_root.decode('utf8')):
2017
root_dir_info = root_dir_info[:2] + \
2018
('tree-reference',) + root_dir_info[3:]
2020
if not root_entries and not root_dir_info:
2021
# this specified path is not present at all, skip it.
2023
path_handled = False
2024
for entry in root_entries:
2025
for result in _process_entry(entry, root_dir_info):
2026
# this check should probably be outside the loop: one
2027
# 'iterate two trees' api, and then _iter_changes filters
2028
# unchanged pairs. - RBC 20070226
2030
if (include_unchanged
2031
or result[2] # content change
2032
or result[3][0] != result[3][1] # versioned status
2033
or result[4][0] != result[4][1] # parent id
2034
or result[5][0] != result[5][1] # name
2035
or result[6][0] != result[6][1] # kind
2036
or result[7][0] != result[7][1] # executable
2039
(utf8_decode_or_none(result[1][0]),
2040
utf8_decode_or_none(result[1][1])),
2044
(utf8_decode_or_none(result[5][0]),
2045
utf8_decode_or_none(result[5][1])),
2049
if want_unversioned and not path_handled and root_dir_info:
2050
new_executable = bool(
2051
stat.S_ISREG(root_dir_info[3].st_mode)
2052
and stat.S_IEXEC & root_dir_info[3].st_mode)
2054
(None, current_root_unicode),
2058
(None, splitpath(current_root_unicode)[-1]),
2059
(None, root_dir_info[2]),
2060
(None, new_executable)
2062
initial_key = (current_root, '', '')
2063
block_index, _ = state._find_block_index_from_key(initial_key)
2064
if block_index == 0:
2065
# we have processed the total root already, but because the
2066
# initial key matched it we should skip it here.
2068
if root_dir_info and root_dir_info[2] == 'tree-reference':
2069
current_dir_info = None
2071
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
2073
current_dir_info = dir_iterator.next()
2075
# on win32, python2.4 has e.errno == ERROR_DIRECTORY, but
2076
# python 2.5 has e.errno == EINVAL,
2077
# and e.winerror == ERROR_DIRECTORY
2078
e_winerror = getattr(e, 'winerror', None)
2079
# there may be directories in the inventory even though
2080
# this path is not a file on disk: so mark it as end of
2082
if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
2083
current_dir_info = None
2084
elif (sys.platform == 'win32'
2085
and ERROR_DIRECTORY in (e.errno, e_winerror)):
2086
current_dir_info = None
2090
if current_dir_info[0][0] == '':
2091
# remove .bzr from iteration
2092
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
2093
assert current_dir_info[1][bzr_index][0] == '.bzr'
2094
del current_dir_info[1][bzr_index]
2095
# walk until both the directory listing and the versioned metadata
2097
if (block_index < len(state._dirblocks) and
2098
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2099
current_block = state._dirblocks[block_index]
2101
current_block = None
2102
while (current_dir_info is not None or
2103
current_block is not None):
2104
if (current_dir_info and current_block
2105
and current_dir_info[0][0] != current_block[0]):
2106
if current_dir_info[0][0] < current_block[0] :
2107
# filesystem data refers to paths not covered by the dirblock.
2108
# this has two possibilities:
2109
# A) it is versioned but empty, so there is no block for it
2110
# B) it is not versioned.
2111
# in either case it was processed by the containing directories walk:
2112
# if it is root/foo, when we walked root we emitted it,
2113
# or if we ere given root/foo to walk specifically, we
2114
# emitted it when checking the walk-root entries
2115
# advance the iterator and loop - we dont need to emit it.
2117
current_dir_info = dir_iterator.next()
2118
except StopIteration:
2119
current_dir_info = None
2121
# We have a dirblock entry for this location, but there
2122
# is no filesystem path for this. This is most likely
2123
# because a directory was removed from the disk.
2124
# We don't have to report the missing directory,
2125
# because that should have already been handled, but we
2126
# need to handle all of the files that are contained
2128
for current_entry in current_block[1]:
2129
# entry referring to file not present on disk.
2130
# advance the entry only, after processing.
2131
for result in _process_entry(current_entry, None):
2132
# this check should probably be outside the loop: one
2133
# 'iterate two trees' api, and then _iter_changes filters
2134
# unchanged pairs. - RBC 20070226
2135
if (include_unchanged
2136
or result[2] # content change
2137
or result[3][0] != result[3][1] # versioned status
2138
or result[4][0] != result[4][1] # parent id
2139
or result[5][0] != result[5][1] # name
2140
or result[6][0] != result[6][1] # kind
2141
or result[7][0] != result[7][1] # executable
2144
(utf8_decode_or_none(result[1][0]),
2145
utf8_decode_or_none(result[1][1])),
2149
(utf8_decode_or_none(result[5][0]),
2150
utf8_decode_or_none(result[5][1])),
2155
if (block_index < len(state._dirblocks) and
2156
osutils.is_inside(current_root,
2157
state._dirblocks[block_index][0])):
2158
current_block = state._dirblocks[block_index]
2160
current_block = None
2163
if current_block and entry_index < len(current_block[1]):
2164
current_entry = current_block[1][entry_index]
2166
current_entry = None
2167
advance_entry = True
2169
if current_dir_info and path_index < len(current_dir_info[1]):
2170
current_path_info = current_dir_info[1][path_index]
2171
if current_path_info[2] == 'directory':
2172
if self.target._directory_is_tree_reference(
2173
current_path_info[0].decode('utf8')):
2174
current_path_info = current_path_info[:2] + \
2175
('tree-reference',) + current_path_info[3:]
2177
current_path_info = None
2179
path_handled = False
2180
while (current_entry is not None or
2181
current_path_info is not None):
2182
if current_entry is None:
2183
# the check for path_handled when the path is adnvaced
2184
# will yield this path if needed.
2186
elif current_path_info is None:
2187
# no path is fine: the per entry code will handle it.
2188
for result in _process_entry(current_entry, current_path_info):
2189
# this check should probably be outside the loop: one
2190
# 'iterate two trees' api, and then _iter_changes filters
2191
# unchanged pairs. - RBC 20070226
2192
if (include_unchanged
2193
or result[2] # content change
2194
or result[3][0] != result[3][1] # versioned status
2195
or result[4][0] != result[4][1] # parent id
2196
or result[5][0] != result[5][1] # name
2197
or result[6][0] != result[6][1] # kind
2198
or result[7][0] != result[7][1] # executable
2201
(utf8_decode_or_none(result[1][0]),
2202
utf8_decode_or_none(result[1][1])),
2206
(utf8_decode_or_none(result[5][0]),
2207
utf8_decode_or_none(result[5][1])),
2211
elif current_entry[0][1] != current_path_info[1]:
2212
if current_path_info[1] < current_entry[0][1]:
2213
# extra file on disk: pass for now, but only
2214
# increment the path, not the entry
2215
advance_entry = False
2217
# entry referring to file not present on disk.
2218
# advance the entry only, after processing.
2219
for result in _process_entry(current_entry, None):
2220
# this check should probably be outside the loop: one
2221
# 'iterate two trees' api, and then _iter_changes filters
2222
# unchanged pairs. - RBC 20070226
2224
if (include_unchanged
2225
or result[2] # content change
2226
or result[3][0] != result[3][1] # versioned status
2227
or result[4][0] != result[4][1] # parent id
2228
or result[5][0] != result[5][1] # name
2229
or result[6][0] != result[6][1] # kind
2230
or result[7][0] != result[7][1] # executable
2233
(utf8_decode_or_none(result[1][0]),
2234
utf8_decode_or_none(result[1][1])),
2238
(utf8_decode_or_none(result[5][0]),
2239
utf8_decode_or_none(result[5][1])),
2243
advance_path = False
2245
for result in _process_entry(current_entry, current_path_info):
2246
# this check should probably be outside the loop: one
2247
# 'iterate two trees' api, and then _iter_changes filters
2248
# unchanged pairs. - RBC 20070226
2250
if (include_unchanged
2251
or result[2] # content change
2252
or result[3][0] != result[3][1] # versioned status
2253
or result[4][0] != result[4][1] # parent id
2254
or result[5][0] != result[5][1] # name
2255
or result[6][0] != result[6][1] # kind
2256
or result[7][0] != result[7][1] # executable
2259
(utf8_decode_or_none(result[1][0]),
2260
utf8_decode_or_none(result[1][1])),
2264
(utf8_decode_or_none(result[5][0]),
2265
utf8_decode_or_none(result[5][1])),
2269
if advance_entry and current_entry is not None:
2271
if entry_index < len(current_block[1]):
2272
current_entry = current_block[1][entry_index]
2274
current_entry = None
2276
advance_entry = True # reset the advance flaga
2277
if advance_path and current_path_info is not None:
2278
if not path_handled:
2279
# unversioned in all regards
2280
if want_unversioned:
2281
new_executable = bool(
2282
stat.S_ISREG(current_path_info[3].st_mode)
2283
and stat.S_IEXEC & current_path_info[3].st_mode)
2284
if want_unversioned:
2286
(None, utf8_decode_or_none(current_path_info[0])),
2290
(None, utf8_decode_or_none(current_path_info[1])),
2291
(None, current_path_info[2]),
2292
(None, new_executable))
2293
# dont descend into this unversioned path if it is
2295
if current_path_info[2] in ('directory'):
2296
del current_dir_info[1][path_index]
2298
# dont descend the disk iterator into any tree
2300
if current_path_info[2] == 'tree-reference':
2301
del current_dir_info[1][path_index]
2304
if path_index < len(current_dir_info[1]):
2305
current_path_info = current_dir_info[1][path_index]
2306
if current_path_info[2] == 'directory':
2307
if self.target._directory_is_tree_reference(
2308
current_path_info[0].decode('utf8')):
2309
current_path_info = current_path_info[:2] + \
2310
('tree-reference',) + current_path_info[3:]
2312
current_path_info = None
2313
path_handled = False
2315
advance_path = True # reset the advance flagg.
2316
if current_block is not None:
2318
if (block_index < len(state._dirblocks) and
2319
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2320
current_block = state._dirblocks[block_index]
2322
current_block = None
2323
if current_dir_info is not None:
2325
current_dir_info = dir_iterator.next()
2326
except StopIteration:
2327
current_dir_info = None
2096
2331
def is_compatible(source, target):
2097
2332
# the target must be a dirstate working tree
2098
if not isinstance(target, DirStateWorkingTree):
2333
if not isinstance(target, WorkingTree4):
2100
# the source must be a revtree or dirstate rev tree.
2335
# the source must be a revtreee or dirstate rev tree.
2101
2336
if not isinstance(source,
2102
2337
(revisiontree.RevisionTree, DirStateRevisionTree)):
2104
2339
# the source revid must be in the target dirstate
2105
if not (source._revision_id == _mod_revision.NULL_REVISION or
2340
if not (source._revision_id == NULL_REVISION or
2106
2341
source._revision_id in target.get_parent_ids()):
2107
# TODO: what about ghosts? it may well need to
2342
# TODO: what about ghosts? it may well need to
2108
2343
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
