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
1761
if not found_versioned:
2081
1762
# 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)
1764
all_versioned = False
1766
if not all_versioned:
1767
raise errors.PathsNotVersionedError(specific_files)
2086
1768
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2087
search_specific_files = osutils.minimum_path_selection(specific_files)
1769
search_specific_files = set()
1770
for path in specific_files:
1771
other_specific_files = specific_files.difference(set([path]))
1772
if not osutils.is_inside_any(other_specific_files, path):
1773
# this is a top level path, we must check it.
1774
search_specific_files.add(path)
1776
# compare source_index and target_index at or under each element of search_specific_files.
1777
# follow the following comparison table. Note that we only want to do diff operations when
1778
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1782
# Source | Target | disk | action
1783
# r | fdlt | | add source to search, add id path move and perform
1784
# | | | diff check on source-target
1785
# r | fdlt | a | dangling file that was present in the basis.
1787
# r | a | | add source to search
1789
# r | r | | this path is present in a non-examined tree, skip.
1790
# r | r | a | this path is present in a non-examined tree, skip.
1791
# a | fdlt | | add new id
1792
# a | fdlt | a | dangling locally added file, skip
1793
# a | a | | not present in either tree, skip
1794
# a | a | a | not present in any tree, skip
1795
# a | r | | not present in either tree at this path, skip as it
1796
# | | | may not be selected by the users list of paths.
1797
# a | r | a | not present in either tree at this path, skip as it
1798
# | | | may not be selected by the users list of paths.
1799
# fdlt | fdlt | | content in both: diff them
1800
# fdlt | fdlt | a | deleted locally, but not unversioned - show as deleted ?
1801
# fdlt | a | | unversioned: output deleted id for now
1802
# fdlt | a | a | unversioned and deleted: output deleted id
1803
# fdlt | r | | relocated in this tree, so add target to search.
1804
# | | | Dont diff, we will see an r,fd; pair when we reach
1805
# | | | this id at the other path.
1806
# fdlt | r | a | relocated in this tree, so add target to search.
1807
# | | | Dont diff, we will see an r,fd; pair when we reach
1808
# | | | this id at the other path.
1810
# for all search_indexs in each path at or under each element of
1811
# search_specific_files, if the detail is relocated: add the id, and add the
1812
# relocated path as one to search if its not searched already. If the
1813
# detail is not relocated, add the id.
1814
searched_specific_files = set()
1815
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1816
# Using a list so that we can access the values and change them in
1817
# nested scope. Each one is [path, file_id, entry]
1818
last_source_parent = [None, None]
1819
last_target_parent = [None, None]
2089
1821
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()
1823
# Just a sentry, so that _process_entry can say that this
1824
# record is handled, but isn't interesting to process (unchanged)
1825
uninteresting = object()
1828
old_dirname_to_file_id = {}
1829
new_dirname_to_file_id = {}
1830
# TODO: jam 20070516 - Avoid the _get_entry lookup overhead by
1831
# keeping a cache of directories that we have seen.
1833
def _process_entry(entry, path_info):
1834
"""Compare an entry and real disk to generate delta information.
1836
:param path_info: top_relpath, basename, kind, lstat, abspath for
1837
the path of entry. If None, then the path is considered absent.
1838
(Perhaps we should pass in a concrete entry for this ?)
1839
Basename is returned as a utf8 string because we expect this
1840
tuple will be ignored, and don't want to take the time to
1842
:return: None if these don't match
1843
A tuple of information about the change, or
1844
the object 'uninteresting' if these match, but are
1845
basically identical.
1847
if source_index is None:
1848
source_details = NULL_PARENT_DETAILS
1850
source_details = entry[1][source_index]
1851
target_details = entry[1][target_index]
1852
target_minikind = target_details[0]
1853
if path_info is not None and target_minikind in 'fdlt':
1854
assert target_index == 0
1855
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
1856
stat_value=path_info[3])
1857
# The entry may have been modified by update_entry
1858
target_details = entry[1][target_index]
1859
target_minikind = target_details[0]
1862
file_id = entry[0][2]
1863
source_minikind = source_details[0]
1864
if source_minikind in 'fdltr' and target_minikind in 'fdlt':
1865
# claimed content in both: diff
1866
# r | fdlt | | add source to search, add id path move and perform
1867
# | | | diff check on source-target
1868
# r | fdlt | a | dangling file that was present in the basis.
1870
if source_minikind in 'r':
1871
# add the source to the search path to find any children it
1872
# has. TODO ? : only add if it is a container ?
1873
if not osutils.is_inside_any(searched_specific_files,
1875
search_specific_files.add(source_details[1])
1876
# generate the old path; this is needed for stating later
1878
old_path = source_details[1]
1879
old_dirname, old_basename = os.path.split(old_path)
1880
path = pathjoin(entry[0][0], entry[0][1])
1881
old_entry = state._get_entry(source_index,
1883
# update the source details variable to be the real
1885
source_details = old_entry[1][source_index]
1886
source_minikind = source_details[0]
1888
old_dirname = entry[0][0]
1889
old_basename = entry[0][1]
1890
old_path = path = None
1891
if path_info is None:
1892
# the file is missing on disk, show as removed.
1893
content_change = True
1897
# source and target are both versioned and disk file is present.
1898
target_kind = path_info[2]
1899
if target_kind == 'directory':
1901
old_path = path = pathjoin(old_dirname, old_basename)
1902
new_dirname_to_file_id[path] = file_id
1903
if source_minikind != 'd':
1904
content_change = True
1906
# directories have no fingerprint
1907
content_change = False
1909
elif target_kind == 'file':
1910
if source_minikind != 'f':
1911
content_change = True
1913
# We could check the size, but we already have the
1915
content_change = (link_or_sha1 != source_details[1])
1916
# Target details is updated at update_entry time
1917
if use_filesystem_for_exec:
1918
# We don't need S_ISREG here, because we are sure
1919
# we are dealing with a file.
1920
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
1922
target_exec = target_details[3]
1923
elif target_kind == 'symlink':
1924
if source_minikind != 'l':
1925
content_change = True
1927
content_change = (link_or_sha1 != source_details[1])
1929
elif target_kind == 'tree-reference':
1930
if source_minikind != 't':
1931
content_change = True
1933
content_change = False
1936
raise Exception, "unknown kind %s" % path_info[2]
1937
if source_minikind == 'd':
1939
old_path = path = pathjoin(old_dirname, old_basename)
1940
old_dirname_to_file_id[old_path] = file_id
1941
# parent id is the entry for the path in the target tree
1942
if old_dirname == last_source_parent[0]:
1943
source_parent_id = last_source_parent[1]
1946
source_parent_id = old_dirname_to_file_id[old_dirname]
1948
source_parent_entry = state._get_entry(source_index,
1949
path_utf8=old_dirname)
1950
source_parent_id = source_parent_entry[0][2]
1951
if source_parent_id == entry[0][2]:
1952
# This is the root, so the parent is None
1953
source_parent_id = None
1955
last_source_parent[0] = old_dirname
1956
last_source_parent[1] = source_parent_id
1957
new_dirname = entry[0][0]
1958
if new_dirname == last_target_parent[0]:
1959
target_parent_id = last_target_parent[1]
1962
target_parent_id = new_dirname_to_file_id[new_dirname]
1964
# TODO: We don't always need to do the lookup, because the
1965
# parent entry will be the same as the source entry.
1966
target_parent_entry = state._get_entry(target_index,
1967
path_utf8=new_dirname)
1968
assert target_parent_entry != (None, None), (
1969
"Could not find target parent in wt: %s\nparent of: %s"
1970
% (new_dirname, entry))
1971
target_parent_id = target_parent_entry[0][2]
1972
if target_parent_id == entry[0][2]:
1973
# This is the root, so the parent is None
1974
target_parent_id = None
1976
last_target_parent[0] = new_dirname
1977
last_target_parent[1] = target_parent_id
1979
source_exec = source_details[3]
1980
if (include_unchanged
1982
or source_parent_id != target_parent_id
1983
or old_basename != entry[0][1]
1984
or source_exec != target_exec
1986
if old_path is None:
1987
old_path = path = pathjoin(old_dirname, old_basename)
1988
old_path_u = utf8_decode(old_path)[0]
1991
old_path_u = utf8_decode(old_path)[0]
1992
if old_path == path:
1995
path_u = utf8_decode(path)[0]
1996
source_kind = _minikind_to_kind[source_minikind]
1997
return (entry[0][2],
1998
(old_path_u, path_u),
2001
(source_parent_id, target_parent_id),
2002
(utf8_decode(old_basename)[0], utf8_decode(entry[0][1])[0]),
2003
(source_kind, target_kind),
2004
(source_exec, target_exec))
2006
return uninteresting
2007
elif source_minikind in 'a' and target_minikind in 'fdlt':
2008
# looks like a new file
2009
if path_info is not None:
2010
path = pathjoin(entry[0][0], entry[0][1])
2011
# parent id is the entry for the path in the target tree
2012
# TODO: these are the same for an entire directory: cache em.
2013
parent_id = state._get_entry(target_index,
2014
path_utf8=entry[0][0])[0][2]
2015
if parent_id == entry[0][2]:
2017
if use_filesystem_for_exec:
2018
# We need S_ISREG here, because we aren't sure if this
2021
stat.S_ISREG(path_info[3].st_mode)
2022
and stat.S_IEXEC & path_info[3].st_mode)
2024
target_exec = target_details[3]
2025
return (entry[0][2],
2026
(None, utf8_decode(path)[0]),
2030
(None, utf8_decode(entry[0][1])[0]),
2031
(None, path_info[2]),
2032
(None, target_exec))
2034
# but its not on disk: we deliberately treat this as just
2035
# never-present. (Why ?! - RBC 20070224)
2037
elif source_minikind in 'fdlt' and target_minikind in 'a':
2038
# unversioned, possibly, or possibly not deleted: we dont care.
2039
# if its still on disk, *and* theres no other entry at this
2040
# path [we dont know this in this routine at the moment -
2041
# perhaps we should change this - then it would be an unknown.
2042
old_path = pathjoin(entry[0][0], entry[0][1])
2043
# parent id is the entry for the path in the target tree
2044
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
2045
if parent_id == entry[0][2]:
2047
return (entry[0][2],
2048
(utf8_decode(old_path)[0], None),
2052
(utf8_decode(entry[0][1])[0], None),
2053
(_minikind_to_kind[source_minikind], None),
2054
(source_details[3], None))
2055
elif source_minikind in 'fdlt' and target_minikind in 'r':
2056
# a rename; could be a true rename, or a rename inherited from
2057
# a renamed parent. TODO: handle this efficiently. Its not
2058
# common case to rename dirs though, so a correct but slow
2059
# implementation will do.
2060
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
2061
search_specific_files.add(target_details[1])
2062
elif source_minikind in 'ra' and target_minikind in 'ra':
2063
# neither of the selected trees contain this file,
2064
# so skip over it. This is not currently directly tested, but
2065
# is indirectly via test_too_much.TestCommands.test_conflicts.
2068
raise AssertionError("don't know how to compare "
2069
"source_minikind=%r, target_minikind=%r"
2070
% (source_minikind, target_minikind))
2071
## import pdb;pdb.set_trace()
2074
while search_specific_files:
2075
# TODO: the pending list should be lexically sorted? the
2076
# interface doesn't require it.
2077
current_root = search_specific_files.pop()
2078
current_root_unicode = current_root.decode('utf8')
2079
searched_specific_files.add(current_root)
2080
# process the entries for this containing directory: the rest will be
2081
# found by their parents recursively.
2082
root_entries = _entries_for_path(current_root)
2083
root_abspath = self.target.abspath(current_root_unicode)
2085
root_stat = os.lstat(root_abspath)
2087
if e.errno == errno.ENOENT:
2088
# the path does not exist: let _process_entry know that.
2089
root_dir_info = None
2091
# some other random error: hand it up.
2094
root_dir_info = ('', current_root,
2095
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
2097
if root_dir_info[2] == 'directory':
2098
if self.target._directory_is_tree_reference(
2099
current_root.decode('utf8')):
2100
root_dir_info = root_dir_info[:2] + \
2101
('tree-reference',) + root_dir_info[3:]
2103
if not root_entries and not root_dir_info:
2104
# this specified path is not present at all, skip it.
2106
path_handled = False
2107
for entry in root_entries:
2108
result = _process_entry(entry, root_dir_info)
2109
if result is not None:
2111
if result is not uninteresting:
2113
if want_unversioned and not path_handled and root_dir_info:
2114
new_executable = bool(
2115
stat.S_ISREG(root_dir_info[3].st_mode)
2116
and stat.S_IEXEC & root_dir_info[3].st_mode)
2118
(None, current_root_unicode),
2122
(None, splitpath(current_root_unicode)[-1]),
2123
(None, root_dir_info[2]),
2124
(None, new_executable)
2126
initial_key = (current_root, '', '')
2127
block_index, _ = state._find_block_index_from_key(initial_key)
2128
if block_index == 0:
2129
# we have processed the total root already, but because the
2130
# initial key matched it we should skip it here.
2132
if root_dir_info and root_dir_info[2] == 'tree-reference':
2133
current_dir_info = None
2135
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
2137
current_dir_info = dir_iterator.next()
2139
# on win32, python2.4 has e.errno == ERROR_DIRECTORY, but
2140
# python 2.5 has e.errno == EINVAL,
2141
# and e.winerror == ERROR_DIRECTORY
2142
e_winerror = getattr(e, 'winerror', None)
2143
win_errors = (ERROR_DIRECTORY, ERROR_PATH_NOT_FOUND)
2144
# there may be directories in the inventory even though
2145
# this path is not a file on disk: so mark it as end of
2147
if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
2148
current_dir_info = None
2149
elif (sys.platform == 'win32'
2150
and (e.errno in win_errors
2151
or e_winerror in win_errors)):
2152
current_dir_info = None
2156
if current_dir_info[0][0] == '':
2157
# remove .bzr from iteration
2158
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
2159
assert current_dir_info[1][bzr_index][0] == '.bzr'
2160
del current_dir_info[1][bzr_index]
2161
# walk until both the directory listing and the versioned metadata
2163
if (block_index < len(state._dirblocks) and
2164
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2165
current_block = state._dirblocks[block_index]
2167
current_block = None
2168
while (current_dir_info is not None or
2169
current_block is not None):
2170
if (current_dir_info and current_block
2171
and current_dir_info[0][0] != current_block[0]):
2172
if cmp_by_dirs(current_dir_info[0][0], current_block[0]) < 0:
2173
# filesystem data refers to paths not covered by the dirblock.
2174
# this has two possibilities:
2175
# A) it is versioned but empty, so there is no block for it
2176
# B) it is not versioned.
2178
# if (A) then we need to recurse into it to check for
2179
# new unknown files or directories.
2180
# if (B) then we should ignore it, because we don't
2181
# recurse into unknown directories.
2183
while path_index < len(current_dir_info[1]):
2184
current_path_info = current_dir_info[1][path_index]
2185
if want_unversioned:
2186
if current_path_info[2] == 'directory':
2187
if self.target._directory_is_tree_reference(
2188
current_path_info[0].decode('utf8')):
2189
current_path_info = current_path_info[:2] + \
2190
('tree-reference',) + current_path_info[3:]
2191
new_executable = bool(
2192
stat.S_ISREG(current_path_info[3].st_mode)
2193
and stat.S_IEXEC & current_path_info[3].st_mode)
2195
(None, utf8_decode(current_path_info[0])[0]),
2199
(None, utf8_decode(current_path_info[1])[0]),
2200
(None, current_path_info[2]),
2201
(None, new_executable))
2202
# dont descend into this unversioned path if it is
2204
if current_path_info[2] in ('directory',
2206
del current_dir_info[1][path_index]
2210
# This dir info has been handled, go to the next
2212
current_dir_info = dir_iterator.next()
2213
except StopIteration:
2214
current_dir_info = None
2216
# We have a dirblock entry for this location, but there
2217
# is no filesystem path for this. This is most likely
2218
# because a directory was removed from the disk.
2219
# We don't have to report the missing directory,
2220
# because that should have already been handled, but we
2221
# need to handle all of the files that are contained
2223
for current_entry in current_block[1]:
2224
# entry referring to file not present on disk.
2225
# advance the entry only, after processing.
2226
result = _process_entry(current_entry, None)
2227
if result is not None:
2228
if result is not uninteresting:
2231
if (block_index < len(state._dirblocks) and
2232
osutils.is_inside(current_root,
2233
state._dirblocks[block_index][0])):
2234
current_block = state._dirblocks[block_index]
2236
current_block = None
2239
if current_block and entry_index < len(current_block[1]):
2240
current_entry = current_block[1][entry_index]
2242
current_entry = None
2243
advance_entry = True
2245
if current_dir_info and path_index < len(current_dir_info[1]):
2246
current_path_info = current_dir_info[1][path_index]
2247
if current_path_info[2] == 'directory':
2248
if self.target._directory_is_tree_reference(
2249
current_path_info[0].decode('utf8')):
2250
current_path_info = current_path_info[:2] + \
2251
('tree-reference',) + current_path_info[3:]
2253
current_path_info = None
2255
path_handled = False
2256
while (current_entry is not None or
2257
current_path_info is not None):
2258
if current_entry is None:
2259
# the check for path_handled when the path is adnvaced
2260
# will yield this path if needed.
2262
elif current_path_info is None:
2263
# no path is fine: the per entry code will handle it.
2264
result = _process_entry(current_entry, current_path_info)
2265
if result is not None:
2266
if result is not uninteresting:
2268
elif (current_entry[0][1] != current_path_info[1]
2269
or current_entry[1][target_index][0] in 'ar'):
2270
# The current path on disk doesn't match the dirblock
2271
# record. Either the dirblock is marked as absent, or
2272
# the file on disk is not present at all in the
2273
# dirblock. Either way, report about the dirblock
2274
# entry, and let other code handle the filesystem one.
2276
# Compare the basename for these files to determine
2278
if current_path_info[1] < current_entry[0][1]:
2279
# extra file on disk: pass for now, but only
2280
# increment the path, not the entry
2281
advance_entry = False
2283
# entry referring to file not present on disk.
2284
# advance the entry only, after processing.
2285
result = _process_entry(current_entry, None)
2286
if result is not None:
2287
if result is not uninteresting:
2289
advance_path = False
2291
result = _process_entry(current_entry, current_path_info)
2292
if result is not None:
2294
if result is not uninteresting:
2296
if advance_entry and current_entry is not None:
2298
if entry_index < len(current_block[1]):
2299
current_entry = current_block[1][entry_index]
2301
current_entry = None
2303
advance_entry = True # reset the advance flaga
2304
if advance_path and current_path_info is not None:
2305
if not path_handled:
2306
# unversioned in all regards
2307
if want_unversioned:
2308
new_executable = bool(
2309
stat.S_ISREG(current_path_info[3].st_mode)
2310
and stat.S_IEXEC & current_path_info[3].st_mode)
2312
(None, utf8_decode(current_path_info[0])[0]),
2316
(None, utf8_decode(current_path_info[1])[0]),
2317
(None, current_path_info[2]),
2318
(None, new_executable))
2319
# dont descend into this unversioned path if it is
2321
if current_path_info[2] in ('directory'):
2322
del current_dir_info[1][path_index]
2324
# dont descend the disk iterator into any tree
2326
if current_path_info[2] == 'tree-reference':
2327
del current_dir_info[1][path_index]
2330
if path_index < len(current_dir_info[1]):
2331
current_path_info = current_dir_info[1][path_index]
2332
if current_path_info[2] == 'directory':
2333
if self.target._directory_is_tree_reference(
2334
current_path_info[0].decode('utf8')):
2335
current_path_info = current_path_info[:2] + \
2336
('tree-reference',) + current_path_info[3:]
2338
current_path_info = None
2339
path_handled = False
2341
advance_path = True # reset the advance flagg.
2342
if current_block is not None:
2344
if (block_index < len(state._dirblocks) and
2345
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2346
current_block = state._dirblocks[block_index]
2348
current_block = None
2349
if current_dir_info is not None:
2351
current_dir_info = dir_iterator.next()
2352
except StopIteration:
2353
current_dir_info = None
2096
2357
def is_compatible(source, target):
2097
2358
# the target must be a dirstate working tree
2098
if not isinstance(target, DirStateWorkingTree):
2359
if not isinstance(target, WorkingTree4):
2100
# the source must be a revtree or dirstate rev tree.
2361
# the source must be a revtreee or dirstate rev tree.
2101
2362
if not isinstance(source,
2102
2363
(revisiontree.RevisionTree, DirStateRevisionTree)):
2104
2365
# the source revid must be in the target dirstate
2105
if not (source._revision_id == _mod_revision.NULL_REVISION or
2366
if not (source._revision_id == NULL_REVISION or
2106
2367
source._revision_id in target.get_parent_ids()):
2107
# TODO: what about ghosts? it may well need to
2368
# TODO: what about ghosts? it may well need to
2108
2369
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
