1263
1224
@needs_tree_write_lock
1264
1225
def _write_inventory(self, inv):
1265
1226
"""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)
1227
assert not self._dirty, ("attempting to write an inventory when the "
1228
"dirstate is dirty will cause data loss")
1229
self.current_dirstate().set_state_from_inventory(inv)
1230
self._make_dirty(reset_inventory=False)
1231
if self._inventory is not None:
1280
1232
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):
1236
class WorkingTreeFormat4(WorkingTreeFormat3):
1237
"""The first consolidated dirstate working tree format.
1240
- exists within a metadir controlling .bzr
1241
- includes an explicit version marker for the workingtree control
1242
files, separate from the BzrDir format
1243
- modifies the hash cache format
1244
- is new in bzr 0.15
1245
- uses a LockDir to guard access to it.
1248
upgrade_recommended = False
1250
def get_format_string(self):
1251
"""See WorkingTreeFormat.get_format_string()."""
1252
return "Bazaar Working Tree Format 4 (bzr 0.15)\n"
1254
def get_format_description(self):
1255
"""See WorkingTreeFormat.get_format_description()."""
1256
return "Working tree format 4"
1258
def initialize(self, a_bzrdir, revision_id=None):
1377
1259
"""See WorkingTreeFormat.initialize().
1379
1261
:param revision_id: allows creating a working tree at a different
1380
1262
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
1264
These trees get an initial random root id, if their repository supports
1389
1265
rich root data, TREE_ROOT otherwise.
2080
1794
if not found_versioned:
2081
1795
# 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)
1797
all_versioned = False
1799
if not all_versioned:
1800
raise errors.PathsNotVersionedError(specific_files)
2086
1801
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2087
search_specific_files = osutils.minimum_path_selection(specific_files)
1802
search_specific_files = set()
1803
for path in specific_files:
1804
other_specific_files = specific_files.difference(set([path]))
1805
if not osutils.is_inside_any(other_specific_files, path):
1806
# this is a top level path, we must check it.
1807
search_specific_files.add(path)
1809
# compare source_index and target_index at or under each element of search_specific_files.
1810
# follow the following comparison table. Note that we only want to do diff operations when
1811
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1815
# Source | Target | disk | action
1816
# r | fdlt | | add source to search, add id path move and perform
1817
# | | | diff check on source-target
1818
# r | fdlt | a | dangling file that was present in the basis.
1820
# r | a | | add source to search
1822
# r | r | | this path is present in a non-examined tree, skip.
1823
# r | r | a | this path is present in a non-examined tree, skip.
1824
# a | fdlt | | add new id
1825
# a | fdlt | a | dangling locally added file, skip
1826
# a | a | | not present in either tree, skip
1827
# a | a | a | not present in any tree, skip
1828
# a | r | | not present in either tree at this path, skip as it
1829
# | | | may not be selected by the users list of paths.
1830
# a | r | a | not present in either tree at this path, skip as it
1831
# | | | may not be selected by the users list of paths.
1832
# fdlt | fdlt | | content in both: diff them
1833
# fdlt | fdlt | a | deleted locally, but not unversioned - show as deleted ?
1834
# fdlt | a | | unversioned: output deleted id for now
1835
# fdlt | a | a | unversioned and deleted: output deleted id
1836
# fdlt | r | | relocated in this tree, so add target to search.
1837
# | | | Dont diff, we will see an r,fd; pair when we reach
1838
# | | | this id at the other path.
1839
# fdlt | r | a | relocated in this tree, so add target to search.
1840
# | | | Dont diff, we will see an r,fd; pair when we reach
1841
# | | | this id at the other path.
1843
# for all search_indexs in each path at or under each element of
1844
# search_specific_files, if the detail is relocated: add the id, and add the
1845
# relocated path as one to search if its not searched already. If the
1846
# detail is not relocated, add the id.
1847
searched_specific_files = set()
1848
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1849
# Using a list so that we can access the values and change them in
1850
# nested scope. Each one is [path, file_id, entry]
1851
last_source_parent = [None, None]
1852
last_target_parent = [None, None]
2089
1854
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()
1856
# Just a sentry, so that _process_entry can say that this
1857
# record is handled, but isn't interesting to process (unchanged)
1858
uninteresting = object()
1861
old_dirname_to_file_id = {}
1862
new_dirname_to_file_id = {}
1863
# TODO: jam 20070516 - Avoid the _get_entry lookup overhead by
1864
# keeping a cache of directories that we have seen.
1866
def _process_entry(entry, path_info):
1867
"""Compare an entry and real disk to generate delta information.
1869
:param path_info: top_relpath, basename, kind, lstat, abspath for
1870
the path of entry. If None, then the path is considered absent.
1871
(Perhaps we should pass in a concrete entry for this ?)
1872
Basename is returned as a utf8 string because we expect this
1873
tuple will be ignored, and don't want to take the time to
1875
:return: None if these don't match
1876
A tuple of information about the change, or
1877
the object 'uninteresting' if these match, but are
1878
basically identical.
1880
if source_index is None:
1881
source_details = NULL_PARENT_DETAILS
1883
source_details = entry[1][source_index]
1884
target_details = entry[1][target_index]
1885
target_minikind = target_details[0]
1886
if path_info is not None and target_minikind in 'fdlt':
1887
assert target_index == 0
1888
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
1889
stat_value=path_info[3])
1890
# The entry may have been modified by update_entry
1891
target_details = entry[1][target_index]
1892
target_minikind = target_details[0]
1895
file_id = entry[0][2]
1896
source_minikind = source_details[0]
1897
if source_minikind in 'fdltr' and target_minikind in 'fdlt':
1898
# claimed content in both: diff
1899
# r | fdlt | | add source to search, add id path move and perform
1900
# | | | diff check on source-target
1901
# r | fdlt | a | dangling file that was present in the basis.
1903
if source_minikind in 'r':
1904
# add the source to the search path to find any children it
1905
# has. TODO ? : only add if it is a container ?
1906
if not osutils.is_inside_any(searched_specific_files,
1908
search_specific_files.add(source_details[1])
1909
# generate the old path; this is needed for stating later
1911
old_path = source_details[1]
1912
old_dirname, old_basename = os.path.split(old_path)
1913
path = pathjoin(entry[0][0], entry[0][1])
1914
old_entry = state._get_entry(source_index,
1916
# update the source details variable to be the real
1918
source_details = old_entry[1][source_index]
1919
source_minikind = source_details[0]
1921
old_dirname = entry[0][0]
1922
old_basename = entry[0][1]
1923
old_path = path = None
1924
if path_info is None:
1925
# the file is missing on disk, show as removed.
1926
content_change = True
1930
# source and target are both versioned and disk file is present.
1931
target_kind = path_info[2]
1932
if target_kind == 'directory':
1934
old_path = path = pathjoin(old_dirname, old_basename)
1935
new_dirname_to_file_id[path] = file_id
1936
if source_minikind != 'd':
1937
content_change = True
1939
# directories have no fingerprint
1940
content_change = False
1942
elif target_kind == 'file':
1943
if source_minikind != 'f':
1944
content_change = True
1946
# We could check the size, but we already have the
1948
content_change = (link_or_sha1 != source_details[1])
1949
# Target details is updated at update_entry time
1950
if use_filesystem_for_exec:
1951
# We don't need S_ISREG here, because we are sure
1952
# we are dealing with a file.
1953
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
1955
target_exec = target_details[3]
1956
elif target_kind == 'symlink':
1957
if source_minikind != 'l':
1958
content_change = True
1960
content_change = (link_or_sha1 != source_details[1])
1962
elif target_kind == 'tree-reference':
1963
if source_minikind != 't':
1964
content_change = True
1966
content_change = False
1969
raise Exception, "unknown kind %s" % path_info[2]
1970
if source_minikind == 'd':
1972
old_path = path = pathjoin(old_dirname, old_basename)
1973
old_dirname_to_file_id[old_path] = file_id
1974
# parent id is the entry for the path in the target tree
1975
if old_dirname == last_source_parent[0]:
1976
source_parent_id = last_source_parent[1]
1979
source_parent_id = old_dirname_to_file_id[old_dirname]
1981
source_parent_entry = state._get_entry(source_index,
1982
path_utf8=old_dirname)
1983
source_parent_id = source_parent_entry[0][2]
1984
if source_parent_id == entry[0][2]:
1985
# This is the root, so the parent is None
1986
source_parent_id = None
1988
last_source_parent[0] = old_dirname
1989
last_source_parent[1] = source_parent_id
1990
new_dirname = entry[0][0]
1991
if new_dirname == last_target_parent[0]:
1992
target_parent_id = last_target_parent[1]
1995
target_parent_id = new_dirname_to_file_id[new_dirname]
1997
# TODO: We don't always need to do the lookup, because the
1998
# parent entry will be the same as the source entry.
1999
target_parent_entry = state._get_entry(target_index,
2000
path_utf8=new_dirname)
2001
assert target_parent_entry != (None, None), (
2002
"Could not find target parent in wt: %s\nparent of: %s"
2003
% (new_dirname, entry))
2004
target_parent_id = target_parent_entry[0][2]
2005
if target_parent_id == entry[0][2]:
2006
# This is the root, so the parent is None
2007
target_parent_id = None
2009
last_target_parent[0] = new_dirname
2010
last_target_parent[1] = target_parent_id
2012
source_exec = source_details[3]
2013
if (include_unchanged
2015
or source_parent_id != target_parent_id
2016
or old_basename != entry[0][1]
2017
or source_exec != target_exec
2019
if old_path is None:
2020
old_path = path = pathjoin(old_dirname, old_basename)
2021
old_path_u = utf8_decode(old_path)[0]
2024
old_path_u = utf8_decode(old_path)[0]
2025
if old_path == path:
2028
path_u = utf8_decode(path)[0]
2029
source_kind = _minikind_to_kind[source_minikind]
2030
return (entry[0][2],
2031
(old_path_u, path_u),
2034
(source_parent_id, target_parent_id),
2035
(utf8_decode(old_basename)[0], utf8_decode(entry[0][1])[0]),
2036
(source_kind, target_kind),
2037
(source_exec, target_exec))
2039
return uninteresting
2040
elif source_minikind in 'a' and target_minikind in 'fdlt':
2041
# looks like a new file
2042
if path_info is not None:
2043
path = pathjoin(entry[0][0], entry[0][1])
2044
# parent id is the entry for the path in the target tree
2045
# TODO: these are the same for an entire directory: cache em.
2046
parent_id = state._get_entry(target_index,
2047
path_utf8=entry[0][0])[0][2]
2048
if parent_id == entry[0][2]:
2050
if use_filesystem_for_exec:
2051
# We need S_ISREG here, because we aren't sure if this
2054
stat.S_ISREG(path_info[3].st_mode)
2055
and stat.S_IEXEC & path_info[3].st_mode)
2057
target_exec = target_details[3]
2058
return (entry[0][2],
2059
(None, utf8_decode(path)[0]),
2063
(None, utf8_decode(entry[0][1])[0]),
2064
(None, path_info[2]),
2065
(None, target_exec))
2067
# but its not on disk: we deliberately treat this as just
2068
# never-present. (Why ?! - RBC 20070224)
2070
elif source_minikind in 'fdlt' and target_minikind in 'a':
2071
# unversioned, possibly, or possibly not deleted: we dont care.
2072
# if its still on disk, *and* theres no other entry at this
2073
# path [we dont know this in this routine at the moment -
2074
# perhaps we should change this - then it would be an unknown.
2075
old_path = pathjoin(entry[0][0], entry[0][1])
2076
# parent id is the entry for the path in the target tree
2077
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
2078
if parent_id == entry[0][2]:
2080
return (entry[0][2],
2081
(utf8_decode(old_path)[0], None),
2085
(utf8_decode(entry[0][1])[0], None),
2086
(_minikind_to_kind[source_minikind], None),
2087
(source_details[3], None))
2088
elif source_minikind in 'fdlt' and target_minikind in 'r':
2089
# a rename; could be a true rename, or a rename inherited from
2090
# a renamed parent. TODO: handle this efficiently. Its not
2091
# common case to rename dirs though, so a correct but slow
2092
# implementation will do.
2093
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
2094
search_specific_files.add(target_details[1])
2095
elif source_minikind in 'ra' and target_minikind in 'ra':
2096
# neither of the selected trees contain this file,
2097
# so skip over it. This is not currently directly tested, but
2098
# is indirectly via test_too_much.TestCommands.test_conflicts.
2101
raise AssertionError("don't know how to compare "
2102
"source_minikind=%r, target_minikind=%r"
2103
% (source_minikind, target_minikind))
2104
## import pdb;pdb.set_trace()
2107
while search_specific_files:
2108
# TODO: the pending list should be lexically sorted? the
2109
# interface doesn't require it.
2110
current_root = search_specific_files.pop()
2111
current_root_unicode = current_root.decode('utf8')
2112
searched_specific_files.add(current_root)
2113
# process the entries for this containing directory: the rest will be
2114
# found by their parents recursively.
2115
root_entries = _entries_for_path(current_root)
2116
root_abspath = self.target.abspath(current_root_unicode)
2118
root_stat = os.lstat(root_abspath)
2120
if e.errno == errno.ENOENT:
2121
# the path does not exist: let _process_entry know that.
2122
root_dir_info = None
2124
# some other random error: hand it up.
2127
root_dir_info = ('', current_root,
2128
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
2130
if root_dir_info[2] == 'directory':
2131
if self.target._directory_is_tree_reference(
2132
current_root.decode('utf8')):
2133
root_dir_info = root_dir_info[:2] + \
2134
('tree-reference',) + root_dir_info[3:]
2136
if not root_entries and not root_dir_info:
2137
# this specified path is not present at all, skip it.
2139
path_handled = False
2140
for entry in root_entries:
2141
result = _process_entry(entry, root_dir_info)
2142
if result is not None:
2144
if result is not uninteresting:
2146
if want_unversioned and not path_handled and root_dir_info:
2147
new_executable = bool(
2148
stat.S_ISREG(root_dir_info[3].st_mode)
2149
and stat.S_IEXEC & root_dir_info[3].st_mode)
2151
(None, current_root_unicode),
2155
(None, splitpath(current_root_unicode)[-1]),
2156
(None, root_dir_info[2]),
2157
(None, new_executable)
2159
initial_key = (current_root, '', '')
2160
block_index, _ = state._find_block_index_from_key(initial_key)
2161
if block_index == 0:
2162
# we have processed the total root already, but because the
2163
# initial key matched it we should skip it here.
2165
if root_dir_info and root_dir_info[2] == 'tree-reference':
2166
current_dir_info = None
2168
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
2170
current_dir_info = dir_iterator.next()
2172
# on win32, python2.4 has e.errno == ERROR_DIRECTORY, but
2173
# python 2.5 has e.errno == EINVAL,
2174
# and e.winerror == ERROR_DIRECTORY
2175
e_winerror = getattr(e, 'winerror', None)
2176
win_errors = (ERROR_DIRECTORY, ERROR_PATH_NOT_FOUND)
2177
# there may be directories in the inventory even though
2178
# this path is not a file on disk: so mark it as end of
2180
if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
2181
current_dir_info = None
2182
elif (sys.platform == 'win32'
2183
and (e.errno in win_errors
2184
or e_winerror in win_errors)):
2185
current_dir_info = None
2189
if current_dir_info[0][0] == '':
2190
# remove .bzr from iteration
2191
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
2192
assert current_dir_info[1][bzr_index][0] == '.bzr'
2193
del current_dir_info[1][bzr_index]
2194
# walk until both the directory listing and the versioned metadata
2196
if (block_index < len(state._dirblocks) and
2197
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2198
current_block = state._dirblocks[block_index]
2200
current_block = None
2201
while (current_dir_info is not None or
2202
current_block is not None):
2203
if (current_dir_info and current_block
2204
and current_dir_info[0][0] != current_block[0]):
2205
if cmp_by_dirs(current_dir_info[0][0], current_block[0]) < 0:
2206
# filesystem data refers to paths not covered by the dirblock.
2207
# this has two possibilities:
2208
# A) it is versioned but empty, so there is no block for it
2209
# B) it is not versioned.
2211
# if (A) then we need to recurse into it to check for
2212
# new unknown files or directories.
2213
# if (B) then we should ignore it, because we don't
2214
# recurse into unknown directories.
2216
while path_index < len(current_dir_info[1]):
2217
current_path_info = current_dir_info[1][path_index]
2218
if want_unversioned:
2219
if current_path_info[2] == 'directory':
2220
if self.target._directory_is_tree_reference(
2221
current_path_info[0].decode('utf8')):
2222
current_path_info = current_path_info[:2] + \
2223
('tree-reference',) + current_path_info[3:]
2224
new_executable = bool(
2225
stat.S_ISREG(current_path_info[3].st_mode)
2226
and stat.S_IEXEC & current_path_info[3].st_mode)
2228
(None, utf8_decode(current_path_info[0])[0]),
2232
(None, utf8_decode(current_path_info[1])[0]),
2233
(None, current_path_info[2]),
2234
(None, new_executable))
2235
# dont descend into this unversioned path if it is
2237
if current_path_info[2] in ('directory',
2239
del current_dir_info[1][path_index]
2243
# This dir info has been handled, go to the next
2245
current_dir_info = dir_iterator.next()
2246
except StopIteration:
2247
current_dir_info = None
2249
# We have a dirblock entry for this location, but there
2250
# is no filesystem path for this. This is most likely
2251
# because a directory was removed from the disk.
2252
# We don't have to report the missing directory,
2253
# because that should have already been handled, but we
2254
# need to handle all of the files that are contained
2256
for current_entry in current_block[1]:
2257
# entry referring to file not present on disk.
2258
# advance the entry only, after processing.
2259
result = _process_entry(current_entry, None)
2260
if result is not None:
2261
if result is not uninteresting:
2264
if (block_index < len(state._dirblocks) and
2265
osutils.is_inside(current_root,
2266
state._dirblocks[block_index][0])):
2267
current_block = state._dirblocks[block_index]
2269
current_block = None
2272
if current_block and entry_index < len(current_block[1]):
2273
current_entry = current_block[1][entry_index]
2275
current_entry = None
2276
advance_entry = True
2278
if current_dir_info and path_index < len(current_dir_info[1]):
2279
current_path_info = current_dir_info[1][path_index]
2280
if current_path_info[2] == 'directory':
2281
if self.target._directory_is_tree_reference(
2282
current_path_info[0].decode('utf8')):
2283
current_path_info = current_path_info[:2] + \
2284
('tree-reference',) + current_path_info[3:]
2286
current_path_info = None
2288
path_handled = False
2289
while (current_entry is not None or
2290
current_path_info is not None):
2291
if current_entry is None:
2292
# the check for path_handled when the path is adnvaced
2293
# will yield this path if needed.
2295
elif current_path_info is None:
2296
# no path is fine: the per entry code will handle it.
2297
result = _process_entry(current_entry, current_path_info)
2298
if result is not None:
2299
if result is not uninteresting:
2301
elif (current_entry[0][1] != current_path_info[1]
2302
or current_entry[1][target_index][0] in 'ar'):
2303
# The current path on disk doesn't match the dirblock
2304
# record. Either the dirblock is marked as absent, or
2305
# the file on disk is not present at all in the
2306
# dirblock. Either way, report about the dirblock
2307
# entry, and let other code handle the filesystem one.
2309
# Compare the basename for these files to determine
2311
if current_path_info[1] < current_entry[0][1]:
2312
# extra file on disk: pass for now, but only
2313
# increment the path, not the entry
2314
advance_entry = False
2316
# entry referring to file not present on disk.
2317
# advance the entry only, after processing.
2318
result = _process_entry(current_entry, None)
2319
if result is not None:
2320
if result is not uninteresting:
2322
advance_path = False
2324
result = _process_entry(current_entry, current_path_info)
2325
if result is not None:
2327
if result is not uninteresting:
2329
if advance_entry and current_entry is not None:
2331
if entry_index < len(current_block[1]):
2332
current_entry = current_block[1][entry_index]
2334
current_entry = None
2336
advance_entry = True # reset the advance flaga
2337
if advance_path and current_path_info is not None:
2338
if not path_handled:
2339
# unversioned in all regards
2340
if want_unversioned:
2341
new_executable = bool(
2342
stat.S_ISREG(current_path_info[3].st_mode)
2343
and stat.S_IEXEC & current_path_info[3].st_mode)
2345
(None, utf8_decode(current_path_info[0])[0]),
2349
(None, utf8_decode(current_path_info[1])[0]),
2350
(None, current_path_info[2]),
2351
(None, new_executable))
2352
# dont descend into this unversioned path if it is
2354
if current_path_info[2] in ('directory'):
2355
del current_dir_info[1][path_index]
2357
# dont descend the disk iterator into any tree
2359
if current_path_info[2] == 'tree-reference':
2360
del current_dir_info[1][path_index]
2363
if path_index < len(current_dir_info[1]):
2364
current_path_info = current_dir_info[1][path_index]
2365
if current_path_info[2] == 'directory':
2366
if self.target._directory_is_tree_reference(
2367
current_path_info[0].decode('utf8')):
2368
current_path_info = current_path_info[:2] + \
2369
('tree-reference',) + current_path_info[3:]
2371
current_path_info = None
2372
path_handled = False
2374
advance_path = True # reset the advance flagg.
2375
if current_block is not None:
2377
if (block_index < len(state._dirblocks) and
2378
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2379
current_block = state._dirblocks[block_index]
2381
current_block = None
2382
if current_dir_info is not None:
2384
current_dir_info = dir_iterator.next()
2385
except StopIteration:
2386
current_dir_info = None
2096
2390
def is_compatible(source, target):
2097
2391
# the target must be a dirstate working tree
2098
if not isinstance(target, DirStateWorkingTree):
2392
if not isinstance(target, WorkingTree4):
2100
# the source must be a revtree or dirstate rev tree.
2394
# the source must be a revtreee or dirstate rev tree.
2101
2395
if not isinstance(source,
2102
2396
(revisiontree.RevisionTree, DirStateRevisionTree)):
2104
2398
# the source revid must be in the target dirstate
2105
if not (source._revision_id == _mod_revision.NULL_REVISION or
2399
if not (source._revision_id == NULL_REVISION or
2106
2400
source._revision_id in target.get_parent_ids()):
2107
# TODO: what about ghosts? it may well need to
2401
# TODO: what about ghosts? it may well need to
2108
2402
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
