1263
1226
@needs_tree_write_lock
1264
1227
def _write_inventory(self, inv):
1265
1228
"""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)
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:
1280
1234
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):
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"
1375
1260
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
1376
1261
accelerator_tree=None, hardlink=False):
2080
1832
if not found_versioned:
2081
1833
# 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)
1835
all_versioned = False
1837
if not all_versioned:
1838
raise errors.PathsNotVersionedError(specific_files)
2086
1839
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2087
search_specific_files = osutils.minimum_path_selection(specific_files)
1840
search_specific_files = set()
1841
for path in specific_files:
1842
other_specific_files = specific_files.difference(set([path]))
1843
if not osutils.is_inside_any(other_specific_files, path):
1844
# this is a top level path, we must check it.
1845
search_specific_files.add(path)
1847
# compare source_index and target_index at or under each element of search_specific_files.
1848
# follow the following comparison table. Note that we only want to do diff operations when
1849
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1853
# Source | Target | disk | action
1854
# r | fdlt | | add source to search, add id path move and perform
1855
# | | | diff check on source-target
1856
# r | fdlt | a | dangling file that was present in the basis.
1858
# r | a | | add source to search
1860
# r | r | | this path is present in a non-examined tree, skip.
1861
# r | r | a | this path is present in a non-examined tree, skip.
1862
# a | fdlt | | add new id
1863
# a | fdlt | a | dangling locally added file, skip
1864
# a | a | | not present in either tree, skip
1865
# a | a | a | not present in any tree, skip
1866
# a | r | | not present in either tree at this path, skip as it
1867
# | | | may not be selected by the users list of paths.
1868
# a | r | a | not present in either tree at this path, skip as it
1869
# | | | may not be selected by the users list of paths.
1870
# fdlt | fdlt | | content in both: diff them
1871
# fdlt | fdlt | a | deleted locally, but not unversioned - show as deleted ?
1872
# fdlt | a | | unversioned: output deleted id for now
1873
# fdlt | a | a | unversioned and deleted: output deleted id
1874
# fdlt | r | | 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.
1877
# fdlt | r | a | relocated in this tree, so add target to search.
1878
# | | | Dont diff, we will see an r,fd; pair when we reach
1879
# | | | this id at the other path.
1881
# for all search_indexs in each path at or under each element of
1882
# search_specific_files, if the detail is relocated: add the id, and add the
1883
# relocated path as one to search if its not searched already. If the
1884
# detail is not relocated, add the id.
1885
searched_specific_files = set()
1886
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1887
# Using a list so that we can access the values and change them in
1888
# nested scope. Each one is [path, file_id, entry]
1889
last_source_parent = [None, None]
1890
last_target_parent = [None, None]
2089
1892
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()
1894
# Just a sentry, so that _process_entry can say that this
1895
# record is handled, but isn't interesting to process (unchanged)
1896
uninteresting = object()
1899
old_dirname_to_file_id = {}
1900
new_dirname_to_file_id = {}
1901
# TODO: jam 20070516 - Avoid the _get_entry lookup overhead by
1902
# keeping a cache of directories that we have seen.
1904
def _process_entry(entry, path_info):
1905
"""Compare an entry and real disk to generate delta information.
1907
:param path_info: top_relpath, basename, kind, lstat, abspath for
1908
the path of entry. If None, then the path is considered absent.
1909
(Perhaps we should pass in a concrete entry for this ?)
1910
Basename is returned as a utf8 string because we expect this
1911
tuple will be ignored, and don't want to take the time to
1913
:return: None if these don't match
1914
A tuple of information about the change, or
1915
the object 'uninteresting' if these match, but are
1916
basically identical.
1918
if source_index is None:
1919
source_details = NULL_PARENT_DETAILS
1921
source_details = entry[1][source_index]
1922
target_details = entry[1][target_index]
1923
target_minikind = target_details[0]
1924
if path_info is not None and target_minikind in 'fdlt':
1925
assert target_index == 0
1926
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
1927
stat_value=path_info[3])
1928
# The entry may have been modified by update_entry
1929
target_details = entry[1][target_index]
1930
target_minikind = target_details[0]
1933
file_id = entry[0][2]
1934
source_minikind = source_details[0]
1935
if source_minikind in 'fdltr' and target_minikind in 'fdlt':
1936
# claimed content in both: diff
1937
# r | fdlt | | add source to search, add id path move and perform
1938
# | | | diff check on source-target
1939
# r | fdlt | a | dangling file that was present in the basis.
1941
if source_minikind in 'r':
1942
# add the source to the search path to find any children it
1943
# has. TODO ? : only add if it is a container ?
1944
if not osutils.is_inside_any(searched_specific_files,
1946
search_specific_files.add(source_details[1])
1947
# generate the old path; this is needed for stating later
1949
old_path = source_details[1]
1950
old_dirname, old_basename = os.path.split(old_path)
1951
path = pathjoin(entry[0][0], entry[0][1])
1952
old_entry = state._get_entry(source_index,
1954
# update the source details variable to be the real
1956
source_details = old_entry[1][source_index]
1957
source_minikind = source_details[0]
1959
old_dirname = entry[0][0]
1960
old_basename = entry[0][1]
1961
old_path = path = None
1962
if path_info is None:
1963
# the file is missing on disk, show as removed.
1964
content_change = True
1968
# source and target are both versioned and disk file is present.
1969
target_kind = path_info[2]
1970
if target_kind == 'directory':
1972
old_path = path = pathjoin(old_dirname, old_basename)
1973
new_dirname_to_file_id[path] = file_id
1974
if source_minikind != 'd':
1975
content_change = True
1977
# directories have no fingerprint
1978
content_change = False
1980
elif target_kind == 'file':
1981
if source_minikind != 'f':
1982
content_change = True
1984
# We could check the size, but we already have the
1986
content_change = (link_or_sha1 != source_details[1])
1987
# Target details is updated at update_entry time
1988
if use_filesystem_for_exec:
1989
# We don't need S_ISREG here, because we are sure
1990
# we are dealing with a file.
1991
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
1993
target_exec = target_details[3]
1994
elif target_kind == 'symlink':
1995
if source_minikind != 'l':
1996
content_change = True
1998
content_change = (link_or_sha1 != source_details[1])
2000
elif target_kind == 'tree-reference':
2001
if source_minikind != 't':
2002
content_change = True
2004
content_change = False
2007
raise Exception, "unknown kind %s" % path_info[2]
2008
if source_minikind == 'd':
2010
old_path = path = pathjoin(old_dirname, old_basename)
2011
old_dirname_to_file_id[old_path] = file_id
2012
# parent id is the entry for the path in the target tree
2013
if old_dirname == last_source_parent[0]:
2014
source_parent_id = last_source_parent[1]
2017
source_parent_id = old_dirname_to_file_id[old_dirname]
2019
source_parent_entry = state._get_entry(source_index,
2020
path_utf8=old_dirname)
2021
source_parent_id = source_parent_entry[0][2]
2022
if source_parent_id == entry[0][2]:
2023
# This is the root, so the parent is None
2024
source_parent_id = None
2026
last_source_parent[0] = old_dirname
2027
last_source_parent[1] = source_parent_id
2028
new_dirname = entry[0][0]
2029
if new_dirname == last_target_parent[0]:
2030
target_parent_id = last_target_parent[1]
2033
target_parent_id = new_dirname_to_file_id[new_dirname]
2035
# TODO: We don't always need to do the lookup, because the
2036
# parent entry will be the same as the source entry.
2037
target_parent_entry = state._get_entry(target_index,
2038
path_utf8=new_dirname)
2039
assert target_parent_entry != (None, None), (
2040
"Could not find target parent in wt: %s\nparent of: %s"
2041
% (new_dirname, entry))
2042
target_parent_id = target_parent_entry[0][2]
2043
if target_parent_id == entry[0][2]:
2044
# This is the root, so the parent is None
2045
target_parent_id = None
2047
last_target_parent[0] = new_dirname
2048
last_target_parent[1] = target_parent_id
2050
source_exec = source_details[3]
2051
if (include_unchanged
2053
or source_parent_id != target_parent_id
2054
or old_basename != entry[0][1]
2055
or source_exec != target_exec
2057
if old_path is None:
2058
old_path = path = pathjoin(old_dirname, old_basename)
2059
old_path_u = utf8_decode(old_path)[0]
2062
old_path_u = utf8_decode(old_path)[0]
2063
if old_path == path:
2066
path_u = utf8_decode(path)[0]
2067
source_kind = _minikind_to_kind[source_minikind]
2068
return (entry[0][2],
2069
(old_path_u, path_u),
2072
(source_parent_id, target_parent_id),
2073
(utf8_decode(old_basename)[0], utf8_decode(entry[0][1])[0]),
2074
(source_kind, target_kind),
2075
(source_exec, target_exec))
2077
return uninteresting
2078
elif source_minikind in 'a' and target_minikind in 'fdlt':
2079
# looks like a new file
2080
if path_info is not None:
2081
path = pathjoin(entry[0][0], entry[0][1])
2082
# parent id is the entry for the path in the target tree
2083
# TODO: these are the same for an entire directory: cache em.
2084
parent_id = state._get_entry(target_index,
2085
path_utf8=entry[0][0])[0][2]
2086
if parent_id == entry[0][2]:
2088
if use_filesystem_for_exec:
2089
# We need S_ISREG here, because we aren't sure if this
2092
stat.S_ISREG(path_info[3].st_mode)
2093
and stat.S_IEXEC & path_info[3].st_mode)
2095
target_exec = target_details[3]
2096
return (entry[0][2],
2097
(None, utf8_decode(path)[0]),
2101
(None, utf8_decode(entry[0][1])[0]),
2102
(None, path_info[2]),
2103
(None, target_exec))
2105
# but its not on disk: we deliberately treat this as just
2106
# never-present. (Why ?! - RBC 20070224)
2108
elif source_minikind in 'fdlt' and target_minikind in 'a':
2109
# unversioned, possibly, or possibly not deleted: we dont care.
2110
# if its still on disk, *and* theres no other entry at this
2111
# path [we dont know this in this routine at the moment -
2112
# perhaps we should change this - then it would be an unknown.
2113
old_path = pathjoin(entry[0][0], entry[0][1])
2114
# parent id is the entry for the path in the target tree
2115
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
2116
if parent_id == entry[0][2]:
2118
return (entry[0][2],
2119
(utf8_decode(old_path)[0], None),
2123
(utf8_decode(entry[0][1])[0], None),
2124
(_minikind_to_kind[source_minikind], None),
2125
(source_details[3], None))
2126
elif source_minikind in 'fdlt' and target_minikind in 'r':
2127
# a rename; could be a true rename, or a rename inherited from
2128
# a renamed parent. TODO: handle this efficiently. Its not
2129
# common case to rename dirs though, so a correct but slow
2130
# implementation will do.
2131
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
2132
search_specific_files.add(target_details[1])
2133
elif source_minikind in 'ra' and target_minikind in 'ra':
2134
# neither of the selected trees contain this file,
2135
# so skip over it. This is not currently directly tested, but
2136
# is indirectly via test_too_much.TestCommands.test_conflicts.
2139
raise AssertionError("don't know how to compare "
2140
"source_minikind=%r, target_minikind=%r"
2141
% (source_minikind, target_minikind))
2142
## import pdb;pdb.set_trace()
2145
while search_specific_files:
2146
# TODO: the pending list should be lexically sorted? the
2147
# interface doesn't require it.
2148
current_root = search_specific_files.pop()
2149
current_root_unicode = current_root.decode('utf8')
2150
searched_specific_files.add(current_root)
2151
# process the entries for this containing directory: the rest will be
2152
# found by their parents recursively.
2153
root_entries = _entries_for_path(current_root)
2154
root_abspath = self.target.abspath(current_root_unicode)
2156
root_stat = os.lstat(root_abspath)
2158
if e.errno == errno.ENOENT:
2159
# the path does not exist: let _process_entry know that.
2160
root_dir_info = None
2162
# some other random error: hand it up.
2165
root_dir_info = ('', current_root,
2166
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
2168
if root_dir_info[2] == 'directory':
2169
if self.target._directory_is_tree_reference(
2170
current_root.decode('utf8')):
2171
root_dir_info = root_dir_info[:2] + \
2172
('tree-reference',) + root_dir_info[3:]
2174
if not root_entries and not root_dir_info:
2175
# this specified path is not present at all, skip it.
2177
path_handled = False
2178
for entry in root_entries:
2179
result = _process_entry(entry, root_dir_info)
2180
if result is not None:
2182
if result is not uninteresting:
2184
if want_unversioned and not path_handled and root_dir_info:
2185
new_executable = bool(
2186
stat.S_ISREG(root_dir_info[3].st_mode)
2187
and stat.S_IEXEC & root_dir_info[3].st_mode)
2189
(None, current_root_unicode),
2193
(None, splitpath(current_root_unicode)[-1]),
2194
(None, root_dir_info[2]),
2195
(None, new_executable)
2197
initial_key = (current_root, '', '')
2198
block_index, _ = state._find_block_index_from_key(initial_key)
2199
if block_index == 0:
2200
# we have processed the total root already, but because the
2201
# initial key matched it we should skip it here.
2203
if root_dir_info and root_dir_info[2] == 'tree-reference':
2204
current_dir_info = None
2206
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
2208
current_dir_info = dir_iterator.next()
2210
# on win32, python2.4 has e.errno == ERROR_DIRECTORY, but
2211
# python 2.5 has e.errno == EINVAL,
2212
# and e.winerror == ERROR_DIRECTORY
2213
e_winerror = getattr(e, 'winerror', None)
2214
win_errors = (ERROR_DIRECTORY, ERROR_PATH_NOT_FOUND)
2215
# there may be directories in the inventory even though
2216
# this path is not a file on disk: so mark it as end of
2218
if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
2219
current_dir_info = None
2220
elif (sys.platform == 'win32'
2221
and (e.errno in win_errors
2222
or e_winerror in win_errors)):
2223
current_dir_info = None
2227
if current_dir_info[0][0] == '':
2228
# remove .bzr from iteration
2229
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
2230
assert current_dir_info[1][bzr_index][0] == '.bzr'
2231
del current_dir_info[1][bzr_index]
2232
# walk until both the directory listing and the versioned metadata
2234
if (block_index < len(state._dirblocks) and
2235
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2236
current_block = state._dirblocks[block_index]
2238
current_block = None
2239
while (current_dir_info is not None or
2240
current_block is not None):
2241
if (current_dir_info and current_block
2242
and current_dir_info[0][0] != current_block[0]):
2243
if cmp_by_dirs(current_dir_info[0][0], current_block[0]) < 0:
2244
# filesystem data refers to paths not covered by the dirblock.
2245
# this has two possibilities:
2246
# A) it is versioned but empty, so there is no block for it
2247
# B) it is not versioned.
2249
# if (A) then we need to recurse into it to check for
2250
# new unknown files or directories.
2251
# if (B) then we should ignore it, because we don't
2252
# recurse into unknown directories.
2254
while path_index < len(current_dir_info[1]):
2255
current_path_info = current_dir_info[1][path_index]
2256
if want_unversioned:
2257
if current_path_info[2] == 'directory':
2258
if self.target._directory_is_tree_reference(
2259
current_path_info[0].decode('utf8')):
2260
current_path_info = current_path_info[:2] + \
2261
('tree-reference',) + current_path_info[3:]
2262
new_executable = bool(
2263
stat.S_ISREG(current_path_info[3].st_mode)
2264
and stat.S_IEXEC & current_path_info[3].st_mode)
2266
(None, utf8_decode(current_path_info[0])[0]),
2270
(None, utf8_decode(current_path_info[1])[0]),
2271
(None, current_path_info[2]),
2272
(None, new_executable))
2273
# dont descend into this unversioned path if it is
2275
if current_path_info[2] in ('directory',
2277
del current_dir_info[1][path_index]
2281
# This dir info has been handled, go to the next
2283
current_dir_info = dir_iterator.next()
2284
except StopIteration:
2285
current_dir_info = None
2287
# We have a dirblock entry for this location, but there
2288
# is no filesystem path for this. This is most likely
2289
# because a directory was removed from the disk.
2290
# We don't have to report the missing directory,
2291
# because that should have already been handled, but we
2292
# need to handle all of the files that are contained
2294
for current_entry in current_block[1]:
2295
# entry referring to file not present on disk.
2296
# advance the entry only, after processing.
2297
result = _process_entry(current_entry, None)
2298
if result is not None:
2299
if result is not uninteresting:
2302
if (block_index < len(state._dirblocks) and
2303
osutils.is_inside(current_root,
2304
state._dirblocks[block_index][0])):
2305
current_block = state._dirblocks[block_index]
2307
current_block = None
2310
if current_block and entry_index < len(current_block[1]):
2311
current_entry = current_block[1][entry_index]
2313
current_entry = None
2314
advance_entry = True
2316
if current_dir_info and path_index < len(current_dir_info[1]):
2317
current_path_info = current_dir_info[1][path_index]
2318
if current_path_info[2] == 'directory':
2319
if self.target._directory_is_tree_reference(
2320
current_path_info[0].decode('utf8')):
2321
current_path_info = current_path_info[:2] + \
2322
('tree-reference',) + current_path_info[3:]
2324
current_path_info = None
2326
path_handled = False
2327
while (current_entry is not None or
2328
current_path_info is not None):
2329
if current_entry is None:
2330
# the check for path_handled when the path is adnvaced
2331
# will yield this path if needed.
2333
elif current_path_info is None:
2334
# no path is fine: the per entry code will handle it.
2335
result = _process_entry(current_entry, current_path_info)
2336
if result is not None:
2337
if result is not uninteresting:
2339
elif (current_entry[0][1] != current_path_info[1]
2340
or current_entry[1][target_index][0] in 'ar'):
2341
# The current path on disk doesn't match the dirblock
2342
# record. Either the dirblock is marked as absent, or
2343
# the file on disk is not present at all in the
2344
# dirblock. Either way, report about the dirblock
2345
# entry, and let other code handle the filesystem one.
2347
# Compare the basename for these files to determine
2349
if current_path_info[1] < current_entry[0][1]:
2350
# extra file on disk: pass for now, but only
2351
# increment the path, not the entry
2352
advance_entry = False
2354
# entry referring to file not present on disk.
2355
# advance the entry only, after processing.
2356
result = _process_entry(current_entry, None)
2357
if result is not None:
2358
if result is not uninteresting:
2360
advance_path = False
2362
result = _process_entry(current_entry, current_path_info)
2363
if result is not None:
2365
if result is not uninteresting:
2367
if advance_entry and current_entry is not None:
2369
if entry_index < len(current_block[1]):
2370
current_entry = current_block[1][entry_index]
2372
current_entry = None
2374
advance_entry = True # reset the advance flaga
2375
if advance_path and current_path_info is not None:
2376
if not path_handled:
2377
# unversioned in all regards
2378
if want_unversioned:
2379
new_executable = bool(
2380
stat.S_ISREG(current_path_info[3].st_mode)
2381
and stat.S_IEXEC & current_path_info[3].st_mode)
2383
(None, utf8_decode(current_path_info[0])[0]),
2387
(None, utf8_decode(current_path_info[1])[0]),
2388
(None, current_path_info[2]),
2389
(None, new_executable))
2390
# dont descend into this unversioned path if it is
2392
if current_path_info[2] in ('directory'):
2393
del current_dir_info[1][path_index]
2395
# dont descend the disk iterator into any tree
2397
if current_path_info[2] == 'tree-reference':
2398
del current_dir_info[1][path_index]
2401
if path_index < len(current_dir_info[1]):
2402
current_path_info = current_dir_info[1][path_index]
2403
if current_path_info[2] == 'directory':
2404
if self.target._directory_is_tree_reference(
2405
current_path_info[0].decode('utf8')):
2406
current_path_info = current_path_info[:2] + \
2407
('tree-reference',) + current_path_info[3:]
2409
current_path_info = None
2410
path_handled = False
2412
advance_path = True # reset the advance flagg.
2413
if current_block is not None:
2415
if (block_index < len(state._dirblocks) and
2416
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2417
current_block = state._dirblocks[block_index]
2419
current_block = None
2420
if current_dir_info is not None:
2422
current_dir_info = dir_iterator.next()
2423
except StopIteration:
2424
current_dir_info = None
2096
2428
def is_compatible(source, target):
2097
2429
# the target must be a dirstate working tree
2098
if not isinstance(target, DirStateWorkingTree):
2430
if not isinstance(target, WorkingTree4):
2100
# the source must be a revtree or dirstate rev tree.
2432
# the source must be a revtreee or dirstate rev tree.
2101
2433
if not isinstance(source,
2102
2434
(revisiontree.RevisionTree, DirStateRevisionTree)):
2104
2436
# the source revid must be in the target dirstate
2105
if not (source._revision_id == _mod_revision.NULL_REVISION or
2437
if not (source._revision_id == NULL_REVISION or
2106
2438
source._revision_id in target.get_parent_ids()):
2107
# TODO: what about ghosts? it may well need to
2439
# TODO: what about ghosts? it may well need to
2108
2440
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
