1277
1250
@needs_tree_write_lock
1278
1251
def _write_inventory(self, inv):
1279
1252
"""Write inventory as the current inventory."""
1281
raise AssertionError("attempting to write an inventory when the "
1282
"dirstate is dirty will lose pending changes")
1283
had_inventory = self._inventory is not None
1284
# Setting self._inventory = None forces the dirstate to regenerate the
1285
# working inventory. We do this because self.inventory may be inv, or
1286
# may have been modified, and either case would prevent a clean delta
1288
self._inventory = None
1290
delta = inv._make_delta(self.inventory)
1292
self.apply_inventory_delta(delta)
1253
assert not self._dirty, ("attempting to write an inventory when the "
1254
"dirstate is dirty will cause data loss")
1255
self.current_dirstate().set_state_from_inventory(inv)
1256
self._make_dirty(reset_inventory=False)
1257
if self._inventory is not None:
1294
1258
self._inventory = inv
1298
class ContentFilterAwareSHA1Provider(dirstate.SHA1Provider):
1300
def __init__(self, tree):
1303
def sha1(self, abspath):
1304
"""See dirstate.SHA1Provider.sha1()."""
1305
filters = self.tree._content_filter_stack(
1306
self.tree.relpath(osutils.safe_unicode(abspath)))
1307
return internal_size_sha_file_byname(abspath, filters)[1]
1309
def stat_and_sha1(self, abspath):
1310
"""See dirstate.SHA1Provider.stat_and_sha1()."""
1311
filters = self.tree._content_filter_stack(
1312
self.tree.relpath(osutils.safe_unicode(abspath)))
1313
file_obj = file(abspath, 'rb', 65000)
1315
statvalue = os.fstat(file_obj.fileno())
1317
file_obj = filtered_input_file(file_obj, filters)
1318
sha1 = osutils.size_sha_file(file_obj)[1]
1321
return statvalue, sha1
1324
class ContentFilteringDirStateWorkingTree(DirStateWorkingTree):
1325
"""Dirstate working tree that supports content filtering.
1327
The dirstate holds the hash and size of the canonical form of the file,
1328
and most methods must return that.
1331
def _file_content_summary(self, path, stat_result):
1332
# This is to support the somewhat obsolete path_content_summary method
1333
# with content filtering: see
1334
# <https://bugs.edge.launchpad.net/bzr/+bug/415508>.
1336
# If the dirstate cache is up to date and knows the hash and size,
1338
# Otherwise if there are no content filters, return the on-disk size
1339
# and leave the hash blank.
1340
# Otherwise, read and filter the on-disk file and use its size and
1343
# The dirstate doesn't store the size of the canonical form so we
1344
# can't trust it for content-filtered trees. We just return None.
1345
dirstate_sha1 = self._dirstate.sha1_from_stat(path, stat_result)
1346
executable = self._is_executable_from_path_and_stat(path, stat_result)
1347
return ('file', None, executable, dirstate_sha1)
1350
class WorkingTree4(DirStateWorkingTree):
1351
"""This is the Format 4 working tree.
1353
This differs from WorkingTree3 by:
1354
- Having a consolidated internal dirstate, stored in a
1355
randomly-accessible sorted file on disk.
1356
- Not having a regular inventory attribute. One can be synthesized
1357
on demand but this is expensive and should be avoided.
1359
This is new in bzr 0.15.
1363
class WorkingTree5(ContentFilteringDirStateWorkingTree):
1364
"""This is the Format 5 working tree.
1366
This differs from WorkingTree4 by:
1367
- Supporting content filtering.
1369
This is new in bzr 1.11.
1373
class WorkingTree6(ContentFilteringDirStateWorkingTree):
1374
"""This is the Format 6 working tree.
1376
This differs from WorkingTree5 by:
1377
- Supporting a current view that may mask the set of files in a tree
1378
impacted by most user operations.
1380
This is new in bzr 1.14.
1383
def _make_views(self):
1384
return views.PathBasedViews(self)
1387
class DirStateWorkingTreeFormat(WorkingTreeFormat3):
1262
class WorkingTreeFormat4(WorkingTreeFormat3):
1263
"""The first consolidated dirstate working tree format.
1266
- exists within a metadir controlling .bzr
1267
- includes an explicit version marker for the workingtree control
1268
files, separate from the BzrDir format
1269
- modifies the hash cache format
1270
- is new in bzr 0.15
1271
- uses a LockDir to guard access to it.
1274
upgrade_recommended = False
1276
def get_format_string(self):
1277
"""See WorkingTreeFormat.get_format_string()."""
1278
return "Bazaar Working Tree Format 4 (bzr 0.15)\n"
1280
def get_format_description(self):
1281
"""See WorkingTreeFormat.get_format_description()."""
1282
return "Working tree format 4"
1389
1284
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
1390
1285
accelerator_tree=None, hardlink=False):
2102
1863
if not found_versioned:
2103
1864
# none of the indexes was not 'absent' at all ids for this
2105
not_versioned.append(path)
2106
if len(not_versioned) > 0:
2107
raise errors.PathsNotVersionedError(not_versioned)
1866
all_versioned = False
1868
if not all_versioned:
1869
raise errors.PathsNotVersionedError(specific_files)
2108
1870
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2109
search_specific_files = osutils.minimum_path_selection(specific_files)
1871
search_specific_files = set()
1872
for path in specific_files:
1873
other_specific_files = specific_files.difference(set([path]))
1874
if not osutils.is_inside_any(other_specific_files, path):
1875
# this is a top level path, we must check it.
1876
search_specific_files.add(path)
1878
# compare source_index and target_index at or under each element of search_specific_files.
1879
# follow the following comparison table. Note that we only want to do diff operations when
1880
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1884
# Source | Target | disk | action
1885
# r | fdlt | | add source to search, add id path move and perform
1886
# | | | diff check on source-target
1887
# r | fdlt | a | dangling file that was present in the basis.
1889
# r | a | | add source to search
1891
# r | r | | this path is present in a non-examined tree, skip.
1892
# r | r | a | this path is present in a non-examined tree, skip.
1893
# a | fdlt | | add new id
1894
# a | fdlt | a | dangling locally added file, skip
1895
# a | a | | not present in either tree, skip
1896
# a | a | a | not present in any tree, skip
1897
# a | r | | not present in either tree at this path, skip as it
1898
# | | | may not be selected by the users list of paths.
1899
# a | r | a | not present in either tree at this path, skip as it
1900
# | | | may not be selected by the users list of paths.
1901
# fdlt | fdlt | | content in both: diff them
1902
# fdlt | fdlt | a | deleted locally, but not unversioned - show as deleted ?
1903
# fdlt | a | | unversioned: output deleted id for now
1904
# fdlt | a | a | unversioned and deleted: output deleted id
1905
# fdlt | r | | relocated in this tree, so add target to search.
1906
# | | | Dont diff, we will see an r,fd; pair when we reach
1907
# | | | this id at the other path.
1908
# fdlt | r | a | relocated in this tree, so add target to search.
1909
# | | | Dont diff, we will see an r,fd; pair when we reach
1910
# | | | this id at the other path.
1912
# for all search_indexs in each path at or under each element of
1913
# search_specific_files, if the detail is relocated: add the id, and add the
1914
# relocated path as one to search if its not searched already. If the
1915
# detail is not relocated, add the id.
1916
searched_specific_files = set()
1917
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1918
# Using a list so that we can access the values and change them in
1919
# nested scope. Each one is [path, file_id, entry]
1920
last_source_parent = [None, None]
1921
last_target_parent = [None, None]
2111
1923
use_filesystem_for_exec = (sys.platform != 'win32')
2112
iter_changes = self.target._iter_changes(include_unchanged,
2113
use_filesystem_for_exec, search_specific_files, state,
2114
source_index, target_index, want_unversioned, self.target)
2115
return iter_changes.iter_changes()
1925
# Just a sentry, so that _process_entry can say that this
1926
# record is handled, but isn't interesting to process (unchanged)
1927
uninteresting = object()
1930
old_dirname_to_file_id = {}
1931
new_dirname_to_file_id = {}
1932
# TODO: jam 20070516 - Avoid the _get_entry lookup overhead by
1933
# keeping a cache of directories that we have seen.
1935
def _process_entry(entry, path_info):
1936
"""Compare an entry and real disk to generate delta information.
1938
:param path_info: top_relpath, basename, kind, lstat, abspath for
1939
the path of entry. If None, then the path is considered absent.
1940
(Perhaps we should pass in a concrete entry for this ?)
1941
Basename is returned as a utf8 string because we expect this
1942
tuple will be ignored, and don't want to take the time to
1944
:return: None if these don't match
1945
A tuple of information about the change, or
1946
the object 'uninteresting' if these match, but are
1947
basically identical.
1949
if source_index is None:
1950
source_details = NULL_PARENT_DETAILS
1952
source_details = entry[1][source_index]
1953
target_details = entry[1][target_index]
1954
target_minikind = target_details[0]
1955
if path_info is not None and target_minikind in 'fdlt':
1956
assert target_index == 0
1957
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
1958
stat_value=path_info[3])
1959
# The entry may have been modified by update_entry
1960
target_details = entry[1][target_index]
1961
target_minikind = target_details[0]
1964
file_id = entry[0][2]
1965
source_minikind = source_details[0]
1966
if source_minikind in 'fdltr' and target_minikind in 'fdlt':
1967
# claimed content in both: diff
1968
# r | fdlt | | add source to search, add id path move and perform
1969
# | | | diff check on source-target
1970
# r | fdlt | a | dangling file that was present in the basis.
1972
if source_minikind in 'r':
1973
# add the source to the search path to find any children it
1974
# has. TODO ? : only add if it is a container ?
1975
if not osutils.is_inside_any(searched_specific_files,
1977
search_specific_files.add(source_details[1])
1978
# generate the old path; this is needed for stating later
1980
old_path = source_details[1]
1981
old_dirname, old_basename = os.path.split(old_path)
1982
path = pathjoin(entry[0][0], entry[0][1])
1983
old_entry = state._get_entry(source_index,
1985
# update the source details variable to be the real
1987
if old_entry == (None, None):
1988
raise errors.CorruptDirstate(state._filename,
1989
"entry '%s/%s' is considered renamed from %r"
1990
" but source does not exist\n"
1991
"entry: %s" % (entry[0][0], entry[0][1], old_path, entry))
1992
source_details = old_entry[1][source_index]
1993
source_minikind = source_details[0]
1995
old_dirname = entry[0][0]
1996
old_basename = entry[0][1]
1997
old_path = path = None
1998
if path_info is None:
1999
# the file is missing on disk, show as removed.
2000
content_change = True
2004
# source and target are both versioned and disk file is present.
2005
target_kind = path_info[2]
2006
if target_kind == 'directory':
2008
old_path = path = pathjoin(old_dirname, old_basename)
2009
new_dirname_to_file_id[path] = file_id
2010
if source_minikind != 'd':
2011
content_change = True
2013
# directories have no fingerprint
2014
content_change = False
2016
elif target_kind == 'file':
2017
if source_minikind != 'f':
2018
content_change = True
2020
# We could check the size, but we already have the
2022
content_change = (link_or_sha1 != source_details[1])
2023
# Target details is updated at update_entry time
2024
if use_filesystem_for_exec:
2025
# We don't need S_ISREG here, because we are sure
2026
# we are dealing with a file.
2027
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
2029
target_exec = target_details[3]
2030
elif target_kind == 'symlink':
2031
if source_minikind != 'l':
2032
content_change = True
2034
content_change = (link_or_sha1 != source_details[1])
2036
elif target_kind == 'tree-reference':
2037
if source_minikind != 't':
2038
content_change = True
2040
content_change = False
2043
raise Exception, "unknown kind %s" % path_info[2]
2044
if source_minikind == 'd':
2046
old_path = path = pathjoin(old_dirname, old_basename)
2047
old_dirname_to_file_id[old_path] = file_id
2048
# parent id is the entry for the path in the target tree
2049
if old_dirname == last_source_parent[0]:
2050
source_parent_id = last_source_parent[1]
2053
source_parent_id = old_dirname_to_file_id[old_dirname]
2055
source_parent_entry = state._get_entry(source_index,
2056
path_utf8=old_dirname)
2057
source_parent_id = source_parent_entry[0][2]
2058
if source_parent_id == entry[0][2]:
2059
# This is the root, so the parent is None
2060
source_parent_id = None
2062
last_source_parent[0] = old_dirname
2063
last_source_parent[1] = source_parent_id
2064
new_dirname = entry[0][0]
2065
if new_dirname == last_target_parent[0]:
2066
target_parent_id = last_target_parent[1]
2069
target_parent_id = new_dirname_to_file_id[new_dirname]
2071
# TODO: We don't always need to do the lookup, because the
2072
# parent entry will be the same as the source entry.
2073
target_parent_entry = state._get_entry(target_index,
2074
path_utf8=new_dirname)
2075
assert target_parent_entry != (None, None), (
2076
"Could not find target parent in wt: %s\nparent of: %s"
2077
% (new_dirname, entry))
2078
target_parent_id = target_parent_entry[0][2]
2079
if target_parent_id == entry[0][2]:
2080
# This is the root, so the parent is None
2081
target_parent_id = None
2083
last_target_parent[0] = new_dirname
2084
last_target_parent[1] = target_parent_id
2086
source_exec = source_details[3]
2087
if (include_unchanged
2089
or source_parent_id != target_parent_id
2090
or old_basename != entry[0][1]
2091
or source_exec != target_exec
2093
if old_path is None:
2094
old_path = path = pathjoin(old_dirname, old_basename)
2095
old_path_u = utf8_decode(old_path)[0]
2098
old_path_u = utf8_decode(old_path)[0]
2099
if old_path == path:
2102
path_u = utf8_decode(path)[0]
2103
source_kind = _minikind_to_kind[source_minikind]
2104
return (entry[0][2],
2105
(old_path_u, path_u),
2108
(source_parent_id, target_parent_id),
2109
(utf8_decode(old_basename)[0], utf8_decode(entry[0][1])[0]),
2110
(source_kind, target_kind),
2111
(source_exec, target_exec))
2113
return uninteresting
2114
elif source_minikind in 'a' and target_minikind in 'fdlt':
2115
# looks like a new file
2116
if path_info is not None:
2117
path = pathjoin(entry[0][0], entry[0][1])
2118
# parent id is the entry for the path in the target tree
2119
# TODO: these are the same for an entire directory: cache em.
2120
parent_id = state._get_entry(target_index,
2121
path_utf8=entry[0][0])[0][2]
2122
if parent_id == entry[0][2]:
2124
if use_filesystem_for_exec:
2125
# We need S_ISREG here, because we aren't sure if this
2128
stat.S_ISREG(path_info[3].st_mode)
2129
and stat.S_IEXEC & path_info[3].st_mode)
2131
target_exec = target_details[3]
2132
return (entry[0][2],
2133
(None, utf8_decode(path)[0]),
2137
(None, utf8_decode(entry[0][1])[0]),
2138
(None, path_info[2]),
2139
(None, target_exec))
2141
# but its not on disk: we deliberately treat this as just
2142
# never-present. (Why ?! - RBC 20070224)
2144
elif source_minikind in 'fdlt' and target_minikind in 'a':
2145
# unversioned, possibly, or possibly not deleted: we dont care.
2146
# if its still on disk, *and* theres no other entry at this
2147
# path [we dont know this in this routine at the moment -
2148
# perhaps we should change this - then it would be an unknown.
2149
old_path = pathjoin(entry[0][0], entry[0][1])
2150
# parent id is the entry for the path in the target tree
2151
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
2152
if parent_id == entry[0][2]:
2154
return (entry[0][2],
2155
(utf8_decode(old_path)[0], None),
2159
(utf8_decode(entry[0][1])[0], None),
2160
(_minikind_to_kind[source_minikind], None),
2161
(source_details[3], None))
2162
elif source_minikind in 'fdlt' and target_minikind in 'r':
2163
# a rename; could be a true rename, or a rename inherited from
2164
# a renamed parent. TODO: handle this efficiently. Its not
2165
# common case to rename dirs though, so a correct but slow
2166
# implementation will do.
2167
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
2168
search_specific_files.add(target_details[1])
2169
elif source_minikind in 'ra' and target_minikind in 'ra':
2170
# neither of the selected trees contain this file,
2171
# so skip over it. This is not currently directly tested, but
2172
# is indirectly via test_too_much.TestCommands.test_conflicts.
2175
raise AssertionError("don't know how to compare "
2176
"source_minikind=%r, target_minikind=%r"
2177
% (source_minikind, target_minikind))
2178
## import pdb;pdb.set_trace()
2181
while search_specific_files:
2182
# TODO: the pending list should be lexically sorted? the
2183
# interface doesn't require it.
2184
current_root = search_specific_files.pop()
2185
current_root_unicode = current_root.decode('utf8')
2186
searched_specific_files.add(current_root)
2187
# process the entries for this containing directory: the rest will be
2188
# found by their parents recursively.
2189
root_entries = _entries_for_path(current_root)
2190
root_abspath = self.target.abspath(current_root_unicode)
2192
root_stat = os.lstat(root_abspath)
2194
if e.errno == errno.ENOENT:
2195
# the path does not exist: let _process_entry know that.
2196
root_dir_info = None
2198
# some other random error: hand it up.
2201
root_dir_info = ('', current_root,
2202
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
2204
if root_dir_info[2] == 'directory':
2205
if self.target._directory_is_tree_reference(
2206
current_root.decode('utf8')):
2207
root_dir_info = root_dir_info[:2] + \
2208
('tree-reference',) + root_dir_info[3:]
2210
if not root_entries and not root_dir_info:
2211
# this specified path is not present at all, skip it.
2213
path_handled = False
2214
for entry in root_entries:
2215
result = _process_entry(entry, root_dir_info)
2216
if result is not None:
2218
if result is not uninteresting:
2220
if want_unversioned and not path_handled and root_dir_info:
2221
new_executable = bool(
2222
stat.S_ISREG(root_dir_info[3].st_mode)
2223
and stat.S_IEXEC & root_dir_info[3].st_mode)
2225
(None, current_root_unicode),
2229
(None, splitpath(current_root_unicode)[-1]),
2230
(None, root_dir_info[2]),
2231
(None, new_executable)
2233
initial_key = (current_root, '', '')
2234
block_index, _ = state._find_block_index_from_key(initial_key)
2235
if block_index == 0:
2236
# we have processed the total root already, but because the
2237
# initial key matched it we should skip it here.
2239
if root_dir_info and root_dir_info[2] == 'tree-reference':
2240
current_dir_info = None
2242
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
2244
current_dir_info = dir_iterator.next()
2246
# on win32, python2.4 has e.errno == ERROR_DIRECTORY, but
2247
# python 2.5 has e.errno == EINVAL,
2248
# and e.winerror == ERROR_DIRECTORY
2249
e_winerror = getattr(e, 'winerror', None)
2250
win_errors = (ERROR_DIRECTORY, ERROR_PATH_NOT_FOUND)
2251
# there may be directories in the inventory even though
2252
# this path is not a file on disk: so mark it as end of
2254
if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
2255
current_dir_info = None
2256
elif (sys.platform == 'win32'
2257
and (e.errno in win_errors
2258
or e_winerror in win_errors)):
2259
current_dir_info = None
2263
if current_dir_info[0][0] == '':
2264
# remove .bzr from iteration
2265
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
2266
assert current_dir_info[1][bzr_index][0] == '.bzr'
2267
del current_dir_info[1][bzr_index]
2268
# walk until both the directory listing and the versioned metadata
2270
if (block_index < len(state._dirblocks) and
2271
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2272
current_block = state._dirblocks[block_index]
2274
current_block = None
2275
while (current_dir_info is not None or
2276
current_block is not None):
2277
if (current_dir_info and current_block
2278
and current_dir_info[0][0] != current_block[0]):
2279
if cmp_by_dirs(current_dir_info[0][0], current_block[0]) < 0:
2280
# filesystem data refers to paths not covered by the dirblock.
2281
# this has two possibilities:
2282
# A) it is versioned but empty, so there is no block for it
2283
# B) it is not versioned.
2285
# if (A) then we need to recurse into it to check for
2286
# new unknown files or directories.
2287
# if (B) then we should ignore it, because we don't
2288
# recurse into unknown directories.
2290
while path_index < len(current_dir_info[1]):
2291
current_path_info = current_dir_info[1][path_index]
2292
if want_unversioned:
2293
if current_path_info[2] == 'directory':
2294
if self.target._directory_is_tree_reference(
2295
current_path_info[0].decode('utf8')):
2296
current_path_info = current_path_info[:2] + \
2297
('tree-reference',) + current_path_info[3:]
2298
new_executable = bool(
2299
stat.S_ISREG(current_path_info[3].st_mode)
2300
and stat.S_IEXEC & current_path_info[3].st_mode)
2302
(None, utf8_decode(current_path_info[0])[0]),
2306
(None, utf8_decode(current_path_info[1])[0]),
2307
(None, current_path_info[2]),
2308
(None, new_executable))
2309
# dont descend into this unversioned path if it is
2311
if current_path_info[2] in ('directory',
2313
del current_dir_info[1][path_index]
2317
# This dir info has been handled, go to the next
2319
current_dir_info = dir_iterator.next()
2320
except StopIteration:
2321
current_dir_info = None
2323
# We have a dirblock entry for this location, but there
2324
# is no filesystem path for this. This is most likely
2325
# because a directory was removed from the disk.
2326
# We don't have to report the missing directory,
2327
# because that should have already been handled, but we
2328
# need to handle all of the files that are contained
2330
for current_entry in current_block[1]:
2331
# entry referring to file not present on disk.
2332
# advance the entry only, after processing.
2333
result = _process_entry(current_entry, None)
2334
if result is not None:
2335
if result is not uninteresting:
2338
if (block_index < len(state._dirblocks) and
2339
osutils.is_inside(current_root,
2340
state._dirblocks[block_index][0])):
2341
current_block = state._dirblocks[block_index]
2343
current_block = None
2346
if current_block and entry_index < len(current_block[1]):
2347
current_entry = current_block[1][entry_index]
2349
current_entry = None
2350
advance_entry = True
2352
if current_dir_info and path_index < len(current_dir_info[1]):
2353
current_path_info = current_dir_info[1][path_index]
2354
if current_path_info[2] == 'directory':
2355
if self.target._directory_is_tree_reference(
2356
current_path_info[0].decode('utf8')):
2357
current_path_info = current_path_info[:2] + \
2358
('tree-reference',) + current_path_info[3:]
2360
current_path_info = None
2362
path_handled = False
2363
while (current_entry is not None or
2364
current_path_info is not None):
2365
if current_entry is None:
2366
# the check for path_handled when the path is adnvaced
2367
# will yield this path if needed.
2369
elif current_path_info is None:
2370
# no path is fine: the per entry code will handle it.
2371
result = _process_entry(current_entry, current_path_info)
2372
if result is not None:
2373
if result is not uninteresting:
2375
elif (current_entry[0][1] != current_path_info[1]
2376
or current_entry[1][target_index][0] in 'ar'):
2377
# The current path on disk doesn't match the dirblock
2378
# record. Either the dirblock is marked as absent, or
2379
# the file on disk is not present at all in the
2380
# dirblock. Either way, report about the dirblock
2381
# entry, and let other code handle the filesystem one.
2383
# Compare the basename for these files to determine
2385
if current_path_info[1] < current_entry[0][1]:
2386
# extra file on disk: pass for now, but only
2387
# increment the path, not the entry
2388
advance_entry = False
2390
# entry referring to file not present on disk.
2391
# advance the entry only, after processing.
2392
result = _process_entry(current_entry, None)
2393
if result is not None:
2394
if result is not uninteresting:
2396
advance_path = False
2398
result = _process_entry(current_entry, current_path_info)
2399
if result is not None:
2401
if result is not uninteresting:
2403
if advance_entry and current_entry is not None:
2405
if entry_index < len(current_block[1]):
2406
current_entry = current_block[1][entry_index]
2408
current_entry = None
2410
advance_entry = True # reset the advance flaga
2411
if advance_path and current_path_info is not None:
2412
if not path_handled:
2413
# unversioned in all regards
2414
if want_unversioned:
2415
new_executable = bool(
2416
stat.S_ISREG(current_path_info[3].st_mode)
2417
and stat.S_IEXEC & current_path_info[3].st_mode)
2419
(None, utf8_decode(current_path_info[0])[0]),
2423
(None, utf8_decode(current_path_info[1])[0]),
2424
(None, current_path_info[2]),
2425
(None, new_executable))
2426
# dont descend into this unversioned path if it is
2428
if current_path_info[2] in ('directory'):
2429
del current_dir_info[1][path_index]
2431
# dont descend the disk iterator into any tree
2433
if current_path_info[2] == 'tree-reference':
2434
del current_dir_info[1][path_index]
2437
if path_index < len(current_dir_info[1]):
2438
current_path_info = current_dir_info[1][path_index]
2439
if current_path_info[2] == 'directory':
2440
if self.target._directory_is_tree_reference(
2441
current_path_info[0].decode('utf8')):
2442
current_path_info = current_path_info[:2] + \
2443
('tree-reference',) + current_path_info[3:]
2445
current_path_info = None
2446
path_handled = False
2448
advance_path = True # reset the advance flagg.
2449
if current_block is not None:
2451
if (block_index < len(state._dirblocks) and
2452
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2453
current_block = state._dirblocks[block_index]
2455
current_block = None
2456
if current_dir_info is not None:
2458
current_dir_info = dir_iterator.next()
2459
except StopIteration:
2460
current_dir_info = None
2118
2464
def is_compatible(source, target):
2119
2465
# the target must be a dirstate working tree
2120
if not isinstance(target, DirStateWorkingTree):
2466
if not isinstance(target, WorkingTree4):
2122
# the source must be a revtree or dirstate rev tree.
2468
# the source must be a revtreee or dirstate rev tree.
2123
2469
if not isinstance(source,
2124
2470
(revisiontree.RevisionTree, DirStateRevisionTree)):
2126
2472
# the source revid must be in the target dirstate
2127
if not (source._revision_id == _mod_revision.NULL_REVISION or
2473
if not (source._revision_id == NULL_REVISION or
2128
2474
source._revision_id in target.get_parent_ids()):
2129
# TODO: what about ghosts? it may well need to
2475
# TODO: what about ghosts? it may well need to
2130
2476
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
