1286
1225
@needs_tree_write_lock
1287
1226
def _write_inventory(self, inv):
1288
1227
"""Write inventory as the current inventory."""
1290
raise AssertionError("attempting to write an inventory when the "
1291
"dirstate is dirty will lose pending changes")
1292
had_inventory = self._inventory is not None
1293
# Setting self._inventory = None forces the dirstate to regenerate the
1294
# working inventory. We do this because self.inventory may be inv, or
1295
# may have been modified, and either case would prevent a clean delta
1297
self._inventory = None
1299
delta = inv._make_delta(self.inventory)
1301
self.apply_inventory_delta(delta)
1228
assert not self._dirty, ("attempting to write an inventory when the "
1229
"dirstate is dirty will cause data loss")
1230
self.current_dirstate().set_state_from_inventory(inv)
1231
self._make_dirty(reset_inventory=False)
1232
if self._inventory is not None:
1303
1233
self._inventory = inv
1306
@needs_tree_write_lock
1307
def reset_state(self, revision_ids=None):
1308
"""Reset the state of the working tree.
1310
This does a hard-reset to a last-known-good state. This is a way to
1311
fix if something got corrupted (like the .bzr/checkout/dirstate file)
1313
if revision_ids is None:
1314
revision_ids = self.get_parent_ids()
1315
if not revision_ids:
1316
base_tree = self.branch.repository.revision_tree(
1317
_mod_revision.NULL_REVISION)
1320
trees = zip(revision_ids,
1321
self.branch.repository.revision_trees(revision_ids))
1322
base_tree = trees[0][1]
1323
state = self.current_dirstate()
1324
# We don't support ghosts yet
1325
state.set_state_from_scratch(base_tree.inventory, trees, [])
1328
class ContentFilterAwareSHA1Provider(dirstate.SHA1Provider):
1330
def __init__(self, tree):
1333
def sha1(self, abspath):
1334
"""See dirstate.SHA1Provider.sha1()."""
1335
filters = self.tree._content_filter_stack(
1336
self.tree.relpath(osutils.safe_unicode(abspath)))
1337
return _mod_filters.internal_size_sha_file_byname(abspath, filters)[1]
1339
def stat_and_sha1(self, abspath):
1340
"""See dirstate.SHA1Provider.stat_and_sha1()."""
1341
filters = self.tree._content_filter_stack(
1342
self.tree.relpath(osutils.safe_unicode(abspath)))
1343
file_obj = file(abspath, 'rb', 65000)
1345
statvalue = os.fstat(file_obj.fileno())
1347
file_obj = _mod_filters.filtered_input_file(file_obj, filters)
1348
sha1 = osutils.size_sha_file(file_obj)[1]
1351
return statvalue, sha1
1354
class ContentFilteringDirStateWorkingTree(DirStateWorkingTree):
1355
"""Dirstate working tree that supports content filtering.
1357
The dirstate holds the hash and size of the canonical form of the file,
1358
and most methods must return that.
1361
def _file_content_summary(self, path, stat_result):
1362
# This is to support the somewhat obsolete path_content_summary method
1363
# with content filtering: see
1364
# <https://bugs.launchpad.net/bzr/+bug/415508>.
1366
# If the dirstate cache is up to date and knows the hash and size,
1368
# Otherwise if there are no content filters, return the on-disk size
1369
# and leave the hash blank.
1370
# Otherwise, read and filter the on-disk file and use its size and
1373
# The dirstate doesn't store the size of the canonical form so we
1374
# can't trust it for content-filtered trees. We just return None.
1375
dirstate_sha1 = self._dirstate.sha1_from_stat(path, stat_result)
1376
executable = self._is_executable_from_path_and_stat(path, stat_result)
1377
return ('file', None, executable, dirstate_sha1)
1380
class WorkingTree4(DirStateWorkingTree):
1381
"""This is the Format 4 working tree.
1383
This differs from WorkingTree by:
1384
- Having a consolidated internal dirstate, stored in a
1385
randomly-accessible sorted file on disk.
1386
- Not having a regular inventory attribute. One can be synthesized
1387
on demand but this is expensive and should be avoided.
1389
This is new in bzr 0.15.
1393
class WorkingTree5(ContentFilteringDirStateWorkingTree):
1394
"""This is the Format 5 working tree.
1396
This differs from WorkingTree4 by:
1397
- Supporting content filtering.
1399
This is new in bzr 1.11.
1403
class WorkingTree6(ContentFilteringDirStateWorkingTree):
1404
"""This is the Format 6 working tree.
1406
This differs from WorkingTree5 by:
1407
- Supporting a current view that may mask the set of files in a tree
1408
impacted by most user operations.
1410
This is new in bzr 1.14.
1413
def _make_views(self):
1414
return views.PathBasedViews(self)
1417
class DirStateWorkingTreeFormat(WorkingTreeFormat):
1419
missing_parent_conflicts = True
1421
_lock_class = LockDir
1422
_lock_file_name = 'lock'
1424
def _open_control_files(self, a_bzrdir):
1425
transport = a_bzrdir.get_workingtree_transport(None)
1426
return LockableFiles(transport, self._lock_file_name,
1429
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
1430
accelerator_tree=None, hardlink=False):
1237
class WorkingTreeFormat4(WorkingTreeFormat3):
1238
"""The first consolidated dirstate working tree format.
1241
- exists within a metadir controlling .bzr
1242
- includes an explicit version marker for the workingtree control
1243
files, separate from the BzrDir format
1244
- modifies the hash cache format
1245
- is new in bzr 0.15
1246
- uses a LockDir to guard access to it.
1249
upgrade_recommended = False
1251
def get_format_string(self):
1252
"""See WorkingTreeFormat.get_format_string()."""
1253
return "Bazaar Working Tree Format 4 (bzr 0.15)\n"
1255
def get_format_description(self):
1256
"""See WorkingTreeFormat.get_format_description()."""
1257
return "Working tree format 4"
1259
def initialize(self, a_bzrdir, revision_id=None, from_branch=None):
1431
1260
"""See WorkingTreeFormat.initialize().
1433
1262
:param revision_id: allows creating a working tree at a different
1434
1263
revision than the branch is at.
1435
:param accelerator_tree: A tree which can be used for retrieving file
1436
contents more quickly than the revision tree, i.e. a workingtree.
1437
The revision tree will be used for cases where accelerator_tree's
1438
content is different.
1439
:param hardlink: If true, hard-link files from accelerator_tree,
1442
1265
These trees get an initial random root id, if their repository supports
1443
1266
rich root data, TREE_ROOT otherwise.
2157
1811
if not found_versioned:
2158
1812
# none of the indexes was not 'absent' at all ids for this
2160
not_versioned.append(path)
2161
if len(not_versioned) > 0:
2162
raise errors.PathsNotVersionedError(not_versioned)
1814
all_versioned = False
1816
if not all_versioned:
1817
raise errors.PathsNotVersionedError(specific_files)
2163
1818
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2164
search_specific_files = osutils.minimum_path_selection(specific_files)
1819
search_specific_files = set()
1820
for path in specific_files:
1821
other_specific_files = specific_files.difference(set([path]))
1822
if not osutils.is_inside_any(other_specific_files, path):
1823
# this is a top level path, we must check it.
1824
search_specific_files.add(path)
1826
# compare source_index and target_index at or under each element of search_specific_files.
1827
# follow the following comparison table. Note that we only want to do diff operations when
1828
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1832
# Source | Target | disk | action
1833
# r | fdlt | | add source to search, add id path move and perform
1834
# | | | diff check on source-target
1835
# r | fdlt | a | dangling file that was present in the basis.
1837
# r | a | | add source to search
1839
# r | r | | this path is present in a non-examined tree, skip.
1840
# r | r | a | this path is present in a non-examined tree, skip.
1841
# a | fdlt | | add new id
1842
# a | fdlt | a | dangling locally added file, skip
1843
# a | a | | not present in either tree, skip
1844
# a | a | a | not present in any tree, skip
1845
# a | r | | not present in either tree at this path, skip as it
1846
# | | | may not be selected by the users list of paths.
1847
# a | r | a | not present in either tree at this path, skip as it
1848
# | | | may not be selected by the users list of paths.
1849
# fdlt | fdlt | | content in both: diff them
1850
# fdlt | fdlt | a | deleted locally, but not unversioned - show as deleted ?
1851
# fdlt | a | | unversioned: output deleted id for now
1852
# fdlt | a | a | unversioned and deleted: output deleted id
1853
# fdlt | r | | relocated in this tree, so add target to search.
1854
# | | | Dont diff, we will see an r,fd; pair when we reach
1855
# | | | this id at the other path.
1856
# fdlt | r | a | relocated in this tree, so add target to search.
1857
# | | | Dont diff, we will see an r,fd; pair when we reach
1858
# | | | this id at the other path.
1860
# for all search_indexs in each path at or under each element of
1861
# search_specific_files, if the detail is relocated: add the id, and add the
1862
# relocated path as one to search if its not searched already. If the
1863
# detail is not relocated, add the id.
1864
searched_specific_files = set()
1865
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1866
# Using a list so that we can access the values and change them in
1867
# nested scope. Each one is [path, file_id, entry]
1868
last_source_parent = [None, None]
1869
last_target_parent = [None, None]
2166
1871
use_filesystem_for_exec = (sys.platform != 'win32')
2167
iter_changes = self.target._iter_changes(include_unchanged,
2168
use_filesystem_for_exec, search_specific_files, state,
2169
source_index, target_index, want_unversioned, self.target)
2170
return iter_changes.iter_changes()
1873
# Just a sentry, so that _process_entry can say that this
1874
# record is handled, but isn't interesting to process (unchanged)
1875
uninteresting = object()
1878
old_dirname_to_file_id = {}
1879
new_dirname_to_file_id = {}
1880
# TODO: jam 20070516 - Avoid the _get_entry lookup overhead by
1881
# keeping a cache of directories that we have seen.
1883
def _process_entry(entry, path_info):
1884
"""Compare an entry and real disk to generate delta information.
1886
:param path_info: top_relpath, basename, kind, lstat, abspath for
1887
the path of entry. If None, then the path is considered absent.
1888
(Perhaps we should pass in a concrete entry for this ?)
1889
Basename is returned as a utf8 string because we expect this
1890
tuple will be ignored, and don't want to take the time to
1892
:return: None if these don't match
1893
A tuple of information about the change, or
1894
the object 'uninteresting' if these match, but are
1895
basically identical.
1897
if source_index is None:
1898
source_details = NULL_PARENT_DETAILS
1900
source_details = entry[1][source_index]
1901
target_details = entry[1][target_index]
1902
target_minikind = target_details[0]
1903
if path_info is not None and target_minikind in 'fdlt':
1904
assert target_index == 0
1905
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
1906
stat_value=path_info[3])
1907
# The entry may have been modified by update_entry
1908
target_details = entry[1][target_index]
1909
target_minikind = target_details[0]
1912
file_id = entry[0][2]
1913
source_minikind = source_details[0]
1914
if source_minikind in 'fdltr' and target_minikind in 'fdlt':
1915
# claimed content in both: diff
1916
# r | fdlt | | add source to search, add id path move and perform
1917
# | | | diff check on source-target
1918
# r | fdlt | a | dangling file that was present in the basis.
1920
if source_minikind in 'r':
1921
# add the source to the search path to find any children it
1922
# has. TODO ? : only add if it is a container ?
1923
if not osutils.is_inside_any(searched_specific_files,
1925
search_specific_files.add(source_details[1])
1926
# generate the old path; this is needed for stating later
1928
old_path = source_details[1]
1929
old_dirname, old_basename = os.path.split(old_path)
1930
path = pathjoin(entry[0][0], entry[0][1])
1931
old_entry = state._get_entry(source_index,
1933
# update the source details variable to be the real
1935
source_details = old_entry[1][source_index]
1936
source_minikind = source_details[0]
1938
old_dirname = entry[0][0]
1939
old_basename = entry[0][1]
1940
old_path = path = None
1941
if path_info is None:
1942
# the file is missing on disk, show as removed.
1943
content_change = True
1947
# source and target are both versioned and disk file is present.
1948
target_kind = path_info[2]
1949
if target_kind == 'directory':
1951
old_path = path = pathjoin(old_dirname, old_basename)
1952
new_dirname_to_file_id[path] = file_id
1953
if source_minikind != 'd':
1954
content_change = True
1956
# directories have no fingerprint
1957
content_change = False
1959
elif target_kind == 'file':
1960
if source_minikind != 'f':
1961
content_change = True
1963
# We could check the size, but we already have the
1965
content_change = (link_or_sha1 != source_details[1])
1966
# Target details is updated at update_entry time
1967
if use_filesystem_for_exec:
1968
# We don't need S_ISREG here, because we are sure
1969
# we are dealing with a file.
1970
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
1972
target_exec = target_details[3]
1973
elif target_kind == 'symlink':
1974
if source_minikind != 'l':
1975
content_change = True
1977
content_change = (link_or_sha1 != source_details[1])
1979
elif target_kind == 'tree-reference':
1980
if source_minikind != 't':
1981
content_change = True
1983
content_change = False
1986
raise Exception, "unknown kind %s" % path_info[2]
1987
if source_minikind == 'd':
1989
old_path = path = pathjoin(old_dirname, old_basename)
1990
old_dirname_to_file_id[old_path] = file_id
1991
# parent id is the entry for the path in the target tree
1992
if old_dirname == last_source_parent[0]:
1993
source_parent_id = last_source_parent[1]
1996
source_parent_id = old_dirname_to_file_id[old_dirname]
1998
source_parent_entry = state._get_entry(source_index,
1999
path_utf8=old_dirname)
2000
source_parent_id = source_parent_entry[0][2]
2001
if source_parent_id == entry[0][2]:
2002
# This is the root, so the parent is None
2003
source_parent_id = None
2005
last_source_parent[0] = old_dirname
2006
last_source_parent[1] = source_parent_id
2007
new_dirname = entry[0][0]
2008
if new_dirname == last_target_parent[0]:
2009
target_parent_id = last_target_parent[1]
2012
target_parent_id = new_dirname_to_file_id[new_dirname]
2014
# TODO: We don't always need to do the lookup, because the
2015
# parent entry will be the same as the source entry.
2016
target_parent_entry = state._get_entry(target_index,
2017
path_utf8=new_dirname)
2018
assert target_parent_entry != (None, None), (
2019
"Could not find target parent in wt: %s\nparent of: %s"
2020
% (new_dirname, entry))
2021
target_parent_id = target_parent_entry[0][2]
2022
if target_parent_id == entry[0][2]:
2023
# This is the root, so the parent is None
2024
target_parent_id = None
2026
last_target_parent[0] = new_dirname
2027
last_target_parent[1] = target_parent_id
2029
source_exec = source_details[3]
2030
if (include_unchanged
2032
or source_parent_id != target_parent_id
2033
or old_basename != entry[0][1]
2034
or source_exec != target_exec
2036
if old_path is None:
2037
old_path = path = pathjoin(old_dirname, old_basename)
2038
old_path_u = utf8_decode(old_path)[0]
2041
old_path_u = utf8_decode(old_path)[0]
2042
if old_path == path:
2045
path_u = utf8_decode(path)[0]
2046
source_kind = _minikind_to_kind[source_minikind]
2047
return (entry[0][2],
2048
(old_path_u, path_u),
2051
(source_parent_id, target_parent_id),
2052
(utf8_decode(old_basename)[0], utf8_decode(entry[0][1])[0]),
2053
(source_kind, target_kind),
2054
(source_exec, target_exec))
2056
return uninteresting
2057
elif source_minikind in 'a' and target_minikind in 'fdlt':
2058
# looks like a new file
2059
if path_info is not None:
2060
path = pathjoin(entry[0][0], entry[0][1])
2061
# parent id is the entry for the path in the target tree
2062
# TODO: these are the same for an entire directory: cache em.
2063
parent_id = state._get_entry(target_index,
2064
path_utf8=entry[0][0])[0][2]
2065
if parent_id == entry[0][2]:
2067
if use_filesystem_for_exec:
2068
# We need S_ISREG here, because we aren't sure if this
2071
stat.S_ISREG(path_info[3].st_mode)
2072
and stat.S_IEXEC & path_info[3].st_mode)
2074
target_exec = target_details[3]
2075
return (entry[0][2],
2076
(None, utf8_decode(path)[0]),
2080
(None, utf8_decode(entry[0][1])[0]),
2081
(None, path_info[2]),
2082
(None, target_exec))
2084
# but its not on disk: we deliberately treat this as just
2085
# never-present. (Why ?! - RBC 20070224)
2087
elif source_minikind in 'fdlt' and target_minikind in 'a':
2088
# unversioned, possibly, or possibly not deleted: we dont care.
2089
# if its still on disk, *and* theres no other entry at this
2090
# path [we dont know this in this routine at the moment -
2091
# perhaps we should change this - then it would be an unknown.
2092
old_path = pathjoin(entry[0][0], entry[0][1])
2093
# parent id is the entry for the path in the target tree
2094
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
2095
if parent_id == entry[0][2]:
2097
return (entry[0][2],
2098
(utf8_decode(old_path)[0], None),
2102
(utf8_decode(entry[0][1])[0], None),
2103
(_minikind_to_kind[source_minikind], None),
2104
(source_details[3], None))
2105
elif source_minikind in 'fdlt' and target_minikind in 'r':
2106
# a rename; could be a true rename, or a rename inherited from
2107
# a renamed parent. TODO: handle this efficiently. Its not
2108
# common case to rename dirs though, so a correct but slow
2109
# implementation will do.
2110
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
2111
search_specific_files.add(target_details[1])
2112
elif source_minikind in 'ra' and target_minikind in 'ra':
2113
# neither of the selected trees contain this file,
2114
# so skip over it. This is not currently directly tested, but
2115
# is indirectly via test_too_much.TestCommands.test_conflicts.
2118
raise AssertionError("don't know how to compare "
2119
"source_minikind=%r, target_minikind=%r"
2120
% (source_minikind, target_minikind))
2121
## import pdb;pdb.set_trace()
2124
while search_specific_files:
2125
# TODO: the pending list should be lexically sorted? the
2126
# interface doesn't require it.
2127
current_root = search_specific_files.pop()
2128
current_root_unicode = current_root.decode('utf8')
2129
searched_specific_files.add(current_root)
2130
# process the entries for this containing directory: the rest will be
2131
# found by their parents recursively.
2132
root_entries = _entries_for_path(current_root)
2133
root_abspath = self.target.abspath(current_root_unicode)
2135
root_stat = os.lstat(root_abspath)
2137
if e.errno == errno.ENOENT:
2138
# the path does not exist: let _process_entry know that.
2139
root_dir_info = None
2141
# some other random error: hand it up.
2144
root_dir_info = ('', current_root,
2145
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
2147
if root_dir_info[2] == 'directory':
2148
if self.target._directory_is_tree_reference(
2149
current_root.decode('utf8')):
2150
root_dir_info = root_dir_info[:2] + \
2151
('tree-reference',) + root_dir_info[3:]
2153
if not root_entries and not root_dir_info:
2154
# this specified path is not present at all, skip it.
2156
path_handled = False
2157
for entry in root_entries:
2158
result = _process_entry(entry, root_dir_info)
2159
if result is not None:
2161
if result is not uninteresting:
2163
if want_unversioned and not path_handled and root_dir_info:
2164
new_executable = bool(
2165
stat.S_ISREG(root_dir_info[3].st_mode)
2166
and stat.S_IEXEC & root_dir_info[3].st_mode)
2168
(None, current_root_unicode),
2172
(None, splitpath(current_root_unicode)[-1]),
2173
(None, root_dir_info[2]),
2174
(None, new_executable)
2176
initial_key = (current_root, '', '')
2177
block_index, _ = state._find_block_index_from_key(initial_key)
2178
if block_index == 0:
2179
# we have processed the total root already, but because the
2180
# initial key matched it we should skip it here.
2182
if root_dir_info and root_dir_info[2] == 'tree-reference':
2183
current_dir_info = None
2185
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
2187
current_dir_info = dir_iterator.next()
2189
# on win32, python2.4 has e.errno == ERROR_DIRECTORY, but
2190
# python 2.5 has e.errno == EINVAL,
2191
# and e.winerror == ERROR_DIRECTORY
2192
e_winerror = getattr(e, 'winerror', None)
2193
win_errors = (ERROR_DIRECTORY, ERROR_PATH_NOT_FOUND)
2194
# there may be directories in the inventory even though
2195
# this path is not a file on disk: so mark it as end of
2197
if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
2198
current_dir_info = None
2199
elif (sys.platform == 'win32'
2200
and (e.errno in win_errors
2201
or e_winerror in win_errors)):
2202
current_dir_info = None
2206
if current_dir_info[0][0] == '':
2207
# remove .bzr from iteration
2208
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
2209
assert current_dir_info[1][bzr_index][0] == '.bzr'
2210
del current_dir_info[1][bzr_index]
2211
# walk until both the directory listing and the versioned metadata
2213
if (block_index < len(state._dirblocks) and
2214
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2215
current_block = state._dirblocks[block_index]
2217
current_block = None
2218
while (current_dir_info is not None or
2219
current_block is not None):
2220
if (current_dir_info and current_block
2221
and current_dir_info[0][0] != current_block[0]):
2222
if cmp_by_dirs(current_dir_info[0][0], current_block[0]) < 0:
2223
# filesystem data refers to paths not covered by the dirblock.
2224
# this has two possibilities:
2225
# A) it is versioned but empty, so there is no block for it
2226
# B) it is not versioned.
2228
# if (A) then we need to recurse into it to check for
2229
# new unknown files or directories.
2230
# if (B) then we should ignore it, because we don't
2231
# recurse into unknown directories.
2233
while path_index < len(current_dir_info[1]):
2234
current_path_info = current_dir_info[1][path_index]
2235
if want_unversioned:
2236
if current_path_info[2] == 'directory':
2237
if self.target._directory_is_tree_reference(
2238
current_path_info[0].decode('utf8')):
2239
current_path_info = current_path_info[:2] + \
2240
('tree-reference',) + current_path_info[3:]
2241
new_executable = bool(
2242
stat.S_ISREG(current_path_info[3].st_mode)
2243
and stat.S_IEXEC & current_path_info[3].st_mode)
2245
(None, utf8_decode(current_path_info[0])[0]),
2249
(None, utf8_decode(current_path_info[1])[0]),
2250
(None, current_path_info[2]),
2251
(None, new_executable))
2252
# dont descend into this unversioned path if it is
2254
if current_path_info[2] in ('directory',
2256
del current_dir_info[1][path_index]
2260
# This dir info has been handled, go to the next
2262
current_dir_info = dir_iterator.next()
2263
except StopIteration:
2264
current_dir_info = None
2266
# We have a dirblock entry for this location, but there
2267
# is no filesystem path for this. This is most likely
2268
# because a directory was removed from the disk.
2269
# We don't have to report the missing directory,
2270
# because that should have already been handled, but we
2271
# need to handle all of the files that are contained
2273
for current_entry in current_block[1]:
2274
# entry referring to file not present on disk.
2275
# advance the entry only, after processing.
2276
result = _process_entry(current_entry, None)
2277
if result is not None:
2278
if result is not uninteresting:
2281
if (block_index < len(state._dirblocks) and
2282
osutils.is_inside(current_root,
2283
state._dirblocks[block_index][0])):
2284
current_block = state._dirblocks[block_index]
2286
current_block = None
2289
if current_block and entry_index < len(current_block[1]):
2290
current_entry = current_block[1][entry_index]
2292
current_entry = None
2293
advance_entry = True
2295
if current_dir_info and path_index < len(current_dir_info[1]):
2296
current_path_info = current_dir_info[1][path_index]
2297
if current_path_info[2] == 'directory':
2298
if self.target._directory_is_tree_reference(
2299
current_path_info[0].decode('utf8')):
2300
current_path_info = current_path_info[:2] + \
2301
('tree-reference',) + current_path_info[3:]
2303
current_path_info = None
2305
path_handled = False
2306
while (current_entry is not None or
2307
current_path_info is not None):
2308
if current_entry is None:
2309
# the check for path_handled when the path is adnvaced
2310
# will yield this path if needed.
2312
elif current_path_info is None:
2313
# no path is fine: the per entry code will handle it.
2314
result = _process_entry(current_entry, current_path_info)
2315
if result is not None:
2316
if result is not uninteresting:
2318
elif (current_entry[0][1] != current_path_info[1]
2319
or current_entry[1][target_index][0] in 'ar'):
2320
# The current path on disk doesn't match the dirblock
2321
# record. Either the dirblock is marked as absent, or
2322
# the file on disk is not present at all in the
2323
# dirblock. Either way, report about the dirblock
2324
# entry, and let other code handle the filesystem one.
2326
# Compare the basename for these files to determine
2328
if current_path_info[1] < current_entry[0][1]:
2329
# extra file on disk: pass for now, but only
2330
# increment the path, not the entry
2331
advance_entry = False
2333
# entry referring to file not present on disk.
2334
# advance the entry only, after processing.
2335
result = _process_entry(current_entry, None)
2336
if result is not None:
2337
if result is not uninteresting:
2339
advance_path = False
2341
result = _process_entry(current_entry, current_path_info)
2342
if result is not None:
2344
if result is not uninteresting:
2346
if advance_entry and current_entry is not None:
2348
if entry_index < len(current_block[1]):
2349
current_entry = current_block[1][entry_index]
2351
current_entry = None
2353
advance_entry = True # reset the advance flaga
2354
if advance_path and current_path_info is not None:
2355
if not path_handled:
2356
# unversioned in all regards
2357
if want_unversioned:
2358
new_executable = bool(
2359
stat.S_ISREG(current_path_info[3].st_mode)
2360
and stat.S_IEXEC & current_path_info[3].st_mode)
2362
(None, utf8_decode(current_path_info[0])[0]),
2366
(None, utf8_decode(current_path_info[1])[0]),
2367
(None, current_path_info[2]),
2368
(None, new_executable))
2369
# dont descend into this unversioned path if it is
2371
if current_path_info[2] in ('directory'):
2372
del current_dir_info[1][path_index]
2374
# dont descend the disk iterator into any tree
2376
if current_path_info[2] == 'tree-reference':
2377
del current_dir_info[1][path_index]
2380
if path_index < len(current_dir_info[1]):
2381
current_path_info = current_dir_info[1][path_index]
2382
if current_path_info[2] == 'directory':
2383
if self.target._directory_is_tree_reference(
2384
current_path_info[0].decode('utf8')):
2385
current_path_info = current_path_info[:2] + \
2386
('tree-reference',) + current_path_info[3:]
2388
current_path_info = None
2389
path_handled = False
2391
advance_path = True # reset the advance flagg.
2392
if current_block is not None:
2394
if (block_index < len(state._dirblocks) and
2395
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2396
current_block = state._dirblocks[block_index]
2398
current_block = None
2399
if current_dir_info is not None:
2401
current_dir_info = dir_iterator.next()
2402
except StopIteration:
2403
current_dir_info = None
2173
2407
def is_compatible(source, target):
2174
2408
# the target must be a dirstate working tree
2175
if not isinstance(target, DirStateWorkingTree):
2409
if not isinstance(target, WorkingTree4):
2177
# the source must be a revtree or dirstate rev tree.
2411
# the source must be a revtreee or dirstate rev tree.
2178
2412
if not isinstance(source,
2179
2413
(revisiontree.RevisionTree, DirStateRevisionTree)):
2181
2415
# the source revid must be in the target dirstate
2182
if not (source._revision_id == _mod_revision.NULL_REVISION or
2416
if not (source._revision_id == NULL_REVISION or
2183
2417
source._revision_id in target.get_parent_ids()):
2184
# TODO: what about ghosts? it may well need to
2418
# TODO: what about ghosts? it may well need to
2185
2419
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
