2102
1891
if not found_versioned:
2103
1892
# none of the indexes was not 'absent' at all ids for this
2105
not_versioned.append(path)
2106
if len(not_versioned) > 0:
2107
raise errors.PathsNotVersionedError(not_versioned)
1894
all_versioned = False
1896
if not all_versioned:
1897
raise errors.PathsNotVersionedError(specific_files)
2108
1898
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2109
search_specific_files = osutils.minimum_path_selection(specific_files)
1899
search_specific_files = set()
1900
for path in specific_files:
1901
other_specific_files = specific_files.difference(set([path]))
1902
if not osutils.is_inside_any(other_specific_files, path):
1903
# this is a top level path, we must check it.
1904
search_specific_files.add(path)
1906
# compare source_index and target_index at or under each element of search_specific_files.
1907
# follow the following comparison table. Note that we only want to do diff operations when
1908
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1912
# Source | Target | disk | action
1913
# r | fdlt | | add source to search, add id path move and perform
1914
# | | | diff check on source-target
1915
# r | fdlt | a | dangling file that was present in the basis.
1917
# r | a | | add source to search
1919
# r | r | | this path is present in a non-examined tree, skip.
1920
# r | r | a | this path is present in a non-examined tree, skip.
1921
# a | fdlt | | add new id
1922
# a | fdlt | a | dangling locally added file, skip
1923
# a | a | | not present in either tree, skip
1924
# a | a | a | not present in any tree, skip
1925
# a | r | | not present in either tree at this path, skip as it
1926
# | | | may not be selected by the users list of paths.
1927
# a | r | a | not present in either tree at this path, skip as it
1928
# | | | may not be selected by the users list of paths.
1929
# fdlt | fdlt | | content in both: diff them
1930
# fdlt | fdlt | a | deleted locally, but not unversioned - show as deleted ?
1931
# fdlt | a | | unversioned: output deleted id for now
1932
# fdlt | a | a | unversioned and deleted: output deleted id
1933
# fdlt | r | | 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.
1936
# fdlt | r | a | relocated in this tree, so add target to search.
1937
# | | | Dont diff, we will see an r,fd; pair when we reach
1938
# | | | this id at the other path.
1940
# for all search_indexs in each path at or under each element of
1941
# search_specific_files, if the detail is relocated: add the id, and add the
1942
# relocated path as one to search if its not searched already. If the
1943
# detail is not relocated, add the id.
1944
searched_specific_files = set()
1945
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1946
# Using a list so that we can access the values and change them in
1947
# nested scope. Each one is [path, file_id, entry]
1948
last_source_parent = [None, None]
1949
last_target_parent = [None, None]
2111
1951
use_filesystem_for_exec = (sys.platform != 'win32')
2112
iter_changes = self.target._iter_changes(include_unchanged,
2113
use_filesystem_for_exec, search_specific_files, state,
2114
source_index, target_index, want_unversioned, self.target)
2115
return iter_changes.iter_changes()
1953
# Just a sentry, so that _process_entry can say that this
1954
# record is handled, but isn't interesting to process (unchanged)
1955
uninteresting = object()
1958
old_dirname_to_file_id = {}
1959
new_dirname_to_file_id = {}
1960
# TODO: jam 20070516 - Avoid the _get_entry lookup overhead by
1961
# keeping a cache of directories that we have seen.
1963
def _process_entry(entry, path_info):
1964
"""Compare an entry and real disk to generate delta information.
1966
:param path_info: top_relpath, basename, kind, lstat, abspath for
1967
the path of entry. If None, then the path is considered absent.
1968
(Perhaps we should pass in a concrete entry for this ?)
1969
Basename is returned as a utf8 string because we expect this
1970
tuple will be ignored, and don't want to take the time to
1972
:return: None if these don't match
1973
A tuple of information about the change, or
1974
the object 'uninteresting' if these match, but are
1975
basically identical.
1977
if source_index is None:
1978
source_details = NULL_PARENT_DETAILS
1980
source_details = entry[1][source_index]
1981
target_details = entry[1][target_index]
1982
target_minikind = target_details[0]
1983
if path_info is not None and target_minikind in 'fdlt':
1984
if not (target_index == 0):
1985
raise AssertionError()
1986
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
1987
stat_value=path_info[3])
1988
# The entry may have been modified by update_entry
1989
target_details = entry[1][target_index]
1990
target_minikind = target_details[0]
1993
file_id = entry[0][2]
1994
source_minikind = source_details[0]
1995
if source_minikind in 'fdltr' and target_minikind in 'fdlt':
1996
# claimed content in both: diff
1997
# r | fdlt | | add source to search, add id path move and perform
1998
# | | | diff check on source-target
1999
# r | fdlt | a | dangling file that was present in the basis.
2001
if source_minikind in 'r':
2002
# add the source to the search path to find any children it
2003
# has. TODO ? : only add if it is a container ?
2004
if not osutils.is_inside_any(searched_specific_files,
2006
search_specific_files.add(source_details[1])
2007
# generate the old path; this is needed for stating later
2009
old_path = source_details[1]
2010
old_dirname, old_basename = os.path.split(old_path)
2011
path = pathjoin(entry[0][0], entry[0][1])
2012
old_entry = state._get_entry(source_index,
2014
# update the source details variable to be the real
2016
if old_entry == (None, None):
2017
raise errors.CorruptDirstate(state._filename,
2018
"entry '%s/%s' is considered renamed from %r"
2019
" but source does not exist\n"
2020
"entry: %s" % (entry[0][0], entry[0][1], old_path, entry))
2021
source_details = old_entry[1][source_index]
2022
source_minikind = source_details[0]
2024
old_dirname = entry[0][0]
2025
old_basename = entry[0][1]
2026
old_path = path = None
2027
if path_info is None:
2028
# the file is missing on disk, show as removed.
2029
content_change = True
2033
# source and target are both versioned and disk file is present.
2034
target_kind = path_info[2]
2035
if target_kind == 'directory':
2037
old_path = path = pathjoin(old_dirname, old_basename)
2038
new_dirname_to_file_id[path] = file_id
2039
if source_minikind != 'd':
2040
content_change = True
2042
# directories have no fingerprint
2043
content_change = False
2045
elif target_kind == 'file':
2046
if source_minikind != 'f':
2047
content_change = True
2049
# We could check the size, but we already have the
2051
content_change = (link_or_sha1 != source_details[1])
2052
# Target details is updated at update_entry time
2053
if use_filesystem_for_exec:
2054
# We don't need S_ISREG here, because we are sure
2055
# we are dealing with a file.
2056
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
2058
target_exec = target_details[3]
2059
elif target_kind == 'symlink':
2060
if source_minikind != 'l':
2061
content_change = True
2063
content_change = (link_or_sha1 != source_details[1])
2065
elif target_kind == 'tree-reference':
2066
if source_minikind != 't':
2067
content_change = True
2069
content_change = False
2072
raise Exception, "unknown kind %s" % path_info[2]
2073
if source_minikind == 'd':
2075
old_path = path = pathjoin(old_dirname, old_basename)
2076
old_dirname_to_file_id[old_path] = file_id
2077
# parent id is the entry for the path in the target tree
2078
if old_dirname == last_source_parent[0]:
2079
source_parent_id = last_source_parent[1]
2082
source_parent_id = old_dirname_to_file_id[old_dirname]
2084
source_parent_entry = state._get_entry(source_index,
2085
path_utf8=old_dirname)
2086
source_parent_id = source_parent_entry[0][2]
2087
if source_parent_id == entry[0][2]:
2088
# This is the root, so the parent is None
2089
source_parent_id = None
2091
last_source_parent[0] = old_dirname
2092
last_source_parent[1] = source_parent_id
2093
new_dirname = entry[0][0]
2094
if new_dirname == last_target_parent[0]:
2095
target_parent_id = last_target_parent[1]
2098
target_parent_id = new_dirname_to_file_id[new_dirname]
2100
# TODO: We don't always need to do the lookup, because the
2101
# parent entry will be the same as the source entry.
2102
target_parent_entry = state._get_entry(target_index,
2103
path_utf8=new_dirname)
2104
if target_parent_entry == (None, None):
2105
raise AssertionError(
2106
"Could not find target parent in wt: %s\nparent of: %s"
2107
% (new_dirname, entry))
2108
target_parent_id = target_parent_entry[0][2]
2109
if target_parent_id == entry[0][2]:
2110
# This is the root, so the parent is None
2111
target_parent_id = None
2113
last_target_parent[0] = new_dirname
2114
last_target_parent[1] = target_parent_id
2116
source_exec = source_details[3]
2117
if (include_unchanged
2119
or source_parent_id != target_parent_id
2120
or old_basename != entry[0][1]
2121
or source_exec != target_exec
2123
if old_path is None:
2124
old_path = path = pathjoin(old_dirname, old_basename)
2125
old_path_u = utf8_decode(old_path)[0]
2128
old_path_u = utf8_decode(old_path)[0]
2129
if old_path == path:
2132
path_u = utf8_decode(path)[0]
2133
source_kind = _minikind_to_kind[source_minikind]
2134
return (entry[0][2],
2135
(old_path_u, path_u),
2138
(source_parent_id, target_parent_id),
2139
(utf8_decode(old_basename)[0], utf8_decode(entry[0][1])[0]),
2140
(source_kind, target_kind),
2141
(source_exec, target_exec))
2143
return uninteresting
2144
elif source_minikind in 'a' and target_minikind in 'fdlt':
2145
# looks like a new file
2146
if path_info is not None:
2147
path = pathjoin(entry[0][0], entry[0][1])
2148
# parent id is the entry for the path in the target tree
2149
# TODO: these are the same for an entire directory: cache em.
2150
parent_id = state._get_entry(target_index,
2151
path_utf8=entry[0][0])[0][2]
2152
if parent_id == entry[0][2]:
2154
if use_filesystem_for_exec:
2155
# We need S_ISREG here, because we aren't sure if this
2158
stat.S_ISREG(path_info[3].st_mode)
2159
and stat.S_IEXEC & path_info[3].st_mode)
2161
target_exec = target_details[3]
2162
return (entry[0][2],
2163
(None, utf8_decode(path)[0]),
2167
(None, utf8_decode(entry[0][1])[0]),
2168
(None, path_info[2]),
2169
(None, target_exec))
2171
# but its not on disk: we deliberately treat this as just
2172
# never-present. (Why ?! - RBC 20070224)
2174
elif source_minikind in 'fdlt' and target_minikind in 'a':
2175
# unversioned, possibly, or possibly not deleted: we dont care.
2176
# if its still on disk, *and* theres no other entry at this
2177
# path [we dont know this in this routine at the moment -
2178
# perhaps we should change this - then it would be an unknown.
2179
old_path = pathjoin(entry[0][0], entry[0][1])
2180
# parent id is the entry for the path in the target tree
2181
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
2182
if parent_id == entry[0][2]:
2184
return (entry[0][2],
2185
(utf8_decode(old_path)[0], None),
2189
(utf8_decode(entry[0][1])[0], None),
2190
(_minikind_to_kind[source_minikind], None),
2191
(source_details[3], None))
2192
elif source_minikind in 'fdlt' and target_minikind in 'r':
2193
# a rename; could be a true rename, or a rename inherited from
2194
# a renamed parent. TODO: handle this efficiently. Its not
2195
# common case to rename dirs though, so a correct but slow
2196
# implementation will do.
2197
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
2198
search_specific_files.add(target_details[1])
2199
elif source_minikind in 'ra' and target_minikind in 'ra':
2200
# neither of the selected trees contain this file,
2201
# so skip over it. This is not currently directly tested, but
2202
# is indirectly via test_too_much.TestCommands.test_conflicts.
2205
raise AssertionError("don't know how to compare "
2206
"source_minikind=%r, target_minikind=%r"
2207
% (source_minikind, target_minikind))
2208
## import pdb;pdb.set_trace()
2211
while search_specific_files:
2212
# TODO: the pending list should be lexically sorted? the
2213
# interface doesn't require it.
2214
current_root = search_specific_files.pop()
2215
current_root_unicode = current_root.decode('utf8')
2216
searched_specific_files.add(current_root)
2217
# process the entries for this containing directory: the rest will be
2218
# found by their parents recursively.
2219
root_entries = _entries_for_path(current_root)
2220
root_abspath = self.target.abspath(current_root_unicode)
2222
root_stat = os.lstat(root_abspath)
2224
if e.errno == errno.ENOENT:
2225
# the path does not exist: let _process_entry know that.
2226
root_dir_info = None
2228
# some other random error: hand it up.
2231
root_dir_info = ('', current_root,
2232
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
2234
if root_dir_info[2] == 'directory':
2235
if self.target._directory_is_tree_reference(
2236
current_root.decode('utf8')):
2237
root_dir_info = root_dir_info[:2] + \
2238
('tree-reference',) + root_dir_info[3:]
2240
if not root_entries and not root_dir_info:
2241
# this specified path is not present at all, skip it.
2243
path_handled = False
2244
for entry in root_entries:
2245
result = _process_entry(entry, root_dir_info)
2246
if result is not None:
2248
if result is not uninteresting:
2250
if want_unversioned and not path_handled and root_dir_info:
2251
new_executable = bool(
2252
stat.S_ISREG(root_dir_info[3].st_mode)
2253
and stat.S_IEXEC & root_dir_info[3].st_mode)
2255
(None, current_root_unicode),
2259
(None, splitpath(current_root_unicode)[-1]),
2260
(None, root_dir_info[2]),
2261
(None, new_executable)
2263
initial_key = (current_root, '', '')
2264
block_index, _ = state._find_block_index_from_key(initial_key)
2265
if block_index == 0:
2266
# we have processed the total root already, but because the
2267
# initial key matched it we should skip it here.
2269
if root_dir_info and root_dir_info[2] == 'tree-reference':
2270
current_dir_info = None
2272
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
2274
current_dir_info = dir_iterator.next()
2276
# on win32, python2.4 has e.errno == ERROR_DIRECTORY, but
2277
# python 2.5 has e.errno == EINVAL,
2278
# and e.winerror == ERROR_DIRECTORY
2279
e_winerror = getattr(e, 'winerror', None)
2280
win_errors = (ERROR_DIRECTORY, ERROR_PATH_NOT_FOUND)
2281
# there may be directories in the inventory even though
2282
# this path is not a file on disk: so mark it as end of
2284
if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
2285
current_dir_info = None
2286
elif (sys.platform == 'win32'
2287
and (e.errno in win_errors
2288
or e_winerror in win_errors)):
2289
current_dir_info = None
2293
if current_dir_info[0][0] == '':
2294
# remove .bzr from iteration
2295
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
2296
if current_dir_info[1][bzr_index][0] != '.bzr':
2297
raise AssertionError()
2298
del current_dir_info[1][bzr_index]
2299
# walk until both the directory listing and the versioned metadata
2301
if (block_index < len(state._dirblocks) and
2302
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2303
current_block = state._dirblocks[block_index]
2305
current_block = None
2306
while (current_dir_info is not None or
2307
current_block is not None):
2308
if (current_dir_info and current_block
2309
and current_dir_info[0][0] != current_block[0]):
2310
if cmp_by_dirs(current_dir_info[0][0], current_block[0]) < 0:
2311
# filesystem data refers to paths not covered by the dirblock.
2312
# this has two possibilities:
2313
# A) it is versioned but empty, so there is no block for it
2314
# B) it is not versioned.
2316
# if (A) then we need to recurse into it to check for
2317
# new unknown files or directories.
2318
# if (B) then we should ignore it, because we don't
2319
# recurse into unknown directories.
2321
while path_index < len(current_dir_info[1]):
2322
current_path_info = current_dir_info[1][path_index]
2323
if want_unversioned:
2324
if current_path_info[2] == 'directory':
2325
if self.target._directory_is_tree_reference(
2326
current_path_info[0].decode('utf8')):
2327
current_path_info = current_path_info[:2] + \
2328
('tree-reference',) + current_path_info[3:]
2329
new_executable = bool(
2330
stat.S_ISREG(current_path_info[3].st_mode)
2331
and stat.S_IEXEC & current_path_info[3].st_mode)
2333
(None, utf8_decode(current_path_info[0])[0]),
2337
(None, utf8_decode(current_path_info[1])[0]),
2338
(None, current_path_info[2]),
2339
(None, new_executable))
2340
# dont descend into this unversioned path if it is
2342
if current_path_info[2] in ('directory',
2344
del current_dir_info[1][path_index]
2348
# This dir info has been handled, go to the next
2350
current_dir_info = dir_iterator.next()
2351
except StopIteration:
2352
current_dir_info = None
2354
# We have a dirblock entry for this location, but there
2355
# is no filesystem path for this. This is most likely
2356
# because a directory was removed from the disk.
2357
# We don't have to report the missing directory,
2358
# because that should have already been handled, but we
2359
# need to handle all of the files that are contained
2361
for current_entry in current_block[1]:
2362
# entry referring to file not present on disk.
2363
# advance the entry only, after processing.
2364
result = _process_entry(current_entry, None)
2365
if result is not None:
2366
if result is not uninteresting:
2369
if (block_index < len(state._dirblocks) and
2370
osutils.is_inside(current_root,
2371
state._dirblocks[block_index][0])):
2372
current_block = state._dirblocks[block_index]
2374
current_block = None
2377
if current_block and entry_index < len(current_block[1]):
2378
current_entry = current_block[1][entry_index]
2380
current_entry = None
2381
advance_entry = True
2383
if current_dir_info and path_index < len(current_dir_info[1]):
2384
current_path_info = current_dir_info[1][path_index]
2385
if current_path_info[2] == 'directory':
2386
if self.target._directory_is_tree_reference(
2387
current_path_info[0].decode('utf8')):
2388
current_path_info = current_path_info[:2] + \
2389
('tree-reference',) + current_path_info[3:]
2391
current_path_info = None
2393
path_handled = False
2394
while (current_entry is not None or
2395
current_path_info is not None):
2396
if current_entry is None:
2397
# the check for path_handled when the path is adnvaced
2398
# will yield this path if needed.
2400
elif current_path_info is None:
2401
# no path is fine: the per entry code will handle it.
2402
result = _process_entry(current_entry, current_path_info)
2403
if result is not None:
2404
if result is not uninteresting:
2406
elif (current_entry[0][1] != current_path_info[1]
2407
or current_entry[1][target_index][0] in 'ar'):
2408
# The current path on disk doesn't match the dirblock
2409
# record. Either the dirblock is marked as absent, or
2410
# the file on disk is not present at all in the
2411
# dirblock. Either way, report about the dirblock
2412
# entry, and let other code handle the filesystem one.
2414
# Compare the basename for these files to determine
2416
if current_path_info[1] < current_entry[0][1]:
2417
# extra file on disk: pass for now, but only
2418
# increment the path, not the entry
2419
advance_entry = False
2421
# entry referring to file not present on disk.
2422
# advance the entry only, after processing.
2423
result = _process_entry(current_entry, None)
2424
if result is not None:
2425
if result is not uninteresting:
2427
advance_path = False
2429
result = _process_entry(current_entry, current_path_info)
2430
if result is not None:
2432
if result is not uninteresting:
2434
if advance_entry and current_entry is not None:
2436
if entry_index < len(current_block[1]):
2437
current_entry = current_block[1][entry_index]
2439
current_entry = None
2441
advance_entry = True # reset the advance flaga
2442
if advance_path and current_path_info is not None:
2443
if not path_handled:
2444
# unversioned in all regards
2445
if want_unversioned:
2446
new_executable = bool(
2447
stat.S_ISREG(current_path_info[3].st_mode)
2448
and stat.S_IEXEC & current_path_info[3].st_mode)
2450
(None, utf8_decode(current_path_info[0])[0]),
2454
(None, utf8_decode(current_path_info[1])[0]),
2455
(None, current_path_info[2]),
2456
(None, new_executable))
2457
# dont descend into this unversioned path if it is
2459
if current_path_info[2] in ('directory'):
2460
del current_dir_info[1][path_index]
2462
# dont descend the disk iterator into any tree
2464
if current_path_info[2] == 'tree-reference':
2465
del current_dir_info[1][path_index]
2468
if path_index < len(current_dir_info[1]):
2469
current_path_info = current_dir_info[1][path_index]
2470
if current_path_info[2] == 'directory':
2471
if self.target._directory_is_tree_reference(
2472
current_path_info[0].decode('utf8')):
2473
current_path_info = current_path_info[:2] + \
2474
('tree-reference',) + current_path_info[3:]
2476
current_path_info = None
2477
path_handled = False
2479
advance_path = True # reset the advance flagg.
2480
if current_block is not None:
2482
if (block_index < len(state._dirblocks) and
2483
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2484
current_block = state._dirblocks[block_index]
2486
current_block = None
2487
if current_dir_info is not None:
2489
current_dir_info = dir_iterator.next()
2490
except StopIteration:
2491
current_dir_info = None
2118
2495
def is_compatible(source, target):
2119
2496
# the target must be a dirstate working tree
2120
if not isinstance(target, DirStateWorkingTree):
2497
if not isinstance(target, WorkingTree4):
2122
# the source must be a revtree or dirstate rev tree.
2499
# the source must be a revtreee or dirstate rev tree.
2123
2500
if not isinstance(source,
2124
2501
(revisiontree.RevisionTree, DirStateRevisionTree)):
2126
2503
# the source revid must be in the target dirstate
2127
if not (source._revision_id == _mod_revision.NULL_REVISION or
2504
if not (source._revision_id == NULL_REVISION or
2128
2505
source._revision_id in target.get_parent_ids()):
2129
# TODO: what about ghosts? it may well need to
2506
# TODO: what about ghosts? it may well need to
2130
2507
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
