1263
1227
@needs_tree_write_lock
1264
1228
def _write_inventory(self, inv):
1265
1229
"""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)
1230
assert not self._dirty, "attempting to write an inventory when the 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):
1375
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
1376
accelerator_tree=None, hardlink=False):
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"
1260
def initialize(self, a_bzrdir, revision_id=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
1796
if not found_versioned:
2081
1797
# 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)
1799
all_versioned = False
1801
if not all_versioned:
1802
raise errors.PathsNotVersionedError(specific_files)
2086
1803
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2087
search_specific_files = osutils.minimum_path_selection(specific_files)
1804
search_specific_files = set()
1805
for path in specific_files:
1806
other_specific_files = specific_files.difference(set([path]))
1807
if not osutils.is_inside_any(other_specific_files, path):
1808
# this is a top level path, we must check it.
1809
search_specific_files.add(path)
1811
# compare source_index and target_index at or under each element of search_specific_files.
1812
# follow the following comparison table. Note that we only want to do diff operations when
1813
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1817
# Source | Target | disk | action
1818
# r | fdlt | | add source to search, add id path move and perform
1819
# | | | diff check on source-target
1820
# r | fdlt | a | dangling file that was present in the basis.
1822
# r | a | | add source to search
1824
# r | r | | this path is present in a non-examined tree, skip.
1825
# r | r | a | this path is present in a non-examined tree, skip.
1826
# a | fdlt | | add new id
1827
# a | fdlt | a | dangling locally added file, skip
1828
# a | a | | not present in either tree, skip
1829
# a | a | a | not present in any tree, skip
1830
# a | r | | not present in either tree at this path, skip as it
1831
# | | | may not be selected by the users list of paths.
1832
# a | r | a | not present in either tree at this path, skip as it
1833
# | | | may not be selected by the users list of paths.
1834
# fdlt | fdlt | | content in both: diff them
1835
# fdlt | fdlt | a | deleted locally, but not unversioned - show as deleted ?
1836
# fdlt | a | | unversioned: output deleted id for now
1837
# fdlt | a | a | unversioned and deleted: output deleted id
1838
# fdlt | r | | relocated in this tree, so add target to search.
1839
# | | | Dont diff, we will see an r,fd; pair when we reach
1840
# | | | this id at the other path.
1841
# fdlt | r | a | relocated in this tree, so add target to search.
1842
# | | | Dont diff, we will see an r,fd; pair when we reach
1843
# | | | this id at the other path.
1845
# for all search_indexs in each path at or under each element of
1846
# search_specific_files, if the detail is relocated: add the id, and add the
1847
# relocated path as one to search if its not searched already. If the
1848
# detail is not relocated, add the id.
1849
searched_specific_files = set()
1850
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1851
# Using a list so that we can access the values and change them in
1852
# nested scope. Each one is [path, file_id, entry]
1853
last_source_parent = [None, None]
1854
last_target_parent = [None, None]
2089
1856
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()
1858
# Just a sentry, so that _process_entry can say that this
1859
# record is handled, but isn't interesting to process (unchanged)
1860
uninteresting = object()
1863
old_dirname_to_file_id = {}
1864
new_dirname_to_file_id = {}
1865
# TODO: jam 20070516 - Avoid the _get_entry lookup overhead by
1866
# keeping a cache of directories that we have seen.
1868
def _process_entry(entry, path_info):
1869
"""Compare an entry and real disk to generate delta information.
1871
:param path_info: top_relpath, basename, kind, lstat, abspath for
1872
the path of entry. If None, then the path is considered absent.
1873
(Perhaps we should pass in a concrete entry for this ?)
1874
Basename is returned as a utf8 string because we expect this
1875
tuple will be ignored, and don't want to take the time to
1877
:return: None if these don't match
1878
A tuple of information about the change, or
1879
the object 'uninteresting' if these match, but are
1880
basically identical.
1882
if source_index is None:
1883
source_details = NULL_PARENT_DETAILS
1885
source_details = entry[1][source_index]
1886
target_details = entry[1][target_index]
1887
target_minikind = target_details[0]
1888
if path_info is not None and target_minikind in 'fdlt':
1889
assert target_index == 0
1890
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
1891
stat_value=path_info[3])
1892
# The entry may have been modified by update_entry
1893
target_details = entry[1][target_index]
1894
target_minikind = target_details[0]
1897
file_id = entry[0][2]
1898
source_minikind = source_details[0]
1899
if source_minikind in 'fdltr' and target_minikind in 'fdlt':
1900
# claimed content in both: diff
1901
# r | fdlt | | add source to search, add id path move and perform
1902
# | | | diff check on source-target
1903
# r | fdlt | a | dangling file that was present in the basis.
1905
if source_minikind in 'r':
1906
# add the source to the search path to find any children it
1907
# has. TODO ? : only add if it is a container ?
1908
if not osutils.is_inside_any(searched_specific_files,
1910
search_specific_files.add(source_details[1])
1911
# generate the old path; this is needed for stating later
1913
old_path = source_details[1]
1914
old_dirname, old_basename = os.path.split(old_path)
1915
path = pathjoin(entry[0][0], entry[0][1])
1916
old_entry = state._get_entry(source_index,
1918
# update the source details variable to be the real
1920
source_details = old_entry[1][source_index]
1921
source_minikind = source_details[0]
1923
old_dirname = entry[0][0]
1924
old_basename = entry[0][1]
1925
old_path = path = None
1926
if path_info is None:
1927
# the file is missing on disk, show as removed.
1928
content_change = True
1932
# source and target are both versioned and disk file is present.
1933
target_kind = path_info[2]
1934
if target_kind == 'directory':
1936
old_path = path = pathjoin(old_dirname, old_basename)
1937
new_dirname_to_file_id[path] = file_id
1938
if source_minikind != 'd':
1939
content_change = True
1941
# directories have no fingerprint
1942
content_change = False
1944
elif target_kind == 'file':
1945
if source_minikind != 'f':
1946
content_change = True
1948
# We could check the size, but we already have the
1950
content_change = (link_or_sha1 != source_details[1])
1951
# Target details is updated at update_entry time
1952
if use_filesystem_for_exec:
1953
# We don't need S_ISREG here, because we are sure
1954
# we are dealing with a file.
1955
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
1957
target_exec = target_details[3]
1958
elif target_kind == 'symlink':
1959
if source_minikind != 'l':
1960
content_change = True
1962
content_change = (link_or_sha1 != source_details[1])
1964
elif target_kind == 'tree-reference':
1965
if source_minikind != 't':
1966
content_change = True
1968
content_change = False
1971
raise Exception, "unknown kind %s" % path_info[2]
1972
if source_minikind == 'd':
1974
old_path = path = pathjoin(old_dirname, old_basename)
1975
old_dirname_to_file_id[old_path] = file_id
1976
# parent id is the entry for the path in the target tree
1977
if old_dirname == last_source_parent[0]:
1978
source_parent_id = last_source_parent[1]
1981
source_parent_id = old_dirname_to_file_id[old_dirname]
1983
source_parent_entry = state._get_entry(source_index,
1984
path_utf8=old_dirname)
1985
source_parent_id = source_parent_entry[0][2]
1986
if source_parent_id == entry[0][2]:
1987
# This is the root, so the parent is None
1988
source_parent_id = None
1990
last_source_parent[0] = old_dirname
1991
last_source_parent[1] = source_parent_id
1992
new_dirname = entry[0][0]
1993
if new_dirname == last_target_parent[0]:
1994
target_parent_id = last_target_parent[1]
1997
target_parent_id = new_dirname_to_file_id[new_dirname]
1999
# TODO: We don't always need to do the lookup, because the
2000
# parent entry will be the same as the source entry.
2001
target_parent_entry = state._get_entry(target_index,
2002
path_utf8=new_dirname)
2003
assert target_parent_entry != (None, None), (
2004
"Could not find target parent in wt: %s\nparent of: %s"
2005
% (new_dirname, entry))
2006
target_parent_id = target_parent_entry[0][2]
2007
if target_parent_id == entry[0][2]:
2008
# This is the root, so the parent is None
2009
target_parent_id = None
2011
last_target_parent[0] = new_dirname
2012
last_target_parent[1] = target_parent_id
2014
source_exec = source_details[3]
2015
if (include_unchanged
2017
or source_parent_id != target_parent_id
2018
or old_basename != entry[0][1]
2019
or source_exec != target_exec
2021
if old_path is None:
2022
old_path = path = pathjoin(old_dirname, old_basename)
2023
old_path_u = utf8_decode(old_path)[0]
2026
old_path_u = utf8_decode(old_path)[0]
2027
if old_path == path:
2030
path_u = utf8_decode(path)[0]
2031
source_kind = _minikind_to_kind[source_minikind]
2032
return (entry[0][2],
2033
(old_path_u, path_u),
2036
(source_parent_id, target_parent_id),
2037
(utf8_decode(old_basename)[0], utf8_decode(entry[0][1])[0]),
2038
(source_kind, target_kind),
2039
(source_exec, target_exec))
2041
return uninteresting
2042
elif source_minikind in 'a' and target_minikind in 'fdlt':
2043
# looks like a new file
2044
if path_info is not None:
2045
path = pathjoin(entry[0][0], entry[0][1])
2046
# parent id is the entry for the path in the target tree
2047
# TODO: these are the same for an entire directory: cache em.
2048
parent_id = state._get_entry(target_index,
2049
path_utf8=entry[0][0])[0][2]
2050
if parent_id == entry[0][2]:
2052
if use_filesystem_for_exec:
2053
# We need S_ISREG here, because we aren't sure if this
2056
stat.S_ISREG(path_info[3].st_mode)
2057
and stat.S_IEXEC & path_info[3].st_mode)
2059
target_exec = target_details[3]
2060
return (entry[0][2],
2061
(None, utf8_decode(path)[0]),
2065
(None, utf8_decode(entry[0][1])[0]),
2066
(None, path_info[2]),
2067
(None, target_exec))
2069
# but its not on disk: we deliberately treat this as just
2070
# never-present. (Why ?! - RBC 20070224)
2072
elif source_minikind in 'fdlt' and target_minikind in 'a':
2073
# unversioned, possibly, or possibly not deleted: we dont care.
2074
# if its still on disk, *and* theres no other entry at this
2075
# path [we dont know this in this routine at the moment -
2076
# perhaps we should change this - then it would be an unknown.
2077
old_path = pathjoin(entry[0][0], entry[0][1])
2078
# parent id is the entry for the path in the target tree
2079
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
2080
if parent_id == entry[0][2]:
2082
return (entry[0][2],
2083
(utf8_decode(old_path)[0], None),
2087
(utf8_decode(entry[0][1])[0], None),
2088
(_minikind_to_kind[source_minikind], None),
2089
(source_details[3], None))
2090
elif source_minikind in 'fdlt' and target_minikind in 'r':
2091
# a rename; could be a true rename, or a rename inherited from
2092
# a renamed parent. TODO: handle this efficiently. Its not
2093
# common case to rename dirs though, so a correct but slow
2094
# implementation will do.
2095
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
2096
search_specific_files.add(target_details[1])
2097
elif source_minikind in 'ra' and target_minikind in 'ra':
2098
# neither of the selected trees contain this file,
2099
# so skip over it. This is not currently directly tested, but
2100
# is indirectly via test_too_much.TestCommands.test_conflicts.
2103
raise AssertionError("don't know how to compare "
2104
"source_minikind=%r, target_minikind=%r"
2105
% (source_minikind, target_minikind))
2106
## import pdb;pdb.set_trace()
2109
while search_specific_files:
2110
# TODO: the pending list should be lexically sorted? the
2111
# interface doesn't require it.
2112
current_root = search_specific_files.pop()
2113
current_root_unicode = current_root.decode('utf8')
2114
searched_specific_files.add(current_root)
2115
# process the entries for this containing directory: the rest will be
2116
# found by their parents recursively.
2117
root_entries = _entries_for_path(current_root)
2118
root_abspath = self.target.abspath(current_root_unicode)
2120
root_stat = os.lstat(root_abspath)
2122
if e.errno == errno.ENOENT:
2123
# the path does not exist: let _process_entry know that.
2124
root_dir_info = None
2126
# some other random error: hand it up.
2129
root_dir_info = ('', current_root,
2130
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
2132
if root_dir_info[2] == 'directory':
2133
if self.target._directory_is_tree_reference(
2134
current_root.decode('utf8')):
2135
root_dir_info = root_dir_info[:2] + \
2136
('tree-reference',) + root_dir_info[3:]
2138
if not root_entries and not root_dir_info:
2139
# this specified path is not present at all, skip it.
2141
path_handled = False
2142
for entry in root_entries:
2143
result = _process_entry(entry, root_dir_info)
2144
if result is not None:
2146
if result is not uninteresting:
2148
if want_unversioned and not path_handled and root_dir_info:
2149
new_executable = bool(
2150
stat.S_ISREG(root_dir_info[3].st_mode)
2151
and stat.S_IEXEC & root_dir_info[3].st_mode)
2153
(None, current_root_unicode),
2157
(None, splitpath(current_root_unicode)[-1]),
2158
(None, root_dir_info[2]),
2159
(None, new_executable)
2161
initial_key = (current_root, '', '')
2162
block_index, _ = state._find_block_index_from_key(initial_key)
2163
if block_index == 0:
2164
# we have processed the total root already, but because the
2165
# initial key matched it we should skip it here.
2167
if root_dir_info and root_dir_info[2] == 'tree-reference':
2168
current_dir_info = None
2170
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
2172
current_dir_info = dir_iterator.next()
2174
# on win32, python2.4 has e.errno == ERROR_DIRECTORY, but
2175
# python 2.5 has e.errno == EINVAL,
2176
# and e.winerror == ERROR_DIRECTORY
2177
e_winerror = getattr(e, 'winerror', None)
2178
win_errors = (ERROR_DIRECTORY, ERROR_PATH_NOT_FOUND)
2179
# there may be directories in the inventory even though
2180
# this path is not a file on disk: so mark it as end of
2182
if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
2183
current_dir_info = None
2184
elif (sys.platform == 'win32'
2185
and (e.errno in win_errors
2186
or e_winerror in win_errors)):
2187
current_dir_info = None
2191
if current_dir_info[0][0] == '':
2192
# remove .bzr from iteration
2193
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
2194
assert current_dir_info[1][bzr_index][0] == '.bzr'
2195
del current_dir_info[1][bzr_index]
2196
# walk until both the directory listing and the versioned metadata
2198
if (block_index < len(state._dirblocks) and
2199
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2200
current_block = state._dirblocks[block_index]
2202
current_block = None
2203
while (current_dir_info is not None or
2204
current_block is not None):
2205
if (current_dir_info and current_block
2206
and current_dir_info[0][0] != current_block[0]):
2207
if cmp_by_dirs(current_dir_info[0][0], current_block[0]) < 0:
2208
# filesystem data refers to paths not covered by the dirblock.
2209
# this has two possibilities:
2210
# A) it is versioned but empty, so there is no block for it
2211
# B) it is not versioned.
2213
# if (A) then we need to recurse into it to check for
2214
# new unknown files or directories.
2215
# if (B) then we should ignore it, because we don't
2216
# recurse into unknown directories.
2218
while path_index < len(current_dir_info[1]):
2219
current_path_info = current_dir_info[1][path_index]
2220
if want_unversioned:
2221
if current_path_info[2] == 'directory':
2222
if self.target._directory_is_tree_reference(
2223
current_path_info[0].decode('utf8')):
2224
current_path_info = current_path_info[:2] + \
2225
('tree-reference',) + current_path_info[3:]
2226
new_executable = bool(
2227
stat.S_ISREG(current_path_info[3].st_mode)
2228
and stat.S_IEXEC & current_path_info[3].st_mode)
2230
(None, utf8_decode(current_path_info[0])[0]),
2234
(None, utf8_decode(current_path_info[1])[0]),
2235
(None, current_path_info[2]),
2236
(None, new_executable))
2237
# dont descend into this unversioned path if it is
2239
if current_path_info[2] in ('directory',
2241
del current_dir_info[1][path_index]
2245
# This dir info has been handled, go to the next
2247
current_dir_info = dir_iterator.next()
2248
except StopIteration:
2249
current_dir_info = None
2251
# We have a dirblock entry for this location, but there
2252
# is no filesystem path for this. This is most likely
2253
# because a directory was removed from the disk.
2254
# We don't have to report the missing directory,
2255
# because that should have already been handled, but we
2256
# need to handle all of the files that are contained
2258
for current_entry in current_block[1]:
2259
# entry referring to file not present on disk.
2260
# advance the entry only, after processing.
2261
result = _process_entry(current_entry, None)
2262
if result is not None:
2263
if result is not uninteresting:
2266
if (block_index < len(state._dirblocks) and
2267
osutils.is_inside(current_root,
2268
state._dirblocks[block_index][0])):
2269
current_block = state._dirblocks[block_index]
2271
current_block = None
2274
if current_block and entry_index < len(current_block[1]):
2275
current_entry = current_block[1][entry_index]
2277
current_entry = None
2278
advance_entry = True
2280
if current_dir_info and path_index < len(current_dir_info[1]):
2281
current_path_info = current_dir_info[1][path_index]
2282
if current_path_info[2] == 'directory':
2283
if self.target._directory_is_tree_reference(
2284
current_path_info[0].decode('utf8')):
2285
current_path_info = current_path_info[:2] + \
2286
('tree-reference',) + current_path_info[3:]
2288
current_path_info = None
2290
path_handled = False
2291
while (current_entry is not None or
2292
current_path_info is not None):
2293
if current_entry is None:
2294
# the check for path_handled when the path is adnvaced
2295
# will yield this path if needed.
2297
elif current_path_info is None:
2298
# no path is fine: the per entry code will handle it.
2299
result = _process_entry(current_entry, current_path_info)
2300
if result is not None:
2301
if result is not uninteresting:
2303
elif (current_entry[0][1] != current_path_info[1]
2304
or current_entry[1][target_index][0] in 'ar'):
2305
# The current path on disk doesn't match the dirblock
2306
# record. Either the dirblock is marked as absent, or
2307
# the file on disk is not present at all in the
2308
# dirblock. Either way, report about the dirblock
2309
# entry, and let other code handle the filesystem one.
2311
# Compare the basename for these files to determine
2313
if current_path_info[1] < current_entry[0][1]:
2314
# extra file on disk: pass for now, but only
2315
# increment the path, not the entry
2316
advance_entry = False
2318
# entry referring to file not present on disk.
2319
# advance the entry only, after processing.
2320
result = _process_entry(current_entry, None)
2321
if result is not None:
2322
if result is not uninteresting:
2324
advance_path = False
2326
result = _process_entry(current_entry, current_path_info)
2327
if result is not None:
2329
if result is not uninteresting:
2331
if advance_entry and current_entry is not None:
2333
if entry_index < len(current_block[1]):
2334
current_entry = current_block[1][entry_index]
2336
current_entry = None
2338
advance_entry = True # reset the advance flaga
2339
if advance_path and current_path_info is not None:
2340
if not path_handled:
2341
# unversioned in all regards
2342
if want_unversioned:
2343
new_executable = bool(
2344
stat.S_ISREG(current_path_info[3].st_mode)
2345
and stat.S_IEXEC & current_path_info[3].st_mode)
2347
(None, utf8_decode(current_path_info[0])[0]),
2351
(None, utf8_decode(current_path_info[1])[0]),
2352
(None, current_path_info[2]),
2353
(None, new_executable))
2354
# dont descend into this unversioned path if it is
2356
if current_path_info[2] in ('directory'):
2357
del current_dir_info[1][path_index]
2359
# dont descend the disk iterator into any tree
2361
if current_path_info[2] == 'tree-reference':
2362
del current_dir_info[1][path_index]
2365
if path_index < len(current_dir_info[1]):
2366
current_path_info = current_dir_info[1][path_index]
2367
if current_path_info[2] == 'directory':
2368
if self.target._directory_is_tree_reference(
2369
current_path_info[0].decode('utf8')):
2370
current_path_info = current_path_info[:2] + \
2371
('tree-reference',) + current_path_info[3:]
2373
current_path_info = None
2374
path_handled = False
2376
advance_path = True # reset the advance flagg.
2377
if current_block is not None:
2379
if (block_index < len(state._dirblocks) and
2380
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2381
current_block = state._dirblocks[block_index]
2383
current_block = None
2384
if current_dir_info is not None:
2386
current_dir_info = dir_iterator.next()
2387
except StopIteration:
2388
current_dir_info = None
2096
2392
def is_compatible(source, target):
2097
2393
# the target must be a dirstate working tree
2098
if not isinstance(target, DirStateWorkingTree):
2394
if not isinstance(target, WorkingTree4):
2100
# the source must be a revtree or dirstate rev tree.
2396
# the source must be a revtreee or dirstate rev tree.
2101
2397
if not isinstance(source,
2102
2398
(revisiontree.RevisionTree, DirStateRevisionTree)):
2104
2400
# the source revid must be in the target dirstate
2105
if not (source._revision_id == _mod_revision.NULL_REVISION or
2401
if not (source._revision_id == NULL_REVISION or
2106
2402
source._revision_id in target.get_parent_ids()):
2107
# TODO: what about ghosts? it may well need to
2403
# TODO: what about ghosts? it may well need to
2108
2404
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
