1336
1275
if self._dirty:
1337
1276
raise AssertionError("attempting to write an inventory when the "
1338
1277
"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)
1278
self.current_dirstate().set_state_from_inventory(inv)
1279
self._make_dirty(reset_inventory=False)
1280
if self._inventory is not None:
1350
1281
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,
1285
class WorkingTreeFormat4(WorkingTreeFormat3):
1286
"""The first consolidated dirstate working tree format.
1289
- exists within a metadir controlling .bzr
1290
- includes an explicit version marker for the workingtree control
1291
files, separate from the BzrDir format
1292
- modifies the hash cache format
1293
- is new in bzr 0.15
1294
- uses a LockDir to guard access to it.
1297
upgrade_recommended = False
1299
def get_format_string(self):
1300
"""See WorkingTreeFormat.get_format_string()."""
1301
return "Bazaar Working Tree Format 4 (bzr 0.15)\n"
1303
def get_format_description(self):
1304
"""See WorkingTreeFormat.get_format_description()."""
1305
return "Working tree format 4"
1478
1307
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
1479
1308
accelerator_tree=None, hardlink=False):
1480
1309
"""See WorkingTreeFormat.initialize().
1482
1311
:param revision_id: allows creating a working tree at a different
1483
revision than the branch is at.
1312
revision than the branch is at.
1484
1313
:param accelerator_tree: A tree which can be used for retrieving file
1485
1314
contents more quickly than the revision tree, i.e. a workingtree.
1486
1315
The revision tree will be used for cases where accelerator_tree's
2241
1905
if not found_versioned:
2242
1906
# 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)
1908
all_versioned = False
1910
if not all_versioned:
1911
raise errors.PathsNotVersionedError(specific_files)
2247
1912
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2248
search_specific_files = osutils.minimum_path_selection(specific_files)
1913
search_specific_files = set()
1914
for path in specific_files:
1915
other_specific_files = specific_files.difference(set([path]))
1916
if not osutils.is_inside_any(other_specific_files, path):
1917
# this is a top level path, we must check it.
1918
search_specific_files.add(path)
1920
# compare source_index and target_index at or under each element of search_specific_files.
1921
# follow the following comparison table. Note that we only want to do diff operations when
1922
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1926
# Source | Target | disk | action
1927
# r | fdlt | | add source to search, add id path move and perform
1928
# | | | diff check on source-target
1929
# r | fdlt | a | dangling file that was present in the basis.
1931
# r | a | | add source to search
1933
# r | r | | this path is present in a non-examined tree, skip.
1934
# r | r | a | this path is present in a non-examined tree, skip.
1935
# a | fdlt | | add new id
1936
# a | fdlt | a | dangling locally added file, skip
1937
# a | a | | not present in either tree, skip
1938
# a | a | a | not present in any tree, skip
1939
# a | r | | not present in either tree at this path, skip as it
1940
# | | | may not be selected by the users list of paths.
1941
# a | r | a | not present in either tree at this path, skip as it
1942
# | | | may not be selected by the users list of paths.
1943
# fdlt | fdlt | | content in both: diff them
1944
# fdlt | fdlt | a | deleted locally, but not unversioned - show as deleted ?
1945
# fdlt | a | | unversioned: output deleted id for now
1946
# fdlt | a | a | unversioned and deleted: output deleted id
1947
# fdlt | r | | relocated in this tree, so add target to search.
1948
# | | | Dont diff, we will see an r,fd; pair when we reach
1949
# | | | this id at the other path.
1950
# fdlt | r | a | relocated in this tree, so add target to search.
1951
# | | | Dont diff, we will see an r,fd; pair when we reach
1952
# | | | this id at the other path.
1954
# for all search_indexs in each path at or under each element of
1955
# search_specific_files, if the detail is relocated: add the id, and add the
1956
# relocated path as one to search if its not searched already. If the
1957
# detail is not relocated, add the id.
1958
searched_specific_files = set()
1959
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1960
# Using a list so that we can access the values and change them in
1961
# nested scope. Each one is [path, file_id, entry]
1962
last_source_parent = [None, None]
1963
last_target_parent = [None, None]
2250
1965
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()
1967
# Just a sentry, so that _process_entry can say that this
1968
# record is handled, but isn't interesting to process (unchanged)
1969
uninteresting = object()
1972
old_dirname_to_file_id = {}
1973
new_dirname_to_file_id = {}
1974
# TODO: jam 20070516 - Avoid the _get_entry lookup overhead by
1975
# keeping a cache of directories that we have seen.
1977
def _process_entry(entry, path_info):
1978
"""Compare an entry and real disk to generate delta information.
1980
:param path_info: top_relpath, basename, kind, lstat, abspath for
1981
the path of entry. If None, then the path is considered absent.
1982
(Perhaps we should pass in a concrete entry for this ?)
1983
Basename is returned as a utf8 string because we expect this
1984
tuple will be ignored, and don't want to take the time to
1986
:return: None if these don't match
1987
A tuple of information about the change, or
1988
the object 'uninteresting' if these match, but are
1989
basically identical.
1991
if source_index is None:
1992
source_details = NULL_PARENT_DETAILS
1994
source_details = entry[1][source_index]
1995
target_details = entry[1][target_index]
1996
target_minikind = target_details[0]
1997
if path_info is not None and target_minikind in 'fdlt':
1998
if not (target_index == 0):
1999
raise AssertionError()
2000
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
2001
stat_value=path_info[3])
2002
# The entry may have been modified by update_entry
2003
target_details = entry[1][target_index]
2004
target_minikind = target_details[0]
2007
file_id = entry[0][2]
2008
source_minikind = source_details[0]
2009
if source_minikind in 'fdltr' and target_minikind in 'fdlt':
2010
# claimed content in both: diff
2011
# r | fdlt | | add source to search, add id path move and perform
2012
# | | | diff check on source-target
2013
# r | fdlt | a | dangling file that was present in the basis.
2015
if source_minikind in 'r':
2016
# add the source to the search path to find any children it
2017
# has. TODO ? : only add if it is a container ?
2018
if not osutils.is_inside_any(searched_specific_files,
2020
search_specific_files.add(source_details[1])
2021
# generate the old path; this is needed for stating later
2023
old_path = source_details[1]
2024
old_dirname, old_basename = os.path.split(old_path)
2025
path = pathjoin(entry[0][0], entry[0][1])
2026
old_entry = state._get_entry(source_index,
2028
# update the source details variable to be the real
2030
if old_entry == (None, None):
2031
raise errors.CorruptDirstate(state._filename,
2032
"entry '%s/%s' is considered renamed from %r"
2033
" but source does not exist\n"
2034
"entry: %s" % (entry[0][0], entry[0][1], old_path, entry))
2035
source_details = old_entry[1][source_index]
2036
source_minikind = source_details[0]
2038
old_dirname = entry[0][0]
2039
old_basename = entry[0][1]
2040
old_path = path = None
2041
if path_info is None:
2042
# the file is missing on disk, show as removed.
2043
content_change = True
2047
# source and target are both versioned and disk file is present.
2048
target_kind = path_info[2]
2049
if target_kind == 'directory':
2051
old_path = path = pathjoin(old_dirname, old_basename)
2052
new_dirname_to_file_id[path] = file_id
2053
if source_minikind != 'd':
2054
content_change = True
2056
# directories have no fingerprint
2057
content_change = False
2059
elif target_kind == 'file':
2060
if source_minikind != 'f':
2061
content_change = True
2063
# We could check the size, but we already have the
2065
content_change = (link_or_sha1 != source_details[1])
2066
# Target details is updated at update_entry time
2067
if use_filesystem_for_exec:
2068
# We don't need S_ISREG here, because we are sure
2069
# we are dealing with a file.
2070
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
2072
target_exec = target_details[3]
2073
elif target_kind == 'symlink':
2074
if source_minikind != 'l':
2075
content_change = True
2077
content_change = (link_or_sha1 != source_details[1])
2079
elif target_kind == 'tree-reference':
2080
if source_minikind != 't':
2081
content_change = True
2083
content_change = False
2086
raise Exception, "unknown kind %s" % path_info[2]
2087
if source_minikind == 'd':
2089
old_path = path = pathjoin(old_dirname, old_basename)
2090
old_dirname_to_file_id[old_path] = file_id
2091
# parent id is the entry for the path in the target tree
2092
if old_dirname == last_source_parent[0]:
2093
source_parent_id = last_source_parent[1]
2096
source_parent_id = old_dirname_to_file_id[old_dirname]
2098
source_parent_entry = state._get_entry(source_index,
2099
path_utf8=old_dirname)
2100
source_parent_id = source_parent_entry[0][2]
2101
if source_parent_id == entry[0][2]:
2102
# This is the root, so the parent is None
2103
source_parent_id = None
2105
last_source_parent[0] = old_dirname
2106
last_source_parent[1] = source_parent_id
2107
new_dirname = entry[0][0]
2108
if new_dirname == last_target_parent[0]:
2109
target_parent_id = last_target_parent[1]
2112
target_parent_id = new_dirname_to_file_id[new_dirname]
2114
# TODO: We don't always need to do the lookup, because the
2115
# parent entry will be the same as the source entry.
2116
target_parent_entry = state._get_entry(target_index,
2117
path_utf8=new_dirname)
2118
if target_parent_entry == (None, None):
2119
raise AssertionError(
2120
"Could not find target parent in wt: %s\nparent of: %s"
2121
% (new_dirname, entry))
2122
target_parent_id = target_parent_entry[0][2]
2123
if target_parent_id == entry[0][2]:
2124
# This is the root, so the parent is None
2125
target_parent_id = None
2127
last_target_parent[0] = new_dirname
2128
last_target_parent[1] = target_parent_id
2130
source_exec = source_details[3]
2131
if (include_unchanged
2133
or source_parent_id != target_parent_id
2134
or old_basename != entry[0][1]
2135
or source_exec != target_exec
2137
if old_path is None:
2138
old_path = path = pathjoin(old_dirname, old_basename)
2139
old_path_u = utf8_decode(old_path)[0]
2142
old_path_u = utf8_decode(old_path)[0]
2143
if old_path == path:
2146
path_u = utf8_decode(path)[0]
2147
source_kind = _minikind_to_kind[source_minikind]
2148
return (entry[0][2],
2149
(old_path_u, path_u),
2152
(source_parent_id, target_parent_id),
2153
(utf8_decode(old_basename)[0], utf8_decode(entry[0][1])[0]),
2154
(source_kind, target_kind),
2155
(source_exec, target_exec))
2157
return uninteresting
2158
elif source_minikind in 'a' and target_minikind in 'fdlt':
2159
# looks like a new file
2160
if path_info is not None:
2161
path = pathjoin(entry[0][0], entry[0][1])
2162
# parent id is the entry for the path in the target tree
2163
# TODO: these are the same for an entire directory: cache em.
2164
parent_id = state._get_entry(target_index,
2165
path_utf8=entry[0][0])[0][2]
2166
if parent_id == entry[0][2]:
2168
if use_filesystem_for_exec:
2169
# We need S_ISREG here, because we aren't sure if this
2172
stat.S_ISREG(path_info[3].st_mode)
2173
and stat.S_IEXEC & path_info[3].st_mode)
2175
target_exec = target_details[3]
2176
return (entry[0][2],
2177
(None, utf8_decode(path)[0]),
2181
(None, utf8_decode(entry[0][1])[0]),
2182
(None, path_info[2]),
2183
(None, target_exec))
2185
# but its not on disk: we deliberately treat this as just
2186
# never-present. (Why ?! - RBC 20070224)
2188
elif source_minikind in 'fdlt' and target_minikind in 'a':
2189
# unversioned, possibly, or possibly not deleted: we dont care.
2190
# if its still on disk, *and* theres no other entry at this
2191
# path [we dont know this in this routine at the moment -
2192
# perhaps we should change this - then it would be an unknown.
2193
old_path = pathjoin(entry[0][0], entry[0][1])
2194
# parent id is the entry for the path in the target tree
2195
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
2196
if parent_id == entry[0][2]:
2198
return (entry[0][2],
2199
(utf8_decode(old_path)[0], None),
2203
(utf8_decode(entry[0][1])[0], None),
2204
(_minikind_to_kind[source_minikind], None),
2205
(source_details[3], None))
2206
elif source_minikind in 'fdlt' and target_minikind in 'r':
2207
# a rename; could be a true rename, or a rename inherited from
2208
# a renamed parent. TODO: handle this efficiently. Its not
2209
# common case to rename dirs though, so a correct but slow
2210
# implementation will do.
2211
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
2212
search_specific_files.add(target_details[1])
2213
elif source_minikind in 'ra' and target_minikind in 'ra':
2214
# neither of the selected trees contain this file,
2215
# so skip over it. This is not currently directly tested, but
2216
# is indirectly via test_too_much.TestCommands.test_conflicts.
2219
raise AssertionError("don't know how to compare "
2220
"source_minikind=%r, target_minikind=%r"
2221
% (source_minikind, target_minikind))
2222
## import pdb;pdb.set_trace()
2225
while search_specific_files:
2226
# TODO: the pending list should be lexically sorted? the
2227
# interface doesn't require it.
2228
current_root = search_specific_files.pop()
2229
current_root_unicode = current_root.decode('utf8')
2230
searched_specific_files.add(current_root)
2231
# process the entries for this containing directory: the rest will be
2232
# found by their parents recursively.
2233
root_entries = _entries_for_path(current_root)
2234
root_abspath = self.target.abspath(current_root_unicode)
2236
root_stat = os.lstat(root_abspath)
2238
if e.errno == errno.ENOENT:
2239
# the path does not exist: let _process_entry know that.
2240
root_dir_info = None
2242
# some other random error: hand it up.
2245
root_dir_info = ('', current_root,
2246
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
2248
if root_dir_info[2] == 'directory':
2249
if self.target._directory_is_tree_reference(
2250
current_root.decode('utf8')):
2251
root_dir_info = root_dir_info[:2] + \
2252
('tree-reference',) + root_dir_info[3:]
2254
if not root_entries and not root_dir_info:
2255
# this specified path is not present at all, skip it.
2257
path_handled = False
2258
for entry in root_entries:
2259
result = _process_entry(entry, root_dir_info)
2260
if result is not None:
2262
if result is not uninteresting:
2264
if want_unversioned and not path_handled and root_dir_info:
2265
new_executable = bool(
2266
stat.S_ISREG(root_dir_info[3].st_mode)
2267
and stat.S_IEXEC & root_dir_info[3].st_mode)
2269
(None, current_root_unicode),
2273
(None, splitpath(current_root_unicode)[-1]),
2274
(None, root_dir_info[2]),
2275
(None, new_executable)
2277
initial_key = (current_root, '', '')
2278
block_index, _ = state._find_block_index_from_key(initial_key)
2279
if block_index == 0:
2280
# we have processed the total root already, but because the
2281
# initial key matched it we should skip it here.
2283
if root_dir_info and root_dir_info[2] == 'tree-reference':
2284
current_dir_info = None
2286
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
2288
current_dir_info = dir_iterator.next()
2290
# on win32, python2.4 has e.errno == ERROR_DIRECTORY, but
2291
# python 2.5 has e.errno == EINVAL,
2292
# and e.winerror == ERROR_DIRECTORY
2293
e_winerror = getattr(e, 'winerror', None)
2294
win_errors = (ERROR_DIRECTORY, ERROR_PATH_NOT_FOUND)
2295
# there may be directories in the inventory even though
2296
# this path is not a file on disk: so mark it as end of
2298
if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
2299
current_dir_info = None
2300
elif (sys.platform == 'win32'
2301
and (e.errno in win_errors
2302
or e_winerror in win_errors)):
2303
current_dir_info = None
2307
if current_dir_info[0][0] == '':
2308
# remove .bzr from iteration
2309
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
2310
if current_dir_info[1][bzr_index][0] != '.bzr':
2311
raise AssertionError()
2312
del current_dir_info[1][bzr_index]
2313
# walk until both the directory listing and the versioned metadata
2315
if (block_index < len(state._dirblocks) and
2316
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2317
current_block = state._dirblocks[block_index]
2319
current_block = None
2320
while (current_dir_info is not None or
2321
current_block is not None):
2322
if (current_dir_info and current_block
2323
and current_dir_info[0][0] != current_block[0]):
2324
if cmp_by_dirs(current_dir_info[0][0], current_block[0]) < 0:
2325
# filesystem data refers to paths not covered by the dirblock.
2326
# this has two possibilities:
2327
# A) it is versioned but empty, so there is no block for it
2328
# B) it is not versioned.
2330
# if (A) then we need to recurse into it to check for
2331
# new unknown files or directories.
2332
# if (B) then we should ignore it, because we don't
2333
# recurse into unknown directories.
2335
while path_index < len(current_dir_info[1]):
2336
current_path_info = current_dir_info[1][path_index]
2337
if want_unversioned:
2338
if current_path_info[2] == 'directory':
2339
if self.target._directory_is_tree_reference(
2340
current_path_info[0].decode('utf8')):
2341
current_path_info = current_path_info[:2] + \
2342
('tree-reference',) + current_path_info[3:]
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',
2358
del current_dir_info[1][path_index]
2362
# This dir info has been handled, go to the next
2364
current_dir_info = dir_iterator.next()
2365
except StopIteration:
2366
current_dir_info = None
2368
# We have a dirblock entry for this location, but there
2369
# is no filesystem path for this. This is most likely
2370
# because a directory was removed from the disk.
2371
# We don't have to report the missing directory,
2372
# because that should have already been handled, but we
2373
# need to handle all of the files that are contained
2375
for current_entry in current_block[1]:
2376
# entry referring to file not present on disk.
2377
# advance the entry only, after processing.
2378
result = _process_entry(current_entry, None)
2379
if result is not None:
2380
if result is not uninteresting:
2383
if (block_index < len(state._dirblocks) and
2384
osutils.is_inside(current_root,
2385
state._dirblocks[block_index][0])):
2386
current_block = state._dirblocks[block_index]
2388
current_block = None
2391
if current_block and entry_index < len(current_block[1]):
2392
current_entry = current_block[1][entry_index]
2394
current_entry = None
2395
advance_entry = True
2397
if current_dir_info and path_index < len(current_dir_info[1]):
2398
current_path_info = current_dir_info[1][path_index]
2399
if current_path_info[2] == 'directory':
2400
if self.target._directory_is_tree_reference(
2401
current_path_info[0].decode('utf8')):
2402
current_path_info = current_path_info[:2] + \
2403
('tree-reference',) + current_path_info[3:]
2405
current_path_info = None
2407
path_handled = False
2408
while (current_entry is not None or
2409
current_path_info is not None):
2410
if current_entry is None:
2411
# the check for path_handled when the path is adnvaced
2412
# will yield this path if needed.
2414
elif current_path_info is None:
2415
# no path is fine: the per entry code will handle it.
2416
result = _process_entry(current_entry, current_path_info)
2417
if result is not None:
2418
if result is not uninteresting:
2420
elif (current_entry[0][1] != current_path_info[1]
2421
or current_entry[1][target_index][0] in 'ar'):
2422
# The current path on disk doesn't match the dirblock
2423
# record. Either the dirblock is marked as absent, or
2424
# the file on disk is not present at all in the
2425
# dirblock. Either way, report about the dirblock
2426
# entry, and let other code handle the filesystem one.
2428
# Compare the basename for these files to determine
2430
if current_path_info[1] < current_entry[0][1]:
2431
# extra file on disk: pass for now, but only
2432
# increment the path, not the entry
2433
advance_entry = False
2435
# entry referring to file not present on disk.
2436
# advance the entry only, after processing.
2437
result = _process_entry(current_entry, None)
2438
if result is not None:
2439
if result is not uninteresting:
2441
advance_path = False
2443
result = _process_entry(current_entry, current_path_info)
2444
if result is not None:
2446
if result is not uninteresting:
2448
if advance_entry and current_entry is not None:
2450
if entry_index < len(current_block[1]):
2451
current_entry = current_block[1][entry_index]
2453
current_entry = None
2455
advance_entry = True # reset the advance flaga
2456
if advance_path and current_path_info is not None:
2457
if not path_handled:
2458
# unversioned in all regards
2459
if want_unversioned:
2460
new_executable = bool(
2461
stat.S_ISREG(current_path_info[3].st_mode)
2462
and stat.S_IEXEC & current_path_info[3].st_mode)
2464
relpath_unicode = utf8_decode(current_path_info[0])[0]
2465
except UnicodeDecodeError:
2466
raise errors.BadFilenameEncoding(
2467
current_path_info[0], osutils._fs_enc)
2469
(None, relpath_unicode),
2473
(None, utf8_decode(current_path_info[1])[0]),
2474
(None, current_path_info[2]),
2475
(None, new_executable))
2476
# dont descend into this unversioned path if it is
2478
if current_path_info[2] in ('directory'):
2479
del current_dir_info[1][path_index]
2481
# dont descend the disk iterator into any tree
2483
if current_path_info[2] == 'tree-reference':
2484
del current_dir_info[1][path_index]
2487
if path_index < len(current_dir_info[1]):
2488
current_path_info = current_dir_info[1][path_index]
2489
if current_path_info[2] == 'directory':
2490
if self.target._directory_is_tree_reference(
2491
current_path_info[0].decode('utf8')):
2492
current_path_info = current_path_info[:2] + \
2493
('tree-reference',) + current_path_info[3:]
2495
current_path_info = None
2496
path_handled = False
2498
advance_path = True # reset the advance flagg.
2499
if current_block is not None:
2501
if (block_index < len(state._dirblocks) and
2502
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2503
current_block = state._dirblocks[block_index]
2505
current_block = None
2506
if current_dir_info is not None:
2508
current_dir_info = dir_iterator.next()
2509
except StopIteration:
2510
current_dir_info = None
2257
2514
def is_compatible(source, target):
2258
2515
# the target must be a dirstate working tree
2259
if not isinstance(target, DirStateWorkingTree):
2516
if not isinstance(target, WorkingTree4):
2261
# the source must be a revtree or dirstate rev tree.
2518
# the source must be a revtreee or dirstate rev tree.
2262
2519
if not isinstance(source,
2263
2520
(revisiontree.RevisionTree, DirStateRevisionTree)):
2265
2522
# the source revid must be in the target dirstate
2266
if not (source._revision_id == _mod_revision.NULL_REVISION or
2523
if not (source._revision_id == NULL_REVISION or
2267
2524
source._revision_id in target.get_parent_ids()):
2268
# TODO: what about ghosts? it may well need to
2525
# TODO: what about ghosts? it may well need to
2269
2526
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
