1765
2608
return ShelfManager(self, self._transport)
1768
class InventoryWorkingTree(WorkingTree,
1769
bzrlib.mutabletree.MutableInventoryTree):
1770
"""Base class for working trees that are inventory-oriented.
1772
The inventory is held in the `Branch` working-inventory, and the
1773
files are in a directory on disk.
1775
It is possible for a `WorkingTree` to have a filename which is
1776
not listed in the Inventory and vice versa.
1779
def __init__(self, basedir='.',
1780
branch=DEPRECATED_PARAMETER,
1782
_control_files=None,
1786
"""Construct a InventoryWorkingTree instance. This is not a public API.
1788
:param branch: A branch to override probing for the branch.
1790
super(InventoryWorkingTree, self).__init__(basedir=basedir,
1791
branch=branch, _control_files=_control_files, _internal=_internal,
1792
_format=_format, _bzrdir=_bzrdir)
1794
self._detect_case_handling()
1796
if _inventory is None:
1797
# This will be acquired on lock_read() or lock_write()
1798
self._inventory_is_modified = False
1799
self._inventory = None
1801
# the caller of __init__ has provided an inventory,
1802
# we assume they know what they are doing - as its only
1803
# the Format factory and creation methods that are
1804
# permitted to do this.
1805
self._set_inventory(_inventory, dirty=False)
1807
def _set_inventory(self, inv, dirty):
1808
"""Set the internal cached inventory.
1810
:param inv: The inventory to set.
1811
:param dirty: A boolean indicating whether the inventory is the same
1812
logical inventory as whats on disk. If True the inventory is not
1813
the same and should be written to disk or data will be lost, if
1814
False then the inventory is the same as that on disk and any
1815
serialisation would be unneeded overhead.
1817
self._inventory = inv
1818
self._inventory_is_modified = dirty
1820
def _detect_case_handling(self):
1821
wt_trans = self.bzrdir.get_workingtree_transport(None)
1823
wt_trans.stat(self._format.case_sensitive_filename)
2611
class WorkingTree2(WorkingTree):
2612
"""This is the Format 2 working tree.
2614
This was the first weave based working tree.
2615
- uses os locks for locking.
2616
- uses the branch last-revision.
2619
def __init__(self, *args, **kwargs):
2620
super(WorkingTree2, self).__init__(*args, **kwargs)
2621
# WorkingTree2 has more of a constraint that self._inventory must
2622
# exist. Because this is an older format, we don't mind the overhead
2623
# caused by the extra computation here.
2625
# Newer WorkingTree's should only have self._inventory set when they
2627
if self._inventory is None:
2628
self.read_working_inventory()
2630
def _get_check_refs(self):
2631
"""Return the references needed to perform a check of this tree."""
2632
return [('trees', self.last_revision())]
2634
def lock_tree_write(self):
2635
"""See WorkingTree.lock_tree_write().
2637
In Format2 WorkingTrees we have a single lock for the branch and tree
2638
so lock_tree_write() degrades to lock_write().
2640
self.branch.lock_write()
2642
return self._control_files.lock_write()
2644
self.branch.unlock()
2648
# do non-implementation specific cleanup
2651
# we share control files:
2652
if self._control_files._lock_count == 3:
2653
# _inventory_is_modified is always False during a read lock.
2654
if self._inventory_is_modified:
2656
self._write_hashcache_if_dirty()
2658
# reverse order of locking.
2660
return self._control_files.unlock()
2662
self.branch.unlock()
2665
class WorkingTree3(WorkingTree):
2666
"""This is the Format 3 working tree.
2668
This differs from the base WorkingTree by:
2669
- having its own file lock
2670
- having its own last-revision property.
2672
This is new in bzr 0.8
2676
def _last_revision(self):
2677
"""See Mutable.last_revision."""
2679
return self._transport.get_bytes('last-revision')
1824
2680
except errors.NoSuchFile:
1825
self.case_sensitive = True
1827
self.case_sensitive = False
1829
self._setup_directory_is_tree_reference()
1831
def _serialize(self, inventory, out_file):
1832
xml5.serializer_v5.write_inventory(self._inventory, out_file,
1835
def _deserialize(selt, in_file):
1836
return xml5.serializer_v5.read_inventory(in_file)
1838
@needs_tree_write_lock
1839
def _write_inventory(self, inv):
1840
"""Write inventory as the current inventory."""
1841
self._set_inventory(inv, dirty=True)
1844
# XXX: This method should be deprecated in favour of taking in a proper
1845
# new Inventory object.
1846
@needs_tree_write_lock
1847
def set_inventory(self, new_inventory_list):
1848
from bzrlib.inventory import (Inventory,
1852
inv = Inventory(self.get_root_id())
1853
for path, file_id, parent, kind in new_inventory_list:
1854
name = os.path.basename(path)
1857
# fixme, there should be a factory function inv,add_??
1858
if kind == 'directory':
1859
inv.add(InventoryDirectory(file_id, name, parent))
1860
elif kind == 'file':
1861
inv.add(InventoryFile(file_id, name, parent))
1862
elif kind == 'symlink':
1863
inv.add(InventoryLink(file_id, name, parent))
1865
raise errors.BzrError("unknown kind %r" % kind)
1866
self._write_inventory(inv)
1868
def _write_basis_inventory(self, xml):
1869
"""Write the basis inventory XML to the basis-inventory file"""
1870
path = self._basis_inventory_name()
1872
self._transport.put_file(path, sio,
1873
mode=self.bzrdir._get_file_mode())
1875
def _reset_data(self):
1876
"""Reset transient data that cannot be revalidated."""
1877
self._inventory_is_modified = False
1878
f = self._transport.get('inventory')
1880
result = self._deserialize(f)
1883
self._set_inventory(result, dirty=False)
1885
def _set_root_id(self, file_id):
1886
"""Set the root id for this tree, in a format specific manner.
1888
:param file_id: The file id to assign to the root. It must not be
1889
present in the current inventory or an error will occur. It must
1890
not be None, but rather a valid file id.
1892
inv = self._inventory
1893
orig_root_id = inv.root.file_id
1894
# TODO: it might be nice to exit early if there was nothing
1895
# to do, saving us from trigger a sync on unlock.
1896
self._inventory_is_modified = True
1897
# we preserve the root inventory entry object, but
1898
# unlinkit from the byid index
1899
del inv._byid[inv.root.file_id]
1900
inv.root.file_id = file_id
1901
# and link it into the index with the new changed id.
1902
inv._byid[inv.root.file_id] = inv.root
1903
# and finally update all children to reference the new id.
1904
# XXX: this should be safe to just look at the root.children
1905
# list, not the WHOLE INVENTORY.
1908
if entry.parent_id == orig_root_id:
1909
entry.parent_id = inv.root.file_id
1911
def all_file_ids(self):
1912
"""See Tree.iter_all_file_ids"""
1913
return set(self.inventory)
1915
@needs_tree_write_lock
1916
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
1917
"""See MutableTree.set_parent_trees."""
1918
parent_ids = [rev for (rev, tree) in parents_list]
1919
for revision_id in parent_ids:
1920
_mod_revision.check_not_reserved_id(revision_id)
1922
self._check_parents_for_ghosts(parent_ids,
1923
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
1925
parent_ids = self._filter_parent_ids_by_ancestry(parent_ids)
1927
if len(parent_ids) == 0:
1928
leftmost_parent_id = _mod_revision.NULL_REVISION
1929
leftmost_parent_tree = None
1931
leftmost_parent_id, leftmost_parent_tree = parents_list[0]
1933
if self._change_last_revision(leftmost_parent_id):
1934
if leftmost_parent_tree is None:
1935
# If we don't have a tree, fall back to reading the
1936
# parent tree from the repository.
1937
self._cache_basis_inventory(leftmost_parent_id)
1939
inv = leftmost_parent_tree.inventory
1940
xml = self._create_basis_xml_from_inventory(
1941
leftmost_parent_id, inv)
1942
self._write_basis_inventory(xml)
1943
self._set_merges_from_parent_ids(parent_ids)
1945
def _cache_basis_inventory(self, new_revision):
1946
"""Cache new_revision as the basis inventory."""
1947
# TODO: this should allow the ready-to-use inventory to be passed in,
1948
# as commit already has that ready-to-use [while the format is the
1951
# this double handles the inventory - unpack and repack -
1952
# but is easier to understand. We can/should put a conditional
1953
# in here based on whether the inventory is in the latest format
1954
# - perhaps we should repack all inventories on a repository
1956
# the fast path is to copy the raw xml from the repository. If the
1957
# xml contains 'revision_id="', then we assume the right
1958
# revision_id is set. We must check for this full string, because a
1959
# root node id can legitimately look like 'revision_id' but cannot
1961
xml = self.branch.repository._get_inventory_xml(new_revision)
1962
firstline = xml.split('\n', 1)[0]
1963
if (not 'revision_id="' in firstline or
1964
'format="7"' not in firstline):
1965
inv = self.branch.repository._serializer.read_inventory_from_string(
1967
xml = self._create_basis_xml_from_inventory(new_revision, inv)
1968
self._write_basis_inventory(xml)
1969
except (errors.NoSuchRevision, errors.RevisionNotPresent):
1972
def _basis_inventory_name(self):
1973
return 'basis-inventory-cache'
1975
def _create_basis_xml_from_inventory(self, revision_id, inventory):
1976
"""Create the text that will be saved in basis-inventory"""
1977
inventory.revision_id = revision_id
1978
return xml7.serializer_v7.write_inventory_to_string(inventory)
2681
return _mod_revision.NULL_REVISION
2683
def _change_last_revision(self, revision_id):
2684
"""See WorkingTree._change_last_revision."""
2685
if revision_id is None or revision_id == _mod_revision.NULL_REVISION:
2687
self._transport.delete('last-revision')
2688
except errors.NoSuchFile:
2692
self._transport.put_bytes('last-revision', revision_id,
2693
mode=self.bzrdir._get_file_mode())
2696
def _get_check_refs(self):
2697
"""Return the references needed to perform a check of this tree."""
2698
return [('trees', self.last_revision())]
1980
2700
@needs_tree_write_lock
1981
2701
def set_conflicts(self, conflicts):
2001
2721
raise errors.ConflictFormatError()
2002
2722
except StopIteration:
2003
2723
raise errors.ConflictFormatError()
2004
reader = _mod_rio.RioReader(confile)
2005
return _mod_conflicts.ConflictList.from_stanzas(reader)
2724
return _mod_conflicts.ConflictList.from_stanzas(RioReader(confile))
2007
2726
confile.close()
2009
def read_basis_inventory(self):
2010
"""Read the cached basis inventory."""
2011
path = self._basis_inventory_name()
2012
return self._transport.get_bytes(path)
2015
def read_working_inventory(self):
2016
"""Read the working inventory.
2018
:raises errors.InventoryModified: read_working_inventory will fail
2019
when the current in memory inventory has been modified.
2021
# conceptually this should be an implementation detail of the tree.
2022
# XXX: Deprecate this.
2023
# ElementTree does its own conversion from UTF-8, so open in
2025
if self._inventory_is_modified:
2026
raise errors.InventoryModified(self)
2027
f = self._transport.get('inventory')
2029
result = self._deserialize(f)
2032
self._set_inventory(result, dirty=False)
2036
def get_root_id(self):
2037
"""Return the id of this trees root"""
2038
return self._inventory.root.file_id
2040
def has_id(self, file_id):
2041
# files that have been deleted are excluded
2042
inv = self.inventory
2043
if not inv.has_id(file_id):
2045
path = inv.id2path(file_id)
2046
return osutils.lexists(self.abspath(path))
2048
def has_or_had_id(self, file_id):
2049
if file_id == self.inventory.root.file_id:
2051
return self.inventory.has_id(file_id)
2053
@symbol_versioning.deprecated_method(symbol_versioning.deprecated_in((2, 4, 0)))
2055
"""Iterate through file_ids for this tree.
2057
file_ids are in a WorkingTree if they are in the working inventory
2058
and the working file exists.
2060
inv = self._inventory
2061
for path, ie in inv.iter_entries():
2062
if osutils.lexists(self.abspath(path)):
2065
@needs_tree_write_lock
2066
def set_last_revision(self, new_revision):
2067
"""Change the last revision in the working tree."""
2068
if self._change_last_revision(new_revision):
2069
self._cache_basis_inventory(new_revision)
2071
def _get_check_refs(self):
2072
"""Return the references needed to perform a check of this tree.
2074
The default implementation returns no refs, and is only suitable for
2075
trees that have no local caching and can commit on ghosts at any time.
2077
:seealso: bzrlib.check for details about check_refs.
2082
def _check(self, references):
2083
"""Check the tree for consistency.
2085
:param references: A dict with keys matching the items returned by
2086
self._get_check_refs(), and values from looking those keys up in
2089
tree_basis = self.basis_tree()
2090
tree_basis.lock_read()
2092
repo_basis = references[('trees', self.last_revision())]
2093
if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2094
raise errors.BzrCheckError(
2095
"Mismatched basis inventory content.")
2101
def check_state(self):
2102
"""Check that the working state is/isn't valid."""
2103
check_refs = self._get_check_refs()
2105
for ref in check_refs:
2108
refs[ref] = self.branch.repository.revision_tree(value)
2111
@needs_tree_write_lock
2112
def reset_state(self, revision_ids=None):
2113
"""Reset the state of the working tree.
2115
This does a hard-reset to a last-known-good state. This is a way to
2116
fix if something got corrupted (like the .bzr/checkout/dirstate file)
2118
if revision_ids is None:
2119
revision_ids = self.get_parent_ids()
2120
if not revision_ids:
2121
rt = self.branch.repository.revision_tree(
2122
_mod_revision.NULL_REVISION)
2124
rt = self.branch.repository.revision_tree(revision_ids[0])
2125
self._write_inventory(rt.inventory)
2126
self.set_parent_ids(revision_ids)
2129
"""Write the in memory inventory to disk."""
2130
# TODO: Maybe this should only write on dirty ?
2131
if self._control_files._lock_mode != 'w':
2132
raise errors.NotWriteLocked(self)
2134
self._serialize(self._inventory, sio)
2136
self._transport.put_file('inventory', sio,
2137
mode=self.bzrdir._get_file_mode())
2138
self._inventory_is_modified = False
2140
def get_file_mtime(self, file_id, path=None):
2141
"""See Tree.get_file_mtime."""
2143
path = self.inventory.id2path(file_id)
2145
return os.lstat(self.abspath(path)).st_mtime
2147
if e.errno == errno.ENOENT:
2148
raise errors.FileTimestampUnavailable(path)
2151
def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
2152
file_id = self.path2id(path)
2154
# For unversioned files on win32, we just assume they are not
2157
return self._inventory[file_id].executable
2159
def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
2160
mode = stat_result.st_mode
2161
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
2163
if not supports_executable():
2164
def is_executable(self, file_id, path=None):
2165
return self._inventory[file_id].executable
2167
_is_executable_from_path_and_stat = \
2168
_is_executable_from_path_and_stat_from_basis
2170
def is_executable(self, file_id, path=None):
2172
path = self.id2path(file_id)
2173
mode = os.lstat(self.abspath(path)).st_mode
2174
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
2176
_is_executable_from_path_and_stat = \
2177
_is_executable_from_path_and_stat_from_stat
2179
@needs_tree_write_lock
2180
def _add(self, files, ids, kinds):
2181
"""See MutableTree._add."""
2182
# TODO: Re-adding a file that is removed in the working copy
2183
# should probably put it back with the previous ID.
2184
# the read and write working inventory should not occur in this
2185
# function - they should be part of lock_write and unlock.
2186
inv = self.inventory
2187
for f, file_id, kind in zip(files, ids, kinds):
2189
inv.add_path(f, kind=kind)
2191
inv.add_path(f, kind=kind, file_id=file_id)
2192
self._inventory_is_modified = True
2194
def revision_tree(self, revision_id):
2195
"""See WorkingTree.revision_id."""
2196
if revision_id == self.last_revision():
2198
xml = self.read_basis_inventory()
2199
except errors.NoSuchFile:
2203
inv = xml7.serializer_v7.read_inventory_from_string(xml)
2204
# dont use the repository revision_tree api because we want
2205
# to supply the inventory.
2206
if inv.revision_id == revision_id:
2207
return revisiontree.InventoryRevisionTree(
2208
self.branch.repository, inv, revision_id)
2209
except errors.BadInventoryFormat:
2211
# raise if there was no inventory, or if we read the wrong inventory.
2212
raise errors.NoSuchRevisionInTree(self, revision_id)
2215
def annotate_iter(self, file_id, default_revision=CURRENT_REVISION):
2216
"""See Tree.annotate_iter
2218
This implementation will use the basis tree implementation if possible.
2219
Lines not in the basis are attributed to CURRENT_REVISION
2221
If there are pending merges, lines added by those merges will be
2222
incorrectly attributed to CURRENT_REVISION (but after committing, the
2223
attribution will be correct).
2225
maybe_file_parent_keys = []
2226
for parent_id in self.get_parent_ids():
2228
parent_tree = self.revision_tree(parent_id)
2229
except errors.NoSuchRevisionInTree:
2230
parent_tree = self.branch.repository.revision_tree(parent_id)
2231
parent_tree.lock_read()
2233
if not parent_tree.has_id(file_id):
2235
ie = parent_tree.inventory[file_id]
2236
if ie.kind != 'file':
2237
# Note: this is slightly unnecessary, because symlinks and
2238
# directories have a "text" which is the empty text, and we
2239
# know that won't mess up annotations. But it seems cleaner
2241
parent_text_key = (file_id, ie.revision)
2242
if parent_text_key not in maybe_file_parent_keys:
2243
maybe_file_parent_keys.append(parent_text_key)
2245
parent_tree.unlock()
2246
graph = _mod_graph.Graph(self.branch.repository.texts)
2247
heads = graph.heads(maybe_file_parent_keys)
2248
file_parent_keys = []
2249
for key in maybe_file_parent_keys:
2251
file_parent_keys.append(key)
2253
# Now we have the parents of this content
2254
annotator = self.branch.repository.texts.get_annotator()
2255
text = self.get_file_text(file_id)
2256
this_key =(file_id, default_revision)
2257
annotator.add_special_text(this_key, file_parent_keys, text)
2258
annotations = [(key[-1], line)
2259
for key, line in annotator.annotate_flat(this_key)]
2263
def merge_modified(self):
2264
"""Return a dictionary of files modified by a merge.
2266
The list is initialized by WorkingTree.set_merge_modified, which is
2267
typically called after we make some automatic updates to the tree
2270
This returns a map of file_id->sha1, containing only files which are
2271
still in the working inventory and have that text hash.
2274
hashfile = self._transport.get('merge-hashes')
2275
except errors.NoSuchFile:
2280
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
2281
raise errors.MergeModifiedFormatError()
2282
except StopIteration:
2283
raise errors.MergeModifiedFormatError()
2284
for s in _mod_rio.RioReader(hashfile):
2285
# RioReader reads in Unicode, so convert file_ids back to utf8
2286
file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
2287
if not self.inventory.has_id(file_id):
2289
text_hash = s.get("hash")
2290
if text_hash == self.get_file_sha1(file_id):
2291
merge_hashes[file_id] = text_hash
2297
def subsume(self, other_tree):
2298
def add_children(inventory, entry):
2299
for child_entry in entry.children.values():
2300
inventory._byid[child_entry.file_id] = child_entry
2301
if child_entry.kind == 'directory':
2302
add_children(inventory, child_entry)
2303
if other_tree.get_root_id() == self.get_root_id():
2304
raise errors.BadSubsumeSource(self, other_tree,
2305
'Trees have the same root')
2307
other_tree_path = self.relpath(other_tree.basedir)
2308
except errors.PathNotChild:
2309
raise errors.BadSubsumeSource(self, other_tree,
2310
'Tree is not contained by the other')
2311
new_root_parent = self.path2id(osutils.dirname(other_tree_path))
2312
if new_root_parent is None:
2313
raise errors.BadSubsumeSource(self, other_tree,
2314
'Parent directory is not versioned.')
2315
# We need to ensure that the result of a fetch will have a
2316
# versionedfile for the other_tree root, and only fetching into
2317
# RepositoryKnit2 guarantees that.
2318
if not self.branch.repository.supports_rich_root():
2319
raise errors.SubsumeTargetNeedsUpgrade(other_tree)
2320
other_tree.lock_tree_write()
2322
new_parents = other_tree.get_parent_ids()
2323
other_root = other_tree.inventory.root
2324
other_root.parent_id = new_root_parent
2325
other_root.name = osutils.basename(other_tree_path)
2326
self.inventory.add(other_root)
2327
add_children(self.inventory, other_root)
2328
self._write_inventory(self.inventory)
2329
# normally we don't want to fetch whole repositories, but i think
2330
# here we really do want to consolidate the whole thing.
2331
for parent_id in other_tree.get_parent_ids():
2332
self.branch.fetch(other_tree.branch, parent_id)
2333
self.add_parent_tree_id(parent_id)
2336
other_tree.bzrdir.retire_bzrdir()
2338
@needs_tree_write_lock
2339
def extract(self, file_id, format=None):
2340
"""Extract a subtree from this tree.
2342
A new branch will be created, relative to the path for this tree.
2346
segments = osutils.splitpath(path)
2347
transport = self.branch.bzrdir.root_transport
2348
for name in segments:
2349
transport = transport.clone(name)
2350
transport.ensure_base()
2353
sub_path = self.id2path(file_id)
2354
branch_transport = mkdirs(sub_path)
2356
format = self.bzrdir.cloning_metadir()
2357
branch_transport.ensure_base()
2358
branch_bzrdir = format.initialize_on_transport(branch_transport)
2360
repo = branch_bzrdir.find_repository()
2361
except errors.NoRepositoryPresent:
2362
repo = branch_bzrdir.create_repository()
2363
if not repo.supports_rich_root():
2364
raise errors.RootNotRich()
2365
new_branch = branch_bzrdir.create_branch()
2366
new_branch.pull(self.branch)
2367
for parent_id in self.get_parent_ids():
2368
new_branch.fetch(self.branch, parent_id)
2369
tree_transport = self.bzrdir.root_transport.clone(sub_path)
2370
if tree_transport.base != branch_transport.base:
2371
tree_bzrdir = format.initialize_on_transport(tree_transport)
2372
branch.BranchReferenceFormat().initialize(tree_bzrdir,
2373
target_branch=new_branch)
2375
tree_bzrdir = branch_bzrdir
2376
wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
2377
wt.set_parent_ids(self.get_parent_ids())
2378
my_inv = self.inventory
2379
child_inv = inventory.Inventory(root_id=None)
2380
new_root = my_inv[file_id]
2381
my_inv.remove_recursive_id(file_id)
2382
new_root.parent_id = None
2383
child_inv.add(new_root)
2384
self._write_inventory(my_inv)
2385
wt._write_inventory(child_inv)
2388
def list_files(self, include_root=False, from_dir=None, recursive=True):
2389
"""List all files as (path, class, kind, id, entry).
2391
Lists, but does not descend into unversioned directories.
2392
This does not include files that have been deleted in this
2393
tree. Skips the control directory.
2395
:param include_root: if True, return an entry for the root
2396
:param from_dir: start from this directory or None for the root
2397
:param recursive: whether to recurse into subdirectories or not
2399
# list_files is an iterator, so @needs_read_lock doesn't work properly
2400
# with it. So callers should be careful to always read_lock the tree.
2401
if not self.is_locked():
2402
raise errors.ObjectNotLocked(self)
2404
inv = self.inventory
2405
if from_dir is None and include_root is True:
2406
yield ('', 'V', 'directory', inv.root.file_id, inv.root)
2407
# Convert these into local objects to save lookup times
2408
pathjoin = osutils.pathjoin
2409
file_kind = self._kind
2411
# transport.base ends in a slash, we want the piece
2412
# between the last two slashes
2413
transport_base_dir = self.bzrdir.transport.base.rsplit('/', 2)[1]
2415
fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
2417
# directory file_id, relative path, absolute path, reverse sorted children
2418
if from_dir is not None:
2419
from_dir_id = inv.path2id(from_dir)
2420
if from_dir_id is None:
2421
# Directory not versioned
2423
from_dir_abspath = pathjoin(self.basedir, from_dir)
2425
from_dir_id = inv.root.file_id
2426
from_dir_abspath = self.basedir
2427
children = os.listdir(from_dir_abspath)
2429
# jam 20060527 The kernel sized tree seems equivalent whether we
2430
# use a deque and popleft to keep them sorted, or if we use a plain
2431
# list and just reverse() them.
2432
children = collections.deque(children)
2433
stack = [(from_dir_id, u'', from_dir_abspath, children)]
2435
from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
2438
f = children.popleft()
2439
## TODO: If we find a subdirectory with its own .bzr
2440
## directory, then that is a separate tree and we
2441
## should exclude it.
2443
# the bzrdir for this tree
2444
if transport_base_dir == f:
2447
# we know that from_dir_relpath and from_dir_abspath never end in a slash
2448
# and 'f' doesn't begin with one, we can do a string op, rather
2449
# than the checks of pathjoin(), all relative paths will have an extra slash
2451
fp = from_dir_relpath + '/' + f
2454
fap = from_dir_abspath + '/' + f
2456
dir_ie = inv[from_dir_id]
2457
if dir_ie.kind == 'directory':
2458
f_ie = dir_ie.children.get(f)
2463
elif self.is_ignored(fp[1:]):
2466
# we may not have found this file, because of a unicode
2467
# issue, or because the directory was actually a symlink.
2468
f_norm, can_access = osutils.normalized_filename(f)
2469
if f == f_norm or not can_access:
2470
# No change, so treat this file normally
2473
# this file can be accessed by a normalized path
2474
# check again if it is versioned
2475
# these lines are repeated here for performance
2477
fp = from_dir_relpath + '/' + f
2478
fap = from_dir_abspath + '/' + f
2479
f_ie = inv.get_child(from_dir_id, f)
2482
elif self.is_ignored(fp[1:]):
2489
# make a last minute entry
2491
yield fp[1:], c, fk, f_ie.file_id, f_ie
2494
yield fp[1:], c, fk, None, fk_entries[fk]()
2496
yield fp[1:], c, fk, None, TreeEntry()
2499
if fk != 'directory':
2502
# But do this child first if recursing down
2504
new_children = os.listdir(fap)
2506
new_children = collections.deque(new_children)
2507
stack.append((f_ie.file_id, fp, fap, new_children))
2508
# Break out of inner loop,
2509
# so that we start outer loop with child
2512
# if we finished all children, pop it off the stack
2515
@needs_tree_write_lock
2516
def move(self, from_paths, to_dir=None, after=False):
2519
to_dir must exist in the inventory.
2521
If to_dir exists and is a directory, the files are moved into
2522
it, keeping their old names.
2524
Note that to_dir is only the last component of the new name;
2525
this doesn't change the directory.
2527
For each entry in from_paths the move mode will be determined
2530
The first mode moves the file in the filesystem and updates the
2531
inventory. The second mode only updates the inventory without
2532
touching the file on the filesystem.
2534
move uses the second mode if 'after == True' and the target is
2535
either not versioned or newly added, and present in the working tree.
2537
move uses the second mode if 'after == False' and the source is
2538
versioned but no longer in the working tree, and the target is not
2539
versioned but present in the working tree.
2541
move uses the first mode if 'after == False' and the source is
2542
versioned and present in the working tree, and the target is not
2543
versioned and not present in the working tree.
2545
Everything else results in an error.
2547
This returns a list of (from_path, to_path) pairs for each
2548
entry that is moved.
2553
# check for deprecated use of signature
2555
raise TypeError('You must supply a target directory')
2556
# check destination directory
2557
if isinstance(from_paths, basestring):
2559
inv = self.inventory
2560
to_abs = self.abspath(to_dir)
2561
if not isdir(to_abs):
2562
raise errors.BzrMoveFailedError('',to_dir,
2563
errors.NotADirectory(to_abs))
2564
if not self.has_filename(to_dir):
2565
raise errors.BzrMoveFailedError('',to_dir,
2566
errors.NotInWorkingDirectory(to_dir))
2567
to_dir_id = inv.path2id(to_dir)
2568
if to_dir_id is None:
2569
raise errors.BzrMoveFailedError('',to_dir,
2570
errors.NotVersionedError(path=to_dir))
2572
to_dir_ie = inv[to_dir_id]
2573
if to_dir_ie.kind != 'directory':
2574
raise errors.BzrMoveFailedError('',to_dir,
2575
errors.NotADirectory(to_abs))
2577
# create rename entries and tuples
2578
for from_rel in from_paths:
2579
from_tail = splitpath(from_rel)[-1]
2580
from_id = inv.path2id(from_rel)
2582
raise errors.BzrMoveFailedError(from_rel,to_dir,
2583
errors.NotVersionedError(path=from_rel))
2585
from_entry = inv[from_id]
2586
from_parent_id = from_entry.parent_id
2587
to_rel = pathjoin(to_dir, from_tail)
2588
rename_entry = InventoryWorkingTree._RenameEntry(
2591
from_tail=from_tail,
2592
from_parent_id=from_parent_id,
2593
to_rel=to_rel, to_tail=from_tail,
2594
to_parent_id=to_dir_id)
2595
rename_entries.append(rename_entry)
2596
rename_tuples.append((from_rel, to_rel))
2598
# determine which move mode to use. checks also for movability
2599
rename_entries = self._determine_mv_mode(rename_entries, after)
2601
original_modified = self._inventory_is_modified
2604
self._inventory_is_modified = True
2605
self._move(rename_entries)
2607
# restore the inventory on error
2608
self._inventory_is_modified = original_modified
2610
self._write_inventory(inv)
2611
return rename_tuples
2613
@needs_tree_write_lock
2614
def rename_one(self, from_rel, to_rel, after=False):
2617
This can change the directory or the filename or both.
2619
rename_one has several 'modes' to work. First, it can rename a physical
2620
file and change the file_id. That is the normal mode. Second, it can
2621
only change the file_id without touching any physical file.
2623
rename_one uses the second mode if 'after == True' and 'to_rel' is not
2624
versioned but present in the working tree.
2626
rename_one uses the second mode if 'after == False' and 'from_rel' is
2627
versioned but no longer in the working tree, and 'to_rel' is not
2628
versioned but present in the working tree.
2630
rename_one uses the first mode if 'after == False' and 'from_rel' is
2631
versioned and present in the working tree, and 'to_rel' is not
2632
versioned and not present in the working tree.
2634
Everything else results in an error.
2636
inv = self.inventory
2639
# create rename entries and tuples
2640
from_tail = splitpath(from_rel)[-1]
2641
from_id = inv.path2id(from_rel)
2643
# if file is missing in the inventory maybe it's in the basis_tree
2644
basis_tree = self.branch.basis_tree()
2645
from_id = basis_tree.path2id(from_rel)
2647
raise errors.BzrRenameFailedError(from_rel,to_rel,
2648
errors.NotVersionedError(path=from_rel))
2649
# put entry back in the inventory so we can rename it
2650
from_entry = basis_tree.inventory[from_id].copy()
2653
from_entry = inv[from_id]
2654
from_parent_id = from_entry.parent_id
2655
to_dir, to_tail = os.path.split(to_rel)
2656
to_dir_id = inv.path2id(to_dir)
2657
rename_entry = InventoryWorkingTree._RenameEntry(from_rel=from_rel,
2659
from_tail=from_tail,
2660
from_parent_id=from_parent_id,
2661
to_rel=to_rel, to_tail=to_tail,
2662
to_parent_id=to_dir_id)
2663
rename_entries.append(rename_entry)
2665
# determine which move mode to use. checks also for movability
2666
rename_entries = self._determine_mv_mode(rename_entries, after)
2668
# check if the target changed directory and if the target directory is
2670
if to_dir_id is None:
2671
raise errors.BzrMoveFailedError(from_rel,to_rel,
2672
errors.NotVersionedError(path=to_dir))
2674
# all checks done. now we can continue with our actual work
2675
mutter('rename_one:\n'
2680
' to_dir_id {%s}\n',
2681
from_id, from_rel, to_rel, to_dir, to_dir_id)
2683
self._move(rename_entries)
2684
self._write_inventory(inv)
2686
class _RenameEntry(object):
2687
def __init__(self, from_rel, from_id, from_tail, from_parent_id,
2688
to_rel, to_tail, to_parent_id, only_change_inv=False,
2690
self.from_rel = from_rel
2691
self.from_id = from_id
2692
self.from_tail = from_tail
2693
self.from_parent_id = from_parent_id
2694
self.to_rel = to_rel
2695
self.to_tail = to_tail
2696
self.to_parent_id = to_parent_id
2697
self.change_id = change_id
2698
self.only_change_inv = only_change_inv
2700
def _determine_mv_mode(self, rename_entries, after=False):
2701
"""Determines for each from-to pair if both inventory and working tree
2702
or only the inventory has to be changed.
2704
Also does basic plausability tests.
2706
inv = self.inventory
2708
for rename_entry in rename_entries:
2709
# store to local variables for easier reference
2710
from_rel = rename_entry.from_rel
2711
from_id = rename_entry.from_id
2712
to_rel = rename_entry.to_rel
2713
to_id = inv.path2id(to_rel)
2714
only_change_inv = False
2717
# check the inventory for source and destination
2719
raise errors.BzrMoveFailedError(from_rel,to_rel,
2720
errors.NotVersionedError(path=from_rel))
2721
if to_id is not None:
2723
# allow it with --after but only if dest is newly added
2725
basis = self.basis_tree()
2728
if not basis.has_id(to_id):
2729
rename_entry.change_id = True
2734
raise errors.BzrMoveFailedError(from_rel,to_rel,
2735
errors.AlreadyVersionedError(path=to_rel))
2737
# try to determine the mode for rename (only change inv or change
2738
# inv and file system)
2740
if not self.has_filename(to_rel):
2741
raise errors.BzrMoveFailedError(from_id,to_rel,
2742
errors.NoSuchFile(path=to_rel,
2743
extra="New file has not been created yet"))
2744
only_change_inv = True
2745
elif not self.has_filename(from_rel) and self.has_filename(to_rel):
2746
only_change_inv = True
2747
elif self.has_filename(from_rel) and not self.has_filename(to_rel):
2748
only_change_inv = False
2749
elif (not self.case_sensitive
2750
and from_rel.lower() == to_rel.lower()
2751
and self.has_filename(from_rel)):
2752
only_change_inv = False
2754
# something is wrong, so lets determine what exactly
2755
if not self.has_filename(from_rel) and \
2756
not self.has_filename(to_rel):
2757
raise errors.BzrRenameFailedError(from_rel,to_rel,
2758
errors.PathsDoNotExist(paths=(str(from_rel),
2761
raise errors.RenameFailedFilesExist(from_rel, to_rel)
2762
rename_entry.only_change_inv = only_change_inv
2763
return rename_entries
2765
def _move(self, rename_entries):
2766
"""Moves a list of files.
2768
Depending on the value of the flag 'only_change_inv', the
2769
file will be moved on the file system or not.
2771
inv = self.inventory
2774
for entry in rename_entries:
2776
self._move_entry(entry)
2778
self._rollback_move(moved)
2782
def _rollback_move(self, moved):
2783
"""Try to rollback a previous move in case of an filesystem error."""
2784
inv = self.inventory
2787
self._move_entry(WorkingTree._RenameEntry(
2788
entry.to_rel, entry.from_id,
2789
entry.to_tail, entry.to_parent_id, entry.from_rel,
2790
entry.from_tail, entry.from_parent_id,
2791
entry.only_change_inv))
2792
except errors.BzrMoveFailedError, e:
2793
raise errors.BzrMoveFailedError( '', '', "Rollback failed."
2794
" The working tree is in an inconsistent state."
2795
" Please consider doing a 'bzr revert'."
2796
" Error message is: %s" % e)
2798
def _move_entry(self, entry):
2799
inv = self.inventory
2800
from_rel_abs = self.abspath(entry.from_rel)
2801
to_rel_abs = self.abspath(entry.to_rel)
2802
if from_rel_abs == to_rel_abs:
2803
raise errors.BzrMoveFailedError(entry.from_rel, entry.to_rel,
2804
"Source and target are identical.")
2806
if not entry.only_change_inv:
2808
osutils.rename(from_rel_abs, to_rel_abs)
2810
raise errors.BzrMoveFailedError(entry.from_rel,
2813
to_id = inv.path2id(entry.to_rel)
2814
inv.remove_recursive_id(to_id)
2815
inv.rename(entry.from_id, entry.to_parent_id, entry.to_tail)
2817
@needs_tree_write_lock
2818
def unversion(self, file_ids):
2819
"""Remove the file ids in file_ids from the current versioned set.
2821
When a file_id is unversioned, all of its children are automatically
2824
:param file_ids: The file ids to stop versioning.
2825
:raises: NoSuchId if any fileid is not currently versioned.
2827
for file_id in file_ids:
2828
if not self._inventory.has_id(file_id):
2829
raise errors.NoSuchId(self, file_id)
2830
for file_id in file_ids:
2831
if self._inventory.has_id(file_id):
2832
self._inventory.remove_recursive_id(file_id)
2834
# in the future this should just set a dirty bit to wait for the
2835
# final unlock. However, until all methods of workingtree start
2836
# with the current in -memory inventory rather than triggering
2837
# a read, it is more complex - we need to teach read_inventory
2838
# to know when to read, and when to not read first... and possibly
2839
# to save first when the in memory one may be corrupted.
2840
# so for now, we just only write it if it is indeed dirty.
2842
self._write_inventory(self._inventory)
2844
def stored_kind(self, file_id):
2845
"""See Tree.stored_kind"""
2846
return self.inventory[file_id].kind
2849
"""Yield all unversioned files in this WorkingTree.
2851
If there are any unversioned directories then only the directory is
2852
returned, not all its children. But if there are unversioned files
2853
under a versioned subdirectory, they are returned.
2855
Currently returned depth-first, sorted by name within directories.
2856
This is the same order used by 'osutils.walkdirs'.
2858
## TODO: Work from given directory downwards
2859
for path, dir_entry in self.inventory.directories():
2860
# mutter("search for unknowns in %r", path)
2861
dirabs = self.abspath(path)
2862
if not isdir(dirabs):
2863
# e.g. directory deleted
2867
for subf in os.listdir(dirabs):
2868
if self.bzrdir.is_control_filename(subf):
2870
if subf not in dir_entry.children:
2873
can_access) = osutils.normalized_filename(subf)
2874
except UnicodeDecodeError:
2875
path_os_enc = path.encode(osutils._fs_enc)
2876
relpath = path_os_enc + '/' + subf
2877
raise errors.BadFilenameEncoding(relpath,
2879
if subf_norm != subf and can_access:
2880
if subf_norm not in dir_entry.children:
2881
fl.append(subf_norm)
2887
subp = pathjoin(path, subf)
2890
def _walkdirs(self, prefix=""):
2891
"""Walk the directories of this tree.
2893
:param prefix: is used as the directrory to start with.
2894
:returns: a generator which yields items in the form::
2896
((curren_directory_path, fileid),
2897
[(file1_path, file1_name, file1_kind, None, file1_id,
2900
_directory = 'directory'
2901
# get the root in the inventory
2902
inv = self.inventory
2903
top_id = inv.path2id(prefix)
2907
pending = [(prefix, '', _directory, None, top_id, None)]
2910
currentdir = pending.pop()
2911
# 0 - relpath, 1- basename, 2- kind, 3- stat, 4-id, 5-kind
2912
top_id = currentdir[4]
2914
relroot = currentdir[0] + '/'
2917
# FIXME: stash the node in pending
2919
if entry.kind == 'directory':
2920
for name, child in entry.sorted_children():
2921
dirblock.append((relroot + name, name, child.kind, None,
2922
child.file_id, child.kind
2924
yield (currentdir[0], entry.file_id), dirblock
2925
# push the user specified dirs from dirblock
2926
for dir in reversed(dirblock):
2927
if dir[2] == _directory:
2931
class WorkingTreeFormatRegistry(controldir.ControlComponentFormatRegistry):
2932
"""Registry for working tree formats."""
2934
def __init__(self, other_registry=None):
2935
super(WorkingTreeFormatRegistry, self).__init__(other_registry)
2936
self._default_format = None
2937
self._default_format_key = None
2939
def get_default(self):
2940
"""Return the current default format."""
2941
if (self._default_format_key is not None and
2942
self._default_format is None):
2943
self._default_format = self.get(self._default_format_key)
2944
return self._default_format
2946
def set_default(self, format):
2947
"""Set the default format."""
2948
self._default_format = format
2949
self._default_format_key = None
2951
def set_default_key(self, format_string):
2952
"""Set the default format by its format string."""
2953
self._default_format_key = format_string
2954
self._default_format = None
2957
format_registry = WorkingTreeFormatRegistry()
2960
class WorkingTreeFormat(controldir.ControlComponentFormat):
2729
# do non-implementation specific cleanup
2731
if self._control_files._lock_count == 1:
2732
# _inventory_is_modified is always False during a read lock.
2733
if self._inventory_is_modified:
2735
self._write_hashcache_if_dirty()
2736
# reverse order of locking.
2738
return self._control_files.unlock()
2740
self.branch.unlock()
2743
def get_conflicted_stem(path):
2744
for suffix in _mod_conflicts.CONFLICT_SUFFIXES:
2745
if path.endswith(suffix):
2746
return path[:-len(suffix)]
2749
class WorkingTreeFormat(object):
2961
2750
"""An encapsulation of the initialization and open routines for a format.
2963
2752
Formats provide three things:
3066
@symbol_versioning.deprecated_method(
3067
symbol_versioning.deprecated_in((2, 4, 0)))
3068
2827
def register_format(klass, format):
3069
format_registry.register(format)
3072
@symbol_versioning.deprecated_method(
3073
symbol_versioning.deprecated_in((2, 4, 0)))
3074
def register_extra_format(klass, format):
3075
format_registry.register_extra(format)
3078
@symbol_versioning.deprecated_method(
3079
symbol_versioning.deprecated_in((2, 4, 0)))
3080
def unregister_extra_format(klass, format):
3081
format_registry.unregister_extra(format)
3084
@symbol_versioning.deprecated_method(
3085
symbol_versioning.deprecated_in((2, 4, 0)))
3086
def get_formats(klass):
3087
return format_registry._get_all()
3090
@symbol_versioning.deprecated_method(
3091
symbol_versioning.deprecated_in((2, 4, 0)))
2828
klass._formats[format.get_format_string()] = format
3092
2831
def set_default_format(klass, format):
3093
format_registry.set_default(format)
2832
klass._default_format = format
3096
@symbol_versioning.deprecated_method(
3097
symbol_versioning.deprecated_in((2, 4, 0)))
3098
2835
def unregister_format(klass, format):
3099
format_registry.remove(format)
3101
def get_controldir_for_branch(self):
3102
"""Get the control directory format for creating branches.
3104
This is to support testing of working tree formats that can not exist
3105
in the same control directory as a branch.
3107
return self._matchingbzrdir
3110
format_registry.register_lazy("Bazaar Working Tree Format 4 (bzr 0.15)\n",
3111
"bzrlib.workingtree_4", "WorkingTreeFormat4")
3112
format_registry.register_lazy("Bazaar Working Tree Format 5 (bzr 1.11)\n",
3113
"bzrlib.workingtree_4", "WorkingTreeFormat5")
3114
format_registry.register_lazy("Bazaar Working Tree Format 6 (bzr 1.14)\n",
3115
"bzrlib.workingtree_4", "WorkingTreeFormat6")
3116
format_registry.register_lazy("Bazaar-NG Working Tree format 3",
3117
"bzrlib.workingtree_3", "WorkingTreeFormat3")
3118
format_registry.set_default_key("Bazaar Working Tree Format 6 (bzr 1.14)\n")
2836
del klass._formats[format.get_format_string()]
2839
class WorkingTreeFormat2(WorkingTreeFormat):
2840
"""The second working tree format.
2842
This format modified the hash cache from the format 1 hash cache.
2845
upgrade_recommended = True
2847
def get_format_description(self):
2848
"""See WorkingTreeFormat.get_format_description()."""
2849
return "Working tree format 2"
2851
def _stub_initialize_on_transport(self, transport, file_mode):
2852
"""Workaround: create control files for a remote working tree.
2854
This ensures that it can later be updated and dealt with locally,
2855
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2856
no working tree. (See bug #43064).
2859
inv = inventory.Inventory()
2860
xml5.serializer_v5.write_inventory(inv, sio, working=True)
2862
transport.put_file('inventory', sio, file_mode)
2863
transport.put_bytes('pending-merges', '', file_mode)
2865
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
2866
accelerator_tree=None, hardlink=False):
2867
"""See WorkingTreeFormat.initialize()."""
2868
if not isinstance(a_bzrdir.transport, LocalTransport):
2869
raise errors.NotLocalUrl(a_bzrdir.transport.base)
2870
if from_branch is not None:
2871
branch = from_branch
2873
branch = a_bzrdir.open_branch()
2874
if revision_id is None:
2875
revision_id = _mod_revision.ensure_null(branch.last_revision())
2878
branch.generate_revision_history(revision_id)
2881
inv = inventory.Inventory()
2882
wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2888
basis_tree = branch.repository.revision_tree(revision_id)
2889
if basis_tree.inventory.root is not None:
2890
wt.set_root_id(basis_tree.get_root_id())
2891
# set the parent list and cache the basis tree.
2892
if _mod_revision.is_null(revision_id):
2895
parent_trees = [(revision_id, basis_tree)]
2896
wt.set_parent_trees(parent_trees)
2897
transform.build_tree(basis_tree, wt)
2901
super(WorkingTreeFormat2, self).__init__()
2902
self._matchingbzrdir = bzrdir.BzrDirFormat6()
2904
def open(self, a_bzrdir, _found=False):
2905
"""Return the WorkingTree object for a_bzrdir
2907
_found is a private parameter, do not use it. It is used to indicate
2908
if format probing has already been done.
2911
# we are being called directly and must probe.
2912
raise NotImplementedError
2913
if not isinstance(a_bzrdir.transport, LocalTransport):
2914
raise errors.NotLocalUrl(a_bzrdir.transport.base)
2915
wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2921
class WorkingTreeFormat3(WorkingTreeFormat):
2922
"""The second working tree format updated to record a format marker.
2925
- exists within a metadir controlling .bzr
2926
- includes an explicit version marker for the workingtree control
2927
files, separate from the BzrDir format
2928
- modifies the hash cache format
2930
- uses a LockDir to guard access for writes.
2933
upgrade_recommended = True
2935
def get_format_string(self):
2936
"""See WorkingTreeFormat.get_format_string()."""
2937
return "Bazaar-NG Working Tree format 3"
2939
def get_format_description(self):
2940
"""See WorkingTreeFormat.get_format_description()."""
2941
return "Working tree format 3"
2943
_lock_file_name = 'lock'
2944
_lock_class = LockDir
2946
_tree_class = WorkingTree3
2948
def __get_matchingbzrdir(self):
2949
return bzrdir.BzrDirMetaFormat1()
2951
_matchingbzrdir = property(__get_matchingbzrdir)
2953
def _open_control_files(self, a_bzrdir):
2954
transport = a_bzrdir.get_workingtree_transport(None)
2955
return LockableFiles(transport, self._lock_file_name,
2958
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
2959
accelerator_tree=None, hardlink=False):
2960
"""See WorkingTreeFormat.initialize().
2962
:param revision_id: if supplied, create a working tree at a different
2963
revision than the branch is at.
2964
:param accelerator_tree: A tree which can be used for retrieving file
2965
contents more quickly than the revision tree, i.e. a workingtree.
2966
The revision tree will be used for cases where accelerator_tree's
2967
content is different.
2968
:param hardlink: If true, hard-link files from accelerator_tree,
2971
if not isinstance(a_bzrdir.transport, LocalTransport):
2972
raise errors.NotLocalUrl(a_bzrdir.transport.base)
2973
transport = a_bzrdir.get_workingtree_transport(self)
2974
control_files = self._open_control_files(a_bzrdir)
2975
control_files.create_lock()
2976
control_files.lock_write()
2977
transport.put_bytes('format', self.get_format_string(),
2978
mode=a_bzrdir._get_file_mode())
2979
if from_branch is not None:
2980
branch = from_branch
2982
branch = a_bzrdir.open_branch()
2983
if revision_id is None:
2984
revision_id = _mod_revision.ensure_null(branch.last_revision())
2985
# WorkingTree3 can handle an inventory which has a unique root id.
2986
# as of bzr 0.12. However, bzr 0.11 and earlier fail to handle
2987
# those trees. And because there isn't a format bump inbetween, we
2988
# are maintaining compatibility with older clients.
2989
# inv = Inventory(root_id=gen_root_id())
2990
inv = self._initial_inventory()
2991
wt = self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
2997
_control_files=control_files)
2998
wt.lock_tree_write()
3000
basis_tree = branch.repository.revision_tree(revision_id)
3001
# only set an explicit root id if there is one to set.
3002
if basis_tree.inventory.root is not None:
3003
wt.set_root_id(basis_tree.get_root_id())
3004
if revision_id == _mod_revision.NULL_REVISION:
3005
wt.set_parent_trees([])
3007
wt.set_parent_trees([(revision_id, basis_tree)])
3008
transform.build_tree(basis_tree, wt)
3010
# Unlock in this order so that the unlock-triggers-flush in
3011
# WorkingTree is given a chance to fire.
3012
control_files.unlock()
3016
def _initial_inventory(self):
3017
return inventory.Inventory()
3020
super(WorkingTreeFormat3, self).__init__()
3022
def open(self, a_bzrdir, _found=False):
3023
"""Return the WorkingTree object for a_bzrdir
3025
_found is a private parameter, do not use it. It is used to indicate
3026
if format probing has already been done.
3029
# we are being called directly and must probe.
3030
raise NotImplementedError
3031
if not isinstance(a_bzrdir.transport, LocalTransport):
3032
raise errors.NotLocalUrl(a_bzrdir.transport.base)
3033
wt = self._open(a_bzrdir, self._open_control_files(a_bzrdir))
3036
def _open(self, a_bzrdir, control_files):
3037
"""Open the tree itself.
3039
:param a_bzrdir: the dir for the tree.
3040
:param control_files: the control files for the tree.
3042
return self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
3046
_control_files=control_files)
3049
return self.get_format_string()
3052
__default_format = WorkingTreeFormat6()
3053
WorkingTreeFormat.register_format(__default_format)
3054
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3055
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3056
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3057
WorkingTreeFormat.set_default_format(__default_format)
3058
# formats which have no format string are not discoverable
3059
# and not independently creatable, so are not registered.
3060
_legacy_formats = [WorkingTreeFormat2(),
added
removed
bzrlib/workingtree.py
