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