1275
1226
@needs_tree_write_lock
1276
1227
def _write_inventory(self, inv):
1277
1228
"""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)
1229
assert not self._dirty, ("attempting to write an inventory when the "
1230
"dirstate is dirty will cause data loss")
1231
self.current_dirstate().set_state_from_inventory(inv)
1232
self._make_dirty(reset_inventory=False)
1233
if self._inventory is not None:
1292
1234
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):
1238
class WorkingTreeFormat4(WorkingTreeFormat3):
1239
"""The first consolidated dirstate working tree format.
1242
- exists within a metadir controlling .bzr
1243
- includes an explicit version marker for the workingtree control
1244
files, separate from the BzrDir format
1245
- modifies the hash cache format
1246
- is new in bzr 0.15
1247
- uses a LockDir to guard access to it.
1250
upgrade_recommended = False
1252
def get_format_string(self):
1253
"""See WorkingTreeFormat.get_format_string()."""
1254
return "Bazaar Working Tree Format 4 (bzr 0.15)\n"
1256
def get_format_description(self):
1257
"""See WorkingTreeFormat.get_format_description()."""
1258
return "Working tree format 4"
1387
1260
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
1388
accelerator_tree=None, hardlink=False):
1261
accelerator_tree=None):
1389
1262
"""See WorkingTreeFormat.initialize().
1391
1264
:param revision_id: allows creating a working tree at a different
2099
1829
if not found_versioned:
2100
1830
# 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)
1832
all_versioned = False
1834
if not all_versioned:
1835
raise errors.PathsNotVersionedError(specific_files)
2105
1836
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2106
search_specific_files = osutils.minimum_path_selection(specific_files)
1837
search_specific_files = set()
1838
for path in specific_files:
1839
other_specific_files = specific_files.difference(set([path]))
1840
if not osutils.is_inside_any(other_specific_files, path):
1841
# this is a top level path, we must check it.
1842
search_specific_files.add(path)
1844
# compare source_index and target_index at or under each element of search_specific_files.
1845
# follow the following comparison table. Note that we only want to do diff operations when
1846
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1850
# Source | Target | disk | action
1851
# r | fdlt | | add source to search, add id path move and perform
1852
# | | | diff check on source-target
1853
# r | fdlt | a | dangling file that was present in the basis.
1855
# r | a | | add source to search
1857
# r | r | | this path is present in a non-examined tree, skip.
1858
# r | r | a | this path is present in a non-examined tree, skip.
1859
# a | fdlt | | add new id
1860
# a | fdlt | a | dangling locally added file, skip
1861
# a | a | | not present in either tree, skip
1862
# a | a | a | not present in any tree, skip
1863
# a | r | | not present in either tree at this path, skip as it
1864
# | | | may not be selected by the users list of paths.
1865
# a | r | a | not present in either tree at this path, skip as it
1866
# | | | may not be selected by the users list of paths.
1867
# fdlt | fdlt | | content in both: diff them
1868
# fdlt | fdlt | a | deleted locally, but not unversioned - show as deleted ?
1869
# fdlt | a | | unversioned: output deleted id for now
1870
# fdlt | a | a | unversioned and deleted: output deleted id
1871
# fdlt | r | | relocated in this tree, so add target to search.
1872
# | | | Dont diff, we will see an r,fd; pair when we reach
1873
# | | | this id at the other path.
1874
# fdlt | r | a | relocated in this tree, so add target to search.
1875
# | | | Dont diff, we will see an r,fd; pair when we reach
1876
# | | | this id at the other path.
1878
# for all search_indexs in each path at or under each element of
1879
# search_specific_files, if the detail is relocated: add the id, and add the
1880
# relocated path as one to search if its not searched already. If the
1881
# detail is not relocated, add the id.
1882
searched_specific_files = set()
1883
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1884
# Using a list so that we can access the values and change them in
1885
# nested scope. Each one is [path, file_id, entry]
1886
last_source_parent = [None, None]
1887
last_target_parent = [None, None]
2108
1889
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()
1891
# Just a sentry, so that _process_entry can say that this
1892
# record is handled, but isn't interesting to process (unchanged)
1893
uninteresting = object()
1896
old_dirname_to_file_id = {}
1897
new_dirname_to_file_id = {}
1898
# TODO: jam 20070516 - Avoid the _get_entry lookup overhead by
1899
# keeping a cache of directories that we have seen.
1901
def _process_entry(entry, path_info):
1902
"""Compare an entry and real disk to generate delta information.
1904
:param path_info: top_relpath, basename, kind, lstat, abspath for
1905
the path of entry. If None, then the path is considered absent.
1906
(Perhaps we should pass in a concrete entry for this ?)
1907
Basename is returned as a utf8 string because we expect this
1908
tuple will be ignored, and don't want to take the time to
1910
:return: None if these don't match
1911
A tuple of information about the change, or
1912
the object 'uninteresting' if these match, but are
1913
basically identical.
1915
if source_index is None:
1916
source_details = NULL_PARENT_DETAILS
1918
source_details = entry[1][source_index]
1919
target_details = entry[1][target_index]
1920
target_minikind = target_details[0]
1921
if path_info is not None and target_minikind in 'fdlt':
1922
assert target_index == 0
1923
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
1924
stat_value=path_info[3])
1925
# The entry may have been modified by update_entry
1926
target_details = entry[1][target_index]
1927
target_minikind = target_details[0]
1930
file_id = entry[0][2]
1931
source_minikind = source_details[0]
1932
if source_minikind in 'fdltr' and target_minikind in 'fdlt':
1933
# claimed content in both: diff
1934
# r | fdlt | | add source to search, add id path move and perform
1935
# | | | diff check on source-target
1936
# r | fdlt | a | dangling file that was present in the basis.
1938
if source_minikind in 'r':
1939
# add the source to the search path to find any children it
1940
# has. TODO ? : only add if it is a container ?
1941
if not osutils.is_inside_any(searched_specific_files,
1943
search_specific_files.add(source_details[1])
1944
# generate the old path; this is needed for stating later
1946
old_path = source_details[1]
1947
old_dirname, old_basename = os.path.split(old_path)
1948
path = pathjoin(entry[0][0], entry[0][1])
1949
old_entry = state._get_entry(source_index,
1951
# update the source details variable to be the real
1953
source_details = old_entry[1][source_index]
1954
source_minikind = source_details[0]
1956
old_dirname = entry[0][0]
1957
old_basename = entry[0][1]
1958
old_path = path = None
1959
if path_info is None:
1960
# the file is missing on disk, show as removed.
1961
content_change = True
1965
# source and target are both versioned and disk file is present.
1966
target_kind = path_info[2]
1967
if target_kind == 'directory':
1969
old_path = path = pathjoin(old_dirname, old_basename)
1970
new_dirname_to_file_id[path] = file_id
1971
if source_minikind != 'd':
1972
content_change = True
1974
# directories have no fingerprint
1975
content_change = False
1977
elif target_kind == 'file':
1978
if source_minikind != 'f':
1979
content_change = True
1981
# We could check the size, but we already have the
1983
content_change = (link_or_sha1 != source_details[1])
1984
# Target details is updated at update_entry time
1985
if use_filesystem_for_exec:
1986
# We don't need S_ISREG here, because we are sure
1987
# we are dealing with a file.
1988
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
1990
target_exec = target_details[3]
1991
elif target_kind == 'symlink':
1992
if source_minikind != 'l':
1993
content_change = True
1995
content_change = (link_or_sha1 != source_details[1])
1997
elif target_kind == 'tree-reference':
1998
if source_minikind != 't':
1999
content_change = True
2001
content_change = False
2004
raise Exception, "unknown kind %s" % path_info[2]
2005
if source_minikind == 'd':
2007
old_path = path = pathjoin(old_dirname, old_basename)
2008
old_dirname_to_file_id[old_path] = file_id
2009
# parent id is the entry for the path in the target tree
2010
if old_dirname == last_source_parent[0]:
2011
source_parent_id = last_source_parent[1]
2014
source_parent_id = old_dirname_to_file_id[old_dirname]
2016
source_parent_entry = state._get_entry(source_index,
2017
path_utf8=old_dirname)
2018
source_parent_id = source_parent_entry[0][2]
2019
if source_parent_id == entry[0][2]:
2020
# This is the root, so the parent is None
2021
source_parent_id = None
2023
last_source_parent[0] = old_dirname
2024
last_source_parent[1] = source_parent_id
2025
new_dirname = entry[0][0]
2026
if new_dirname == last_target_parent[0]:
2027
target_parent_id = last_target_parent[1]
2030
target_parent_id = new_dirname_to_file_id[new_dirname]
2032
# TODO: We don't always need to do the lookup, because the
2033
# parent entry will be the same as the source entry.
2034
target_parent_entry = state._get_entry(target_index,
2035
path_utf8=new_dirname)
2036
assert target_parent_entry != (None, None), (
2037
"Could not find target parent in wt: %s\nparent of: %s"
2038
% (new_dirname, entry))
2039
target_parent_id = target_parent_entry[0][2]
2040
if target_parent_id == entry[0][2]:
2041
# This is the root, so the parent is None
2042
target_parent_id = None
2044
last_target_parent[0] = new_dirname
2045
last_target_parent[1] = target_parent_id
2047
source_exec = source_details[3]
2048
if (include_unchanged
2050
or source_parent_id != target_parent_id
2051
or old_basename != entry[0][1]
2052
or source_exec != target_exec
2054
if old_path is None:
2055
old_path = path = pathjoin(old_dirname, old_basename)
2056
old_path_u = utf8_decode(old_path)[0]
2059
old_path_u = utf8_decode(old_path)[0]
2060
if old_path == path:
2063
path_u = utf8_decode(path)[0]
2064
source_kind = _minikind_to_kind[source_minikind]
2065
return (entry[0][2],
2066
(old_path_u, path_u),
2069
(source_parent_id, target_parent_id),
2070
(utf8_decode(old_basename)[0], utf8_decode(entry[0][1])[0]),
2071
(source_kind, target_kind),
2072
(source_exec, target_exec))
2074
return uninteresting
2075
elif source_minikind in 'a' and target_minikind in 'fdlt':
2076
# looks like a new file
2077
if path_info is not None:
2078
path = pathjoin(entry[0][0], entry[0][1])
2079
# parent id is the entry for the path in the target tree
2080
# TODO: these are the same for an entire directory: cache em.
2081
parent_id = state._get_entry(target_index,
2082
path_utf8=entry[0][0])[0][2]
2083
if parent_id == entry[0][2]:
2085
if use_filesystem_for_exec:
2086
# We need S_ISREG here, because we aren't sure if this
2089
stat.S_ISREG(path_info[3].st_mode)
2090
and stat.S_IEXEC & path_info[3].st_mode)
2092
target_exec = target_details[3]
2093
return (entry[0][2],
2094
(None, utf8_decode(path)[0]),
2098
(None, utf8_decode(entry[0][1])[0]),
2099
(None, path_info[2]),
2100
(None, target_exec))
2102
# but its not on disk: we deliberately treat this as just
2103
# never-present. (Why ?! - RBC 20070224)
2105
elif source_minikind in 'fdlt' and target_minikind in 'a':
2106
# unversioned, possibly, or possibly not deleted: we dont care.
2107
# if its still on disk, *and* theres no other entry at this
2108
# path [we dont know this in this routine at the moment -
2109
# perhaps we should change this - then it would be an unknown.
2110
old_path = pathjoin(entry[0][0], entry[0][1])
2111
# parent id is the entry for the path in the target tree
2112
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
2113
if parent_id == entry[0][2]:
2115
return (entry[0][2],
2116
(utf8_decode(old_path)[0], None),
2120
(utf8_decode(entry[0][1])[0], None),
2121
(_minikind_to_kind[source_minikind], None),
2122
(source_details[3], None))
2123
elif source_minikind in 'fdlt' and target_minikind in 'r':
2124
# a rename; could be a true rename, or a rename inherited from
2125
# a renamed parent. TODO: handle this efficiently. Its not
2126
# common case to rename dirs though, so a correct but slow
2127
# implementation will do.
2128
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
2129
search_specific_files.add(target_details[1])
2130
elif source_minikind in 'ra' and target_minikind in 'ra':
2131
# neither of the selected trees contain this file,
2132
# so skip over it. This is not currently directly tested, but
2133
# is indirectly via test_too_much.TestCommands.test_conflicts.
2136
raise AssertionError("don't know how to compare "
2137
"source_minikind=%r, target_minikind=%r"
2138
% (source_minikind, target_minikind))
2139
## import pdb;pdb.set_trace()
2142
while search_specific_files:
2143
# TODO: the pending list should be lexically sorted? the
2144
# interface doesn't require it.
2145
current_root = search_specific_files.pop()
2146
current_root_unicode = current_root.decode('utf8')
2147
searched_specific_files.add(current_root)
2148
# process the entries for this containing directory: the rest will be
2149
# found by their parents recursively.
2150
root_entries = _entries_for_path(current_root)
2151
root_abspath = self.target.abspath(current_root_unicode)
2153
root_stat = os.lstat(root_abspath)
2155
if e.errno == errno.ENOENT:
2156
# the path does not exist: let _process_entry know that.
2157
root_dir_info = None
2159
# some other random error: hand it up.
2162
root_dir_info = ('', current_root,
2163
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
2165
if root_dir_info[2] == 'directory':
2166
if self.target._directory_is_tree_reference(
2167
current_root.decode('utf8')):
2168
root_dir_info = root_dir_info[:2] + \
2169
('tree-reference',) + root_dir_info[3:]
2171
if not root_entries and not root_dir_info:
2172
# this specified path is not present at all, skip it.
2174
path_handled = False
2175
for entry in root_entries:
2176
result = _process_entry(entry, root_dir_info)
2177
if result is not None:
2179
if result is not uninteresting:
2181
if want_unversioned and not path_handled and root_dir_info:
2182
new_executable = bool(
2183
stat.S_ISREG(root_dir_info[3].st_mode)
2184
and stat.S_IEXEC & root_dir_info[3].st_mode)
2186
(None, current_root_unicode),
2190
(None, splitpath(current_root_unicode)[-1]),
2191
(None, root_dir_info[2]),
2192
(None, new_executable)
2194
initial_key = (current_root, '', '')
2195
block_index, _ = state._find_block_index_from_key(initial_key)
2196
if block_index == 0:
2197
# we have processed the total root already, but because the
2198
# initial key matched it we should skip it here.
2200
if root_dir_info and root_dir_info[2] == 'tree-reference':
2201
current_dir_info = None
2203
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
2205
current_dir_info = dir_iterator.next()
2207
# on win32, python2.4 has e.errno == ERROR_DIRECTORY, but
2208
# python 2.5 has e.errno == EINVAL,
2209
# and e.winerror == ERROR_DIRECTORY
2210
e_winerror = getattr(e, 'winerror', None)
2211
win_errors = (ERROR_DIRECTORY, ERROR_PATH_NOT_FOUND)
2212
# there may be directories in the inventory even though
2213
# this path is not a file on disk: so mark it as end of
2215
if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
2216
current_dir_info = None
2217
elif (sys.platform == 'win32'
2218
and (e.errno in win_errors
2219
or e_winerror in win_errors)):
2220
current_dir_info = None
2224
if current_dir_info[0][0] == '':
2225
# remove .bzr from iteration
2226
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
2227
assert current_dir_info[1][bzr_index][0] == '.bzr'
2228
del current_dir_info[1][bzr_index]
2229
# walk until both the directory listing and the versioned metadata
2231
if (block_index < len(state._dirblocks) and
2232
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2233
current_block = state._dirblocks[block_index]
2235
current_block = None
2236
while (current_dir_info is not None or
2237
current_block is not None):
2238
if (current_dir_info and current_block
2239
and current_dir_info[0][0] != current_block[0]):
2240
if cmp_by_dirs(current_dir_info[0][0], current_block[0]) < 0:
2241
# filesystem data refers to paths not covered by the dirblock.
2242
# this has two possibilities:
2243
# A) it is versioned but empty, so there is no block for it
2244
# B) it is not versioned.
2246
# if (A) then we need to recurse into it to check for
2247
# new unknown files or directories.
2248
# if (B) then we should ignore it, because we don't
2249
# recurse into unknown directories.
2251
while path_index < len(current_dir_info[1]):
2252
current_path_info = current_dir_info[1][path_index]
2253
if want_unversioned:
2254
if current_path_info[2] == 'directory':
2255
if self.target._directory_is_tree_reference(
2256
current_path_info[0].decode('utf8')):
2257
current_path_info = current_path_info[:2] + \
2258
('tree-reference',) + current_path_info[3:]
2259
new_executable = bool(
2260
stat.S_ISREG(current_path_info[3].st_mode)
2261
and stat.S_IEXEC & current_path_info[3].st_mode)
2263
(None, utf8_decode(current_path_info[0])[0]),
2267
(None, utf8_decode(current_path_info[1])[0]),
2268
(None, current_path_info[2]),
2269
(None, new_executable))
2270
# dont descend into this unversioned path if it is
2272
if current_path_info[2] in ('directory',
2274
del current_dir_info[1][path_index]
2278
# This dir info has been handled, go to the next
2280
current_dir_info = dir_iterator.next()
2281
except StopIteration:
2282
current_dir_info = None
2284
# We have a dirblock entry for this location, but there
2285
# is no filesystem path for this. This is most likely
2286
# because a directory was removed from the disk.
2287
# We don't have to report the missing directory,
2288
# because that should have already been handled, but we
2289
# need to handle all of the files that are contained
2291
for current_entry in current_block[1]:
2292
# entry referring to file not present on disk.
2293
# advance the entry only, after processing.
2294
result = _process_entry(current_entry, None)
2295
if result is not None:
2296
if result is not uninteresting:
2299
if (block_index < len(state._dirblocks) and
2300
osutils.is_inside(current_root,
2301
state._dirblocks[block_index][0])):
2302
current_block = state._dirblocks[block_index]
2304
current_block = None
2307
if current_block and entry_index < len(current_block[1]):
2308
current_entry = current_block[1][entry_index]
2310
current_entry = None
2311
advance_entry = True
2313
if current_dir_info and path_index < len(current_dir_info[1]):
2314
current_path_info = current_dir_info[1][path_index]
2315
if current_path_info[2] == 'directory':
2316
if self.target._directory_is_tree_reference(
2317
current_path_info[0].decode('utf8')):
2318
current_path_info = current_path_info[:2] + \
2319
('tree-reference',) + current_path_info[3:]
2321
current_path_info = None
2323
path_handled = False
2324
while (current_entry is not None or
2325
current_path_info is not None):
2326
if current_entry is None:
2327
# the check for path_handled when the path is adnvaced
2328
# will yield this path if needed.
2330
elif current_path_info is None:
2331
# no path is fine: the per entry code will handle it.
2332
result = _process_entry(current_entry, current_path_info)
2333
if result is not None:
2334
if result is not uninteresting:
2336
elif (current_entry[0][1] != current_path_info[1]
2337
or current_entry[1][target_index][0] in 'ar'):
2338
# The current path on disk doesn't match the dirblock
2339
# record. Either the dirblock is marked as absent, or
2340
# the file on disk is not present at all in the
2341
# dirblock. Either way, report about the dirblock
2342
# entry, and let other code handle the filesystem one.
2344
# Compare the basename for these files to determine
2346
if current_path_info[1] < current_entry[0][1]:
2347
# extra file on disk: pass for now, but only
2348
# increment the path, not the entry
2349
advance_entry = False
2351
# entry referring to file not present on disk.
2352
# advance the entry only, after processing.
2353
result = _process_entry(current_entry, None)
2354
if result is not None:
2355
if result is not uninteresting:
2357
advance_path = False
2359
result = _process_entry(current_entry, current_path_info)
2360
if result is not None:
2362
if result is not uninteresting:
2364
if advance_entry and current_entry is not None:
2366
if entry_index < len(current_block[1]):
2367
current_entry = current_block[1][entry_index]
2369
current_entry = None
2371
advance_entry = True # reset the advance flaga
2372
if advance_path and current_path_info is not None:
2373
if not path_handled:
2374
# unversioned in all regards
2375
if want_unversioned:
2376
new_executable = bool(
2377
stat.S_ISREG(current_path_info[3].st_mode)
2378
and stat.S_IEXEC & current_path_info[3].st_mode)
2380
(None, utf8_decode(current_path_info[0])[0]),
2384
(None, utf8_decode(current_path_info[1])[0]),
2385
(None, current_path_info[2]),
2386
(None, new_executable))
2387
# dont descend into this unversioned path if it is
2389
if current_path_info[2] in ('directory'):
2390
del current_dir_info[1][path_index]
2392
# dont descend the disk iterator into any tree
2394
if current_path_info[2] == 'tree-reference':
2395
del current_dir_info[1][path_index]
2398
if path_index < len(current_dir_info[1]):
2399
current_path_info = current_dir_info[1][path_index]
2400
if current_path_info[2] == 'directory':
2401
if self.target._directory_is_tree_reference(
2402
current_path_info[0].decode('utf8')):
2403
current_path_info = current_path_info[:2] + \
2404
('tree-reference',) + current_path_info[3:]
2406
current_path_info = None
2407
path_handled = False
2409
advance_path = True # reset the advance flagg.
2410
if current_block is not None:
2412
if (block_index < len(state._dirblocks) and
2413
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2414
current_block = state._dirblocks[block_index]
2416
current_block = None
2417
if current_dir_info is not None:
2419
current_dir_info = dir_iterator.next()
2420
except StopIteration:
2421
current_dir_info = None
2115
2425
def is_compatible(source, target):
2116
2426
# the target must be a dirstate working tree
2117
if not isinstance(target, DirStateWorkingTree):
2427
if not isinstance(target, WorkingTree4):
2119
# the source must be a revtree or dirstate rev tree.
2429
# the source must be a revtreee or dirstate rev tree.
2120
2430
if not isinstance(source,
2121
2431
(revisiontree.RevisionTree, DirStateRevisionTree)):
2123
2433
# the source revid must be in the target dirstate
2124
if not (source._revision_id == _mod_revision.NULL_REVISION or
2434
if not (source._revision_id == NULL_REVISION or
2125
2435
source._revision_id in target.get_parent_ids()):
2126
# TODO: what about ghosts? it may well need to
2436
# TODO: what about ghosts? it may well need to
2127
2437
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
