1275
1228
@needs_tree_write_lock
1276
1229
def _write_inventory(self, inv):
1277
1230
"""Write inventory as the current inventory."""
1279
raise AssertionError("attempting to write an inventory when the "
1280
"dirstate is dirty will lose pending changes")
1281
had_inventory = self._inventory is not None
1282
# Setting self._inventory = None forces the dirstate to regenerate the
1283
# working inventory. We do this because self.inventory may be inv, or
1284
# may have been modified, and either case would prevent a clean delta
1286
self._inventory = None
1288
delta = inv._make_delta(self.inventory)
1290
self.apply_inventory_delta(delta)
1231
assert not self._dirty, "attempting to write an inventory when the dirstate is dirty will cause data loss"
1232
self.current_dirstate().set_state_from_inventory(inv)
1233
self._make_dirty(reset_inventory=False)
1234
if self._inventory is not None:
1292
1235
self._inventory = inv
1296
class ContentFilterAwareSHA1Provider(dirstate.SHA1Provider):
1298
def __init__(self, tree):
1301
def sha1(self, abspath):
1302
"""See dirstate.SHA1Provider.sha1()."""
1303
filters = self.tree._content_filter_stack(
1304
self.tree.relpath(osutils.safe_unicode(abspath)))
1305
return internal_size_sha_file_byname(abspath, filters)[1]
1307
def stat_and_sha1(self, abspath):
1308
"""See dirstate.SHA1Provider.stat_and_sha1()."""
1309
filters = self.tree._content_filter_stack(
1310
self.tree.relpath(osutils.safe_unicode(abspath)))
1311
file_obj = file(abspath, 'rb', 65000)
1313
statvalue = os.fstat(file_obj.fileno())
1315
file_obj = filtered_input_file(file_obj, filters)
1316
sha1 = osutils.size_sha_file(file_obj)[1]
1319
return statvalue, sha1
1322
class ContentFilteringDirStateWorkingTree(DirStateWorkingTree):
1323
"""Dirstate working tree that supports content filtering.
1325
The dirstate holds the hash and size of the canonical form of the file,
1326
and most methods must return that.
1329
def _file_content_summary(self, path, stat_result):
1330
# This is to support the somewhat obsolete path_content_summary method
1331
# with content filtering: see
1332
# <https://bugs.edge.launchpad.net/bzr/+bug/415508>.
1334
# If the dirstate cache is up to date and knows the hash and size,
1336
# Otherwise if there are no content filters, return the on-disk size
1337
# and leave the hash blank.
1338
# Otherwise, read and filter the on-disk file and use its size and
1341
# The dirstate doesn't store the size of the canonical form so we
1342
# can't trust it for content-filtered trees. We just return None.
1343
dirstate_sha1 = self._dirstate.sha1_from_stat(path, stat_result)
1344
executable = self._is_executable_from_path_and_stat(path, stat_result)
1345
return ('file', None, executable, dirstate_sha1)
1348
class WorkingTree4(DirStateWorkingTree):
1349
"""This is the Format 4 working tree.
1351
This differs from WorkingTree3 by:
1352
- Having a consolidated internal dirstate, stored in a
1353
randomly-accessible sorted file on disk.
1354
- Not having a regular inventory attribute. One can be synthesized
1355
on demand but this is expensive and should be avoided.
1357
This is new in bzr 0.15.
1361
class WorkingTree5(ContentFilteringDirStateWorkingTree):
1362
"""This is the Format 5 working tree.
1364
This differs from WorkingTree4 by:
1365
- Supporting content filtering.
1367
This is new in bzr 1.11.
1371
class WorkingTree6(ContentFilteringDirStateWorkingTree):
1372
"""This is the Format 6 working tree.
1374
This differs from WorkingTree5 by:
1375
- Supporting a current view that may mask the set of files in a tree
1376
impacted by most user operations.
1378
This is new in bzr 1.14.
1381
def _make_views(self):
1382
return views.PathBasedViews(self)
1385
class DirStateWorkingTreeFormat(WorkingTreeFormat3):
1387
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
1388
accelerator_tree=None, hardlink=False):
1239
class WorkingTreeFormat4(WorkingTreeFormat3):
1240
"""The first consolidated dirstate working tree format.
1243
- exists within a metadir controlling .bzr
1244
- includes an explicit version marker for the workingtree control
1245
files, separate from the BzrDir format
1246
- modifies the hash cache format
1247
- is new in bzr 0.15
1248
- uses a LockDir to guard access to it.
1251
upgrade_recommended = False
1253
def get_format_string(self):
1254
"""See WorkingTreeFormat.get_format_string()."""
1255
return "Bazaar Working Tree Format 4 (bzr 0.15)\n"
1257
def get_format_description(self):
1258
"""See WorkingTreeFormat.get_format_description()."""
1259
return "Working tree format 4"
1261
def initialize(self, a_bzrdir, revision_id=None):
1389
1262
"""See WorkingTreeFormat.initialize().
1391
1264
:param revision_id: allows creating a working tree at a different
1392
1265
revision than the branch is at.
1393
:param accelerator_tree: A tree which can be used for retrieving file
1394
contents more quickly than the revision tree, i.e. a workingtree.
1395
The revision tree will be used for cases where accelerator_tree's
1396
content is different.
1397
:param hardlink: If true, hard-link files from accelerator_tree,
1400
1267
These trees get an initial random root id, if their repository supports
1401
1268
rich root data, TREE_ROOT otherwise.
1270
revision_id = osutils.safe_revision_id(revision_id)
1403
1271
if not isinstance(a_bzrdir.transport, LocalTransport):
1404
1272
raise errors.NotLocalUrl(a_bzrdir.transport.base)
1405
1273
transport = a_bzrdir.get_workingtree_transport(self)
1406
1274
control_files = self._open_control_files(a_bzrdir)
1407
1275
control_files.create_lock()
1408
1276
control_files.lock_write()
1409
transport.put_bytes('format', self.get_format_string(),
1410
mode=a_bzrdir._get_file_mode())
1411
if from_branch is not None:
1412
branch = from_branch
1414
branch = a_bzrdir.open_branch()
1277
control_files.put_utf8('format', self.get_format_string())
1278
branch = a_bzrdir.open_branch()
1415
1279
if revision_id is None:
1416
1280
revision_id = branch.last_revision()
1417
1281
local_path = transport.local_abspath('dirstate')
2099
1785
if not found_versioned:
2100
1786
# none of the indexes was not 'absent' at all ids for this
2102
not_versioned.append(path)
2103
if len(not_versioned) > 0:
2104
raise errors.PathsNotVersionedError(not_versioned)
1788
all_versioned = False
1790
if not all_versioned:
1791
raise errors.PathsNotVersionedError(specific_files)
2105
1792
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2106
search_specific_files = osutils.minimum_path_selection(specific_files)
1793
search_specific_files = set()
1794
for path in specific_files:
1795
other_specific_files = specific_files.difference(set([path]))
1796
if not osutils.is_inside_any(other_specific_files, path):
1797
# this is a top level path, we must check it.
1798
search_specific_files.add(path)
1800
# compare source_index and target_index at or under each element of search_specific_files.
1801
# follow the following comparison table. Note that we only want to do diff operations when
1802
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1806
# Source | Target | disk | action
1807
# r | fdlt | | add source to search, add id path move and perform
1808
# | | | diff check on source-target
1809
# r | fdlt | a | dangling file that was present in the basis.
1811
# r | a | | add source to search
1813
# r | r | | this path is present in a non-examined tree, skip.
1814
# r | r | a | this path is present in a non-examined tree, skip.
1815
# a | fdlt | | add new id
1816
# a | fdlt | a | dangling locally added file, skip
1817
# a | a | | not present in either tree, skip
1818
# a | a | a | not present in any tree, skip
1819
# a | r | | not present in either tree at this path, skip as it
1820
# | | | may not be selected by the users list of paths.
1821
# a | r | a | not present in either tree at this path, skip as it
1822
# | | | may not be selected by the users list of paths.
1823
# fdlt | fdlt | | content in both: diff them
1824
# fdlt | fdlt | a | deleted locally, but not unversioned - show as deleted ?
1825
# fdlt | a | | unversioned: output deleted id for now
1826
# fdlt | a | a | unversioned and deleted: output deleted id
1827
# fdlt | r | | relocated in this tree, so add target to search.
1828
# | | | Dont diff, we will see an r,fd; pair when we reach
1829
# | | | this id at the other path.
1830
# fdlt | r | a | relocated in this tree, so add target to search.
1831
# | | | Dont diff, we will see an r,fd; pair when we reach
1832
# | | | this id at the other path.
1834
# for all search_indexs in each path at or under each element of
1835
# search_specific_files, if the detail is relocated: add the id, and add the
1836
# relocated path as one to search if its not searched already. If the
1837
# detail is not relocated, add the id.
1838
searched_specific_files = set()
1839
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1840
# Using a list so that we can access the values and change them in
1841
# nested scope. Each one is [path, file_id, entry]
1842
last_source_parent = [None, None]
1843
last_target_parent = [None, None]
2108
1845
use_filesystem_for_exec = (sys.platform != 'win32')
2109
iter_changes = self.target._iter_changes(include_unchanged,
2110
use_filesystem_for_exec, search_specific_files, state,
2111
source_index, target_index, want_unversioned, self.target)
2112
return iter_changes.iter_changes()
1847
# Just a sentry, so that _process_entry can say that this
1848
# record is handled, but isn't interesting to process (unchanged)
1849
uninteresting = object()
1852
old_dirname_to_file_id = {}
1853
new_dirname_to_file_id = {}
1854
# TODO: jam 20070516 - Avoid the _get_entry lookup overhead by
1855
# keeping a cache of directories that we have seen.
1857
def _process_entry(entry, path_info):
1858
"""Compare an entry and real disk to generate delta information.
1860
:param path_info: top_relpath, basename, kind, lstat, abspath for
1861
the path of entry. If None, then the path is considered absent.
1862
(Perhaps we should pass in a concrete entry for this ?)
1863
Basename is returned as a utf8 string because we expect this
1864
tuple will be ignored, and don't want to take the time to
1866
:return: None if these don't match
1867
A tuple of information about the change, or
1868
the object 'uninteresting' if these match, but are
1869
basically identical.
1871
if source_index is None:
1872
source_details = NULL_PARENT_DETAILS
1874
source_details = entry[1][source_index]
1875
target_details = entry[1][target_index]
1876
target_minikind = target_details[0]
1877
if path_info is not None and target_minikind in 'fdlt':
1878
assert target_index == 0
1879
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
1880
stat_value=path_info[3])
1881
# The entry may have been modified by update_entry
1882
target_details = entry[1][target_index]
1883
target_minikind = target_details[0]
1886
file_id = entry[0][2]
1887
source_minikind = source_details[0]
1888
if source_minikind in 'fdltr' and target_minikind in 'fdlt':
1889
# claimed content in both: diff
1890
# r | fdlt | | add source to search, add id path move and perform
1891
# | | | diff check on source-target
1892
# r | fdlt | a | dangling file that was present in the basis.
1894
if source_minikind in 'r':
1895
# add the source to the search path to find any children it
1896
# has. TODO ? : only add if it is a container ?
1897
if not osutils.is_inside_any(searched_specific_files,
1899
search_specific_files.add(source_details[1])
1900
# generate the old path; this is needed for stating later
1902
old_path = source_details[1]
1903
old_dirname, old_basename = os.path.split(old_path)
1904
path = pathjoin(entry[0][0], entry[0][1])
1905
old_entry = state._get_entry(source_index,
1907
# update the source details variable to be the real
1909
source_details = old_entry[1][source_index]
1910
source_minikind = source_details[0]
1912
old_dirname = entry[0][0]
1913
old_basename = entry[0][1]
1914
old_path = path = None
1915
if path_info is None:
1916
# the file is missing on disk, show as removed.
1917
content_change = True
1921
# source and target are both versioned and disk file is present.
1922
target_kind = path_info[2]
1923
if target_kind == 'directory':
1925
old_path = path = pathjoin(old_dirname, old_basename)
1926
new_dirname_to_file_id[path] = file_id
1927
if source_minikind != 'd':
1928
content_change = True
1930
# directories have no fingerprint
1931
content_change = False
1933
elif target_kind == 'file':
1934
if source_minikind != 'f':
1935
content_change = True
1937
# We could check the size, but we already have the
1939
content_change = (link_or_sha1 != source_details[1])
1940
# Target details is updated at update_entry time
1941
if use_filesystem_for_exec:
1942
# We don't need S_ISREG here, because we are sure
1943
# we are dealing with a file.
1944
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
1946
target_exec = target_details[3]
1947
elif target_kind == 'symlink':
1948
if source_minikind != 'l':
1949
content_change = True
1951
content_change = (link_or_sha1 != source_details[1])
1953
elif target_kind == 'tree-reference':
1954
if source_minikind != 't':
1955
content_change = True
1957
content_change = False
1960
raise Exception, "unknown kind %s" % path_info[2]
1961
if source_minikind == 'd':
1963
old_path = path = pathjoin(old_dirname, old_basename)
1964
old_dirname_to_file_id[old_path] = file_id
1965
# parent id is the entry for the path in the target tree
1966
if old_dirname == last_source_parent[0]:
1967
source_parent_id = last_source_parent[1]
1970
source_parent_id = old_dirname_to_file_id[old_dirname]
1972
source_parent_entry = state._get_entry(source_index,
1973
path_utf8=old_dirname)
1974
source_parent_id = source_parent_entry[0][2]
1975
if source_parent_id == entry[0][2]:
1976
# This is the root, so the parent is None
1977
source_parent_id = None
1979
last_source_parent[0] = old_dirname
1980
last_source_parent[1] = source_parent_id
1981
new_dirname = entry[0][0]
1982
if new_dirname == last_target_parent[0]:
1983
target_parent_id = last_target_parent[1]
1986
target_parent_id = new_dirname_to_file_id[new_dirname]
1988
# TODO: We don't always need to do the lookup, because the
1989
# parent entry will be the same as the source entry.
1990
target_parent_entry = state._get_entry(target_index,
1991
path_utf8=new_dirname)
1992
assert target_parent_entry != (None, None), (
1993
"Could not find target parent in wt: %s\nparent of: %s"
1994
% (new_dirname, entry))
1995
target_parent_id = target_parent_entry[0][2]
1996
if target_parent_id == entry[0][2]:
1997
# This is the root, so the parent is None
1998
target_parent_id = None
2000
last_target_parent[0] = new_dirname
2001
last_target_parent[1] = target_parent_id
2003
source_exec = source_details[3]
2004
if (include_unchanged
2006
or source_parent_id != target_parent_id
2007
or old_basename != entry[0][1]
2008
or source_exec != target_exec
2010
if old_path is None:
2011
old_path = path = pathjoin(old_dirname, old_basename)
2012
old_path_u = utf8_decode(old_path)[0]
2015
old_path_u = utf8_decode(old_path)[0]
2016
if old_path == path:
2019
path_u = utf8_decode(path)[0]
2020
source_kind = _minikind_to_kind[source_minikind]
2021
return (entry[0][2],
2022
(old_path_u, path_u),
2025
(source_parent_id, target_parent_id),
2026
(utf8_decode(old_basename)[0], utf8_decode(entry[0][1])[0]),
2027
(source_kind, target_kind),
2028
(source_exec, target_exec))
2030
return uninteresting
2031
elif source_minikind in 'a' and target_minikind in 'fdlt':
2032
# looks like a new file
2033
if path_info is not None:
2034
path = pathjoin(entry[0][0], entry[0][1])
2035
# parent id is the entry for the path in the target tree
2036
# TODO: these are the same for an entire directory: cache em.
2037
parent_id = state._get_entry(target_index,
2038
path_utf8=entry[0][0])[0][2]
2039
if parent_id == entry[0][2]:
2041
if use_filesystem_for_exec:
2042
# We need S_ISREG here, because we aren't sure if this
2045
stat.S_ISREG(path_info[3].st_mode)
2046
and stat.S_IEXEC & path_info[3].st_mode)
2048
target_exec = target_details[3]
2049
return (entry[0][2],
2050
(None, utf8_decode(path)[0]),
2054
(None, utf8_decode(entry[0][1])[0]),
2055
(None, path_info[2]),
2056
(None, target_exec))
2058
# but its not on disk: we deliberately treat this as just
2059
# never-present. (Why ?! - RBC 20070224)
2061
elif source_minikind in 'fdlt' and target_minikind in 'a':
2062
# unversioned, possibly, or possibly not deleted: we dont care.
2063
# if its still on disk, *and* theres no other entry at this
2064
# path [we dont know this in this routine at the moment -
2065
# perhaps we should change this - then it would be an unknown.
2066
old_path = pathjoin(entry[0][0], entry[0][1])
2067
# parent id is the entry for the path in the target tree
2068
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
2069
if parent_id == entry[0][2]:
2071
return (entry[0][2],
2072
(utf8_decode(old_path)[0], None),
2076
(utf8_decode(entry[0][1])[0], None),
2077
(_minikind_to_kind[source_minikind], None),
2078
(source_details[3], None))
2079
elif source_minikind in 'fdlt' and target_minikind in 'r':
2080
# a rename; could be a true rename, or a rename inherited from
2081
# a renamed parent. TODO: handle this efficiently. Its not
2082
# common case to rename dirs though, so a correct but slow
2083
# implementation will do.
2084
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
2085
search_specific_files.add(target_details[1])
2086
elif source_minikind in 'ra' and target_minikind in 'ra':
2087
# neither of the selected trees contain this file,
2088
# so skip over it. This is not currently directly tested, but
2089
# is indirectly via test_too_much.TestCommands.test_conflicts.
2092
raise AssertionError("don't know how to compare "
2093
"source_minikind=%r, target_minikind=%r"
2094
% (source_minikind, target_minikind))
2095
## import pdb;pdb.set_trace()
2098
while search_specific_files:
2099
# TODO: the pending list should be lexically sorted? the
2100
# interface doesn't require it.
2101
current_root = search_specific_files.pop()
2102
current_root_unicode = current_root.decode('utf8')
2103
searched_specific_files.add(current_root)
2104
# process the entries for this containing directory: the rest will be
2105
# found by their parents recursively.
2106
root_entries = _entries_for_path(current_root)
2107
root_abspath = self.target.abspath(current_root_unicode)
2109
root_stat = os.lstat(root_abspath)
2111
if e.errno == errno.ENOENT:
2112
# the path does not exist: let _process_entry know that.
2113
root_dir_info = None
2115
# some other random error: hand it up.
2118
root_dir_info = ('', current_root,
2119
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
2121
if root_dir_info[2] == 'directory':
2122
if self.target._directory_is_tree_reference(
2123
current_root.decode('utf8')):
2124
root_dir_info = root_dir_info[:2] + \
2125
('tree-reference',) + root_dir_info[3:]
2127
if not root_entries and not root_dir_info:
2128
# this specified path is not present at all, skip it.
2130
path_handled = False
2131
for entry in root_entries:
2132
result = _process_entry(entry, root_dir_info)
2133
if result is not None:
2135
if result is not uninteresting:
2137
if want_unversioned and not path_handled and root_dir_info:
2138
new_executable = bool(
2139
stat.S_ISREG(root_dir_info[3].st_mode)
2140
and stat.S_IEXEC & root_dir_info[3].st_mode)
2142
(None, current_root_unicode),
2146
(None, splitpath(current_root_unicode)[-1]),
2147
(None, root_dir_info[2]),
2148
(None, new_executable)
2150
initial_key = (current_root, '', '')
2151
block_index, _ = state._find_block_index_from_key(initial_key)
2152
if block_index == 0:
2153
# we have processed the total root already, but because the
2154
# initial key matched it we should skip it here.
2156
if root_dir_info and root_dir_info[2] == 'tree-reference':
2157
current_dir_info = None
2159
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
2161
current_dir_info = dir_iterator.next()
2163
# on win32, python2.4 has e.errno == ERROR_DIRECTORY, but
2164
# python 2.5 has e.errno == EINVAL,
2165
# and e.winerror == ERROR_DIRECTORY
2166
e_winerror = getattr(e, 'winerror', None)
2167
win_errors = (ERROR_DIRECTORY, ERROR_PATH_NOT_FOUND)
2168
# there may be directories in the inventory even though
2169
# this path is not a file on disk: so mark it as end of
2171
if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
2172
current_dir_info = None
2173
elif (sys.platform == 'win32'
2174
and (e.errno in win_errors
2175
or e_winerror in win_errors)):
2176
current_dir_info = None
2180
if current_dir_info[0][0] == '':
2181
# remove .bzr from iteration
2182
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
2183
assert current_dir_info[1][bzr_index][0] == '.bzr'
2184
del current_dir_info[1][bzr_index]
2185
# walk until both the directory listing and the versioned metadata
2187
if (block_index < len(state._dirblocks) and
2188
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2189
current_block = state._dirblocks[block_index]
2191
current_block = None
2192
while (current_dir_info is not None or
2193
current_block is not None):
2194
if (current_dir_info and current_block
2195
and current_dir_info[0][0] != current_block[0]):
2196
if cmp_by_dirs(current_dir_info[0][0], current_block[0]) < 0:
2197
# filesystem data refers to paths not covered by the dirblock.
2198
# this has two possibilities:
2199
# A) it is versioned but empty, so there is no block for it
2200
# B) it is not versioned.
2202
# if (A) then we need to recurse into it to check for
2203
# new unknown files or directories.
2204
# if (B) then we should ignore it, because we don't
2205
# recurse into unknown directories.
2207
while path_index < len(current_dir_info[1]):
2208
current_path_info = current_dir_info[1][path_index]
2209
if want_unversioned:
2210
if current_path_info[2] == 'directory':
2211
if self.target._directory_is_tree_reference(
2212
current_path_info[0].decode('utf8')):
2213
current_path_info = current_path_info[:2] + \
2214
('tree-reference',) + current_path_info[3:]
2215
new_executable = bool(
2216
stat.S_ISREG(current_path_info[3].st_mode)
2217
and stat.S_IEXEC & current_path_info[3].st_mode)
2219
(None, utf8_decode(current_path_info[0])[0]),
2223
(None, utf8_decode(current_path_info[1])[0]),
2224
(None, current_path_info[2]),
2225
(None, new_executable))
2226
# dont descend into this unversioned path if it is
2228
if current_path_info[2] in ('directory',
2230
del current_dir_info[1][path_index]
2234
# This dir info has been handled, go to the next
2236
current_dir_info = dir_iterator.next()
2237
except StopIteration:
2238
current_dir_info = None
2240
# We have a dirblock entry for this location, but there
2241
# is no filesystem path for this. This is most likely
2242
# because a directory was removed from the disk.
2243
# We don't have to report the missing directory,
2244
# because that should have already been handled, but we
2245
# need to handle all of the files that are contained
2247
for current_entry in current_block[1]:
2248
# entry referring to file not present on disk.
2249
# advance the entry only, after processing.
2250
result = _process_entry(current_entry, None)
2251
if result is not None:
2252
if result is not uninteresting:
2255
if (block_index < len(state._dirblocks) and
2256
osutils.is_inside(current_root,
2257
state._dirblocks[block_index][0])):
2258
current_block = state._dirblocks[block_index]
2260
current_block = None
2263
if current_block and entry_index < len(current_block[1]):
2264
current_entry = current_block[1][entry_index]
2266
current_entry = None
2267
advance_entry = True
2269
if current_dir_info and path_index < len(current_dir_info[1]):
2270
current_path_info = current_dir_info[1][path_index]
2271
if current_path_info[2] == 'directory':
2272
if self.target._directory_is_tree_reference(
2273
current_path_info[0].decode('utf8')):
2274
current_path_info = current_path_info[:2] + \
2275
('tree-reference',) + current_path_info[3:]
2277
current_path_info = None
2279
path_handled = False
2280
while (current_entry is not None or
2281
current_path_info is not None):
2282
if current_entry is None:
2283
# the check for path_handled when the path is adnvaced
2284
# will yield this path if needed.
2286
elif current_path_info is None:
2287
# no path is fine: the per entry code will handle it.
2288
result = _process_entry(current_entry, current_path_info)
2289
if result is not None:
2290
if result is not uninteresting:
2292
elif (current_entry[0][1] != current_path_info[1]
2293
or current_entry[1][target_index][0] in 'ar'):
2294
# The current path on disk doesn't match the dirblock
2295
# record. Either the dirblock is marked as absent, or
2296
# the file on disk is not present at all in the
2297
# dirblock. Either way, report about the dirblock
2298
# entry, and let other code handle the filesystem one.
2300
# Compare the basename for these files to determine
2302
if current_path_info[1] < current_entry[0][1]:
2303
# extra file on disk: pass for now, but only
2304
# increment the path, not the entry
2305
advance_entry = False
2307
# entry referring to file not present on disk.
2308
# advance the entry only, after processing.
2309
result = _process_entry(current_entry, None)
2310
if result is not None:
2311
if result is not uninteresting:
2313
advance_path = False
2315
result = _process_entry(current_entry, current_path_info)
2316
if result is not None:
2318
if result is not uninteresting:
2320
if advance_entry and current_entry is not None:
2322
if entry_index < len(current_block[1]):
2323
current_entry = current_block[1][entry_index]
2325
current_entry = None
2327
advance_entry = True # reset the advance flaga
2328
if advance_path and current_path_info is not None:
2329
if not path_handled:
2330
# unversioned in all regards
2331
if want_unversioned:
2332
new_executable = bool(
2333
stat.S_ISREG(current_path_info[3].st_mode)
2334
and stat.S_IEXEC & current_path_info[3].st_mode)
2336
(None, utf8_decode(current_path_info[0])[0]),
2340
(None, utf8_decode(current_path_info[1])[0]),
2341
(None, current_path_info[2]),
2342
(None, new_executable))
2343
# dont descend into this unversioned path if it is
2345
if current_path_info[2] in ('directory'):
2346
del current_dir_info[1][path_index]
2348
# dont descend the disk iterator into any tree
2350
if current_path_info[2] == 'tree-reference':
2351
del current_dir_info[1][path_index]
2354
if path_index < len(current_dir_info[1]):
2355
current_path_info = current_dir_info[1][path_index]
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:]
2362
current_path_info = None
2363
path_handled = False
2365
advance_path = True # reset the advance flagg.
2366
if current_block is not None:
2368
if (block_index < len(state._dirblocks) and
2369
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2370
current_block = state._dirblocks[block_index]
2372
current_block = None
2373
if current_dir_info is not None:
2375
current_dir_info = dir_iterator.next()
2376
except StopIteration:
2377
current_dir_info = None
2115
2381
def is_compatible(source, target):
2116
2382
# the target must be a dirstate working tree
2117
if not isinstance(target, DirStateWorkingTree):
2383
if not isinstance(target, WorkingTree4):
2119
# the source must be a revtree or dirstate rev tree.
2385
# the source must be a revtreee or dirstate rev tree.
2120
2386
if not isinstance(source,
2121
2387
(revisiontree.RevisionTree, DirStateRevisionTree)):
2123
2389
# the source revid must be in the target dirstate
2124
if not (source._revision_id == _mod_revision.NULL_REVISION or
2390
if not (source._revision_id == NULL_REVISION or
2125
2391
source._revision_id in target.get_parent_ids()):
2126
# TODO: what about ghosts? it may well need to
2392
# TODO: what about ghosts? it may well need to
2127
2393
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
