1275
1213
@needs_tree_write_lock
1276
1214
def _write_inventory(self, inv):
1277
1215
"""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)
1216
assert not self._dirty, "attempting to write an inventory when the dirstate is dirty will cause data loss"
1217
self.current_dirstate().set_state_from_inventory(inv)
1218
self._make_dirty(reset_inventory=False)
1219
if self._inventory is not None:
1292
1220
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):
1224
class WorkingTreeFormat4(WorkingTreeFormat3):
1225
"""The first consolidated dirstate working tree format.
1228
- exists within a metadir controlling .bzr
1229
- includes an explicit version marker for the workingtree control
1230
files, separate from the BzrDir format
1231
- modifies the hash cache format
1232
- is new in bzr 0.15
1233
- uses a LockDir to guard access to it.
1236
upgrade_recommended = False
1238
def get_format_string(self):
1239
"""See WorkingTreeFormat.get_format_string()."""
1240
return "Bazaar Working Tree Format 4 (bzr 0.15)\n"
1242
def get_format_description(self):
1243
"""See WorkingTreeFormat.get_format_description()."""
1244
return "Working tree format 4"
1246
def initialize(self, a_bzrdir, revision_id=None):
1389
1247
"""See WorkingTreeFormat.initialize().
1391
1249
:param revision_id: allows creating a working tree at a different
1392
1250
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
1252
These trees get an initial random root id, if their repository supports
1401
1253
rich root data, TREE_ROOT otherwise.
1255
revision_id = osutils.safe_revision_id(revision_id)
1403
1256
if not isinstance(a_bzrdir.transport, LocalTransport):
1404
1257
raise errors.NotLocalUrl(a_bzrdir.transport.base)
1405
1258
transport = a_bzrdir.get_workingtree_transport(self)
1406
1259
control_files = self._open_control_files(a_bzrdir)
1407
1260
control_files.create_lock()
1408
1261
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()
1262
control_files.put_utf8('format', self.get_format_string())
1263
branch = a_bzrdir.open_branch()
1415
1264
if revision_id is None:
1416
1265
revision_id = branch.last_revision()
1417
1266
local_path = transport.local_abspath('dirstate')
2099
1746
if not found_versioned:
2100
1747
# 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)
1749
all_versioned = False
1751
if not all_versioned:
1752
raise errors.PathsNotVersionedError(specific_files)
2105
1753
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2106
search_specific_files = osutils.minimum_path_selection(specific_files)
1754
search_specific_files = set()
1755
for path in specific_files:
1756
other_specific_files = specific_files.difference(set([path]))
1757
if not osutils.is_inside_any(other_specific_files, path):
1758
# this is a top level path, we must check it.
1759
search_specific_files.add(path)
1761
# compare source_index and target_index at or under each element of search_specific_files.
1762
# follow the following comparison table. Note that we only want to do diff operations when
1763
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1767
# Source | Target | disk | action
1768
# r | fdlt | | add source to search, add id path move and perform
1769
# | | | diff check on source-target
1770
# r | fdlt | a | dangling file that was present in the basis.
1772
# r | a | | add source to search
1774
# r | r | | this path is present in a non-examined tree, skip.
1775
# r | r | a | this path is present in a non-examined tree, skip.
1776
# a | fdlt | | add new id
1777
# a | fdlt | a | dangling locally added file, skip
1778
# a | a | | not present in either tree, skip
1779
# a | a | a | not present in any tree, skip
1780
# a | r | | not present in either tree at this path, skip as it
1781
# | | | may not be selected by the users list of paths.
1782
# a | r | a | not present in either tree at this path, skip as it
1783
# | | | may not be selected by the users list of paths.
1784
# fdlt | fdlt | | content in both: diff them
1785
# fdlt | fdlt | a | deleted locally, but not unversioned - show as deleted ?
1786
# fdlt | a | | unversioned: output deleted id for now
1787
# fdlt | a | a | unversioned and deleted: output deleted id
1788
# fdlt | r | | relocated in this tree, so add target to search.
1789
# | | | Dont diff, we will see an r,fd; pair when we reach
1790
# | | | this id at the other path.
1791
# fdlt | r | a | relocated in this tree, so add target to search.
1792
# | | | Dont diff, we will see an r,fd; pair when we reach
1793
# | | | this id at the other path.
1795
# for all search_indexs in each path at or under each element of
1796
# search_specific_files, if the detail is relocated: add the id, and add the
1797
# relocated path as one to search if its not searched already. If the
1798
# detail is not relocated, add the id.
1799
searched_specific_files = set()
1800
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1801
# Using a list so that we can access the values and change them in
1802
# nested scope. Each one is [path, file_id, entry]
1803
last_source_parent = [None, None, None]
1804
last_target_parent = [None, None, None]
2108
1806
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()
1808
def _process_entry(entry, path_info):
1809
"""Compare an entry and real disk to generate delta information.
1811
:param path_info: top_relpath, basename, kind, lstat, abspath for
1812
the path of entry. If None, then the path is considered absent.
1813
(Perhaps we should pass in a concrete entry for this ?)
1814
Basename is returned as a utf8 string because we expect this
1815
tuple will be ignored, and don't want to take the time to
1818
if source_index is None:
1819
source_details = NULL_PARENT_DETAILS
1821
source_details = entry[1][source_index]
1822
target_details = entry[1][target_index]
1823
target_minikind = target_details[0]
1824
if path_info is not None and target_minikind in 'fdlt':
1825
assert target_index == 0
1826
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
1827
stat_value=path_info[3])
1828
# The entry may have been modified by update_entry
1829
target_details = entry[1][target_index]
1830
target_minikind = target_details[0]
1833
source_minikind = source_details[0]
1834
if source_minikind in 'fdltr' and target_minikind in 'fdlt':
1835
# claimed content in both: diff
1836
# r | fdlt | | add source to search, add id path move and perform
1837
# | | | diff check on source-target
1838
# r | fdlt | a | dangling file that was present in the basis.
1840
if source_minikind in 'r':
1841
# add the source to the search path to find any children it
1842
# has. TODO ? : only add if it is a container ?
1843
if not osutils.is_inside_any(searched_specific_files,
1845
search_specific_files.add(source_details[1])
1846
# generate the old path; this is needed for stating later
1848
old_path = source_details[1]
1849
old_dirname, old_basename = os.path.split(old_path)
1850
path = pathjoin(entry[0][0], entry[0][1])
1851
old_entry = state._get_entry(source_index,
1853
# update the source details variable to be the real
1855
source_details = old_entry[1][source_index]
1856
source_minikind = source_details[0]
1858
old_dirname = entry[0][0]
1859
old_basename = entry[0][1]
1860
old_path = path = pathjoin(old_dirname, old_basename)
1861
if path_info is None:
1862
# the file is missing on disk, show as removed.
1863
content_change = True
1867
# source and target are both versioned and disk file is present.
1868
target_kind = path_info[2]
1869
if target_kind == 'directory':
1870
if source_minikind != 'd':
1871
content_change = True
1873
# directories have no fingerprint
1874
content_change = False
1876
elif target_kind == 'file':
1877
if source_minikind != 'f':
1878
content_change = True
1880
# We could check the size, but we already have the
1882
content_change = (link_or_sha1 != source_details[1])
1883
# Target details is updated at update_entry time
1884
if use_filesystem_for_exec:
1885
# We don't need S_ISREG here, because we are sure
1886
# we are dealing with a file.
1887
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
1889
target_exec = target_details[3]
1890
elif target_kind == 'symlink':
1891
if source_minikind != 'l':
1892
content_change = True
1894
content_change = (link_or_sha1 != source_details[1])
1896
elif target_kind == 'tree-reference':
1897
if source_minikind != 't':
1898
content_change = True
1900
content_change = False
1903
raise Exception, "unknown kind %s" % path_info[2]
1904
# parent id is the entry for the path in the target tree
1905
if old_dirname == last_source_parent[0]:
1906
source_parent_id = last_source_parent[1]
1908
source_parent_entry = state._get_entry(source_index,
1909
path_utf8=old_dirname)
1910
source_parent_id = source_parent_entry[0][2]
1911
if source_parent_id == entry[0][2]:
1912
# This is the root, so the parent is None
1913
source_parent_id = None
1915
last_source_parent[0] = old_dirname
1916
last_source_parent[1] = source_parent_id
1917
last_source_parent[2] = source_parent_entry
1918
new_dirname = entry[0][0]
1919
if new_dirname == last_target_parent[0]:
1920
target_parent_id = last_target_parent[1]
1922
# TODO: We don't always need to do the lookup, because the
1923
# parent entry will be the same as the source entry.
1924
target_parent_entry = state._get_entry(target_index,
1925
path_utf8=new_dirname)
1926
assert target_parent_entry != (None, None), (
1927
"Could not find target parent in wt: %s\nparent of: %s"
1928
% (new_dirname, entry))
1929
target_parent_id = target_parent_entry[0][2]
1930
if target_parent_id == entry[0][2]:
1931
# This is the root, so the parent is None
1932
target_parent_id = None
1934
last_target_parent[0] = new_dirname
1935
last_target_parent[1] = target_parent_id
1936
last_target_parent[2] = target_parent_entry
1938
source_exec = source_details[3]
1939
return ((entry[0][2], (old_path, path), content_change,
1941
(source_parent_id, target_parent_id),
1942
(old_basename, entry[0][1]),
1943
(_minikind_to_kind[source_minikind], target_kind),
1944
(source_exec, target_exec)),)
1945
elif source_minikind in 'a' and target_minikind in 'fdlt':
1946
# looks like a new file
1947
if path_info is not None:
1948
path = pathjoin(entry[0][0], entry[0][1])
1949
# parent id is the entry for the path in the target tree
1950
# TODO: these are the same for an entire directory: cache em.
1951
parent_id = state._get_entry(target_index,
1952
path_utf8=entry[0][0])[0][2]
1953
if parent_id == entry[0][2]:
1955
if use_filesystem_for_exec:
1956
# We need S_ISREG here, because we aren't sure if this
1959
stat.S_ISREG(path_info[3].st_mode)
1960
and stat.S_IEXEC & path_info[3].st_mode)
1962
target_exec = target_details[3]
1963
return ((entry[0][2], (None, path), True,
1966
(None, entry[0][1]),
1967
(None, path_info[2]),
1968
(None, target_exec)),)
1970
# but its not on disk: we deliberately treat this as just
1971
# never-present. (Why ?! - RBC 20070224)
1973
elif source_minikind in 'fdlt' and target_minikind in 'a':
1974
# unversioned, possibly, or possibly not deleted: we dont care.
1975
# if its still on disk, *and* theres no other entry at this
1976
# path [we dont know this in this routine at the moment -
1977
# perhaps we should change this - then it would be an unknown.
1978
old_path = pathjoin(entry[0][0], entry[0][1])
1979
# parent id is the entry for the path in the target tree
1980
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
1981
if parent_id == entry[0][2]:
1983
return ((entry[0][2], (old_path, None), True,
1986
(entry[0][1], None),
1987
(_minikind_to_kind[source_minikind], None),
1988
(source_details[3], None)),)
1989
elif source_minikind in 'fdlt' and target_minikind in 'r':
1990
# a rename; could be a true rename, or a rename inherited from
1991
# a renamed parent. TODO: handle this efficiently. Its not
1992
# common case to rename dirs though, so a correct but slow
1993
# implementation will do.
1994
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
1995
search_specific_files.add(target_details[1])
1996
elif source_minikind in 'ra' and target_minikind in 'ra':
1997
# neither of the selected trees contain this file,
1998
# so skip over it. This is not currently directly tested, but
1999
# is indirectly via test_too_much.TestCommands.test_conflicts.
2002
raise AssertionError("don't know how to compare "
2003
"source_minikind=%r, target_minikind=%r"
2004
% (source_minikind, target_minikind))
2005
## import pdb;pdb.set_trace()
2008
while search_specific_files:
2009
# TODO: the pending list should be lexically sorted? the
2010
# interface doesn't require it.
2011
current_root = search_specific_files.pop()
2012
current_root_unicode = current_root.decode('utf8')
2013
searched_specific_files.add(current_root)
2014
# process the entries for this containing directory: the rest will be
2015
# found by their parents recursively.
2016
root_entries = _entries_for_path(current_root)
2017
root_abspath = self.target.abspath(current_root_unicode)
2019
root_stat = os.lstat(root_abspath)
2021
if e.errno == errno.ENOENT:
2022
# the path does not exist: let _process_entry know that.
2023
root_dir_info = None
2025
# some other random error: hand it up.
2028
root_dir_info = ('', current_root,
2029
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
2031
if root_dir_info[2] == 'directory':
2032
if self.target._directory_is_tree_reference(
2033
current_root.decode('utf8')):
2034
root_dir_info = root_dir_info[:2] + \
2035
('tree-reference',) + root_dir_info[3:]
2037
if not root_entries and not root_dir_info:
2038
# this specified path is not present at all, skip it.
2040
path_handled = False
2041
for entry in root_entries:
2042
for result in _process_entry(entry, root_dir_info):
2043
# this check should probably be outside the loop: one
2044
# 'iterate two trees' api, and then _iter_changes filters
2045
# unchanged pairs. - RBC 20070226
2047
if (include_unchanged
2048
or result[2] # content change
2049
or result[3][0] != result[3][1] # versioned status
2050
or result[4][0] != result[4][1] # parent id
2051
or result[5][0] != result[5][1] # name
2052
or result[6][0] != result[6][1] # kind
2053
or result[7][0] != result[7][1] # executable
2056
(utf8_decode_or_none(result[1][0]),
2057
utf8_decode_or_none(result[1][1])),
2061
(utf8_decode_or_none(result[5][0]),
2062
utf8_decode_or_none(result[5][1])),
2066
if want_unversioned and not path_handled and root_dir_info:
2067
new_executable = bool(
2068
stat.S_ISREG(root_dir_info[3].st_mode)
2069
and stat.S_IEXEC & root_dir_info[3].st_mode)
2071
(None, current_root_unicode),
2075
(None, splitpath(current_root_unicode)[-1]),
2076
(None, root_dir_info[2]),
2077
(None, new_executable)
2079
initial_key = (current_root, '', '')
2080
block_index, _ = state._find_block_index_from_key(initial_key)
2081
if block_index == 0:
2082
# we have processed the total root already, but because the
2083
# initial key matched it we should skip it here.
2085
if root_dir_info and root_dir_info[2] == 'tree-reference':
2086
current_dir_info = None
2088
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
2090
current_dir_info = dir_iterator.next()
2092
# on win32, python2.4 has e.errno == ERROR_DIRECTORY, but
2093
# python 2.5 has e.errno == EINVAL,
2094
# and e.winerror == ERROR_DIRECTORY
2095
e_winerror = getattr(e, 'winerror', None)
2096
win_errors = (ERROR_DIRECTORY, ERROR_PATH_NOT_FOUND)
2097
# there may be directories in the inventory even though
2098
# this path is not a file on disk: so mark it as end of
2100
if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
2101
current_dir_info = None
2102
elif (sys.platform == 'win32'
2103
and (e.errno in win_errors
2104
or e_winerror in win_errors)):
2105
current_dir_info = None
2109
if current_dir_info[0][0] == '':
2110
# remove .bzr from iteration
2111
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
2112
assert current_dir_info[1][bzr_index][0] == '.bzr'
2113
del current_dir_info[1][bzr_index]
2114
# walk until both the directory listing and the versioned metadata
2116
if (block_index < len(state._dirblocks) and
2117
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2118
current_block = state._dirblocks[block_index]
2120
current_block = None
2121
while (current_dir_info is not None or
2122
current_block is not None):
2123
if (current_dir_info and current_block
2124
and current_dir_info[0][0] != current_block[0]):
2125
if current_dir_info[0][0].split('/') < current_block[0].split('/'):
2126
# filesystem data refers to paths not covered by the dirblock.
2127
# this has two possibilities:
2128
# A) it is versioned but empty, so there is no block for it
2129
# B) it is not versioned.
2131
# if (A) then we need to recurse into it to check for
2132
# new unknown files or directories.
2133
# if (B) then we should ignore it, because we don't
2134
# recurse into unknown directories.
2136
while path_index < len(current_dir_info[1]):
2137
current_path_info = current_dir_info[1][path_index]
2138
if want_unversioned:
2139
if current_path_info[2] == 'directory':
2140
if self.target._directory_is_tree_reference(
2141
current_path_info[0].decode('utf8')):
2142
current_path_info = current_path_info[:2] + \
2143
('tree-reference',) + current_path_info[3:]
2144
new_executable = bool(
2145
stat.S_ISREG(current_path_info[3].st_mode)
2146
and stat.S_IEXEC & current_path_info[3].st_mode)
2148
(None, utf8_decode_or_none(current_path_info[0])),
2152
(None, utf8_decode_or_none(current_path_info[1])),
2153
(None, current_path_info[2]),
2154
(None, new_executable))
2155
# dont descend into this unversioned path if it is
2157
if current_path_info[2] in ('directory',
2159
del current_dir_info[1][path_index]
2163
# This dir info has been handled, go to the next
2165
current_dir_info = dir_iterator.next()
2166
except StopIteration:
2167
current_dir_info = None
2169
# We have a dirblock entry for this location, but there
2170
# is no filesystem path for this. This is most likely
2171
# because a directory was removed from the disk.
2172
# We don't have to report the missing directory,
2173
# because that should have already been handled, but we
2174
# need to handle all of the files that are contained
2176
for current_entry in current_block[1]:
2177
# entry referring to file not present on disk.
2178
# advance the entry only, after processing.
2179
for result in _process_entry(current_entry, None):
2180
# this check should probably be outside the loop: one
2181
# 'iterate two trees' api, and then _iter_changes filters
2182
# unchanged pairs. - RBC 20070226
2183
if (include_unchanged
2184
or result[2] # content change
2185
or result[3][0] != result[3][1] # versioned status
2186
or result[4][0] != result[4][1] # parent id
2187
or result[5][0] != result[5][1] # name
2188
or result[6][0] != result[6][1] # kind
2189
or result[7][0] != result[7][1] # executable
2192
(utf8_decode_or_none(result[1][0]),
2193
utf8_decode_or_none(result[1][1])),
2197
(utf8_decode_or_none(result[5][0]),
2198
utf8_decode_or_none(result[5][1])),
2203
if (block_index < len(state._dirblocks) and
2204
osutils.is_inside(current_root,
2205
state._dirblocks[block_index][0])):
2206
current_block = state._dirblocks[block_index]
2208
current_block = None
2211
if current_block and entry_index < len(current_block[1]):
2212
current_entry = current_block[1][entry_index]
2214
current_entry = None
2215
advance_entry = True
2217
if current_dir_info and path_index < len(current_dir_info[1]):
2218
current_path_info = current_dir_info[1][path_index]
2219
if current_path_info[2] == 'directory':
2220
if self.target._directory_is_tree_reference(
2221
current_path_info[0].decode('utf8')):
2222
current_path_info = current_path_info[:2] + \
2223
('tree-reference',) + current_path_info[3:]
2225
current_path_info = None
2227
path_handled = False
2228
while (current_entry is not None or
2229
current_path_info is not None):
2230
if current_entry is None:
2231
# the check for path_handled when the path is adnvaced
2232
# will yield this path if needed.
2234
elif current_path_info is None:
2235
# no path is fine: the per entry code will handle it.
2236
for result in _process_entry(current_entry, current_path_info):
2237
# this check should probably be outside the loop: one
2238
# 'iterate two trees' api, and then _iter_changes filters
2239
# unchanged pairs. - RBC 20070226
2240
if (include_unchanged
2241
or result[2] # content change
2242
or result[3][0] != result[3][1] # versioned status
2243
or result[4][0] != result[4][1] # parent id
2244
or result[5][0] != result[5][1] # name
2245
or result[6][0] != result[6][1] # kind
2246
or result[7][0] != result[7][1] # executable
2249
(utf8_decode_or_none(result[1][0]),
2250
utf8_decode_or_none(result[1][1])),
2254
(utf8_decode_or_none(result[5][0]),
2255
utf8_decode_or_none(result[5][1])),
2259
elif (current_entry[0][1] != current_path_info[1]
2260
or current_entry[1][target_index][0] in 'ar'):
2261
# The current path on disk doesn't match the dirblock
2262
# record. Either the dirblock is marked as absent, or
2263
# the file on disk is not present at all in the
2264
# dirblock. Either way, report about the dirblock
2265
# entry, and let other code handle the filesystem one.
2266
if current_path_info[1].split('/') < current_entry[0][1].split('/'):
2267
# extra file on disk: pass for now, but only
2268
# increment the path, not the entry
2269
advance_entry = False
2271
# entry referring to file not present on disk.
2272
# advance the entry only, after processing.
2273
for result in _process_entry(current_entry, None):
2274
# this check should probably be outside the loop: one
2275
# 'iterate two trees' api, and then _iter_changes filters
2276
# unchanged pairs. - RBC 20070226
2277
if (include_unchanged
2278
or result[2] # content change
2279
or result[3][0] != result[3][1] # versioned status
2280
or result[4][0] != result[4][1] # parent id
2281
or result[5][0] != result[5][1] # name
2282
or result[6][0] != result[6][1] # kind
2283
or result[7][0] != result[7][1] # executable
2286
(utf8_decode_or_none(result[1][0]),
2287
utf8_decode_or_none(result[1][1])),
2291
(utf8_decode_or_none(result[5][0]),
2292
utf8_decode_or_none(result[5][1])),
2296
advance_path = False
2298
for result in _process_entry(current_entry, current_path_info):
2299
# this check should probably be outside the loop: one
2300
# 'iterate two trees' api, and then _iter_changes filters
2301
# unchanged pairs. - RBC 20070226
2303
if (include_unchanged
2304
or result[2] # content change
2305
or result[3][0] != result[3][1] # versioned status
2306
or result[4][0] != result[4][1] # parent id
2307
or result[5][0] != result[5][1] # name
2308
or result[6][0] != result[6][1] # kind
2309
or result[7][0] != result[7][1] # executable
2312
(utf8_decode_or_none(result[1][0]),
2313
utf8_decode_or_none(result[1][1])),
2317
(utf8_decode_or_none(result[5][0]),
2318
utf8_decode_or_none(result[5][1])),
2322
if advance_entry and current_entry is not None:
2324
if entry_index < len(current_block[1]):
2325
current_entry = current_block[1][entry_index]
2327
current_entry = None
2329
advance_entry = True # reset the advance flaga
2330
if advance_path and current_path_info is not None:
2331
if not path_handled:
2332
# unversioned in all regards
2333
if want_unversioned:
2334
new_executable = bool(
2335
stat.S_ISREG(current_path_info[3].st_mode)
2336
and stat.S_IEXEC & current_path_info[3].st_mode)
2338
(None, utf8_decode_or_none(current_path_info[0])),
2342
(None, utf8_decode_or_none(current_path_info[1])),
2343
(None, current_path_info[2]),
2344
(None, new_executable))
2345
# dont descend into this unversioned path if it is
2347
if current_path_info[2] in ('directory'):
2348
del current_dir_info[1][path_index]
2350
# dont descend the disk iterator into any tree
2352
if current_path_info[2] == 'tree-reference':
2353
del current_dir_info[1][path_index]
2356
if path_index < len(current_dir_info[1]):
2357
current_path_info = current_dir_info[1][path_index]
2358
if current_path_info[2] == 'directory':
2359
if self.target._directory_is_tree_reference(
2360
current_path_info[0].decode('utf8')):
2361
current_path_info = current_path_info[:2] + \
2362
('tree-reference',) + current_path_info[3:]
2364
current_path_info = None
2365
path_handled = False
2367
advance_path = True # reset the advance flagg.
2368
if current_block is not None:
2370
if (block_index < len(state._dirblocks) and
2371
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2372
current_block = state._dirblocks[block_index]
2374
current_block = None
2375
if current_dir_info is not None:
2377
current_dir_info = dir_iterator.next()
2378
except StopIteration:
2379
current_dir_info = None
2115
2383
def is_compatible(source, target):
2116
2384
# the target must be a dirstate working tree
2117
if not isinstance(target, DirStateWorkingTree):
2385
if not isinstance(target, WorkingTree4):
2119
# the source must be a revtree or dirstate rev tree.
2387
# the source must be a revtreee or dirstate rev tree.
2120
2388
if not isinstance(source,
2121
2389
(revisiontree.RevisionTree, DirStateRevisionTree)):
2123
2391
# the source revid must be in the target dirstate
2124
if not (source._revision_id == _mod_revision.NULL_REVISION or
2392
if not (source._revision_id == NULL_REVISION or
2125
2393
source._revision_id in target.get_parent_ids()):
2126
# TODO: what about ghosts? it may well need to
2394
# TODO: what about ghosts? it may well need to
2127
2395
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
