1336
1274
if self._dirty:
1337
1275
raise AssertionError("attempting to write an inventory when the "
1338
1276
"dirstate is dirty will lose pending changes")
1339
had_inventory = self._inventory is not None
1340
# Setting self._inventory = None forces the dirstate to regenerate the
1341
# working inventory. We do this because self.inventory may be inv, or
1342
# may have been modified, and either case would prevent a clean delta
1344
self._inventory = None
1346
delta = inv._make_delta(self.root_inventory)
1348
self.apply_inventory_delta(delta)
1277
self.current_dirstate().set_state_from_inventory(inv)
1278
self._make_dirty(reset_inventory=False)
1279
if self._inventory is not None:
1350
1280
self._inventory = inv
1353
@needs_tree_write_lock
1354
def reset_state(self, revision_ids=None):
1355
"""Reset the state of the working tree.
1357
This does a hard-reset to a last-known-good state. This is a way to
1358
fix if something got corrupted (like the .bzr/checkout/dirstate file)
1360
if revision_ids is None:
1361
revision_ids = self.get_parent_ids()
1362
if not revision_ids:
1363
base_tree = self.branch.repository.revision_tree(
1364
_mod_revision.NULL_REVISION)
1367
trees = zip(revision_ids,
1368
self.branch.repository.revision_trees(revision_ids))
1369
base_tree = trees[0][1]
1370
state = self.current_dirstate()
1371
# We don't support ghosts yet
1372
state.set_state_from_scratch(base_tree.root_inventory, trees, [])
1375
class ContentFilterAwareSHA1Provider(dirstate.SHA1Provider):
1377
def __init__(self, tree):
1380
def sha1(self, abspath):
1381
"""See dirstate.SHA1Provider.sha1()."""
1382
filters = self.tree._content_filter_stack(
1383
self.tree.relpath(osutils.safe_unicode(abspath)))
1384
return _mod_filters.internal_size_sha_file_byname(abspath, filters)[1]
1386
def stat_and_sha1(self, abspath):
1387
"""See dirstate.SHA1Provider.stat_and_sha1()."""
1388
filters = self.tree._content_filter_stack(
1389
self.tree.relpath(osutils.safe_unicode(abspath)))
1390
file_obj = file(abspath, 'rb', 65000)
1392
statvalue = os.fstat(file_obj.fileno())
1394
file_obj = _mod_filters.filtered_input_file(file_obj, filters)
1395
sha1 = osutils.size_sha_file(file_obj)[1]
1398
return statvalue, sha1
1401
class ContentFilteringDirStateWorkingTree(DirStateWorkingTree):
1402
"""Dirstate working tree that supports content filtering.
1404
The dirstate holds the hash and size of the canonical form of the file,
1405
and most methods must return that.
1408
def _file_content_summary(self, path, stat_result):
1409
# This is to support the somewhat obsolete path_content_summary method
1410
# with content filtering: see
1411
# <https://bugs.launchpad.net/bzr/+bug/415508>.
1413
# If the dirstate cache is up to date and knows the hash and size,
1415
# Otherwise if there are no content filters, return the on-disk size
1416
# and leave the hash blank.
1417
# Otherwise, read and filter the on-disk file and use its size and
1420
# The dirstate doesn't store the size of the canonical form so we
1421
# can't trust it for content-filtered trees. We just return None.
1422
dirstate_sha1 = self._dirstate.sha1_from_stat(path, stat_result)
1423
executable = self._is_executable_from_path_and_stat(path, stat_result)
1424
return ('file', None, executable, dirstate_sha1)
1427
class WorkingTree4(DirStateWorkingTree):
1428
"""This is the Format 4 working tree.
1430
This differs from WorkingTree by:
1431
- Having a consolidated internal dirstate, stored in a
1432
randomly-accessible sorted file on disk.
1433
- Not having a regular inventory attribute. One can be synthesized
1434
on demand but this is expensive and should be avoided.
1436
This is new in bzr 0.15.
1440
class WorkingTree5(ContentFilteringDirStateWorkingTree):
1441
"""This is the Format 5 working tree.
1443
This differs from WorkingTree4 by:
1444
- Supporting content filtering.
1446
This is new in bzr 1.11.
1450
class WorkingTree6(ContentFilteringDirStateWorkingTree):
1451
"""This is the Format 6 working tree.
1453
This differs from WorkingTree5 by:
1454
- Supporting a current view that may mask the set of files in a tree
1455
impacted by most user operations.
1457
This is new in bzr 1.14.
1460
def _make_views(self):
1461
return views.PathBasedViews(self)
1464
class DirStateWorkingTreeFormat(WorkingTreeFormatMetaDir):
1466
missing_parent_conflicts = True
1468
supports_versioned_directories = True
1470
_lock_class = LockDir
1471
_lock_file_name = 'lock'
1473
def _open_control_files(self, a_bzrdir):
1474
transport = a_bzrdir.get_workingtree_transport(None)
1475
return LockableFiles(transport, self._lock_file_name,
1284
class WorkingTreeFormat4(WorkingTreeFormat3):
1285
"""The first consolidated dirstate working tree format.
1288
- exists within a metadir controlling .bzr
1289
- includes an explicit version marker for the workingtree control
1290
files, separate from the BzrDir format
1291
- modifies the hash cache format
1292
- is new in bzr 0.15
1293
- uses a LockDir to guard access to it.
1296
upgrade_recommended = False
1298
def get_format_string(self):
1299
"""See WorkingTreeFormat.get_format_string()."""
1300
return "Bazaar Working Tree Format 4 (bzr 0.15)\n"
1302
def get_format_description(self):
1303
"""See WorkingTreeFormat.get_format_description()."""
1304
return "Working tree format 4"
1478
1306
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
1479
1307
accelerator_tree=None, hardlink=False):
1480
1308
"""See WorkingTreeFormat.initialize().
1482
1310
:param revision_id: allows creating a working tree at a different
1483
revision than the branch is at.
1311
revision than the branch is at.
1484
1312
:param accelerator_tree: A tree which can be used for retrieving file
1485
1313
contents more quickly than the revision tree, i.e. a workingtree.
1486
1314
The revision tree will be used for cases where accelerator_tree's
2241
1904
if not found_versioned:
2242
1905
# none of the indexes was not 'absent' at all ids for this
2244
not_versioned.append(path.decode('utf-8'))
2245
if len(not_versioned) > 0:
2246
raise errors.PathsNotVersionedError(not_versioned)
1907
all_versioned = False
1909
if not all_versioned:
1910
raise errors.PathsNotVersionedError(specific_files)
2247
1911
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2248
search_specific_files = osutils.minimum_path_selection(specific_files)
1912
search_specific_files = set()
1913
for path in specific_files:
1914
other_specific_files = specific_files.difference(set([path]))
1915
if not osutils.is_inside_any(other_specific_files, path):
1916
# this is a top level path, we must check it.
1917
search_specific_files.add(path)
1919
# compare source_index and target_index at or under each element of search_specific_files.
1920
# follow the following comparison table. Note that we only want to do diff operations when
1921
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1925
# Source | Target | disk | action
1926
# r | fdlt | | add source to search, add id path move and perform
1927
# | | | diff check on source-target
1928
# r | fdlt | a | dangling file that was present in the basis.
1930
# r | a | | add source to search
1932
# r | r | | this path is present in a non-examined tree, skip.
1933
# r | r | a | this path is present in a non-examined tree, skip.
1934
# a | fdlt | | add new id
1935
# a | fdlt | a | dangling locally added file, skip
1936
# a | a | | not present in either tree, skip
1937
# a | a | a | not present in any tree, skip
1938
# a | r | | not present in either tree at this path, skip as it
1939
# | | | may not be selected by the users list of paths.
1940
# a | r | a | not present in either tree at this path, skip as it
1941
# | | | may not be selected by the users list of paths.
1942
# fdlt | fdlt | | content in both: diff them
1943
# fdlt | fdlt | a | deleted locally, but not unversioned - show as deleted ?
1944
# fdlt | a | | unversioned: output deleted id for now
1945
# fdlt | a | a | unversioned and deleted: output deleted id
1946
# fdlt | r | | relocated in this tree, so add target to search.
1947
# | | | Dont diff, we will see an r,fd; pair when we reach
1948
# | | | this id at the other path.
1949
# fdlt | r | a | relocated in this tree, so add target to search.
1950
# | | | Dont diff, we will see an r,fd; pair when we reach
1951
# | | | this id at the other path.
1953
# for all search_indexs in each path at or under each element of
1954
# search_specific_files, if the detail is relocated: add the id, and add the
1955
# relocated path as one to search if its not searched already. If the
1956
# detail is not relocated, add the id.
1957
searched_specific_files = set()
1958
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1959
# Using a list so that we can access the values and change them in
1960
# nested scope. Each one is [path, file_id, entry]
1961
last_source_parent = [None, None]
1962
last_target_parent = [None, None]
2250
1964
use_filesystem_for_exec = (sys.platform != 'win32')
2251
iter_changes = self.target._iter_changes(include_unchanged,
2252
use_filesystem_for_exec, search_specific_files, state,
2253
source_index, target_index, want_unversioned, self.target)
2254
return iter_changes.iter_changes()
1966
# Just a sentry, so that _process_entry can say that this
1967
# record is handled, but isn't interesting to process (unchanged)
1968
uninteresting = object()
1971
old_dirname_to_file_id = {}
1972
new_dirname_to_file_id = {}
1973
# TODO: jam 20070516 - Avoid the _get_entry lookup overhead by
1974
# keeping a cache of directories that we have seen.
1976
def _process_entry(entry, path_info):
1977
"""Compare an entry and real disk to generate delta information.
1979
:param path_info: top_relpath, basename, kind, lstat, abspath for
1980
the path of entry. If None, then the path is considered absent.
1981
(Perhaps we should pass in a concrete entry for this ?)
1982
Basename is returned as a utf8 string because we expect this
1983
tuple will be ignored, and don't want to take the time to
1985
:return: None if these don't match
1986
A tuple of information about the change, or
1987
the object 'uninteresting' if these match, but are
1988
basically identical.
1990
if source_index is None:
1991
source_details = NULL_PARENT_DETAILS
1993
source_details = entry[1][source_index]
1994
target_details = entry[1][target_index]
1995
target_minikind = target_details[0]
1996
if path_info is not None and target_minikind in 'fdlt':
1997
if not (target_index == 0):
1998
raise AssertionError()
1999
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
2000
stat_value=path_info[3])
2001
# The entry may have been modified by update_entry
2002
target_details = entry[1][target_index]
2003
target_minikind = target_details[0]
2006
file_id = entry[0][2]
2007
source_minikind = source_details[0]
2008
if source_minikind in 'fdltr' and target_minikind in 'fdlt':
2009
# claimed content in both: diff
2010
# r | fdlt | | add source to search, add id path move and perform
2011
# | | | diff check on source-target
2012
# r | fdlt | a | dangling file that was present in the basis.
2014
if source_minikind in 'r':
2015
# add the source to the search path to find any children it
2016
# has. TODO ? : only add if it is a container ?
2017
if not osutils.is_inside_any(searched_specific_files,
2019
search_specific_files.add(source_details[1])
2020
# generate the old path; this is needed for stating later
2022
old_path = source_details[1]
2023
old_dirname, old_basename = os.path.split(old_path)
2024
path = pathjoin(entry[0][0], entry[0][1])
2025
old_entry = state._get_entry(source_index,
2027
# update the source details variable to be the real
2029
if old_entry == (None, None):
2030
raise errors.CorruptDirstate(state._filename,
2031
"entry '%s/%s' is considered renamed from %r"
2032
" but source does not exist\n"
2033
"entry: %s" % (entry[0][0], entry[0][1], old_path, entry))
2034
source_details = old_entry[1][source_index]
2035
source_minikind = source_details[0]
2037
old_dirname = entry[0][0]
2038
old_basename = entry[0][1]
2039
old_path = path = None
2040
if path_info is None:
2041
# the file is missing on disk, show as removed.
2042
content_change = True
2046
# source and target are both versioned and disk file is present.
2047
target_kind = path_info[2]
2048
if target_kind == 'directory':
2050
old_path = path = pathjoin(old_dirname, old_basename)
2051
new_dirname_to_file_id[path] = file_id
2052
if source_minikind != 'd':
2053
content_change = True
2055
# directories have no fingerprint
2056
content_change = False
2058
elif target_kind == 'file':
2059
if source_minikind != 'f':
2060
content_change = True
2062
# We could check the size, but we already have the
2064
content_change = (link_or_sha1 != source_details[1])
2065
# Target details is updated at update_entry time
2066
if use_filesystem_for_exec:
2067
# We don't need S_ISREG here, because we are sure
2068
# we are dealing with a file.
2069
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
2071
target_exec = target_details[3]
2072
elif target_kind == 'symlink':
2073
if source_minikind != 'l':
2074
content_change = True
2076
content_change = (link_or_sha1 != source_details[1])
2078
elif target_kind == 'tree-reference':
2079
if source_minikind != 't':
2080
content_change = True
2082
content_change = False
2085
raise Exception, "unknown kind %s" % path_info[2]
2086
if source_minikind == 'd':
2088
old_path = path = pathjoin(old_dirname, old_basename)
2089
old_dirname_to_file_id[old_path] = file_id
2090
# parent id is the entry for the path in the target tree
2091
if old_dirname == last_source_parent[0]:
2092
source_parent_id = last_source_parent[1]
2095
source_parent_id = old_dirname_to_file_id[old_dirname]
2097
source_parent_entry = state._get_entry(source_index,
2098
path_utf8=old_dirname)
2099
source_parent_id = source_parent_entry[0][2]
2100
if source_parent_id == entry[0][2]:
2101
# This is the root, so the parent is None
2102
source_parent_id = None
2104
last_source_parent[0] = old_dirname
2105
last_source_parent[1] = source_parent_id
2106
new_dirname = entry[0][0]
2107
if new_dirname == last_target_parent[0]:
2108
target_parent_id = last_target_parent[1]
2111
target_parent_id = new_dirname_to_file_id[new_dirname]
2113
# TODO: We don't always need to do the lookup, because the
2114
# parent entry will be the same as the source entry.
2115
target_parent_entry = state._get_entry(target_index,
2116
path_utf8=new_dirname)
2117
if target_parent_entry == (None, None):
2118
raise AssertionError(
2119
"Could not find target parent in wt: %s\nparent of: %s"
2120
% (new_dirname, entry))
2121
target_parent_id = target_parent_entry[0][2]
2122
if target_parent_id == entry[0][2]:
2123
# This is the root, so the parent is None
2124
target_parent_id = None
2126
last_target_parent[0] = new_dirname
2127
last_target_parent[1] = target_parent_id
2129
source_exec = source_details[3]
2130
if (include_unchanged
2132
or source_parent_id != target_parent_id
2133
or old_basename != entry[0][1]
2134
or source_exec != target_exec
2136
if old_path is None:
2137
old_path = path = pathjoin(old_dirname, old_basename)
2138
old_path_u = utf8_decode(old_path)[0]
2141
old_path_u = utf8_decode(old_path)[0]
2142
if old_path == path:
2145
path_u = utf8_decode(path)[0]
2146
source_kind = _minikind_to_kind[source_minikind]
2147
return (entry[0][2],
2148
(old_path_u, path_u),
2151
(source_parent_id, target_parent_id),
2152
(utf8_decode(old_basename)[0], utf8_decode(entry[0][1])[0]),
2153
(source_kind, target_kind),
2154
(source_exec, target_exec))
2156
return uninteresting
2157
elif source_minikind in 'a' and target_minikind in 'fdlt':
2158
# looks like a new file
2159
if path_info is not None:
2160
path = pathjoin(entry[0][0], entry[0][1])
2161
# parent id is the entry for the path in the target tree
2162
# TODO: these are the same for an entire directory: cache em.
2163
parent_id = state._get_entry(target_index,
2164
path_utf8=entry[0][0])[0][2]
2165
if parent_id == entry[0][2]:
2167
if use_filesystem_for_exec:
2168
# We need S_ISREG here, because we aren't sure if this
2171
stat.S_ISREG(path_info[3].st_mode)
2172
and stat.S_IEXEC & path_info[3].st_mode)
2174
target_exec = target_details[3]
2175
return (entry[0][2],
2176
(None, utf8_decode(path)[0]),
2180
(None, utf8_decode(entry[0][1])[0]),
2181
(None, path_info[2]),
2182
(None, target_exec))
2184
# but its not on disk: we deliberately treat this as just
2185
# never-present. (Why ?! - RBC 20070224)
2187
elif source_minikind in 'fdlt' and target_minikind in 'a':
2188
# unversioned, possibly, or possibly not deleted: we dont care.
2189
# if its still on disk, *and* theres no other entry at this
2190
# path [we dont know this in this routine at the moment -
2191
# perhaps we should change this - then it would be an unknown.
2192
old_path = pathjoin(entry[0][0], entry[0][1])
2193
# parent id is the entry for the path in the target tree
2194
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
2195
if parent_id == entry[0][2]:
2197
return (entry[0][2],
2198
(utf8_decode(old_path)[0], None),
2202
(utf8_decode(entry[0][1])[0], None),
2203
(_minikind_to_kind[source_minikind], None),
2204
(source_details[3], None))
2205
elif source_minikind in 'fdlt' and target_minikind in 'r':
2206
# a rename; could be a true rename, or a rename inherited from
2207
# a renamed parent. TODO: handle this efficiently. Its not
2208
# common case to rename dirs though, so a correct but slow
2209
# implementation will do.
2210
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
2211
search_specific_files.add(target_details[1])
2212
elif source_minikind in 'ra' and target_minikind in 'ra':
2213
# neither of the selected trees contain this file,
2214
# so skip over it. This is not currently directly tested, but
2215
# is indirectly via test_too_much.TestCommands.test_conflicts.
2218
raise AssertionError("don't know how to compare "
2219
"source_minikind=%r, target_minikind=%r"
2220
% (source_minikind, target_minikind))
2221
## import pdb;pdb.set_trace()
2224
while search_specific_files:
2225
# TODO: the pending list should be lexically sorted? the
2226
# interface doesn't require it.
2227
current_root = search_specific_files.pop()
2228
current_root_unicode = current_root.decode('utf8')
2229
searched_specific_files.add(current_root)
2230
# process the entries for this containing directory: the rest will be
2231
# found by their parents recursively.
2232
root_entries = _entries_for_path(current_root)
2233
root_abspath = self.target.abspath(current_root_unicode)
2235
root_stat = os.lstat(root_abspath)
2237
if e.errno == errno.ENOENT:
2238
# the path does not exist: let _process_entry know that.
2239
root_dir_info = None
2241
# some other random error: hand it up.
2244
root_dir_info = ('', current_root,
2245
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
2247
if root_dir_info[2] == 'directory':
2248
if self.target._directory_is_tree_reference(
2249
current_root.decode('utf8')):
2250
root_dir_info = root_dir_info[:2] + \
2251
('tree-reference',) + root_dir_info[3:]
2253
if not root_entries and not root_dir_info:
2254
# this specified path is not present at all, skip it.
2256
path_handled = False
2257
for entry in root_entries:
2258
result = _process_entry(entry, root_dir_info)
2259
if result is not None:
2261
if result is not uninteresting:
2263
if want_unversioned and not path_handled and root_dir_info:
2264
new_executable = bool(
2265
stat.S_ISREG(root_dir_info[3].st_mode)
2266
and stat.S_IEXEC & root_dir_info[3].st_mode)
2268
(None, current_root_unicode),
2272
(None, splitpath(current_root_unicode)[-1]),
2273
(None, root_dir_info[2]),
2274
(None, new_executable)
2276
initial_key = (current_root, '', '')
2277
block_index, _ = state._find_block_index_from_key(initial_key)
2278
if block_index == 0:
2279
# we have processed the total root already, but because the
2280
# initial key matched it we should skip it here.
2282
if root_dir_info and root_dir_info[2] == 'tree-reference':
2283
current_dir_info = None
2285
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
2287
current_dir_info = dir_iterator.next()
2289
# on win32, python2.4 has e.errno == ERROR_DIRECTORY, but
2290
# python 2.5 has e.errno == EINVAL,
2291
# and e.winerror == ERROR_DIRECTORY
2292
e_winerror = getattr(e, 'winerror', None)
2293
win_errors = (ERROR_DIRECTORY, ERROR_PATH_NOT_FOUND)
2294
# there may be directories in the inventory even though
2295
# this path is not a file on disk: so mark it as end of
2297
if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
2298
current_dir_info = None
2299
elif (sys.platform == 'win32'
2300
and (e.errno in win_errors
2301
or e_winerror in win_errors)):
2302
current_dir_info = None
2306
if current_dir_info[0][0] == '':
2307
# remove .bzr from iteration
2308
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
2309
if current_dir_info[1][bzr_index][0] != '.bzr':
2310
raise AssertionError()
2311
del current_dir_info[1][bzr_index]
2312
# walk until both the directory listing and the versioned metadata
2314
if (block_index < len(state._dirblocks) and
2315
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2316
current_block = state._dirblocks[block_index]
2318
current_block = None
2319
while (current_dir_info is not None or
2320
current_block is not None):
2321
if (current_dir_info and current_block
2322
and current_dir_info[0][0] != current_block[0]):
2323
if cmp_by_dirs(current_dir_info[0][0], current_block[0]) < 0:
2324
# filesystem data refers to paths not covered by the dirblock.
2325
# this has two possibilities:
2326
# A) it is versioned but empty, so there is no block for it
2327
# B) it is not versioned.
2329
# if (A) then we need to recurse into it to check for
2330
# new unknown files or directories.
2331
# if (B) then we should ignore it, because we don't
2332
# recurse into unknown directories.
2334
while path_index < len(current_dir_info[1]):
2335
current_path_info = current_dir_info[1][path_index]
2336
if want_unversioned:
2337
if current_path_info[2] == 'directory':
2338
if self.target._directory_is_tree_reference(
2339
current_path_info[0].decode('utf8')):
2340
current_path_info = current_path_info[:2] + \
2341
('tree-reference',) + current_path_info[3:]
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',
2357
del current_dir_info[1][path_index]
2361
# This dir info has been handled, go to the next
2363
current_dir_info = dir_iterator.next()
2364
except StopIteration:
2365
current_dir_info = None
2367
# We have a dirblock entry for this location, but there
2368
# is no filesystem path for this. This is most likely
2369
# because a directory was removed from the disk.
2370
# We don't have to report the missing directory,
2371
# because that should have already been handled, but we
2372
# need to handle all of the files that are contained
2374
for current_entry in current_block[1]:
2375
# entry referring to file not present on disk.
2376
# advance the entry only, after processing.
2377
result = _process_entry(current_entry, None)
2378
if result is not None:
2379
if result is not uninteresting:
2382
if (block_index < len(state._dirblocks) and
2383
osutils.is_inside(current_root,
2384
state._dirblocks[block_index][0])):
2385
current_block = state._dirblocks[block_index]
2387
current_block = None
2390
if current_block and entry_index < len(current_block[1]):
2391
current_entry = current_block[1][entry_index]
2393
current_entry = None
2394
advance_entry = True
2396
if current_dir_info and path_index < len(current_dir_info[1]):
2397
current_path_info = current_dir_info[1][path_index]
2398
if current_path_info[2] == 'directory':
2399
if self.target._directory_is_tree_reference(
2400
current_path_info[0].decode('utf8')):
2401
current_path_info = current_path_info[:2] + \
2402
('tree-reference',) + current_path_info[3:]
2404
current_path_info = None
2406
path_handled = False
2407
while (current_entry is not None or
2408
current_path_info is not None):
2409
if current_entry is None:
2410
# the check for path_handled when the path is adnvaced
2411
# will yield this path if needed.
2413
elif current_path_info is None:
2414
# no path is fine: the per entry code will handle it.
2415
result = _process_entry(current_entry, current_path_info)
2416
if result is not None:
2417
if result is not uninteresting:
2419
elif (current_entry[0][1] != current_path_info[1]
2420
or current_entry[1][target_index][0] in 'ar'):
2421
# The current path on disk doesn't match the dirblock
2422
# record. Either the dirblock is marked as absent, or
2423
# the file on disk is not present at all in the
2424
# dirblock. Either way, report about the dirblock
2425
# entry, and let other code handle the filesystem one.
2427
# Compare the basename for these files to determine
2429
if current_path_info[1] < current_entry[0][1]:
2430
# extra file on disk: pass for now, but only
2431
# increment the path, not the entry
2432
advance_entry = False
2434
# entry referring to file not present on disk.
2435
# advance the entry only, after processing.
2436
result = _process_entry(current_entry, None)
2437
if result is not None:
2438
if result is not uninteresting:
2440
advance_path = False
2442
result = _process_entry(current_entry, current_path_info)
2443
if result is not None:
2445
if result is not uninteresting:
2447
if advance_entry and current_entry is not None:
2449
if entry_index < len(current_block[1]):
2450
current_entry = current_block[1][entry_index]
2452
current_entry = None
2454
advance_entry = True # reset the advance flaga
2455
if advance_path and current_path_info is not None:
2456
if not path_handled:
2457
# unversioned in all regards
2458
if want_unversioned:
2459
new_executable = bool(
2460
stat.S_ISREG(current_path_info[3].st_mode)
2461
and stat.S_IEXEC & current_path_info[3].st_mode)
2463
(None, utf8_decode(current_path_info[0])[0]),
2467
(None, utf8_decode(current_path_info[1])[0]),
2468
(None, current_path_info[2]),
2469
(None, new_executable))
2470
# dont descend into this unversioned path if it is
2472
if current_path_info[2] in ('directory'):
2473
del current_dir_info[1][path_index]
2475
# dont descend the disk iterator into any tree
2477
if current_path_info[2] == 'tree-reference':
2478
del current_dir_info[1][path_index]
2481
if path_index < len(current_dir_info[1]):
2482
current_path_info = current_dir_info[1][path_index]
2483
if current_path_info[2] == 'directory':
2484
if self.target._directory_is_tree_reference(
2485
current_path_info[0].decode('utf8')):
2486
current_path_info = current_path_info[:2] + \
2487
('tree-reference',) + current_path_info[3:]
2489
current_path_info = None
2490
path_handled = False
2492
advance_path = True # reset the advance flagg.
2493
if current_block is not None:
2495
if (block_index < len(state._dirblocks) and
2496
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2497
current_block = state._dirblocks[block_index]
2499
current_block = None
2500
if current_dir_info is not None:
2502
current_dir_info = dir_iterator.next()
2503
except StopIteration:
2504
current_dir_info = None
2257
2508
def is_compatible(source, target):
2258
2509
# the target must be a dirstate working tree
2259
if not isinstance(target, DirStateWorkingTree):
2510
if not isinstance(target, WorkingTree4):
2261
# the source must be a revtree or dirstate rev tree.
2512
# the source must be a revtreee or dirstate rev tree.
2262
2513
if not isinstance(source,
2263
2514
(revisiontree.RevisionTree, DirStateRevisionTree)):
2265
2516
# the source revid must be in the target dirstate
2266
if not (source._revision_id == _mod_revision.NULL_REVISION or
2517
if not (source._revision_id == NULL_REVISION or
2267
2518
source._revision_id in target.get_parent_ids()):
2268
# TODO: what about ghosts? it may well need to
2519
# TODO: what about ghosts? it may well need to
2269
2520
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
