1933
1893
if not all_versioned:
1934
1894
raise errors.PathsNotVersionedError(specific_files)
1935
1895
# -- remove redundancy in supplied specific_files to prevent over-scanning --
1896
search_specific_files = set()
1936
1897
for path in specific_files:
1937
1898
other_specific_files = specific_files.difference(set([path]))
1938
1899
if not osutils.is_inside_any(other_specific_files, path):
1939
1900
# this is a top level path, we must check it.
1940
1901
search_specific_files.add(path)
1903
# compare source_index and target_index at or under each element of search_specific_files.
1904
# follow the following comparison table. Note that we only want to do diff operations when
1905
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1909
# Source | Target | disk | action
1910
# r | fdlt | | add source to search, add id path move and perform
1911
# | | | diff check on source-target
1912
# r | fdlt | a | dangling file that was present in the basis.
1914
# r | a | | add source to search
1916
# r | r | | this path is present in a non-examined tree, skip.
1917
# r | r | a | this path is present in a non-examined tree, skip.
1918
# a | fdlt | | add new id
1919
# a | fdlt | a | dangling locally added file, skip
1920
# a | a | | not present in either tree, skip
1921
# a | a | a | not present in any tree, skip
1922
# a | r | | not present in either tree at this path, skip as it
1923
# | | | may not be selected by the users list of paths.
1924
# a | r | a | not present in either tree at this path, skip as it
1925
# | | | may not be selected by the users list of paths.
1926
# fdlt | fdlt | | content in both: diff them
1927
# fdlt | fdlt | a | deleted locally, but not unversioned - show as deleted ?
1928
# fdlt | a | | unversioned: output deleted id for now
1929
# fdlt | a | a | unversioned and deleted: output deleted id
1930
# fdlt | r | | relocated in this tree, so add target to search.
1931
# | | | Dont diff, we will see an r,fd; pair when we reach
1932
# | | | this id at the other path.
1933
# fdlt | r | a | relocated in this tree, so add target to search.
1934
# | | | Dont diff, we will see an r,fd; pair when we reach
1935
# | | | this id at the other path.
1937
# for all search_indexs in each path at or under each element of
1938
# search_specific_files, if the detail is relocated: add the id, and add the
1939
# relocated path as one to search if its not searched already. If the
1940
# detail is not relocated, add the id.
1941
searched_specific_files = set()
1942
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1943
# Using a list so that we can access the values and change them in
1944
# nested scope. Each one is [path, file_id, entry]
1945
last_source_parent = [None, None]
1946
last_target_parent = [None, None]
1942
1948
use_filesystem_for_exec = (sys.platform != 'win32')
1943
iter_changes = self.target._iter_changes(include_unchanged,
1944
use_filesystem_for_exec, search_specific_files, state,
1945
source_index, target_index, want_unversioned, self.target)
1946
return iter_changes.iter_changes()
1950
# Just a sentry, so that _process_entry can say that this
1951
# record is handled, but isn't interesting to process (unchanged)
1952
uninteresting = object()
1955
old_dirname_to_file_id = {}
1956
new_dirname_to_file_id = {}
1957
# TODO: jam 20070516 - Avoid the _get_entry lookup overhead by
1958
# keeping a cache of directories that we have seen.
1960
def _process_entry(entry, path_info):
1961
"""Compare an entry and real disk to generate delta information.
1963
:param path_info: top_relpath, basename, kind, lstat, abspath for
1964
the path of entry. If None, then the path is considered absent.
1965
(Perhaps we should pass in a concrete entry for this ?)
1966
Basename is returned as a utf8 string because we expect this
1967
tuple will be ignored, and don't want to take the time to
1969
:return: None if these don't match
1970
A tuple of information about the change, or
1971
the object 'uninteresting' if these match, but are
1972
basically identical.
1974
if source_index is None:
1975
source_details = NULL_PARENT_DETAILS
1977
source_details = entry[1][source_index]
1978
target_details = entry[1][target_index]
1979
target_minikind = target_details[0]
1980
if path_info is not None and target_minikind in 'fdlt':
1981
if not (target_index == 0):
1982
raise AssertionError()
1983
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
1984
stat_value=path_info[3])
1985
# The entry may have been modified by update_entry
1986
target_details = entry[1][target_index]
1987
target_minikind = target_details[0]
1990
file_id = entry[0][2]
1991
source_minikind = source_details[0]
1992
if source_minikind in 'fdltr' and target_minikind in 'fdlt':
1993
# claimed content in both: diff
1994
# r | fdlt | | add source to search, add id path move and perform
1995
# | | | diff check on source-target
1996
# r | fdlt | a | dangling file that was present in the basis.
1998
if source_minikind in 'r':
1999
# add the source to the search path to find any children it
2000
# has. TODO ? : only add if it is a container ?
2001
if not osutils.is_inside_any(searched_specific_files,
2003
search_specific_files.add(source_details[1])
2004
# generate the old path; this is needed for stating later
2006
old_path = source_details[1]
2007
old_dirname, old_basename = os.path.split(old_path)
2008
path = pathjoin(entry[0][0], entry[0][1])
2009
old_entry = state._get_entry(source_index,
2011
# update the source details variable to be the real
2013
if old_entry == (None, None):
2014
raise errors.CorruptDirstate(state._filename,
2015
"entry '%s/%s' is considered renamed from %r"
2016
" but source does not exist\n"
2017
"entry: %s" % (entry[0][0], entry[0][1], old_path, entry))
2018
source_details = old_entry[1][source_index]
2019
source_minikind = source_details[0]
2021
old_dirname = entry[0][0]
2022
old_basename = entry[0][1]
2023
old_path = path = None
2024
if path_info is None:
2025
# the file is missing on disk, show as removed.
2026
content_change = True
2030
# source and target are both versioned and disk file is present.
2031
target_kind = path_info[2]
2032
if target_kind == 'directory':
2034
old_path = path = pathjoin(old_dirname, old_basename)
2035
new_dirname_to_file_id[path] = file_id
2036
if source_minikind != 'd':
2037
content_change = True
2039
# directories have no fingerprint
2040
content_change = False
2042
elif target_kind == 'file':
2043
if source_minikind != 'f':
2044
content_change = True
2046
# We could check the size, but we already have the
2048
content_change = (link_or_sha1 != source_details[1])
2049
# Target details is updated at update_entry time
2050
if use_filesystem_for_exec:
2051
# We don't need S_ISREG here, because we are sure
2052
# we are dealing with a file.
2053
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
2055
target_exec = target_details[3]
2056
elif target_kind == 'symlink':
2057
if source_minikind != 'l':
2058
content_change = True
2060
content_change = (link_or_sha1 != source_details[1])
2062
elif target_kind == 'tree-reference':
2063
if source_minikind != 't':
2064
content_change = True
2066
content_change = False
2069
raise Exception, "unknown kind %s" % path_info[2]
2070
if source_minikind == 'd':
2072
old_path = path = pathjoin(old_dirname, old_basename)
2073
old_dirname_to_file_id[old_path] = file_id
2074
# parent id is the entry for the path in the target tree
2075
if old_dirname == last_source_parent[0]:
2076
source_parent_id = last_source_parent[1]
2079
source_parent_id = old_dirname_to_file_id[old_dirname]
2081
source_parent_entry = state._get_entry(source_index,
2082
path_utf8=old_dirname)
2083
source_parent_id = source_parent_entry[0][2]
2084
if source_parent_id == entry[0][2]:
2085
# This is the root, so the parent is None
2086
source_parent_id = None
2088
last_source_parent[0] = old_dirname
2089
last_source_parent[1] = source_parent_id
2090
new_dirname = entry[0][0]
2091
if new_dirname == last_target_parent[0]:
2092
target_parent_id = last_target_parent[1]
2095
target_parent_id = new_dirname_to_file_id[new_dirname]
2097
# TODO: We don't always need to do the lookup, because the
2098
# parent entry will be the same as the source entry.
2099
target_parent_entry = state._get_entry(target_index,
2100
path_utf8=new_dirname)
2101
if target_parent_entry == (None, None):
2102
raise AssertionError(
2103
"Could not find target parent in wt: %s\nparent of: %s"
2104
% (new_dirname, entry))
2105
target_parent_id = target_parent_entry[0][2]
2106
if target_parent_id == entry[0][2]:
2107
# This is the root, so the parent is None
2108
target_parent_id = None
2110
last_target_parent[0] = new_dirname
2111
last_target_parent[1] = target_parent_id
2113
source_exec = source_details[3]
2114
if (include_unchanged
2116
or source_parent_id != target_parent_id
2117
or old_basename != entry[0][1]
2118
or source_exec != target_exec
2120
if old_path is None:
2121
old_path = path = pathjoin(old_dirname, old_basename)
2122
old_path_u = utf8_decode(old_path)[0]
2125
old_path_u = utf8_decode(old_path)[0]
2126
if old_path == path:
2129
path_u = utf8_decode(path)[0]
2130
source_kind = _minikind_to_kind[source_minikind]
2131
return (entry[0][2],
2132
(old_path_u, path_u),
2135
(source_parent_id, target_parent_id),
2136
(utf8_decode(old_basename)[0], utf8_decode(entry[0][1])[0]),
2137
(source_kind, target_kind),
2138
(source_exec, target_exec))
2140
return uninteresting
2141
elif source_minikind in 'a' and target_minikind in 'fdlt':
2142
# looks like a new file
2143
if path_info is not None:
2144
path = pathjoin(entry[0][0], entry[0][1])
2145
# parent id is the entry for the path in the target tree
2146
# TODO: these are the same for an entire directory: cache em.
2147
parent_id = state._get_entry(target_index,
2148
path_utf8=entry[0][0])[0][2]
2149
if parent_id == entry[0][2]:
2151
if use_filesystem_for_exec:
2152
# We need S_ISREG here, because we aren't sure if this
2155
stat.S_ISREG(path_info[3].st_mode)
2156
and stat.S_IEXEC & path_info[3].st_mode)
2158
target_exec = target_details[3]
2159
return (entry[0][2],
2160
(None, utf8_decode(path)[0]),
2164
(None, utf8_decode(entry[0][1])[0]),
2165
(None, path_info[2]),
2166
(None, target_exec))
2168
# but its not on disk: we deliberately treat this as just
2169
# never-present. (Why ?! - RBC 20070224)
2171
elif source_minikind in 'fdlt' and target_minikind in 'a':
2172
# unversioned, possibly, or possibly not deleted: we dont care.
2173
# if its still on disk, *and* theres no other entry at this
2174
# path [we dont know this in this routine at the moment -
2175
# perhaps we should change this - then it would be an unknown.
2176
old_path = pathjoin(entry[0][0], entry[0][1])
2177
# parent id is the entry for the path in the target tree
2178
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
2179
if parent_id == entry[0][2]:
2181
return (entry[0][2],
2182
(utf8_decode(old_path)[0], None),
2186
(utf8_decode(entry[0][1])[0], None),
2187
(_minikind_to_kind[source_minikind], None),
2188
(source_details[3], None))
2189
elif source_minikind in 'fdlt' and target_minikind in 'r':
2190
# a rename; could be a true rename, or a rename inherited from
2191
# a renamed parent. TODO: handle this efficiently. Its not
2192
# common case to rename dirs though, so a correct but slow
2193
# implementation will do.
2194
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
2195
search_specific_files.add(target_details[1])
2196
elif source_minikind in 'ra' and target_minikind in 'ra':
2197
# neither of the selected trees contain this file,
2198
# so skip over it. This is not currently directly tested, but
2199
# is indirectly via test_too_much.TestCommands.test_conflicts.
2202
raise AssertionError("don't know how to compare "
2203
"source_minikind=%r, target_minikind=%r"
2204
% (source_minikind, target_minikind))
2205
## import pdb;pdb.set_trace()
2208
while search_specific_files:
2209
# TODO: the pending list should be lexically sorted? the
2210
# interface doesn't require it.
2211
current_root = search_specific_files.pop()
2212
current_root_unicode = current_root.decode('utf8')
2213
searched_specific_files.add(current_root)
2214
# process the entries for this containing directory: the rest will be
2215
# found by their parents recursively.
2216
root_entries = _entries_for_path(current_root)
2217
root_abspath = self.target.abspath(current_root_unicode)
2219
root_stat = os.lstat(root_abspath)
2221
if e.errno == errno.ENOENT:
2222
# the path does not exist: let _process_entry know that.
2223
root_dir_info = None
2225
# some other random error: hand it up.
2228
root_dir_info = ('', current_root,
2229
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
2231
if root_dir_info[2] == 'directory':
2232
if self.target._directory_is_tree_reference(
2233
current_root.decode('utf8')):
2234
root_dir_info = root_dir_info[:2] + \
2235
('tree-reference',) + root_dir_info[3:]
2237
if not root_entries and not root_dir_info:
2238
# this specified path is not present at all, skip it.
2240
path_handled = False
2241
for entry in root_entries:
2242
result = _process_entry(entry, root_dir_info)
2243
if result is not None:
2245
if result is not uninteresting:
2247
if want_unversioned and not path_handled and root_dir_info:
2248
new_executable = bool(
2249
stat.S_ISREG(root_dir_info[3].st_mode)
2250
and stat.S_IEXEC & root_dir_info[3].st_mode)
2252
(None, current_root_unicode),
2256
(None, splitpath(current_root_unicode)[-1]),
2257
(None, root_dir_info[2]),
2258
(None, new_executable)
2260
initial_key = (current_root, '', '')
2261
block_index, _ = state._find_block_index_from_key(initial_key)
2262
if block_index == 0:
2263
# we have processed the total root already, but because the
2264
# initial key matched it we should skip it here.
2266
if root_dir_info and root_dir_info[2] == 'tree-reference':
2267
current_dir_info = None
2269
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
2271
current_dir_info = dir_iterator.next()
2273
# on win32, python2.4 has e.errno == ERROR_DIRECTORY, but
2274
# python 2.5 has e.errno == EINVAL,
2275
# and e.winerror == ERROR_DIRECTORY
2276
e_winerror = getattr(e, 'winerror', None)
2277
win_errors = (ERROR_DIRECTORY, ERROR_PATH_NOT_FOUND)
2278
# there may be directories in the inventory even though
2279
# this path is not a file on disk: so mark it as end of
2281
if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
2282
current_dir_info = None
2283
elif (sys.platform == 'win32'
2284
and (e.errno in win_errors
2285
or e_winerror in win_errors)):
2286
current_dir_info = None
2290
if current_dir_info[0][0] == '':
2291
# remove .bzr from iteration
2292
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
2293
if current_dir_info[1][bzr_index][0] != '.bzr':
2294
raise AssertionError()
2295
del current_dir_info[1][bzr_index]
2296
# walk until both the directory listing and the versioned metadata
2298
if (block_index < len(state._dirblocks) and
2299
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2300
current_block = state._dirblocks[block_index]
2302
current_block = None
2303
while (current_dir_info is not None or
2304
current_block is not None):
2305
if (current_dir_info and current_block
2306
and current_dir_info[0][0] != current_block[0]):
2307
if cmp_by_dirs(current_dir_info[0][0], current_block[0]) < 0:
2308
# filesystem data refers to paths not covered by the dirblock.
2309
# this has two possibilities:
2310
# A) it is versioned but empty, so there is no block for it
2311
# B) it is not versioned.
2313
# if (A) then we need to recurse into it to check for
2314
# new unknown files or directories.
2315
# if (B) then we should ignore it, because we don't
2316
# recurse into unknown directories.
2318
while path_index < len(current_dir_info[1]):
2319
current_path_info = current_dir_info[1][path_index]
2320
if want_unversioned:
2321
if current_path_info[2] == 'directory':
2322
if self.target._directory_is_tree_reference(
2323
current_path_info[0].decode('utf8')):
2324
current_path_info = current_path_info[:2] + \
2325
('tree-reference',) + current_path_info[3:]
2326
new_executable = bool(
2327
stat.S_ISREG(current_path_info[3].st_mode)
2328
and stat.S_IEXEC & current_path_info[3].st_mode)
2330
(None, utf8_decode(current_path_info[0])[0]),
2334
(None, utf8_decode(current_path_info[1])[0]),
2335
(None, current_path_info[2]),
2336
(None, new_executable))
2337
# dont descend into this unversioned path if it is
2339
if current_path_info[2] in ('directory',
2341
del current_dir_info[1][path_index]
2345
# This dir info has been handled, go to the next
2347
current_dir_info = dir_iterator.next()
2348
except StopIteration:
2349
current_dir_info = None
2351
# We have a dirblock entry for this location, but there
2352
# is no filesystem path for this. This is most likely
2353
# because a directory was removed from the disk.
2354
# We don't have to report the missing directory,
2355
# because that should have already been handled, but we
2356
# need to handle all of the files that are contained
2358
for current_entry in current_block[1]:
2359
# entry referring to file not present on disk.
2360
# advance the entry only, after processing.
2361
result = _process_entry(current_entry, None)
2362
if result is not None:
2363
if result is not uninteresting:
2366
if (block_index < len(state._dirblocks) and
2367
osutils.is_inside(current_root,
2368
state._dirblocks[block_index][0])):
2369
current_block = state._dirblocks[block_index]
2371
current_block = None
2374
if current_block and entry_index < len(current_block[1]):
2375
current_entry = current_block[1][entry_index]
2377
current_entry = None
2378
advance_entry = True
2380
if current_dir_info and path_index < len(current_dir_info[1]):
2381
current_path_info = current_dir_info[1][path_index]
2382
if current_path_info[2] == 'directory':
2383
if self.target._directory_is_tree_reference(
2384
current_path_info[0].decode('utf8')):
2385
current_path_info = current_path_info[:2] + \
2386
('tree-reference',) + current_path_info[3:]
2388
current_path_info = None
2390
path_handled = False
2391
while (current_entry is not None or
2392
current_path_info is not None):
2393
if current_entry is None:
2394
# the check for path_handled when the path is adnvaced
2395
# will yield this path if needed.
2397
elif current_path_info is None:
2398
# no path is fine: the per entry code will handle it.
2399
result = _process_entry(current_entry, current_path_info)
2400
if result is not None:
2401
if result is not uninteresting:
2403
elif (current_entry[0][1] != current_path_info[1]
2404
or current_entry[1][target_index][0] in 'ar'):
2405
# The current path on disk doesn't match the dirblock
2406
# record. Either the dirblock is marked as absent, or
2407
# the file on disk is not present at all in the
2408
# dirblock. Either way, report about the dirblock
2409
# entry, and let other code handle the filesystem one.
2411
# Compare the basename for these files to determine
2413
if current_path_info[1] < current_entry[0][1]:
2414
# extra file on disk: pass for now, but only
2415
# increment the path, not the entry
2416
advance_entry = False
2418
# entry referring to file not present on disk.
2419
# advance the entry only, after processing.
2420
result = _process_entry(current_entry, None)
2421
if result is not None:
2422
if result is not uninteresting:
2424
advance_path = False
2426
result = _process_entry(current_entry, current_path_info)
2427
if result is not None:
2429
if result is not uninteresting:
2431
if advance_entry and current_entry is not None:
2433
if entry_index < len(current_block[1]):
2434
current_entry = current_block[1][entry_index]
2436
current_entry = None
2438
advance_entry = True # reset the advance flaga
2439
if advance_path and current_path_info is not None:
2440
if not path_handled:
2441
# unversioned in all regards
2442
if want_unversioned:
2443
new_executable = bool(
2444
stat.S_ISREG(current_path_info[3].st_mode)
2445
and stat.S_IEXEC & current_path_info[3].st_mode)
2447
(None, utf8_decode(current_path_info[0])[0]),
2451
(None, utf8_decode(current_path_info[1])[0]),
2452
(None, current_path_info[2]),
2453
(None, new_executable))
2454
# dont descend into this unversioned path if it is
2456
if current_path_info[2] in ('directory'):
2457
del current_dir_info[1][path_index]
2459
# dont descend the disk iterator into any tree
2461
if current_path_info[2] == 'tree-reference':
2462
del current_dir_info[1][path_index]
2465
if path_index < len(current_dir_info[1]):
2466
current_path_info = current_dir_info[1][path_index]
2467
if current_path_info[2] == 'directory':
2468
if self.target._directory_is_tree_reference(
2469
current_path_info[0].decode('utf8')):
2470
current_path_info = current_path_info[:2] + \
2471
('tree-reference',) + current_path_info[3:]
2473
current_path_info = None
2474
path_handled = False
2476
advance_path = True # reset the advance flagg.
2477
if current_block is not None:
2479
if (block_index < len(state._dirblocks) and
2480
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2481
current_block = state._dirblocks[block_index]
2483
current_block = None
2484
if current_dir_info is not None:
2486
current_dir_info = dir_iterator.next()
2487
except StopIteration:
2488
current_dir_info = None
1949
2492
def is_compatible(source, target):
added
removed
bzrlib/workingtree_4.py
