1263
1227
@needs_tree_write_lock
1264
1228
def _write_inventory(self, inv):
1265
1229
"""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)
1230
assert not self._dirty, ("attempting to write an inventory when the "
1231
"dirstate is dirty will cause data loss")
1232
self.current_dirstate().set_state_from_inventory(inv)
1233
self._make_dirty(reset_inventory=False)
1234
if self._inventory is not None:
1280
1235
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):
1239
class WorkingTreeFormat4(WorkingTreeFormat3):
1240
"""The first consolidated dirstate working tree format.
1243
- exists within a metadir controlling .bzr
1244
- includes an explicit version marker for the workingtree control
1245
files, separate from the BzrDir format
1246
- modifies the hash cache format
1247
- is new in bzr 0.15
1248
- uses a LockDir to guard access to it.
1251
upgrade_recommended = False
1253
def get_format_string(self):
1254
"""See WorkingTreeFormat.get_format_string()."""
1255
return "Bazaar Working Tree Format 4 (bzr 0.15)\n"
1257
def get_format_description(self):
1258
"""See WorkingTreeFormat.get_format_description()."""
1259
return "Working tree format 4"
1375
1261
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
1376
accelerator_tree=None, hardlink=False):
1262
accelerator_tree=None):
1377
1263
"""See WorkingTreeFormat.initialize().
1379
1265
:param revision_id: allows creating a working tree at a different
2080
1830
if not found_versioned:
2081
1831
# 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)
1833
all_versioned = False
1835
if not all_versioned:
1836
raise errors.PathsNotVersionedError(specific_files)
2086
1837
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2087
search_specific_files = osutils.minimum_path_selection(specific_files)
1838
search_specific_files = set()
1839
for path in specific_files:
1840
other_specific_files = specific_files.difference(set([path]))
1841
if not osutils.is_inside_any(other_specific_files, path):
1842
# this is a top level path, we must check it.
1843
search_specific_files.add(path)
1845
# compare source_index and target_index at or under each element of search_specific_files.
1846
# follow the following comparison table. Note that we only want to do diff operations when
1847
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1851
# Source | Target | disk | action
1852
# r | fdlt | | add source to search, add id path move and perform
1853
# | | | diff check on source-target
1854
# r | fdlt | a | dangling file that was present in the basis.
1856
# r | a | | add source to search
1858
# r | r | | this path is present in a non-examined tree, skip.
1859
# r | r | a | this path is present in a non-examined tree, skip.
1860
# a | fdlt | | add new id
1861
# a | fdlt | a | dangling locally added file, skip
1862
# a | a | | not present in either tree, skip
1863
# a | a | a | not present in any tree, skip
1864
# a | r | | not present in either tree at this path, skip as it
1865
# | | | may not be selected by the users list of paths.
1866
# a | r | a | not present in either tree at this path, skip as it
1867
# | | | may not be selected by the users list of paths.
1868
# fdlt | fdlt | | content in both: diff them
1869
# fdlt | fdlt | a | deleted locally, but not unversioned - show as deleted ?
1870
# fdlt | a | | unversioned: output deleted id for now
1871
# fdlt | a | a | unversioned and deleted: output deleted id
1872
# fdlt | r | | relocated in this tree, so add target to search.
1873
# | | | Dont diff, we will see an r,fd; pair when we reach
1874
# | | | this id at the other path.
1875
# fdlt | r | a | relocated in this tree, so add target to search.
1876
# | | | Dont diff, we will see an r,fd; pair when we reach
1877
# | | | this id at the other path.
1879
# for all search_indexs in each path at or under each element of
1880
# search_specific_files, if the detail is relocated: add the id, and add the
1881
# relocated path as one to search if its not searched already. If the
1882
# detail is not relocated, add the id.
1883
searched_specific_files = set()
1884
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1885
# Using a list so that we can access the values and change them in
1886
# nested scope. Each one is [path, file_id, entry]
1887
last_source_parent = [None, None]
1888
last_target_parent = [None, None]
2089
1890
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()
1892
# Just a sentry, so that _process_entry can say that this
1893
# record is handled, but isn't interesting to process (unchanged)
1894
uninteresting = object()
1897
old_dirname_to_file_id = {}
1898
new_dirname_to_file_id = {}
1899
# TODO: jam 20070516 - Avoid the _get_entry lookup overhead by
1900
# keeping a cache of directories that we have seen.
1902
def _process_entry(entry, path_info):
1903
"""Compare an entry and real disk to generate delta information.
1905
:param path_info: top_relpath, basename, kind, lstat, abspath for
1906
the path of entry. If None, then the path is considered absent.
1907
(Perhaps we should pass in a concrete entry for this ?)
1908
Basename is returned as a utf8 string because we expect this
1909
tuple will be ignored, and don't want to take the time to
1911
:return: None if these don't match
1912
A tuple of information about the change, or
1913
the object 'uninteresting' if these match, but are
1914
basically identical.
1916
if source_index is None:
1917
source_details = NULL_PARENT_DETAILS
1919
source_details = entry[1][source_index]
1920
target_details = entry[1][target_index]
1921
target_minikind = target_details[0]
1922
if path_info is not None and target_minikind in 'fdlt':
1923
assert target_index == 0
1924
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
1925
stat_value=path_info[3])
1926
# The entry may have been modified by update_entry
1927
target_details = entry[1][target_index]
1928
target_minikind = target_details[0]
1931
file_id = entry[0][2]
1932
source_minikind = source_details[0]
1933
if source_minikind in 'fdltr' and target_minikind in 'fdlt':
1934
# claimed content in both: diff
1935
# r | fdlt | | add source to search, add id path move and perform
1936
# | | | diff check on source-target
1937
# r | fdlt | a | dangling file that was present in the basis.
1939
if source_minikind in 'r':
1940
# add the source to the search path to find any children it
1941
# has. TODO ? : only add if it is a container ?
1942
if not osutils.is_inside_any(searched_specific_files,
1944
search_specific_files.add(source_details[1])
1945
# generate the old path; this is needed for stating later
1947
old_path = source_details[1]
1948
old_dirname, old_basename = os.path.split(old_path)
1949
path = pathjoin(entry[0][0], entry[0][1])
1950
old_entry = state._get_entry(source_index,
1952
# update the source details variable to be the real
1954
if old_entry == (None, None):
1955
raise errors.CorruptDirstate(state._filename,
1956
"entry '%s/%s' is considered renamed from %r"
1957
" but source does not exist\n"
1958
"entry: %s" % (entry[0][0], entry[0][1], old_path, entry))
1959
source_details = old_entry[1][source_index]
1960
source_minikind = source_details[0]
1962
old_dirname = entry[0][0]
1963
old_basename = entry[0][1]
1964
old_path = path = None
1965
if path_info is None:
1966
# the file is missing on disk, show as removed.
1967
content_change = True
1971
# source and target are both versioned and disk file is present.
1972
target_kind = path_info[2]
1973
if target_kind == 'directory':
1975
old_path = path = pathjoin(old_dirname, old_basename)
1976
new_dirname_to_file_id[path] = file_id
1977
if source_minikind != 'd':
1978
content_change = True
1980
# directories have no fingerprint
1981
content_change = False
1983
elif target_kind == 'file':
1984
if source_minikind != 'f':
1985
content_change = True
1987
# We could check the size, but we already have the
1989
content_change = (link_or_sha1 != source_details[1])
1990
# Target details is updated at update_entry time
1991
if use_filesystem_for_exec:
1992
# We don't need S_ISREG here, because we are sure
1993
# we are dealing with a file.
1994
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
1996
target_exec = target_details[3]
1997
elif target_kind == 'symlink':
1998
if source_minikind != 'l':
1999
content_change = True
2001
content_change = (link_or_sha1 != source_details[1])
2003
elif target_kind == 'tree-reference':
2004
if source_minikind != 't':
2005
content_change = True
2007
content_change = False
2010
raise Exception, "unknown kind %s" % path_info[2]
2011
if source_minikind == 'd':
2013
old_path = path = pathjoin(old_dirname, old_basename)
2014
old_dirname_to_file_id[old_path] = file_id
2015
# parent id is the entry for the path in the target tree
2016
if old_dirname == last_source_parent[0]:
2017
source_parent_id = last_source_parent[1]
2020
source_parent_id = old_dirname_to_file_id[old_dirname]
2022
source_parent_entry = state._get_entry(source_index,
2023
path_utf8=old_dirname)
2024
source_parent_id = source_parent_entry[0][2]
2025
if source_parent_id == entry[0][2]:
2026
# This is the root, so the parent is None
2027
source_parent_id = None
2029
last_source_parent[0] = old_dirname
2030
last_source_parent[1] = source_parent_id
2031
new_dirname = entry[0][0]
2032
if new_dirname == last_target_parent[0]:
2033
target_parent_id = last_target_parent[1]
2036
target_parent_id = new_dirname_to_file_id[new_dirname]
2038
# TODO: We don't always need to do the lookup, because the
2039
# parent entry will be the same as the source entry.
2040
target_parent_entry = state._get_entry(target_index,
2041
path_utf8=new_dirname)
2042
assert target_parent_entry != (None, None), (
2043
"Could not find target parent in wt: %s\nparent of: %s"
2044
% (new_dirname, entry))
2045
target_parent_id = target_parent_entry[0][2]
2046
if target_parent_id == entry[0][2]:
2047
# This is the root, so the parent is None
2048
target_parent_id = None
2050
last_target_parent[0] = new_dirname
2051
last_target_parent[1] = target_parent_id
2053
source_exec = source_details[3]
2054
if (include_unchanged
2056
or source_parent_id != target_parent_id
2057
or old_basename != entry[0][1]
2058
or source_exec != target_exec
2060
if old_path is None:
2061
old_path = path = pathjoin(old_dirname, old_basename)
2062
old_path_u = utf8_decode(old_path)[0]
2065
old_path_u = utf8_decode(old_path)[0]
2066
if old_path == path:
2069
path_u = utf8_decode(path)[0]
2070
source_kind = _minikind_to_kind[source_minikind]
2071
return (entry[0][2],
2072
(old_path_u, path_u),
2075
(source_parent_id, target_parent_id),
2076
(utf8_decode(old_basename)[0], utf8_decode(entry[0][1])[0]),
2077
(source_kind, target_kind),
2078
(source_exec, target_exec))
2080
return uninteresting
2081
elif source_minikind in 'a' and target_minikind in 'fdlt':
2082
# looks like a new file
2083
if path_info is not None:
2084
path = pathjoin(entry[0][0], entry[0][1])
2085
# parent id is the entry for the path in the target tree
2086
# TODO: these are the same for an entire directory: cache em.
2087
parent_id = state._get_entry(target_index,
2088
path_utf8=entry[0][0])[0][2]
2089
if parent_id == entry[0][2]:
2091
if use_filesystem_for_exec:
2092
# We need S_ISREG here, because we aren't sure if this
2095
stat.S_ISREG(path_info[3].st_mode)
2096
and stat.S_IEXEC & path_info[3].st_mode)
2098
target_exec = target_details[3]
2099
return (entry[0][2],
2100
(None, utf8_decode(path)[0]),
2104
(None, utf8_decode(entry[0][1])[0]),
2105
(None, path_info[2]),
2106
(None, target_exec))
2108
# but its not on disk: we deliberately treat this as just
2109
# never-present. (Why ?! - RBC 20070224)
2111
elif source_minikind in 'fdlt' and target_minikind in 'a':
2112
# unversioned, possibly, or possibly not deleted: we dont care.
2113
# if its still on disk, *and* theres no other entry at this
2114
# path [we dont know this in this routine at the moment -
2115
# perhaps we should change this - then it would be an unknown.
2116
old_path = pathjoin(entry[0][0], entry[0][1])
2117
# parent id is the entry for the path in the target tree
2118
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
2119
if parent_id == entry[0][2]:
2121
return (entry[0][2],
2122
(utf8_decode(old_path)[0], None),
2126
(utf8_decode(entry[0][1])[0], None),
2127
(_minikind_to_kind[source_minikind], None),
2128
(source_details[3], None))
2129
elif source_minikind in 'fdlt' and target_minikind in 'r':
2130
# a rename; could be a true rename, or a rename inherited from
2131
# a renamed parent. TODO: handle this efficiently. Its not
2132
# common case to rename dirs though, so a correct but slow
2133
# implementation will do.
2134
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
2135
search_specific_files.add(target_details[1])
2136
elif source_minikind in 'ra' and target_minikind in 'ra':
2137
# neither of the selected trees contain this file,
2138
# so skip over it. This is not currently directly tested, but
2139
# is indirectly via test_too_much.TestCommands.test_conflicts.
2142
raise AssertionError("don't know how to compare "
2143
"source_minikind=%r, target_minikind=%r"
2144
% (source_minikind, target_minikind))
2145
## import pdb;pdb.set_trace()
2148
while search_specific_files:
2149
# TODO: the pending list should be lexically sorted? the
2150
# interface doesn't require it.
2151
current_root = search_specific_files.pop()
2152
current_root_unicode = current_root.decode('utf8')
2153
searched_specific_files.add(current_root)
2154
# process the entries for this containing directory: the rest will be
2155
# found by their parents recursively.
2156
root_entries = _entries_for_path(current_root)
2157
root_abspath = self.target.abspath(current_root_unicode)
2159
root_stat = os.lstat(root_abspath)
2161
if e.errno == errno.ENOENT:
2162
# the path does not exist: let _process_entry know that.
2163
root_dir_info = None
2165
# some other random error: hand it up.
2168
root_dir_info = ('', current_root,
2169
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
2171
if root_dir_info[2] == 'directory':
2172
if self.target._directory_is_tree_reference(
2173
current_root.decode('utf8')):
2174
root_dir_info = root_dir_info[:2] + \
2175
('tree-reference',) + root_dir_info[3:]
2177
if not root_entries and not root_dir_info:
2178
# this specified path is not present at all, skip it.
2180
path_handled = False
2181
for entry in root_entries:
2182
result = _process_entry(entry, root_dir_info)
2183
if result is not None:
2185
if result is not uninteresting:
2187
if want_unversioned and not path_handled and root_dir_info:
2188
new_executable = bool(
2189
stat.S_ISREG(root_dir_info[3].st_mode)
2190
and stat.S_IEXEC & root_dir_info[3].st_mode)
2192
(None, current_root_unicode),
2196
(None, splitpath(current_root_unicode)[-1]),
2197
(None, root_dir_info[2]),
2198
(None, new_executable)
2200
initial_key = (current_root, '', '')
2201
block_index, _ = state._find_block_index_from_key(initial_key)
2202
if block_index == 0:
2203
# we have processed the total root already, but because the
2204
# initial key matched it we should skip it here.
2206
if root_dir_info and root_dir_info[2] == 'tree-reference':
2207
current_dir_info = None
2209
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
2211
current_dir_info = dir_iterator.next()
2213
# on win32, python2.4 has e.errno == ERROR_DIRECTORY, but
2214
# python 2.5 has e.errno == EINVAL,
2215
# and e.winerror == ERROR_DIRECTORY
2216
e_winerror = getattr(e, 'winerror', None)
2217
win_errors = (ERROR_DIRECTORY, ERROR_PATH_NOT_FOUND)
2218
# there may be directories in the inventory even though
2219
# this path is not a file on disk: so mark it as end of
2221
if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
2222
current_dir_info = None
2223
elif (sys.platform == 'win32'
2224
and (e.errno in win_errors
2225
or e_winerror in win_errors)):
2226
current_dir_info = None
2230
if current_dir_info[0][0] == '':
2231
# remove .bzr from iteration
2232
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
2233
assert current_dir_info[1][bzr_index][0] == '.bzr'
2234
del current_dir_info[1][bzr_index]
2235
# walk until both the directory listing and the versioned metadata
2237
if (block_index < len(state._dirblocks) and
2238
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2239
current_block = state._dirblocks[block_index]
2241
current_block = None
2242
while (current_dir_info is not None or
2243
current_block is not None):
2244
if (current_dir_info and current_block
2245
and current_dir_info[0][0] != current_block[0]):
2246
if cmp_by_dirs(current_dir_info[0][0], current_block[0]) < 0:
2247
# filesystem data refers to paths not covered by the dirblock.
2248
# this has two possibilities:
2249
# A) it is versioned but empty, so there is no block for it
2250
# B) it is not versioned.
2252
# if (A) then we need to recurse into it to check for
2253
# new unknown files or directories.
2254
# if (B) then we should ignore it, because we don't
2255
# recurse into unknown directories.
2257
while path_index < len(current_dir_info[1]):
2258
current_path_info = current_dir_info[1][path_index]
2259
if want_unversioned:
2260
if current_path_info[2] == 'directory':
2261
if self.target._directory_is_tree_reference(
2262
current_path_info[0].decode('utf8')):
2263
current_path_info = current_path_info[:2] + \
2264
('tree-reference',) + current_path_info[3:]
2265
new_executable = bool(
2266
stat.S_ISREG(current_path_info[3].st_mode)
2267
and stat.S_IEXEC & current_path_info[3].st_mode)
2269
(None, utf8_decode(current_path_info[0])[0]),
2273
(None, utf8_decode(current_path_info[1])[0]),
2274
(None, current_path_info[2]),
2275
(None, new_executable))
2276
# dont descend into this unversioned path if it is
2278
if current_path_info[2] in ('directory',
2280
del current_dir_info[1][path_index]
2284
# This dir info has been handled, go to the next
2286
current_dir_info = dir_iterator.next()
2287
except StopIteration:
2288
current_dir_info = None
2290
# We have a dirblock entry for this location, but there
2291
# is no filesystem path for this. This is most likely
2292
# because a directory was removed from the disk.
2293
# We don't have to report the missing directory,
2294
# because that should have already been handled, but we
2295
# need to handle all of the files that are contained
2297
for current_entry in current_block[1]:
2298
# entry referring to file not present on disk.
2299
# advance the entry only, after processing.
2300
result = _process_entry(current_entry, None)
2301
if result is not None:
2302
if result is not uninteresting:
2305
if (block_index < len(state._dirblocks) and
2306
osutils.is_inside(current_root,
2307
state._dirblocks[block_index][0])):
2308
current_block = state._dirblocks[block_index]
2310
current_block = None
2313
if current_block and entry_index < len(current_block[1]):
2314
current_entry = current_block[1][entry_index]
2316
current_entry = None
2317
advance_entry = True
2319
if current_dir_info and path_index < len(current_dir_info[1]):
2320
current_path_info = current_dir_info[1][path_index]
2321
if current_path_info[2] == 'directory':
2322
if self.target._directory_is_tree_reference(
2323
current_path_info[0].decode('utf8')):
2324
current_path_info = current_path_info[:2] + \
2325
('tree-reference',) + current_path_info[3:]
2327
current_path_info = None
2329
path_handled = False
2330
while (current_entry is not None or
2331
current_path_info is not None):
2332
if current_entry is None:
2333
# the check for path_handled when the path is adnvaced
2334
# will yield this path if needed.
2336
elif current_path_info is None:
2337
# no path is fine: the per entry code will handle it.
2338
result = _process_entry(current_entry, current_path_info)
2339
if result is not None:
2340
if result is not uninteresting:
2342
elif (current_entry[0][1] != current_path_info[1]
2343
or current_entry[1][target_index][0] in 'ar'):
2344
# The current path on disk doesn't match the dirblock
2345
# record. Either the dirblock is marked as absent, or
2346
# the file on disk is not present at all in the
2347
# dirblock. Either way, report about the dirblock
2348
# entry, and let other code handle the filesystem one.
2350
# Compare the basename for these files to determine
2352
if current_path_info[1] < current_entry[0][1]:
2353
# extra file on disk: pass for now, but only
2354
# increment the path, not the entry
2355
advance_entry = False
2357
# entry referring to file not present on disk.
2358
# advance the entry only, after processing.
2359
result = _process_entry(current_entry, None)
2360
if result is not None:
2361
if result is not uninteresting:
2363
advance_path = False
2365
result = _process_entry(current_entry, current_path_info)
2366
if result is not None:
2368
if result is not uninteresting:
2370
if advance_entry and current_entry is not None:
2372
if entry_index < len(current_block[1]):
2373
current_entry = current_block[1][entry_index]
2375
current_entry = None
2377
advance_entry = True # reset the advance flaga
2378
if advance_path and current_path_info is not None:
2379
if not path_handled:
2380
# unversioned in all regards
2381
if want_unversioned:
2382
new_executable = bool(
2383
stat.S_ISREG(current_path_info[3].st_mode)
2384
and stat.S_IEXEC & current_path_info[3].st_mode)
2386
(None, utf8_decode(current_path_info[0])[0]),
2390
(None, utf8_decode(current_path_info[1])[0]),
2391
(None, current_path_info[2]),
2392
(None, new_executable))
2393
# dont descend into this unversioned path if it is
2395
if current_path_info[2] in ('directory'):
2396
del current_dir_info[1][path_index]
2398
# dont descend the disk iterator into any tree
2400
if current_path_info[2] == 'tree-reference':
2401
del current_dir_info[1][path_index]
2404
if path_index < len(current_dir_info[1]):
2405
current_path_info = current_dir_info[1][path_index]
2406
if current_path_info[2] == 'directory':
2407
if self.target._directory_is_tree_reference(
2408
current_path_info[0].decode('utf8')):
2409
current_path_info = current_path_info[:2] + \
2410
('tree-reference',) + current_path_info[3:]
2412
current_path_info = None
2413
path_handled = False
2415
advance_path = True # reset the advance flagg.
2416
if current_block is not None:
2418
if (block_index < len(state._dirblocks) and
2419
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2420
current_block = state._dirblocks[block_index]
2422
current_block = None
2423
if current_dir_info is not None:
2425
current_dir_info = dir_iterator.next()
2426
except StopIteration:
2427
current_dir_info = None
2096
2431
def is_compatible(source, target):
2097
2432
# the target must be a dirstate working tree
2098
if not isinstance(target, DirStateWorkingTree):
2433
if not isinstance(target, WorkingTree4):
2100
# the source must be a revtree or dirstate rev tree.
2435
# the source must be a revtreee or dirstate rev tree.
2101
2436
if not isinstance(source,
2102
2437
(revisiontree.RevisionTree, DirStateRevisionTree)):
2104
2439
# the source revid must be in the target dirstate
2105
if not (source._revision_id == _mod_revision.NULL_REVISION or
2440
if not (source._revision_id == NULL_REVISION or
2106
2441
source._revision_id in target.get_parent_ids()):
2107
# TODO: what about ghosts? it may well need to
2442
# TODO: what about ghosts? it may well need to
2108
2443
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
