1263
1225
@needs_tree_write_lock
1264
1226
def _write_inventory(self, inv):
1265
1227
"""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)
1228
assert not self._dirty, ("attempting to write an inventory when the "
1229
"dirstate is dirty will cause data loss")
1230
self.current_dirstate().set_state_from_inventory(inv)
1231
self._make_dirty(reset_inventory=False)
1232
if self._inventory is not None:
1280
1233
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):
1237
class WorkingTreeFormat4(WorkingTreeFormat3):
1238
"""The first consolidated dirstate working tree format.
1241
- exists within a metadir controlling .bzr
1242
- includes an explicit version marker for the workingtree control
1243
files, separate from the BzrDir format
1244
- modifies the hash cache format
1245
- is new in bzr 0.15
1246
- uses a LockDir to guard access to it.
1249
upgrade_recommended = False
1251
def get_format_string(self):
1252
"""See WorkingTreeFormat.get_format_string()."""
1253
return "Bazaar Working Tree Format 4 (bzr 0.15)\n"
1255
def get_format_description(self):
1256
"""See WorkingTreeFormat.get_format_description()."""
1257
return "Working tree format 4"
1375
1259
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
1376
accelerator_tree=None, hardlink=False):
1260
accelerator_tree=None):
1377
1261
"""See WorkingTreeFormat.initialize().
1379
1263
:param revision_id: allows creating a working tree at a different
1380
1264
revision than the branch is at.
1381
:param accelerator_tree: A tree which can be used for retrieving file
1382
contents more quickly than the revision tree, i.e. a workingtree.
1383
The revision tree will be used for cases where accelerator_tree's
1384
content is different.
1385
:param hardlink: If true, hard-link files from accelerator_tree,
1388
1266
These trees get an initial random root id, if their repository supports
1389
1267
rich root data, TREE_ROOT otherwise.
2080
1812
if not found_versioned:
2081
1813
# 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)
1815
all_versioned = False
1817
if not all_versioned:
1818
raise errors.PathsNotVersionedError(specific_files)
2086
1819
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2087
search_specific_files = osutils.minimum_path_selection(specific_files)
1820
search_specific_files = set()
1821
for path in specific_files:
1822
other_specific_files = specific_files.difference(set([path]))
1823
if not osutils.is_inside_any(other_specific_files, path):
1824
# this is a top level path, we must check it.
1825
search_specific_files.add(path)
1827
# compare source_index and target_index at or under each element of search_specific_files.
1828
# follow the following comparison table. Note that we only want to do diff operations when
1829
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1833
# Source | Target | disk | action
1834
# r | fdlt | | add source to search, add id path move and perform
1835
# | | | diff check on source-target
1836
# r | fdlt | a | dangling file that was present in the basis.
1838
# r | a | | add source to search
1840
# r | r | | this path is present in a non-examined tree, skip.
1841
# r | r | a | this path is present in a non-examined tree, skip.
1842
# a | fdlt | | add new id
1843
# a | fdlt | a | dangling locally added file, skip
1844
# a | a | | not present in either tree, skip
1845
# a | a | a | not present in any tree, skip
1846
# a | r | | not present in either tree at this path, skip as it
1847
# | | | may not be selected by the users list of paths.
1848
# a | r | a | not present in either tree at this path, skip as it
1849
# | | | may not be selected by the users list of paths.
1850
# fdlt | fdlt | | content in both: diff them
1851
# fdlt | fdlt | a | deleted locally, but not unversioned - show as deleted ?
1852
# fdlt | a | | unversioned: output deleted id for now
1853
# fdlt | a | a | unversioned and deleted: output deleted id
1854
# fdlt | r | | relocated in this tree, so add target to search.
1855
# | | | Dont diff, we will see an r,fd; pair when we reach
1856
# | | | this id at the other path.
1857
# fdlt | r | a | relocated in this tree, so add target to search.
1858
# | | | Dont diff, we will see an r,fd; pair when we reach
1859
# | | | this id at the other path.
1861
# for all search_indexs in each path at or under each element of
1862
# search_specific_files, if the detail is relocated: add the id, and add the
1863
# relocated path as one to search if its not searched already. If the
1864
# detail is not relocated, add the id.
1865
searched_specific_files = set()
1866
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1867
# Using a list so that we can access the values and change them in
1868
# nested scope. Each one is [path, file_id, entry]
1869
last_source_parent = [None, None]
1870
last_target_parent = [None, None]
2089
1872
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()
1874
# Just a sentry, so that _process_entry can say that this
1875
# record is handled, but isn't interesting to process (unchanged)
1876
uninteresting = object()
1879
old_dirname_to_file_id = {}
1880
new_dirname_to_file_id = {}
1881
# TODO: jam 20070516 - Avoid the _get_entry lookup overhead by
1882
# keeping a cache of directories that we have seen.
1884
def _process_entry(entry, path_info):
1885
"""Compare an entry and real disk to generate delta information.
1887
:param path_info: top_relpath, basename, kind, lstat, abspath for
1888
the path of entry. If None, then the path is considered absent.
1889
(Perhaps we should pass in a concrete entry for this ?)
1890
Basename is returned as a utf8 string because we expect this
1891
tuple will be ignored, and don't want to take the time to
1893
:return: None if these don't match
1894
A tuple of information about the change, or
1895
the object 'uninteresting' if these match, but are
1896
basically identical.
1898
if source_index is None:
1899
source_details = NULL_PARENT_DETAILS
1901
source_details = entry[1][source_index]
1902
target_details = entry[1][target_index]
1903
target_minikind = target_details[0]
1904
if path_info is not None and target_minikind in 'fdlt':
1905
assert target_index == 0
1906
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
1907
stat_value=path_info[3])
1908
# The entry may have been modified by update_entry
1909
target_details = entry[1][target_index]
1910
target_minikind = target_details[0]
1913
file_id = entry[0][2]
1914
source_minikind = source_details[0]
1915
if source_minikind in 'fdltr' and target_minikind in 'fdlt':
1916
# claimed content in both: diff
1917
# r | fdlt | | add source to search, add id path move and perform
1918
# | | | diff check on source-target
1919
# r | fdlt | a | dangling file that was present in the basis.
1921
if source_minikind in 'r':
1922
# add the source to the search path to find any children it
1923
# has. TODO ? : only add if it is a container ?
1924
if not osutils.is_inside_any(searched_specific_files,
1926
search_specific_files.add(source_details[1])
1927
# generate the old path; this is needed for stating later
1929
old_path = source_details[1]
1930
old_dirname, old_basename = os.path.split(old_path)
1931
path = pathjoin(entry[0][0], entry[0][1])
1932
old_entry = state._get_entry(source_index,
1934
# update the source details variable to be the real
1936
source_details = old_entry[1][source_index]
1937
source_minikind = source_details[0]
1939
old_dirname = entry[0][0]
1940
old_basename = entry[0][1]
1941
old_path = path = None
1942
if path_info is None:
1943
# the file is missing on disk, show as removed.
1944
content_change = True
1948
# source and target are both versioned and disk file is present.
1949
target_kind = path_info[2]
1950
if target_kind == 'directory':
1952
old_path = path = pathjoin(old_dirname, old_basename)
1953
new_dirname_to_file_id[path] = file_id
1954
if source_minikind != 'd':
1955
content_change = True
1957
# directories have no fingerprint
1958
content_change = False
1960
elif target_kind == 'file':
1961
if source_minikind != 'f':
1962
content_change = True
1964
# We could check the size, but we already have the
1966
content_change = (link_or_sha1 != source_details[1])
1967
# Target details is updated at update_entry time
1968
if use_filesystem_for_exec:
1969
# We don't need S_ISREG here, because we are sure
1970
# we are dealing with a file.
1971
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
1973
target_exec = target_details[3]
1974
elif target_kind == 'symlink':
1975
if source_minikind != 'l':
1976
content_change = True
1978
content_change = (link_or_sha1 != source_details[1])
1980
elif target_kind == 'tree-reference':
1981
if source_minikind != 't':
1982
content_change = True
1984
content_change = False
1987
raise Exception, "unknown kind %s" % path_info[2]
1988
if source_minikind == 'd':
1990
old_path = path = pathjoin(old_dirname, old_basename)
1991
old_dirname_to_file_id[old_path] = file_id
1992
# parent id is the entry for the path in the target tree
1993
if old_dirname == last_source_parent[0]:
1994
source_parent_id = last_source_parent[1]
1997
source_parent_id = old_dirname_to_file_id[old_dirname]
1999
source_parent_entry = state._get_entry(source_index,
2000
path_utf8=old_dirname)
2001
source_parent_id = source_parent_entry[0][2]
2002
if source_parent_id == entry[0][2]:
2003
# This is the root, so the parent is None
2004
source_parent_id = None
2006
last_source_parent[0] = old_dirname
2007
last_source_parent[1] = source_parent_id
2008
new_dirname = entry[0][0]
2009
if new_dirname == last_target_parent[0]:
2010
target_parent_id = last_target_parent[1]
2013
target_parent_id = new_dirname_to_file_id[new_dirname]
2015
# TODO: We don't always need to do the lookup, because the
2016
# parent entry will be the same as the source entry.
2017
target_parent_entry = state._get_entry(target_index,
2018
path_utf8=new_dirname)
2019
assert target_parent_entry != (None, None), (
2020
"Could not find target parent in wt: %s\nparent of: %s"
2021
% (new_dirname, entry))
2022
target_parent_id = target_parent_entry[0][2]
2023
if target_parent_id == entry[0][2]:
2024
# This is the root, so the parent is None
2025
target_parent_id = None
2027
last_target_parent[0] = new_dirname
2028
last_target_parent[1] = target_parent_id
2030
source_exec = source_details[3]
2031
if (include_unchanged
2033
or source_parent_id != target_parent_id
2034
or old_basename != entry[0][1]
2035
or source_exec != target_exec
2037
if old_path is None:
2038
old_path = path = pathjoin(old_dirname, old_basename)
2039
old_path_u = utf8_decode(old_path)[0]
2042
old_path_u = utf8_decode(old_path)[0]
2043
if old_path == path:
2046
path_u = utf8_decode(path)[0]
2047
source_kind = _minikind_to_kind[source_minikind]
2048
return (entry[0][2],
2049
(old_path_u, path_u),
2052
(source_parent_id, target_parent_id),
2053
(utf8_decode(old_basename)[0], utf8_decode(entry[0][1])[0]),
2054
(source_kind, target_kind),
2055
(source_exec, target_exec))
2057
return uninteresting
2058
elif source_minikind in 'a' and target_minikind in 'fdlt':
2059
# looks like a new file
2060
if path_info is not None:
2061
path = pathjoin(entry[0][0], entry[0][1])
2062
# parent id is the entry for the path in the target tree
2063
# TODO: these are the same for an entire directory: cache em.
2064
parent_id = state._get_entry(target_index,
2065
path_utf8=entry[0][0])[0][2]
2066
if parent_id == entry[0][2]:
2068
if use_filesystem_for_exec:
2069
# We need S_ISREG here, because we aren't sure if this
2072
stat.S_ISREG(path_info[3].st_mode)
2073
and stat.S_IEXEC & path_info[3].st_mode)
2075
target_exec = target_details[3]
2076
return (entry[0][2],
2077
(None, utf8_decode(path)[0]),
2081
(None, utf8_decode(entry[0][1])[0]),
2082
(None, path_info[2]),
2083
(None, target_exec))
2085
# but its not on disk: we deliberately treat this as just
2086
# never-present. (Why ?! - RBC 20070224)
2088
elif source_minikind in 'fdlt' and target_minikind in 'a':
2089
# unversioned, possibly, or possibly not deleted: we dont care.
2090
# if its still on disk, *and* theres no other entry at this
2091
# path [we dont know this in this routine at the moment -
2092
# perhaps we should change this - then it would be an unknown.
2093
old_path = pathjoin(entry[0][0], entry[0][1])
2094
# parent id is the entry for the path in the target tree
2095
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
2096
if parent_id == entry[0][2]:
2098
return (entry[0][2],
2099
(utf8_decode(old_path)[0], None),
2103
(utf8_decode(entry[0][1])[0], None),
2104
(_minikind_to_kind[source_minikind], None),
2105
(source_details[3], None))
2106
elif source_minikind in 'fdlt' and target_minikind in 'r':
2107
# a rename; could be a true rename, or a rename inherited from
2108
# a renamed parent. TODO: handle this efficiently. Its not
2109
# common case to rename dirs though, so a correct but slow
2110
# implementation will do.
2111
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
2112
search_specific_files.add(target_details[1])
2113
elif source_minikind in 'ra' and target_minikind in 'ra':
2114
# neither of the selected trees contain this file,
2115
# so skip over it. This is not currently directly tested, but
2116
# is indirectly via test_too_much.TestCommands.test_conflicts.
2119
raise AssertionError("don't know how to compare "
2120
"source_minikind=%r, target_minikind=%r"
2121
% (source_minikind, target_minikind))
2122
## import pdb;pdb.set_trace()
2125
while search_specific_files:
2126
# TODO: the pending list should be lexically sorted? the
2127
# interface doesn't require it.
2128
current_root = search_specific_files.pop()
2129
current_root_unicode = current_root.decode('utf8')
2130
searched_specific_files.add(current_root)
2131
# process the entries for this containing directory: the rest will be
2132
# found by their parents recursively.
2133
root_entries = _entries_for_path(current_root)
2134
root_abspath = self.target.abspath(current_root_unicode)
2136
root_stat = os.lstat(root_abspath)
2138
if e.errno == errno.ENOENT:
2139
# the path does not exist: let _process_entry know that.
2140
root_dir_info = None
2142
# some other random error: hand it up.
2145
root_dir_info = ('', current_root,
2146
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
2148
if root_dir_info[2] == 'directory':
2149
if self.target._directory_is_tree_reference(
2150
current_root.decode('utf8')):
2151
root_dir_info = root_dir_info[:2] + \
2152
('tree-reference',) + root_dir_info[3:]
2154
if not root_entries and not root_dir_info:
2155
# this specified path is not present at all, skip it.
2157
path_handled = False
2158
for entry in root_entries:
2159
result = _process_entry(entry, root_dir_info)
2160
if result is not None:
2162
if result is not uninteresting:
2164
if want_unversioned and not path_handled and root_dir_info:
2165
new_executable = bool(
2166
stat.S_ISREG(root_dir_info[3].st_mode)
2167
and stat.S_IEXEC & root_dir_info[3].st_mode)
2169
(None, current_root_unicode),
2173
(None, splitpath(current_root_unicode)[-1]),
2174
(None, root_dir_info[2]),
2175
(None, new_executable)
2177
initial_key = (current_root, '', '')
2178
block_index, _ = state._find_block_index_from_key(initial_key)
2179
if block_index == 0:
2180
# we have processed the total root already, but because the
2181
# initial key matched it we should skip it here.
2183
if root_dir_info and root_dir_info[2] == 'tree-reference':
2184
current_dir_info = None
2186
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
2188
current_dir_info = dir_iterator.next()
2190
# on win32, python2.4 has e.errno == ERROR_DIRECTORY, but
2191
# python 2.5 has e.errno == EINVAL,
2192
# and e.winerror == ERROR_DIRECTORY
2193
e_winerror = getattr(e, 'winerror', None)
2194
win_errors = (ERROR_DIRECTORY, ERROR_PATH_NOT_FOUND)
2195
# there may be directories in the inventory even though
2196
# this path is not a file on disk: so mark it as end of
2198
if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
2199
current_dir_info = None
2200
elif (sys.platform == 'win32'
2201
and (e.errno in win_errors
2202
or e_winerror in win_errors)):
2203
current_dir_info = None
2207
if current_dir_info[0][0] == '':
2208
# remove .bzr from iteration
2209
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
2210
assert current_dir_info[1][bzr_index][0] == '.bzr'
2211
del current_dir_info[1][bzr_index]
2212
# walk until both the directory listing and the versioned metadata
2214
if (block_index < len(state._dirblocks) and
2215
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2216
current_block = state._dirblocks[block_index]
2218
current_block = None
2219
while (current_dir_info is not None or
2220
current_block is not None):
2221
if (current_dir_info and current_block
2222
and current_dir_info[0][0] != current_block[0]):
2223
if cmp_by_dirs(current_dir_info[0][0], current_block[0]) < 0:
2224
# filesystem data refers to paths not covered by the dirblock.
2225
# this has two possibilities:
2226
# A) it is versioned but empty, so there is no block for it
2227
# B) it is not versioned.
2229
# if (A) then we need to recurse into it to check for
2230
# new unknown files or directories.
2231
# if (B) then we should ignore it, because we don't
2232
# recurse into unknown directories.
2234
while path_index < len(current_dir_info[1]):
2235
current_path_info = current_dir_info[1][path_index]
2236
if want_unversioned:
2237
if current_path_info[2] == 'directory':
2238
if self.target._directory_is_tree_reference(
2239
current_path_info[0].decode('utf8')):
2240
current_path_info = current_path_info[:2] + \
2241
('tree-reference',) + current_path_info[3:]
2242
new_executable = bool(
2243
stat.S_ISREG(current_path_info[3].st_mode)
2244
and stat.S_IEXEC & current_path_info[3].st_mode)
2246
(None, utf8_decode(current_path_info[0])[0]),
2250
(None, utf8_decode(current_path_info[1])[0]),
2251
(None, current_path_info[2]),
2252
(None, new_executable))
2253
# dont descend into this unversioned path if it is
2255
if current_path_info[2] in ('directory',
2257
del current_dir_info[1][path_index]
2261
# This dir info has been handled, go to the next
2263
current_dir_info = dir_iterator.next()
2264
except StopIteration:
2265
current_dir_info = None
2267
# We have a dirblock entry for this location, but there
2268
# is no filesystem path for this. This is most likely
2269
# because a directory was removed from the disk.
2270
# We don't have to report the missing directory,
2271
# because that should have already been handled, but we
2272
# need to handle all of the files that are contained
2274
for current_entry in current_block[1]:
2275
# entry referring to file not present on disk.
2276
# advance the entry only, after processing.
2277
result = _process_entry(current_entry, None)
2278
if result is not None:
2279
if result is not uninteresting:
2282
if (block_index < len(state._dirblocks) and
2283
osutils.is_inside(current_root,
2284
state._dirblocks[block_index][0])):
2285
current_block = state._dirblocks[block_index]
2287
current_block = None
2290
if current_block and entry_index < len(current_block[1]):
2291
current_entry = current_block[1][entry_index]
2293
current_entry = None
2294
advance_entry = True
2296
if current_dir_info and path_index < len(current_dir_info[1]):
2297
current_path_info = current_dir_info[1][path_index]
2298
if current_path_info[2] == 'directory':
2299
if self.target._directory_is_tree_reference(
2300
current_path_info[0].decode('utf8')):
2301
current_path_info = current_path_info[:2] + \
2302
('tree-reference',) + current_path_info[3:]
2304
current_path_info = None
2306
path_handled = False
2307
while (current_entry is not None or
2308
current_path_info is not None):
2309
if current_entry is None:
2310
# the check for path_handled when the path is adnvaced
2311
# will yield this path if needed.
2313
elif current_path_info is None:
2314
# no path is fine: the per entry code will handle it.
2315
result = _process_entry(current_entry, current_path_info)
2316
if result is not None:
2317
if result is not uninteresting:
2319
elif (current_entry[0][1] != current_path_info[1]
2320
or current_entry[1][target_index][0] in 'ar'):
2321
# The current path on disk doesn't match the dirblock
2322
# record. Either the dirblock is marked as absent, or
2323
# the file on disk is not present at all in the
2324
# dirblock. Either way, report about the dirblock
2325
# entry, and let other code handle the filesystem one.
2327
# Compare the basename for these files to determine
2329
if current_path_info[1] < current_entry[0][1]:
2330
# extra file on disk: pass for now, but only
2331
# increment the path, not the entry
2332
advance_entry = False
2334
# entry referring to file not present on disk.
2335
# advance the entry only, after processing.
2336
result = _process_entry(current_entry, None)
2337
if result is not None:
2338
if result is not uninteresting:
2340
advance_path = False
2342
result = _process_entry(current_entry, current_path_info)
2343
if result is not None:
2345
if result is not uninteresting:
2347
if advance_entry and current_entry is not None:
2349
if entry_index < len(current_block[1]):
2350
current_entry = current_block[1][entry_index]
2352
current_entry = None
2354
advance_entry = True # reset the advance flaga
2355
if advance_path and current_path_info is not None:
2356
if not path_handled:
2357
# unversioned in all regards
2358
if want_unversioned:
2359
new_executable = bool(
2360
stat.S_ISREG(current_path_info[3].st_mode)
2361
and stat.S_IEXEC & current_path_info[3].st_mode)
2363
(None, utf8_decode(current_path_info[0])[0]),
2367
(None, utf8_decode(current_path_info[1])[0]),
2368
(None, current_path_info[2]),
2369
(None, new_executable))
2370
# dont descend into this unversioned path if it is
2372
if current_path_info[2] in ('directory'):
2373
del current_dir_info[1][path_index]
2375
# dont descend the disk iterator into any tree
2377
if current_path_info[2] == 'tree-reference':
2378
del current_dir_info[1][path_index]
2381
if path_index < len(current_dir_info[1]):
2382
current_path_info = current_dir_info[1][path_index]
2383
if current_path_info[2] == 'directory':
2384
if self.target._directory_is_tree_reference(
2385
current_path_info[0].decode('utf8')):
2386
current_path_info = current_path_info[:2] + \
2387
('tree-reference',) + current_path_info[3:]
2389
current_path_info = None
2390
path_handled = False
2392
advance_path = True # reset the advance flagg.
2393
if current_block is not None:
2395
if (block_index < len(state._dirblocks) and
2396
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2397
current_block = state._dirblocks[block_index]
2399
current_block = None
2400
if current_dir_info is not None:
2402
current_dir_info = dir_iterator.next()
2403
except StopIteration:
2404
current_dir_info = None
2096
2408
def is_compatible(source, target):
2097
2409
# the target must be a dirstate working tree
2098
if not isinstance(target, DirStateWorkingTree):
2410
if not isinstance(target, WorkingTree4):
2100
# the source must be a revtree or dirstate rev tree.
2412
# the source must be a revtreee or dirstate rev tree.
2101
2413
if not isinstance(source,
2102
2414
(revisiontree.RevisionTree, DirStateRevisionTree)):
2104
2416
# the source revid must be in the target dirstate
2105
if not (source._revision_id == _mod_revision.NULL_REVISION or
2417
if not (source._revision_id == NULL_REVISION or
2106
2418
source._revision_id in target.get_parent_ids()):
2107
# TODO: what about ghosts? it may well need to
2419
# TODO: what about ghosts? it may well need to
2108
2420
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
