1336
1256
if self._dirty:
1337
1257
raise AssertionError("attempting to write an inventory when the "
1338
1258
"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)
1259
self.current_dirstate().set_state_from_inventory(inv)
1260
self._make_dirty(reset_inventory=False)
1261
if self._inventory is not None:
1350
1262
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,
1266
class WorkingTreeFormat4(WorkingTreeFormat3):
1267
"""The first consolidated dirstate working tree format.
1270
- exists within a metadir controlling .bzr
1271
- includes an explicit version marker for the workingtree control
1272
files, separate from the BzrDir format
1273
- modifies the hash cache format
1274
- is new in bzr 0.15
1275
- uses a LockDir to guard access to it.
1278
upgrade_recommended = False
1280
def get_format_string(self):
1281
"""See WorkingTreeFormat.get_format_string()."""
1282
return "Bazaar Working Tree Format 4 (bzr 0.15)\n"
1284
def get_format_description(self):
1285
"""See WorkingTreeFormat.get_format_description()."""
1286
return "Working tree format 4"
1478
1288
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
1479
1289
accelerator_tree=None, hardlink=False):
1480
1290
"""See WorkingTreeFormat.initialize().
1482
1292
:param revision_id: allows creating a working tree at a different
1483
revision than the branch is at.
1293
revision than the branch is at.
1484
1294
:param accelerator_tree: A tree which can be used for retrieving file
1485
1295
contents more quickly than the revision tree, i.e. a workingtree.
1486
1296
The revision tree will be used for cases where accelerator_tree's
2241
1876
if not found_versioned:
2242
1877
# 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)
1879
all_versioned = False
1881
if not all_versioned:
1882
raise errors.PathsNotVersionedError(specific_files)
2247
1883
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2248
search_specific_files = osutils.minimum_path_selection(specific_files)
1884
search_specific_files = set()
1885
for path in specific_files:
1886
other_specific_files = specific_files.difference(set([path]))
1887
if not osutils.is_inside_any(other_specific_files, path):
1888
# this is a top level path, we must check it.
1889
search_specific_files.add(path)
1891
# compare source_index and target_index at or under each element of search_specific_files.
1892
# follow the following comparison table. Note that we only want to do diff operations when
1893
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1897
# Source | Target | disk | action
1898
# r | fdlt | | add source to search, add id path move and perform
1899
# | | | diff check on source-target
1900
# r | fdlt | a | dangling file that was present in the basis.
1902
# r | a | | add source to search
1904
# r | r | | this path is present in a non-examined tree, skip.
1905
# r | r | a | this path is present in a non-examined tree, skip.
1906
# a | fdlt | | add new id
1907
# a | fdlt | a | dangling locally added file, skip
1908
# a | a | | not present in either tree, skip
1909
# a | a | a | not present in any tree, skip
1910
# a | r | | not present in either tree at this path, skip as it
1911
# | | | may not be selected by the users list of paths.
1912
# a | r | a | not present in either tree at this path, skip as it
1913
# | | | may not be selected by the users list of paths.
1914
# fdlt | fdlt | | content in both: diff them
1915
# fdlt | fdlt | a | deleted locally, but not unversioned - show as deleted ?
1916
# fdlt | a | | unversioned: output deleted id for now
1917
# fdlt | a | a | unversioned and deleted: output deleted id
1918
# fdlt | r | | relocated in this tree, so add target to search.
1919
# | | | Dont diff, we will see an r,fd; pair when we reach
1920
# | | | this id at the other path.
1921
# fdlt | r | a | relocated in this tree, so add target to search.
1922
# | | | Dont diff, we will see an r,fd; pair when we reach
1923
# | | | this id at the other path.
1925
# for all search_indexs in each path at or under each element of
1926
# search_specific_files, if the detail is relocated: add the id, and add the
1927
# relocated path as one to search if its not searched already. If the
1928
# detail is not relocated, add the id.
1929
searched_specific_files = set()
1930
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1931
# Using a list so that we can access the values and change them in
1932
# nested scope. Each one is [path, file_id, entry]
1933
last_source_parent = [None, None]
1934
last_target_parent = [None, None]
2250
1936
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()
1938
# Just a sentry, so that _process_entry can say that this
1939
# record is handled, but isn't interesting to process (unchanged)
1940
uninteresting = object()
1943
old_dirname_to_file_id = {}
1944
new_dirname_to_file_id = {}
1945
# TODO: jam 20070516 - Avoid the _get_entry lookup overhead by
1946
# keeping a cache of directories that we have seen.
1948
def _process_entry(entry, path_info):
1949
"""Compare an entry and real disk to generate delta information.
1951
:param path_info: top_relpath, basename, kind, lstat, abspath for
1952
the path of entry. If None, then the path is considered absent.
1953
(Perhaps we should pass in a concrete entry for this ?)
1954
Basename is returned as a utf8 string because we expect this
1955
tuple will be ignored, and don't want to take the time to
1957
:return: None if these don't match
1958
A tuple of information about the change, or
1959
the object 'uninteresting' if these match, but are
1960
basically identical.
1962
if source_index is None:
1963
source_details = NULL_PARENT_DETAILS
1965
source_details = entry[1][source_index]
1966
target_details = entry[1][target_index]
1967
target_minikind = target_details[0]
1968
if path_info is not None and target_minikind in 'fdlt':
1969
if not (target_index == 0):
1970
raise AssertionError()
1971
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
1972
stat_value=path_info[3])
1973
# The entry may have been modified by update_entry
1974
target_details = entry[1][target_index]
1975
target_minikind = target_details[0]
1978
file_id = entry[0][2]
1979
source_minikind = source_details[0]
1980
if source_minikind in 'fdltr' and target_minikind in 'fdlt':
1981
# claimed content in both: diff
1982
# r | fdlt | | add source to search, add id path move and perform
1983
# | | | diff check on source-target
1984
# r | fdlt | a | dangling file that was present in the basis.
1986
if source_minikind in 'r':
1987
# add the source to the search path to find any children it
1988
# has. TODO ? : only add if it is a container ?
1989
if not osutils.is_inside_any(searched_specific_files,
1991
search_specific_files.add(source_details[1])
1992
# generate the old path; this is needed for stating later
1994
old_path = source_details[1]
1995
old_dirname, old_basename = os.path.split(old_path)
1996
path = pathjoin(entry[0][0], entry[0][1])
1997
old_entry = state._get_entry(source_index,
1999
# update the source details variable to be the real
2001
if old_entry == (None, None):
2002
raise errors.CorruptDirstate(state._filename,
2003
"entry '%s/%s' is considered renamed from %r"
2004
" but source does not exist\n"
2005
"entry: %s" % (entry[0][0], entry[0][1], old_path, entry))
2006
source_details = old_entry[1][source_index]
2007
source_minikind = source_details[0]
2009
old_dirname = entry[0][0]
2010
old_basename = entry[0][1]
2011
old_path = path = None
2012
if path_info is None:
2013
# the file is missing on disk, show as removed.
2014
content_change = True
2018
# source and target are both versioned and disk file is present.
2019
target_kind = path_info[2]
2020
if target_kind == 'directory':
2022
old_path = path = pathjoin(old_dirname, old_basename)
2023
new_dirname_to_file_id[path] = file_id
2024
if source_minikind != 'd':
2025
content_change = True
2027
# directories have no fingerprint
2028
content_change = False
2030
elif target_kind == 'file':
2031
if source_minikind != 'f':
2032
content_change = True
2034
# We could check the size, but we already have the
2036
content_change = (link_or_sha1 != source_details[1])
2037
# Target details is updated at update_entry time
2038
if use_filesystem_for_exec:
2039
# We don't need S_ISREG here, because we are sure
2040
# we are dealing with a file.
2041
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
2043
target_exec = target_details[3]
2044
elif target_kind == 'symlink':
2045
if source_minikind != 'l':
2046
content_change = True
2048
content_change = (link_or_sha1 != source_details[1])
2050
elif target_kind == 'tree-reference':
2051
if source_minikind != 't':
2052
content_change = True
2054
content_change = False
2057
raise Exception, "unknown kind %s" % path_info[2]
2058
if source_minikind == 'd':
2060
old_path = path = pathjoin(old_dirname, old_basename)
2061
old_dirname_to_file_id[old_path] = file_id
2062
# parent id is the entry for the path in the target tree
2063
if old_dirname == last_source_parent[0]:
2064
source_parent_id = last_source_parent[1]
2067
source_parent_id = old_dirname_to_file_id[old_dirname]
2069
source_parent_entry = state._get_entry(source_index,
2070
path_utf8=old_dirname)
2071
source_parent_id = source_parent_entry[0][2]
2072
if source_parent_id == entry[0][2]:
2073
# This is the root, so the parent is None
2074
source_parent_id = None
2076
last_source_parent[0] = old_dirname
2077
last_source_parent[1] = source_parent_id
2078
new_dirname = entry[0][0]
2079
if new_dirname == last_target_parent[0]:
2080
target_parent_id = last_target_parent[1]
2083
target_parent_id = new_dirname_to_file_id[new_dirname]
2085
# TODO: We don't always need to do the lookup, because the
2086
# parent entry will be the same as the source entry.
2087
target_parent_entry = state._get_entry(target_index,
2088
path_utf8=new_dirname)
2089
if target_parent_entry == (None, None):
2090
raise AssertionError(
2091
"Could not find target parent in wt: %s\nparent of: %s"
2092
% (new_dirname, entry))
2093
target_parent_id = target_parent_entry[0][2]
2094
if target_parent_id == entry[0][2]:
2095
# This is the root, so the parent is None
2096
target_parent_id = None
2098
last_target_parent[0] = new_dirname
2099
last_target_parent[1] = target_parent_id
2101
source_exec = source_details[3]
2102
if (include_unchanged
2104
or source_parent_id != target_parent_id
2105
or old_basename != entry[0][1]
2106
or source_exec != target_exec
2108
if old_path is None:
2109
old_path = path = pathjoin(old_dirname, old_basename)
2110
old_path_u = utf8_decode(old_path)[0]
2113
old_path_u = utf8_decode(old_path)[0]
2114
if old_path == path:
2117
path_u = utf8_decode(path)[0]
2118
source_kind = _minikind_to_kind[source_minikind]
2119
return (entry[0][2],
2120
(old_path_u, path_u),
2123
(source_parent_id, target_parent_id),
2124
(utf8_decode(old_basename)[0], utf8_decode(entry[0][1])[0]),
2125
(source_kind, target_kind),
2126
(source_exec, target_exec))
2128
return uninteresting
2129
elif source_minikind in 'a' and target_minikind in 'fdlt':
2130
# looks like a new file
2131
if path_info is not None:
2132
path = pathjoin(entry[0][0], entry[0][1])
2133
# parent id is the entry for the path in the target tree
2134
# TODO: these are the same for an entire directory: cache em.
2135
parent_id = state._get_entry(target_index,
2136
path_utf8=entry[0][0])[0][2]
2137
if parent_id == entry[0][2]:
2139
if use_filesystem_for_exec:
2140
# We need S_ISREG here, because we aren't sure if this
2143
stat.S_ISREG(path_info[3].st_mode)
2144
and stat.S_IEXEC & path_info[3].st_mode)
2146
target_exec = target_details[3]
2147
return (entry[0][2],
2148
(None, utf8_decode(path)[0]),
2152
(None, utf8_decode(entry[0][1])[0]),
2153
(None, path_info[2]),
2154
(None, target_exec))
2156
# but its not on disk: we deliberately treat this as just
2157
# never-present. (Why ?! - RBC 20070224)
2159
elif source_minikind in 'fdlt' and target_minikind in 'a':
2160
# unversioned, possibly, or possibly not deleted: we dont care.
2161
# if its still on disk, *and* theres no other entry at this
2162
# path [we dont know this in this routine at the moment -
2163
# perhaps we should change this - then it would be an unknown.
2164
old_path = pathjoin(entry[0][0], entry[0][1])
2165
# parent id is the entry for the path in the target tree
2166
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
2167
if parent_id == entry[0][2]:
2169
return (entry[0][2],
2170
(utf8_decode(old_path)[0], None),
2174
(utf8_decode(entry[0][1])[0], None),
2175
(_minikind_to_kind[source_minikind], None),
2176
(source_details[3], None))
2177
elif source_minikind in 'fdlt' and target_minikind in 'r':
2178
# a rename; could be a true rename, or a rename inherited from
2179
# a renamed parent. TODO: handle this efficiently. Its not
2180
# common case to rename dirs though, so a correct but slow
2181
# implementation will do.
2182
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
2183
search_specific_files.add(target_details[1])
2184
elif source_minikind in 'ra' and target_minikind in 'ra':
2185
# neither of the selected trees contain this file,
2186
# so skip over it. This is not currently directly tested, but
2187
# is indirectly via test_too_much.TestCommands.test_conflicts.
2190
raise AssertionError("don't know how to compare "
2191
"source_minikind=%r, target_minikind=%r"
2192
% (source_minikind, target_minikind))
2193
## import pdb;pdb.set_trace()
2196
while search_specific_files:
2197
# TODO: the pending list should be lexically sorted? the
2198
# interface doesn't require it.
2199
current_root = search_specific_files.pop()
2200
current_root_unicode = current_root.decode('utf8')
2201
searched_specific_files.add(current_root)
2202
# process the entries for this containing directory: the rest will be
2203
# found by their parents recursively.
2204
root_entries = _entries_for_path(current_root)
2205
root_abspath = self.target.abspath(current_root_unicode)
2207
root_stat = os.lstat(root_abspath)
2209
if e.errno == errno.ENOENT:
2210
# the path does not exist: let _process_entry know that.
2211
root_dir_info = None
2213
# some other random error: hand it up.
2216
root_dir_info = ('', current_root,
2217
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
2219
if root_dir_info[2] == 'directory':
2220
if self.target._directory_is_tree_reference(
2221
current_root.decode('utf8')):
2222
root_dir_info = root_dir_info[:2] + \
2223
('tree-reference',) + root_dir_info[3:]
2225
if not root_entries and not root_dir_info:
2226
# this specified path is not present at all, skip it.
2228
path_handled = False
2229
for entry in root_entries:
2230
result = _process_entry(entry, root_dir_info)
2231
if result is not None:
2233
if result is not uninteresting:
2235
if want_unversioned and not path_handled and root_dir_info:
2236
new_executable = bool(
2237
stat.S_ISREG(root_dir_info[3].st_mode)
2238
and stat.S_IEXEC & root_dir_info[3].st_mode)
2240
(None, current_root_unicode),
2244
(None, splitpath(current_root_unicode)[-1]),
2245
(None, root_dir_info[2]),
2246
(None, new_executable)
2248
initial_key = (current_root, '', '')
2249
block_index, _ = state._find_block_index_from_key(initial_key)
2250
if block_index == 0:
2251
# we have processed the total root already, but because the
2252
# initial key matched it we should skip it here.
2254
if root_dir_info and root_dir_info[2] == 'tree-reference':
2255
current_dir_info = None
2257
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
2259
current_dir_info = dir_iterator.next()
2261
# on win32, python2.4 has e.errno == ERROR_DIRECTORY, but
2262
# python 2.5 has e.errno == EINVAL,
2263
# and e.winerror == ERROR_DIRECTORY
2264
e_winerror = getattr(e, 'winerror', None)
2265
win_errors = (ERROR_DIRECTORY, ERROR_PATH_NOT_FOUND)
2266
# there may be directories in the inventory even though
2267
# this path is not a file on disk: so mark it as end of
2269
if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
2270
current_dir_info = None
2271
elif (sys.platform == 'win32'
2272
and (e.errno in win_errors
2273
or e_winerror in win_errors)):
2274
current_dir_info = None
2278
if current_dir_info[0][0] == '':
2279
# remove .bzr from iteration
2280
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
2281
if current_dir_info[1][bzr_index][0] != '.bzr':
2282
raise AssertionError()
2283
del current_dir_info[1][bzr_index]
2284
# walk until both the directory listing and the versioned metadata
2286
if (block_index < len(state._dirblocks) and
2287
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2288
current_block = state._dirblocks[block_index]
2290
current_block = None
2291
while (current_dir_info is not None or
2292
current_block is not None):
2293
if (current_dir_info and current_block
2294
and current_dir_info[0][0] != current_block[0]):
2295
if cmp_by_dirs(current_dir_info[0][0], current_block[0]) < 0:
2296
# filesystem data refers to paths not covered by the dirblock.
2297
# this has two possibilities:
2298
# A) it is versioned but empty, so there is no block for it
2299
# B) it is not versioned.
2301
# if (A) then we need to recurse into it to check for
2302
# new unknown files or directories.
2303
# if (B) then we should ignore it, because we don't
2304
# recurse into unknown directories.
2306
while path_index < len(current_dir_info[1]):
2307
current_path_info = current_dir_info[1][path_index]
2308
if want_unversioned:
2309
if current_path_info[2] == 'directory':
2310
if self.target._directory_is_tree_reference(
2311
current_path_info[0].decode('utf8')):
2312
current_path_info = current_path_info[:2] + \
2313
('tree-reference',) + current_path_info[3:]
2314
new_executable = bool(
2315
stat.S_ISREG(current_path_info[3].st_mode)
2316
and stat.S_IEXEC & current_path_info[3].st_mode)
2318
(None, utf8_decode(current_path_info[0])[0]),
2322
(None, utf8_decode(current_path_info[1])[0]),
2323
(None, current_path_info[2]),
2324
(None, new_executable))
2325
# dont descend into this unversioned path if it is
2327
if current_path_info[2] in ('directory',
2329
del current_dir_info[1][path_index]
2333
# This dir info has been handled, go to the next
2335
current_dir_info = dir_iterator.next()
2336
except StopIteration:
2337
current_dir_info = None
2339
# We have a dirblock entry for this location, but there
2340
# is no filesystem path for this. This is most likely
2341
# because a directory was removed from the disk.
2342
# We don't have to report the missing directory,
2343
# because that should have already been handled, but we
2344
# need to handle all of the files that are contained
2346
for current_entry in current_block[1]:
2347
# entry referring to file not present on disk.
2348
# advance the entry only, after processing.
2349
result = _process_entry(current_entry, None)
2350
if result is not None:
2351
if result is not uninteresting:
2354
if (block_index < len(state._dirblocks) and
2355
osutils.is_inside(current_root,
2356
state._dirblocks[block_index][0])):
2357
current_block = state._dirblocks[block_index]
2359
current_block = None
2362
if current_block and entry_index < len(current_block[1]):
2363
current_entry = current_block[1][entry_index]
2365
current_entry = None
2366
advance_entry = True
2368
if current_dir_info and path_index < len(current_dir_info[1]):
2369
current_path_info = current_dir_info[1][path_index]
2370
if current_path_info[2] == 'directory':
2371
if self.target._directory_is_tree_reference(
2372
current_path_info[0].decode('utf8')):
2373
current_path_info = current_path_info[:2] + \
2374
('tree-reference',) + current_path_info[3:]
2376
current_path_info = None
2378
path_handled = False
2379
while (current_entry is not None or
2380
current_path_info is not None):
2381
if current_entry is None:
2382
# the check for path_handled when the path is adnvaced
2383
# will yield this path if needed.
2385
elif current_path_info is None:
2386
# no path is fine: the per entry code will handle it.
2387
result = _process_entry(current_entry, current_path_info)
2388
if result is not None:
2389
if result is not uninteresting:
2391
elif (current_entry[0][1] != current_path_info[1]
2392
or current_entry[1][target_index][0] in 'ar'):
2393
# The current path on disk doesn't match the dirblock
2394
# record. Either the dirblock is marked as absent, or
2395
# the file on disk is not present at all in the
2396
# dirblock. Either way, report about the dirblock
2397
# entry, and let other code handle the filesystem one.
2399
# Compare the basename for these files to determine
2401
if current_path_info[1] < current_entry[0][1]:
2402
# extra file on disk: pass for now, but only
2403
# increment the path, not the entry
2404
advance_entry = False
2406
# entry referring to file not present on disk.
2407
# advance the entry only, after processing.
2408
result = _process_entry(current_entry, None)
2409
if result is not None:
2410
if result is not uninteresting:
2412
advance_path = False
2414
result = _process_entry(current_entry, current_path_info)
2415
if result is not None:
2417
if result is not uninteresting:
2419
if advance_entry and current_entry is not None:
2421
if entry_index < len(current_block[1]):
2422
current_entry = current_block[1][entry_index]
2424
current_entry = None
2426
advance_entry = True # reset the advance flaga
2427
if advance_path and current_path_info is not None:
2428
if not path_handled:
2429
# unversioned in all regards
2430
if want_unversioned:
2431
new_executable = bool(
2432
stat.S_ISREG(current_path_info[3].st_mode)
2433
and stat.S_IEXEC & current_path_info[3].st_mode)
2435
(None, utf8_decode(current_path_info[0])[0]),
2439
(None, utf8_decode(current_path_info[1])[0]),
2440
(None, current_path_info[2]),
2441
(None, new_executable))
2442
# dont descend into this unversioned path if it is
2444
if current_path_info[2] in ('directory'):
2445
del current_dir_info[1][path_index]
2447
# dont descend the disk iterator into any tree
2449
if current_path_info[2] == 'tree-reference':
2450
del current_dir_info[1][path_index]
2453
if path_index < len(current_dir_info[1]):
2454
current_path_info = current_dir_info[1][path_index]
2455
if current_path_info[2] == 'directory':
2456
if self.target._directory_is_tree_reference(
2457
current_path_info[0].decode('utf8')):
2458
current_path_info = current_path_info[:2] + \
2459
('tree-reference',) + current_path_info[3:]
2461
current_path_info = None
2462
path_handled = False
2464
advance_path = True # reset the advance flagg.
2465
if current_block is not None:
2467
if (block_index < len(state._dirblocks) and
2468
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2469
current_block = state._dirblocks[block_index]
2471
current_block = None
2472
if current_dir_info is not None:
2474
current_dir_info = dir_iterator.next()
2475
except StopIteration:
2476
current_dir_info = None
2257
2480
def is_compatible(source, target):
2258
2481
# the target must be a dirstate working tree
2259
if not isinstance(target, DirStateWorkingTree):
2482
if not isinstance(target, WorkingTree4):
2261
# the source must be a revtree or dirstate rev tree.
2484
# the source must be a revtreee or dirstate rev tree.
2262
2485
if not isinstance(source,
2263
2486
(revisiontree.RevisionTree, DirStateRevisionTree)):
2265
2488
# the source revid must be in the target dirstate
2266
if not (source._revision_id == _mod_revision.NULL_REVISION or
2489
if not (source._revision_id == NULL_REVISION or
2267
2490
source._revision_id in target.get_parent_ids()):
2268
# TODO: what about ghosts? it may well need to
2491
# TODO: what about ghosts? it may well need to
2269
2492
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
