1263
1234
@needs_tree_write_lock
1264
1235
def _write_inventory(self, inv):
1265
1236
"""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)
1237
assert not self._dirty, "attempting to write an inventory when the dirstate is dirty will cause data loss"
1238
self.current_dirstate().set_state_from_inventory(inv)
1239
self._make_dirty(reset_inventory=False)
1240
if self._inventory is not None:
1280
1241
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):
1245
class WorkingTreeFormat4(WorkingTreeFormat3):
1246
"""The first consolidated dirstate working tree format.
1249
- exists within a metadir controlling .bzr
1250
- includes an explicit version marker for the workingtree control
1251
files, separate from the BzrDir format
1252
- modifies the hash cache format
1253
- is new in bzr 0.15
1254
- uses a LockDir to guard access to it.
1257
upgrade_recommended = False
1259
def get_format_string(self):
1260
"""See WorkingTreeFormat.get_format_string()."""
1261
return "Bazaar Working Tree Format 4 (bzr 0.15)\n"
1263
def get_format_description(self):
1264
"""See WorkingTreeFormat.get_format_description()."""
1265
return "Working tree format 4"
1267
def initialize(self, a_bzrdir, revision_id=None):
1377
1268
"""See WorkingTreeFormat.initialize().
1379
1270
:param revision_id: allows creating a working tree at a different
1380
1271
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
1273
These trees get an initial random root id, if their repository supports
1389
1274
rich root data, TREE_ROOT otherwise.
1276
revision_id = osutils.safe_revision_id(revision_id)
1391
1277
if not isinstance(a_bzrdir.transport, LocalTransport):
1392
1278
raise errors.NotLocalUrl(a_bzrdir.transport.base)
1393
1279
transport = a_bzrdir.get_workingtree_transport(self)
1394
1280
control_files = self._open_control_files(a_bzrdir)
1395
1281
control_files.create_lock()
1396
1282
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()
1283
control_files.put_utf8('format', self.get_format_string())
1284
branch = a_bzrdir.open_branch()
1403
1285
if revision_id is None:
1404
1286
revision_id = branch.last_revision()
1405
1287
local_path = transport.local_abspath('dirstate')
2080
1791
if not found_versioned:
2081
1792
# 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)
1794
all_versioned = False
1796
if not all_versioned:
1797
raise errors.PathsNotVersionedError(specific_files)
2086
1798
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2087
search_specific_files = osutils.minimum_path_selection(specific_files)
1799
search_specific_files = set()
1800
for path in specific_files:
1801
other_specific_files = specific_files.difference(set([path]))
1802
if not osutils.is_inside_any(other_specific_files, path):
1803
# this is a top level path, we must check it.
1804
search_specific_files.add(path)
1806
# compare source_index and target_index at or under each element of search_specific_files.
1807
# follow the following comparison table. Note that we only want to do diff operations when
1808
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1812
# Source | Target | disk | action
1813
# r | fdlt | | add source to search, add id path move and perform
1814
# | | | diff check on source-target
1815
# r | fdlt | a | dangling file that was present in the basis.
1817
# r | a | | add source to search
1819
# r | r | | this path is present in a non-examined tree, skip.
1820
# r | r | a | this path is present in a non-examined tree, skip.
1821
# a | fdlt | | add new id
1822
# a | fdlt | a | dangling locally added file, skip
1823
# a | a | | not present in either tree, skip
1824
# a | a | a | not present in any tree, skip
1825
# a | r | | not present in either tree at this path, skip as it
1826
# | | | may not be selected by the users list of paths.
1827
# a | r | a | not present in either tree at this path, skip as it
1828
# | | | may not be selected by the users list of paths.
1829
# fdlt | fdlt | | content in both: diff them
1830
# fdlt | fdlt | a | deleted locally, but not unversioned - show as deleted ?
1831
# fdlt | a | | unversioned: output deleted id for now
1832
# fdlt | a | a | unversioned and deleted: output deleted id
1833
# fdlt | r | | relocated in this tree, so add target to search.
1834
# | | | Dont diff, we will see an r,fd; pair when we reach
1835
# | | | this id at the other path.
1836
# fdlt | r | a | relocated in this tree, so add target to search.
1837
# | | | Dont diff, we will see an r,fd; pair when we reach
1838
# | | | this id at the other path.
1840
# for all search_indexs in each path at or under each element of
1841
# search_specific_files, if the detail is relocated: add the id, and add the
1842
# relocated path as one to search if its not searched already. If the
1843
# detail is not relocated, add the id.
1844
searched_specific_files = set()
1845
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1846
# Using a list so that we can access the values and change them in
1847
# nested scope. Each one is [path, file_id, entry]
1848
last_source_parent = [None, None]
1849
last_target_parent = [None, None]
2089
1851
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()
1853
# Just a sentry, so that _process_entry can say that this
1854
# record is handled, but isn't interesting to process (unchanged)
1855
uninteresting = object()
1858
old_dirname_to_file_id = {}
1859
new_dirname_to_file_id = {}
1860
# TODO: jam 20070516 - Avoid the _get_entry lookup overhead by
1861
# keeping a cache of directories that we have seen.
1863
def _process_entry(entry, path_info):
1864
"""Compare an entry and real disk to generate delta information.
1866
:param path_info: top_relpath, basename, kind, lstat, abspath for
1867
the path of entry. If None, then the path is considered absent.
1868
(Perhaps we should pass in a concrete entry for this ?)
1869
Basename is returned as a utf8 string because we expect this
1870
tuple will be ignored, and don't want to take the time to
1872
:return: None if these don't match
1873
A tuple of information about the change, or
1874
the object 'uninteresting' if these match, but are
1875
basically identical.
1877
if source_index is None:
1878
source_details = NULL_PARENT_DETAILS
1880
source_details = entry[1][source_index]
1881
target_details = entry[1][target_index]
1882
target_minikind = target_details[0]
1883
if path_info is not None and target_minikind in 'fdlt':
1884
assert target_index == 0
1885
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
1886
stat_value=path_info[3])
1887
# The entry may have been modified by update_entry
1888
target_details = entry[1][target_index]
1889
target_minikind = target_details[0]
1892
file_id = entry[0][2]
1893
source_minikind = source_details[0]
1894
if source_minikind in 'fdltr' and target_minikind in 'fdlt':
1895
# claimed content in both: diff
1896
# r | fdlt | | add source to search, add id path move and perform
1897
# | | | diff check on source-target
1898
# r | fdlt | a | dangling file that was present in the basis.
1900
if source_minikind in 'r':
1901
# add the source to the search path to find any children it
1902
# has. TODO ? : only add if it is a container ?
1903
if not osutils.is_inside_any(searched_specific_files,
1905
search_specific_files.add(source_details[1])
1906
# generate the old path; this is needed for stating later
1908
old_path = source_details[1]
1909
old_dirname, old_basename = os.path.split(old_path)
1910
path = pathjoin(entry[0][0], entry[0][1])
1911
old_entry = state._get_entry(source_index,
1913
# update the source details variable to be the real
1915
source_details = old_entry[1][source_index]
1916
source_minikind = source_details[0]
1918
old_dirname = entry[0][0]
1919
old_basename = entry[0][1]
1920
old_path = path = None
1921
if path_info is None:
1922
# the file is missing on disk, show as removed.
1923
content_change = True
1927
# source and target are both versioned and disk file is present.
1928
target_kind = path_info[2]
1929
if target_kind == 'directory':
1931
old_path = path = pathjoin(old_dirname, old_basename)
1932
new_dirname_to_file_id[path] = file_id
1933
if source_minikind != 'd':
1934
content_change = True
1936
# directories have no fingerprint
1937
content_change = False
1939
elif target_kind == 'file':
1940
if source_minikind != 'f':
1941
content_change = True
1943
# We could check the size, but we already have the
1945
content_change = (link_or_sha1 != source_details[1])
1946
# Target details is updated at update_entry time
1947
if use_filesystem_for_exec:
1948
# We don't need S_ISREG here, because we are sure
1949
# we are dealing with a file.
1950
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
1952
target_exec = target_details[3]
1953
elif target_kind == 'symlink':
1954
if source_minikind != 'l':
1955
content_change = True
1957
content_change = (link_or_sha1 != source_details[1])
1959
elif target_kind == 'tree-reference':
1960
if source_minikind != 't':
1961
content_change = True
1963
content_change = False
1966
raise Exception, "unknown kind %s" % path_info[2]
1967
if source_minikind == 'd':
1969
old_path = path = pathjoin(old_dirname, old_basename)
1970
old_dirname_to_file_id[old_path] = file_id
1971
# parent id is the entry for the path in the target tree
1972
if old_dirname == last_source_parent[0]:
1973
source_parent_id = last_source_parent[1]
1976
source_parent_id = old_dirname_to_file_id[old_dirname]
1978
source_parent_entry = state._get_entry(source_index,
1979
path_utf8=old_dirname)
1980
source_parent_id = source_parent_entry[0][2]
1981
if source_parent_id == entry[0][2]:
1982
# This is the root, so the parent is None
1983
source_parent_id = None
1985
last_source_parent[0] = old_dirname
1986
last_source_parent[1] = source_parent_id
1987
new_dirname = entry[0][0]
1988
if new_dirname == last_target_parent[0]:
1989
target_parent_id = last_target_parent[1]
1992
target_parent_id = new_dirname_to_file_id[new_dirname]
1994
# TODO: We don't always need to do the lookup, because the
1995
# parent entry will be the same as the source entry.
1996
target_parent_entry = state._get_entry(target_index,
1997
path_utf8=new_dirname)
1998
assert target_parent_entry != (None, None), (
1999
"Could not find target parent in wt: %s\nparent of: %s"
2000
% (new_dirname, entry))
2001
target_parent_id = target_parent_entry[0][2]
2002
if target_parent_id == entry[0][2]:
2003
# This is the root, so the parent is None
2004
target_parent_id = None
2006
last_target_parent[0] = new_dirname
2007
last_target_parent[1] = target_parent_id
2009
source_exec = source_details[3]
2010
if (include_unchanged
2012
or source_parent_id != target_parent_id
2013
or old_basename != entry[0][1]
2014
or source_exec != target_exec
2016
if old_path is None:
2017
old_path = path = pathjoin(old_dirname, old_basename)
2018
old_path_u = utf8_decode(old_path)[0]
2021
old_path_u = utf8_decode(old_path)[0]
2022
if old_path == path:
2025
path_u = utf8_decode(path)[0]
2026
source_kind = _minikind_to_kind[source_minikind]
2027
return (entry[0][2],
2028
(old_path_u, path_u),
2031
(source_parent_id, target_parent_id),
2032
(utf8_decode(old_basename)[0], utf8_decode(entry[0][1])[0]),
2033
(source_kind, target_kind),
2034
(source_exec, target_exec))
2036
return uninteresting
2037
elif source_minikind in 'a' and target_minikind in 'fdlt':
2038
# looks like a new file
2039
if path_info is not None:
2040
path = pathjoin(entry[0][0], entry[0][1])
2041
# parent id is the entry for the path in the target tree
2042
# TODO: these are the same for an entire directory: cache em.
2043
parent_id = state._get_entry(target_index,
2044
path_utf8=entry[0][0])[0][2]
2045
if parent_id == entry[0][2]:
2047
if use_filesystem_for_exec:
2048
# We need S_ISREG here, because we aren't sure if this
2051
stat.S_ISREG(path_info[3].st_mode)
2052
and stat.S_IEXEC & path_info[3].st_mode)
2054
target_exec = target_details[3]
2055
return (entry[0][2],
2056
(None, utf8_decode(path)[0]),
2060
(None, utf8_decode(entry[0][1])[0]),
2061
(None, path_info[2]),
2062
(None, target_exec))
2064
# but its not on disk: we deliberately treat this as just
2065
# never-present. (Why ?! - RBC 20070224)
2067
elif source_minikind in 'fdlt' and target_minikind in 'a':
2068
# unversioned, possibly, or possibly not deleted: we dont care.
2069
# if its still on disk, *and* theres no other entry at this
2070
# path [we dont know this in this routine at the moment -
2071
# perhaps we should change this - then it would be an unknown.
2072
old_path = pathjoin(entry[0][0], entry[0][1])
2073
# parent id is the entry for the path in the target tree
2074
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
2075
if parent_id == entry[0][2]:
2077
return (entry[0][2],
2078
(utf8_decode(old_path)[0], None),
2082
(utf8_decode(entry[0][1])[0], None),
2083
(_minikind_to_kind[source_minikind], None),
2084
(source_details[3], None))
2085
elif source_minikind in 'fdlt' and target_minikind in 'r':
2086
# a rename; could be a true rename, or a rename inherited from
2087
# a renamed parent. TODO: handle this efficiently. Its not
2088
# common case to rename dirs though, so a correct but slow
2089
# implementation will do.
2090
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
2091
search_specific_files.add(target_details[1])
2092
elif source_minikind in 'ra' and target_minikind in 'ra':
2093
# neither of the selected trees contain this file,
2094
# so skip over it. This is not currently directly tested, but
2095
# is indirectly via test_too_much.TestCommands.test_conflicts.
2098
raise AssertionError("don't know how to compare "
2099
"source_minikind=%r, target_minikind=%r"
2100
% (source_minikind, target_minikind))
2101
## import pdb;pdb.set_trace()
2104
while search_specific_files:
2105
# TODO: the pending list should be lexically sorted? the
2106
# interface doesn't require it.
2107
current_root = search_specific_files.pop()
2108
current_root_unicode = current_root.decode('utf8')
2109
searched_specific_files.add(current_root)
2110
# process the entries for this containing directory: the rest will be
2111
# found by their parents recursively.
2112
root_entries = _entries_for_path(current_root)
2113
root_abspath = self.target.abspath(current_root_unicode)
2115
root_stat = os.lstat(root_abspath)
2117
if e.errno == errno.ENOENT:
2118
# the path does not exist: let _process_entry know that.
2119
root_dir_info = None
2121
# some other random error: hand it up.
2124
root_dir_info = ('', current_root,
2125
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
2127
if root_dir_info[2] == 'directory':
2128
if self.target._directory_is_tree_reference(
2129
current_root.decode('utf8')):
2130
root_dir_info = root_dir_info[:2] + \
2131
('tree-reference',) + root_dir_info[3:]
2133
if not root_entries and not root_dir_info:
2134
# this specified path is not present at all, skip it.
2136
path_handled = False
2137
for entry in root_entries:
2138
result = _process_entry(entry, root_dir_info)
2139
if result is not None:
2141
if result is not uninteresting:
2143
if want_unversioned and not path_handled and root_dir_info:
2144
new_executable = bool(
2145
stat.S_ISREG(root_dir_info[3].st_mode)
2146
and stat.S_IEXEC & root_dir_info[3].st_mode)
2148
(None, current_root_unicode),
2152
(None, splitpath(current_root_unicode)[-1]),
2153
(None, root_dir_info[2]),
2154
(None, new_executable)
2156
initial_key = (current_root, '', '')
2157
block_index, _ = state._find_block_index_from_key(initial_key)
2158
if block_index == 0:
2159
# we have processed the total root already, but because the
2160
# initial key matched it we should skip it here.
2162
if root_dir_info and root_dir_info[2] == 'tree-reference':
2163
current_dir_info = None
2165
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
2167
current_dir_info = dir_iterator.next()
2169
# on win32, python2.4 has e.errno == ERROR_DIRECTORY, but
2170
# python 2.5 has e.errno == EINVAL,
2171
# and e.winerror == ERROR_DIRECTORY
2172
e_winerror = getattr(e, 'winerror', None)
2173
win_errors = (ERROR_DIRECTORY, ERROR_PATH_NOT_FOUND)
2174
# there may be directories in the inventory even though
2175
# this path is not a file on disk: so mark it as end of
2177
if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
2178
current_dir_info = None
2179
elif (sys.platform == 'win32'
2180
and (e.errno in win_errors
2181
or e_winerror in win_errors)):
2182
current_dir_info = None
2186
if current_dir_info[0][0] == '':
2187
# remove .bzr from iteration
2188
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
2189
assert current_dir_info[1][bzr_index][0] == '.bzr'
2190
del current_dir_info[1][bzr_index]
2191
# walk until both the directory listing and the versioned metadata
2193
if (block_index < len(state._dirblocks) and
2194
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2195
current_block = state._dirblocks[block_index]
2197
current_block = None
2198
while (current_dir_info is not None or
2199
current_block is not None):
2200
if (current_dir_info and current_block
2201
and current_dir_info[0][0] != current_block[0]):
2202
if cmp_by_dirs(current_dir_info[0][0], current_block[0]) < 0:
2203
# filesystem data refers to paths not covered by the dirblock.
2204
# this has two possibilities:
2205
# A) it is versioned but empty, so there is no block for it
2206
# B) it is not versioned.
2208
# if (A) then we need to recurse into it to check for
2209
# new unknown files or directories.
2210
# if (B) then we should ignore it, because we don't
2211
# recurse into unknown directories.
2213
while path_index < len(current_dir_info[1]):
2214
current_path_info = current_dir_info[1][path_index]
2215
if want_unversioned:
2216
if current_path_info[2] == 'directory':
2217
if self.target._directory_is_tree_reference(
2218
current_path_info[0].decode('utf8')):
2219
current_path_info = current_path_info[:2] + \
2220
('tree-reference',) + current_path_info[3:]
2221
new_executable = bool(
2222
stat.S_ISREG(current_path_info[3].st_mode)
2223
and stat.S_IEXEC & current_path_info[3].st_mode)
2225
(None, utf8_decode(current_path_info[0])[0]),
2229
(None, utf8_decode(current_path_info[1])[0]),
2230
(None, current_path_info[2]),
2231
(None, new_executable))
2232
# dont descend into this unversioned path if it is
2234
if current_path_info[2] in ('directory',
2236
del current_dir_info[1][path_index]
2240
# This dir info has been handled, go to the next
2242
current_dir_info = dir_iterator.next()
2243
except StopIteration:
2244
current_dir_info = None
2246
# We have a dirblock entry for this location, but there
2247
# is no filesystem path for this. This is most likely
2248
# because a directory was removed from the disk.
2249
# We don't have to report the missing directory,
2250
# because that should have already been handled, but we
2251
# need to handle all of the files that are contained
2253
for current_entry in current_block[1]:
2254
# entry referring to file not present on disk.
2255
# advance the entry only, after processing.
2256
result = _process_entry(current_entry, None)
2257
if result is not None:
2258
if result is not uninteresting:
2261
if (block_index < len(state._dirblocks) and
2262
osutils.is_inside(current_root,
2263
state._dirblocks[block_index][0])):
2264
current_block = state._dirblocks[block_index]
2266
current_block = None
2269
if current_block and entry_index < len(current_block[1]):
2270
current_entry = current_block[1][entry_index]
2272
current_entry = None
2273
advance_entry = True
2275
if current_dir_info and path_index < len(current_dir_info[1]):
2276
current_path_info = current_dir_info[1][path_index]
2277
if current_path_info[2] == 'directory':
2278
if self.target._directory_is_tree_reference(
2279
current_path_info[0].decode('utf8')):
2280
current_path_info = current_path_info[:2] + \
2281
('tree-reference',) + current_path_info[3:]
2283
current_path_info = None
2285
path_handled = False
2286
while (current_entry is not None or
2287
current_path_info is not None):
2288
if current_entry is None:
2289
# the check for path_handled when the path is adnvaced
2290
# will yield this path if needed.
2292
elif current_path_info is None:
2293
# no path is fine: the per entry code will handle it.
2294
result = _process_entry(current_entry, current_path_info)
2295
if result is not None:
2296
if result is not uninteresting:
2298
elif (current_entry[0][1] != current_path_info[1]
2299
or current_entry[1][target_index][0] in 'ar'):
2300
# The current path on disk doesn't match the dirblock
2301
# record. Either the dirblock is marked as absent, or
2302
# the file on disk is not present at all in the
2303
# dirblock. Either way, report about the dirblock
2304
# entry, and let other code handle the filesystem one.
2306
# Compare the basename for these files to determine
2308
if current_path_info[1] < current_entry[0][1]:
2309
# extra file on disk: pass for now, but only
2310
# increment the path, not the entry
2311
advance_entry = False
2313
# entry referring to file not present on disk.
2314
# advance the entry only, after processing.
2315
result = _process_entry(current_entry, None)
2316
if result is not None:
2317
if result is not uninteresting:
2319
advance_path = False
2321
result = _process_entry(current_entry, current_path_info)
2322
if result is not None:
2324
if result is not uninteresting:
2326
if advance_entry and current_entry is not None:
2328
if entry_index < len(current_block[1]):
2329
current_entry = current_block[1][entry_index]
2331
current_entry = None
2333
advance_entry = True # reset the advance flaga
2334
if advance_path and current_path_info is not None:
2335
if not path_handled:
2336
# unversioned in all regards
2337
if want_unversioned:
2338
new_executable = bool(
2339
stat.S_ISREG(current_path_info[3].st_mode)
2340
and stat.S_IEXEC & current_path_info[3].st_mode)
2342
(None, utf8_decode(current_path_info[0])[0]),
2346
(None, utf8_decode(current_path_info[1])[0]),
2347
(None, current_path_info[2]),
2348
(None, new_executable))
2349
# dont descend into this unversioned path if it is
2351
if current_path_info[2] in ('directory'):
2352
del current_dir_info[1][path_index]
2354
# dont descend the disk iterator into any tree
2356
if current_path_info[2] == 'tree-reference':
2357
del current_dir_info[1][path_index]
2360
if path_index < len(current_dir_info[1]):
2361
current_path_info = current_dir_info[1][path_index]
2362
if current_path_info[2] == 'directory':
2363
if self.target._directory_is_tree_reference(
2364
current_path_info[0].decode('utf8')):
2365
current_path_info = current_path_info[:2] + \
2366
('tree-reference',) + current_path_info[3:]
2368
current_path_info = None
2369
path_handled = False
2371
advance_path = True # reset the advance flagg.
2372
if current_block is not None:
2374
if (block_index < len(state._dirblocks) and
2375
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2376
current_block = state._dirblocks[block_index]
2378
current_block = None
2379
if current_dir_info is not None:
2381
current_dir_info = dir_iterator.next()
2382
except StopIteration:
2383
current_dir_info = None
2096
2387
def is_compatible(source, target):
2097
2388
# the target must be a dirstate working tree
2098
if not isinstance(target, DirStateWorkingTree):
2389
if not isinstance(target, WorkingTree4):
2100
# the source must be a revtree or dirstate rev tree.
2391
# the source must be a revtreee or dirstate rev tree.
2101
2392
if not isinstance(source,
2102
2393
(revisiontree.RevisionTree, DirStateRevisionTree)):
2104
2395
# the source revid must be in the target dirstate
2105
if not (source._revision_id == _mod_revision.NULL_REVISION or
2396
if not (source._revision_id == NULL_REVISION or
2106
2397
source._revision_id in target.get_parent_ids()):
2107
# TODO: what about ghosts? it may well need to
2398
# TODO: what about ghosts? it may well need to
2108
2399
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
