1263
1225
@needs_tree_write_lock
1264
1226
def _write_inventory(self, inv):
1265
1227
"""Write inventory as the current inventory."""
1267
raise AssertionError("attempting to write an inventory when the "
1268
"dirstate is dirty will lose pending changes")
1269
had_inventory = self._inventory is not None
1270
# Setting self._inventory = None forces the dirstate to regenerate the
1271
# working inventory. We do this because self.inventory may be inv, or
1272
# may have been modified, and either case would prevent a clean delta
1274
self._inventory = None
1276
delta = inv._make_delta(self.inventory)
1278
self.apply_inventory_delta(delta)
1228
assert not self._dirty, "attempting to write an inventory when the dirstate is dirty will cause data loss"
1229
self.current_dirstate().set_state_from_inventory(inv)
1230
self._make_dirty(reset_inventory=False)
1231
if self._inventory is not None:
1280
1232
self._inventory = inv
1284
class ContentFilterAwareSHA1Provider(dirstate.SHA1Provider):
1286
def __init__(self, tree):
1289
def sha1(self, abspath):
1290
"""See dirstate.SHA1Provider.sha1()."""
1291
filters = self.tree._content_filter_stack(
1292
self.tree.relpath(osutils.safe_unicode(abspath)))
1293
return internal_size_sha_file_byname(abspath, filters)[1]
1295
def stat_and_sha1(self, abspath):
1296
"""See dirstate.SHA1Provider.stat_and_sha1()."""
1297
filters = self.tree._content_filter_stack(
1298
self.tree.relpath(osutils.safe_unicode(abspath)))
1299
file_obj = file(abspath, 'rb', 65000)
1301
statvalue = os.fstat(file_obj.fileno())
1303
file_obj = filtered_input_file(file_obj, filters)
1304
sha1 = osutils.size_sha_file(file_obj)[1]
1307
return statvalue, sha1
1310
class ContentFilteringDirStateWorkingTree(DirStateWorkingTree):
1311
"""Dirstate working tree that supports content filtering.
1313
The dirstate holds the hash and size of the canonical form of the file,
1314
and most methods must return that.
1317
def _file_content_summary(self, path, stat_result):
1318
# This is to support the somewhat obsolete path_content_summary method
1319
# with content filtering: see
1320
# <https://bugs.edge.launchpad.net/bzr/+bug/415508>.
1322
# If the dirstate cache is up to date and knows the hash and size,
1324
# Otherwise if there are no content filters, return the on-disk size
1325
# and leave the hash blank.
1326
# Otherwise, read and filter the on-disk file and use its size and
1329
# The dirstate doesn't store the size of the canonical form so we
1330
# can't trust it for content-filtered trees. We just return None.
1331
dirstate_sha1 = self._dirstate.sha1_from_stat(path, stat_result)
1332
executable = self._is_executable_from_path_and_stat(path, stat_result)
1333
return ('file', None, executable, dirstate_sha1)
1336
class WorkingTree4(DirStateWorkingTree):
1337
"""This is the Format 4 working tree.
1339
This differs from WorkingTree3 by:
1340
- Having a consolidated internal dirstate, stored in a
1341
randomly-accessible sorted file on disk.
1342
- Not having a regular inventory attribute. One can be synthesized
1343
on demand but this is expensive and should be avoided.
1345
This is new in bzr 0.15.
1349
class WorkingTree5(ContentFilteringDirStateWorkingTree):
1350
"""This is the Format 5 working tree.
1352
This differs from WorkingTree4 by:
1353
- Supporting content filtering.
1355
This is new in bzr 1.11.
1359
class WorkingTree6(ContentFilteringDirStateWorkingTree):
1360
"""This is the Format 6 working tree.
1362
This differs from WorkingTree5 by:
1363
- Supporting a current view that may mask the set of files in a tree
1364
impacted by most user operations.
1366
This is new in bzr 1.14.
1369
def _make_views(self):
1370
return views.PathBasedViews(self)
1373
class DirStateWorkingTreeFormat(WorkingTreeFormat3):
1375
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
1376
accelerator_tree=None, hardlink=False):
1236
class WorkingTreeFormat4(WorkingTreeFormat3):
1237
"""The first consolidated dirstate working tree format.
1240
- exists within a metadir controlling .bzr
1241
- includes an explicit version marker for the workingtree control
1242
files, separate from the BzrDir format
1243
- modifies the hash cache format
1244
- is new in bzr 0.15
1245
- uses a LockDir to guard access to it.
1248
upgrade_recommended = False
1250
def get_format_string(self):
1251
"""See WorkingTreeFormat.get_format_string()."""
1252
return "Bazaar Working Tree Format 4 (bzr 0.15)\n"
1254
def get_format_description(self):
1255
"""See WorkingTreeFormat.get_format_description()."""
1256
return "Working tree format 4"
1258
def initialize(self, a_bzrdir, revision_id=None):
1377
1259
"""See WorkingTreeFormat.initialize().
1379
1261
:param revision_id: allows creating a working tree at a different
1380
1262
revision than the branch is at.
1381
:param accelerator_tree: A tree which can be used for retrieving file
1382
contents more quickly than the revision tree, i.e. a workingtree.
1383
The revision tree will be used for cases where accelerator_tree's
1384
content is different.
1385
:param hardlink: If true, hard-link files from accelerator_tree,
1388
1264
These trees get an initial random root id, if their repository supports
1389
1265
rich root data, TREE_ROOT otherwise.
1267
revision_id = osutils.safe_revision_id(revision_id)
1391
1268
if not isinstance(a_bzrdir.transport, LocalTransport):
1392
1269
raise errors.NotLocalUrl(a_bzrdir.transport.base)
1393
1270
transport = a_bzrdir.get_workingtree_transport(self)
1394
1271
control_files = self._open_control_files(a_bzrdir)
1395
1272
control_files.create_lock()
1396
1273
control_files.lock_write()
1397
transport.put_bytes('format', self.get_format_string(),
1398
mode=a_bzrdir._get_file_mode())
1399
if from_branch is not None:
1400
branch = from_branch
1402
branch = a_bzrdir.open_branch()
1274
control_files.put_utf8('format', self.get_format_string())
1275
branch = a_bzrdir.open_branch()
1403
1276
if revision_id is None:
1404
1277
revision_id = branch.last_revision()
1405
1278
local_path = transport.local_abspath('dirstate')
2080
1756
if not found_versioned:
2081
1757
# none of the indexes was not 'absent' at all ids for this
2083
not_versioned.append(path)
2084
if len(not_versioned) > 0:
2085
raise errors.PathsNotVersionedError(not_versioned)
1759
all_versioned = False
1761
if not all_versioned:
1762
raise errors.PathsNotVersionedError(specific_files)
2086
1763
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2087
search_specific_files = osutils.minimum_path_selection(specific_files)
1764
search_specific_files = set()
1765
for path in specific_files:
1766
other_specific_files = specific_files.difference(set([path]))
1767
if not osutils.is_inside_any(other_specific_files, path):
1768
# this is a top level path, we must check it.
1769
search_specific_files.add(path)
1771
# compare source_index and target_index at or under each element of search_specific_files.
1772
# follow the following comparison table. Note that we only want to do diff operations when
1773
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1777
# Source | Target | disk | action
1778
# r | fdlt | | add source to search, add id path move and perform
1779
# | | | diff check on source-target
1780
# r | fdlt | a | dangling file that was present in the basis.
1782
# r | a | | add source to search
1784
# r | r | | this path is present in a non-examined tree, skip.
1785
# r | r | a | this path is present in a non-examined tree, skip.
1786
# a | fdlt | | add new id
1787
# a | fdlt | a | dangling locally added file, skip
1788
# a | a | | not present in either tree, skip
1789
# a | a | a | not present in any tree, skip
1790
# a | r | | not present in either tree at this path, skip as it
1791
# | | | may not be selected by the users list of paths.
1792
# a | r | a | not present in either tree at this path, skip as it
1793
# | | | may not be selected by the users list of paths.
1794
# fdlt | fdlt | | content in both: diff them
1795
# fdlt | fdlt | a | deleted locally, but not unversioned - show as deleted ?
1796
# fdlt | a | | unversioned: output deleted id for now
1797
# fdlt | a | a | unversioned and deleted: output deleted id
1798
# fdlt | r | | relocated in this tree, so add target to search.
1799
# | | | Dont diff, we will see an r,fd; pair when we reach
1800
# | | | this id at the other path.
1801
# fdlt | r | a | relocated in this tree, so add target to search.
1802
# | | | Dont diff, we will see an r,fd; pair when we reach
1803
# | | | this id at the other path.
1805
# for all search_indexs in each path at or under each element of
1806
# search_specific_files, if the detail is relocated: add the id, and add the
1807
# relocated path as one to search if its not searched already. If the
1808
# detail is not relocated, add the id.
1809
searched_specific_files = set()
1810
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1811
# Using a list so that we can access the values and change them in
1812
# nested scope. Each one is [path, file_id, entry]
1813
last_source_parent = [None, None]
1814
last_target_parent = [None, None]
2089
1816
use_filesystem_for_exec = (sys.platform != 'win32')
2090
iter_changes = self.target._iter_changes(include_unchanged,
2091
use_filesystem_for_exec, search_specific_files, state,
2092
source_index, target_index, want_unversioned, self.target)
2093
return iter_changes.iter_changes()
1818
# Just a sentry, so that _process_entry can say that this
1819
# record is handled, but isn't interesting to process (unchanged)
1820
uninteresting = object()
1823
old_dirname_to_file_id = {}
1824
new_dirname_to_file_id = {}
1825
# TODO: jam 20070516 - Avoid the _get_entry lookup overhead by
1826
# keeping a cache of directories that we have seen.
1828
def _process_entry(entry, path_info):
1829
"""Compare an entry and real disk to generate delta information.
1831
:param path_info: top_relpath, basename, kind, lstat, abspath for
1832
the path of entry. If None, then the path is considered absent.
1833
(Perhaps we should pass in a concrete entry for this ?)
1834
Basename is returned as a utf8 string because we expect this
1835
tuple will be ignored, and don't want to take the time to
1837
:return: None if these don't match
1838
A tuple of information about the change, or
1839
the object 'uninteresting' if these match, but are
1840
basically identical.
1842
if source_index is None:
1843
source_details = NULL_PARENT_DETAILS
1845
source_details = entry[1][source_index]
1846
target_details = entry[1][target_index]
1847
target_minikind = target_details[0]
1848
if path_info is not None and target_minikind in 'fdlt':
1849
assert target_index == 0
1850
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
1851
stat_value=path_info[3])
1852
# The entry may have been modified by update_entry
1853
target_details = entry[1][target_index]
1854
target_minikind = target_details[0]
1857
file_id = entry[0][2]
1858
source_minikind = source_details[0]
1859
if source_minikind in 'fdltr' and target_minikind in 'fdlt':
1860
# claimed content in both: diff
1861
# r | fdlt | | add source to search, add id path move and perform
1862
# | | | diff check on source-target
1863
# r | fdlt | a | dangling file that was present in the basis.
1865
if source_minikind in 'r':
1866
# add the source to the search path to find any children it
1867
# has. TODO ? : only add if it is a container ?
1868
if not osutils.is_inside_any(searched_specific_files,
1870
search_specific_files.add(source_details[1])
1871
# generate the old path; this is needed for stating later
1873
old_path = source_details[1]
1874
old_dirname, old_basename = os.path.split(old_path)
1875
path = pathjoin(entry[0][0], entry[0][1])
1876
old_entry = state._get_entry(source_index,
1878
# update the source details variable to be the real
1880
source_details = old_entry[1][source_index]
1881
source_minikind = source_details[0]
1883
old_dirname = entry[0][0]
1884
old_basename = entry[0][1]
1885
old_path = path = None
1886
if path_info is None:
1887
# the file is missing on disk, show as removed.
1888
content_change = True
1892
# source and target are both versioned and disk file is present.
1893
target_kind = path_info[2]
1894
if target_kind == 'directory':
1896
old_path = path = pathjoin(old_dirname, old_basename)
1897
new_dirname_to_file_id[path] = file_id
1898
if source_minikind != 'd':
1899
content_change = True
1901
# directories have no fingerprint
1902
content_change = False
1904
elif target_kind == 'file':
1905
if source_minikind != 'f':
1906
content_change = True
1908
# We could check the size, but we already have the
1910
content_change = (link_or_sha1 != source_details[1])
1911
# Target details is updated at update_entry time
1912
if use_filesystem_for_exec:
1913
# We don't need S_ISREG here, because we are sure
1914
# we are dealing with a file.
1915
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
1917
target_exec = target_details[3]
1918
elif target_kind == 'symlink':
1919
if source_minikind != 'l':
1920
content_change = True
1922
content_change = (link_or_sha1 != source_details[1])
1924
elif target_kind == 'tree-reference':
1925
if source_minikind != 't':
1926
content_change = True
1928
content_change = False
1931
raise Exception, "unknown kind %s" % path_info[2]
1932
if source_minikind == 'd':
1934
old_path = path = pathjoin(old_dirname, old_basename)
1935
old_dirname_to_file_id[old_path] = file_id
1936
# parent id is the entry for the path in the target tree
1937
if old_dirname == last_source_parent[0]:
1938
source_parent_id = last_source_parent[1]
1941
source_parent_id = old_dirname_to_file_id[old_dirname]
1943
source_parent_entry = state._get_entry(source_index,
1944
path_utf8=old_dirname)
1945
source_parent_id = source_parent_entry[0][2]
1946
if source_parent_id == entry[0][2]:
1947
# This is the root, so the parent is None
1948
source_parent_id = None
1950
last_source_parent[0] = old_dirname
1951
last_source_parent[1] = source_parent_id
1952
new_dirname = entry[0][0]
1953
if new_dirname == last_target_parent[0]:
1954
target_parent_id = last_target_parent[1]
1957
target_parent_id = new_dirname_to_file_id[new_dirname]
1959
# TODO: We don't always need to do the lookup, because the
1960
# parent entry will be the same as the source entry.
1961
target_parent_entry = state._get_entry(target_index,
1962
path_utf8=new_dirname)
1963
assert target_parent_entry != (None, None), (
1964
"Could not find target parent in wt: %s\nparent of: %s"
1965
% (new_dirname, entry))
1966
target_parent_id = target_parent_entry[0][2]
1967
if target_parent_id == entry[0][2]:
1968
# This is the root, so the parent is None
1969
target_parent_id = None
1971
last_target_parent[0] = new_dirname
1972
last_target_parent[1] = target_parent_id
1974
source_exec = source_details[3]
1975
if (include_unchanged
1977
or source_parent_id != target_parent_id
1978
or old_basename != entry[0][1]
1979
or source_exec != target_exec
1981
if old_path is None:
1982
old_path = path = pathjoin(old_dirname, old_basename)
1983
old_path_u = utf8_decode(old_path)[0]
1986
old_path_u = utf8_decode(old_path)[0]
1987
if old_path == path:
1990
path_u = utf8_decode(path)[0]
1991
source_kind = _minikind_to_kind[source_minikind]
1992
return (entry[0][2],
1993
(old_path_u, path_u),
1996
(source_parent_id, target_parent_id),
1997
(utf8_decode(old_basename)[0], utf8_decode(entry[0][1])[0]),
1998
(source_kind, target_kind),
1999
(source_exec, target_exec))
2001
return uninteresting
2002
elif source_minikind in 'a' and target_minikind in 'fdlt':
2003
# looks like a new file
2004
if path_info is not None:
2005
path = pathjoin(entry[0][0], entry[0][1])
2006
# parent id is the entry for the path in the target tree
2007
# TODO: these are the same for an entire directory: cache em.
2008
parent_id = state._get_entry(target_index,
2009
path_utf8=entry[0][0])[0][2]
2010
if parent_id == entry[0][2]:
2012
if use_filesystem_for_exec:
2013
# We need S_ISREG here, because we aren't sure if this
2016
stat.S_ISREG(path_info[3].st_mode)
2017
and stat.S_IEXEC & path_info[3].st_mode)
2019
target_exec = target_details[3]
2020
return (entry[0][2],
2021
(None, utf8_decode(path)[0]),
2025
(None, utf8_decode(entry[0][1])[0]),
2026
(None, path_info[2]),
2027
(None, target_exec))
2029
# but its not on disk: we deliberately treat this as just
2030
# never-present. (Why ?! - RBC 20070224)
2032
elif source_minikind in 'fdlt' and target_minikind in 'a':
2033
# unversioned, possibly, or possibly not deleted: we dont care.
2034
# if its still on disk, *and* theres no other entry at this
2035
# path [we dont know this in this routine at the moment -
2036
# perhaps we should change this - then it would be an unknown.
2037
old_path = pathjoin(entry[0][0], entry[0][1])
2038
# parent id is the entry for the path in the target tree
2039
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
2040
if parent_id == entry[0][2]:
2042
return (entry[0][2],
2043
(utf8_decode(old_path)[0], None),
2047
(utf8_decode(entry[0][1])[0], None),
2048
(_minikind_to_kind[source_minikind], None),
2049
(source_details[3], None))
2050
elif source_minikind in 'fdlt' and target_minikind in 'r':
2051
# a rename; could be a true rename, or a rename inherited from
2052
# a renamed parent. TODO: handle this efficiently. Its not
2053
# common case to rename dirs though, so a correct but slow
2054
# implementation will do.
2055
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
2056
search_specific_files.add(target_details[1])
2057
elif source_minikind in 'ra' and target_minikind in 'ra':
2058
# neither of the selected trees contain this file,
2059
# so skip over it. This is not currently directly tested, but
2060
# is indirectly via test_too_much.TestCommands.test_conflicts.
2063
raise AssertionError("don't know how to compare "
2064
"source_minikind=%r, target_minikind=%r"
2065
% (source_minikind, target_minikind))
2066
## import pdb;pdb.set_trace()
2069
while search_specific_files:
2070
# TODO: the pending list should be lexically sorted? the
2071
# interface doesn't require it.
2072
current_root = search_specific_files.pop()
2073
current_root_unicode = current_root.decode('utf8')
2074
searched_specific_files.add(current_root)
2075
# process the entries for this containing directory: the rest will be
2076
# found by their parents recursively.
2077
root_entries = _entries_for_path(current_root)
2078
root_abspath = self.target.abspath(current_root_unicode)
2080
root_stat = os.lstat(root_abspath)
2082
if e.errno == errno.ENOENT:
2083
# the path does not exist: let _process_entry know that.
2084
root_dir_info = None
2086
# some other random error: hand it up.
2089
root_dir_info = ('', current_root,
2090
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
2092
if root_dir_info[2] == 'directory':
2093
if self.target._directory_is_tree_reference(
2094
current_root.decode('utf8')):
2095
root_dir_info = root_dir_info[:2] + \
2096
('tree-reference',) + root_dir_info[3:]
2098
if not root_entries and not root_dir_info:
2099
# this specified path is not present at all, skip it.
2101
path_handled = False
2102
for entry in root_entries:
2103
result = _process_entry(entry, root_dir_info)
2104
if result is not None:
2106
if result is not uninteresting:
2108
if want_unversioned and not path_handled and root_dir_info:
2109
new_executable = bool(
2110
stat.S_ISREG(root_dir_info[3].st_mode)
2111
and stat.S_IEXEC & root_dir_info[3].st_mode)
2113
(None, current_root_unicode),
2117
(None, splitpath(current_root_unicode)[-1]),
2118
(None, root_dir_info[2]),
2119
(None, new_executable)
2121
initial_key = (current_root, '', '')
2122
block_index, _ = state._find_block_index_from_key(initial_key)
2123
if block_index == 0:
2124
# we have processed the total root already, but because the
2125
# initial key matched it we should skip it here.
2127
if root_dir_info and root_dir_info[2] == 'tree-reference':
2128
current_dir_info = None
2130
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
2132
current_dir_info = dir_iterator.next()
2134
# on win32, python2.4 has e.errno == ERROR_DIRECTORY, but
2135
# python 2.5 has e.errno == EINVAL,
2136
# and e.winerror == ERROR_DIRECTORY
2137
e_winerror = getattr(e, 'winerror', None)
2138
win_errors = (ERROR_DIRECTORY, ERROR_PATH_NOT_FOUND)
2139
# there may be directories in the inventory even though
2140
# this path is not a file on disk: so mark it as end of
2142
if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
2143
current_dir_info = None
2144
elif (sys.platform == 'win32'
2145
and (e.errno in win_errors
2146
or e_winerror in win_errors)):
2147
current_dir_info = None
2151
if current_dir_info[0][0] == '':
2152
# remove .bzr from iteration
2153
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
2154
assert current_dir_info[1][bzr_index][0] == '.bzr'
2155
del current_dir_info[1][bzr_index]
2156
# walk until both the directory listing and the versioned metadata
2158
if (block_index < len(state._dirblocks) and
2159
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2160
current_block = state._dirblocks[block_index]
2162
current_block = None
2163
while (current_dir_info is not None or
2164
current_block is not None):
2165
if (current_dir_info and current_block
2166
and current_dir_info[0][0] != current_block[0]):
2167
if current_dir_info[0][0].split('/') < current_block[0].split('/'):
2168
# filesystem data refers to paths not covered by the dirblock.
2169
# this has two possibilities:
2170
# A) it is versioned but empty, so there is no block for it
2171
# B) it is not versioned.
2173
# if (A) then we need to recurse into it to check for
2174
# new unknown files or directories.
2175
# if (B) then we should ignore it, because we don't
2176
# recurse into unknown directories.
2178
while path_index < len(current_dir_info[1]):
2179
current_path_info = current_dir_info[1][path_index]
2180
if want_unversioned:
2181
if current_path_info[2] == 'directory':
2182
if self.target._directory_is_tree_reference(
2183
current_path_info[0].decode('utf8')):
2184
current_path_info = current_path_info[:2] + \
2185
('tree-reference',) + current_path_info[3:]
2186
new_executable = bool(
2187
stat.S_ISREG(current_path_info[3].st_mode)
2188
and stat.S_IEXEC & current_path_info[3].st_mode)
2190
(None, utf8_decode(current_path_info[0])[0]),
2194
(None, utf8_decode(current_path_info[1])[0]),
2195
(None, current_path_info[2]),
2196
(None, new_executable))
2197
# dont descend into this unversioned path if it is
2199
if current_path_info[2] in ('directory',
2201
del current_dir_info[1][path_index]
2205
# This dir info has been handled, go to the next
2207
current_dir_info = dir_iterator.next()
2208
except StopIteration:
2209
current_dir_info = None
2211
# We have a dirblock entry for this location, but there
2212
# is no filesystem path for this. This is most likely
2213
# because a directory was removed from the disk.
2214
# We don't have to report the missing directory,
2215
# because that should have already been handled, but we
2216
# need to handle all of the files that are contained
2218
for current_entry in current_block[1]:
2219
# entry referring to file not present on disk.
2220
# advance the entry only, after processing.
2221
result = _process_entry(current_entry, None)
2222
if result is not None:
2223
if result is not uninteresting:
2226
if (block_index < len(state._dirblocks) and
2227
osutils.is_inside(current_root,
2228
state._dirblocks[block_index][0])):
2229
current_block = state._dirblocks[block_index]
2231
current_block = None
2234
if current_block and entry_index < len(current_block[1]):
2235
current_entry = current_block[1][entry_index]
2237
current_entry = None
2238
advance_entry = True
2240
if current_dir_info and path_index < len(current_dir_info[1]):
2241
current_path_info = current_dir_info[1][path_index]
2242
if current_path_info[2] == 'directory':
2243
if self.target._directory_is_tree_reference(
2244
current_path_info[0].decode('utf8')):
2245
current_path_info = current_path_info[:2] + \
2246
('tree-reference',) + current_path_info[3:]
2248
current_path_info = None
2250
path_handled = False
2251
while (current_entry is not None or
2252
current_path_info is not None):
2253
if current_entry is None:
2254
# the check for path_handled when the path is adnvaced
2255
# will yield this path if needed.
2257
elif current_path_info is None:
2258
# no path is fine: the per entry code will handle it.
2259
result = _process_entry(current_entry, current_path_info)
2260
if result is not None:
2261
if result is not uninteresting:
2263
elif (current_entry[0][1] != current_path_info[1]
2264
or current_entry[1][target_index][0] in 'ar'):
2265
# The current path on disk doesn't match the dirblock
2266
# record. Either the dirblock is marked as absent, or
2267
# the file on disk is not present at all in the
2268
# dirblock. Either way, report about the dirblock
2269
# entry, and let other code handle the filesystem one.
2271
# Compare the basename for these files to determine
2273
if current_path_info[1] < current_entry[0][1]:
2274
# extra file on disk: pass for now, but only
2275
# increment the path, not the entry
2276
advance_entry = False
2278
# entry referring to file not present on disk.
2279
# advance the entry only, after processing.
2280
result = _process_entry(current_entry, None)
2281
if result is not None:
2282
if result is not uninteresting:
2284
advance_path = False
2286
result = _process_entry(current_entry, current_path_info)
2287
if result is not None:
2289
if result is not uninteresting:
2291
if advance_entry and current_entry is not None:
2293
if entry_index < len(current_block[1]):
2294
current_entry = current_block[1][entry_index]
2296
current_entry = None
2298
advance_entry = True # reset the advance flaga
2299
if advance_path and current_path_info is not None:
2300
if not path_handled:
2301
# unversioned in all regards
2302
if want_unversioned:
2303
new_executable = bool(
2304
stat.S_ISREG(current_path_info[3].st_mode)
2305
and stat.S_IEXEC & current_path_info[3].st_mode)
2307
(None, utf8_decode(current_path_info[0])[0]),
2311
(None, utf8_decode(current_path_info[1])[0]),
2312
(None, current_path_info[2]),
2313
(None, new_executable))
2314
# dont descend into this unversioned path if it is
2316
if current_path_info[2] in ('directory'):
2317
del current_dir_info[1][path_index]
2319
# dont descend the disk iterator into any tree
2321
if current_path_info[2] == 'tree-reference':
2322
del current_dir_info[1][path_index]
2325
if path_index < len(current_dir_info[1]):
2326
current_path_info = current_dir_info[1][path_index]
2327
if current_path_info[2] == 'directory':
2328
if self.target._directory_is_tree_reference(
2329
current_path_info[0].decode('utf8')):
2330
current_path_info = current_path_info[:2] + \
2331
('tree-reference',) + current_path_info[3:]
2333
current_path_info = None
2334
path_handled = False
2336
advance_path = True # reset the advance flagg.
2337
if current_block is not None:
2339
if (block_index < len(state._dirblocks) and
2340
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2341
current_block = state._dirblocks[block_index]
2343
current_block = None
2344
if current_dir_info is not None:
2346
current_dir_info = dir_iterator.next()
2347
except StopIteration:
2348
current_dir_info = None
2096
2352
def is_compatible(source, target):
2097
2353
# the target must be a dirstate working tree
2098
if not isinstance(target, DirStateWorkingTree):
2354
if not isinstance(target, WorkingTree4):
2100
# the source must be a revtree or dirstate rev tree.
2356
# the source must be a revtreee or dirstate rev tree.
2101
2357
if not isinstance(source,
2102
2358
(revisiontree.RevisionTree, DirStateRevisionTree)):
2104
2360
# the source revid must be in the target dirstate
2105
if not (source._revision_id == _mod_revision.NULL_REVISION or
2361
if not (source._revision_id == NULL_REVISION or
2106
2362
source._revision_id in target.get_parent_ids()):
2107
# TODO: what about ghosts? it may well need to
2363
# TODO: what about ghosts? it may well need to
2108
2364
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
