2047
1789
if not found_versioned:
2048
1790
# none of the indexes was not 'absent' at all ids for this
2050
not_versioned.append(path)
2051
if len(not_versioned) > 0:
2052
raise errors.PathsNotVersionedError(not_versioned)
1792
all_versioned = False
1794
if not all_versioned:
1795
raise errors.PathsNotVersionedError(specific_files)
2053
1796
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2054
search_specific_files = osutils.minimum_path_selection(specific_files)
1797
search_specific_files = set()
1798
for path in specific_files:
1799
other_specific_files = specific_files.difference(set([path]))
1800
if not osutils.is_inside_any(other_specific_files, path):
1801
# this is a top level path, we must check it.
1802
search_specific_files.add(path)
1804
# compare source_index and target_index at or under each element of search_specific_files.
1805
# follow the following comparison table. Note that we only want to do diff operations when
1806
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1810
# Source | Target | disk | action
1811
# r | fdlt | | add source to search, add id path move and perform
1812
# | | | diff check on source-target
1813
# r | fdlt | a | dangling file that was present in the basis.
1815
# r | a | | add source to search
1817
# r | r | | this path is present in a non-examined tree, skip.
1818
# r | r | a | this path is present in a non-examined tree, skip.
1819
# a | fdlt | | add new id
1820
# a | fdlt | a | dangling locally added file, skip
1821
# a | a | | not present in either tree, skip
1822
# a | a | a | not present in any tree, skip
1823
# a | r | | not present in either tree at this path, skip as it
1824
# | | | may not be selected by the users list of paths.
1825
# a | r | a | not present in either tree at this path, skip as it
1826
# | | | may not be selected by the users list of paths.
1827
# fdlt | fdlt | | content in both: diff them
1828
# fdlt | fdlt | a | deleted locally, but not unversioned - show as deleted ?
1829
# fdlt | a | | unversioned: output deleted id for now
1830
# fdlt | a | a | unversioned and deleted: output deleted id
1831
# fdlt | r | | relocated in this tree, so add target to search.
1832
# | | | Dont diff, we will see an r,fd; pair when we reach
1833
# | | | this id at the other path.
1834
# fdlt | r | a | relocated in this tree, so add target to search.
1835
# | | | Dont diff, we will see an r,fd; pair when we reach
1836
# | | | this id at the other path.
1838
# for all search_indexs in each path at or under each element of
1839
# search_specific_files, if the detail is relocated: add the id, and add the
1840
# relocated path as one to search if its not searched already. If the
1841
# detail is not relocated, add the id.
1842
searched_specific_files = set()
1843
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1844
# Using a list so that we can access the values and change them in
1845
# nested scope. Each one is [path, file_id, entry]
1846
last_source_parent = [None, None]
1847
last_target_parent = [None, None]
2056
1849
use_filesystem_for_exec = (sys.platform != 'win32')
2057
iter_changes = self.target._iter_changes(include_unchanged,
2058
use_filesystem_for_exec, search_specific_files, state,
2059
source_index, target_index, want_unversioned, self.target)
2060
return iter_changes.iter_changes()
1851
# Just a sentry, so that _process_entry can say that this
1852
# record is handled, but isn't interesting to process (unchanged)
1853
uninteresting = object()
1856
old_dirname_to_file_id = {}
1857
new_dirname_to_file_id = {}
1858
# TODO: jam 20070516 - Avoid the _get_entry lookup overhead by
1859
# keeping a cache of directories that we have seen.
1861
def _process_entry(entry, path_info):
1862
"""Compare an entry and real disk to generate delta information.
1864
:param path_info: top_relpath, basename, kind, lstat, abspath for
1865
the path of entry. If None, then the path is considered absent.
1866
(Perhaps we should pass in a concrete entry for this ?)
1867
Basename is returned as a utf8 string because we expect this
1868
tuple will be ignored, and don't want to take the time to
1870
:return: None if these don't match
1871
A tuple of information about the change, or
1872
the object 'uninteresting' if these match, but are
1873
basically identical.
1875
if source_index is None:
1876
source_details = NULL_PARENT_DETAILS
1878
source_details = entry[1][source_index]
1879
target_details = entry[1][target_index]
1880
target_minikind = target_details[0]
1881
if path_info is not None and target_minikind in 'fdlt':
1882
assert target_index == 0
1883
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
1884
stat_value=path_info[3])
1885
# The entry may have been modified by update_entry
1886
target_details = entry[1][target_index]
1887
target_minikind = target_details[0]
1890
file_id = entry[0][2]
1891
source_minikind = source_details[0]
1892
if source_minikind in 'fdltr' and target_minikind in 'fdlt':
1893
# claimed content in both: diff
1894
# r | fdlt | | add source to search, add id path move and perform
1895
# | | | diff check on source-target
1896
# r | fdlt | a | dangling file that was present in the basis.
1898
if source_minikind in 'r':
1899
# add the source to the search path to find any children it
1900
# has. TODO ? : only add if it is a container ?
1901
if not osutils.is_inside_any(searched_specific_files,
1903
search_specific_files.add(source_details[1])
1904
# generate the old path; this is needed for stating later
1906
old_path = source_details[1]
1907
old_dirname, old_basename = os.path.split(old_path)
1908
path = pathjoin(entry[0][0], entry[0][1])
1909
old_entry = state._get_entry(source_index,
1911
# update the source details variable to be the real
1913
source_details = old_entry[1][source_index]
1914
source_minikind = source_details[0]
1916
old_dirname = entry[0][0]
1917
old_basename = entry[0][1]
1918
old_path = path = None
1919
if path_info is None:
1920
# the file is missing on disk, show as removed.
1921
content_change = True
1925
# source and target are both versioned and disk file is present.
1926
target_kind = path_info[2]
1927
if target_kind == 'directory':
1929
old_path = path = pathjoin(old_dirname, old_basename)
1930
new_dirname_to_file_id[path] = file_id
1931
if source_minikind != 'd':
1932
content_change = True
1934
# directories have no fingerprint
1935
content_change = False
1937
elif target_kind == 'file':
1938
if source_minikind != 'f':
1939
content_change = True
1941
# We could check the size, but we already have the
1943
content_change = (link_or_sha1 != source_details[1])
1944
# Target details is updated at update_entry time
1945
if use_filesystem_for_exec:
1946
# We don't need S_ISREG here, because we are sure
1947
# we are dealing with a file.
1948
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
1950
target_exec = target_details[3]
1951
elif target_kind == 'symlink':
1952
if source_minikind != 'l':
1953
content_change = True
1955
content_change = (link_or_sha1 != source_details[1])
1957
elif target_kind == 'tree-reference':
1958
if source_minikind != 't':
1959
content_change = True
1961
content_change = False
1964
raise Exception, "unknown kind %s" % path_info[2]
1965
if source_minikind == 'd':
1967
old_path = path = pathjoin(old_dirname, old_basename)
1968
old_dirname_to_file_id[old_path] = file_id
1969
# parent id is the entry for the path in the target tree
1970
if old_dirname == last_source_parent[0]:
1971
source_parent_id = last_source_parent[1]
1974
source_parent_id = old_dirname_to_file_id[old_dirname]
1976
source_parent_entry = state._get_entry(source_index,
1977
path_utf8=old_dirname)
1978
source_parent_id = source_parent_entry[0][2]
1979
if source_parent_id == entry[0][2]:
1980
# This is the root, so the parent is None
1981
source_parent_id = None
1983
last_source_parent[0] = old_dirname
1984
last_source_parent[1] = source_parent_id
1985
new_dirname = entry[0][0]
1986
if new_dirname == last_target_parent[0]:
1987
target_parent_id = last_target_parent[1]
1990
target_parent_id = new_dirname_to_file_id[new_dirname]
1992
# TODO: We don't always need to do the lookup, because the
1993
# parent entry will be the same as the source entry.
1994
target_parent_entry = state._get_entry(target_index,
1995
path_utf8=new_dirname)
1996
assert target_parent_entry != (None, None), (
1997
"Could not find target parent in wt: %s\nparent of: %s"
1998
% (new_dirname, entry))
1999
target_parent_id = target_parent_entry[0][2]
2000
if target_parent_id == entry[0][2]:
2001
# This is the root, so the parent is None
2002
target_parent_id = None
2004
last_target_parent[0] = new_dirname
2005
last_target_parent[1] = target_parent_id
2007
source_exec = source_details[3]
2008
if (include_unchanged
2010
or source_parent_id != target_parent_id
2011
or old_basename != entry[0][1]
2012
or source_exec != target_exec
2014
if old_path is None:
2015
old_path = path = pathjoin(old_dirname, old_basename)
2016
old_path_u = utf8_decode(old_path)[0]
2019
old_path_u = utf8_decode(old_path)[0]
2020
if old_path == path:
2023
path_u = utf8_decode(path)[0]
2024
source_kind = _minikind_to_kind[source_minikind]
2025
return (entry[0][2],
2026
(old_path_u, path_u),
2029
(source_parent_id, target_parent_id),
2030
(utf8_decode(old_basename)[0], utf8_decode(entry[0][1])[0]),
2031
(source_kind, target_kind),
2032
(source_exec, target_exec))
2034
return uninteresting
2035
elif source_minikind in 'a' and target_minikind in 'fdlt':
2036
# looks like a new file
2037
if path_info is not None:
2038
path = pathjoin(entry[0][0], entry[0][1])
2039
# parent id is the entry for the path in the target tree
2040
# TODO: these are the same for an entire directory: cache em.
2041
parent_id = state._get_entry(target_index,
2042
path_utf8=entry[0][0])[0][2]
2043
if parent_id == entry[0][2]:
2045
if use_filesystem_for_exec:
2046
# We need S_ISREG here, because we aren't sure if this
2049
stat.S_ISREG(path_info[3].st_mode)
2050
and stat.S_IEXEC & path_info[3].st_mode)
2052
target_exec = target_details[3]
2053
return (entry[0][2],
2054
(None, utf8_decode(path)[0]),
2058
(None, utf8_decode(entry[0][1])[0]),
2059
(None, path_info[2]),
2060
(None, target_exec))
2062
# but its not on disk: we deliberately treat this as just
2063
# never-present. (Why ?! - RBC 20070224)
2065
elif source_minikind in 'fdlt' and target_minikind in 'a':
2066
# unversioned, possibly, or possibly not deleted: we dont care.
2067
# if its still on disk, *and* theres no other entry at this
2068
# path [we dont know this in this routine at the moment -
2069
# perhaps we should change this - then it would be an unknown.
2070
old_path = pathjoin(entry[0][0], entry[0][1])
2071
# parent id is the entry for the path in the target tree
2072
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
2073
if parent_id == entry[0][2]:
2075
return (entry[0][2],
2076
(utf8_decode(old_path)[0], None),
2080
(utf8_decode(entry[0][1])[0], None),
2081
(_minikind_to_kind[source_minikind], None),
2082
(source_details[3], None))
2083
elif source_minikind in 'fdlt' and target_minikind in 'r':
2084
# a rename; could be a true rename, or a rename inherited from
2085
# a renamed parent. TODO: handle this efficiently. Its not
2086
# common case to rename dirs though, so a correct but slow
2087
# implementation will do.
2088
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
2089
search_specific_files.add(target_details[1])
2090
elif source_minikind in 'ra' and target_minikind in 'ra':
2091
# neither of the selected trees contain this file,
2092
# so skip over it. This is not currently directly tested, but
2093
# is indirectly via test_too_much.TestCommands.test_conflicts.
2096
raise AssertionError("don't know how to compare "
2097
"source_minikind=%r, target_minikind=%r"
2098
% (source_minikind, target_minikind))
2099
## import pdb;pdb.set_trace()
2102
while search_specific_files:
2103
# TODO: the pending list should be lexically sorted? the
2104
# interface doesn't require it.
2105
current_root = search_specific_files.pop()
2106
current_root_unicode = current_root.decode('utf8')
2107
searched_specific_files.add(current_root)
2108
# process the entries for this containing directory: the rest will be
2109
# found by their parents recursively.
2110
root_entries = _entries_for_path(current_root)
2111
root_abspath = self.target.abspath(current_root_unicode)
2113
root_stat = os.lstat(root_abspath)
2115
if e.errno == errno.ENOENT:
2116
# the path does not exist: let _process_entry know that.
2117
root_dir_info = None
2119
# some other random error: hand it up.
2122
root_dir_info = ('', current_root,
2123
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
2125
if root_dir_info[2] == 'directory':
2126
if self.target._directory_is_tree_reference(
2127
current_root.decode('utf8')):
2128
root_dir_info = root_dir_info[:2] + \
2129
('tree-reference',) + root_dir_info[3:]
2131
if not root_entries and not root_dir_info:
2132
# this specified path is not present at all, skip it.
2134
path_handled = False
2135
for entry in root_entries:
2136
result = _process_entry(entry, root_dir_info)
2137
if result is not None:
2139
if result is not uninteresting:
2141
if want_unversioned and not path_handled and root_dir_info:
2142
new_executable = bool(
2143
stat.S_ISREG(root_dir_info[3].st_mode)
2144
and stat.S_IEXEC & root_dir_info[3].st_mode)
2146
(None, current_root_unicode),
2150
(None, splitpath(current_root_unicode)[-1]),
2151
(None, root_dir_info[2]),
2152
(None, new_executable)
2154
initial_key = (current_root, '', '')
2155
block_index, _ = state._find_block_index_from_key(initial_key)
2156
if block_index == 0:
2157
# we have processed the total root already, but because the
2158
# initial key matched it we should skip it here.
2160
if root_dir_info and root_dir_info[2] == 'tree-reference':
2161
current_dir_info = None
2163
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
2165
current_dir_info = dir_iterator.next()
2167
# on win32, python2.4 has e.errno == ERROR_DIRECTORY, but
2168
# python 2.5 has e.errno == EINVAL,
2169
# and e.winerror == ERROR_DIRECTORY
2170
e_winerror = getattr(e, 'winerror', None)
2171
win_errors = (ERROR_DIRECTORY, ERROR_PATH_NOT_FOUND)
2172
# there may be directories in the inventory even though
2173
# this path is not a file on disk: so mark it as end of
2175
if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
2176
current_dir_info = None
2177
elif (sys.platform == 'win32'
2178
and (e.errno in win_errors
2179
or e_winerror in win_errors)):
2180
current_dir_info = None
2184
if current_dir_info[0][0] == '':
2185
# remove .bzr from iteration
2186
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
2187
assert current_dir_info[1][bzr_index][0] == '.bzr'
2188
del current_dir_info[1][bzr_index]
2189
# walk until both the directory listing and the versioned metadata
2191
if (block_index < len(state._dirblocks) and
2192
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2193
current_block = state._dirblocks[block_index]
2195
current_block = None
2196
while (current_dir_info is not None or
2197
current_block is not None):
2198
if (current_dir_info and current_block
2199
and current_dir_info[0][0] != current_block[0]):
2200
if cmp_by_dirs(current_dir_info[0][0], current_block[0]) < 0:
2201
# filesystem data refers to paths not covered by the dirblock.
2202
# this has two possibilities:
2203
# A) it is versioned but empty, so there is no block for it
2204
# B) it is not versioned.
2206
# if (A) then we need to recurse into it to check for
2207
# new unknown files or directories.
2208
# if (B) then we should ignore it, because we don't
2209
# recurse into unknown directories.
2211
while path_index < len(current_dir_info[1]):
2212
current_path_info = current_dir_info[1][path_index]
2213
if want_unversioned:
2214
if current_path_info[2] == 'directory':
2215
if self.target._directory_is_tree_reference(
2216
current_path_info[0].decode('utf8')):
2217
current_path_info = current_path_info[:2] + \
2218
('tree-reference',) + current_path_info[3:]
2219
new_executable = bool(
2220
stat.S_ISREG(current_path_info[3].st_mode)
2221
and stat.S_IEXEC & current_path_info[3].st_mode)
2223
(None, utf8_decode(current_path_info[0])[0]),
2227
(None, utf8_decode(current_path_info[1])[0]),
2228
(None, current_path_info[2]),
2229
(None, new_executable))
2230
# dont descend into this unversioned path if it is
2232
if current_path_info[2] in ('directory',
2234
del current_dir_info[1][path_index]
2238
# This dir info has been handled, go to the next
2240
current_dir_info = dir_iterator.next()
2241
except StopIteration:
2242
current_dir_info = None
2244
# We have a dirblock entry for this location, but there
2245
# is no filesystem path for this. This is most likely
2246
# because a directory was removed from the disk.
2247
# We don't have to report the missing directory,
2248
# because that should have already been handled, but we
2249
# need to handle all of the files that are contained
2251
for current_entry in current_block[1]:
2252
# entry referring to file not present on disk.
2253
# advance the entry only, after processing.
2254
result = _process_entry(current_entry, None)
2255
if result is not None:
2256
if result is not uninteresting:
2259
if (block_index < len(state._dirblocks) and
2260
osutils.is_inside(current_root,
2261
state._dirblocks[block_index][0])):
2262
current_block = state._dirblocks[block_index]
2264
current_block = None
2267
if current_block and entry_index < len(current_block[1]):
2268
current_entry = current_block[1][entry_index]
2270
current_entry = None
2271
advance_entry = True
2273
if current_dir_info and path_index < len(current_dir_info[1]):
2274
current_path_info = current_dir_info[1][path_index]
2275
if current_path_info[2] == 'directory':
2276
if self.target._directory_is_tree_reference(
2277
current_path_info[0].decode('utf8')):
2278
current_path_info = current_path_info[:2] + \
2279
('tree-reference',) + current_path_info[3:]
2281
current_path_info = None
2283
path_handled = False
2284
while (current_entry is not None or
2285
current_path_info is not None):
2286
if current_entry is None:
2287
# the check for path_handled when the path is adnvaced
2288
# will yield this path if needed.
2290
elif current_path_info is None:
2291
# no path is fine: the per entry code will handle it.
2292
result = _process_entry(current_entry, current_path_info)
2293
if result is not None:
2294
if result is not uninteresting:
2296
elif (current_entry[0][1] != current_path_info[1]
2297
or current_entry[1][target_index][0] in 'ar'):
2298
# The current path on disk doesn't match the dirblock
2299
# record. Either the dirblock is marked as absent, or
2300
# the file on disk is not present at all in the
2301
# dirblock. Either way, report about the dirblock
2302
# entry, and let other code handle the filesystem one.
2304
# Compare the basename for these files to determine
2306
if current_path_info[1] < current_entry[0][1]:
2307
# extra file on disk: pass for now, but only
2308
# increment the path, not the entry
2309
advance_entry = False
2311
# entry referring to file not present on disk.
2312
# advance the entry only, after processing.
2313
result = _process_entry(current_entry, None)
2314
if result is not None:
2315
if result is not uninteresting:
2317
advance_path = False
2319
result = _process_entry(current_entry, current_path_info)
2320
if result is not None:
2322
if result is not uninteresting:
2324
if advance_entry and current_entry is not None:
2326
if entry_index < len(current_block[1]):
2327
current_entry = current_block[1][entry_index]
2329
current_entry = None
2331
advance_entry = True # reset the advance flaga
2332
if advance_path and current_path_info is not None:
2333
if not path_handled:
2334
# unversioned in all regards
2335
if want_unversioned:
2336
new_executable = bool(
2337
stat.S_ISREG(current_path_info[3].st_mode)
2338
and stat.S_IEXEC & current_path_info[3].st_mode)
2340
(None, utf8_decode(current_path_info[0])[0]),
2344
(None, utf8_decode(current_path_info[1])[0]),
2345
(None, current_path_info[2]),
2346
(None, new_executable))
2347
# dont descend into this unversioned path if it is
2349
if current_path_info[2] in ('directory'):
2350
del current_dir_info[1][path_index]
2352
# dont descend the disk iterator into any tree
2354
if current_path_info[2] == 'tree-reference':
2355
del current_dir_info[1][path_index]
2358
if path_index < len(current_dir_info[1]):
2359
current_path_info = current_dir_info[1][path_index]
2360
if current_path_info[2] == 'directory':
2361
if self.target._directory_is_tree_reference(
2362
current_path_info[0].decode('utf8')):
2363
current_path_info = current_path_info[:2] + \
2364
('tree-reference',) + current_path_info[3:]
2366
current_path_info = None
2367
path_handled = False
2369
advance_path = True # reset the advance flagg.
2370
if current_block is not None:
2372
if (block_index < len(state._dirblocks) and
2373
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2374
current_block = state._dirblocks[block_index]
2376
current_block = None
2377
if current_dir_info is not None:
2379
current_dir_info = dir_iterator.next()
2380
except StopIteration:
2381
current_dir_info = None
2063
2385
def is_compatible(source, target):
2064
2386
# the target must be a dirstate working tree
2065
if not isinstance(target, DirStateWorkingTree):
2387
if not isinstance(target, WorkingTree4):
2067
# the source must be a revtree or dirstate rev tree.
2389
# the source must be a revtreee or dirstate rev tree.
2068
2390
if not isinstance(source,
2069
2391
(revisiontree.RevisionTree, DirStateRevisionTree)):
2071
2393
# the source revid must be in the target dirstate
2072
if not (source._revision_id == _mod_revision.NULL_REVISION or
2394
if not (source._revision_id == NULL_REVISION or
2073
2395
source._revision_id in target.get_parent_ids()):
2074
# TODO: what about ghosts? it may well need to
2396
# TODO: what about ghosts? it may well need to
2075
2397
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
