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
1766
if not found_versioned:
2081
1767
# 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)
1769
all_versioned = False
1771
if not all_versioned:
1772
raise errors.PathsNotVersionedError(specific_files)
2086
1773
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2087
search_specific_files = osutils.minimum_path_selection(specific_files)
1774
search_specific_files = set()
1775
for path in specific_files:
1776
other_specific_files = specific_files.difference(set([path]))
1777
if not osutils.is_inside_any(other_specific_files, path):
1778
# this is a top level path, we must check it.
1779
search_specific_files.add(path)
1781
# compare source_index and target_index at or under each element of search_specific_files.
1782
# follow the following comparison table. Note that we only want to do diff operations when
1783
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1787
# Source | Target | disk | action
1788
# r | fdlt | | add source to search, add id path move and perform
1789
# | | | diff check on source-target
1790
# r | fdlt | a | dangling file that was present in the basis.
1792
# r | a | | add source to search
1794
# r | r | | this path is present in a non-examined tree, skip.
1795
# r | r | a | this path is present in a non-examined tree, skip.
1796
# a | fdlt | | add new id
1797
# a | fdlt | a | dangling locally added file, skip
1798
# a | a | | not present in either tree, skip
1799
# a | a | a | not present in any tree, skip
1800
# a | r | | not present in either tree at this path, skip as it
1801
# | | | may not be selected by the users list of paths.
1802
# a | r | a | not present in either tree at this path, skip as it
1803
# | | | may not be selected by the users list of paths.
1804
# fdlt | fdlt | | content in both: diff them
1805
# fdlt | fdlt | a | deleted locally, but not unversioned - show as deleted ?
1806
# fdlt | a | | unversioned: output deleted id for now
1807
# fdlt | a | a | unversioned and deleted: output deleted id
1808
# fdlt | r | | relocated in this tree, so add target to search.
1809
# | | | Dont diff, we will see an r,fd; pair when we reach
1810
# | | | this id at the other path.
1811
# fdlt | r | a | relocated in this tree, so add target to search.
1812
# | | | Dont diff, we will see an r,fd; pair when we reach
1813
# | | | this id at the other path.
1815
# for all search_indexs in each path at or under each element of
1816
# search_specific_files, if the detail is relocated: add the id, and add the
1817
# relocated path as one to search if its not searched already. If the
1818
# detail is not relocated, add the id.
1819
searched_specific_files = set()
1820
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1821
# Using a list so that we can access the values and change them in
1822
# nested scope. Each one is [path, file_id, entry]
1823
last_source_parent = [None, None]
1824
last_target_parent = [None, None]
2089
1826
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()
1828
# Just a sentry, so that _process_entry can say that this
1829
# record is handled, but isn't interesting to process (unchanged)
1830
uninteresting = object()
1833
old_dirname_to_file_id = {}
1834
new_dirname_to_file_id = {}
1835
# TODO: jam 20070516 - Avoid the _get_entry lookup overhead by
1836
# keeping a cache of directories that we have seen.
1838
def _process_entry(entry, path_info):
1839
"""Compare an entry and real disk to generate delta information.
1841
:param path_info: top_relpath, basename, kind, lstat, abspath for
1842
the path of entry. If None, then the path is considered absent.
1843
(Perhaps we should pass in a concrete entry for this ?)
1844
Basename is returned as a utf8 string because we expect this
1845
tuple will be ignored, and don't want to take the time to
1847
:return: None if these don't match
1848
A tuple of information about the change, or
1849
the object 'uninteresting' if these match, but are
1850
basically identical.
1852
if source_index is None:
1853
source_details = NULL_PARENT_DETAILS
1855
source_details = entry[1][source_index]
1856
target_details = entry[1][target_index]
1857
target_minikind = target_details[0]
1858
if path_info is not None and target_minikind in 'fdlt':
1859
assert target_index == 0
1860
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
1861
stat_value=path_info[3])
1862
# The entry may have been modified by update_entry
1863
target_details = entry[1][target_index]
1864
target_minikind = target_details[0]
1867
file_id = entry[0][2]
1868
source_minikind = source_details[0]
1869
if source_minikind in 'fdltr' and target_minikind in 'fdlt':
1870
# claimed content in both: diff
1871
# r | fdlt | | add source to search, add id path move and perform
1872
# | | | diff check on source-target
1873
# r | fdlt | a | dangling file that was present in the basis.
1875
if source_minikind in 'r':
1876
# add the source to the search path to find any children it
1877
# has. TODO ? : only add if it is a container ?
1878
if not osutils.is_inside_any(searched_specific_files,
1880
search_specific_files.add(source_details[1])
1881
# generate the old path; this is needed for stating later
1883
old_path = source_details[1]
1884
old_dirname, old_basename = os.path.split(old_path)
1885
path = pathjoin(entry[0][0], entry[0][1])
1886
old_entry = state._get_entry(source_index,
1888
# update the source details variable to be the real
1890
source_details = old_entry[1][source_index]
1891
source_minikind = source_details[0]
1893
old_dirname = entry[0][0]
1894
old_basename = entry[0][1]
1895
old_path = path = None
1896
if path_info is None:
1897
# the file is missing on disk, show as removed.
1898
content_change = True
1902
# source and target are both versioned and disk file is present.
1903
target_kind = path_info[2]
1904
if target_kind == 'directory':
1906
old_path = path = pathjoin(old_dirname, old_basename)
1907
new_dirname_to_file_id[path] = file_id
1908
if source_minikind != 'd':
1909
content_change = True
1911
# directories have no fingerprint
1912
content_change = False
1914
elif target_kind == 'file':
1915
if source_minikind != 'f':
1916
content_change = True
1918
# We could check the size, but we already have the
1920
content_change = (link_or_sha1 != source_details[1])
1921
# Target details is updated at update_entry time
1922
if use_filesystem_for_exec:
1923
# We don't need S_ISREG here, because we are sure
1924
# we are dealing with a file.
1925
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
1927
target_exec = target_details[3]
1928
elif target_kind == 'symlink':
1929
if source_minikind != 'l':
1930
content_change = True
1932
content_change = (link_or_sha1 != source_details[1])
1934
elif target_kind == 'tree-reference':
1935
if source_minikind != 't':
1936
content_change = True
1938
content_change = False
1941
raise Exception, "unknown kind %s" % path_info[2]
1942
if source_minikind == 'd':
1944
old_path = path = pathjoin(old_dirname, old_basename)
1945
old_dirname_to_file_id[old_path] = file_id
1946
# parent id is the entry for the path in the target tree
1947
if old_dirname == last_source_parent[0]:
1948
source_parent_id = last_source_parent[1]
1951
source_parent_id = old_dirname_to_file_id[old_dirname]
1953
source_parent_entry = state._get_entry(source_index,
1954
path_utf8=old_dirname)
1955
source_parent_id = source_parent_entry[0][2]
1956
if source_parent_id == entry[0][2]:
1957
# This is the root, so the parent is None
1958
source_parent_id = None
1960
last_source_parent[0] = old_dirname
1961
last_source_parent[1] = source_parent_id
1962
new_dirname = entry[0][0]
1963
if new_dirname == last_target_parent[0]:
1964
target_parent_id = last_target_parent[1]
1967
target_parent_id = new_dirname_to_file_id[new_dirname]
1969
# TODO: We don't always need to do the lookup, because the
1970
# parent entry will be the same as the source entry.
1971
target_parent_entry = state._get_entry(target_index,
1972
path_utf8=new_dirname)
1973
assert target_parent_entry != (None, None), (
1974
"Could not find target parent in wt: %s\nparent of: %s"
1975
% (new_dirname, entry))
1976
target_parent_id = target_parent_entry[0][2]
1977
if target_parent_id == entry[0][2]:
1978
# This is the root, so the parent is None
1979
target_parent_id = None
1981
last_target_parent[0] = new_dirname
1982
last_target_parent[1] = target_parent_id
1984
source_exec = source_details[3]
1985
if (include_unchanged
1987
or source_parent_id != target_parent_id
1988
or old_basename != entry[0][1]
1989
or source_exec != target_exec
1991
if old_path is None:
1992
old_path = path = pathjoin(old_dirname, old_basename)
1993
old_path_u = utf8_decode(old_path)[0]
1996
old_path_u = utf8_decode(old_path)[0]
1997
if old_path == path:
2000
path_u = utf8_decode(path)[0]
2001
source_kind = _minikind_to_kind[source_minikind]
2002
return (entry[0][2],
2003
(old_path_u, path_u),
2006
(source_parent_id, target_parent_id),
2007
(utf8_decode(old_basename)[0], utf8_decode(entry[0][1])[0]),
2008
(source_kind, target_kind),
2009
(source_exec, target_exec))
2011
return uninteresting
2012
elif source_minikind in 'a' and target_minikind in 'fdlt':
2013
# looks like a new file
2014
if path_info is not None:
2015
path = pathjoin(entry[0][0], entry[0][1])
2016
# parent id is the entry for the path in the target tree
2017
# TODO: these are the same for an entire directory: cache em.
2018
parent_id = state._get_entry(target_index,
2019
path_utf8=entry[0][0])[0][2]
2020
if parent_id == entry[0][2]:
2022
if use_filesystem_for_exec:
2023
# We need S_ISREG here, because we aren't sure if this
2026
stat.S_ISREG(path_info[3].st_mode)
2027
and stat.S_IEXEC & path_info[3].st_mode)
2029
target_exec = target_details[3]
2030
return (entry[0][2],
2031
(None, utf8_decode(path)[0]),
2035
(None, utf8_decode(entry[0][1])[0]),
2036
(None, path_info[2]),
2037
(None, target_exec))
2039
# but its not on disk: we deliberately treat this as just
2040
# never-present. (Why ?! - RBC 20070224)
2042
elif source_minikind in 'fdlt' and target_minikind in 'a':
2043
# unversioned, possibly, or possibly not deleted: we dont care.
2044
# if its still on disk, *and* theres no other entry at this
2045
# path [we dont know this in this routine at the moment -
2046
# perhaps we should change this - then it would be an unknown.
2047
old_path = pathjoin(entry[0][0], entry[0][1])
2048
# parent id is the entry for the path in the target tree
2049
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
2050
if parent_id == entry[0][2]:
2052
return (entry[0][2],
2053
(utf8_decode(old_path)[0], None),
2057
(utf8_decode(entry[0][1])[0], None),
2058
(_minikind_to_kind[source_minikind], None),
2059
(source_details[3], None))
2060
elif source_minikind in 'fdlt' and target_minikind in 'r':
2061
# a rename; could be a true rename, or a rename inherited from
2062
# a renamed parent. TODO: handle this efficiently. Its not
2063
# common case to rename dirs though, so a correct but slow
2064
# implementation will do.
2065
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
2066
search_specific_files.add(target_details[1])
2067
elif source_minikind in 'ra' and target_minikind in 'ra':
2068
# neither of the selected trees contain this file,
2069
# so skip over it. This is not currently directly tested, but
2070
# is indirectly via test_too_much.TestCommands.test_conflicts.
2073
raise AssertionError("don't know how to compare "
2074
"source_minikind=%r, target_minikind=%r"
2075
% (source_minikind, target_minikind))
2076
## import pdb;pdb.set_trace()
2079
while search_specific_files:
2080
# TODO: the pending list should be lexically sorted? the
2081
# interface doesn't require it.
2082
current_root = search_specific_files.pop()
2083
current_root_unicode = current_root.decode('utf8')
2084
searched_specific_files.add(current_root)
2085
# process the entries for this containing directory: the rest will be
2086
# found by their parents recursively.
2087
root_entries = _entries_for_path(current_root)
2088
root_abspath = self.target.abspath(current_root_unicode)
2090
root_stat = os.lstat(root_abspath)
2092
if e.errno == errno.ENOENT:
2093
# the path does not exist: let _process_entry know that.
2094
root_dir_info = None
2096
# some other random error: hand it up.
2099
root_dir_info = ('', current_root,
2100
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
2102
if root_dir_info[2] == 'directory':
2103
if self.target._directory_is_tree_reference(
2104
current_root.decode('utf8')):
2105
root_dir_info = root_dir_info[:2] + \
2106
('tree-reference',) + root_dir_info[3:]
2108
if not root_entries and not root_dir_info:
2109
# this specified path is not present at all, skip it.
2111
path_handled = False
2112
for entry in root_entries:
2113
result = _process_entry(entry, root_dir_info)
2114
if result is not None:
2116
if result is not uninteresting:
2118
if want_unversioned and not path_handled and root_dir_info:
2119
new_executable = bool(
2120
stat.S_ISREG(root_dir_info[3].st_mode)
2121
and stat.S_IEXEC & root_dir_info[3].st_mode)
2123
(None, current_root_unicode),
2127
(None, splitpath(current_root_unicode)[-1]),
2128
(None, root_dir_info[2]),
2129
(None, new_executable)
2131
initial_key = (current_root, '', '')
2132
block_index, _ = state._find_block_index_from_key(initial_key)
2133
if block_index == 0:
2134
# we have processed the total root already, but because the
2135
# initial key matched it we should skip it here.
2137
if root_dir_info and root_dir_info[2] == 'tree-reference':
2138
current_dir_info = None
2140
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
2142
current_dir_info = dir_iterator.next()
2144
# on win32, python2.4 has e.errno == ERROR_DIRECTORY, but
2145
# python 2.5 has e.errno == EINVAL,
2146
# and e.winerror == ERROR_DIRECTORY
2147
e_winerror = getattr(e, 'winerror', None)
2148
win_errors = (ERROR_DIRECTORY, ERROR_PATH_NOT_FOUND)
2149
# there may be directories in the inventory even though
2150
# this path is not a file on disk: so mark it as end of
2152
if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
2153
current_dir_info = None
2154
elif (sys.platform == 'win32'
2155
and (e.errno in win_errors
2156
or e_winerror in win_errors)):
2157
current_dir_info = None
2161
if current_dir_info[0][0] == '':
2162
# remove .bzr from iteration
2163
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
2164
assert current_dir_info[1][bzr_index][0] == '.bzr'
2165
del current_dir_info[1][bzr_index]
2166
# walk until both the directory listing and the versioned metadata
2168
if (block_index < len(state._dirblocks) and
2169
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2170
current_block = state._dirblocks[block_index]
2172
current_block = None
2173
while (current_dir_info is not None or
2174
current_block is not None):
2175
if (current_dir_info and current_block
2176
and current_dir_info[0][0] != current_block[0]):
2177
if current_dir_info[0][0].split('/') < current_block[0].split('/'):
2178
# filesystem data refers to paths not covered by the dirblock.
2179
# this has two possibilities:
2180
# A) it is versioned but empty, so there is no block for it
2181
# B) it is not versioned.
2183
# if (A) then we need to recurse into it to check for
2184
# new unknown files or directories.
2185
# if (B) then we should ignore it, because we don't
2186
# recurse into unknown directories.
2188
while path_index < len(current_dir_info[1]):
2189
current_path_info = current_dir_info[1][path_index]
2190
if want_unversioned:
2191
if current_path_info[2] == 'directory':
2192
if self.target._directory_is_tree_reference(
2193
current_path_info[0].decode('utf8')):
2194
current_path_info = current_path_info[:2] + \
2195
('tree-reference',) + current_path_info[3:]
2196
new_executable = bool(
2197
stat.S_ISREG(current_path_info[3].st_mode)
2198
and stat.S_IEXEC & current_path_info[3].st_mode)
2200
(None, utf8_decode(current_path_info[0])[0]),
2204
(None, utf8_decode(current_path_info[1])[0]),
2205
(None, current_path_info[2]),
2206
(None, new_executable))
2207
# dont descend into this unversioned path if it is
2209
if current_path_info[2] in ('directory',
2211
del current_dir_info[1][path_index]
2215
# This dir info has been handled, go to the next
2217
current_dir_info = dir_iterator.next()
2218
except StopIteration:
2219
current_dir_info = None
2221
# We have a dirblock entry for this location, but there
2222
# is no filesystem path for this. This is most likely
2223
# because a directory was removed from the disk.
2224
# We don't have to report the missing directory,
2225
# because that should have already been handled, but we
2226
# need to handle all of the files that are contained
2228
for current_entry in current_block[1]:
2229
# entry referring to file not present on disk.
2230
# advance the entry only, after processing.
2231
result = _process_entry(current_entry, None)
2232
if result is not None:
2233
if result is not uninteresting:
2236
if (block_index < len(state._dirblocks) and
2237
osutils.is_inside(current_root,
2238
state._dirblocks[block_index][0])):
2239
current_block = state._dirblocks[block_index]
2241
current_block = None
2244
if current_block and entry_index < len(current_block[1]):
2245
current_entry = current_block[1][entry_index]
2247
current_entry = None
2248
advance_entry = True
2250
if current_dir_info and path_index < len(current_dir_info[1]):
2251
current_path_info = current_dir_info[1][path_index]
2252
if current_path_info[2] == 'directory':
2253
if self.target._directory_is_tree_reference(
2254
current_path_info[0].decode('utf8')):
2255
current_path_info = current_path_info[:2] + \
2256
('tree-reference',) + current_path_info[3:]
2258
current_path_info = None
2260
path_handled = False
2261
while (current_entry is not None or
2262
current_path_info is not None):
2263
if current_entry is None:
2264
# the check for path_handled when the path is adnvaced
2265
# will yield this path if needed.
2267
elif current_path_info is None:
2268
# no path is fine: the per entry code will handle it.
2269
result = _process_entry(current_entry, current_path_info)
2270
if result is not None:
2271
if result is not uninteresting:
2273
elif (current_entry[0][1] != current_path_info[1]
2274
or current_entry[1][target_index][0] in 'ar'):
2275
# The current path on disk doesn't match the dirblock
2276
# record. Either the dirblock is marked as absent, or
2277
# the file on disk is not present at all in the
2278
# dirblock. Either way, report about the dirblock
2279
# entry, and let other code handle the filesystem one.
2281
# Compare the basename for these files to determine
2283
if current_path_info[1] < current_entry[0][1]:
2284
# extra file on disk: pass for now, but only
2285
# increment the path, not the entry
2286
advance_entry = False
2288
# entry referring to file not present on disk.
2289
# advance the entry only, after processing.
2290
result = _process_entry(current_entry, None)
2291
if result is not None:
2292
if result is not uninteresting:
2294
advance_path = False
2296
result = _process_entry(current_entry, current_path_info)
2297
if result is not None:
2299
if result is not uninteresting:
2301
if advance_entry and current_entry is not None:
2303
if entry_index < len(current_block[1]):
2304
current_entry = current_block[1][entry_index]
2306
current_entry = None
2308
advance_entry = True # reset the advance flaga
2309
if advance_path and current_path_info is not None:
2310
if not path_handled:
2311
# unversioned in all regards
2312
if want_unversioned:
2313
new_executable = bool(
2314
stat.S_ISREG(current_path_info[3].st_mode)
2315
and stat.S_IEXEC & current_path_info[3].st_mode)
2317
(None, utf8_decode(current_path_info[0])[0]),
2321
(None, utf8_decode(current_path_info[1])[0]),
2322
(None, current_path_info[2]),
2323
(None, new_executable))
2324
# dont descend into this unversioned path if it is
2326
if current_path_info[2] in ('directory'):
2327
del current_dir_info[1][path_index]
2329
# dont descend the disk iterator into any tree
2331
if current_path_info[2] == 'tree-reference':
2332
del current_dir_info[1][path_index]
2335
if path_index < len(current_dir_info[1]):
2336
current_path_info = current_dir_info[1][path_index]
2337
if current_path_info[2] == 'directory':
2338
if self.target._directory_is_tree_reference(
2339
current_path_info[0].decode('utf8')):
2340
current_path_info = current_path_info[:2] + \
2341
('tree-reference',) + current_path_info[3:]
2343
current_path_info = None
2344
path_handled = False
2346
advance_path = True # reset the advance flagg.
2347
if current_block is not None:
2349
if (block_index < len(state._dirblocks) and
2350
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2351
current_block = state._dirblocks[block_index]
2353
current_block = None
2354
if current_dir_info is not None:
2356
current_dir_info = dir_iterator.next()
2357
except StopIteration:
2358
current_dir_info = None
2096
2362
def is_compatible(source, target):
2097
2363
# the target must be a dirstate working tree
2098
if not isinstance(target, DirStateWorkingTree):
2364
if not isinstance(target, WorkingTree4):
2100
# the source must be a revtree or dirstate rev tree.
2366
# the source must be a revtreee or dirstate rev tree.
2101
2367
if not isinstance(source,
2102
2368
(revisiontree.RevisionTree, DirStateRevisionTree)):
2104
2370
# the source revid must be in the target dirstate
2105
if not (source._revision_id == _mod_revision.NULL_REVISION or
2371
if not (source._revision_id == NULL_REVISION or
2106
2372
source._revision_id in target.get_parent_ids()):
2107
# TODO: what about ghosts? it may well need to
2373
# TODO: what about ghosts? it may well need to
2108
2374
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
