2080
1875
if not found_versioned:
2081
1876
# 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)
1878
all_versioned = False
1880
if not all_versioned:
1881
raise errors.PathsNotVersionedError(specific_files)
2086
1882
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2087
search_specific_files = osutils.minimum_path_selection(specific_files)
1883
search_specific_files = set()
1884
for path in specific_files:
1885
other_specific_files = specific_files.difference(set([path]))
1886
if not osutils.is_inside_any(other_specific_files, path):
1887
# this is a top level path, we must check it.
1888
search_specific_files.add(path)
1890
# compare source_index and target_index at or under each element of search_specific_files.
1891
# follow the following comparison table. Note that we only want to do diff operations when
1892
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1896
# Source | Target | disk | action
1897
# r | fdlt | | add source to search, add id path move and perform
1898
# | | | diff check on source-target
1899
# r | fdlt | a | dangling file that was present in the basis.
1901
# r | a | | add source to search
1903
# r | r | | this path is present in a non-examined tree, skip.
1904
# r | r | a | this path is present in a non-examined tree, skip.
1905
# a | fdlt | | add new id
1906
# a | fdlt | a | dangling locally added file, skip
1907
# a | a | | not present in either tree, skip
1908
# a | a | a | not present in any tree, skip
1909
# a | r | | not present in either tree at this path, skip as it
1910
# | | | may not be selected by the users list of paths.
1911
# a | r | a | not present in either tree at this path, skip as it
1912
# | | | may not be selected by the users list of paths.
1913
# fdlt | fdlt | | content in both: diff them
1914
# fdlt | fdlt | a | deleted locally, but not unversioned - show as deleted ?
1915
# fdlt | a | | unversioned: output deleted id for now
1916
# fdlt | a | a | unversioned and deleted: output deleted id
1917
# fdlt | r | | relocated in this tree, so add target to search.
1918
# | | | Dont diff, we will see an r,fd; pair when we reach
1919
# | | | this id at the other path.
1920
# fdlt | r | a | relocated in this tree, so add target to search.
1921
# | | | Dont diff, we will see an r,fd; pair when we reach
1922
# | | | this id at the other path.
1924
# for all search_indexs in each path at or under each element of
1925
# search_specific_files, if the detail is relocated: add the id, and add the
1926
# relocated path as one to search if its not searched already. If the
1927
# detail is not relocated, add the id.
1928
searched_specific_files = set()
1929
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1930
# Using a list so that we can access the values and change them in
1931
# nested scope. Each one is [path, file_id, entry]
1932
last_source_parent = [None, None]
1933
last_target_parent = [None, None]
2089
1935
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()
1937
# Just a sentry, so that _process_entry can say that this
1938
# record is handled, but isn't interesting to process (unchanged)
1939
uninteresting = object()
1942
old_dirname_to_file_id = {}
1943
new_dirname_to_file_id = {}
1944
# TODO: jam 20070516 - Avoid the _get_entry lookup overhead by
1945
# keeping a cache of directories that we have seen.
1947
def _process_entry(entry, path_info):
1948
"""Compare an entry and real disk to generate delta information.
1950
:param path_info: top_relpath, basename, kind, lstat, abspath for
1951
the path of entry. If None, then the path is considered absent.
1952
(Perhaps we should pass in a concrete entry for this ?)
1953
Basename is returned as a utf8 string because we expect this
1954
tuple will be ignored, and don't want to take the time to
1956
:return: None if these don't match
1957
A tuple of information about the change, or
1958
the object 'uninteresting' if these match, but are
1959
basically identical.
1961
if source_index is None:
1962
source_details = NULL_PARENT_DETAILS
1964
source_details = entry[1][source_index]
1965
target_details = entry[1][target_index]
1966
target_minikind = target_details[0]
1967
if path_info is not None and target_minikind in 'fdlt':
1968
if not (target_index == 0):
1969
raise AssertionError()
1970
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
1971
stat_value=path_info[3])
1972
# The entry may have been modified by update_entry
1973
target_details = entry[1][target_index]
1974
target_minikind = target_details[0]
1977
file_id = entry[0][2]
1978
source_minikind = source_details[0]
1979
if source_minikind in 'fdltr' and target_minikind in 'fdlt':
1980
# claimed content in both: diff
1981
# r | fdlt | | add source to search, add id path move and perform
1982
# | | | diff check on source-target
1983
# r | fdlt | a | dangling file that was present in the basis.
1985
if source_minikind in 'r':
1986
# add the source to the search path to find any children it
1987
# has. TODO ? : only add if it is a container ?
1988
if not osutils.is_inside_any(searched_specific_files,
1990
search_specific_files.add(source_details[1])
1991
# generate the old path; this is needed for stating later
1993
old_path = source_details[1]
1994
old_dirname, old_basename = os.path.split(old_path)
1995
path = pathjoin(entry[0][0], entry[0][1])
1996
old_entry = state._get_entry(source_index,
1998
# update the source details variable to be the real
2000
if old_entry == (None, None):
2001
raise errors.CorruptDirstate(state._filename,
2002
"entry '%s/%s' is considered renamed from %r"
2003
" but source does not exist\n"
2004
"entry: %s" % (entry[0][0], entry[0][1], old_path, entry))
2005
source_details = old_entry[1][source_index]
2006
source_minikind = source_details[0]
2008
old_dirname = entry[0][0]
2009
old_basename = entry[0][1]
2010
old_path = path = None
2011
if path_info is None:
2012
# the file is missing on disk, show as removed.
2013
content_change = True
2017
# source and target are both versioned and disk file is present.
2018
target_kind = path_info[2]
2019
if target_kind == 'directory':
2021
old_path = path = pathjoin(old_dirname, old_basename)
2022
new_dirname_to_file_id[path] = file_id
2023
if source_minikind != 'd':
2024
content_change = True
2026
# directories have no fingerprint
2027
content_change = False
2029
elif target_kind == 'file':
2030
if source_minikind != 'f':
2031
content_change = True
2033
# We could check the size, but we already have the
2035
content_change = (link_or_sha1 != source_details[1])
2036
# Target details is updated at update_entry time
2037
if use_filesystem_for_exec:
2038
# We don't need S_ISREG here, because we are sure
2039
# we are dealing with a file.
2040
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
2042
target_exec = target_details[3]
2043
elif target_kind == 'symlink':
2044
if source_minikind != 'l':
2045
content_change = True
2047
content_change = (link_or_sha1 != source_details[1])
2049
elif target_kind == 'tree-reference':
2050
if source_minikind != 't':
2051
content_change = True
2053
content_change = False
2056
raise Exception, "unknown kind %s" % path_info[2]
2057
if source_minikind == 'd':
2059
old_path = path = pathjoin(old_dirname, old_basename)
2060
old_dirname_to_file_id[old_path] = file_id
2061
# parent id is the entry for the path in the target tree
2062
if old_dirname == last_source_parent[0]:
2063
source_parent_id = last_source_parent[1]
2066
source_parent_id = old_dirname_to_file_id[old_dirname]
2068
source_parent_entry = state._get_entry(source_index,
2069
path_utf8=old_dirname)
2070
source_parent_id = source_parent_entry[0][2]
2071
if source_parent_id == entry[0][2]:
2072
# This is the root, so the parent is None
2073
source_parent_id = None
2075
last_source_parent[0] = old_dirname
2076
last_source_parent[1] = source_parent_id
2077
new_dirname = entry[0][0]
2078
if new_dirname == last_target_parent[0]:
2079
target_parent_id = last_target_parent[1]
2082
target_parent_id = new_dirname_to_file_id[new_dirname]
2084
# TODO: We don't always need to do the lookup, because the
2085
# parent entry will be the same as the source entry.
2086
target_parent_entry = state._get_entry(target_index,
2087
path_utf8=new_dirname)
2088
if target_parent_entry == (None, None):
2089
raise AssertionError(
2090
"Could not find target parent in wt: %s\nparent of: %s"
2091
% (new_dirname, entry))
2092
target_parent_id = target_parent_entry[0][2]
2093
if target_parent_id == entry[0][2]:
2094
# This is the root, so the parent is None
2095
target_parent_id = None
2097
last_target_parent[0] = new_dirname
2098
last_target_parent[1] = target_parent_id
2100
source_exec = source_details[3]
2101
if (include_unchanged
2103
or source_parent_id != target_parent_id
2104
or old_basename != entry[0][1]
2105
or source_exec != target_exec
2107
if old_path is None:
2108
old_path = path = pathjoin(old_dirname, old_basename)
2109
old_path_u = utf8_decode(old_path)[0]
2112
old_path_u = utf8_decode(old_path)[0]
2113
if old_path == path:
2116
path_u = utf8_decode(path)[0]
2117
source_kind = _minikind_to_kind[source_minikind]
2118
return (entry[0][2],
2119
(old_path_u, path_u),
2122
(source_parent_id, target_parent_id),
2123
(utf8_decode(old_basename)[0], utf8_decode(entry[0][1])[0]),
2124
(source_kind, target_kind),
2125
(source_exec, target_exec))
2127
return uninteresting
2128
elif source_minikind in 'a' and target_minikind in 'fdlt':
2129
# looks like a new file
2130
if path_info is not None:
2131
path = pathjoin(entry[0][0], entry[0][1])
2132
# parent id is the entry for the path in the target tree
2133
# TODO: these are the same for an entire directory: cache em.
2134
parent_id = state._get_entry(target_index,
2135
path_utf8=entry[0][0])[0][2]
2136
if parent_id == entry[0][2]:
2138
if use_filesystem_for_exec:
2139
# We need S_ISREG here, because we aren't sure if this
2142
stat.S_ISREG(path_info[3].st_mode)
2143
and stat.S_IEXEC & path_info[3].st_mode)
2145
target_exec = target_details[3]
2146
return (entry[0][2],
2147
(None, utf8_decode(path)[0]),
2151
(None, utf8_decode(entry[0][1])[0]),
2152
(None, path_info[2]),
2153
(None, target_exec))
2155
# but its not on disk: we deliberately treat this as just
2156
# never-present. (Why ?! - RBC 20070224)
2158
elif source_minikind in 'fdlt' and target_minikind in 'a':
2159
# unversioned, possibly, or possibly not deleted: we dont care.
2160
# if its still on disk, *and* theres no other entry at this
2161
# path [we dont know this in this routine at the moment -
2162
# perhaps we should change this - then it would be an unknown.
2163
old_path = pathjoin(entry[0][0], entry[0][1])
2164
# parent id is the entry for the path in the target tree
2165
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
2166
if parent_id == entry[0][2]:
2168
return (entry[0][2],
2169
(utf8_decode(old_path)[0], None),
2173
(utf8_decode(entry[0][1])[0], None),
2174
(_minikind_to_kind[source_minikind], None),
2175
(source_details[3], None))
2176
elif source_minikind in 'fdlt' and target_minikind in 'r':
2177
# a rename; could be a true rename, or a rename inherited from
2178
# a renamed parent. TODO: handle this efficiently. Its not
2179
# common case to rename dirs though, so a correct but slow
2180
# implementation will do.
2181
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
2182
search_specific_files.add(target_details[1])
2183
elif source_minikind in 'ra' and target_minikind in 'ra':
2184
# neither of the selected trees contain this file,
2185
# so skip over it. This is not currently directly tested, but
2186
# is indirectly via test_too_much.TestCommands.test_conflicts.
2189
raise AssertionError("don't know how to compare "
2190
"source_minikind=%r, target_minikind=%r"
2191
% (source_minikind, target_minikind))
2192
## import pdb;pdb.set_trace()
2195
while search_specific_files:
2196
# TODO: the pending list should be lexically sorted? the
2197
# interface doesn't require it.
2198
current_root = search_specific_files.pop()
2199
current_root_unicode = current_root.decode('utf8')
2200
searched_specific_files.add(current_root)
2201
# process the entries for this containing directory: the rest will be
2202
# found by their parents recursively.
2203
root_entries = _entries_for_path(current_root)
2204
root_abspath = self.target.abspath(current_root_unicode)
2206
root_stat = os.lstat(root_abspath)
2208
if e.errno == errno.ENOENT:
2209
# the path does not exist: let _process_entry know that.
2210
root_dir_info = None
2212
# some other random error: hand it up.
2215
root_dir_info = ('', current_root,
2216
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
2218
if root_dir_info[2] == 'directory':
2219
if self.target._directory_is_tree_reference(
2220
current_root.decode('utf8')):
2221
root_dir_info = root_dir_info[:2] + \
2222
('tree-reference',) + root_dir_info[3:]
2224
if not root_entries and not root_dir_info:
2225
# this specified path is not present at all, skip it.
2227
path_handled = False
2228
for entry in root_entries:
2229
result = _process_entry(entry, root_dir_info)
2230
if result is not None:
2232
if result is not uninteresting:
2234
if want_unversioned and not path_handled and root_dir_info:
2235
new_executable = bool(
2236
stat.S_ISREG(root_dir_info[3].st_mode)
2237
and stat.S_IEXEC & root_dir_info[3].st_mode)
2239
(None, current_root_unicode),
2243
(None, splitpath(current_root_unicode)[-1]),
2244
(None, root_dir_info[2]),
2245
(None, new_executable)
2247
initial_key = (current_root, '', '')
2248
block_index, _ = state._find_block_index_from_key(initial_key)
2249
if block_index == 0:
2250
# we have processed the total root already, but because the
2251
# initial key matched it we should skip it here.
2253
if root_dir_info and root_dir_info[2] == 'tree-reference':
2254
current_dir_info = None
2256
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
2258
current_dir_info = dir_iterator.next()
2260
# on win32, python2.4 has e.errno == ERROR_DIRECTORY, but
2261
# python 2.5 has e.errno == EINVAL,
2262
# and e.winerror == ERROR_DIRECTORY
2263
e_winerror = getattr(e, 'winerror', None)
2264
win_errors = (ERROR_DIRECTORY, ERROR_PATH_NOT_FOUND)
2265
# there may be directories in the inventory even though
2266
# this path is not a file on disk: so mark it as end of
2268
if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
2269
current_dir_info = None
2270
elif (sys.platform == 'win32'
2271
and (e.errno in win_errors
2272
or e_winerror in win_errors)):
2273
current_dir_info = None
2277
if current_dir_info[0][0] == '':
2278
# remove .bzr from iteration
2279
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
2280
if current_dir_info[1][bzr_index][0] != '.bzr':
2281
raise AssertionError()
2282
del current_dir_info[1][bzr_index]
2283
# walk until both the directory listing and the versioned metadata
2285
if (block_index < len(state._dirblocks) and
2286
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2287
current_block = state._dirblocks[block_index]
2289
current_block = None
2290
while (current_dir_info is not None or
2291
current_block is not None):
2292
if (current_dir_info and current_block
2293
and current_dir_info[0][0] != current_block[0]):
2294
if cmp_by_dirs(current_dir_info[0][0], current_block[0]) < 0:
2295
# filesystem data refers to paths not covered by the dirblock.
2296
# this has two possibilities:
2297
# A) it is versioned but empty, so there is no block for it
2298
# B) it is not versioned.
2300
# if (A) then we need to recurse into it to check for
2301
# new unknown files or directories.
2302
# if (B) then we should ignore it, because we don't
2303
# recurse into unknown directories.
2305
while path_index < len(current_dir_info[1]):
2306
current_path_info = current_dir_info[1][path_index]
2307
if want_unversioned:
2308
if current_path_info[2] == 'directory':
2309
if self.target._directory_is_tree_reference(
2310
current_path_info[0].decode('utf8')):
2311
current_path_info = current_path_info[:2] + \
2312
('tree-reference',) + current_path_info[3:]
2313
new_executable = bool(
2314
stat.S_ISREG(current_path_info[3].st_mode)
2315
and stat.S_IEXEC & current_path_info[3].st_mode)
2317
(None, utf8_decode(current_path_info[0])[0]),
2321
(None, utf8_decode(current_path_info[1])[0]),
2322
(None, current_path_info[2]),
2323
(None, new_executable))
2324
# dont descend into this unversioned path if it is
2326
if current_path_info[2] in ('directory',
2328
del current_dir_info[1][path_index]
2332
# This dir info has been handled, go to the next
2334
current_dir_info = dir_iterator.next()
2335
except StopIteration:
2336
current_dir_info = None
2338
# We have a dirblock entry for this location, but there
2339
# is no filesystem path for this. This is most likely
2340
# because a directory was removed from the disk.
2341
# We don't have to report the missing directory,
2342
# because that should have already been handled, but we
2343
# need to handle all of the files that are contained
2345
for current_entry in current_block[1]:
2346
# entry referring to file not present on disk.
2347
# advance the entry only, after processing.
2348
result = _process_entry(current_entry, None)
2349
if result is not None:
2350
if result is not uninteresting:
2353
if (block_index < len(state._dirblocks) and
2354
osutils.is_inside(current_root,
2355
state._dirblocks[block_index][0])):
2356
current_block = state._dirblocks[block_index]
2358
current_block = None
2361
if current_block and entry_index < len(current_block[1]):
2362
current_entry = current_block[1][entry_index]
2364
current_entry = None
2365
advance_entry = True
2367
if current_dir_info and path_index < len(current_dir_info[1]):
2368
current_path_info = current_dir_info[1][path_index]
2369
if current_path_info[2] == 'directory':
2370
if self.target._directory_is_tree_reference(
2371
current_path_info[0].decode('utf8')):
2372
current_path_info = current_path_info[:2] + \
2373
('tree-reference',) + current_path_info[3:]
2375
current_path_info = None
2377
path_handled = False
2378
while (current_entry is not None or
2379
current_path_info is not None):
2380
if current_entry is None:
2381
# the check for path_handled when the path is adnvaced
2382
# will yield this path if needed.
2384
elif current_path_info is None:
2385
# no path is fine: the per entry code will handle it.
2386
result = _process_entry(current_entry, current_path_info)
2387
if result is not None:
2388
if result is not uninteresting:
2390
elif (current_entry[0][1] != current_path_info[1]
2391
or current_entry[1][target_index][0] in 'ar'):
2392
# The current path on disk doesn't match the dirblock
2393
# record. Either the dirblock is marked as absent, or
2394
# the file on disk is not present at all in the
2395
# dirblock. Either way, report about the dirblock
2396
# entry, and let other code handle the filesystem one.
2398
# Compare the basename for these files to determine
2400
if current_path_info[1] < current_entry[0][1]:
2401
# extra file on disk: pass for now, but only
2402
# increment the path, not the entry
2403
advance_entry = False
2405
# entry referring to file not present on disk.
2406
# advance the entry only, after processing.
2407
result = _process_entry(current_entry, None)
2408
if result is not None:
2409
if result is not uninteresting:
2411
advance_path = False
2413
result = _process_entry(current_entry, current_path_info)
2414
if result is not None:
2416
if result is not uninteresting:
2418
if advance_entry and current_entry is not None:
2420
if entry_index < len(current_block[1]):
2421
current_entry = current_block[1][entry_index]
2423
current_entry = None
2425
advance_entry = True # reset the advance flaga
2426
if advance_path and current_path_info is not None:
2427
if not path_handled:
2428
# unversioned in all regards
2429
if want_unversioned:
2430
new_executable = bool(
2431
stat.S_ISREG(current_path_info[3].st_mode)
2432
and stat.S_IEXEC & current_path_info[3].st_mode)
2434
(None, utf8_decode(current_path_info[0])[0]),
2438
(None, utf8_decode(current_path_info[1])[0]),
2439
(None, current_path_info[2]),
2440
(None, new_executable))
2441
# dont descend into this unversioned path if it is
2443
if current_path_info[2] in ('directory'):
2444
del current_dir_info[1][path_index]
2446
# dont descend the disk iterator into any tree
2448
if current_path_info[2] == 'tree-reference':
2449
del current_dir_info[1][path_index]
2452
if path_index < len(current_dir_info[1]):
2453
current_path_info = current_dir_info[1][path_index]
2454
if current_path_info[2] == 'directory':
2455
if self.target._directory_is_tree_reference(
2456
current_path_info[0].decode('utf8')):
2457
current_path_info = current_path_info[:2] + \
2458
('tree-reference',) + current_path_info[3:]
2460
current_path_info = None
2461
path_handled = False
2463
advance_path = True # reset the advance flagg.
2464
if current_block is not None:
2466
if (block_index < len(state._dirblocks) and
2467
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2468
current_block = state._dirblocks[block_index]
2470
current_block = None
2471
if current_dir_info is not None:
2473
current_dir_info = dir_iterator.next()
2474
except StopIteration:
2475
current_dir_info = None
2096
2479
def is_compatible(source, target):
2097
2480
# the target must be a dirstate working tree
2098
if not isinstance(target, DirStateWorkingTree):
2481
if not isinstance(target, WorkingTree4):
2100
# the source must be a revtree or dirstate rev tree.
2483
# the source must be a revtreee or dirstate rev tree.
2101
2484
if not isinstance(source,
2102
2485
(revisiontree.RevisionTree, DirStateRevisionTree)):
2104
2487
# the source revid must be in the target dirstate
2105
if not (source._revision_id == _mod_revision.NULL_REVISION or
2488
if not (source._revision_id == NULL_REVISION or
2106
2489
source._revision_id in target.get_parent_ids()):
2107
# TODO: what about ghosts? it may well need to
2490
# TODO: what about ghosts? it may well need to
2108
2491
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
