1238
1203
self._inventory.remove_recursive_id(file_id)
1240
1205
@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
1206
def _write_inventory(self, inv):
1265
1207
"""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)
1208
assert not self._dirty, "attempting to write an inventory when the dirstate is dirty will cause data loss"
1209
self.current_dirstate().set_state_from_inventory(inv)
1210
self._make_dirty(reset_inventory=False)
1211
if self._inventory is not None:
1280
1212
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):
1216
class WorkingTreeFormat4(WorkingTreeFormat3):
1217
"""The first consolidated dirstate working tree format.
1220
- exists within a metadir controlling .bzr
1221
- includes an explicit version marker for the workingtree control
1222
files, separate from the BzrDir format
1223
- modifies the hash cache format
1224
- is new in bzr 0.15
1225
- uses a LockDir to guard access to it.
1228
def get_format_string(self):
1229
"""See WorkingTreeFormat.get_format_string()."""
1230
return "Bazaar Working Tree Format 4 (bzr 0.15)\n"
1232
def get_format_description(self):
1233
"""See WorkingTreeFormat.get_format_description()."""
1234
return "Working tree format 4"
1236
def initialize(self, a_bzrdir, revision_id=None):
1377
1237
"""See WorkingTreeFormat.initialize().
1379
1239
:param revision_id: allows creating a working tree at a different
1380
1240
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.
1242
These trees get an initial random root id.
1244
revision_id = osutils.safe_revision_id(revision_id)
1391
1245
if not isinstance(a_bzrdir.transport, LocalTransport):
1392
1246
raise errors.NotLocalUrl(a_bzrdir.transport.base)
1393
1247
transport = a_bzrdir.get_workingtree_transport(self)
1394
1248
control_files = self._open_control_files(a_bzrdir)
1395
1249
control_files.create_lock()
1396
1250
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()
1251
control_files.put_utf8('format', self.get_format_string())
1252
branch = a_bzrdir.open_branch()
1403
1253
if revision_id is None:
1404
1254
revision_id = branch.last_revision()
1405
1255
local_path = transport.local_abspath('dirstate')
1406
1256
# write out new dirstate (must exist when we create the tree)
1407
1257
state = dirstate.DirState.initialize(local_path)
1410
wt = self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
1259
wt = WorkingTree4(a_bzrdir.root_transport.local_abspath('.'),
1413
1262
_bzrdir=a_bzrdir,
1414
1263
_control_files=control_files)
1416
1265
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)
1268
if revision_id in (None, NULL_REVISION):
1269
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)]
1271
wt.current_dirstate()._validate()
1272
wt.set_last_revision(revision_id)
1274
basis = wt.basis_tree()
1440
1275
basis.lock_read()
1442
wt.set_parent_trees(parents_list, allow_leftmost_as_ghost=True)
1276
# if the basis has a root id we have to use that; otherwise we use
1278
basis_root_id = basis.get_root_id()
1279
if basis_root_id is not None:
1280
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)
1282
transform.build_tree(basis, wt)
1466
1285
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
1289
def _open(self, a_bzrdir, control_files):
1480
1290
"""Open the tree itself.
1482
1292
:param a_bzrdir: the dir for the tree.
1483
1293
:param control_files: the control files for the tree.
1485
return self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
1295
return WorkingTree4(a_bzrdir.root_transport.local_abspath('.'),
1486
1296
branch=a_bzrdir.open_branch(),
1488
1298
_bzrdir=a_bzrdir,
1489
1299
_control_files=control_files)
1491
1301
def __get_matchingbzrdir(self):
1492
return self._get_matchingbzrdir()
1494
def _get_matchingbzrdir(self):
1495
"""Overrideable method to get a bzrdir for testing."""
1496
1302
# please test against something that will let us do tree references
1497
1303
return bzrdir.format_registry.make_bzrdir(
1498
1304
'dirstate-with-subtree')
2080
1731
if not found_versioned:
2081
1732
# 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)
1734
all_versioned = False
1736
if not all_versioned:
1737
raise errors.PathsNotVersionedError(specific_files)
2086
1738
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2087
search_specific_files = osutils.minimum_path_selection(specific_files)
1739
search_specific_files = set()
1740
for path in specific_files:
1741
other_specific_files = specific_files.difference(set([path]))
1742
if not osutils.is_inside_any(other_specific_files, path):
1743
# this is a top level path, we must check it.
1744
search_specific_files.add(path)
1746
# compare source_index and target_index at or under each element of search_specific_files.
1747
# follow the following comparison table. Note that we only want to do diff operations when
1748
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1752
# Source | Target | disk | action
1753
# r | fdlt | | add source to search, add id path move and perform
1754
# | | | diff check on source-target
1755
# r | fdlt | a | dangling file that was present in the basis.
1757
# r | a | | add source to search
1759
# r | r | | this path is present in a non-examined tree, skip.
1760
# r | r | a | this path is present in a non-examined tree, skip.
1761
# a | fdlt | | add new id
1762
# a | fdlt | a | dangling locally added file, skip
1763
# a | a | | not present in either tree, skip
1764
# a | a | a | not present in any tree, skip
1765
# a | r | | not present in either tree at this path, skip as it
1766
# | | | may not be selected by the users list of paths.
1767
# a | r | a | not present in either tree at this path, skip as it
1768
# | | | may not be selected by the users list of paths.
1769
# fdlt | fdlt | | content in both: diff them
1770
# fdlt | fdlt | a | deleted locally, but not unversioned - show as deleted ?
1771
# fdlt | a | | unversioned: output deleted id for now
1772
# fdlt | a | a | unversioned and deleted: output deleted id
1773
# fdlt | r | | relocated in this tree, so add target to search.
1774
# | | | Dont diff, we will see an r,fd; pair when we reach
1775
# | | | this id at the other path.
1776
# fdlt | r | a | relocated in this tree, so add target to search.
1777
# | | | Dont diff, we will see an r,fd; pair when we reach
1778
# | | | this id at the other path.
1780
# for all search_indexs in each path at or under each element of
1781
# search_specific_files, if the detail is relocated: add the id, and add the
1782
# relocated path as one to search if its not searched already. If the
1783
# detail is not relocated, add the id.
1784
searched_specific_files = set()
1785
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1786
# Using a list so that we can access the values and change them in
1787
# nested scope. Each one is [path, file_id, entry]
1788
last_source_parent = [None, None, None]
1789
last_target_parent = [None, None, None]
2089
1791
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()
1793
def _process_entry(entry, path_info):
1794
"""Compare an entry and real disk to generate delta information.
1796
:param path_info: top_relpath, basename, kind, lstat, abspath for
1797
the path of entry. If None, then the path is considered absent.
1798
(Perhaps we should pass in a concrete entry for this ?)
1799
Basename is returned as a utf8 string because we expect this
1800
tuple will be ignored, and don't want to take the time to
1803
if source_index is None:
1804
source_details = NULL_PARENT_DETAILS
1806
source_details = entry[1][source_index]
1807
target_details = entry[1][target_index]
1808
target_minikind = target_details[0]
1809
if path_info is not None and target_minikind in 'fdlt':
1810
assert target_index == 0
1811
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
1812
stat_value=path_info[3])
1813
# The entry may have been modified by update_entry
1814
target_details = entry[1][target_index]
1815
target_minikind = target_details[0]
1818
source_minikind = source_details[0]
1819
if source_minikind in 'fdltr' and target_minikind in 'fdlt':
1820
# claimed content in both: diff
1821
# r | fdlt | | add source to search, add id path move and perform
1822
# | | | diff check on source-target
1823
# r | fdlt | a | dangling file that was present in the basis.
1825
if source_minikind in 'r':
1826
# add the source to the search path to find any children it
1827
# has. TODO ? : only add if it is a container ?
1828
if not osutils.is_inside_any(searched_specific_files,
1830
search_specific_files.add(source_details[1])
1831
# generate the old path; this is needed for stating later
1833
old_path = source_details[1]
1834
old_dirname, old_basename = os.path.split(old_path)
1835
path = pathjoin(entry[0][0], entry[0][1])
1836
old_entry = state._get_entry(source_index,
1838
# update the source details variable to be the real
1840
source_details = old_entry[1][source_index]
1841
source_minikind = source_details[0]
1843
old_dirname = entry[0][0]
1844
old_basename = entry[0][1]
1845
old_path = path = pathjoin(old_dirname, old_basename)
1846
if path_info is None:
1847
# the file is missing on disk, show as removed.
1848
content_change = True
1852
# source and target are both versioned and disk file is present.
1853
target_kind = path_info[2]
1854
if target_kind == 'directory':
1855
if source_minikind != 'd':
1856
content_change = True
1858
# directories have no fingerprint
1859
content_change = False
1861
elif target_kind == 'file':
1862
if source_minikind != 'f':
1863
content_change = True
1865
# We could check the size, but we already have the
1867
content_change = (link_or_sha1 != source_details[1])
1868
# Target details is updated at update_entry time
1869
if use_filesystem_for_exec:
1870
# We don't need S_ISREG here, because we are sure
1871
# we are dealing with a file.
1872
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
1874
target_exec = target_details[3]
1875
elif target_kind == 'symlink':
1876
if source_minikind != 'l':
1877
content_change = True
1879
content_change = (link_or_sha1 != source_details[1])
1881
elif target_kind == 'tree-reference':
1882
if source_minikind != 't':
1883
content_change = True
1885
content_change = False
1888
raise Exception, "unknown kind %s" % path_info[2]
1889
# parent id is the entry for the path in the target tree
1890
if old_dirname == last_source_parent[0]:
1891
source_parent_id = last_source_parent[1]
1893
source_parent_entry = state._get_entry(source_index,
1894
path_utf8=old_dirname)
1895
source_parent_id = source_parent_entry[0][2]
1896
if source_parent_id == entry[0][2]:
1897
# This is the root, so the parent is None
1898
source_parent_id = None
1900
last_source_parent[0] = old_dirname
1901
last_source_parent[1] = source_parent_id
1902
last_source_parent[2] = source_parent_entry
1903
new_dirname = entry[0][0]
1904
if new_dirname == last_target_parent[0]:
1905
target_parent_id = last_target_parent[1]
1907
# TODO: We don't always need to do the lookup, because the
1908
# parent entry will be the same as the source entry.
1909
target_parent_entry = state._get_entry(target_index,
1910
path_utf8=new_dirname)
1911
target_parent_id = target_parent_entry[0][2]
1912
if target_parent_id == entry[0][2]:
1913
# This is the root, so the parent is None
1914
target_parent_id = None
1916
last_target_parent[0] = new_dirname
1917
last_target_parent[1] = target_parent_id
1918
last_target_parent[2] = target_parent_entry
1920
source_exec = source_details[3]
1921
return ((entry[0][2], (old_path, path), content_change,
1923
(source_parent_id, target_parent_id),
1924
(old_basename, entry[0][1]),
1925
(_minikind_to_kind[source_minikind], target_kind),
1926
(source_exec, target_exec)),)
1927
elif source_minikind in 'a' and target_minikind in 'fdlt':
1928
# looks like a new file
1929
if path_info is not None:
1930
path = pathjoin(entry[0][0], entry[0][1])
1931
# parent id is the entry for the path in the target tree
1932
# TODO: these are the same for an entire directory: cache em.
1933
parent_id = state._get_entry(target_index,
1934
path_utf8=entry[0][0])[0][2]
1935
if parent_id == entry[0][2]:
1937
if use_filesystem_for_exec:
1938
# We need S_ISREG here, because we aren't sure if this
1941
stat.S_ISREG(path_info[3].st_mode)
1942
and stat.S_IEXEC & path_info[3].st_mode)
1944
target_exec = target_details[3]
1945
return ((entry[0][2], (None, path), True,
1948
(None, entry[0][1]),
1949
(None, path_info[2]),
1950
(None, target_exec)),)
1952
# but its not on disk: we deliberately treat this as just
1953
# never-present. (Why ?! - RBC 20070224)
1955
elif source_minikind in 'fdlt' and target_minikind in 'a':
1956
# unversioned, possibly, or possibly not deleted: we dont care.
1957
# if its still on disk, *and* theres no other entry at this
1958
# path [we dont know this in this routine at the moment -
1959
# perhaps we should change this - then it would be an unknown.
1960
old_path = pathjoin(entry[0][0], entry[0][1])
1961
# parent id is the entry for the path in the target tree
1962
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
1963
if parent_id == entry[0][2]:
1965
return ((entry[0][2], (old_path, None), True,
1968
(entry[0][1], None),
1969
(_minikind_to_kind[source_minikind], None),
1970
(source_details[3], None)),)
1971
elif source_minikind in 'fdlt' and target_minikind in 'r':
1972
# a rename; could be a true rename, or a rename inherited from
1973
# a renamed parent. TODO: handle this efficiently. Its not
1974
# common case to rename dirs though, so a correct but slow
1975
# implementation will do.
1976
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
1977
search_specific_files.add(target_details[1])
1978
elif source_minikind in 'ra' and target_minikind in 'ra':
1979
# neither of the selected trees contain this file,
1980
# so skip over it. This is not currently directly tested, but
1981
# is indirectly via test_too_much.TestCommands.test_conflicts.
1984
raise AssertionError("don't know how to compare "
1985
"source_minikind=%r, target_minikind=%r"
1986
% (source_minikind, target_minikind))
1987
## import pdb;pdb.set_trace()
1990
while search_specific_files:
1991
# TODO: the pending list should be lexically sorted? the
1992
# interface doesn't require it.
1993
current_root = search_specific_files.pop()
1994
current_root_unicode = current_root.decode('utf8')
1995
searched_specific_files.add(current_root)
1996
# process the entries for this containing directory: the rest will be
1997
# found by their parents recursively.
1998
root_entries = _entries_for_path(current_root)
1999
root_abspath = self.target.abspath(current_root_unicode)
2001
root_stat = os.lstat(root_abspath)
2003
if e.errno == errno.ENOENT:
2004
# the path does not exist: let _process_entry know that.
2005
root_dir_info = None
2007
# some other random error: hand it up.
2010
root_dir_info = ('', current_root,
2011
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
2013
if root_dir_info[2] == 'directory':
2014
if self.target._directory_is_tree_reference(
2015
current_root.decode('utf8')):
2016
root_dir_info = root_dir_info[:2] + \
2017
('tree-reference',) + root_dir_info[3:]
2019
if not root_entries and not root_dir_info:
2020
# this specified path is not present at all, skip it.
2022
path_handled = False
2023
for entry in root_entries:
2024
for result in _process_entry(entry, root_dir_info):
2025
# this check should probably be outside the loop: one
2026
# 'iterate two trees' api, and then _iter_changes filters
2027
# unchanged pairs. - RBC 20070226
2029
if (include_unchanged
2030
or result[2] # content change
2031
or result[3][0] != result[3][1] # versioned status
2032
or result[4][0] != result[4][1] # parent id
2033
or result[5][0] != result[5][1] # name
2034
or result[6][0] != result[6][1] # kind
2035
or result[7][0] != result[7][1] # executable
2038
(utf8_decode_or_none(result[1][0]),
2039
utf8_decode_or_none(result[1][1])),
2043
(utf8_decode_or_none(result[5][0]),
2044
utf8_decode_or_none(result[5][1])),
2048
if want_unversioned and not path_handled and root_dir_info:
2049
new_executable = bool(
2050
stat.S_ISREG(root_dir_info[3].st_mode)
2051
and stat.S_IEXEC & root_dir_info[3].st_mode)
2053
(None, current_root_unicode),
2057
(None, splitpath(current_root_unicode)[-1]),
2058
(None, root_dir_info[2]),
2059
(None, new_executable)
2061
initial_key = (current_root, '', '')
2062
block_index, _ = state._find_block_index_from_key(initial_key)
2063
if block_index == 0:
2064
# we have processed the total root already, but because the
2065
# initial key matched it we should skip it here.
2067
if root_dir_info and root_dir_info[2] == 'tree-reference':
2068
current_dir_info = None
2070
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
2072
current_dir_info = dir_iterator.next()
2074
# on win32, python2.4 has e.errno == ERROR_DIRECTORY, but
2075
# python 2.5 has e.errno == EINVAL,
2076
# and e.winerror == ERROR_DIRECTORY
2077
e_winerror = getattr(e, 'winerror', None)
2078
# there may be directories in the inventory even though
2079
# this path is not a file on disk: so mark it as end of
2081
if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
2082
current_dir_info = None
2083
elif (sys.platform == 'win32'
2084
and ERROR_DIRECTORY in (e.errno, e_winerror)):
2085
current_dir_info = None
2089
if current_dir_info[0][0] == '':
2090
# remove .bzr from iteration
2091
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
2092
assert current_dir_info[1][bzr_index][0] == '.bzr'
2093
del current_dir_info[1][bzr_index]
2094
# walk until both the directory listing and the versioned metadata
2096
if (block_index < len(state._dirblocks) and
2097
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2098
current_block = state._dirblocks[block_index]
2100
current_block = None
2101
while (current_dir_info is not None or
2102
current_block is not None):
2103
if (current_dir_info and current_block
2104
and current_dir_info[0][0] != current_block[0]):
2105
if current_dir_info[0][0] < current_block[0] :
2106
# filesystem data refers to paths not covered by the dirblock.
2107
# this has two possibilities:
2108
# A) it is versioned but empty, so there is no block for it
2109
# B) it is not versioned.
2110
# in either case it was processed by the containing directories walk:
2111
# if it is root/foo, when we walked root we emitted it,
2112
# or if we ere given root/foo to walk specifically, we
2113
# emitted it when checking the walk-root entries
2114
# advance the iterator and loop - we dont need to emit it.
2116
current_dir_info = dir_iterator.next()
2117
except StopIteration:
2118
current_dir_info = None
2120
# We have a dirblock entry for this location, but there
2121
# is no filesystem path for this. This is most likely
2122
# because a directory was removed from the disk.
2123
# We don't have to report the missing directory,
2124
# because that should have already been handled, but we
2125
# need to handle all of the files that are contained
2127
for current_entry in current_block[1]:
2128
# entry referring to file not present on disk.
2129
# advance the entry only, after processing.
2130
for result in _process_entry(current_entry, None):
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
2143
(utf8_decode_or_none(result[1][0]),
2144
utf8_decode_or_none(result[1][1])),
2148
(utf8_decode_or_none(result[5][0]),
2149
utf8_decode_or_none(result[5][1])),
2154
if (block_index < len(state._dirblocks) and
2155
osutils.is_inside(current_root,
2156
state._dirblocks[block_index][0])):
2157
current_block = state._dirblocks[block_index]
2159
current_block = None
2162
if current_block and entry_index < len(current_block[1]):
2163
current_entry = current_block[1][entry_index]
2165
current_entry = None
2166
advance_entry = True
2168
if current_dir_info and path_index < len(current_dir_info[1]):
2169
current_path_info = current_dir_info[1][path_index]
2170
if current_path_info[2] == 'directory':
2171
if self.target._directory_is_tree_reference(
2172
current_path_info[0].decode('utf8')):
2173
current_path_info = current_path_info[:2] + \
2174
('tree-reference',) + current_path_info[3:]
2176
current_path_info = None
2178
path_handled = False
2179
while (current_entry is not None or
2180
current_path_info is not None):
2181
if current_entry is None:
2182
# the check for path_handled when the path is adnvaced
2183
# will yield this path if needed.
2185
elif current_path_info is None:
2186
# no path is fine: the per entry code will handle it.
2187
for result in _process_entry(current_entry, current_path_info):
2188
# this check should probably be outside the loop: one
2189
# 'iterate two trees' api, and then _iter_changes filters
2190
# unchanged pairs. - RBC 20070226
2191
if (include_unchanged
2192
or result[2] # content change
2193
or result[3][0] != result[3][1] # versioned status
2194
or result[4][0] != result[4][1] # parent id
2195
or result[5][0] != result[5][1] # name
2196
or result[6][0] != result[6][1] # kind
2197
or result[7][0] != result[7][1] # executable
2200
(utf8_decode_or_none(result[1][0]),
2201
utf8_decode_or_none(result[1][1])),
2205
(utf8_decode_or_none(result[5][0]),
2206
utf8_decode_or_none(result[5][1])),
2210
elif current_entry[0][1] != current_path_info[1]:
2211
if current_path_info[1] < current_entry[0][1]:
2212
# extra file on disk: pass for now, but only
2213
# increment the path, not the entry
2214
advance_entry = False
2216
# entry referring to file not present on disk.
2217
# advance the entry only, after processing.
2218
for result in _process_entry(current_entry, None):
2219
# this check should probably be outside the loop: one
2220
# 'iterate two trees' api, and then _iter_changes filters
2221
# unchanged pairs. - RBC 20070226
2223
if (include_unchanged
2224
or result[2] # content change
2225
or result[3][0] != result[3][1] # versioned status
2226
or result[4][0] != result[4][1] # parent id
2227
or result[5][0] != result[5][1] # name
2228
or result[6][0] != result[6][1] # kind
2229
or result[7][0] != result[7][1] # executable
2232
(utf8_decode_or_none(result[1][0]),
2233
utf8_decode_or_none(result[1][1])),
2237
(utf8_decode_or_none(result[5][0]),
2238
utf8_decode_or_none(result[5][1])),
2242
advance_path = False
2244
for result in _process_entry(current_entry, current_path_info):
2245
# this check should probably be outside the loop: one
2246
# 'iterate two trees' api, and then _iter_changes filters
2247
# unchanged pairs. - RBC 20070226
2249
if (include_unchanged
2250
or result[2] # content change
2251
or result[3][0] != result[3][1] # versioned status
2252
or result[4][0] != result[4][1] # parent id
2253
or result[5][0] != result[5][1] # name
2254
or result[6][0] != result[6][1] # kind
2255
or result[7][0] != result[7][1] # executable
2258
(utf8_decode_or_none(result[1][0]),
2259
utf8_decode_or_none(result[1][1])),
2263
(utf8_decode_or_none(result[5][0]),
2264
utf8_decode_or_none(result[5][1])),
2268
if advance_entry and current_entry is not None:
2270
if entry_index < len(current_block[1]):
2271
current_entry = current_block[1][entry_index]
2273
current_entry = None
2275
advance_entry = True # reset the advance flaga
2276
if advance_path and current_path_info is not None:
2277
if not path_handled:
2278
# unversioned in all regards
2279
if want_unversioned:
2280
new_executable = bool(
2281
stat.S_ISREG(current_path_info[3].st_mode)
2282
and stat.S_IEXEC & current_path_info[3].st_mode)
2283
if want_unversioned:
2285
(None, utf8_decode_or_none(current_path_info[0])),
2289
(None, utf8_decode_or_none(current_path_info[1])),
2290
(None, current_path_info[2]),
2291
(None, new_executable))
2292
# dont descend into this unversioned path if it is
2294
if current_path_info[2] in ('directory'):
2295
del current_dir_info[1][path_index]
2297
# dont descend the disk iterator into any tree
2299
if current_path_info[2] == 'tree-reference':
2300
del current_dir_info[1][path_index]
2303
if path_index < len(current_dir_info[1]):
2304
current_path_info = current_dir_info[1][path_index]
2305
if current_path_info[2] == 'directory':
2306
if self.target._directory_is_tree_reference(
2307
current_path_info[0].decode('utf8')):
2308
current_path_info = current_path_info[:2] + \
2309
('tree-reference',) + current_path_info[3:]
2311
current_path_info = None
2312
path_handled = False
2314
advance_path = True # reset the advance flagg.
2315
if current_block is not None:
2317
if (block_index < len(state._dirblocks) and
2318
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2319
current_block = state._dirblocks[block_index]
2321
current_block = None
2322
if current_dir_info is not None:
2324
current_dir_info = dir_iterator.next()
2325
except StopIteration:
2326
current_dir_info = None
2096
2330
def is_compatible(source, target):
2097
2331
# the target must be a dirstate working tree
2098
if not isinstance(target, DirStateWorkingTree):
2332
if not isinstance(target, WorkingTree4):
2100
# the source must be a revtree or dirstate rev tree.
2334
# the source must be a revtreee or dirstate rev tree.
2101
2335
if not isinstance(source,
2102
2336
(revisiontree.RevisionTree, DirStateRevisionTree)):
2104
2338
# the source revid must be in the target dirstate
2105
if not (source._revision_id == _mod_revision.NULL_REVISION or
2339
if not (source._revision_id == NULL_REVISION or
2106
2340
source._revision_id in target.get_parent_ids()):
2107
# TODO: what about ghosts? it may well need to
2341
# TODO: what about ghosts? it may well need to
2108
2342
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
