2080
1878
if not found_versioned:
2081
1879
# 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)
1881
all_versioned = False
1883
if not all_versioned:
1884
raise errors.PathsNotVersionedError(specific_files)
2086
1885
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2087
search_specific_files = osutils.minimum_path_selection(specific_files)
1886
search_specific_files = set()
1887
for path in specific_files:
1888
other_specific_files = specific_files.difference(set([path]))
1889
if not osutils.is_inside_any(other_specific_files, path):
1890
# this is a top level path, we must check it.
1891
search_specific_files.add(path)
1893
# compare source_index and target_index at or under each element of search_specific_files.
1894
# follow the following comparison table. Note that we only want to do diff operations when
1895
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1899
# Source | Target | disk | action
1900
# r | fdlt | | add source to search, add id path move and perform
1901
# | | | diff check on source-target
1902
# r | fdlt | a | dangling file that was present in the basis.
1904
# r | a | | add source to search
1906
# r | r | | this path is present in a non-examined tree, skip.
1907
# r | r | a | this path is present in a non-examined tree, skip.
1908
# a | fdlt | | add new id
1909
# a | fdlt | a | dangling locally added file, skip
1910
# a | a | | not present in either tree, skip
1911
# a | a | a | not present in any tree, skip
1912
# a | r | | not present in either tree at this path, skip as it
1913
# | | | may not be selected by the users list of paths.
1914
# a | r | a | not present in either tree at this path, skip as it
1915
# | | | may not be selected by the users list of paths.
1916
# fdlt | fdlt | | content in both: diff them
1917
# fdlt | fdlt | a | deleted locally, but not unversioned - show as deleted ?
1918
# fdlt | a | | unversioned: output deleted id for now
1919
# fdlt | a | a | unversioned and deleted: output deleted id
1920
# fdlt | r | | 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.
1923
# fdlt | r | a | relocated in this tree, so add target to search.
1924
# | | | Dont diff, we will see an r,fd; pair when we reach
1925
# | | | this id at the other path.
1927
# for all search_indexs in each path at or under each element of
1928
# search_specific_files, if the detail is relocated: add the id, and add the
1929
# relocated path as one to search if its not searched already. If the
1930
# detail is not relocated, add the id.
1931
searched_specific_files = set()
1932
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1933
# Using a list so that we can access the values and change them in
1934
# nested scope. Each one is [path, file_id, entry]
1935
last_source_parent = [None, None]
1936
last_target_parent = [None, None]
2089
1938
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()
1940
# Just a sentry, so that _process_entry can say that this
1941
# record is handled, but isn't interesting to process (unchanged)
1942
uninteresting = object()
1945
old_dirname_to_file_id = {}
1946
new_dirname_to_file_id = {}
1947
# TODO: jam 20070516 - Avoid the _get_entry lookup overhead by
1948
# keeping a cache of directories that we have seen.
1950
def _process_entry(entry, path_info):
1951
"""Compare an entry and real disk to generate delta information.
1953
:param path_info: top_relpath, basename, kind, lstat, abspath for
1954
the path of entry. If None, then the path is considered absent.
1955
(Perhaps we should pass in a concrete entry for this ?)
1956
Basename is returned as a utf8 string because we expect this
1957
tuple will be ignored, and don't want to take the time to
1959
:return: None if these don't match
1960
A tuple of information about the change, or
1961
the object 'uninteresting' if these match, but are
1962
basically identical.
1964
if source_index is None:
1965
source_details = NULL_PARENT_DETAILS
1967
source_details = entry[1][source_index]
1968
target_details = entry[1][target_index]
1969
target_minikind = target_details[0]
1970
if path_info is not None and target_minikind in 'fdlt':
1971
if not (target_index == 0):
1972
raise AssertionError()
1973
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
1974
stat_value=path_info[3])
1975
# The entry may have been modified by update_entry
1976
target_details = entry[1][target_index]
1977
target_minikind = target_details[0]
1980
file_id = entry[0][2]
1981
source_minikind = source_details[0]
1982
if source_minikind in 'fdltr' and target_minikind in 'fdlt':
1983
# claimed content in both: diff
1984
# r | fdlt | | add source to search, add id path move and perform
1985
# | | | diff check on source-target
1986
# r | fdlt | a | dangling file that was present in the basis.
1988
if source_minikind in 'r':
1989
# add the source to the search path to find any children it
1990
# has. TODO ? : only add if it is a container ?
1991
if not osutils.is_inside_any(searched_specific_files,
1993
search_specific_files.add(source_details[1])
1994
# generate the old path; this is needed for stating later
1996
old_path = source_details[1]
1997
old_dirname, old_basename = os.path.split(old_path)
1998
path = pathjoin(entry[0][0], entry[0][1])
1999
old_entry = state._get_entry(source_index,
2001
# update the source details variable to be the real
2003
if old_entry == (None, None):
2004
raise errors.CorruptDirstate(state._filename,
2005
"entry '%s/%s' is considered renamed from %r"
2006
" but source does not exist\n"
2007
"entry: %s" % (entry[0][0], entry[0][1], old_path, entry))
2008
source_details = old_entry[1][source_index]
2009
source_minikind = source_details[0]
2011
old_dirname = entry[0][0]
2012
old_basename = entry[0][1]
2013
old_path = path = None
2014
if path_info is None:
2015
# the file is missing on disk, show as removed.
2016
content_change = True
2020
# source and target are both versioned and disk file is present.
2021
target_kind = path_info[2]
2022
if target_kind == 'directory':
2024
old_path = path = pathjoin(old_dirname, old_basename)
2025
new_dirname_to_file_id[path] = file_id
2026
if source_minikind != 'd':
2027
content_change = True
2029
# directories have no fingerprint
2030
content_change = False
2032
elif target_kind == 'file':
2033
if source_minikind != 'f':
2034
content_change = True
2036
# We could check the size, but we already have the
2038
content_change = (link_or_sha1 != source_details[1])
2039
# Target details is updated at update_entry time
2040
if use_filesystem_for_exec:
2041
# We don't need S_ISREG here, because we are sure
2042
# we are dealing with a file.
2043
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
2045
target_exec = target_details[3]
2046
elif target_kind == 'symlink':
2047
if source_minikind != 'l':
2048
content_change = True
2050
content_change = (link_or_sha1 != source_details[1])
2052
elif target_kind == 'tree-reference':
2053
if source_minikind != 't':
2054
content_change = True
2056
content_change = False
2059
raise Exception, "unknown kind %s" % path_info[2]
2060
if source_minikind == 'd':
2062
old_path = path = pathjoin(old_dirname, old_basename)
2063
old_dirname_to_file_id[old_path] = file_id
2064
# parent id is the entry for the path in the target tree
2065
if old_dirname == last_source_parent[0]:
2066
source_parent_id = last_source_parent[1]
2069
source_parent_id = old_dirname_to_file_id[old_dirname]
2071
source_parent_entry = state._get_entry(source_index,
2072
path_utf8=old_dirname)
2073
source_parent_id = source_parent_entry[0][2]
2074
if source_parent_id == entry[0][2]:
2075
# This is the root, so the parent is None
2076
source_parent_id = None
2078
last_source_parent[0] = old_dirname
2079
last_source_parent[1] = source_parent_id
2080
new_dirname = entry[0][0]
2081
if new_dirname == last_target_parent[0]:
2082
target_parent_id = last_target_parent[1]
2085
target_parent_id = new_dirname_to_file_id[new_dirname]
2087
# TODO: We don't always need to do the lookup, because the
2088
# parent entry will be the same as the source entry.
2089
target_parent_entry = state._get_entry(target_index,
2090
path_utf8=new_dirname)
2091
if target_parent_entry == (None, None):
2092
raise AssertionError(
2093
"Could not find target parent in wt: %s\nparent of: %s"
2094
% (new_dirname, entry))
2095
target_parent_id = target_parent_entry[0][2]
2096
if target_parent_id == entry[0][2]:
2097
# This is the root, so the parent is None
2098
target_parent_id = None
2100
last_target_parent[0] = new_dirname
2101
last_target_parent[1] = target_parent_id
2103
source_exec = source_details[3]
2104
if (include_unchanged
2106
or source_parent_id != target_parent_id
2107
or old_basename != entry[0][1]
2108
or source_exec != target_exec
2110
if old_path is None:
2111
old_path = path = pathjoin(old_dirname, old_basename)
2112
old_path_u = utf8_decode(old_path)[0]
2115
old_path_u = utf8_decode(old_path)[0]
2116
if old_path == path:
2119
path_u = utf8_decode(path)[0]
2120
source_kind = _minikind_to_kind[source_minikind]
2121
return (entry[0][2],
2122
(old_path_u, path_u),
2125
(source_parent_id, target_parent_id),
2126
(utf8_decode(old_basename)[0], utf8_decode(entry[0][1])[0]),
2127
(source_kind, target_kind),
2128
(source_exec, target_exec))
2130
return uninteresting
2131
elif source_minikind in 'a' and target_minikind in 'fdlt':
2132
# looks like a new file
2133
if path_info is not None:
2134
path = pathjoin(entry[0][0], entry[0][1])
2135
# parent id is the entry for the path in the target tree
2136
# TODO: these are the same for an entire directory: cache em.
2137
parent_id = state._get_entry(target_index,
2138
path_utf8=entry[0][0])[0][2]
2139
if parent_id == entry[0][2]:
2141
if use_filesystem_for_exec:
2142
# We need S_ISREG here, because we aren't sure if this
2145
stat.S_ISREG(path_info[3].st_mode)
2146
and stat.S_IEXEC & path_info[3].st_mode)
2148
target_exec = target_details[3]
2149
return (entry[0][2],
2150
(None, utf8_decode(path)[0]),
2154
(None, utf8_decode(entry[0][1])[0]),
2155
(None, path_info[2]),
2156
(None, target_exec))
2158
# but its not on disk: we deliberately treat this as just
2159
# never-present. (Why ?! - RBC 20070224)
2161
elif source_minikind in 'fdlt' and target_minikind in 'a':
2162
# unversioned, possibly, or possibly not deleted: we dont care.
2163
# if its still on disk, *and* theres no other entry at this
2164
# path [we dont know this in this routine at the moment -
2165
# perhaps we should change this - then it would be an unknown.
2166
old_path = pathjoin(entry[0][0], entry[0][1])
2167
# parent id is the entry for the path in the target tree
2168
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
2169
if parent_id == entry[0][2]:
2171
return (entry[0][2],
2172
(utf8_decode(old_path)[0], None),
2176
(utf8_decode(entry[0][1])[0], None),
2177
(_minikind_to_kind[source_minikind], None),
2178
(source_details[3], None))
2179
elif source_minikind in 'fdlt' and target_minikind in 'r':
2180
# a rename; could be a true rename, or a rename inherited from
2181
# a renamed parent. TODO: handle this efficiently. Its not
2182
# common case to rename dirs though, so a correct but slow
2183
# implementation will do.
2184
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
2185
search_specific_files.add(target_details[1])
2186
elif source_minikind in 'ra' and target_minikind in 'ra':
2187
# neither of the selected trees contain this file,
2188
# so skip over it. This is not currently directly tested, but
2189
# is indirectly via test_too_much.TestCommands.test_conflicts.
2192
raise AssertionError("don't know how to compare "
2193
"source_minikind=%r, target_minikind=%r"
2194
% (source_minikind, target_minikind))
2195
## import pdb;pdb.set_trace()
2198
while search_specific_files:
2199
# TODO: the pending list should be lexically sorted? the
2200
# interface doesn't require it.
2201
current_root = search_specific_files.pop()
2202
current_root_unicode = current_root.decode('utf8')
2203
searched_specific_files.add(current_root)
2204
# process the entries for this containing directory: the rest will be
2205
# found by their parents recursively.
2206
root_entries = _entries_for_path(current_root)
2207
root_abspath = self.target.abspath(current_root_unicode)
2209
root_stat = os.lstat(root_abspath)
2211
if e.errno == errno.ENOENT:
2212
# the path does not exist: let _process_entry know that.
2213
root_dir_info = None
2215
# some other random error: hand it up.
2218
root_dir_info = ('', current_root,
2219
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
2221
if root_dir_info[2] == 'directory':
2222
if self.target._directory_is_tree_reference(
2223
current_root.decode('utf8')):
2224
root_dir_info = root_dir_info[:2] + \
2225
('tree-reference',) + root_dir_info[3:]
2227
if not root_entries and not root_dir_info:
2228
# this specified path is not present at all, skip it.
2230
path_handled = False
2231
for entry in root_entries:
2232
result = _process_entry(entry, root_dir_info)
2233
if result is not None:
2235
if result is not uninteresting:
2237
if want_unversioned and not path_handled and root_dir_info:
2238
new_executable = bool(
2239
stat.S_ISREG(root_dir_info[3].st_mode)
2240
and stat.S_IEXEC & root_dir_info[3].st_mode)
2242
(None, current_root_unicode),
2246
(None, splitpath(current_root_unicode)[-1]),
2247
(None, root_dir_info[2]),
2248
(None, new_executable)
2250
initial_key = (current_root, '', '')
2251
block_index, _ = state._find_block_index_from_key(initial_key)
2252
if block_index == 0:
2253
# we have processed the total root already, but because the
2254
# initial key matched it we should skip it here.
2256
if root_dir_info and root_dir_info[2] == 'tree-reference':
2257
current_dir_info = None
2259
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
2261
current_dir_info = dir_iterator.next()
2263
# on win32, python2.4 has e.errno == ERROR_DIRECTORY, but
2264
# python 2.5 has e.errno == EINVAL,
2265
# and e.winerror == ERROR_DIRECTORY
2266
e_winerror = getattr(e, 'winerror', None)
2267
win_errors = (ERROR_DIRECTORY, ERROR_PATH_NOT_FOUND)
2268
# there may be directories in the inventory even though
2269
# this path is not a file on disk: so mark it as end of
2271
if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
2272
current_dir_info = None
2273
elif (sys.platform == 'win32'
2274
and (e.errno in win_errors
2275
or e_winerror in win_errors)):
2276
current_dir_info = None
2280
if current_dir_info[0][0] == '':
2281
# remove .bzr from iteration
2282
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
2283
if current_dir_info[1][bzr_index][0] != '.bzr':
2284
raise AssertionError()
2285
del current_dir_info[1][bzr_index]
2286
# walk until both the directory listing and the versioned metadata
2288
if (block_index < len(state._dirblocks) and
2289
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2290
current_block = state._dirblocks[block_index]
2292
current_block = None
2293
while (current_dir_info is not None or
2294
current_block is not None):
2295
if (current_dir_info and current_block
2296
and current_dir_info[0][0] != current_block[0]):
2297
if cmp_by_dirs(current_dir_info[0][0], current_block[0]) < 0:
2298
# filesystem data refers to paths not covered by the dirblock.
2299
# this has two possibilities:
2300
# A) it is versioned but empty, so there is no block for it
2301
# B) it is not versioned.
2303
# if (A) then we need to recurse into it to check for
2304
# new unknown files or directories.
2305
# if (B) then we should ignore it, because we don't
2306
# recurse into unknown directories.
2308
while path_index < len(current_dir_info[1]):
2309
current_path_info = current_dir_info[1][path_index]
2310
if want_unversioned:
2311
if current_path_info[2] == 'directory':
2312
if self.target._directory_is_tree_reference(
2313
current_path_info[0].decode('utf8')):
2314
current_path_info = current_path_info[:2] + \
2315
('tree-reference',) + current_path_info[3:]
2316
new_executable = bool(
2317
stat.S_ISREG(current_path_info[3].st_mode)
2318
and stat.S_IEXEC & current_path_info[3].st_mode)
2320
(None, utf8_decode(current_path_info[0])[0]),
2324
(None, utf8_decode(current_path_info[1])[0]),
2325
(None, current_path_info[2]),
2326
(None, new_executable))
2327
# dont descend into this unversioned path if it is
2329
if current_path_info[2] in ('directory',
2331
del current_dir_info[1][path_index]
2335
# This dir info has been handled, go to the next
2337
current_dir_info = dir_iterator.next()
2338
except StopIteration:
2339
current_dir_info = None
2341
# We have a dirblock entry for this location, but there
2342
# is no filesystem path for this. This is most likely
2343
# because a directory was removed from the disk.
2344
# We don't have to report the missing directory,
2345
# because that should have already been handled, but we
2346
# need to handle all of the files that are contained
2348
for current_entry in current_block[1]:
2349
# entry referring to file not present on disk.
2350
# advance the entry only, after processing.
2351
result = _process_entry(current_entry, None)
2352
if result is not None:
2353
if result is not uninteresting:
2356
if (block_index < len(state._dirblocks) and
2357
osutils.is_inside(current_root,
2358
state._dirblocks[block_index][0])):
2359
current_block = state._dirblocks[block_index]
2361
current_block = None
2364
if current_block and entry_index < len(current_block[1]):
2365
current_entry = current_block[1][entry_index]
2367
current_entry = None
2368
advance_entry = True
2370
if current_dir_info and path_index < len(current_dir_info[1]):
2371
current_path_info = current_dir_info[1][path_index]
2372
if current_path_info[2] == 'directory':
2373
if self.target._directory_is_tree_reference(
2374
current_path_info[0].decode('utf8')):
2375
current_path_info = current_path_info[:2] + \
2376
('tree-reference',) + current_path_info[3:]
2378
current_path_info = None
2380
path_handled = False
2381
while (current_entry is not None or
2382
current_path_info is not None):
2383
if current_entry is None:
2384
# the check for path_handled when the path is adnvaced
2385
# will yield this path if needed.
2387
elif current_path_info is None:
2388
# no path is fine: the per entry code will handle it.
2389
result = _process_entry(current_entry, current_path_info)
2390
if result is not None:
2391
if result is not uninteresting:
2393
elif (current_entry[0][1] != current_path_info[1]
2394
or current_entry[1][target_index][0] in 'ar'):
2395
# The current path on disk doesn't match the dirblock
2396
# record. Either the dirblock is marked as absent, or
2397
# the file on disk is not present at all in the
2398
# dirblock. Either way, report about the dirblock
2399
# entry, and let other code handle the filesystem one.
2401
# Compare the basename for these files to determine
2403
if current_path_info[1] < current_entry[0][1]:
2404
# extra file on disk: pass for now, but only
2405
# increment the path, not the entry
2406
advance_entry = False
2408
# entry referring to file not present on disk.
2409
# advance the entry only, after processing.
2410
result = _process_entry(current_entry, None)
2411
if result is not None:
2412
if result is not uninteresting:
2414
advance_path = False
2416
result = _process_entry(current_entry, current_path_info)
2417
if result is not None:
2419
if result is not uninteresting:
2421
if advance_entry and current_entry is not None:
2423
if entry_index < len(current_block[1]):
2424
current_entry = current_block[1][entry_index]
2426
current_entry = None
2428
advance_entry = True # reset the advance flaga
2429
if advance_path and current_path_info is not None:
2430
if not path_handled:
2431
# unversioned in all regards
2432
if want_unversioned:
2433
new_executable = bool(
2434
stat.S_ISREG(current_path_info[3].st_mode)
2435
and stat.S_IEXEC & current_path_info[3].st_mode)
2437
(None, utf8_decode(current_path_info[0])[0]),
2441
(None, utf8_decode(current_path_info[1])[0]),
2442
(None, current_path_info[2]),
2443
(None, new_executable))
2444
# dont descend into this unversioned path if it is
2446
if current_path_info[2] in ('directory'):
2447
del current_dir_info[1][path_index]
2449
# dont descend the disk iterator into any tree
2451
if current_path_info[2] == 'tree-reference':
2452
del current_dir_info[1][path_index]
2455
if path_index < len(current_dir_info[1]):
2456
current_path_info = current_dir_info[1][path_index]
2457
if current_path_info[2] == 'directory':
2458
if self.target._directory_is_tree_reference(
2459
current_path_info[0].decode('utf8')):
2460
current_path_info = current_path_info[:2] + \
2461
('tree-reference',) + current_path_info[3:]
2463
current_path_info = None
2464
path_handled = False
2466
advance_path = True # reset the advance flagg.
2467
if current_block is not None:
2469
if (block_index < len(state._dirblocks) and
2470
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2471
current_block = state._dirblocks[block_index]
2473
current_block = None
2474
if current_dir_info is not None:
2476
current_dir_info = dir_iterator.next()
2477
except StopIteration:
2478
current_dir_info = None
2096
2482
def is_compatible(source, target):
2097
2483
# the target must be a dirstate working tree
2098
if not isinstance(target, DirStateWorkingTree):
2484
if not isinstance(target, WorkingTree4):
2100
# the source must be a revtree or dirstate rev tree.
2486
# the source must be a revtreee or dirstate rev tree.
2101
2487
if not isinstance(source,
2102
2488
(revisiontree.RevisionTree, DirStateRevisionTree)):
2104
2490
# the source revid must be in the target dirstate
2105
if not (source._revision_id == _mod_revision.NULL_REVISION or
2491
if not (source._revision_id == NULL_REVISION or
2106
2492
source._revision_id in target.get_parent_ids()):
2107
# TODO: what about ghosts? it may well need to
2493
# TODO: what about ghosts? it may well need to
2108
2494
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
