1275
1230
@needs_tree_write_lock
1276
1231
def _write_inventory(self, inv):
1277
1232
"""Write inventory as the current inventory."""
1279
raise AssertionError("attempting to write an inventory when the "
1280
"dirstate is dirty will lose pending changes")
1281
had_inventory = self._inventory is not None
1282
# Setting self._inventory = None forces the dirstate to regenerate the
1283
# working inventory. We do this because self.inventory may be inv, or
1284
# may have been modified, and either case would prevent a clean delta
1286
self._inventory = None
1288
delta = inv._make_delta(self.inventory)
1290
self.apply_inventory_delta(delta)
1233
assert not self._dirty, "attempting to write an inventory when the dirstate is dirty will cause data loss"
1234
self.current_dirstate().set_state_from_inventory(inv)
1235
self._make_dirty(reset_inventory=False)
1236
if self._inventory is not None:
1292
1237
self._inventory = inv
1296
class ContentFilterAwareSHA1Provider(dirstate.SHA1Provider):
1298
def __init__(self, tree):
1301
def sha1(self, abspath):
1302
"""See dirstate.SHA1Provider.sha1()."""
1303
filters = self.tree._content_filter_stack(
1304
self.tree.relpath(osutils.safe_unicode(abspath)))
1305
return internal_size_sha_file_byname(abspath, filters)[1]
1307
def stat_and_sha1(self, abspath):
1308
"""See dirstate.SHA1Provider.stat_and_sha1()."""
1309
filters = self.tree._content_filter_stack(
1310
self.tree.relpath(osutils.safe_unicode(abspath)))
1311
file_obj = file(abspath, 'rb', 65000)
1313
statvalue = os.fstat(file_obj.fileno())
1315
file_obj = filtered_input_file(file_obj, filters)
1316
sha1 = osutils.size_sha_file(file_obj)[1]
1319
return statvalue, sha1
1322
class ContentFilteringDirStateWorkingTree(DirStateWorkingTree):
1323
"""Dirstate working tree that supports content filtering.
1325
The dirstate holds the hash and size of the canonical form of the file,
1326
and most methods must return that.
1329
def _file_content_summary(self, path, stat_result):
1330
# This is to support the somewhat obsolete path_content_summary method
1331
# with content filtering: see
1332
# <https://bugs.edge.launchpad.net/bzr/+bug/415508>.
1334
# If the dirstate cache is up to date and knows the hash and size,
1336
# Otherwise if there are no content filters, return the on-disk size
1337
# and leave the hash blank.
1338
# Otherwise, read and filter the on-disk file and use its size and
1341
# The dirstate doesn't store the size of the canonical form so we
1342
# can't trust it for content-filtered trees. We just return None.
1343
dirstate_sha1 = self._dirstate.sha1_from_stat(path, stat_result)
1344
executable = self._is_executable_from_path_and_stat(path, stat_result)
1345
return ('file', None, executable, dirstate_sha1)
1348
class WorkingTree4(DirStateWorkingTree):
1349
"""This is the Format 4 working tree.
1351
This differs from WorkingTree3 by:
1352
- Having a consolidated internal dirstate, stored in a
1353
randomly-accessible sorted file on disk.
1354
- Not having a regular inventory attribute. One can be synthesized
1355
on demand but this is expensive and should be avoided.
1357
This is new in bzr 0.15.
1361
class WorkingTree5(ContentFilteringDirStateWorkingTree):
1362
"""This is the Format 5 working tree.
1364
This differs from WorkingTree4 by:
1365
- Supporting content filtering.
1367
This is new in bzr 1.11.
1371
class WorkingTree6(ContentFilteringDirStateWorkingTree):
1372
"""This is the Format 6 working tree.
1374
This differs from WorkingTree5 by:
1375
- Supporting a current view that may mask the set of files in a tree
1376
impacted by most user operations.
1378
This is new in bzr 1.14.
1381
def _make_views(self):
1382
return views.PathBasedViews(self)
1385
class DirStateWorkingTreeFormat(WorkingTreeFormat3):
1387
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
1388
accelerator_tree=None, hardlink=False):
1241
class WorkingTreeFormat4(WorkingTreeFormat3):
1242
"""The first consolidated dirstate working tree format.
1245
- exists within a metadir controlling .bzr
1246
- includes an explicit version marker for the workingtree control
1247
files, separate from the BzrDir format
1248
- modifies the hash cache format
1249
- is new in bzr 0.15
1250
- uses a LockDir to guard access to it.
1253
upgrade_recommended = False
1255
def get_format_string(self):
1256
"""See WorkingTreeFormat.get_format_string()."""
1257
return "Bazaar Working Tree Format 4 (bzr 0.15)\n"
1259
def get_format_description(self):
1260
"""See WorkingTreeFormat.get_format_description()."""
1261
return "Working tree format 4"
1263
def initialize(self, a_bzrdir, revision_id=None):
1389
1264
"""See WorkingTreeFormat.initialize().
1391
1266
:param revision_id: allows creating a working tree at a different
1392
1267
revision than the branch is at.
1393
:param accelerator_tree: A tree which can be used for retrieving file
1394
contents more quickly than the revision tree, i.e. a workingtree.
1395
The revision tree will be used for cases where accelerator_tree's
1396
content is different.
1397
:param hardlink: If true, hard-link files from accelerator_tree,
1400
1269
These trees get an initial random root id, if their repository supports
1401
1270
rich root data, TREE_ROOT otherwise.
1272
revision_id = osutils.safe_revision_id(revision_id)
1403
1273
if not isinstance(a_bzrdir.transport, LocalTransport):
1404
1274
raise errors.NotLocalUrl(a_bzrdir.transport.base)
1405
1275
transport = a_bzrdir.get_workingtree_transport(self)
1406
1276
control_files = self._open_control_files(a_bzrdir)
1407
1277
control_files.create_lock()
1408
1278
control_files.lock_write()
1409
transport.put_bytes('format', self.get_format_string(),
1410
mode=a_bzrdir._get_file_mode())
1411
if from_branch is not None:
1412
branch = from_branch
1414
branch = a_bzrdir.open_branch()
1279
control_files.put_utf8('format', self.get_format_string())
1280
branch = a_bzrdir.open_branch()
1415
1281
if revision_id is None:
1416
1282
revision_id = branch.last_revision()
1417
1283
local_path = transport.local_abspath('dirstate')
2099
1801
if not found_versioned:
2100
1802
# none of the indexes was not 'absent' at all ids for this
2102
not_versioned.append(path)
2103
if len(not_versioned) > 0:
2104
raise errors.PathsNotVersionedError(not_versioned)
1804
all_versioned = False
1806
if not all_versioned:
1807
raise errors.PathsNotVersionedError(specific_files)
2105
1808
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2106
search_specific_files = osutils.minimum_path_selection(specific_files)
1809
search_specific_files = set()
1810
for path in specific_files:
1811
other_specific_files = specific_files.difference(set([path]))
1812
if not osutils.is_inside_any(other_specific_files, path):
1813
# this is a top level path, we must check it.
1814
search_specific_files.add(path)
1816
# compare source_index and target_index at or under each element of search_specific_files.
1817
# follow the following comparison table. Note that we only want to do diff operations when
1818
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1822
# Source | Target | disk | action
1823
# r | fdlt | | add source to search, add id path move and perform
1824
# | | | diff check on source-target
1825
# r | fdlt | a | dangling file that was present in the basis.
1827
# r | a | | add source to search
1829
# r | r | | this path is present in a non-examined tree, skip.
1830
# r | r | a | this path is present in a non-examined tree, skip.
1831
# a | fdlt | | add new id
1832
# a | fdlt | a | dangling locally added file, skip
1833
# a | a | | not present in either tree, skip
1834
# a | a | a | not present in any tree, skip
1835
# a | r | | not present in either tree at this path, skip as it
1836
# | | | may not be selected by the users list of paths.
1837
# a | r | a | not present in either tree at this path, skip as it
1838
# | | | may not be selected by the users list of paths.
1839
# fdlt | fdlt | | content in both: diff them
1840
# fdlt | fdlt | a | deleted locally, but not unversioned - show as deleted ?
1841
# fdlt | a | | unversioned: output deleted id for now
1842
# fdlt | a | a | unversioned and deleted: output deleted id
1843
# fdlt | r | | relocated in this tree, so add target to search.
1844
# | | | Dont diff, we will see an r,fd; pair when we reach
1845
# | | | this id at the other path.
1846
# fdlt | r | a | relocated in this tree, so add target to search.
1847
# | | | Dont diff, we will see an r,fd; pair when we reach
1848
# | | | this id at the other path.
1850
# for all search_indexs in each path at or under each element of
1851
# search_specific_files, if the detail is relocated: add the id, and add the
1852
# relocated path as one to search if its not searched already. If the
1853
# detail is not relocated, add the id.
1854
searched_specific_files = set()
1855
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1856
# Using a list so that we can access the values and change them in
1857
# nested scope. Each one is [path, file_id, entry]
1858
last_source_parent = [None, None]
1859
last_target_parent = [None, None]
2108
1861
use_filesystem_for_exec = (sys.platform != 'win32')
2109
iter_changes = self.target._iter_changes(include_unchanged,
2110
use_filesystem_for_exec, search_specific_files, state,
2111
source_index, target_index, want_unversioned, self.target)
2112
return iter_changes.iter_changes()
1863
# Just a sentry, so that _process_entry can say that this
1864
# record is handled, but isn't interesting to process (unchanged)
1865
uninteresting = object()
1868
old_dirname_to_file_id = {}
1869
new_dirname_to_file_id = {}
1870
# TODO: jam 20070516 - Avoid the _get_entry lookup overhead by
1871
# keeping a cache of directories that we have seen.
1873
def _process_entry(entry, path_info):
1874
"""Compare an entry and real disk to generate delta information.
1876
:param path_info: top_relpath, basename, kind, lstat, abspath for
1877
the path of entry. If None, then the path is considered absent.
1878
(Perhaps we should pass in a concrete entry for this ?)
1879
Basename is returned as a utf8 string because we expect this
1880
tuple will be ignored, and don't want to take the time to
1882
:return: None if these don't match
1883
A tuple of information about the change, or
1884
the object 'uninteresting' if these match, but are
1885
basically identical.
1887
if source_index is None:
1888
source_details = NULL_PARENT_DETAILS
1890
source_details = entry[1][source_index]
1891
target_details = entry[1][target_index]
1892
target_minikind = target_details[0]
1893
if path_info is not None and target_minikind in 'fdlt':
1894
assert target_index == 0
1895
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
1896
stat_value=path_info[3])
1897
# The entry may have been modified by update_entry
1898
target_details = entry[1][target_index]
1899
target_minikind = target_details[0]
1902
file_id = entry[0][2]
1903
source_minikind = source_details[0]
1904
if source_minikind in 'fdltr' and target_minikind in 'fdlt':
1905
# claimed content in both: diff
1906
# r | fdlt | | add source to search, add id path move and perform
1907
# | | | diff check on source-target
1908
# r | fdlt | a | dangling file that was present in the basis.
1910
if source_minikind in 'r':
1911
# add the source to the search path to find any children it
1912
# has. TODO ? : only add if it is a container ?
1913
if not osutils.is_inside_any(searched_specific_files,
1915
search_specific_files.add(source_details[1])
1916
# generate the old path; this is needed for stating later
1918
old_path = source_details[1]
1919
old_dirname, old_basename = os.path.split(old_path)
1920
path = pathjoin(entry[0][0], entry[0][1])
1921
old_entry = state._get_entry(source_index,
1923
# update the source details variable to be the real
1925
source_details = old_entry[1][source_index]
1926
source_minikind = source_details[0]
1928
old_dirname = entry[0][0]
1929
old_basename = entry[0][1]
1930
old_path = path = None
1931
if path_info is None:
1932
# the file is missing on disk, show as removed.
1933
content_change = True
1937
# source and target are both versioned and disk file is present.
1938
target_kind = path_info[2]
1939
if target_kind == 'directory':
1941
old_path = path = pathjoin(old_dirname, old_basename)
1942
new_dirname_to_file_id[path] = file_id
1943
if source_minikind != 'd':
1944
content_change = True
1946
# directories have no fingerprint
1947
content_change = False
1949
elif target_kind == 'file':
1950
if source_minikind != 'f':
1951
content_change = True
1953
# We could check the size, but we already have the
1955
content_change = (link_or_sha1 != source_details[1])
1956
# Target details is updated at update_entry time
1957
if use_filesystem_for_exec:
1958
# We don't need S_ISREG here, because we are sure
1959
# we are dealing with a file.
1960
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
1962
target_exec = target_details[3]
1963
elif target_kind == 'symlink':
1964
if source_minikind != 'l':
1965
content_change = True
1967
content_change = (link_or_sha1 != source_details[1])
1969
elif target_kind == 'tree-reference':
1970
if source_minikind != 't':
1971
content_change = True
1973
content_change = False
1976
raise Exception, "unknown kind %s" % path_info[2]
1977
if source_minikind == 'd':
1979
old_path = path = pathjoin(old_dirname, old_basename)
1980
old_dirname_to_file_id[old_path] = file_id
1981
# parent id is the entry for the path in the target tree
1982
if old_dirname == last_source_parent[0]:
1983
source_parent_id = last_source_parent[1]
1986
source_parent_id = old_dirname_to_file_id[old_dirname]
1988
source_parent_entry = state._get_entry(source_index,
1989
path_utf8=old_dirname)
1990
source_parent_id = source_parent_entry[0][2]
1991
if source_parent_id == entry[0][2]:
1992
# This is the root, so the parent is None
1993
source_parent_id = None
1995
last_source_parent[0] = old_dirname
1996
last_source_parent[1] = source_parent_id
1997
new_dirname = entry[0][0]
1998
if new_dirname == last_target_parent[0]:
1999
target_parent_id = last_target_parent[1]
2002
target_parent_id = new_dirname_to_file_id[new_dirname]
2004
# TODO: We don't always need to do the lookup, because the
2005
# parent entry will be the same as the source entry.
2006
target_parent_entry = state._get_entry(target_index,
2007
path_utf8=new_dirname)
2008
assert target_parent_entry != (None, None), (
2009
"Could not find target parent in wt: %s\nparent of: %s"
2010
% (new_dirname, entry))
2011
target_parent_id = target_parent_entry[0][2]
2012
if target_parent_id == entry[0][2]:
2013
# This is the root, so the parent is None
2014
target_parent_id = None
2016
last_target_parent[0] = new_dirname
2017
last_target_parent[1] = target_parent_id
2019
source_exec = source_details[3]
2020
if (include_unchanged
2022
or source_parent_id != target_parent_id
2023
or old_basename != entry[0][1]
2024
or source_exec != target_exec
2026
if old_path is None:
2027
old_path = path = pathjoin(old_dirname, old_basename)
2028
old_path_u = utf8_decode(old_path)[0]
2031
old_path_u = utf8_decode(old_path)[0]
2032
if old_path == path:
2035
path_u = utf8_decode(path)[0]
2036
source_kind = _minikind_to_kind[source_minikind]
2037
return (entry[0][2],
2038
(old_path_u, path_u),
2041
(source_parent_id, target_parent_id),
2042
(utf8_decode(old_basename)[0], utf8_decode(entry[0][1])[0]),
2043
(source_kind, target_kind),
2044
(source_exec, target_exec))
2046
return uninteresting
2047
elif source_minikind in 'a' and target_minikind in 'fdlt':
2048
# looks like a new file
2049
if path_info is not None:
2050
path = pathjoin(entry[0][0], entry[0][1])
2051
# parent id is the entry for the path in the target tree
2052
# TODO: these are the same for an entire directory: cache em.
2053
parent_id = state._get_entry(target_index,
2054
path_utf8=entry[0][0])[0][2]
2055
if parent_id == entry[0][2]:
2057
if use_filesystem_for_exec:
2058
# We need S_ISREG here, because we aren't sure if this
2061
stat.S_ISREG(path_info[3].st_mode)
2062
and stat.S_IEXEC & path_info[3].st_mode)
2064
target_exec = target_details[3]
2065
return (entry[0][2],
2066
(None, utf8_decode(path)[0]),
2070
(None, utf8_decode(entry[0][1])[0]),
2071
(None, path_info[2]),
2072
(None, target_exec))
2074
# but its not on disk: we deliberately treat this as just
2075
# never-present. (Why ?! - RBC 20070224)
2077
elif source_minikind in 'fdlt' and target_minikind in 'a':
2078
# unversioned, possibly, or possibly not deleted: we dont care.
2079
# if its still on disk, *and* theres no other entry at this
2080
# path [we dont know this in this routine at the moment -
2081
# perhaps we should change this - then it would be an unknown.
2082
old_path = pathjoin(entry[0][0], entry[0][1])
2083
# parent id is the entry for the path in the target tree
2084
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
2085
if parent_id == entry[0][2]:
2087
return (entry[0][2],
2088
(utf8_decode(old_path)[0], None),
2092
(utf8_decode(entry[0][1])[0], None),
2093
(_minikind_to_kind[source_minikind], None),
2094
(source_details[3], None))
2095
elif source_minikind in 'fdlt' and target_minikind in 'r':
2096
# a rename; could be a true rename, or a rename inherited from
2097
# a renamed parent. TODO: handle this efficiently. Its not
2098
# common case to rename dirs though, so a correct but slow
2099
# implementation will do.
2100
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
2101
search_specific_files.add(target_details[1])
2102
elif source_minikind in 'ra' and target_minikind in 'ra':
2103
# neither of the selected trees contain this file,
2104
# so skip over it. This is not currently directly tested, but
2105
# is indirectly via test_too_much.TestCommands.test_conflicts.
2108
raise AssertionError("don't know how to compare "
2109
"source_minikind=%r, target_minikind=%r"
2110
% (source_minikind, target_minikind))
2111
## import pdb;pdb.set_trace()
2114
while search_specific_files:
2115
# TODO: the pending list should be lexically sorted? the
2116
# interface doesn't require it.
2117
current_root = search_specific_files.pop()
2118
current_root_unicode = current_root.decode('utf8')
2119
searched_specific_files.add(current_root)
2120
# process the entries for this containing directory: the rest will be
2121
# found by their parents recursively.
2122
root_entries = _entries_for_path(current_root)
2123
root_abspath = self.target.abspath(current_root_unicode)
2125
root_stat = os.lstat(root_abspath)
2127
if e.errno == errno.ENOENT:
2128
# the path does not exist: let _process_entry know that.
2129
root_dir_info = None
2131
# some other random error: hand it up.
2134
root_dir_info = ('', current_root,
2135
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
2137
if root_dir_info[2] == 'directory':
2138
if self.target._directory_is_tree_reference(
2139
current_root.decode('utf8')):
2140
root_dir_info = root_dir_info[:2] + \
2141
('tree-reference',) + root_dir_info[3:]
2143
if not root_entries and not root_dir_info:
2144
# this specified path is not present at all, skip it.
2146
path_handled = False
2147
for entry in root_entries:
2148
result = _process_entry(entry, root_dir_info)
2149
if result is not None:
2151
if result is not uninteresting:
2153
if want_unversioned and not path_handled and root_dir_info:
2154
new_executable = bool(
2155
stat.S_ISREG(root_dir_info[3].st_mode)
2156
and stat.S_IEXEC & root_dir_info[3].st_mode)
2158
(None, current_root_unicode),
2162
(None, splitpath(current_root_unicode)[-1]),
2163
(None, root_dir_info[2]),
2164
(None, new_executable)
2166
initial_key = (current_root, '', '')
2167
block_index, _ = state._find_block_index_from_key(initial_key)
2168
if block_index == 0:
2169
# we have processed the total root already, but because the
2170
# initial key matched it we should skip it here.
2172
if root_dir_info and root_dir_info[2] == 'tree-reference':
2173
current_dir_info = None
2175
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
2177
current_dir_info = dir_iterator.next()
2179
# on win32, python2.4 has e.errno == ERROR_DIRECTORY, but
2180
# python 2.5 has e.errno == EINVAL,
2181
# and e.winerror == ERROR_DIRECTORY
2182
e_winerror = getattr(e, 'winerror', None)
2183
win_errors = (ERROR_DIRECTORY, ERROR_PATH_NOT_FOUND)
2184
# there may be directories in the inventory even though
2185
# this path is not a file on disk: so mark it as end of
2187
if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
2188
current_dir_info = None
2189
elif (sys.platform == 'win32'
2190
and (e.errno in win_errors
2191
or e_winerror in win_errors)):
2192
current_dir_info = None
2196
if current_dir_info[0][0] == '':
2197
# remove .bzr from iteration
2198
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
2199
assert current_dir_info[1][bzr_index][0] == '.bzr'
2200
del current_dir_info[1][bzr_index]
2201
# walk until both the directory listing and the versioned metadata
2203
if (block_index < len(state._dirblocks) and
2204
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2205
current_block = state._dirblocks[block_index]
2207
current_block = None
2208
while (current_dir_info is not None or
2209
current_block is not None):
2210
if (current_dir_info and current_block
2211
and current_dir_info[0][0] != current_block[0]):
2212
if cmp_by_dirs(current_dir_info[0][0], current_block[0]) < 0:
2213
# filesystem data refers to paths not covered by the dirblock.
2214
# this has two possibilities:
2215
# A) it is versioned but empty, so there is no block for it
2216
# B) it is not versioned.
2218
# if (A) then we need to recurse into it to check for
2219
# new unknown files or directories.
2220
# if (B) then we should ignore it, because we don't
2221
# recurse into unknown directories.
2223
while path_index < len(current_dir_info[1]):
2224
current_path_info = current_dir_info[1][path_index]
2225
if want_unversioned:
2226
if current_path_info[2] == 'directory':
2227
if self.target._directory_is_tree_reference(
2228
current_path_info[0].decode('utf8')):
2229
current_path_info = current_path_info[:2] + \
2230
('tree-reference',) + current_path_info[3:]
2231
new_executable = bool(
2232
stat.S_ISREG(current_path_info[3].st_mode)
2233
and stat.S_IEXEC & current_path_info[3].st_mode)
2235
(None, utf8_decode(current_path_info[0])[0]),
2239
(None, utf8_decode(current_path_info[1])[0]),
2240
(None, current_path_info[2]),
2241
(None, new_executable))
2242
# dont descend into this unversioned path if it is
2244
if current_path_info[2] in ('directory',
2246
del current_dir_info[1][path_index]
2250
# This dir info has been handled, go to the next
2252
current_dir_info = dir_iterator.next()
2253
except StopIteration:
2254
current_dir_info = None
2256
# We have a dirblock entry for this location, but there
2257
# is no filesystem path for this. This is most likely
2258
# because a directory was removed from the disk.
2259
# We don't have to report the missing directory,
2260
# because that should have already been handled, but we
2261
# need to handle all of the files that are contained
2263
for current_entry in current_block[1]:
2264
# entry referring to file not present on disk.
2265
# advance the entry only, after processing.
2266
result = _process_entry(current_entry, None)
2267
if result is not None:
2268
if result is not uninteresting:
2271
if (block_index < len(state._dirblocks) and
2272
osutils.is_inside(current_root,
2273
state._dirblocks[block_index][0])):
2274
current_block = state._dirblocks[block_index]
2276
current_block = None
2279
if current_block and entry_index < len(current_block[1]):
2280
current_entry = current_block[1][entry_index]
2282
current_entry = None
2283
advance_entry = True
2285
if current_dir_info and path_index < len(current_dir_info[1]):
2286
current_path_info = current_dir_info[1][path_index]
2287
if current_path_info[2] == 'directory':
2288
if self.target._directory_is_tree_reference(
2289
current_path_info[0].decode('utf8')):
2290
current_path_info = current_path_info[:2] + \
2291
('tree-reference',) + current_path_info[3:]
2293
current_path_info = None
2295
path_handled = False
2296
while (current_entry is not None or
2297
current_path_info is not None):
2298
if current_entry is None:
2299
# the check for path_handled when the path is adnvaced
2300
# will yield this path if needed.
2302
elif current_path_info is None:
2303
# no path is fine: the per entry code will handle it.
2304
result = _process_entry(current_entry, current_path_info)
2305
if result is not None:
2306
if result is not uninteresting:
2308
elif (current_entry[0][1] != current_path_info[1]
2309
or current_entry[1][target_index][0] in 'ar'):
2310
# The current path on disk doesn't match the dirblock
2311
# record. Either the dirblock is marked as absent, or
2312
# the file on disk is not present at all in the
2313
# dirblock. Either way, report about the dirblock
2314
# entry, and let other code handle the filesystem one.
2316
# Compare the basename for these files to determine
2318
if current_path_info[1] < current_entry[0][1]:
2319
# extra file on disk: pass for now, but only
2320
# increment the path, not the entry
2321
advance_entry = False
2323
# entry referring to file not present on disk.
2324
# advance the entry only, after processing.
2325
result = _process_entry(current_entry, None)
2326
if result is not None:
2327
if result is not uninteresting:
2329
advance_path = False
2331
result = _process_entry(current_entry, current_path_info)
2332
if result is not None:
2334
if result is not uninteresting:
2336
if advance_entry and current_entry is not None:
2338
if entry_index < len(current_block[1]):
2339
current_entry = current_block[1][entry_index]
2341
current_entry = None
2343
advance_entry = True # reset the advance flaga
2344
if advance_path and current_path_info is not None:
2345
if not path_handled:
2346
# unversioned in all regards
2347
if want_unversioned:
2348
new_executable = bool(
2349
stat.S_ISREG(current_path_info[3].st_mode)
2350
and stat.S_IEXEC & current_path_info[3].st_mode)
2352
(None, utf8_decode(current_path_info[0])[0]),
2356
(None, utf8_decode(current_path_info[1])[0]),
2357
(None, current_path_info[2]),
2358
(None, new_executable))
2359
# dont descend into this unversioned path if it is
2361
if current_path_info[2] in ('directory'):
2362
del current_dir_info[1][path_index]
2364
# dont descend the disk iterator into any tree
2366
if current_path_info[2] == 'tree-reference':
2367
del current_dir_info[1][path_index]
2370
if path_index < len(current_dir_info[1]):
2371
current_path_info = current_dir_info[1][path_index]
2372
if current_path_info[2] == 'directory':
2373
if self.target._directory_is_tree_reference(
2374
current_path_info[0].decode('utf8')):
2375
current_path_info = current_path_info[:2] + \
2376
('tree-reference',) + current_path_info[3:]
2378
current_path_info = None
2379
path_handled = False
2381
advance_path = True # reset the advance flagg.
2382
if current_block is not None:
2384
if (block_index < len(state._dirblocks) and
2385
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2386
current_block = state._dirblocks[block_index]
2388
current_block = None
2389
if current_dir_info is not None:
2391
current_dir_info = dir_iterator.next()
2392
except StopIteration:
2393
current_dir_info = None
2115
2397
def is_compatible(source, target):
2116
2398
# the target must be a dirstate working tree
2117
if not isinstance(target, DirStateWorkingTree):
2399
if not isinstance(target, WorkingTree4):
2119
# the source must be a revtree or dirstate rev tree.
2401
# the source must be a revtreee or dirstate rev tree.
2120
2402
if not isinstance(source,
2121
2403
(revisiontree.RevisionTree, DirStateRevisionTree)):
2123
2405
# the source revid must be in the target dirstate
2124
if not (source._revision_id == _mod_revision.NULL_REVISION or
2406
if not (source._revision_id == NULL_REVISION or
2125
2407
source._revision_id in target.get_parent_ids()):
2126
# TODO: what about ghosts? it may well need to
2408
# TODO: what about ghosts? it may well need to
2127
2409
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
