2080
1917
if not found_versioned:
2081
1918
# none of the indexes was not 'absent' at all ids for this
2083
not_versioned.append(path)
2084
if len(not_versioned) > 0:
2085
raise errors.PathsNotVersionedError(not_versioned)
1920
all_versioned = False
1922
if not all_versioned:
1923
raise errors.PathsNotVersionedError(specific_files)
2086
1924
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2087
search_specific_files = osutils.minimum_path_selection(specific_files)
1925
search_specific_files = set()
1926
for path in specific_files:
1927
other_specific_files = specific_files.difference(set([path]))
1928
if not osutils.is_inside_any(other_specific_files, path):
1929
# this is a top level path, we must check it.
1930
search_specific_files.add(path)
1932
# compare source_index and target_index at or under each element of search_specific_files.
1933
# follow the following comparison table. Note that we only want to do diff operations when
1934
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1938
# Source | Target | disk | action
1939
# r | fdlt | | add source to search, add id path move and perform
1940
# | | | diff check on source-target
1941
# r | fdlt | a | dangling file that was present in the basis.
1943
# r | a | | add source to search
1945
# r | r | | this path is present in a non-examined tree, skip.
1946
# r | r | a | this path is present in a non-examined tree, skip.
1947
# a | fdlt | | add new id
1948
# a | fdlt | a | dangling locally added file, skip
1949
# a | a | | not present in either tree, skip
1950
# a | a | a | not present in any tree, skip
1951
# a | r | | not present in either tree at this path, skip as it
1952
# | | | may not be selected by the users list of paths.
1953
# a | r | a | not present in either tree at this path, skip as it
1954
# | | | may not be selected by the users list of paths.
1955
# fdlt | fdlt | | content in both: diff them
1956
# fdlt | fdlt | a | deleted locally, but not unversioned - show as deleted ?
1957
# fdlt | a | | unversioned: output deleted id for now
1958
# fdlt | a | a | unversioned and deleted: output deleted id
1959
# fdlt | r | | relocated in this tree, so add target to search.
1960
# | | | Dont diff, we will see an r,fd; pair when we reach
1961
# | | | this id at the other path.
1962
# fdlt | r | a | relocated in this tree, so add target to search.
1963
# | | | Dont diff, we will see an r,fd; pair when we reach
1964
# | | | this id at the other path.
1966
# for all search_indexs in each path at or under each element of
1967
# search_specific_files, if the detail is relocated: add the id, and add the
1968
# relocated path as one to search if its not searched already. If the
1969
# detail is not relocated, add the id.
1970
searched_specific_files = set()
1971
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1972
# Using a list so that we can access the values and change them in
1973
# nested scope. Each one is [path, file_id, entry]
1974
last_source_parent = [None, None]
1975
last_target_parent = [None, None]
2089
1977
use_filesystem_for_exec = (sys.platform != 'win32')
2090
iter_changes = self.target._iter_changes(include_unchanged,
2091
use_filesystem_for_exec, search_specific_files, state,
2092
source_index, target_index, want_unversioned, self.target)
2093
return iter_changes.iter_changes()
1979
# Just a sentry, so that _process_entry can say that this
1980
# record is handled, but isn't interesting to process (unchanged)
1981
uninteresting = object()
1984
old_dirname_to_file_id = {}
1985
new_dirname_to_file_id = {}
1986
# TODO: jam 20070516 - Avoid the _get_entry lookup overhead by
1987
# keeping a cache of directories that we have seen.
1989
def _process_entry(entry, path_info):
1990
"""Compare an entry and real disk to generate delta information.
1992
:param path_info: top_relpath, basename, kind, lstat, abspath for
1993
the path of entry. If None, then the path is considered absent.
1994
(Perhaps we should pass in a concrete entry for this ?)
1995
Basename is returned as a utf8 string because we expect this
1996
tuple will be ignored, and don't want to take the time to
1998
:return: None if these don't match
1999
A tuple of information about the change, or
2000
the object 'uninteresting' if these match, but are
2001
basically identical.
2003
if source_index is None:
2004
source_details = NULL_PARENT_DETAILS
2006
source_details = entry[1][source_index]
2007
target_details = entry[1][target_index]
2008
target_minikind = target_details[0]
2009
if path_info is not None and target_minikind in 'fdlt':
2010
if not (target_index == 0):
2011
raise AssertionError()
2012
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
2013
stat_value=path_info[3])
2014
# The entry may have been modified by update_entry
2015
target_details = entry[1][target_index]
2016
target_minikind = target_details[0]
2019
file_id = entry[0][2]
2020
source_minikind = source_details[0]
2021
if source_minikind in 'fdltr' and target_minikind in 'fdlt':
2022
# claimed content in both: diff
2023
# r | fdlt | | add source to search, add id path move and perform
2024
# | | | diff check on source-target
2025
# r | fdlt | a | dangling file that was present in the basis.
2027
if source_minikind in 'r':
2028
# add the source to the search path to find any children it
2029
# has. TODO ? : only add if it is a container ?
2030
if not osutils.is_inside_any(searched_specific_files,
2032
search_specific_files.add(source_details[1])
2033
# generate the old path; this is needed for stating later
2035
old_path = source_details[1]
2036
old_dirname, old_basename = os.path.split(old_path)
2037
path = pathjoin(entry[0][0], entry[0][1])
2038
old_entry = state._get_entry(source_index,
2040
# update the source details variable to be the real
2042
if old_entry == (None, None):
2043
raise errors.CorruptDirstate(state._filename,
2044
"entry '%s/%s' is considered renamed from %r"
2045
" but source does not exist\n"
2046
"entry: %s" % (entry[0][0], entry[0][1], old_path, entry))
2047
source_details = old_entry[1][source_index]
2048
source_minikind = source_details[0]
2050
old_dirname = entry[0][0]
2051
old_basename = entry[0][1]
2052
old_path = path = None
2053
if path_info is None:
2054
# the file is missing on disk, show as removed.
2055
content_change = True
2059
# source and target are both versioned and disk file is present.
2060
target_kind = path_info[2]
2061
if target_kind == 'directory':
2063
old_path = path = pathjoin(old_dirname, old_basename)
2064
new_dirname_to_file_id[path] = file_id
2065
if source_minikind != 'd':
2066
content_change = True
2068
# directories have no fingerprint
2069
content_change = False
2071
elif target_kind == 'file':
2072
if source_minikind != 'f':
2073
content_change = True
2075
# We could check the size, but we already have the
2077
content_change = (link_or_sha1 != source_details[1])
2078
# Target details is updated at update_entry time
2079
if use_filesystem_for_exec:
2080
# We don't need S_ISREG here, because we are sure
2081
# we are dealing with a file.
2082
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
2084
target_exec = target_details[3]
2085
elif target_kind == 'symlink':
2086
if source_minikind != 'l':
2087
content_change = True
2089
content_change = (link_or_sha1 != source_details[1])
2091
elif target_kind == 'tree-reference':
2092
if source_minikind != 't':
2093
content_change = True
2095
content_change = False
2098
raise Exception, "unknown kind %s" % path_info[2]
2099
if source_minikind == 'd':
2101
old_path = path = pathjoin(old_dirname, old_basename)
2102
old_dirname_to_file_id[old_path] = file_id
2103
# parent id is the entry for the path in the target tree
2104
if old_dirname == last_source_parent[0]:
2105
source_parent_id = last_source_parent[1]
2108
source_parent_id = old_dirname_to_file_id[old_dirname]
2110
source_parent_entry = state._get_entry(source_index,
2111
path_utf8=old_dirname)
2112
source_parent_id = source_parent_entry[0][2]
2113
if source_parent_id == entry[0][2]:
2114
# This is the root, so the parent is None
2115
source_parent_id = None
2117
last_source_parent[0] = old_dirname
2118
last_source_parent[1] = source_parent_id
2119
new_dirname = entry[0][0]
2120
if new_dirname == last_target_parent[0]:
2121
target_parent_id = last_target_parent[1]
2124
target_parent_id = new_dirname_to_file_id[new_dirname]
2126
# TODO: We don't always need to do the lookup, because the
2127
# parent entry will be the same as the source entry.
2128
target_parent_entry = state._get_entry(target_index,
2129
path_utf8=new_dirname)
2130
if target_parent_entry == (None, None):
2131
raise AssertionError(
2132
"Could not find target parent in wt: %s\nparent of: %s"
2133
% (new_dirname, entry))
2134
target_parent_id = target_parent_entry[0][2]
2135
if target_parent_id == entry[0][2]:
2136
# This is the root, so the parent is None
2137
target_parent_id = None
2139
last_target_parent[0] = new_dirname
2140
last_target_parent[1] = target_parent_id
2142
source_exec = source_details[3]
2143
if (include_unchanged
2145
or source_parent_id != target_parent_id
2146
or old_basename != entry[0][1]
2147
or source_exec != target_exec
2149
if old_path is None:
2150
old_path = path = pathjoin(old_dirname, old_basename)
2151
old_path_u = utf8_decode(old_path)[0]
2154
old_path_u = utf8_decode(old_path)[0]
2155
if old_path == path:
2158
path_u = utf8_decode(path)[0]
2159
source_kind = _minikind_to_kind[source_minikind]
2160
return (entry[0][2],
2161
(old_path_u, path_u),
2164
(source_parent_id, target_parent_id),
2165
(utf8_decode(old_basename)[0], utf8_decode(entry[0][1])[0]),
2166
(source_kind, target_kind),
2167
(source_exec, target_exec))
2169
return uninteresting
2170
elif source_minikind in 'a' and target_minikind in 'fdlt':
2171
# looks like a new file
2172
if path_info is not None:
2173
path = pathjoin(entry[0][0], entry[0][1])
2174
# parent id is the entry for the path in the target tree
2175
# TODO: these are the same for an entire directory: cache em.
2176
parent_id = state._get_entry(target_index,
2177
path_utf8=entry[0][0])[0][2]
2178
if parent_id == entry[0][2]:
2180
if use_filesystem_for_exec:
2181
# We need S_ISREG here, because we aren't sure if this
2184
stat.S_ISREG(path_info[3].st_mode)
2185
and stat.S_IEXEC & path_info[3].st_mode)
2187
target_exec = target_details[3]
2188
return (entry[0][2],
2189
(None, utf8_decode(path)[0]),
2193
(None, utf8_decode(entry[0][1])[0]),
2194
(None, path_info[2]),
2195
(None, target_exec))
2197
# but its not on disk: we deliberately treat this as just
2198
# never-present. (Why ?! - RBC 20070224)
2200
elif source_minikind in 'fdlt' and target_minikind in 'a':
2201
# unversioned, possibly, or possibly not deleted: we dont care.
2202
# if its still on disk, *and* theres no other entry at this
2203
# path [we dont know this in this routine at the moment -
2204
# perhaps we should change this - then it would be an unknown.
2205
old_path = pathjoin(entry[0][0], entry[0][1])
2206
# parent id is the entry for the path in the target tree
2207
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
2208
if parent_id == entry[0][2]:
2210
return (entry[0][2],
2211
(utf8_decode(old_path)[0], None),
2215
(utf8_decode(entry[0][1])[0], None),
2216
(_minikind_to_kind[source_minikind], None),
2217
(source_details[3], None))
2218
elif source_minikind in 'fdlt' and target_minikind in 'r':
2219
# a rename; could be a true rename, or a rename inherited from
2220
# a renamed parent. TODO: handle this efficiently. Its not
2221
# common case to rename dirs though, so a correct but slow
2222
# implementation will do.
2223
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
2224
search_specific_files.add(target_details[1])
2225
elif source_minikind in 'ra' and target_minikind in 'ra':
2226
# neither of the selected trees contain this file,
2227
# so skip over it. This is not currently directly tested, but
2228
# is indirectly via test_too_much.TestCommands.test_conflicts.
2231
raise AssertionError("don't know how to compare "
2232
"source_minikind=%r, target_minikind=%r"
2233
% (source_minikind, target_minikind))
2234
## import pdb;pdb.set_trace()
2237
while search_specific_files:
2238
# TODO: the pending list should be lexically sorted? the
2239
# interface doesn't require it.
2240
current_root = search_specific_files.pop()
2241
current_root_unicode = current_root.decode('utf8')
2242
searched_specific_files.add(current_root)
2243
# process the entries for this containing directory: the rest will be
2244
# found by their parents recursively.
2245
root_entries = _entries_for_path(current_root)
2246
root_abspath = self.target.abspath(current_root_unicode)
2248
root_stat = os.lstat(root_abspath)
2250
if e.errno == errno.ENOENT:
2251
# the path does not exist: let _process_entry know that.
2252
root_dir_info = None
2254
# some other random error: hand it up.
2257
root_dir_info = ('', current_root,
2258
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
2260
if root_dir_info[2] == 'directory':
2261
if self.target._directory_is_tree_reference(
2262
current_root.decode('utf8')):
2263
root_dir_info = root_dir_info[:2] + \
2264
('tree-reference',) + root_dir_info[3:]
2266
if not root_entries and not root_dir_info:
2267
# this specified path is not present at all, skip it.
2269
path_handled = False
2270
for entry in root_entries:
2271
result = _process_entry(entry, root_dir_info)
2272
if result is not None:
2274
if result is not uninteresting:
2276
if want_unversioned and not path_handled and root_dir_info:
2277
new_executable = bool(
2278
stat.S_ISREG(root_dir_info[3].st_mode)
2279
and stat.S_IEXEC & root_dir_info[3].st_mode)
2281
(None, current_root_unicode),
2285
(None, splitpath(current_root_unicode)[-1]),
2286
(None, root_dir_info[2]),
2287
(None, new_executable)
2289
initial_key = (current_root, '', '')
2290
block_index, _ = state._find_block_index_from_key(initial_key)
2291
if block_index == 0:
2292
# we have processed the total root already, but because the
2293
# initial key matched it we should skip it here.
2295
if root_dir_info and root_dir_info[2] == 'tree-reference':
2296
current_dir_info = None
2298
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
2300
current_dir_info = dir_iterator.next()
2302
# on win32, python2.4 has e.errno == ERROR_DIRECTORY, but
2303
# python 2.5 has e.errno == EINVAL,
2304
# and e.winerror == ERROR_DIRECTORY
2305
e_winerror = getattr(e, 'winerror', None)
2306
win_errors = (ERROR_DIRECTORY, ERROR_PATH_NOT_FOUND)
2307
# there may be directories in the inventory even though
2308
# this path is not a file on disk: so mark it as end of
2310
if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
2311
current_dir_info = None
2312
elif (sys.platform == 'win32'
2313
and (e.errno in win_errors
2314
or e_winerror in win_errors)):
2315
current_dir_info = None
2319
if current_dir_info[0][0] == '':
2320
# remove .bzr from iteration
2321
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
2322
if current_dir_info[1][bzr_index][0] != '.bzr':
2323
raise AssertionError()
2324
del current_dir_info[1][bzr_index]
2325
# walk until both the directory listing and the versioned metadata
2327
if (block_index < len(state._dirblocks) and
2328
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2329
current_block = state._dirblocks[block_index]
2331
current_block = None
2332
while (current_dir_info is not None or
2333
current_block is not None):
2334
if (current_dir_info and current_block
2335
and current_dir_info[0][0] != current_block[0]):
2336
if cmp_by_dirs(current_dir_info[0][0], current_block[0]) < 0:
2337
# filesystem data refers to paths not covered by the dirblock.
2338
# this has two possibilities:
2339
# A) it is versioned but empty, so there is no block for it
2340
# B) it is not versioned.
2342
# if (A) then we need to recurse into it to check for
2343
# new unknown files or directories.
2344
# if (B) then we should ignore it, because we don't
2345
# recurse into unknown directories.
2347
while path_index < len(current_dir_info[1]):
2348
current_path_info = current_dir_info[1][path_index]
2349
if want_unversioned:
2350
if current_path_info[2] == 'directory':
2351
if self.target._directory_is_tree_reference(
2352
current_path_info[0].decode('utf8')):
2353
current_path_info = current_path_info[:2] + \
2354
('tree-reference',) + current_path_info[3:]
2355
new_executable = bool(
2356
stat.S_ISREG(current_path_info[3].st_mode)
2357
and stat.S_IEXEC & current_path_info[3].st_mode)
2359
(None, utf8_decode(current_path_info[0])[0]),
2363
(None, utf8_decode(current_path_info[1])[0]),
2364
(None, current_path_info[2]),
2365
(None, new_executable))
2366
# dont descend into this unversioned path if it is
2368
if current_path_info[2] in ('directory',
2370
del current_dir_info[1][path_index]
2374
# This dir info has been handled, go to the next
2376
current_dir_info = dir_iterator.next()
2377
except StopIteration:
2378
current_dir_info = None
2380
# We have a dirblock entry for this location, but there
2381
# is no filesystem path for this. This is most likely
2382
# because a directory was removed from the disk.
2383
# We don't have to report the missing directory,
2384
# because that should have already been handled, but we
2385
# need to handle all of the files that are contained
2387
for current_entry in current_block[1]:
2388
# entry referring to file not present on disk.
2389
# advance the entry only, after processing.
2390
result = _process_entry(current_entry, None)
2391
if result is not None:
2392
if result is not uninteresting:
2395
if (block_index < len(state._dirblocks) and
2396
osutils.is_inside(current_root,
2397
state._dirblocks[block_index][0])):
2398
current_block = state._dirblocks[block_index]
2400
current_block = None
2403
if current_block and entry_index < len(current_block[1]):
2404
current_entry = current_block[1][entry_index]
2406
current_entry = None
2407
advance_entry = True
2409
if current_dir_info and path_index < len(current_dir_info[1]):
2410
current_path_info = current_dir_info[1][path_index]
2411
if current_path_info[2] == 'directory':
2412
if self.target._directory_is_tree_reference(
2413
current_path_info[0].decode('utf8')):
2414
current_path_info = current_path_info[:2] + \
2415
('tree-reference',) + current_path_info[3:]
2417
current_path_info = None
2419
path_handled = False
2420
while (current_entry is not None or
2421
current_path_info is not None):
2422
if current_entry is None:
2423
# the check for path_handled when the path is adnvaced
2424
# will yield this path if needed.
2426
elif current_path_info is None:
2427
# no path is fine: the per entry code will handle it.
2428
result = _process_entry(current_entry, current_path_info)
2429
if result is not None:
2430
if result is not uninteresting:
2432
elif (current_entry[0][1] != current_path_info[1]
2433
or current_entry[1][target_index][0] in 'ar'):
2434
# The current path on disk doesn't match the dirblock
2435
# record. Either the dirblock is marked as absent, or
2436
# the file on disk is not present at all in the
2437
# dirblock. Either way, report about the dirblock
2438
# entry, and let other code handle the filesystem one.
2440
# Compare the basename for these files to determine
2442
if current_path_info[1] < current_entry[0][1]:
2443
# extra file on disk: pass for now, but only
2444
# increment the path, not the entry
2445
advance_entry = False
2447
# entry referring to file not present on disk.
2448
# advance the entry only, after processing.
2449
result = _process_entry(current_entry, None)
2450
if result is not None:
2451
if result is not uninteresting:
2453
advance_path = False
2455
result = _process_entry(current_entry, current_path_info)
2456
if result is not None:
2458
if result is not uninteresting:
2460
if advance_entry and current_entry is not None:
2462
if entry_index < len(current_block[1]):
2463
current_entry = current_block[1][entry_index]
2465
current_entry = None
2467
advance_entry = True # reset the advance flaga
2468
if advance_path and current_path_info is not None:
2469
if not path_handled:
2470
# unversioned in all regards
2471
if want_unversioned:
2472
new_executable = bool(
2473
stat.S_ISREG(current_path_info[3].st_mode)
2474
and stat.S_IEXEC & current_path_info[3].st_mode)
2476
relpath_unicode = utf8_decode(current_path_info[0])[0]
2477
except UnicodeDecodeError:
2478
raise errors.BadFilenameEncoding(
2479
current_path_info[0], osutils._fs_enc)
2481
(None, relpath_unicode),
2485
(None, utf8_decode(current_path_info[1])[0]),
2486
(None, current_path_info[2]),
2487
(None, new_executable))
2488
# dont descend into this unversioned path if it is
2490
if current_path_info[2] in ('directory'):
2491
del current_dir_info[1][path_index]
2493
# dont descend the disk iterator into any tree
2495
if current_path_info[2] == 'tree-reference':
2496
del current_dir_info[1][path_index]
2499
if path_index < len(current_dir_info[1]):
2500
current_path_info = current_dir_info[1][path_index]
2501
if current_path_info[2] == 'directory':
2502
if self.target._directory_is_tree_reference(
2503
current_path_info[0].decode('utf8')):
2504
current_path_info = current_path_info[:2] + \
2505
('tree-reference',) + current_path_info[3:]
2507
current_path_info = None
2508
path_handled = False
2510
advance_path = True # reset the advance flagg.
2511
if current_block is not None:
2513
if (block_index < len(state._dirblocks) and
2514
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2515
current_block = state._dirblocks[block_index]
2517
current_block = None
2518
if current_dir_info is not None:
2520
current_dir_info = dir_iterator.next()
2521
except StopIteration:
2522
current_dir_info = None
2096
2526
def is_compatible(source, target):
2097
2527
# the target must be a dirstate working tree
2098
if not isinstance(target, DirStateWorkingTree):
2528
if not isinstance(target, WorkingTree4):
2100
# the source must be a revtree or dirstate rev tree.
2530
# the source must be a revtreee or dirstate rev tree.
2101
2531
if not isinstance(source,
2102
2532
(revisiontree.RevisionTree, DirStateRevisionTree)):
2104
2534
# the source revid must be in the target dirstate
2105
if not (source._revision_id == _mod_revision.NULL_REVISION or
2535
if not (source._revision_id == NULL_REVISION or
2106
2536
source._revision_id in target.get_parent_ids()):
2107
# TODO: what about ghosts? it may well need to
2537
# TODO: what about ghosts? it may well need to
2108
2538
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
