1277
1227
@needs_tree_write_lock
1278
1228
def _write_inventory(self, inv):
1279
1229
"""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)
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:
1294
1235
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):
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"
1389
1261
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
1390
accelerator_tree=None, hardlink=False):
1262
accelerator_tree=None):
1391
1263
"""See WorkingTreeFormat.initialize().
1393
1265
:param revision_id: allows creating a working tree at a different
2102
1830
if not found_versioned:
2103
1831
# 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)
1833
all_versioned = False
1835
if not all_versioned:
1836
raise errors.PathsNotVersionedError(specific_files)
2108
1837
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2109
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]
2111
1890
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()
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
source_details = old_entry[1][source_index]
1955
source_minikind = source_details[0]
1957
old_dirname = entry[0][0]
1958
old_basename = entry[0][1]
1959
old_path = path = None
1960
if path_info is None:
1961
# the file is missing on disk, show as removed.
1962
content_change = True
1966
# source and target are both versioned and disk file is present.
1967
target_kind = path_info[2]
1968
if target_kind == 'directory':
1970
old_path = path = pathjoin(old_dirname, old_basename)
1971
new_dirname_to_file_id[path] = file_id
1972
if source_minikind != 'd':
1973
content_change = True
1975
# directories have no fingerprint
1976
content_change = False
1978
elif target_kind == 'file':
1979
if source_minikind != 'f':
1980
content_change = True
1982
# We could check the size, but we already have the
1984
content_change = (link_or_sha1 != source_details[1])
1985
# Target details is updated at update_entry time
1986
if use_filesystem_for_exec:
1987
# We don't need S_ISREG here, because we are sure
1988
# we are dealing with a file.
1989
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
1991
target_exec = target_details[3]
1992
elif target_kind == 'symlink':
1993
if source_minikind != 'l':
1994
content_change = True
1996
content_change = (link_or_sha1 != source_details[1])
1998
elif target_kind == 'tree-reference':
1999
if source_minikind != 't':
2000
content_change = True
2002
content_change = False
2005
raise Exception, "unknown kind %s" % path_info[2]
2006
if source_minikind == 'd':
2008
old_path = path = pathjoin(old_dirname, old_basename)
2009
old_dirname_to_file_id[old_path] = file_id
2010
# parent id is the entry for the path in the target tree
2011
if old_dirname == last_source_parent[0]:
2012
source_parent_id = last_source_parent[1]
2015
source_parent_id = old_dirname_to_file_id[old_dirname]
2017
source_parent_entry = state._get_entry(source_index,
2018
path_utf8=old_dirname)
2019
source_parent_id = source_parent_entry[0][2]
2020
if source_parent_id == entry[0][2]:
2021
# This is the root, so the parent is None
2022
source_parent_id = None
2024
last_source_parent[0] = old_dirname
2025
last_source_parent[1] = source_parent_id
2026
new_dirname = entry[0][0]
2027
if new_dirname == last_target_parent[0]:
2028
target_parent_id = last_target_parent[1]
2031
target_parent_id = new_dirname_to_file_id[new_dirname]
2033
# TODO: We don't always need to do the lookup, because the
2034
# parent entry will be the same as the source entry.
2035
target_parent_entry = state._get_entry(target_index,
2036
path_utf8=new_dirname)
2037
assert target_parent_entry != (None, None), (
2038
"Could not find target parent in wt: %s\nparent of: %s"
2039
% (new_dirname, entry))
2040
target_parent_id = target_parent_entry[0][2]
2041
if target_parent_id == entry[0][2]:
2042
# This is the root, so the parent is None
2043
target_parent_id = None
2045
last_target_parent[0] = new_dirname
2046
last_target_parent[1] = target_parent_id
2048
source_exec = source_details[3]
2049
if (include_unchanged
2051
or source_parent_id != target_parent_id
2052
or old_basename != entry[0][1]
2053
or source_exec != target_exec
2055
if old_path is None:
2056
old_path = path = pathjoin(old_dirname, old_basename)
2057
old_path_u = utf8_decode(old_path)[0]
2060
old_path_u = utf8_decode(old_path)[0]
2061
if old_path == path:
2064
path_u = utf8_decode(path)[0]
2065
source_kind = _minikind_to_kind[source_minikind]
2066
return (entry[0][2],
2067
(old_path_u, path_u),
2070
(source_parent_id, target_parent_id),
2071
(utf8_decode(old_basename)[0], utf8_decode(entry[0][1])[0]),
2072
(source_kind, target_kind),
2073
(source_exec, target_exec))
2075
return uninteresting
2076
elif source_minikind in 'a' and target_minikind in 'fdlt':
2077
# looks like a new file
2078
if path_info is not None:
2079
path = pathjoin(entry[0][0], entry[0][1])
2080
# parent id is the entry for the path in the target tree
2081
# TODO: these are the same for an entire directory: cache em.
2082
parent_id = state._get_entry(target_index,
2083
path_utf8=entry[0][0])[0][2]
2084
if parent_id == entry[0][2]:
2086
if use_filesystem_for_exec:
2087
# We need S_ISREG here, because we aren't sure if this
2090
stat.S_ISREG(path_info[3].st_mode)
2091
and stat.S_IEXEC & path_info[3].st_mode)
2093
target_exec = target_details[3]
2094
return (entry[0][2],
2095
(None, utf8_decode(path)[0]),
2099
(None, utf8_decode(entry[0][1])[0]),
2100
(None, path_info[2]),
2101
(None, target_exec))
2103
# but its not on disk: we deliberately treat this as just
2104
# never-present. (Why ?! - RBC 20070224)
2106
elif source_minikind in 'fdlt' and target_minikind in 'a':
2107
# unversioned, possibly, or possibly not deleted: we dont care.
2108
# if its still on disk, *and* theres no other entry at this
2109
# path [we dont know this in this routine at the moment -
2110
# perhaps we should change this - then it would be an unknown.
2111
old_path = pathjoin(entry[0][0], entry[0][1])
2112
# parent id is the entry for the path in the target tree
2113
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
2114
if parent_id == entry[0][2]:
2116
return (entry[0][2],
2117
(utf8_decode(old_path)[0], None),
2121
(utf8_decode(entry[0][1])[0], None),
2122
(_minikind_to_kind[source_minikind], None),
2123
(source_details[3], None))
2124
elif source_minikind in 'fdlt' and target_minikind in 'r':
2125
# a rename; could be a true rename, or a rename inherited from
2126
# a renamed parent. TODO: handle this efficiently. Its not
2127
# common case to rename dirs though, so a correct but slow
2128
# implementation will do.
2129
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
2130
search_specific_files.add(target_details[1])
2131
elif source_minikind in 'ra' and target_minikind in 'ra':
2132
# neither of the selected trees contain this file,
2133
# so skip over it. This is not currently directly tested, but
2134
# is indirectly via test_too_much.TestCommands.test_conflicts.
2137
raise AssertionError("don't know how to compare "
2138
"source_minikind=%r, target_minikind=%r"
2139
% (source_minikind, target_minikind))
2140
## import pdb;pdb.set_trace()
2143
while search_specific_files:
2144
# TODO: the pending list should be lexically sorted? the
2145
# interface doesn't require it.
2146
current_root = search_specific_files.pop()
2147
current_root_unicode = current_root.decode('utf8')
2148
searched_specific_files.add(current_root)
2149
# process the entries for this containing directory: the rest will be
2150
# found by their parents recursively.
2151
root_entries = _entries_for_path(current_root)
2152
root_abspath = self.target.abspath(current_root_unicode)
2154
root_stat = os.lstat(root_abspath)
2156
if e.errno == errno.ENOENT:
2157
# the path does not exist: let _process_entry know that.
2158
root_dir_info = None
2160
# some other random error: hand it up.
2163
root_dir_info = ('', current_root,
2164
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
2166
if root_dir_info[2] == 'directory':
2167
if self.target._directory_is_tree_reference(
2168
current_root.decode('utf8')):
2169
root_dir_info = root_dir_info[:2] + \
2170
('tree-reference',) + root_dir_info[3:]
2172
if not root_entries and not root_dir_info:
2173
# this specified path is not present at all, skip it.
2175
path_handled = False
2176
for entry in root_entries:
2177
result = _process_entry(entry, root_dir_info)
2178
if result is not None:
2180
if result is not uninteresting:
2182
if want_unversioned and not path_handled and root_dir_info:
2183
new_executable = bool(
2184
stat.S_ISREG(root_dir_info[3].st_mode)
2185
and stat.S_IEXEC & root_dir_info[3].st_mode)
2187
(None, current_root_unicode),
2191
(None, splitpath(current_root_unicode)[-1]),
2192
(None, root_dir_info[2]),
2193
(None, new_executable)
2195
initial_key = (current_root, '', '')
2196
block_index, _ = state._find_block_index_from_key(initial_key)
2197
if block_index == 0:
2198
# we have processed the total root already, but because the
2199
# initial key matched it we should skip it here.
2201
if root_dir_info and root_dir_info[2] == 'tree-reference':
2202
current_dir_info = None
2204
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
2206
current_dir_info = dir_iterator.next()
2208
# on win32, python2.4 has e.errno == ERROR_DIRECTORY, but
2209
# python 2.5 has e.errno == EINVAL,
2210
# and e.winerror == ERROR_DIRECTORY
2211
e_winerror = getattr(e, 'winerror', None)
2212
win_errors = (ERROR_DIRECTORY, ERROR_PATH_NOT_FOUND)
2213
# there may be directories in the inventory even though
2214
# this path is not a file on disk: so mark it as end of
2216
if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
2217
current_dir_info = None
2218
elif (sys.platform == 'win32'
2219
and (e.errno in win_errors
2220
or e_winerror in win_errors)):
2221
current_dir_info = None
2225
if current_dir_info[0][0] == '':
2226
# remove .bzr from iteration
2227
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
2228
assert current_dir_info[1][bzr_index][0] == '.bzr'
2229
del current_dir_info[1][bzr_index]
2230
# walk until both the directory listing and the versioned metadata
2232
if (block_index < len(state._dirblocks) and
2233
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2234
current_block = state._dirblocks[block_index]
2236
current_block = None
2237
while (current_dir_info is not None or
2238
current_block is not None):
2239
if (current_dir_info and current_block
2240
and current_dir_info[0][0] != current_block[0]):
2241
if cmp_by_dirs(current_dir_info[0][0], current_block[0]) < 0:
2242
# filesystem data refers to paths not covered by the dirblock.
2243
# this has two possibilities:
2244
# A) it is versioned but empty, so there is no block for it
2245
# B) it is not versioned.
2247
# if (A) then we need to recurse into it to check for
2248
# new unknown files or directories.
2249
# if (B) then we should ignore it, because we don't
2250
# recurse into unknown directories.
2252
while path_index < len(current_dir_info[1]):
2253
current_path_info = current_dir_info[1][path_index]
2254
if want_unversioned:
2255
if current_path_info[2] == 'directory':
2256
if self.target._directory_is_tree_reference(
2257
current_path_info[0].decode('utf8')):
2258
current_path_info = current_path_info[:2] + \
2259
('tree-reference',) + current_path_info[3:]
2260
new_executable = bool(
2261
stat.S_ISREG(current_path_info[3].st_mode)
2262
and stat.S_IEXEC & current_path_info[3].st_mode)
2264
(None, utf8_decode(current_path_info[0])[0]),
2268
(None, utf8_decode(current_path_info[1])[0]),
2269
(None, current_path_info[2]),
2270
(None, new_executable))
2271
# dont descend into this unversioned path if it is
2273
if current_path_info[2] in ('directory',
2275
del current_dir_info[1][path_index]
2279
# This dir info has been handled, go to the next
2281
current_dir_info = dir_iterator.next()
2282
except StopIteration:
2283
current_dir_info = None
2285
# We have a dirblock entry for this location, but there
2286
# is no filesystem path for this. This is most likely
2287
# because a directory was removed from the disk.
2288
# We don't have to report the missing directory,
2289
# because that should have already been handled, but we
2290
# need to handle all of the files that are contained
2292
for current_entry in current_block[1]:
2293
# entry referring to file not present on disk.
2294
# advance the entry only, after processing.
2295
result = _process_entry(current_entry, None)
2296
if result is not None:
2297
if result is not uninteresting:
2300
if (block_index < len(state._dirblocks) and
2301
osutils.is_inside(current_root,
2302
state._dirblocks[block_index][0])):
2303
current_block = state._dirblocks[block_index]
2305
current_block = None
2308
if current_block and entry_index < len(current_block[1]):
2309
current_entry = current_block[1][entry_index]
2311
current_entry = None
2312
advance_entry = True
2314
if current_dir_info and path_index < len(current_dir_info[1]):
2315
current_path_info = current_dir_info[1][path_index]
2316
if current_path_info[2] == 'directory':
2317
if self.target._directory_is_tree_reference(
2318
current_path_info[0].decode('utf8')):
2319
current_path_info = current_path_info[:2] + \
2320
('tree-reference',) + current_path_info[3:]
2322
current_path_info = None
2324
path_handled = False
2325
while (current_entry is not None or
2326
current_path_info is not None):
2327
if current_entry is None:
2328
# the check for path_handled when the path is adnvaced
2329
# will yield this path if needed.
2331
elif current_path_info is None:
2332
# no path is fine: the per entry code will handle it.
2333
result = _process_entry(current_entry, current_path_info)
2334
if result is not None:
2335
if result is not uninteresting:
2337
elif (current_entry[0][1] != current_path_info[1]
2338
or current_entry[1][target_index][0] in 'ar'):
2339
# The current path on disk doesn't match the dirblock
2340
# record. Either the dirblock is marked as absent, or
2341
# the file on disk is not present at all in the
2342
# dirblock. Either way, report about the dirblock
2343
# entry, and let other code handle the filesystem one.
2345
# Compare the basename for these files to determine
2347
if current_path_info[1] < current_entry[0][1]:
2348
# extra file on disk: pass for now, but only
2349
# increment the path, not the entry
2350
advance_entry = False
2352
# entry referring to file not present on disk.
2353
# advance the entry only, after processing.
2354
result = _process_entry(current_entry, None)
2355
if result is not None:
2356
if result is not uninteresting:
2358
advance_path = False
2360
result = _process_entry(current_entry, current_path_info)
2361
if result is not None:
2363
if result is not uninteresting:
2365
if advance_entry and current_entry is not None:
2367
if entry_index < len(current_block[1]):
2368
current_entry = current_block[1][entry_index]
2370
current_entry = None
2372
advance_entry = True # reset the advance flaga
2373
if advance_path and current_path_info is not None:
2374
if not path_handled:
2375
# unversioned in all regards
2376
if want_unversioned:
2377
new_executable = bool(
2378
stat.S_ISREG(current_path_info[3].st_mode)
2379
and stat.S_IEXEC & current_path_info[3].st_mode)
2381
(None, utf8_decode(current_path_info[0])[0]),
2385
(None, utf8_decode(current_path_info[1])[0]),
2386
(None, current_path_info[2]),
2387
(None, new_executable))
2388
# dont descend into this unversioned path if it is
2390
if current_path_info[2] in ('directory'):
2391
del current_dir_info[1][path_index]
2393
# dont descend the disk iterator into any tree
2395
if current_path_info[2] == 'tree-reference':
2396
del current_dir_info[1][path_index]
2399
if path_index < len(current_dir_info[1]):
2400
current_path_info = current_dir_info[1][path_index]
2401
if current_path_info[2] == 'directory':
2402
if self.target._directory_is_tree_reference(
2403
current_path_info[0].decode('utf8')):
2404
current_path_info = current_path_info[:2] + \
2405
('tree-reference',) + current_path_info[3:]
2407
current_path_info = None
2408
path_handled = False
2410
advance_path = True # reset the advance flagg.
2411
if current_block is not None:
2413
if (block_index < len(state._dirblocks) and
2414
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2415
current_block = state._dirblocks[block_index]
2417
current_block = None
2418
if current_dir_info is not None:
2420
current_dir_info = dir_iterator.next()
2421
except StopIteration:
2422
current_dir_info = None
2118
2426
def is_compatible(source, target):
2119
2427
# the target must be a dirstate working tree
2120
if not isinstance(target, DirStateWorkingTree):
2428
if not isinstance(target, WorkingTree4):
2122
# the source must be a revtree or dirstate rev tree.
2430
# the source must be a revtreee or dirstate rev tree.
2123
2431
if not isinstance(source,
2124
2432
(revisiontree.RevisionTree, DirStateRevisionTree)):
2126
2434
# the source revid must be in the target dirstate
2127
if not (source._revision_id == _mod_revision.NULL_REVISION or
2435
if not (source._revision_id == NULL_REVISION or
2128
2436
source._revision_id in target.get_parent_ids()):
2129
# TODO: what about ghosts? it may well need to
2437
# TODO: what about ghosts? it may well need to
2130
2438
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
