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
_tree_class = WorkingTree4
1301
def get_format_string(self):
1302
"""See WorkingTreeFormat.get_format_string()."""
1303
return "Bazaar Working Tree Format 4 (bzr 0.15)\n"
1305
def get_format_description(self):
1306
"""See WorkingTreeFormat.get_format_description()."""
1307
return "Working tree format 4"
1478
1309
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
1479
1310
accelerator_tree=None, hardlink=False):
1480
1311
"""See WorkingTreeFormat.initialize().
1482
1313
:param revision_id: allows creating a working tree at a different
1483
revision than the branch is at.
1314
revision than the branch is at.
1484
1315
:param accelerator_tree: A tree which can be used for retrieving file
1485
1316
contents more quickly than the revision tree, i.e. a workingtree.
1486
1317
The revision tree will be used for cases where accelerator_tree's
2241
1917
if not found_versioned:
2242
1918
# 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)
1920
all_versioned = False
1922
if not all_versioned:
1923
raise errors.PathsNotVersionedError(specific_files)
2247
1924
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2248
search_specific_files = osutils.minimum_path_selection(specific_files)
1925
search_specific_files = set()
1926
for path in specific_files:
1927
other_specific_files = specific_files.difference(set([path]))
1928
if not osutils.is_inside_any(other_specific_files, path):
1929
# this is a top level path, we must check it.
1930
search_specific_files.add(path)
1932
# compare source_index and target_index at or under each element of search_specific_files.
1933
# follow the following comparison table. Note that we only want to do diff operations when
1934
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1938
# Source | Target | disk | action
1939
# r | fdlt | | add source to search, add id path move and perform
1940
# | | | diff check on source-target
1941
# r | fdlt | a | dangling file that was present in the basis.
1943
# r | a | | add source to search
1945
# r | r | | this path is present in a non-examined tree, skip.
1946
# r | r | a | this path is present in a non-examined tree, skip.
1947
# a | fdlt | | add new id
1948
# a | fdlt | a | dangling locally added file, skip
1949
# a | a | | not present in either tree, skip
1950
# a | a | a | not present in any tree, skip
1951
# a | r | | not present in either tree at this path, skip as it
1952
# | | | may not be selected by the users list of paths.
1953
# a | r | a | not present in either tree at this path, skip as it
1954
# | | | may not be selected by the users list of paths.
1955
# fdlt | fdlt | | content in both: diff them
1956
# fdlt | fdlt | a | deleted locally, but not unversioned - show as deleted ?
1957
# fdlt | a | | unversioned: output deleted id for now
1958
# fdlt | a | a | unversioned and deleted: output deleted id
1959
# fdlt | r | | relocated in this tree, so add target to search.
1960
# | | | Dont diff, we will see an r,fd; pair when we reach
1961
# | | | this id at the other path.
1962
# fdlt | r | a | relocated in this tree, so add target to search.
1963
# | | | Dont diff, we will see an r,fd; pair when we reach
1964
# | | | this id at the other path.
1966
# for all search_indexs in each path at or under each element of
1967
# search_specific_files, if the detail is relocated: add the id, and add the
1968
# relocated path as one to search if its not searched already. If the
1969
# detail is not relocated, add the id.
1970
searched_specific_files = set()
1971
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1972
# Using a list so that we can access the values and change them in
1973
# nested scope. Each one is [path, file_id, entry]
1974
last_source_parent = [None, None]
1975
last_target_parent = [None, None]
2250
1977
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()
1979
# Just a sentry, so that _process_entry can say that this
1980
# record is handled, but isn't interesting to process (unchanged)
1981
uninteresting = object()
1983
old_dirname_to_file_id = {}
1984
new_dirname_to_file_id = {}
1985
# TODO: jam 20070516 - Avoid the _get_entry lookup overhead by
1986
# keeping a cache of directories that we have seen.
1988
def _process_entry(entry, path_info):
1989
"""Compare an entry and real disk to generate delta information.
1991
:param path_info: top_relpath, basename, kind, lstat, abspath for
1992
the path of entry. If None, then the path is considered absent.
1993
(Perhaps we should pass in a concrete entry for this ?)
1994
Basename is returned as a utf8 string because we expect this
1995
tuple will be ignored, and don't want to take the time to
1997
:return: None if these don't match
1998
A tuple of information about the change, or
1999
the object 'uninteresting' if these match, but are
2000
basically identical.
2002
if source_index is None:
2003
source_details = NULL_PARENT_DETAILS
2005
source_details = entry[1][source_index]
2006
target_details = entry[1][target_index]
2007
target_minikind = target_details[0]
2008
if path_info is not None and target_minikind in 'fdlt':
2009
if not (target_index == 0):
2010
raise AssertionError()
2011
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
2012
stat_value=path_info[3])
2013
# The entry may have been modified by update_entry
2014
target_details = entry[1][target_index]
2015
target_minikind = target_details[0]
2018
file_id = entry[0][2]
2019
source_minikind = source_details[0]
2020
if source_minikind in 'fdltr' and target_minikind in 'fdlt':
2021
# claimed content in both: diff
2022
# r | fdlt | | add source to search, add id path move and perform
2023
# | | | diff check on source-target
2024
# r | fdlt | a | dangling file that was present in the basis.
2026
if source_minikind in 'r':
2027
# add the source to the search path to find any children it
2028
# has. TODO ? : only add if it is a container ?
2029
if not osutils.is_inside_any(searched_specific_files,
2031
search_specific_files.add(source_details[1])
2032
# generate the old path; this is needed for stating later
2034
old_path = source_details[1]
2035
old_dirname, old_basename = os.path.split(old_path)
2036
path = pathjoin(entry[0][0], entry[0][1])
2037
old_entry = state._get_entry(source_index,
2039
# update the source details variable to be the real
2041
if old_entry == (None, None):
2042
raise errors.CorruptDirstate(state._filename,
2043
"entry '%s/%s' is considered renamed from %r"
2044
" but source does not exist\n"
2045
"entry: %s" % (entry[0][0], entry[0][1], old_path, entry))
2046
source_details = old_entry[1][source_index]
2047
source_minikind = source_details[0]
2049
old_dirname = entry[0][0]
2050
old_basename = entry[0][1]
2051
old_path = path = None
2052
if path_info is None:
2053
# the file is missing on disk, show as removed.
2054
content_change = True
2058
# source and target are both versioned and disk file is present.
2059
target_kind = path_info[2]
2060
if target_kind == 'directory':
2062
old_path = path = pathjoin(old_dirname, old_basename)
2063
new_dirname_to_file_id[path] = file_id
2064
if source_minikind != 'd':
2065
content_change = True
2067
# directories have no fingerprint
2068
content_change = False
2070
elif target_kind == 'file':
2071
if source_minikind != 'f':
2072
content_change = True
2074
# We could check the size, but we already have the
2076
content_change = (link_or_sha1 != source_details[1])
2077
# Target details is updated at update_entry time
2078
if use_filesystem_for_exec:
2079
# We don't need S_ISREG here, because we are sure
2080
# we are dealing with a file.
2081
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
2083
target_exec = target_details[3]
2084
elif target_kind == 'symlink':
2085
if source_minikind != 'l':
2086
content_change = True
2088
content_change = (link_or_sha1 != source_details[1])
2090
elif target_kind == 'tree-reference':
2091
if source_minikind != 't':
2092
content_change = True
2094
content_change = False
2097
raise Exception, "unknown kind %s" % path_info[2]
2098
if source_minikind == 'd':
2100
old_path = path = pathjoin(old_dirname, old_basename)
2101
old_dirname_to_file_id[old_path] = file_id
2102
# parent id is the entry for the path in the target tree
2103
if old_dirname == last_source_parent[0]:
2104
source_parent_id = last_source_parent[1]
2107
source_parent_id = old_dirname_to_file_id[old_dirname]
2109
source_parent_entry = state._get_entry(source_index,
2110
path_utf8=old_dirname)
2111
source_parent_id = source_parent_entry[0][2]
2112
if source_parent_id == entry[0][2]:
2113
# This is the root, so the parent is None
2114
source_parent_id = None
2116
last_source_parent[0] = old_dirname
2117
last_source_parent[1] = source_parent_id
2118
new_dirname = entry[0][0]
2119
if new_dirname == last_target_parent[0]:
2120
target_parent_id = last_target_parent[1]
2123
target_parent_id = new_dirname_to_file_id[new_dirname]
2125
# TODO: We don't always need to do the lookup, because the
2126
# parent entry will be the same as the source entry.
2127
target_parent_entry = state._get_entry(target_index,
2128
path_utf8=new_dirname)
2129
if target_parent_entry == (None, None):
2130
raise AssertionError(
2131
"Could not find target parent in wt: %s\nparent of: %s"
2132
% (new_dirname, entry))
2133
target_parent_id = target_parent_entry[0][2]
2134
if target_parent_id == entry[0][2]:
2135
# This is the root, so the parent is None
2136
target_parent_id = None
2138
last_target_parent[0] = new_dirname
2139
last_target_parent[1] = target_parent_id
2141
source_exec = source_details[3]
2142
if (include_unchanged
2144
or source_parent_id != target_parent_id
2145
or old_basename != entry[0][1]
2146
or source_exec != target_exec
2148
if old_path is None:
2149
old_path = path = pathjoin(old_dirname, old_basename)
2150
old_path_u = utf8_decode(old_path)[0]
2153
old_path_u = utf8_decode(old_path)[0]
2154
if old_path == path:
2157
path_u = utf8_decode(path)[0]
2158
source_kind = _minikind_to_kind[source_minikind]
2159
return (entry[0][2],
2160
(old_path_u, path_u),
2163
(source_parent_id, target_parent_id),
2164
(utf8_decode(old_basename)[0], utf8_decode(entry[0][1])[0]),
2165
(source_kind, target_kind),
2166
(source_exec, target_exec))
2168
return uninteresting
2169
elif source_minikind in 'a' and target_minikind in 'fdlt':
2170
# looks like a new file
2171
path = pathjoin(entry[0][0], entry[0][1])
2172
# parent id is the entry for the path in the target tree
2173
# TODO: these are the same for an entire directory: cache em.
2174
parent_id = state._get_entry(target_index,
2175
path_utf8=entry[0][0])[0][2]
2176
if parent_id == entry[0][2]:
2178
if path_info is not None:
2180
if use_filesystem_for_exec:
2181
# We need S_ISREG here, because we aren't sure if this
2184
stat.S_ISREG(path_info[3].st_mode)
2185
and stat.S_IEXEC & path_info[3].st_mode)
2187
target_exec = target_details[3]
2188
return (entry[0][2],
2189
(None, utf8_decode(path)[0]),
2193
(None, utf8_decode(entry[0][1])[0]),
2194
(None, path_info[2]),
2195
(None, target_exec))
2197
# Its a missing file, report it as such.
2198
return (entry[0][2],
2199
(None, utf8_decode(path)[0]),
2203
(None, utf8_decode(entry[0][1])[0]),
2206
elif source_minikind in 'fdlt' and target_minikind in 'a':
2207
# unversioned, possibly, or possibly not deleted: we dont care.
2208
# if its still on disk, *and* theres no other entry at this
2209
# path [we dont know this in this routine at the moment -
2210
# perhaps we should change this - then it would be an unknown.
2211
old_path = pathjoin(entry[0][0], entry[0][1])
2212
# parent id is the entry for the path in the target tree
2213
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
2214
if parent_id == entry[0][2]:
2216
return (entry[0][2],
2217
(utf8_decode(old_path)[0], None),
2221
(utf8_decode(entry[0][1])[0], None),
2222
(_minikind_to_kind[source_minikind], None),
2223
(source_details[3], None))
2224
elif source_minikind in 'fdlt' and target_minikind in 'r':
2225
# a rename; could be a true rename, or a rename inherited from
2226
# a renamed parent. TODO: handle this efficiently. Its not
2227
# common case to rename dirs though, so a correct but slow
2228
# implementation will do.
2229
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
2230
search_specific_files.add(target_details[1])
2231
elif source_minikind in 'ra' and target_minikind in 'ra':
2232
# neither of the selected trees contain this file,
2233
# so skip over it. This is not currently directly tested, but
2234
# is indirectly via test_too_much.TestCommands.test_conflicts.
2237
raise AssertionError("don't know how to compare "
2238
"source_minikind=%r, target_minikind=%r"
2239
% (source_minikind, target_minikind))
2240
## import pdb;pdb.set_trace()
2243
while search_specific_files:
2244
# TODO: the pending list should be lexically sorted? the
2245
# interface doesn't require it.
2246
current_root = search_specific_files.pop()
2247
current_root_unicode = current_root.decode('utf8')
2248
searched_specific_files.add(current_root)
2249
# process the entries for this containing directory: the rest will be
2250
# found by their parents recursively.
2251
root_entries = _entries_for_path(current_root)
2252
root_abspath = self.target.abspath(current_root_unicode)
2254
root_stat = os.lstat(root_abspath)
2256
if e.errno == errno.ENOENT:
2257
# the path does not exist: let _process_entry know that.
2258
root_dir_info = None
2260
# some other random error: hand it up.
2263
root_dir_info = ('', current_root,
2264
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
2266
if root_dir_info[2] == 'directory':
2267
if self.target._directory_is_tree_reference(
2268
current_root.decode('utf8')):
2269
root_dir_info = root_dir_info[:2] + \
2270
('tree-reference',) + root_dir_info[3:]
2272
if not root_entries and not root_dir_info:
2273
# this specified path is not present at all, skip it.
2275
path_handled = False
2276
for entry in root_entries:
2277
result = _process_entry(entry, root_dir_info)
2278
if result is not None:
2280
if result is not uninteresting:
2282
if want_unversioned and not path_handled and root_dir_info:
2283
new_executable = bool(
2284
stat.S_ISREG(root_dir_info[3].st_mode)
2285
and stat.S_IEXEC & root_dir_info[3].st_mode)
2287
(None, current_root_unicode),
2291
(None, splitpath(current_root_unicode)[-1]),
2292
(None, root_dir_info[2]),
2293
(None, new_executable)
2295
initial_key = (current_root, '', '')
2296
block_index, _ = state._find_block_index_from_key(initial_key)
2297
if block_index == 0:
2298
# we have processed the total root already, but because the
2299
# initial key matched it we should skip it here.
2301
if root_dir_info and root_dir_info[2] == 'tree-reference':
2302
current_dir_info = None
2304
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
2306
current_dir_info = dir_iterator.next()
2308
# on win32, python2.4 has e.errno == ERROR_DIRECTORY, but
2309
# python 2.5 has e.errno == EINVAL,
2310
# and e.winerror == ERROR_DIRECTORY
2311
e_winerror = getattr(e, 'winerror', None)
2312
win_errors = (ERROR_DIRECTORY, ERROR_PATH_NOT_FOUND)
2313
# there may be directories in the inventory even though
2314
# this path is not a file on disk: so mark it as end of
2316
if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
2317
current_dir_info = None
2318
elif (sys.platform == 'win32'
2319
and (e.errno in win_errors
2320
or e_winerror in win_errors)):
2321
current_dir_info = None
2325
if current_dir_info[0][0] == '':
2326
# remove .bzr from iteration
2327
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
2328
if current_dir_info[1][bzr_index][0] != '.bzr':
2329
raise AssertionError()
2330
del current_dir_info[1][bzr_index]
2331
# walk until both the directory listing and the versioned metadata
2333
if (block_index < len(state._dirblocks) and
2334
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2335
current_block = state._dirblocks[block_index]
2337
current_block = None
2338
while (current_dir_info is not None or
2339
current_block is not None):
2340
if (current_dir_info and current_block
2341
and current_dir_info[0][0] != current_block[0]):
2342
if cmp_by_dirs(current_dir_info[0][0], current_block[0]) < 0:
2343
# filesystem data refers to paths not covered by the dirblock.
2344
# this has two possibilities:
2345
# A) it is versioned but empty, so there is no block for it
2346
# B) it is not versioned.
2348
# if (A) then we need to recurse into it to check for
2349
# new unknown files or directories.
2350
# if (B) then we should ignore it, because we don't
2351
# recurse into unknown directories.
2353
while path_index < len(current_dir_info[1]):
2354
current_path_info = current_dir_info[1][path_index]
2355
if want_unversioned:
2356
if current_path_info[2] == 'directory':
2357
if self.target._directory_is_tree_reference(
2358
current_path_info[0].decode('utf8')):
2359
current_path_info = current_path_info[:2] + \
2360
('tree-reference',) + current_path_info[3:]
2361
new_executable = bool(
2362
stat.S_ISREG(current_path_info[3].st_mode)
2363
and stat.S_IEXEC & current_path_info[3].st_mode)
2365
(None, utf8_decode(current_path_info[0])[0]),
2369
(None, utf8_decode(current_path_info[1])[0]),
2370
(None, current_path_info[2]),
2371
(None, new_executable))
2372
# dont descend into this unversioned path if it is
2374
if current_path_info[2] in ('directory',
2376
del current_dir_info[1][path_index]
2380
# This dir info has been handled, go to the next
2382
current_dir_info = dir_iterator.next()
2383
except StopIteration:
2384
current_dir_info = None
2386
# We have a dirblock entry for this location, but there
2387
# is no filesystem path for this. This is most likely
2388
# because a directory was removed from the disk.
2389
# We don't have to report the missing directory,
2390
# because that should have already been handled, but we
2391
# need to handle all of the files that are contained
2393
for current_entry in current_block[1]:
2394
# entry referring to file not present on disk.
2395
# advance the entry only, after processing.
2396
result = _process_entry(current_entry, None)
2397
if result is not None:
2398
if result is not uninteresting:
2401
if (block_index < len(state._dirblocks) and
2402
osutils.is_inside(current_root,
2403
state._dirblocks[block_index][0])):
2404
current_block = state._dirblocks[block_index]
2406
current_block = None
2409
if current_block and entry_index < len(current_block[1]):
2410
current_entry = current_block[1][entry_index]
2412
current_entry = None
2413
advance_entry = True
2415
if current_dir_info and path_index < len(current_dir_info[1]):
2416
current_path_info = current_dir_info[1][path_index]
2417
if current_path_info[2] == 'directory':
2418
if self.target._directory_is_tree_reference(
2419
current_path_info[0].decode('utf8')):
2420
current_path_info = current_path_info[:2] + \
2421
('tree-reference',) + current_path_info[3:]
2423
current_path_info = None
2425
path_handled = False
2426
while (current_entry is not None or
2427
current_path_info is not None):
2428
if current_entry is None:
2429
# the check for path_handled when the path is adnvaced
2430
# will yield this path if needed.
2432
elif current_path_info is None:
2433
# no path is fine: the per entry code will handle it.
2434
result = _process_entry(current_entry, current_path_info)
2435
if result is not None:
2436
if result is not uninteresting:
2438
elif (current_entry[0][1] != current_path_info[1]
2439
or current_entry[1][target_index][0] in 'ar'):
2440
# The current path on disk doesn't match the dirblock
2441
# record. Either the dirblock is marked as absent, or
2442
# the file on disk is not present at all in the
2443
# dirblock. Either way, report about the dirblock
2444
# entry, and let other code handle the filesystem one.
2446
# Compare the basename for these files to determine
2448
if current_path_info[1] < current_entry[0][1]:
2449
# extra file on disk: pass for now, but only
2450
# increment the path, not the entry
2451
advance_entry = False
2453
# entry referring to file not present on disk.
2454
# advance the entry only, after processing.
2455
result = _process_entry(current_entry, None)
2456
if result is not None:
2457
if result is not uninteresting:
2459
advance_path = False
2461
result = _process_entry(current_entry, current_path_info)
2462
if result is not None:
2464
if result is not uninteresting:
2466
if advance_entry and current_entry is not None:
2468
if entry_index < len(current_block[1]):
2469
current_entry = current_block[1][entry_index]
2471
current_entry = None
2473
advance_entry = True # reset the advance flaga
2474
if advance_path and current_path_info is not None:
2475
if not path_handled:
2476
# unversioned in all regards
2477
if want_unversioned:
2478
new_executable = bool(
2479
stat.S_ISREG(current_path_info[3].st_mode)
2480
and stat.S_IEXEC & current_path_info[3].st_mode)
2482
relpath_unicode = utf8_decode(current_path_info[0])[0]
2483
except UnicodeDecodeError:
2484
raise errors.BadFilenameEncoding(
2485
current_path_info[0], osutils._fs_enc)
2487
(None, relpath_unicode),
2491
(None, utf8_decode(current_path_info[1])[0]),
2492
(None, current_path_info[2]),
2493
(None, new_executable))
2494
# dont descend into this unversioned path if it is
2496
if current_path_info[2] in ('directory'):
2497
del current_dir_info[1][path_index]
2499
# dont descend the disk iterator into any tree
2501
if current_path_info[2] == 'tree-reference':
2502
del current_dir_info[1][path_index]
2505
if path_index < len(current_dir_info[1]):
2506
current_path_info = current_dir_info[1][path_index]
2507
if current_path_info[2] == 'directory':
2508
if self.target._directory_is_tree_reference(
2509
current_path_info[0].decode('utf8')):
2510
current_path_info = current_path_info[:2] + \
2511
('tree-reference',) + current_path_info[3:]
2513
current_path_info = None
2514
path_handled = False
2516
advance_path = True # reset the advance flagg.
2517
if current_block is not None:
2519
if (block_index < len(state._dirblocks) and
2520
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2521
current_block = state._dirblocks[block_index]
2523
current_block = None
2524
if current_dir_info is not None:
2526
current_dir_info = dir_iterator.next()
2527
except StopIteration:
2528
current_dir_info = None
2257
2531
def is_compatible(source, target):
2258
2532
# the target must be a dirstate working tree
2259
if not isinstance(target, DirStateWorkingTree):
2533
if not isinstance(target, WorkingTree4):
2261
# the source must be a revtree or dirstate rev tree.
2535
# the source must be a revtreee or dirstate rev tree.
2262
2536
if not isinstance(source,
2263
2537
(revisiontree.RevisionTree, DirStateRevisionTree)):
2265
2539
# the source revid must be in the target dirstate
2266
if not (source._revision_id == _mod_revision.NULL_REVISION or
2540
if not (source._revision_id == NULL_REVISION or
2267
2541
source._revision_id in target.get_parent_ids()):
2268
# TODO: what about ghosts? it may well need to
2542
# TODO: what about ghosts? it may well need to
2269
2543
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
