2608
1761
return ShelfManager(self, self._transport)
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.
1764
class InventoryWorkingTree(WorkingTree,
1765
bzrlib.mutabletree.MutableInventoryTree):
1766
"""Base class for working trees that are inventory-oriented.
1768
The inventory is held in the `Branch` working-inventory, and the
1769
files are in a directory on disk.
1771
It is possible for a `WorkingTree` to have a filename which is
1772
not listed in the Inventory and vice versa.
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()
1775
def __init__(self, basedir='.',
1776
branch=DEPRECATED_PARAMETER,
1778
_control_files=None,
1782
"""Construct a InventoryWorkingTree instance. This is not a public API.
1784
:param branch: A branch to override probing for the branch.
1786
super(InventoryWorkingTree, self).__init__(basedir=basedir,
1787
branch=branch, _control_files=_control_files, _internal=_internal,
1788
_format=_format, _bzrdir=_bzrdir)
1790
self._detect_case_handling()
1792
if _inventory is None:
1793
# This will be acquired on lock_read() or lock_write()
1794
self._inventory_is_modified = False
1795
self._inventory = None
1797
# the caller of __init__ has provided an inventory,
1798
# we assume they know what they are doing - as its only
1799
# the Format factory and creation methods that are
1800
# permitted to do this.
1801
self._set_inventory(_inventory, dirty=False)
1803
def _set_inventory(self, inv, dirty):
1804
"""Set the internal cached inventory.
1806
:param inv: The inventory to set.
1807
:param dirty: A boolean indicating whether the inventory is the same
1808
logical inventory as whats on disk. If True the inventory is not
1809
the same and should be written to disk or data will be lost, if
1810
False then the inventory is the same as that on disk and any
1811
serialisation would be unneeded overhead.
1813
self._inventory = inv
1814
self._inventory_is_modified = dirty
1816
def _detect_case_handling(self):
1817
wt_trans = self.bzrdir.get_workingtree_transport(None)
1819
wt_trans.stat(self._format.case_sensitive_filename)
1820
except errors.NoSuchFile:
1821
self.case_sensitive = True
1823
self.case_sensitive = False
1825
self._setup_directory_is_tree_reference()
1827
def _serialize(self, inventory, out_file):
1828
xml5.serializer_v5.write_inventory(self._inventory, out_file,
1831
def _deserialize(selt, in_file):
1832
return xml5.serializer_v5.read_inventory(in_file)
1834
@needs_tree_write_lock
1835
def _write_inventory(self, inv):
1836
"""Write inventory as the current inventory."""
1837
self._set_inventory(inv, dirty=True)
1840
# XXX: This method should be deprecated in favour of taking in a proper
1841
# new Inventory object.
1842
@needs_tree_write_lock
1843
def set_inventory(self, new_inventory_list):
1844
from bzrlib.inventory import (Inventory,
1848
inv = Inventory(self.get_root_id())
1849
for path, file_id, parent, kind in new_inventory_list:
1850
name = os.path.basename(path)
1853
# fixme, there should be a factory function inv,add_??
1854
if kind == 'directory':
1855
inv.add(InventoryDirectory(file_id, name, parent))
1856
elif kind == 'file':
1857
inv.add(InventoryFile(file_id, name, parent))
1858
elif kind == 'symlink':
1859
inv.add(InventoryLink(file_id, name, parent))
1861
raise errors.BzrError("unknown kind %r" % kind)
1862
self._write_inventory(inv)
1864
def _write_basis_inventory(self, xml):
1865
"""Write the basis inventory XML to the basis-inventory file"""
1866
path = self._basis_inventory_name()
1868
self._transport.put_file(path, sio,
1869
mode=self.bzrdir._get_file_mode())
1871
def _reset_data(self):
1872
"""Reset transient data that cannot be revalidated."""
1873
self._inventory_is_modified = False
1874
f = self._transport.get('inventory')
1876
result = self._deserialize(f)
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."""
1879
self._set_inventory(result, dirty=False)
1881
def _set_root_id(self, file_id):
1882
"""Set the root id for this tree, in a format specific manner.
1884
:param file_id: The file id to assign to the root. It must not be
1885
present in the current inventory or an error will occur. It must
1886
not be None, but rather a valid file id.
1888
inv = self._inventory
1889
orig_root_id = inv.root.file_id
1890
# TODO: it might be nice to exit early if there was nothing
1891
# to do, saving us from trigger a sync on unlock.
1892
self._inventory_is_modified = True
1893
# we preserve the root inventory entry object, but
1894
# unlinkit from the byid index
1895
del inv._byid[inv.root.file_id]
1896
inv.root.file_id = file_id
1897
# and link it into the index with the new changed id.
1898
inv._byid[inv.root.file_id] = inv.root
1899
# and finally update all children to reference the new id.
1900
# XXX: this should be safe to just look at the root.children
1901
# list, not the WHOLE INVENTORY.
1904
if entry.parent_id == orig_root_id:
1905
entry.parent_id = inv.root.file_id
1907
def all_file_ids(self):
1908
"""See Tree.iter_all_file_ids"""
1909
return set(self.inventory)
1911
@needs_tree_write_lock
1912
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
1913
"""See MutableTree.set_parent_trees."""
1914
parent_ids = [rev for (rev, tree) in parents_list]
1915
for revision_id in parent_ids:
1916
_mod_revision.check_not_reserved_id(revision_id)
1918
self._check_parents_for_ghosts(parent_ids,
1919
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
1921
parent_ids = self._filter_parent_ids_by_ancestry(parent_ids)
1923
if len(parent_ids) == 0:
1924
leftmost_parent_id = _mod_revision.NULL_REVISION
1925
leftmost_parent_tree = None
1927
leftmost_parent_id, leftmost_parent_tree = parents_list[0]
1929
if self._change_last_revision(leftmost_parent_id):
1930
if leftmost_parent_tree is None:
1931
# If we don't have a tree, fall back to reading the
1932
# parent tree from the repository.
1933
self._cache_basis_inventory(leftmost_parent_id)
1935
inv = leftmost_parent_tree.inventory
1936
xml = self._create_basis_xml_from_inventory(
1937
leftmost_parent_id, inv)
1938
self._write_basis_inventory(xml)
1939
self._set_merges_from_parent_ids(parent_ids)
1941
def _cache_basis_inventory(self, new_revision):
1942
"""Cache new_revision as the basis inventory."""
1943
# TODO: this should allow the ready-to-use inventory to be passed in,
1944
# as commit already has that ready-to-use [while the format is the
2679
return self._transport.get_bytes('last-revision')
2680
except errors.NoSuchFile:
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())]
1947
# this double handles the inventory - unpack and repack -
1948
# but is easier to understand. We can/should put a conditional
1949
# in here based on whether the inventory is in the latest format
1950
# - perhaps we should repack all inventories on a repository
1952
# the fast path is to copy the raw xml from the repository. If the
1953
# xml contains 'revision_id="', then we assume the right
1954
# revision_id is set. We must check for this full string, because a
1955
# root node id can legitimately look like 'revision_id' but cannot
1957
xml = self.branch.repository._get_inventory_xml(new_revision)
1958
firstline = xml.split('\n', 1)[0]
1959
if (not 'revision_id="' in firstline or
1960
'format="7"' not in firstline):
1961
inv = self.branch.repository._serializer.read_inventory_from_string(
1963
xml = self._create_basis_xml_from_inventory(new_revision, inv)
1964
self._write_basis_inventory(xml)
1965
except (errors.NoSuchRevision, errors.RevisionNotPresent):
1968
def _basis_inventory_name(self):
1969
return 'basis-inventory-cache'
1971
def _create_basis_xml_from_inventory(self, revision_id, inventory):
1972
"""Create the text that will be saved in basis-inventory"""
1973
inventory.revision_id = revision_id
1974
return xml7.serializer_v7.write_inventory_to_string(inventory)
2700
1976
@needs_tree_write_lock
2701
1977
def set_conflicts(self, conflicts):
2721
1997
raise errors.ConflictFormatError()
2722
1998
except StopIteration:
2723
1999
raise errors.ConflictFormatError()
2724
return _mod_conflicts.ConflictList.from_stanzas(RioReader(confile))
2000
reader = _mod_rio.RioReader(confile)
2001
return _mod_conflicts.ConflictList.from_stanzas(reader)
2726
2003
confile.close()
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):
2005
def read_basis_inventory(self):
2006
"""Read the cached basis inventory."""
2007
path = self._basis_inventory_name()
2008
return self._transport.get_bytes(path)
2011
def read_working_inventory(self):
2012
"""Read the working inventory.
2014
:raises errors.InventoryModified: read_working_inventory will fail
2015
when the current in memory inventory has been modified.
2017
# conceptually this should be an implementation detail of the tree.
2018
# XXX: Deprecate this.
2019
# ElementTree does its own conversion from UTF-8, so open in
2021
if self._inventory_is_modified:
2022
raise errors.InventoryModified(self)
2023
f = self._transport.get('inventory')
2025
result = self._deserialize(f)
2028
self._set_inventory(result, dirty=False)
2032
def get_root_id(self):
2033
"""Return the id of this trees root"""
2034
return self._inventory.root.file_id
2036
def has_id(self, file_id):
2037
# files that have been deleted are excluded
2038
inv = self.inventory
2039
if not inv.has_id(file_id):
2041
path = inv.id2path(file_id)
2042
return osutils.lexists(self.abspath(path))
2044
def has_or_had_id(self, file_id):
2045
if file_id == self.inventory.root.file_id:
2047
return self.inventory.has_id(file_id)
2049
@symbol_versioning.deprecated_method(symbol_versioning.deprecated_in((2, 4, 0)))
2051
"""Iterate through file_ids for this tree.
2053
file_ids are in a WorkingTree if they are in the working inventory
2054
and the working file exists.
2056
inv = self._inventory
2057
for path, ie in inv.iter_entries():
2058
if osutils.lexists(self.abspath(path)):
2061
@needs_tree_write_lock
2062
def set_last_revision(self, new_revision):
2063
"""Change the last revision in the working tree."""
2064
if self._change_last_revision(new_revision):
2065
self._cache_basis_inventory(new_revision)
2067
def _get_check_refs(self):
2068
"""Return the references needed to perform a check of this tree.
2070
The default implementation returns no refs, and is only suitable for
2071
trees that have no local caching and can commit on ghosts at any time.
2073
:seealso: bzrlib.check for details about check_refs.
2078
def _check(self, references):
2079
"""Check the tree for consistency.
2081
:param references: A dict with keys matching the items returned by
2082
self._get_check_refs(), and values from looking those keys up in
2085
tree_basis = self.basis_tree()
2086
tree_basis.lock_read()
2088
repo_basis = references[('trees', self.last_revision())]
2089
if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2090
raise errors.BzrCheckError(
2091
"Mismatched basis inventory content.")
2097
def check_state(self):
2098
"""Check that the working state is/isn't valid."""
2099
check_refs = self._get_check_refs()
2101
for ref in check_refs:
2104
refs[ref] = self.branch.repository.revision_tree(value)
2107
@needs_tree_write_lock
2108
def reset_state(self, revision_ids=None):
2109
"""Reset the state of the working tree.
2111
This does a hard-reset to a last-known-good state. This is a way to
2112
fix if something got corrupted (like the .bzr/checkout/dirstate file)
2114
if revision_ids is None:
2115
revision_ids = self.get_parent_ids()
2116
if not revision_ids:
2117
rt = self.branch.repository.revision_tree(
2118
_mod_revision.NULL_REVISION)
2120
rt = self.branch.repository.revision_tree(revision_ids[0])
2121
self._write_inventory(rt.inventory)
2122
self.set_parent_ids(revision_ids)
2125
"""Write the in memory inventory to disk."""
2126
# TODO: Maybe this should only write on dirty ?
2127
if self._control_files._lock_mode != 'w':
2128
raise errors.NotWriteLocked(self)
2130
self._serialize(self._inventory, sio)
2132
self._transport.put_file('inventory', sio,
2133
mode=self.bzrdir._get_file_mode())
2134
self._inventory_is_modified = False
2136
def get_file_mtime(self, file_id, path=None):
2137
"""See Tree.get_file_mtime."""
2139
path = self.inventory.id2path(file_id)
2141
return os.lstat(self.abspath(path)).st_mtime
2143
if e.errno == errno.ENOENT:
2144
raise errors.FileTimestampUnavailable(path)
2147
def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
2148
file_id = self.path2id(path)
2150
# For unversioned files on win32, we just assume they are not
2153
return self._inventory[file_id].executable
2155
def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
2156
mode = stat_result.st_mode
2157
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
2159
if not supports_executable():
2160
def is_executable(self, file_id, path=None):
2161
return self._inventory[file_id].executable
2163
_is_executable_from_path_and_stat = \
2164
_is_executable_from_path_and_stat_from_basis
2166
def is_executable(self, file_id, path=None):
2168
path = self.id2path(file_id)
2169
mode = os.lstat(self.abspath(path)).st_mode
2170
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
2172
_is_executable_from_path_and_stat = \
2173
_is_executable_from_path_and_stat_from_stat
2175
@needs_tree_write_lock
2176
def _add(self, files, ids, kinds):
2177
"""See MutableTree._add."""
2178
# TODO: Re-adding a file that is removed in the working copy
2179
# should probably put it back with the previous ID.
2180
# the read and write working inventory should not occur in this
2181
# function - they should be part of lock_write and unlock.
2182
inv = self.inventory
2183
for f, file_id, kind in zip(files, ids, kinds):
2185
inv.add_path(f, kind=kind)
2187
inv.add_path(f, kind=kind, file_id=file_id)
2188
self._inventory_is_modified = True
2190
def revision_tree(self, revision_id):
2191
"""See WorkingTree.revision_id."""
2192
if revision_id == self.last_revision():
2194
xml = self.read_basis_inventory()
2195
except errors.NoSuchFile:
2199
inv = xml7.serializer_v7.read_inventory_from_string(xml)
2200
# dont use the repository revision_tree api because we want
2201
# to supply the inventory.
2202
if inv.revision_id == revision_id:
2203
return revisiontree.InventoryRevisionTree(
2204
self.branch.repository, inv, revision_id)
2205
except errors.BadInventoryFormat:
2207
# raise if there was no inventory, or if we read the wrong inventory.
2208
raise errors.NoSuchRevisionInTree(self, revision_id)
2211
def annotate_iter(self, file_id, default_revision=CURRENT_REVISION):
2212
"""See Tree.annotate_iter
2214
This implementation will use the basis tree implementation if possible.
2215
Lines not in the basis are attributed to CURRENT_REVISION
2217
If there are pending merges, lines added by those merges will be
2218
incorrectly attributed to CURRENT_REVISION (but after committing, the
2219
attribution will be correct).
2221
maybe_file_parent_keys = []
2222
for parent_id in self.get_parent_ids():
2224
parent_tree = self.revision_tree(parent_id)
2225
except errors.NoSuchRevisionInTree:
2226
parent_tree = self.branch.repository.revision_tree(parent_id)
2227
parent_tree.lock_read()
2229
if not parent_tree.has_id(file_id):
2231
ie = parent_tree.inventory[file_id]
2232
if ie.kind != 'file':
2233
# Note: this is slightly unnecessary, because symlinks and
2234
# directories have a "text" which is the empty text, and we
2235
# know that won't mess up annotations. But it seems cleaner
2237
parent_text_key = (file_id, ie.revision)
2238
if parent_text_key not in maybe_file_parent_keys:
2239
maybe_file_parent_keys.append(parent_text_key)
2241
parent_tree.unlock()
2242
graph = _mod_graph.Graph(self.branch.repository.texts)
2243
heads = graph.heads(maybe_file_parent_keys)
2244
file_parent_keys = []
2245
for key in maybe_file_parent_keys:
2247
file_parent_keys.append(key)
2249
# Now we have the parents of this content
2250
annotator = self.branch.repository.texts.get_annotator()
2251
text = self.get_file_text(file_id)
2252
this_key =(file_id, default_revision)
2253
annotator.add_special_text(this_key, file_parent_keys, text)
2254
annotations = [(key[-1], line)
2255
for key, line in annotator.annotate_flat(this_key)]
2259
def merge_modified(self):
2260
"""Return a dictionary of files modified by a merge.
2262
The list is initialized by WorkingTree.set_merge_modified, which is
2263
typically called after we make some automatic updates to the tree
2266
This returns a map of file_id->sha1, containing only files which are
2267
still in the working inventory and have that text hash.
2270
hashfile = self._transport.get('merge-hashes')
2271
except errors.NoSuchFile:
2276
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
2277
raise errors.MergeModifiedFormatError()
2278
except StopIteration:
2279
raise errors.MergeModifiedFormatError()
2280
for s in _mod_rio.RioReader(hashfile):
2281
# RioReader reads in Unicode, so convert file_ids back to utf8
2282
file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
2283
if not self.inventory.has_id(file_id):
2285
text_hash = s.get("hash")
2286
if text_hash == self.get_file_sha1(file_id):
2287
merge_hashes[file_id] = text_hash
2293
def subsume(self, other_tree):
2294
def add_children(inventory, entry):
2295
for child_entry in entry.children.values():
2296
inventory._byid[child_entry.file_id] = child_entry
2297
if child_entry.kind == 'directory':
2298
add_children(inventory, child_entry)
2299
if other_tree.get_root_id() == self.get_root_id():
2300
raise errors.BadSubsumeSource(self, other_tree,
2301
'Trees have the same root')
2303
other_tree_path = self.relpath(other_tree.basedir)
2304
except errors.PathNotChild:
2305
raise errors.BadSubsumeSource(self, other_tree,
2306
'Tree is not contained by the other')
2307
new_root_parent = self.path2id(osutils.dirname(other_tree_path))
2308
if new_root_parent is None:
2309
raise errors.BadSubsumeSource(self, other_tree,
2310
'Parent directory is not versioned.')
2311
# We need to ensure that the result of a fetch will have a
2312
# versionedfile for the other_tree root, and only fetching into
2313
# RepositoryKnit2 guarantees that.
2314
if not self.branch.repository.supports_rich_root():
2315
raise errors.SubsumeTargetNeedsUpgrade(other_tree)
2316
other_tree.lock_tree_write()
2318
new_parents = other_tree.get_parent_ids()
2319
other_root = other_tree.inventory.root
2320
other_root.parent_id = new_root_parent
2321
other_root.name = osutils.basename(other_tree_path)
2322
self.inventory.add(other_root)
2323
add_children(self.inventory, other_root)
2324
self._write_inventory(self.inventory)
2325
# normally we don't want to fetch whole repositories, but i think
2326
# here we really do want to consolidate the whole thing.
2327
for parent_id in other_tree.get_parent_ids():
2328
self.branch.fetch(other_tree.branch, parent_id)
2329
self.add_parent_tree_id(parent_id)
2332
other_tree.bzrdir.retire_bzrdir()
2334
@needs_tree_write_lock
2335
def extract(self, file_id, format=None):
2336
"""Extract a subtree from this tree.
2338
A new branch will be created, relative to the path for this tree.
2342
segments = osutils.splitpath(path)
2343
transport = self.branch.bzrdir.root_transport
2344
for name in segments:
2345
transport = transport.clone(name)
2346
transport.ensure_base()
2349
sub_path = self.id2path(file_id)
2350
branch_transport = mkdirs(sub_path)
2352
format = self.bzrdir.cloning_metadir()
2353
branch_transport.ensure_base()
2354
branch_bzrdir = format.initialize_on_transport(branch_transport)
2356
repo = branch_bzrdir.find_repository()
2357
except errors.NoRepositoryPresent:
2358
repo = branch_bzrdir.create_repository()
2359
if not repo.supports_rich_root():
2360
raise errors.RootNotRich()
2361
new_branch = branch_bzrdir.create_branch()
2362
new_branch.pull(self.branch)
2363
for parent_id in self.get_parent_ids():
2364
new_branch.fetch(self.branch, parent_id)
2365
tree_transport = self.bzrdir.root_transport.clone(sub_path)
2366
if tree_transport.base != branch_transport.base:
2367
tree_bzrdir = format.initialize_on_transport(tree_transport)
2368
branch.BranchReferenceFormat().initialize(tree_bzrdir,
2369
target_branch=new_branch)
2371
tree_bzrdir = branch_bzrdir
2372
wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
2373
wt.set_parent_ids(self.get_parent_ids())
2374
my_inv = self.inventory
2375
child_inv = inventory.Inventory(root_id=None)
2376
new_root = my_inv[file_id]
2377
my_inv.remove_recursive_id(file_id)
2378
new_root.parent_id = None
2379
child_inv.add(new_root)
2380
self._write_inventory(my_inv)
2381
wt._write_inventory(child_inv)
2384
def list_files(self, include_root=False, from_dir=None, recursive=True):
2385
"""List all files as (path, class, kind, id, entry).
2387
Lists, but does not descend into unversioned directories.
2388
This does not include files that have been deleted in this
2389
tree. Skips the control directory.
2391
:param include_root: if True, return an entry for the root
2392
:param from_dir: start from this directory or None for the root
2393
:param recursive: whether to recurse into subdirectories or not
2395
# list_files is an iterator, so @needs_read_lock doesn't work properly
2396
# with it. So callers should be careful to always read_lock the tree.
2397
if not self.is_locked():
2398
raise errors.ObjectNotLocked(self)
2400
inv = self.inventory
2401
if from_dir is None and include_root is True:
2402
yield ('', 'V', 'directory', inv.root.file_id, inv.root)
2403
# Convert these into local objects to save lookup times
2404
pathjoin = osutils.pathjoin
2405
file_kind = self._kind
2407
# transport.base ends in a slash, we want the piece
2408
# between the last two slashes
2409
transport_base_dir = self.bzrdir.transport.base.rsplit('/', 2)[1]
2411
fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
2413
# directory file_id, relative path, absolute path, reverse sorted children
2414
if from_dir is not None:
2415
from_dir_id = inv.path2id(from_dir)
2416
if from_dir_id is None:
2417
# Directory not versioned
2419
from_dir_abspath = pathjoin(self.basedir, from_dir)
2421
from_dir_id = inv.root.file_id
2422
from_dir_abspath = self.basedir
2423
children = os.listdir(from_dir_abspath)
2425
# jam 20060527 The kernel sized tree seems equivalent whether we
2426
# use a deque and popleft to keep them sorted, or if we use a plain
2427
# list and just reverse() them.
2428
children = collections.deque(children)
2429
stack = [(from_dir_id, u'', from_dir_abspath, children)]
2431
from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
2434
f = children.popleft()
2435
## TODO: If we find a subdirectory with its own .bzr
2436
## directory, then that is a separate tree and we
2437
## should exclude it.
2439
# the bzrdir for this tree
2440
if transport_base_dir == f:
2443
# we know that from_dir_relpath and from_dir_abspath never end in a slash
2444
# and 'f' doesn't begin with one, we can do a string op, rather
2445
# than the checks of pathjoin(), all relative paths will have an extra slash
2447
fp = from_dir_relpath + '/' + f
2450
fap = from_dir_abspath + '/' + f
2452
dir_ie = inv[from_dir_id]
2453
if dir_ie.kind == 'directory':
2454
f_ie = dir_ie.children.get(f)
2459
elif self.is_ignored(fp[1:]):
2462
# we may not have found this file, because of a unicode
2463
# issue, or because the directory was actually a symlink.
2464
f_norm, can_access = osutils.normalized_filename(f)
2465
if f == f_norm or not can_access:
2466
# No change, so treat this file normally
2469
# this file can be accessed by a normalized path
2470
# check again if it is versioned
2471
# these lines are repeated here for performance
2473
fp = from_dir_relpath + '/' + f
2474
fap = from_dir_abspath + '/' + f
2475
f_ie = inv.get_child(from_dir_id, f)
2478
elif self.is_ignored(fp[1:]):
2485
# make a last minute entry
2487
yield fp[1:], c, fk, f_ie.file_id, f_ie
2490
yield fp[1:], c, fk, None, fk_entries[fk]()
2492
yield fp[1:], c, fk, None, TreeEntry()
2495
if fk != 'directory':
2498
# But do this child first if recursing down
2500
new_children = os.listdir(fap)
2502
new_children = collections.deque(new_children)
2503
stack.append((f_ie.file_id, fp, fap, new_children))
2504
# Break out of inner loop,
2505
# so that we start outer loop with child
2508
# if we finished all children, pop it off the stack
2511
@needs_tree_write_lock
2512
def move(self, from_paths, to_dir=None, after=False):
2515
to_dir must exist in the inventory.
2517
If to_dir exists and is a directory, the files are moved into
2518
it, keeping their old names.
2520
Note that to_dir is only the last component of the new name;
2521
this doesn't change the directory.
2523
For each entry in from_paths the move mode will be determined
2526
The first mode moves the file in the filesystem and updates the
2527
inventory. The second mode only updates the inventory without
2528
touching the file on the filesystem.
2530
move uses the second mode if 'after == True' and the target is
2531
either not versioned or newly added, and present in the working tree.
2533
move uses the second mode if 'after == False' and the source is
2534
versioned but no longer in the working tree, and the target is not
2535
versioned but present in the working tree.
2537
move uses the first mode if 'after == False' and the source is
2538
versioned and present in the working tree, and the target is not
2539
versioned and not present in the working tree.
2541
Everything else results in an error.
2543
This returns a list of (from_path, to_path) pairs for each
2544
entry that is moved.
2549
# check for deprecated use of signature
2551
raise TypeError('You must supply a target directory')
2552
# check destination directory
2553
if isinstance(from_paths, basestring):
2555
inv = self.inventory
2556
to_abs = self.abspath(to_dir)
2557
if not isdir(to_abs):
2558
raise errors.BzrMoveFailedError('',to_dir,
2559
errors.NotADirectory(to_abs))
2560
if not self.has_filename(to_dir):
2561
raise errors.BzrMoveFailedError('',to_dir,
2562
errors.NotInWorkingDirectory(to_dir))
2563
to_dir_id = inv.path2id(to_dir)
2564
if to_dir_id is None:
2565
raise errors.BzrMoveFailedError('',to_dir,
2566
errors.NotVersionedError(path=to_dir))
2568
to_dir_ie = inv[to_dir_id]
2569
if to_dir_ie.kind != 'directory':
2570
raise errors.BzrMoveFailedError('',to_dir,
2571
errors.NotADirectory(to_abs))
2573
# create rename entries and tuples
2574
for from_rel in from_paths:
2575
from_tail = splitpath(from_rel)[-1]
2576
from_id = inv.path2id(from_rel)
2578
raise errors.BzrMoveFailedError(from_rel,to_dir,
2579
errors.NotVersionedError(path=from_rel))
2581
from_entry = inv[from_id]
2582
from_parent_id = from_entry.parent_id
2583
to_rel = pathjoin(to_dir, from_tail)
2584
rename_entry = InventoryWorkingTree._RenameEntry(
2587
from_tail=from_tail,
2588
from_parent_id=from_parent_id,
2589
to_rel=to_rel, to_tail=from_tail,
2590
to_parent_id=to_dir_id)
2591
rename_entries.append(rename_entry)
2592
rename_tuples.append((from_rel, to_rel))
2594
# determine which move mode to use. checks also for movability
2595
rename_entries = self._determine_mv_mode(rename_entries, after)
2597
original_modified = self._inventory_is_modified
2600
self._inventory_is_modified = True
2601
self._move(rename_entries)
2603
# restore the inventory on error
2604
self._inventory_is_modified = original_modified
2606
self._write_inventory(inv)
2607
return rename_tuples
2609
@needs_tree_write_lock
2610
def rename_one(self, from_rel, to_rel, after=False):
2613
This can change the directory or the filename or both.
2615
rename_one has several 'modes' to work. First, it can rename a physical
2616
file and change the file_id. That is the normal mode. Second, it can
2617
only change the file_id without touching any physical file.
2619
rename_one uses the second mode if 'after == True' and 'to_rel' is not
2620
versioned but present in the working tree.
2622
rename_one uses the second mode if 'after == False' and 'from_rel' is
2623
versioned but no longer in the working tree, and 'to_rel' is not
2624
versioned but present in the working tree.
2626
rename_one uses the first mode if 'after == False' and 'from_rel' is
2627
versioned and present in the working tree, and 'to_rel' is not
2628
versioned and not present in the working tree.
2630
Everything else results in an error.
2632
inv = self.inventory
2635
# create rename entries and tuples
2636
from_tail = splitpath(from_rel)[-1]
2637
from_id = inv.path2id(from_rel)
2639
# if file is missing in the inventory maybe it's in the basis_tree
2640
basis_tree = self.branch.basis_tree()
2641
from_id = basis_tree.path2id(from_rel)
2643
raise errors.BzrRenameFailedError(from_rel,to_rel,
2644
errors.NotVersionedError(path=from_rel))
2645
# put entry back in the inventory so we can rename it
2646
from_entry = basis_tree.inventory[from_id].copy()
2649
from_entry = inv[from_id]
2650
from_parent_id = from_entry.parent_id
2651
to_dir, to_tail = os.path.split(to_rel)
2652
to_dir_id = inv.path2id(to_dir)
2653
rename_entry = InventoryWorkingTree._RenameEntry(from_rel=from_rel,
2655
from_tail=from_tail,
2656
from_parent_id=from_parent_id,
2657
to_rel=to_rel, to_tail=to_tail,
2658
to_parent_id=to_dir_id)
2659
rename_entries.append(rename_entry)
2661
# determine which move mode to use. checks also for movability
2662
rename_entries = self._determine_mv_mode(rename_entries, after)
2664
# check if the target changed directory and if the target directory is
2666
if to_dir_id is None:
2667
raise errors.BzrMoveFailedError(from_rel,to_rel,
2668
errors.NotVersionedError(path=to_dir))
2670
# all checks done. now we can continue with our actual work
2671
mutter('rename_one:\n'
2676
' to_dir_id {%s}\n',
2677
from_id, from_rel, to_rel, to_dir, to_dir_id)
2679
self._move(rename_entries)
2680
self._write_inventory(inv)
2682
class _RenameEntry(object):
2683
def __init__(self, from_rel, from_id, from_tail, from_parent_id,
2684
to_rel, to_tail, to_parent_id, only_change_inv=False,
2686
self.from_rel = from_rel
2687
self.from_id = from_id
2688
self.from_tail = from_tail
2689
self.from_parent_id = from_parent_id
2690
self.to_rel = to_rel
2691
self.to_tail = to_tail
2692
self.to_parent_id = to_parent_id
2693
self.change_id = change_id
2694
self.only_change_inv = only_change_inv
2696
def _determine_mv_mode(self, rename_entries, after=False):
2697
"""Determines for each from-to pair if both inventory and working tree
2698
or only the inventory has to be changed.
2700
Also does basic plausability tests.
2702
inv = self.inventory
2704
for rename_entry in rename_entries:
2705
# store to local variables for easier reference
2706
from_rel = rename_entry.from_rel
2707
from_id = rename_entry.from_id
2708
to_rel = rename_entry.to_rel
2709
to_id = inv.path2id(to_rel)
2710
only_change_inv = False
2713
# check the inventory for source and destination
2715
raise errors.BzrMoveFailedError(from_rel,to_rel,
2716
errors.NotVersionedError(path=from_rel))
2717
if to_id is not None:
2719
# allow it with --after but only if dest is newly added
2721
basis = self.basis_tree()
2724
if not basis.has_id(to_id):
2725
rename_entry.change_id = True
2730
raise errors.BzrMoveFailedError(from_rel,to_rel,
2731
errors.AlreadyVersionedError(path=to_rel))
2733
# try to determine the mode for rename (only change inv or change
2734
# inv and file system)
2736
if not self.has_filename(to_rel):
2737
raise errors.BzrMoveFailedError(from_id,to_rel,
2738
errors.NoSuchFile(path=to_rel,
2739
extra="New file has not been created yet"))
2740
only_change_inv = True
2741
elif not self.has_filename(from_rel) and self.has_filename(to_rel):
2742
only_change_inv = True
2743
elif self.has_filename(from_rel) and not self.has_filename(to_rel):
2744
only_change_inv = False
2745
elif (not self.case_sensitive
2746
and from_rel.lower() == to_rel.lower()
2747
and self.has_filename(from_rel)):
2748
only_change_inv = False
2750
# something is wrong, so lets determine what exactly
2751
if not self.has_filename(from_rel) and \
2752
not self.has_filename(to_rel):
2753
raise errors.BzrRenameFailedError(from_rel,to_rel,
2754
errors.PathsDoNotExist(paths=(str(from_rel),
2757
raise errors.RenameFailedFilesExist(from_rel, to_rel)
2758
rename_entry.only_change_inv = only_change_inv
2759
return rename_entries
2761
def _move(self, rename_entries):
2762
"""Moves a list of files.
2764
Depending on the value of the flag 'only_change_inv', the
2765
file will be moved on the file system or not.
2767
inv = self.inventory
2770
for entry in rename_entries:
2772
self._move_entry(entry)
2774
self._rollback_move(moved)
2778
def _rollback_move(self, moved):
2779
"""Try to rollback a previous move in case of an filesystem error."""
2780
inv = self.inventory
2783
self._move_entry(WorkingTree._RenameEntry(
2784
entry.to_rel, entry.from_id,
2785
entry.to_tail, entry.to_parent_id, entry.from_rel,
2786
entry.from_tail, entry.from_parent_id,
2787
entry.only_change_inv))
2788
except errors.BzrMoveFailedError, e:
2789
raise errors.BzrMoveFailedError( '', '', "Rollback failed."
2790
" The working tree is in an inconsistent state."
2791
" Please consider doing a 'bzr revert'."
2792
" Error message is: %s" % e)
2794
def _move_entry(self, entry):
2795
inv = self.inventory
2796
from_rel_abs = self.abspath(entry.from_rel)
2797
to_rel_abs = self.abspath(entry.to_rel)
2798
if from_rel_abs == to_rel_abs:
2799
raise errors.BzrMoveFailedError(entry.from_rel, entry.to_rel,
2800
"Source and target are identical.")
2802
if not entry.only_change_inv:
2804
osutils.rename(from_rel_abs, to_rel_abs)
2806
raise errors.BzrMoveFailedError(entry.from_rel,
2809
to_id = inv.path2id(entry.to_rel)
2810
inv.remove_recursive_id(to_id)
2811
inv.rename(entry.from_id, entry.to_parent_id, entry.to_tail)
2813
@needs_tree_write_lock
2814
def unversion(self, file_ids):
2815
"""Remove the file ids in file_ids from the current versioned set.
2817
When a file_id is unversioned, all of its children are automatically
2820
:param file_ids: The file ids to stop versioning.
2821
:raises: NoSuchId if any fileid is not currently versioned.
2823
for file_id in file_ids:
2824
if not self._inventory.has_id(file_id):
2825
raise errors.NoSuchId(self, file_id)
2826
for file_id in file_ids:
2827
if self._inventory.has_id(file_id):
2828
self._inventory.remove_recursive_id(file_id)
2830
# in the future this should just set a dirty bit to wait for the
2831
# final unlock. However, until all methods of workingtree start
2832
# with the current in -memory inventory rather than triggering
2833
# a read, it is more complex - we need to teach read_inventory
2834
# to know when to read, and when to not read first... and possibly
2835
# to save first when the in memory one may be corrupted.
2836
# so for now, we just only write it if it is indeed dirty.
2838
self._write_inventory(self._inventory)
2840
def stored_kind(self, file_id):
2841
"""See Tree.stored_kind"""
2842
return self.inventory[file_id].kind
2845
"""Yield all unversioned files in this WorkingTree.
2847
If there are any unversioned directories then only the directory is
2848
returned, not all its children. But if there are unversioned files
2849
under a versioned subdirectory, they are returned.
2851
Currently returned depth-first, sorted by name within directories.
2852
This is the same order used by 'osutils.walkdirs'.
2854
## TODO: Work from given directory downwards
2855
for path, dir_entry in self.inventory.directories():
2856
# mutter("search for unknowns in %r", path)
2857
dirabs = self.abspath(path)
2858
if not isdir(dirabs):
2859
# e.g. directory deleted
2863
for subf in os.listdir(dirabs):
2864
if self.bzrdir.is_control_filename(subf):
2866
if subf not in dir_entry.children:
2869
can_access) = osutils.normalized_filename(subf)
2870
except UnicodeDecodeError:
2871
path_os_enc = path.encode(osutils._fs_enc)
2872
relpath = path_os_enc + '/' + subf
2873
raise errors.BadFilenameEncoding(relpath,
2875
if subf_norm != subf and can_access:
2876
if subf_norm not in dir_entry.children:
2877
fl.append(subf_norm)
2883
subp = pathjoin(path, subf)
2886
def _walkdirs(self, prefix=""):
2887
"""Walk the directories of this tree.
2889
:param prefix: is used as the directrory to start with.
2890
:returns: a generator which yields items in the form::
2892
((curren_directory_path, fileid),
2893
[(file1_path, file1_name, file1_kind, None, file1_id,
2896
_directory = 'directory'
2897
# get the root in the inventory
2898
inv = self.inventory
2899
top_id = inv.path2id(prefix)
2903
pending = [(prefix, '', _directory, None, top_id, None)]
2906
currentdir = pending.pop()
2907
# 0 - relpath, 1- basename, 2- kind, 3- stat, 4-id, 5-kind
2908
top_id = currentdir[4]
2910
relroot = currentdir[0] + '/'
2913
# FIXME: stash the node in pending
2915
if entry.kind == 'directory':
2916
for name, child in entry.sorted_children():
2917
dirblock.append((relroot + name, name, child.kind, None,
2918
child.file_id, child.kind
2920
yield (currentdir[0], entry.file_id), dirblock
2921
# push the user specified dirs from dirblock
2922
for dir in reversed(dirblock):
2923
if dir[2] == _directory:
2927
class WorkingTreeFormatRegistry(controldir.ControlComponentFormatRegistry):
2928
"""Registry for working tree formats."""
2930
def __init__(self, other_registry=None):
2931
super(WorkingTreeFormatRegistry, self).__init__(other_registry)
2932
self._default_format = None
2933
self._default_format_key = None
2935
def get_default(self):
2936
"""Return the current default format."""
2937
if (self._default_format_key is not None and
2938
self._default_format is None):
2939
self._default_format = self.get(self._default_format_key)
2940
return self._default_format
2942
def set_default(self, format):
2943
"""Set the default format."""
2944
self._default_format = format
2945
self._default_format_key = None
2947
def set_default_key(self, format_string):
2948
"""Set the default format by its format string."""
2949
self._default_format_key = format_string
2950
self._default_format = None
2953
format_registry = WorkingTreeFormatRegistry()
2956
class WorkingTreeFormat(controldir.ControlComponentFormat):
2750
2957
"""An encapsulation of the initialization and open routines for a format.
2752
2959
Formats provide three things:
3062
@symbol_versioning.deprecated_method(
3063
symbol_versioning.deprecated_in((2, 4, 0)))
2827
3064
def register_format(klass, format):
2828
klass._formats[format.get_format_string()] = format
3065
format_registry.register(format)
3068
@symbol_versioning.deprecated_method(
3069
symbol_versioning.deprecated_in((2, 4, 0)))
3070
def register_extra_format(klass, format):
3071
format_registry.register_extra(format)
3074
@symbol_versioning.deprecated_method(
3075
symbol_versioning.deprecated_in((2, 4, 0)))
3076
def unregister_extra_format(klass, format):
3077
format_registry.unregister_extra(format)
3080
@symbol_versioning.deprecated_method(
3081
symbol_versioning.deprecated_in((2, 4, 0)))
3082
def get_formats(klass):
3083
return format_registry._get_all()
3086
@symbol_versioning.deprecated_method(
3087
symbol_versioning.deprecated_in((2, 4, 0)))
2831
3088
def set_default_format(klass, format):
2832
klass._default_format = format
3089
format_registry.set_default(format)
3092
@symbol_versioning.deprecated_method(
3093
symbol_versioning.deprecated_in((2, 4, 0)))
2835
3094
def unregister_format(klass, format):
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(),
3095
format_registry.remove(format)
3097
def get_controldir_for_branch(self):
3098
"""Get the control directory format for creating branches.
3100
This is to support testing of working tree formats that can not exist
3101
in the same control directory as a branch.
3103
return self._matchingbzrdir
3106
format_registry.register_lazy("Bazaar Working Tree Format 4 (bzr 0.15)\n",
3107
"bzrlib.workingtree_4", "WorkingTreeFormat4")
3108
format_registry.register_lazy("Bazaar Working Tree Format 5 (bzr 1.11)\n",
3109
"bzrlib.workingtree_4", "WorkingTreeFormat5")
3110
format_registry.register_lazy("Bazaar Working Tree Format 6 (bzr 1.14)\n",
3111
"bzrlib.workingtree_4", "WorkingTreeFormat6")
3112
format_registry.register_lazy("Bazaar-NG Working Tree format 3",
3113
"bzrlib.workingtree_3", "WorkingTreeFormat3")
3114
format_registry.set_default_key("Bazaar Working Tree Format 6 (bzr 1.14)\n")
added
removed
bzrlib/workingtree.py
