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