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):
1375
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
1376
accelerator_tree=None, hardlink=False):
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"
1259
def initialize(self, a_bzrdir, revision_id=None):
1377
1260
"""See WorkingTreeFormat.initialize().
1379
1262
:param revision_id: allows creating a working tree at a different
1380
1263
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
1265
These trees get an initial random root id, if their repository supports
1389
1266
rich root data, TREE_ROOT otherwise.
2080
1795
if not found_versioned:
2081
1796
# 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)
1798
all_versioned = False
1800
if not all_versioned:
1801
raise errors.PathsNotVersionedError(specific_files)
2086
1802
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2087
search_specific_files = osutils.minimum_path_selection(specific_files)
1803
search_specific_files = set()
1804
for path in specific_files:
1805
other_specific_files = specific_files.difference(set([path]))
1806
if not osutils.is_inside_any(other_specific_files, path):
1807
# this is a top level path, we must check it.
1808
search_specific_files.add(path)
1810
# compare source_index and target_index at or under each element of search_specific_files.
1811
# follow the following comparison table. Note that we only want to do diff operations when
1812
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1816
# Source | Target | disk | action
1817
# r | fdlt | | add source to search, add id path move and perform
1818
# | | | diff check on source-target
1819
# r | fdlt | a | dangling file that was present in the basis.
1821
# r | a | | add source to search
1823
# r | r | | this path is present in a non-examined tree, skip.
1824
# r | r | a | this path is present in a non-examined tree, skip.
1825
# a | fdlt | | add new id
1826
# a | fdlt | a | dangling locally added file, skip
1827
# a | a | | not present in either tree, skip
1828
# a | a | a | not present in any tree, skip
1829
# a | r | | not present in either tree at this path, skip as it
1830
# | | | may not be selected by the users list of paths.
1831
# a | r | a | not present in either tree at this path, skip as it
1832
# | | | may not be selected by the users list of paths.
1833
# fdlt | fdlt | | content in both: diff them
1834
# fdlt | fdlt | a | deleted locally, but not unversioned - show as deleted ?
1835
# fdlt | a | | unversioned: output deleted id for now
1836
# fdlt | a | a | unversioned and deleted: output deleted id
1837
# fdlt | r | | relocated in this tree, so add target to search.
1838
# | | | Dont diff, we will see an r,fd; pair when we reach
1839
# | | | this id at the other path.
1840
# fdlt | r | a | relocated in this tree, so add target to search.
1841
# | | | Dont diff, we will see an r,fd; pair when we reach
1842
# | | | this id at the other path.
1844
# for all search_indexs in each path at or under each element of
1845
# search_specific_files, if the detail is relocated: add the id, and add the
1846
# relocated path as one to search if its not searched already. If the
1847
# detail is not relocated, add the id.
1848
searched_specific_files = set()
1849
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1850
# Using a list so that we can access the values and change them in
1851
# nested scope. Each one is [path, file_id, entry]
1852
last_source_parent = [None, None]
1853
last_target_parent = [None, None]
2089
1855
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()
1857
# Just a sentry, so that _process_entry can say that this
1858
# record is handled, but isn't interesting to process (unchanged)
1859
uninteresting = object()
1862
old_dirname_to_file_id = {}
1863
new_dirname_to_file_id = {}
1864
# TODO: jam 20070516 - Avoid the _get_entry lookup overhead by
1865
# keeping a cache of directories that we have seen.
1867
def _process_entry(entry, path_info):
1868
"""Compare an entry and real disk to generate delta information.
1870
:param path_info: top_relpath, basename, kind, lstat, abspath for
1871
the path of entry. If None, then the path is considered absent.
1872
(Perhaps we should pass in a concrete entry for this ?)
1873
Basename is returned as a utf8 string because we expect this
1874
tuple will be ignored, and don't want to take the time to
1876
:return: None if these don't match
1877
A tuple of information about the change, or
1878
the object 'uninteresting' if these match, but are
1879
basically identical.
1881
if source_index is None:
1882
source_details = NULL_PARENT_DETAILS
1884
source_details = entry[1][source_index]
1885
target_details = entry[1][target_index]
1886
target_minikind = target_details[0]
1887
if path_info is not None and target_minikind in 'fdlt':
1888
assert target_index == 0
1889
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
1890
stat_value=path_info[3])
1891
# The entry may have been modified by update_entry
1892
target_details = entry[1][target_index]
1893
target_minikind = target_details[0]
1896
file_id = entry[0][2]
1897
source_minikind = source_details[0]
1898
if source_minikind in 'fdltr' and target_minikind in 'fdlt':
1899
# claimed content in both: diff
1900
# r | fdlt | | add source to search, add id path move and perform
1901
# | | | diff check on source-target
1902
# r | fdlt | a | dangling file that was present in the basis.
1904
if source_minikind in 'r':
1905
# add the source to the search path to find any children it
1906
# has. TODO ? : only add if it is a container ?
1907
if not osutils.is_inside_any(searched_specific_files,
1909
search_specific_files.add(source_details[1])
1910
# generate the old path; this is needed for stating later
1912
old_path = source_details[1]
1913
old_dirname, old_basename = os.path.split(old_path)
1914
path = pathjoin(entry[0][0], entry[0][1])
1915
old_entry = state._get_entry(source_index,
1917
# update the source details variable to be the real
1919
source_details = old_entry[1][source_index]
1920
source_minikind = source_details[0]
1922
old_dirname = entry[0][0]
1923
old_basename = entry[0][1]
1924
old_path = path = None
1925
if path_info is None:
1926
# the file is missing on disk, show as removed.
1927
content_change = True
1931
# source and target are both versioned and disk file is present.
1932
target_kind = path_info[2]
1933
if target_kind == 'directory':
1935
old_path = path = pathjoin(old_dirname, old_basename)
1936
new_dirname_to_file_id[path] = file_id
1937
if source_minikind != 'd':
1938
content_change = True
1940
# directories have no fingerprint
1941
content_change = False
1943
elif target_kind == 'file':
1944
if source_minikind != 'f':
1945
content_change = True
1947
# We could check the size, but we already have the
1949
content_change = (link_or_sha1 != source_details[1])
1950
# Target details is updated at update_entry time
1951
if use_filesystem_for_exec:
1952
# We don't need S_ISREG here, because we are sure
1953
# we are dealing with a file.
1954
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
1956
target_exec = target_details[3]
1957
elif target_kind == 'symlink':
1958
if source_minikind != 'l':
1959
content_change = True
1961
content_change = (link_or_sha1 != source_details[1])
1963
elif target_kind == 'tree-reference':
1964
if source_minikind != 't':
1965
content_change = True
1967
content_change = False
1970
raise Exception, "unknown kind %s" % path_info[2]
1971
if source_minikind == 'd':
1973
old_path = path = pathjoin(old_dirname, old_basename)
1974
old_dirname_to_file_id[old_path] = file_id
1975
# parent id is the entry for the path in the target tree
1976
if old_dirname == last_source_parent[0]:
1977
source_parent_id = last_source_parent[1]
1980
source_parent_id = old_dirname_to_file_id[old_dirname]
1982
source_parent_entry = state._get_entry(source_index,
1983
path_utf8=old_dirname)
1984
source_parent_id = source_parent_entry[0][2]
1985
if source_parent_id == entry[0][2]:
1986
# This is the root, so the parent is None
1987
source_parent_id = None
1989
last_source_parent[0] = old_dirname
1990
last_source_parent[1] = source_parent_id
1991
new_dirname = entry[0][0]
1992
if new_dirname == last_target_parent[0]:
1993
target_parent_id = last_target_parent[1]
1996
target_parent_id = new_dirname_to_file_id[new_dirname]
1998
# TODO: We don't always need to do the lookup, because the
1999
# parent entry will be the same as the source entry.
2000
target_parent_entry = state._get_entry(target_index,
2001
path_utf8=new_dirname)
2002
assert target_parent_entry != (None, None), (
2003
"Could not find target parent in wt: %s\nparent of: %s"
2004
% (new_dirname, entry))
2005
target_parent_id = target_parent_entry[0][2]
2006
if target_parent_id == entry[0][2]:
2007
# This is the root, so the parent is None
2008
target_parent_id = None
2010
last_target_parent[0] = new_dirname
2011
last_target_parent[1] = target_parent_id
2013
source_exec = source_details[3]
2014
if (include_unchanged
2016
or source_parent_id != target_parent_id
2017
or old_basename != entry[0][1]
2018
or source_exec != target_exec
2020
if old_path is None:
2021
old_path = path = pathjoin(old_dirname, old_basename)
2022
old_path_u = utf8_decode(old_path)[0]
2025
old_path_u = utf8_decode(old_path)[0]
2026
if old_path == path:
2029
path_u = utf8_decode(path)[0]
2030
source_kind = _minikind_to_kind[source_minikind]
2031
return (entry[0][2],
2032
(old_path_u, path_u),
2035
(source_parent_id, target_parent_id),
2036
(utf8_decode(old_basename)[0], utf8_decode(entry[0][1])[0]),
2037
(source_kind, target_kind),
2038
(source_exec, target_exec))
2040
return uninteresting
2041
elif source_minikind in 'a' and target_minikind in 'fdlt':
2042
# looks like a new file
2043
if path_info is not None:
2044
path = pathjoin(entry[0][0], entry[0][1])
2045
# parent id is the entry for the path in the target tree
2046
# TODO: these are the same for an entire directory: cache em.
2047
parent_id = state._get_entry(target_index,
2048
path_utf8=entry[0][0])[0][2]
2049
if parent_id == entry[0][2]:
2051
if use_filesystem_for_exec:
2052
# We need S_ISREG here, because we aren't sure if this
2055
stat.S_ISREG(path_info[3].st_mode)
2056
and stat.S_IEXEC & path_info[3].st_mode)
2058
target_exec = target_details[3]
2059
return (entry[0][2],
2060
(None, utf8_decode(path)[0]),
2064
(None, utf8_decode(entry[0][1])[0]),
2065
(None, path_info[2]),
2066
(None, target_exec))
2068
# but its not on disk: we deliberately treat this as just
2069
# never-present. (Why ?! - RBC 20070224)
2071
elif source_minikind in 'fdlt' and target_minikind in 'a':
2072
# unversioned, possibly, or possibly not deleted: we dont care.
2073
# if its still on disk, *and* theres no other entry at this
2074
# path [we dont know this in this routine at the moment -
2075
# perhaps we should change this - then it would be an unknown.
2076
old_path = pathjoin(entry[0][0], entry[0][1])
2077
# parent id is the entry for the path in the target tree
2078
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
2079
if parent_id == entry[0][2]:
2081
return (entry[0][2],
2082
(utf8_decode(old_path)[0], None),
2086
(utf8_decode(entry[0][1])[0], None),
2087
(_minikind_to_kind[source_minikind], None),
2088
(source_details[3], None))
2089
elif source_minikind in 'fdlt' and target_minikind in 'r':
2090
# a rename; could be a true rename, or a rename inherited from
2091
# a renamed parent. TODO: handle this efficiently. Its not
2092
# common case to rename dirs though, so a correct but slow
2093
# implementation will do.
2094
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
2095
search_specific_files.add(target_details[1])
2096
elif source_minikind in 'ra' and target_minikind in 'ra':
2097
# neither of the selected trees contain this file,
2098
# so skip over it. This is not currently directly tested, but
2099
# is indirectly via test_too_much.TestCommands.test_conflicts.
2102
raise AssertionError("don't know how to compare "
2103
"source_minikind=%r, target_minikind=%r"
2104
% (source_minikind, target_minikind))
2105
## import pdb;pdb.set_trace()
2108
while search_specific_files:
2109
# TODO: the pending list should be lexically sorted? the
2110
# interface doesn't require it.
2111
current_root = search_specific_files.pop()
2112
current_root_unicode = current_root.decode('utf8')
2113
searched_specific_files.add(current_root)
2114
# process the entries for this containing directory: the rest will be
2115
# found by their parents recursively.
2116
root_entries = _entries_for_path(current_root)
2117
root_abspath = self.target.abspath(current_root_unicode)
2119
root_stat = os.lstat(root_abspath)
2121
if e.errno == errno.ENOENT:
2122
# the path does not exist: let _process_entry know that.
2123
root_dir_info = None
2125
# some other random error: hand it up.
2128
root_dir_info = ('', current_root,
2129
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
2131
if root_dir_info[2] == 'directory':
2132
if self.target._directory_is_tree_reference(
2133
current_root.decode('utf8')):
2134
root_dir_info = root_dir_info[:2] + \
2135
('tree-reference',) + root_dir_info[3:]
2137
if not root_entries and not root_dir_info:
2138
# this specified path is not present at all, skip it.
2140
path_handled = False
2141
for entry in root_entries:
2142
result = _process_entry(entry, root_dir_info)
2143
if result is not None:
2145
if result is not uninteresting:
2147
if want_unversioned and not path_handled and root_dir_info:
2148
new_executable = bool(
2149
stat.S_ISREG(root_dir_info[3].st_mode)
2150
and stat.S_IEXEC & root_dir_info[3].st_mode)
2152
(None, current_root_unicode),
2156
(None, splitpath(current_root_unicode)[-1]),
2157
(None, root_dir_info[2]),
2158
(None, new_executable)
2160
initial_key = (current_root, '', '')
2161
block_index, _ = state._find_block_index_from_key(initial_key)
2162
if block_index == 0:
2163
# we have processed the total root already, but because the
2164
# initial key matched it we should skip it here.
2166
if root_dir_info and root_dir_info[2] == 'tree-reference':
2167
current_dir_info = None
2169
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
2171
current_dir_info = dir_iterator.next()
2173
# on win32, python2.4 has e.errno == ERROR_DIRECTORY, but
2174
# python 2.5 has e.errno == EINVAL,
2175
# and e.winerror == ERROR_DIRECTORY
2176
e_winerror = getattr(e, 'winerror', None)
2177
win_errors = (ERROR_DIRECTORY, ERROR_PATH_NOT_FOUND)
2178
# there may be directories in the inventory even though
2179
# this path is not a file on disk: so mark it as end of
2181
if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
2182
current_dir_info = None
2183
elif (sys.platform == 'win32'
2184
and (e.errno in win_errors
2185
or e_winerror in win_errors)):
2186
current_dir_info = None
2190
if current_dir_info[0][0] == '':
2191
# remove .bzr from iteration
2192
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
2193
assert current_dir_info[1][bzr_index][0] == '.bzr'
2194
del current_dir_info[1][bzr_index]
2195
# walk until both the directory listing and the versioned metadata
2197
if (block_index < len(state._dirblocks) and
2198
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2199
current_block = state._dirblocks[block_index]
2201
current_block = None
2202
while (current_dir_info is not None or
2203
current_block is not None):
2204
if (current_dir_info and current_block
2205
and current_dir_info[0][0] != current_block[0]):
2206
if cmp_by_dirs(current_dir_info[0][0], current_block[0]) < 0:
2207
# filesystem data refers to paths not covered by the dirblock.
2208
# this has two possibilities:
2209
# A) it is versioned but empty, so there is no block for it
2210
# B) it is not versioned.
2212
# if (A) then we need to recurse into it to check for
2213
# new unknown files or directories.
2214
# if (B) then we should ignore it, because we don't
2215
# recurse into unknown directories.
2217
while path_index < len(current_dir_info[1]):
2218
current_path_info = current_dir_info[1][path_index]
2219
if want_unversioned:
2220
if current_path_info[2] == 'directory':
2221
if self.target._directory_is_tree_reference(
2222
current_path_info[0].decode('utf8')):
2223
current_path_info = current_path_info[:2] + \
2224
('tree-reference',) + current_path_info[3:]
2225
new_executable = bool(
2226
stat.S_ISREG(current_path_info[3].st_mode)
2227
and stat.S_IEXEC & current_path_info[3].st_mode)
2229
(None, utf8_decode(current_path_info[0])[0]),
2233
(None, utf8_decode(current_path_info[1])[0]),
2234
(None, current_path_info[2]),
2235
(None, new_executable))
2236
# dont descend into this unversioned path if it is
2238
if current_path_info[2] in ('directory',
2240
del current_dir_info[1][path_index]
2244
# This dir info has been handled, go to the next
2246
current_dir_info = dir_iterator.next()
2247
except StopIteration:
2248
current_dir_info = None
2250
# We have a dirblock entry for this location, but there
2251
# is no filesystem path for this. This is most likely
2252
# because a directory was removed from the disk.
2253
# We don't have to report the missing directory,
2254
# because that should have already been handled, but we
2255
# need to handle all of the files that are contained
2257
for current_entry in current_block[1]:
2258
# entry referring to file not present on disk.
2259
# advance the entry only, after processing.
2260
result = _process_entry(current_entry, None)
2261
if result is not None:
2262
if result is not uninteresting:
2265
if (block_index < len(state._dirblocks) and
2266
osutils.is_inside(current_root,
2267
state._dirblocks[block_index][0])):
2268
current_block = state._dirblocks[block_index]
2270
current_block = None
2273
if current_block and entry_index < len(current_block[1]):
2274
current_entry = current_block[1][entry_index]
2276
current_entry = None
2277
advance_entry = True
2279
if current_dir_info and path_index < len(current_dir_info[1]):
2280
current_path_info = current_dir_info[1][path_index]
2281
if current_path_info[2] == 'directory':
2282
if self.target._directory_is_tree_reference(
2283
current_path_info[0].decode('utf8')):
2284
current_path_info = current_path_info[:2] + \
2285
('tree-reference',) + current_path_info[3:]
2287
current_path_info = None
2289
path_handled = False
2290
while (current_entry is not None or
2291
current_path_info is not None):
2292
if current_entry is None:
2293
# the check for path_handled when the path is adnvaced
2294
# will yield this path if needed.
2296
elif current_path_info is None:
2297
# no path is fine: the per entry code will handle it.
2298
result = _process_entry(current_entry, current_path_info)
2299
if result is not None:
2300
if result is not uninteresting:
2302
elif (current_entry[0][1] != current_path_info[1]
2303
or current_entry[1][target_index][0] in 'ar'):
2304
# The current path on disk doesn't match the dirblock
2305
# record. Either the dirblock is marked as absent, or
2306
# the file on disk is not present at all in the
2307
# dirblock. Either way, report about the dirblock
2308
# entry, and let other code handle the filesystem one.
2310
# Compare the basename for these files to determine
2312
if current_path_info[1] < current_entry[0][1]:
2313
# extra file on disk: pass for now, but only
2314
# increment the path, not the entry
2315
advance_entry = False
2317
# entry referring to file not present on disk.
2318
# advance the entry only, after processing.
2319
result = _process_entry(current_entry, None)
2320
if result is not None:
2321
if result is not uninteresting:
2323
advance_path = False
2325
result = _process_entry(current_entry, current_path_info)
2326
if result is not None:
2328
if result is not uninteresting:
2330
if advance_entry and current_entry is not None:
2332
if entry_index < len(current_block[1]):
2333
current_entry = current_block[1][entry_index]
2335
current_entry = None
2337
advance_entry = True # reset the advance flaga
2338
if advance_path and current_path_info is not None:
2339
if not path_handled:
2340
# unversioned in all regards
2341
if want_unversioned:
2342
new_executable = bool(
2343
stat.S_ISREG(current_path_info[3].st_mode)
2344
and stat.S_IEXEC & current_path_info[3].st_mode)
2346
(None, utf8_decode(current_path_info[0])[0]),
2350
(None, utf8_decode(current_path_info[1])[0]),
2351
(None, current_path_info[2]),
2352
(None, new_executable))
2353
# dont descend into this unversioned path if it is
2355
if current_path_info[2] in ('directory'):
2356
del current_dir_info[1][path_index]
2358
# dont descend the disk iterator into any tree
2360
if current_path_info[2] == 'tree-reference':
2361
del current_dir_info[1][path_index]
2364
if path_index < len(current_dir_info[1]):
2365
current_path_info = current_dir_info[1][path_index]
2366
if current_path_info[2] == 'directory':
2367
if self.target._directory_is_tree_reference(
2368
current_path_info[0].decode('utf8')):
2369
current_path_info = current_path_info[:2] + \
2370
('tree-reference',) + current_path_info[3:]
2372
current_path_info = None
2373
path_handled = False
2375
advance_path = True # reset the advance flagg.
2376
if current_block is not None:
2378
if (block_index < len(state._dirblocks) and
2379
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2380
current_block = state._dirblocks[block_index]
2382
current_block = None
2383
if current_dir_info is not None:
2385
current_dir_info = dir_iterator.next()
2386
except StopIteration:
2387
current_dir_info = None
2096
2391
def is_compatible(source, target):
2097
2392
# the target must be a dirstate working tree
2098
if not isinstance(target, DirStateWorkingTree):
2393
if not isinstance(target, WorkingTree4):
2100
# the source must be a revtree or dirstate rev tree.
2395
# the source must be a revtreee or dirstate rev tree.
2101
2396
if not isinstance(source,
2102
2397
(revisiontree.RevisionTree, DirStateRevisionTree)):
2104
2399
# the source revid must be in the target dirstate
2105
if not (source._revision_id == _mod_revision.NULL_REVISION or
2400
if not (source._revision_id == NULL_REVISION or
2106
2401
source._revision_id in target.get_parent_ids()):
2107
# TODO: what about ghosts? it may well need to
2402
# TODO: what about ghosts? it may well need to
2108
2403
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
