1333
1218
@needs_tree_write_lock
1334
1219
def _write_inventory(self, inv):
1335
1220
"""Write inventory as the current inventory."""
1337
raise AssertionError("attempting to write an inventory when the "
1338
"dirstate is dirty will lose pending changes")
1339
had_inventory = self._inventory is not None
1340
# Setting self._inventory = None forces the dirstate to regenerate the
1341
# working inventory. We do this because self.inventory may be inv, or
1342
# may have been modified, and either case would prevent a clean delta
1344
self._inventory = None
1346
delta = inv._make_delta(self.root_inventory)
1348
self.apply_inventory_delta(delta)
1221
assert not self._dirty, "attempting to write an inventory when the dirstate is dirty will cause data loss"
1222
self.current_dirstate().set_state_from_inventory(inv)
1223
self._make_dirty(reset_inventory=False)
1224
if self._inventory is not None:
1350
1225
self._inventory = inv
1353
@needs_tree_write_lock
1354
def reset_state(self, revision_ids=None):
1355
"""Reset the state of the working tree.
1357
This does a hard-reset to a last-known-good state. This is a way to
1358
fix if something got corrupted (like the .bzr/checkout/dirstate file)
1360
if revision_ids is None:
1361
revision_ids = self.get_parent_ids()
1362
if not revision_ids:
1363
base_tree = self.branch.repository.revision_tree(
1364
_mod_revision.NULL_REVISION)
1367
trees = zip(revision_ids,
1368
self.branch.repository.revision_trees(revision_ids))
1369
base_tree = trees[0][1]
1370
state = self.current_dirstate()
1371
# We don't support ghosts yet
1372
state.set_state_from_scratch(base_tree.root_inventory, trees, [])
1375
class ContentFilterAwareSHA1Provider(dirstate.SHA1Provider):
1377
def __init__(self, tree):
1380
def sha1(self, abspath):
1381
"""See dirstate.SHA1Provider.sha1()."""
1382
filters = self.tree._content_filter_stack(
1383
self.tree.relpath(osutils.safe_unicode(abspath)))
1384
return _mod_filters.internal_size_sha_file_byname(abspath, filters)[1]
1386
def stat_and_sha1(self, abspath):
1387
"""See dirstate.SHA1Provider.stat_and_sha1()."""
1388
filters = self.tree._content_filter_stack(
1389
self.tree.relpath(osutils.safe_unicode(abspath)))
1390
file_obj = file(abspath, 'rb', 65000)
1392
statvalue = os.fstat(file_obj.fileno())
1394
file_obj = _mod_filters.filtered_input_file(file_obj, filters)
1395
sha1 = osutils.size_sha_file(file_obj)[1]
1398
return statvalue, sha1
1401
class ContentFilteringDirStateWorkingTree(DirStateWorkingTree):
1402
"""Dirstate working tree that supports content filtering.
1404
The dirstate holds the hash and size of the canonical form of the file,
1405
and most methods must return that.
1408
def _file_content_summary(self, path, stat_result):
1409
# This is to support the somewhat obsolete path_content_summary method
1410
# with content filtering: see
1411
# <https://bugs.launchpad.net/bzr/+bug/415508>.
1413
# If the dirstate cache is up to date and knows the hash and size,
1415
# Otherwise if there are no content filters, return the on-disk size
1416
# and leave the hash blank.
1417
# Otherwise, read and filter the on-disk file and use its size and
1420
# The dirstate doesn't store the size of the canonical form so we
1421
# can't trust it for content-filtered trees. We just return None.
1422
dirstate_sha1 = self._dirstate.sha1_from_stat(path, stat_result)
1423
executable = self._is_executable_from_path_and_stat(path, stat_result)
1424
return ('file', None, executable, dirstate_sha1)
1427
class WorkingTree4(DirStateWorkingTree):
1428
"""This is the Format 4 working tree.
1430
This differs from WorkingTree by:
1431
- Having a consolidated internal dirstate, stored in a
1432
randomly-accessible sorted file on disk.
1433
- Not having a regular inventory attribute. One can be synthesized
1434
on demand but this is expensive and should be avoided.
1436
This is new in bzr 0.15.
1440
class WorkingTree5(ContentFilteringDirStateWorkingTree):
1441
"""This is the Format 5 working tree.
1443
This differs from WorkingTree4 by:
1444
- Supporting content filtering.
1446
This is new in bzr 1.11.
1450
class WorkingTree6(ContentFilteringDirStateWorkingTree):
1451
"""This is the Format 6 working tree.
1453
This differs from WorkingTree5 by:
1454
- Supporting a current view that may mask the set of files in a tree
1455
impacted by most user operations.
1457
This is new in bzr 1.14.
1460
def _make_views(self):
1461
return views.PathBasedViews(self)
1464
class DirStateWorkingTreeFormat(WorkingTreeFormatMetaDir):
1466
missing_parent_conflicts = True
1468
supports_versioned_directories = True
1470
_lock_class = LockDir
1471
_lock_file_name = 'lock'
1473
def _open_control_files(self, a_bzrdir):
1474
transport = a_bzrdir.get_workingtree_transport(None)
1475
return LockableFiles(transport, self._lock_file_name,
1478
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
1479
accelerator_tree=None, hardlink=False):
1229
class WorkingTreeFormat4(WorkingTreeFormat3):
1230
"""The first consolidated dirstate working tree format.
1233
- exists within a metadir controlling .bzr
1234
- includes an explicit version marker for the workingtree control
1235
files, separate from the BzrDir format
1236
- modifies the hash cache format
1237
- is new in bzr 0.15
1238
- uses a LockDir to guard access to it.
1241
upgrade_recommended = False
1243
def get_format_string(self):
1244
"""See WorkingTreeFormat.get_format_string()."""
1245
return "Bazaar Working Tree Format 4 (bzr 0.15)\n"
1247
def get_format_description(self):
1248
"""See WorkingTreeFormat.get_format_description()."""
1249
return "Working tree format 4"
1251
def initialize(self, a_bzrdir, revision_id=None):
1480
1252
"""See WorkingTreeFormat.initialize().
1482
1254
:param revision_id: allows creating a working tree at a different
1483
revision than the branch is at.
1484
:param accelerator_tree: A tree which can be used for retrieving file
1485
contents more quickly than the revision tree, i.e. a workingtree.
1486
The revision tree will be used for cases where accelerator_tree's
1487
content is different.
1488
:param hardlink: If true, hard-link files from accelerator_tree,
1255
revision than the branch is at.
1491
1257
These trees get an initial random root id, if their repository supports
1492
1258
rich root data, TREE_ROOT otherwise.
1519
1281
wt.lock_tree_write()
1521
self._init_custom_control_files(wt)
1522
if revision_id in (None, _mod_revision.NULL_REVISION):
1283
if revision_id in (None, NULL_REVISION):
1523
1284
if branch.repository.supports_rich_root():
1524
1285
wt._set_root_id(generate_ids.gen_root_id())
1526
1287
wt._set_root_id(ROOT_ID)
1529
# frequently, we will get here due to branching. The accelerator
1530
# tree will be the tree from the branch, so the desired basis
1531
# tree will often be a parent of the accelerator tree.
1532
if accelerator_tree is not None:
1534
basis = accelerator_tree.revision_tree(revision_id)
1535
except errors.NoSuchRevision:
1538
basis = branch.repository.revision_tree(revision_id)
1539
if revision_id == _mod_revision.NULL_REVISION:
1542
parents_list = [(revision_id, basis)]
1289
wt.set_last_revision(revision_id)
1291
basis = wt.basis_tree()
1543
1292
basis.lock_read()
1545
wt.set_parent_trees(parents_list, allow_leftmost_as_ghost=True)
1293
# if the basis has a root id we have to use that; otherwise we use
1295
basis_root_id = basis.get_root_id()
1296
if basis_root_id is not None:
1297
wt._set_root_id(basis_root_id)
1547
# if the basis has a root id we have to use that; otherwise we
1548
# use a new random one
1549
basis_root_id = basis.get_root_id()
1550
if basis_root_id is not None:
1551
wt._set_root_id(basis_root_id)
1553
if wt.supports_content_filtering():
1554
# The original tree may not have the same content filters
1555
# applied so we can't safely build the inventory delta from
1557
delta_from_tree = False
1559
delta_from_tree = True
1560
# delta_from_tree is safe even for DirStateRevisionTrees,
1561
# because wt4.apply_inventory_delta does not mutate the input
1562
# inventory entries.
1563
transform.build_tree(basis, wt, accelerator_tree,
1565
delta_from_tree=delta_from_tree)
1566
for hook in MutableTree.hooks['post_build_tree']:
1299
transform.build_tree(basis, wt)
1571
1302
control_files.unlock()
1575
def _init_custom_control_files(self, wt):
1576
"""Subclasses with custom control files should override this method.
1578
The working tree and control files are locked for writing when this
1581
:param wt: the WorkingTree object
1584
def open(self, a_bzrdir, _found=False):
1585
"""Return the WorkingTree object for a_bzrdir
1587
_found is a private parameter, do not use it. It is used to indicate
1588
if format probing has already been done.
1591
# we are being called directly and must probe.
1592
raise NotImplementedError
1593
if not isinstance(a_bzrdir.transport, LocalTransport):
1594
raise errors.NotLocalUrl(a_bzrdir.transport.base)
1595
wt = self._open(a_bzrdir, self._open_control_files(a_bzrdir))
1598
1306
def _open(self, a_bzrdir, control_files):
1599
1307
"""Open the tree itself.
1601
1309
:param a_bzrdir: the dir for the tree.
1602
1310
:param control_files: the control files for the tree.
1604
return self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
1312
return WorkingTree4(a_bzrdir.root_transport.local_abspath('.'),
1605
1313
branch=a_bzrdir.open_branch(),
1607
1315
_bzrdir=a_bzrdir,
1608
1316
_control_files=control_files)
1610
1318
def __get_matchingbzrdir(self):
1611
return self._get_matchingbzrdir()
1613
def _get_matchingbzrdir(self):
1614
"""Overrideable method to get a bzrdir for testing."""
1615
1319
# please test against something that will let us do tree references
1616
return controldir.format_registry.make_bzrdir(
1617
'development-subtree')
1320
return bzrdir.format_registry.make_bzrdir(
1321
'dirstate-with-subtree')
1619
1323
_matchingbzrdir = property(__get_matchingbzrdir)
1622
class WorkingTreeFormat4(DirStateWorkingTreeFormat):
1623
"""The first consolidated dirstate working tree format.
1626
- exists within a metadir controlling .bzr
1627
- includes an explicit version marker for the workingtree control
1628
files, separate from the ControlDir format
1629
- modifies the hash cache format
1630
- is new in bzr 0.15
1631
- uses a LockDir to guard access to it.
1634
upgrade_recommended = False
1636
_tree_class = WorkingTree4
1639
def get_format_string(cls):
1640
"""See WorkingTreeFormat.get_format_string()."""
1641
return "Bazaar Working Tree Format 4 (bzr 0.15)\n"
1643
def get_format_description(self):
1644
"""See WorkingTreeFormat.get_format_description()."""
1645
return "Working tree format 4"
1648
class WorkingTreeFormat5(DirStateWorkingTreeFormat):
1649
"""WorkingTree format supporting content filtering.
1652
upgrade_recommended = False
1654
_tree_class = WorkingTree5
1657
def get_format_string(cls):
1658
"""See WorkingTreeFormat.get_format_string()."""
1659
return "Bazaar Working Tree Format 5 (bzr 1.11)\n"
1661
def get_format_description(self):
1662
"""See WorkingTreeFormat.get_format_description()."""
1663
return "Working tree format 5"
1665
def supports_content_filtering(self):
1669
class WorkingTreeFormat6(DirStateWorkingTreeFormat):
1670
"""WorkingTree format supporting views.
1673
upgrade_recommended = False
1675
_tree_class = WorkingTree6
1678
def get_format_string(cls):
1679
"""See WorkingTreeFormat.get_format_string()."""
1680
return "Bazaar Working Tree Format 6 (bzr 1.14)\n"
1682
def get_format_description(self):
1683
"""See WorkingTreeFormat.get_format_description()."""
1684
return "Working tree format 6"
1686
def _init_custom_control_files(self, wt):
1687
"""Subclasses with custom control files should override this method."""
1688
wt._transport.put_bytes('views', '', mode=wt.bzrdir._get_file_mode())
1690
def supports_content_filtering(self):
1693
def supports_views(self):
1696
def _get_matchingbzrdir(self):
1697
"""Overrideable method to get a bzrdir for testing."""
1698
# We use 'development-subtree' instead of '2a', because we have a
1699
# few tests that want to test tree references
1700
return bzrdir.format_registry.make_bzrdir('development-subtree')
1703
class DirStateRevisionTree(InventoryTree):
1704
"""A revision tree pulling the inventory from a dirstate.
1706
Note that this is one of the historical (ie revision) trees cached in the
1707
dirstate for easy access, not the workingtree.
1326
class DirStateRevisionTree(Tree):
1327
"""A revision tree pulling the inventory from a dirstate."""
1710
1329
def __init__(self, dirstate, revision_id, repository):
1711
1330
self._dirstate = dirstate
2241
1787
if not found_versioned:
2242
1788
# none of the indexes was not 'absent' at all ids for this
2244
not_versioned.append(path.decode('utf-8'))
2245
if len(not_versioned) > 0:
2246
raise errors.PathsNotVersionedError(not_versioned)
1790
all_versioned = False
1792
if not all_versioned:
1793
raise errors.PathsNotVersionedError(specific_files)
2247
1794
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2248
search_specific_files = osutils.minimum_path_selection(specific_files)
1795
search_specific_files = set()
1796
for path in specific_files:
1797
other_specific_files = specific_files.difference(set([path]))
1798
if not osutils.is_inside_any(other_specific_files, path):
1799
# this is a top level path, we must check it.
1800
search_specific_files.add(path)
1802
# compare source_index and target_index at or under each element of search_specific_files.
1803
# follow the following comparison table. Note that we only want to do diff operations when
1804
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1808
# Source | Target | disk | action
1809
# r | fdlt | | add source to search, add id path move and perform
1810
# | | | diff check on source-target
1811
# r | fdlt | a | dangling file that was present in the basis.
1813
# r | a | | add source to search
1815
# r | r | | this path is present in a non-examined tree, skip.
1816
# r | r | a | this path is present in a non-examined tree, skip.
1817
# a | fdlt | | add new id
1818
# a | fdlt | a | dangling locally added file, skip
1819
# a | a | | not present in either tree, skip
1820
# a | a | a | not present in any tree, skip
1821
# a | r | | not present in either tree at this path, skip as it
1822
# | | | may not be selected by the users list of paths.
1823
# a | r | a | not present in either tree at this path, skip as it
1824
# | | | may not be selected by the users list of paths.
1825
# fdlt | fdlt | | content in both: diff them
1826
# fdlt | fdlt | a | deleted locally, but not unversioned - show as deleted ?
1827
# fdlt | a | | unversioned: output deleted id for now
1828
# fdlt | a | a | unversioned and deleted: output deleted id
1829
# fdlt | r | | relocated in this tree, so add target to search.
1830
# | | | Dont diff, we will see an r,fd; pair when we reach
1831
# | | | this id at the other path.
1832
# fdlt | r | a | relocated in this tree, so add target to search.
1833
# | | | Dont diff, we will see an r,fd; pair when we reach
1834
# | | | this id at the other path.
1836
# for all search_indexs in each path at or under each element of
1837
# search_specific_files, if the detail is relocated: add the id, and add the
1838
# relocated path as one to search if its not searched already. If the
1839
# detail is not relocated, add the id.
1840
searched_specific_files = set()
1841
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1842
# Using a list so that we can access the values and change them in
1843
# nested scope. Each one is [path, file_id, entry]
1844
last_source_parent = [None, None]
1845
last_target_parent = [None, None]
2250
1847
use_filesystem_for_exec = (sys.platform != 'win32')
2251
iter_changes = self.target._iter_changes(include_unchanged,
2252
use_filesystem_for_exec, search_specific_files, state,
2253
source_index, target_index, want_unversioned, self.target)
2254
return iter_changes.iter_changes()
1849
# Just a sentry, so that _process_entry can say that this
1850
# record is handled, but isn't interesting to process (unchanged)
1851
uninteresting = object()
1854
old_dirname_to_file_id = {}
1855
new_dirname_to_file_id = {}
1856
# TODO: jam 20070516 - Avoid the _get_entry lookup overhead by
1857
# keeping a cache of directories that we have seen.
1859
def _process_entry(entry, path_info):
1860
"""Compare an entry and real disk to generate delta information.
1862
:param path_info: top_relpath, basename, kind, lstat, abspath for
1863
the path of entry. If None, then the path is considered absent.
1864
(Perhaps we should pass in a concrete entry for this ?)
1865
Basename is returned as a utf8 string because we expect this
1866
tuple will be ignored, and don't want to take the time to
1868
:return: None if these don't match
1869
A tuple of information about the change, or
1870
the object 'uninteresting' if these match, but are
1871
basically identical.
1873
if source_index is None:
1874
source_details = NULL_PARENT_DETAILS
1876
source_details = entry[1][source_index]
1877
target_details = entry[1][target_index]
1878
target_minikind = target_details[0]
1879
if path_info is not None and target_minikind in 'fdlt':
1880
assert target_index == 0
1881
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
1882
stat_value=path_info[3])
1883
# The entry may have been modified by update_entry
1884
target_details = entry[1][target_index]
1885
target_minikind = target_details[0]
1888
file_id = entry[0][2]
1889
source_minikind = source_details[0]
1890
if source_minikind in 'fdltr' and target_minikind in 'fdlt':
1891
# claimed content in both: diff
1892
# r | fdlt | | add source to search, add id path move and perform
1893
# | | | diff check on source-target
1894
# r | fdlt | a | dangling file that was present in the basis.
1896
if source_minikind in 'r':
1897
# add the source to the search path to find any children it
1898
# has. TODO ? : only add if it is a container ?
1899
if not osutils.is_inside_any(searched_specific_files,
1901
search_specific_files.add(source_details[1])
1902
# generate the old path; this is needed for stating later
1904
old_path = source_details[1]
1905
old_dirname, old_basename = os.path.split(old_path)
1906
path = pathjoin(entry[0][0], entry[0][1])
1907
old_entry = state._get_entry(source_index,
1909
# update the source details variable to be the real
1911
source_details = old_entry[1][source_index]
1912
source_minikind = source_details[0]
1914
old_dirname = entry[0][0]
1915
old_basename = entry[0][1]
1916
old_path = path = None
1917
if path_info is None:
1918
# the file is missing on disk, show as removed.
1919
content_change = True
1923
# source and target are both versioned and disk file is present.
1924
target_kind = path_info[2]
1925
if target_kind == 'directory':
1927
old_path = path = pathjoin(old_dirname, old_basename)
1928
new_dirname_to_file_id[path] = file_id
1929
if source_minikind != 'd':
1930
content_change = True
1932
# directories have no fingerprint
1933
content_change = False
1935
elif target_kind == 'file':
1936
if source_minikind != 'f':
1937
content_change = True
1939
# We could check the size, but we already have the
1941
content_change = (link_or_sha1 != source_details[1])
1942
# Target details is updated at update_entry time
1943
if use_filesystem_for_exec:
1944
# We don't need S_ISREG here, because we are sure
1945
# we are dealing with a file.
1946
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
1948
target_exec = target_details[3]
1949
elif target_kind == 'symlink':
1950
if source_minikind != 'l':
1951
content_change = True
1953
content_change = (link_or_sha1 != source_details[1])
1955
elif target_kind == 'tree-reference':
1956
if source_minikind != 't':
1957
content_change = True
1959
content_change = False
1962
raise Exception, "unknown kind %s" % path_info[2]
1963
if source_minikind == 'd':
1965
old_path = path = pathjoin(old_dirname, old_basename)
1966
old_dirname_to_file_id[old_path] = file_id
1967
# parent id is the entry for the path in the target tree
1968
if old_dirname == last_source_parent[0]:
1969
source_parent_id = last_source_parent[1]
1972
source_parent_id = old_dirname_to_file_id[old_dirname]
1974
source_parent_entry = state._get_entry(source_index,
1975
path_utf8=old_dirname)
1976
source_parent_id = source_parent_entry[0][2]
1977
if source_parent_id == entry[0][2]:
1978
# This is the root, so the parent is None
1979
source_parent_id = None
1981
last_source_parent[0] = old_dirname
1982
last_source_parent[1] = source_parent_id
1983
new_dirname = entry[0][0]
1984
if new_dirname == last_target_parent[0]:
1985
target_parent_id = last_target_parent[1]
1988
target_parent_id = new_dirname_to_file_id[new_dirname]
1990
# TODO: We don't always need to do the lookup, because the
1991
# parent entry will be the same as the source entry.
1992
target_parent_entry = state._get_entry(target_index,
1993
path_utf8=new_dirname)
1994
assert target_parent_entry != (None, None), (
1995
"Could not find target parent in wt: %s\nparent of: %s"
1996
% (new_dirname, entry))
1997
target_parent_id = target_parent_entry[0][2]
1998
if target_parent_id == entry[0][2]:
1999
# This is the root, so the parent is None
2000
target_parent_id = None
2002
last_target_parent[0] = new_dirname
2003
last_target_parent[1] = target_parent_id
2005
source_exec = source_details[3]
2006
if (include_unchanged
2008
or source_parent_id != target_parent_id
2009
or old_basename != entry[0][1]
2010
or source_exec != target_exec
2012
if old_path is None:
2013
old_path = path = pathjoin(old_dirname, old_basename)
2014
old_path_u = utf8_decode(old_path)[0]
2017
old_path_u = utf8_decode(old_path)[0]
2018
if old_path == path:
2021
path_u = utf8_decode(path)[0]
2022
source_kind = _minikind_to_kind[source_minikind]
2023
return (entry[0][2],
2024
(old_path_u, path_u),
2027
(source_parent_id, target_parent_id),
2028
(utf8_decode(old_basename)[0], utf8_decode(entry[0][1])[0]),
2029
(source_kind, target_kind),
2030
(source_exec, target_exec))
2032
return uninteresting
2033
elif source_minikind in 'a' and target_minikind in 'fdlt':
2034
# looks like a new file
2035
if path_info is not None:
2036
path = pathjoin(entry[0][0], entry[0][1])
2037
# parent id is the entry for the path in the target tree
2038
# TODO: these are the same for an entire directory: cache em.
2039
parent_id = state._get_entry(target_index,
2040
path_utf8=entry[0][0])[0][2]
2041
if parent_id == entry[0][2]:
2043
if use_filesystem_for_exec:
2044
# We need S_ISREG here, because we aren't sure if this
2047
stat.S_ISREG(path_info[3].st_mode)
2048
and stat.S_IEXEC & path_info[3].st_mode)
2050
target_exec = target_details[3]
2051
return (entry[0][2],
2052
(None, utf8_decode(path)[0]),
2056
(None, utf8_decode(entry[0][1])[0]),
2057
(None, path_info[2]),
2058
(None, target_exec))
2060
# but its not on disk: we deliberately treat this as just
2061
# never-present. (Why ?! - RBC 20070224)
2063
elif source_minikind in 'fdlt' and target_minikind in 'a':
2064
# unversioned, possibly, or possibly not deleted: we dont care.
2065
# if its still on disk, *and* theres no other entry at this
2066
# path [we dont know this in this routine at the moment -
2067
# perhaps we should change this - then it would be an unknown.
2068
old_path = pathjoin(entry[0][0], entry[0][1])
2069
# parent id is the entry for the path in the target tree
2070
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
2071
if parent_id == entry[0][2]:
2073
return (entry[0][2],
2074
(utf8_decode(old_path)[0], None),
2078
(utf8_decode(entry[0][1])[0], None),
2079
(_minikind_to_kind[source_minikind], None),
2080
(source_details[3], None))
2081
elif source_minikind in 'fdlt' and target_minikind in 'r':
2082
# a rename; could be a true rename, or a rename inherited from
2083
# a renamed parent. TODO: handle this efficiently. Its not
2084
# common case to rename dirs though, so a correct but slow
2085
# implementation will do.
2086
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
2087
search_specific_files.add(target_details[1])
2088
elif source_minikind in 'ra' and target_minikind in 'ra':
2089
# neither of the selected trees contain this file,
2090
# so skip over it. This is not currently directly tested, but
2091
# is indirectly via test_too_much.TestCommands.test_conflicts.
2094
raise AssertionError("don't know how to compare "
2095
"source_minikind=%r, target_minikind=%r"
2096
% (source_minikind, target_minikind))
2097
## import pdb;pdb.set_trace()
2100
while search_specific_files:
2101
# TODO: the pending list should be lexically sorted? the
2102
# interface doesn't require it.
2103
current_root = search_specific_files.pop()
2104
current_root_unicode = current_root.decode('utf8')
2105
searched_specific_files.add(current_root)
2106
# process the entries for this containing directory: the rest will be
2107
# found by their parents recursively.
2108
root_entries = _entries_for_path(current_root)
2109
root_abspath = self.target.abspath(current_root_unicode)
2111
root_stat = os.lstat(root_abspath)
2113
if e.errno == errno.ENOENT:
2114
# the path does not exist: let _process_entry know that.
2115
root_dir_info = None
2117
# some other random error: hand it up.
2120
root_dir_info = ('', current_root,
2121
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
2123
if root_dir_info[2] == 'directory':
2124
if self.target._directory_is_tree_reference(
2125
current_root.decode('utf8')):
2126
root_dir_info = root_dir_info[:2] + \
2127
('tree-reference',) + root_dir_info[3:]
2129
if not root_entries and not root_dir_info:
2130
# this specified path is not present at all, skip it.
2132
path_handled = False
2133
for entry in root_entries:
2134
result = _process_entry(entry, root_dir_info)
2135
if result is not None:
2137
if result is not uninteresting:
2139
if want_unversioned and not path_handled and root_dir_info:
2140
new_executable = bool(
2141
stat.S_ISREG(root_dir_info[3].st_mode)
2142
and stat.S_IEXEC & root_dir_info[3].st_mode)
2144
(None, current_root_unicode),
2148
(None, splitpath(current_root_unicode)[-1]),
2149
(None, root_dir_info[2]),
2150
(None, new_executable)
2152
initial_key = (current_root, '', '')
2153
block_index, _ = state._find_block_index_from_key(initial_key)
2154
if block_index == 0:
2155
# we have processed the total root already, but because the
2156
# initial key matched it we should skip it here.
2158
if root_dir_info and root_dir_info[2] == 'tree-reference':
2159
current_dir_info = None
2161
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
2163
current_dir_info = dir_iterator.next()
2165
# on win32, python2.4 has e.errno == ERROR_DIRECTORY, but
2166
# python 2.5 has e.errno == EINVAL,
2167
# and e.winerror == ERROR_DIRECTORY
2168
e_winerror = getattr(e, 'winerror', None)
2169
win_errors = (ERROR_DIRECTORY, ERROR_PATH_NOT_FOUND)
2170
# there may be directories in the inventory even though
2171
# this path is not a file on disk: so mark it as end of
2173
if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
2174
current_dir_info = None
2175
elif (sys.platform == 'win32'
2176
and (e.errno in win_errors
2177
or e_winerror in win_errors)):
2178
current_dir_info = None
2182
if current_dir_info[0][0] == '':
2183
# remove .bzr from iteration
2184
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
2185
assert current_dir_info[1][bzr_index][0] == '.bzr'
2186
del current_dir_info[1][bzr_index]
2187
# walk until both the directory listing and the versioned metadata
2189
if (block_index < len(state._dirblocks) and
2190
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2191
current_block = state._dirblocks[block_index]
2193
current_block = None
2194
while (current_dir_info is not None or
2195
current_block is not None):
2196
if (current_dir_info and current_block
2197
and current_dir_info[0][0] != current_block[0]):
2198
if cmp_by_dirs(current_dir_info[0][0], current_block[0]) < 0:
2199
# filesystem data refers to paths not covered by the dirblock.
2200
# this has two possibilities:
2201
# A) it is versioned but empty, so there is no block for it
2202
# B) it is not versioned.
2204
# if (A) then we need to recurse into it to check for
2205
# new unknown files or directories.
2206
# if (B) then we should ignore it, because we don't
2207
# recurse into unknown directories.
2209
while path_index < len(current_dir_info[1]):
2210
current_path_info = current_dir_info[1][path_index]
2211
if want_unversioned:
2212
if current_path_info[2] == 'directory':
2213
if self.target._directory_is_tree_reference(
2214
current_path_info[0].decode('utf8')):
2215
current_path_info = current_path_info[:2] + \
2216
('tree-reference',) + current_path_info[3:]
2217
new_executable = bool(
2218
stat.S_ISREG(current_path_info[3].st_mode)
2219
and stat.S_IEXEC & current_path_info[3].st_mode)
2221
(None, utf8_decode(current_path_info[0])[0]),
2225
(None, utf8_decode(current_path_info[1])[0]),
2226
(None, current_path_info[2]),
2227
(None, new_executable))
2228
# dont descend into this unversioned path if it is
2230
if current_path_info[2] in ('directory',
2232
del current_dir_info[1][path_index]
2236
# This dir info has been handled, go to the next
2238
current_dir_info = dir_iterator.next()
2239
except StopIteration:
2240
current_dir_info = None
2242
# We have a dirblock entry for this location, but there
2243
# is no filesystem path for this. This is most likely
2244
# because a directory was removed from the disk.
2245
# We don't have to report the missing directory,
2246
# because that should have already been handled, but we
2247
# need to handle all of the files that are contained
2249
for current_entry in current_block[1]:
2250
# entry referring to file not present on disk.
2251
# advance the entry only, after processing.
2252
result = _process_entry(current_entry, None)
2253
if result is not None:
2254
if result is not uninteresting:
2257
if (block_index < len(state._dirblocks) and
2258
osutils.is_inside(current_root,
2259
state._dirblocks[block_index][0])):
2260
current_block = state._dirblocks[block_index]
2262
current_block = None
2265
if current_block and entry_index < len(current_block[1]):
2266
current_entry = current_block[1][entry_index]
2268
current_entry = None
2269
advance_entry = True
2271
if current_dir_info and path_index < len(current_dir_info[1]):
2272
current_path_info = current_dir_info[1][path_index]
2273
if current_path_info[2] == 'directory':
2274
if self.target._directory_is_tree_reference(
2275
current_path_info[0].decode('utf8')):
2276
current_path_info = current_path_info[:2] + \
2277
('tree-reference',) + current_path_info[3:]
2279
current_path_info = None
2281
path_handled = False
2282
while (current_entry is not None or
2283
current_path_info is not None):
2284
if current_entry is None:
2285
# the check for path_handled when the path is adnvaced
2286
# will yield this path if needed.
2288
elif current_path_info is None:
2289
# no path is fine: the per entry code will handle it.
2290
result = _process_entry(current_entry, current_path_info)
2291
if result is not None:
2292
if result is not uninteresting:
2294
elif (current_entry[0][1] != current_path_info[1]
2295
or current_entry[1][target_index][0] in 'ar'):
2296
# The current path on disk doesn't match the dirblock
2297
# record. Either the dirblock is marked as absent, or
2298
# the file on disk is not present at all in the
2299
# dirblock. Either way, report about the dirblock
2300
# entry, and let other code handle the filesystem one.
2302
# Compare the basename for these files to determine
2304
if current_path_info[1] < current_entry[0][1]:
2305
# extra file on disk: pass for now, but only
2306
# increment the path, not the entry
2307
advance_entry = False
2309
# entry referring to file not present on disk.
2310
# advance the entry only, after processing.
2311
result = _process_entry(current_entry, None)
2312
if result is not None:
2313
if result is not uninteresting:
2315
advance_path = False
2317
result = _process_entry(current_entry, current_path_info)
2318
if result is not None:
2320
if result is not uninteresting:
2322
if advance_entry and current_entry is not None:
2324
if entry_index < len(current_block[1]):
2325
current_entry = current_block[1][entry_index]
2327
current_entry = None
2329
advance_entry = True # reset the advance flaga
2330
if advance_path and current_path_info is not None:
2331
if not path_handled:
2332
# unversioned in all regards
2333
if want_unversioned:
2334
new_executable = bool(
2335
stat.S_ISREG(current_path_info[3].st_mode)
2336
and stat.S_IEXEC & current_path_info[3].st_mode)
2338
(None, utf8_decode(current_path_info[0])[0]),
2342
(None, utf8_decode(current_path_info[1])[0]),
2343
(None, current_path_info[2]),
2344
(None, new_executable))
2345
# dont descend into this unversioned path if it is
2347
if current_path_info[2] in ('directory'):
2348
del current_dir_info[1][path_index]
2350
# dont descend the disk iterator into any tree
2352
if current_path_info[2] == 'tree-reference':
2353
del current_dir_info[1][path_index]
2356
if path_index < len(current_dir_info[1]):
2357
current_path_info = current_dir_info[1][path_index]
2358
if current_path_info[2] == 'directory':
2359
if self.target._directory_is_tree_reference(
2360
current_path_info[0].decode('utf8')):
2361
current_path_info = current_path_info[:2] + \
2362
('tree-reference',) + current_path_info[3:]
2364
current_path_info = None
2365
path_handled = False
2367
advance_path = True # reset the advance flagg.
2368
if current_block is not None:
2370
if (block_index < len(state._dirblocks) and
2371
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2372
current_block = state._dirblocks[block_index]
2374
current_block = None
2375
if current_dir_info is not None:
2377
current_dir_info = dir_iterator.next()
2378
except StopIteration:
2379
current_dir_info = None
2257
2383
def is_compatible(source, target):
2258
2384
# the target must be a dirstate working tree
2259
if not isinstance(target, DirStateWorkingTree):
2385
if not isinstance(target, WorkingTree4):
2261
# the source must be a revtree or dirstate rev tree.
2387
# the source must be a revtreee or dirstate rev tree.
2262
2388
if not isinstance(source,
2263
2389
(revisiontree.RevisionTree, DirStateRevisionTree)):
2265
2391
# the source revid must be in the target dirstate
2266
if not (source._revision_id == _mod_revision.NULL_REVISION or
2392
if not (source._revision_id == NULL_REVISION or
2267
2393
source._revision_id in target.get_parent_ids()):
2268
# TODO: what about ghosts? it may well need to
2394
# TODO: what about ghosts? it may well need to
2269
2395
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
