2080
1910
if not found_versioned:
2081
1911
# 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)
1913
all_versioned = False
1915
if not all_versioned:
1916
raise errors.PathsNotVersionedError(specific_files)
2086
1917
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2087
search_specific_files = osutils.minimum_path_selection(specific_files)
1918
search_specific_files = set()
1919
for path in specific_files:
1920
other_specific_files = specific_files.difference(set([path]))
1921
if not osutils.is_inside_any(other_specific_files, path):
1922
# this is a top level path, we must check it.
1923
search_specific_files.add(path)
1925
# compare source_index and target_index at or under each element of search_specific_files.
1926
# follow the following comparison table. Note that we only want to do diff operations when
1927
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1931
# Source | Target | disk | action
1932
# r | fdlt | | add source to search, add id path move and perform
1933
# | | | diff check on source-target
1934
# r | fdlt | a | dangling file that was present in the basis.
1936
# r | a | | add source to search
1938
# r | r | | this path is present in a non-examined tree, skip.
1939
# r | r | a | this path is present in a non-examined tree, skip.
1940
# a | fdlt | | add new id
1941
# a | fdlt | a | dangling locally added file, skip
1942
# a | a | | not present in either tree, skip
1943
# a | a | a | not present in any tree, skip
1944
# a | r | | not present in either tree at this path, skip as it
1945
# | | | may not be selected by the users list of paths.
1946
# a | r | a | not present in either tree at this path, skip as it
1947
# | | | may not be selected by the users list of paths.
1948
# fdlt | fdlt | | content in both: diff them
1949
# fdlt | fdlt | a | deleted locally, but not unversioned - show as deleted ?
1950
# fdlt | a | | unversioned: output deleted id for now
1951
# fdlt | a | a | unversioned and deleted: output deleted id
1952
# fdlt | r | | relocated in this tree, so add target to search.
1953
# | | | Dont diff, we will see an r,fd; pair when we reach
1954
# | | | this id at the other path.
1955
# fdlt | r | a | relocated in this tree, so add target to search.
1956
# | | | Dont diff, we will see an r,fd; pair when we reach
1957
# | | | this id at the other path.
1959
# for all search_indexs in each path at or under each element of
1960
# search_specific_files, if the detail is relocated: add the id, and add the
1961
# relocated path as one to search if its not searched already. If the
1962
# detail is not relocated, add the id.
1963
searched_specific_files = set()
1964
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1965
# Using a list so that we can access the values and change them in
1966
# nested scope. Each one is [path, file_id, entry]
1967
last_source_parent = [None, None]
1968
last_target_parent = [None, None]
2089
1970
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()
1972
# Just a sentry, so that _process_entry can say that this
1973
# record is handled, but isn't interesting to process (unchanged)
1974
uninteresting = object()
1977
old_dirname_to_file_id = {}
1978
new_dirname_to_file_id = {}
1979
# TODO: jam 20070516 - Avoid the _get_entry lookup overhead by
1980
# keeping a cache of directories that we have seen.
1982
def _process_entry(entry, path_info):
1983
"""Compare an entry and real disk to generate delta information.
1985
:param path_info: top_relpath, basename, kind, lstat, abspath for
1986
the path of entry. If None, then the path is considered absent.
1987
(Perhaps we should pass in a concrete entry for this ?)
1988
Basename is returned as a utf8 string because we expect this
1989
tuple will be ignored, and don't want to take the time to
1991
:return: None if these don't match
1992
A tuple of information about the change, or
1993
the object 'uninteresting' if these match, but are
1994
basically identical.
1996
if source_index is None:
1997
source_details = NULL_PARENT_DETAILS
1999
source_details = entry[1][source_index]
2000
target_details = entry[1][target_index]
2001
target_minikind = target_details[0]
2002
if path_info is not None and target_minikind in 'fdlt':
2003
if not (target_index == 0):
2004
raise AssertionError()
2005
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
2006
stat_value=path_info[3])
2007
# The entry may have been modified by update_entry
2008
target_details = entry[1][target_index]
2009
target_minikind = target_details[0]
2012
file_id = entry[0][2]
2013
source_minikind = source_details[0]
2014
if source_minikind in 'fdltr' and target_minikind in 'fdlt':
2015
# claimed content in both: diff
2016
# r | fdlt | | add source to search, add id path move and perform
2017
# | | | diff check on source-target
2018
# r | fdlt | a | dangling file that was present in the basis.
2020
if source_minikind in 'r':
2021
# add the source to the search path to find any children it
2022
# has. TODO ? : only add if it is a container ?
2023
if not osutils.is_inside_any(searched_specific_files,
2025
search_specific_files.add(source_details[1])
2026
# generate the old path; this is needed for stating later
2028
old_path = source_details[1]
2029
old_dirname, old_basename = os.path.split(old_path)
2030
path = pathjoin(entry[0][0], entry[0][1])
2031
old_entry = state._get_entry(source_index,
2033
# update the source details variable to be the real
2035
if old_entry == (None, None):
2036
raise errors.CorruptDirstate(state._filename,
2037
"entry '%s/%s' is considered renamed from %r"
2038
" but source does not exist\n"
2039
"entry: %s" % (entry[0][0], entry[0][1], old_path, entry))
2040
source_details = old_entry[1][source_index]
2041
source_minikind = source_details[0]
2043
old_dirname = entry[0][0]
2044
old_basename = entry[0][1]
2045
old_path = path = None
2046
if path_info is None:
2047
# the file is missing on disk, show as removed.
2048
content_change = True
2052
# source and target are both versioned and disk file is present.
2053
target_kind = path_info[2]
2054
if target_kind == 'directory':
2056
old_path = path = pathjoin(old_dirname, old_basename)
2057
new_dirname_to_file_id[path] = file_id
2058
if source_minikind != 'd':
2059
content_change = True
2061
# directories have no fingerprint
2062
content_change = False
2064
elif target_kind == 'file':
2065
if source_minikind != 'f':
2066
content_change = True
2068
# We could check the size, but we already have the
2070
content_change = (link_or_sha1 != source_details[1])
2071
# Target details is updated at update_entry time
2072
if use_filesystem_for_exec:
2073
# We don't need S_ISREG here, because we are sure
2074
# we are dealing with a file.
2075
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
2077
target_exec = target_details[3]
2078
elif target_kind == 'symlink':
2079
if source_minikind != 'l':
2080
content_change = True
2082
content_change = (link_or_sha1 != source_details[1])
2084
elif target_kind == 'tree-reference':
2085
if source_minikind != 't':
2086
content_change = True
2088
content_change = False
2091
raise Exception, "unknown kind %s" % path_info[2]
2092
if source_minikind == 'd':
2094
old_path = path = pathjoin(old_dirname, old_basename)
2095
old_dirname_to_file_id[old_path] = file_id
2096
# parent id is the entry for the path in the target tree
2097
if old_dirname == last_source_parent[0]:
2098
source_parent_id = last_source_parent[1]
2101
source_parent_id = old_dirname_to_file_id[old_dirname]
2103
source_parent_entry = state._get_entry(source_index,
2104
path_utf8=old_dirname)
2105
source_parent_id = source_parent_entry[0][2]
2106
if source_parent_id == entry[0][2]:
2107
# This is the root, so the parent is None
2108
source_parent_id = None
2110
last_source_parent[0] = old_dirname
2111
last_source_parent[1] = source_parent_id
2112
new_dirname = entry[0][0]
2113
if new_dirname == last_target_parent[0]:
2114
target_parent_id = last_target_parent[1]
2117
target_parent_id = new_dirname_to_file_id[new_dirname]
2119
# TODO: We don't always need to do the lookup, because the
2120
# parent entry will be the same as the source entry.
2121
target_parent_entry = state._get_entry(target_index,
2122
path_utf8=new_dirname)
2123
if target_parent_entry == (None, None):
2124
raise AssertionError(
2125
"Could not find target parent in wt: %s\nparent of: %s"
2126
% (new_dirname, entry))
2127
target_parent_id = target_parent_entry[0][2]
2128
if target_parent_id == entry[0][2]:
2129
# This is the root, so the parent is None
2130
target_parent_id = None
2132
last_target_parent[0] = new_dirname
2133
last_target_parent[1] = target_parent_id
2135
source_exec = source_details[3]
2136
if (include_unchanged
2138
or source_parent_id != target_parent_id
2139
or old_basename != entry[0][1]
2140
or source_exec != target_exec
2142
if old_path is None:
2143
old_path = path = pathjoin(old_dirname, old_basename)
2144
old_path_u = utf8_decode(old_path)[0]
2147
old_path_u = utf8_decode(old_path)[0]
2148
if old_path == path:
2151
path_u = utf8_decode(path)[0]
2152
source_kind = _minikind_to_kind[source_minikind]
2153
return (entry[0][2],
2154
(old_path_u, path_u),
2157
(source_parent_id, target_parent_id),
2158
(utf8_decode(old_basename)[0], utf8_decode(entry[0][1])[0]),
2159
(source_kind, target_kind),
2160
(source_exec, target_exec))
2162
return uninteresting
2163
elif source_minikind in 'a' and target_minikind in 'fdlt':
2164
# looks like a new file
2165
if path_info is not None:
2166
path = pathjoin(entry[0][0], entry[0][1])
2167
# parent id is the entry for the path in the target tree
2168
# TODO: these are the same for an entire directory: cache em.
2169
parent_id = state._get_entry(target_index,
2170
path_utf8=entry[0][0])[0][2]
2171
if parent_id == entry[0][2]:
2173
if use_filesystem_for_exec:
2174
# We need S_ISREG here, because we aren't sure if this
2177
stat.S_ISREG(path_info[3].st_mode)
2178
and stat.S_IEXEC & path_info[3].st_mode)
2180
target_exec = target_details[3]
2181
return (entry[0][2],
2182
(None, utf8_decode(path)[0]),
2186
(None, utf8_decode(entry[0][1])[0]),
2187
(None, path_info[2]),
2188
(None, target_exec))
2190
# but its not on disk: we deliberately treat this as just
2191
# never-present. (Why ?! - RBC 20070224)
2193
elif source_minikind in 'fdlt' and target_minikind in 'a':
2194
# unversioned, possibly, or possibly not deleted: we dont care.
2195
# if its still on disk, *and* theres no other entry at this
2196
# path [we dont know this in this routine at the moment -
2197
# perhaps we should change this - then it would be an unknown.
2198
old_path = pathjoin(entry[0][0], entry[0][1])
2199
# parent id is the entry for the path in the target tree
2200
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
2201
if parent_id == entry[0][2]:
2203
return (entry[0][2],
2204
(utf8_decode(old_path)[0], None),
2208
(utf8_decode(entry[0][1])[0], None),
2209
(_minikind_to_kind[source_minikind], None),
2210
(source_details[3], None))
2211
elif source_minikind in 'fdlt' and target_minikind in 'r':
2212
# a rename; could be a true rename, or a rename inherited from
2213
# a renamed parent. TODO: handle this efficiently. Its not
2214
# common case to rename dirs though, so a correct but slow
2215
# implementation will do.
2216
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
2217
search_specific_files.add(target_details[1])
2218
elif source_minikind in 'ra' and target_minikind in 'ra':
2219
# neither of the selected trees contain this file,
2220
# so skip over it. This is not currently directly tested, but
2221
# is indirectly via test_too_much.TestCommands.test_conflicts.
2224
raise AssertionError("don't know how to compare "
2225
"source_minikind=%r, target_minikind=%r"
2226
% (source_minikind, target_minikind))
2227
## import pdb;pdb.set_trace()
2230
while search_specific_files:
2231
# TODO: the pending list should be lexically sorted? the
2232
# interface doesn't require it.
2233
current_root = search_specific_files.pop()
2234
current_root_unicode = current_root.decode('utf8')
2235
searched_specific_files.add(current_root)
2236
# process the entries for this containing directory: the rest will be
2237
# found by their parents recursively.
2238
root_entries = _entries_for_path(current_root)
2239
root_abspath = self.target.abspath(current_root_unicode)
2241
root_stat = os.lstat(root_abspath)
2243
if e.errno == errno.ENOENT:
2244
# the path does not exist: let _process_entry know that.
2245
root_dir_info = None
2247
# some other random error: hand it up.
2250
root_dir_info = ('', current_root,
2251
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
2253
if root_dir_info[2] == 'directory':
2254
if self.target._directory_is_tree_reference(
2255
current_root.decode('utf8')):
2256
root_dir_info = root_dir_info[:2] + \
2257
('tree-reference',) + root_dir_info[3:]
2259
if not root_entries and not root_dir_info:
2260
# this specified path is not present at all, skip it.
2262
path_handled = False
2263
for entry in root_entries:
2264
result = _process_entry(entry, root_dir_info)
2265
if result is not None:
2267
if result is not uninteresting:
2269
if want_unversioned and not path_handled and root_dir_info:
2270
new_executable = bool(
2271
stat.S_ISREG(root_dir_info[3].st_mode)
2272
and stat.S_IEXEC & root_dir_info[3].st_mode)
2274
(None, current_root_unicode),
2278
(None, splitpath(current_root_unicode)[-1]),
2279
(None, root_dir_info[2]),
2280
(None, new_executable)
2282
initial_key = (current_root, '', '')
2283
block_index, _ = state._find_block_index_from_key(initial_key)
2284
if block_index == 0:
2285
# we have processed the total root already, but because the
2286
# initial key matched it we should skip it here.
2288
if root_dir_info and root_dir_info[2] == 'tree-reference':
2289
current_dir_info = None
2291
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
2293
current_dir_info = dir_iterator.next()
2295
# on win32, python2.4 has e.errno == ERROR_DIRECTORY, but
2296
# python 2.5 has e.errno == EINVAL,
2297
# and e.winerror == ERROR_DIRECTORY
2298
e_winerror = getattr(e, 'winerror', None)
2299
win_errors = (ERROR_DIRECTORY, ERROR_PATH_NOT_FOUND)
2300
# there may be directories in the inventory even though
2301
# this path is not a file on disk: so mark it as end of
2303
if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
2304
current_dir_info = None
2305
elif (sys.platform == 'win32'
2306
and (e.errno in win_errors
2307
or e_winerror in win_errors)):
2308
current_dir_info = None
2312
if current_dir_info[0][0] == '':
2313
# remove .bzr from iteration
2314
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
2315
if current_dir_info[1][bzr_index][0] != '.bzr':
2316
raise AssertionError()
2317
del current_dir_info[1][bzr_index]
2318
# walk until both the directory listing and the versioned metadata
2320
if (block_index < len(state._dirblocks) and
2321
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2322
current_block = state._dirblocks[block_index]
2324
current_block = None
2325
while (current_dir_info is not None or
2326
current_block is not None):
2327
if (current_dir_info and current_block
2328
and current_dir_info[0][0] != current_block[0]):
2329
if cmp_by_dirs(current_dir_info[0][0], current_block[0]) < 0:
2330
# filesystem data refers to paths not covered by the dirblock.
2331
# this has two possibilities:
2332
# A) it is versioned but empty, so there is no block for it
2333
# B) it is not versioned.
2335
# if (A) then we need to recurse into it to check for
2336
# new unknown files or directories.
2337
# if (B) then we should ignore it, because we don't
2338
# recurse into unknown directories.
2340
while path_index < len(current_dir_info[1]):
2341
current_path_info = current_dir_info[1][path_index]
2342
if want_unversioned:
2343
if current_path_info[2] == 'directory':
2344
if self.target._directory_is_tree_reference(
2345
current_path_info[0].decode('utf8')):
2346
current_path_info = current_path_info[:2] + \
2347
('tree-reference',) + current_path_info[3:]
2348
new_executable = bool(
2349
stat.S_ISREG(current_path_info[3].st_mode)
2350
and stat.S_IEXEC & current_path_info[3].st_mode)
2352
(None, utf8_decode(current_path_info[0])[0]),
2356
(None, utf8_decode(current_path_info[1])[0]),
2357
(None, current_path_info[2]),
2358
(None, new_executable))
2359
# dont descend into this unversioned path if it is
2361
if current_path_info[2] in ('directory',
2363
del current_dir_info[1][path_index]
2367
# This dir info has been handled, go to the next
2369
current_dir_info = dir_iterator.next()
2370
except StopIteration:
2371
current_dir_info = None
2373
# We have a dirblock entry for this location, but there
2374
# is no filesystem path for this. This is most likely
2375
# because a directory was removed from the disk.
2376
# We don't have to report the missing directory,
2377
# because that should have already been handled, but we
2378
# need to handle all of the files that are contained
2380
for current_entry in current_block[1]:
2381
# entry referring to file not present on disk.
2382
# advance the entry only, after processing.
2383
result = _process_entry(current_entry, None)
2384
if result is not None:
2385
if result is not uninteresting:
2388
if (block_index < len(state._dirblocks) and
2389
osutils.is_inside(current_root,
2390
state._dirblocks[block_index][0])):
2391
current_block = state._dirblocks[block_index]
2393
current_block = None
2396
if current_block and entry_index < len(current_block[1]):
2397
current_entry = current_block[1][entry_index]
2399
current_entry = None
2400
advance_entry = True
2402
if current_dir_info and path_index < len(current_dir_info[1]):
2403
current_path_info = current_dir_info[1][path_index]
2404
if current_path_info[2] == 'directory':
2405
if self.target._directory_is_tree_reference(
2406
current_path_info[0].decode('utf8')):
2407
current_path_info = current_path_info[:2] + \
2408
('tree-reference',) + current_path_info[3:]
2410
current_path_info = None
2412
path_handled = False
2413
while (current_entry is not None or
2414
current_path_info is not None):
2415
if current_entry is None:
2416
# the check for path_handled when the path is adnvaced
2417
# will yield this path if needed.
2419
elif current_path_info is None:
2420
# no path is fine: the per entry code will handle it.
2421
result = _process_entry(current_entry, current_path_info)
2422
if result is not None:
2423
if result is not uninteresting:
2425
elif (current_entry[0][1] != current_path_info[1]
2426
or current_entry[1][target_index][0] in 'ar'):
2427
# The current path on disk doesn't match the dirblock
2428
# record. Either the dirblock is marked as absent, or
2429
# the file on disk is not present at all in the
2430
# dirblock. Either way, report about the dirblock
2431
# entry, and let other code handle the filesystem one.
2433
# Compare the basename for these files to determine
2435
if current_path_info[1] < current_entry[0][1]:
2436
# extra file on disk: pass for now, but only
2437
# increment the path, not the entry
2438
advance_entry = False
2440
# entry referring to file not present on disk.
2441
# advance the entry only, after processing.
2442
result = _process_entry(current_entry, None)
2443
if result is not None:
2444
if result is not uninteresting:
2446
advance_path = False
2448
result = _process_entry(current_entry, current_path_info)
2449
if result is not None:
2451
if result is not uninteresting:
2453
if advance_entry and current_entry is not None:
2455
if entry_index < len(current_block[1]):
2456
current_entry = current_block[1][entry_index]
2458
current_entry = None
2460
advance_entry = True # reset the advance flaga
2461
if advance_path and current_path_info is not None:
2462
if not path_handled:
2463
# unversioned in all regards
2464
if want_unversioned:
2465
new_executable = bool(
2466
stat.S_ISREG(current_path_info[3].st_mode)
2467
and stat.S_IEXEC & current_path_info[3].st_mode)
2469
(None, utf8_decode(current_path_info[0])[0]),
2473
(None, utf8_decode(current_path_info[1])[0]),
2474
(None, current_path_info[2]),
2475
(None, new_executable))
2476
# dont descend into this unversioned path if it is
2478
if current_path_info[2] in ('directory'):
2479
del current_dir_info[1][path_index]
2481
# dont descend the disk iterator into any tree
2483
if current_path_info[2] == 'tree-reference':
2484
del current_dir_info[1][path_index]
2487
if path_index < len(current_dir_info[1]):
2488
current_path_info = current_dir_info[1][path_index]
2489
if current_path_info[2] == 'directory':
2490
if self.target._directory_is_tree_reference(
2491
current_path_info[0].decode('utf8')):
2492
current_path_info = current_path_info[:2] + \
2493
('tree-reference',) + current_path_info[3:]
2495
current_path_info = None
2496
path_handled = False
2498
advance_path = True # reset the advance flagg.
2499
if current_block is not None:
2501
if (block_index < len(state._dirblocks) and
2502
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2503
current_block = state._dirblocks[block_index]
2505
current_block = None
2506
if current_dir_info is not None:
2508
current_dir_info = dir_iterator.next()
2509
except StopIteration:
2510
current_dir_info = None
2096
2514
def is_compatible(source, target):
2097
2515
# the target must be a dirstate working tree
2098
if not isinstance(target, DirStateWorkingTree):
2516
if not isinstance(target, WorkingTree4):
2100
# the source must be a revtree or dirstate rev tree.
2518
# the source must be a revtreee or dirstate rev tree.
2101
2519
if not isinstance(source,
2102
2520
(revisiontree.RevisionTree, DirStateRevisionTree)):
2104
2522
# the source revid must be in the target dirstate
2105
if not (source._revision_id == _mod_revision.NULL_REVISION or
2523
if not (source._revision_id == NULL_REVISION or
2106
2524
source._revision_id in target.get_parent_ids()):
2107
# TODO: what about ghosts? it may well need to
2525
# TODO: what about ghosts? it may well need to
2108
2526
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
