2608
1812
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.
1815
class InventoryWorkingTree(WorkingTree,
1816
bzrlib.mutabletree.MutableInventoryTree):
1817
"""Base class for working trees that are inventory-oriented.
1819
The inventory is held in the `Branch` working-inventory, and the
1820
files are in a directory on disk.
1822
It is possible for a `WorkingTree` to have a filename which is
1823
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()
1826
def __init__(self, basedir='.',
1827
branch=DEPRECATED_PARAMETER,
1829
_control_files=None,
1833
"""Construct a InventoryWorkingTree instance. This is not a public API.
1835
:param branch: A branch to override probing for the branch.
1837
super(InventoryWorkingTree, self).__init__(basedir=basedir,
1838
branch=branch, _control_files=_control_files, _internal=_internal,
1839
_format=_format, _bzrdir=_bzrdir)
1841
if _inventory is None:
1842
# This will be acquired on lock_read() or lock_write()
1843
self._inventory_is_modified = False
1844
self._inventory = None
1846
# the caller of __init__ has provided an inventory,
1847
# we assume they know what they are doing - as its only
1848
# the Format factory and creation methods that are
1849
# permitted to do this.
1850
self._set_inventory(_inventory, dirty=False)
1852
def _set_inventory(self, inv, dirty):
1853
"""Set the internal cached inventory.
1855
:param inv: The inventory to set.
1856
:param dirty: A boolean indicating whether the inventory is the same
1857
logical inventory as whats on disk. If True the inventory is not
1858
the same and should be written to disk or data will be lost, if
1859
False then the inventory is the same as that on disk and any
1860
serialisation would be unneeded overhead.
1862
self._inventory = inv
1863
self._inventory_is_modified = dirty
1865
def _serialize(self, inventory, out_file):
1866
xml5.serializer_v5.write_inventory(self._inventory, out_file,
1869
def _deserialize(selt, in_file):
1870
return xml5.serializer_v5.read_inventory(in_file)
1872
@needs_tree_write_lock
1873
def _write_inventory(self, inv):
1874
"""Write inventory as the current inventory."""
1875
self._set_inventory(inv, dirty=True)
1878
# XXX: This method should be deprecated in favour of taking in a proper
1879
# new Inventory object.
1880
@needs_tree_write_lock
1881
def set_inventory(self, new_inventory_list):
1882
from bzrlib.inventory import (Inventory,
1886
inv = Inventory(self.get_root_id())
1887
for path, file_id, parent, kind in new_inventory_list:
1888
name = os.path.basename(path)
1891
# fixme, there should be a factory function inv,add_??
1892
if kind == 'directory':
1893
inv.add(InventoryDirectory(file_id, name, parent))
1894
elif kind == 'file':
1895
inv.add(InventoryFile(file_id, name, parent))
1896
elif kind == 'symlink':
1897
inv.add(InventoryLink(file_id, name, parent))
1899
raise errors.BzrError("unknown kind %r" % kind)
1900
self._write_inventory(inv)
1902
def _write_basis_inventory(self, xml):
1903
"""Write the basis inventory XML to the basis-inventory file"""
1904
path = self._basis_inventory_name()
1906
self._transport.put_file(path, sio,
1907
mode=self.bzrdir._get_file_mode())
1909
def _reset_data(self):
1910
"""Reset transient data that cannot be revalidated."""
1911
self._inventory_is_modified = False
1912
f = self._transport.get('inventory')
1914
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."""
1917
self._set_inventory(result, dirty=False)
1919
def _set_root_id(self, file_id):
1920
"""Set the root id for this tree, in a format specific manner.
1922
:param file_id: The file id to assign to the root. It must not be
1923
present in the current inventory or an error will occur. It must
1924
not be None, but rather a valid file id.
1926
inv = self._inventory
1927
orig_root_id = inv.root.file_id
1928
# TODO: it might be nice to exit early if there was nothing
1929
# to do, saving us from trigger a sync on unlock.
1930
self._inventory_is_modified = True
1931
# we preserve the root inventory entry object, but
1932
# unlinkit from the byid index
1933
del inv._byid[inv.root.file_id]
1934
inv.root.file_id = file_id
1935
# and link it into the index with the new changed id.
1936
inv._byid[inv.root.file_id] = inv.root
1937
# and finally update all children to reference the new id.
1938
# XXX: this should be safe to just look at the root.children
1939
# list, not the WHOLE INVENTORY.
1942
if entry.parent_id == orig_root_id:
1943
entry.parent_id = inv.root.file_id
1945
def all_file_ids(self):
1946
"""See Tree.iter_all_file_ids"""
1947
return set(self.inventory)
1949
@needs_tree_write_lock
1950
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
1951
"""See MutableTree.set_parent_trees."""
1952
parent_ids = [rev for (rev, tree) in parents_list]
1953
for revision_id in parent_ids:
1954
_mod_revision.check_not_reserved_id(revision_id)
1956
self._check_parents_for_ghosts(parent_ids,
1957
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
1959
parent_ids = self._filter_parent_ids_by_ancestry(parent_ids)
1961
if len(parent_ids) == 0:
1962
leftmost_parent_id = _mod_revision.NULL_REVISION
1963
leftmost_parent_tree = None
1965
leftmost_parent_id, leftmost_parent_tree = parents_list[0]
1967
if self._change_last_revision(leftmost_parent_id):
1968
if leftmost_parent_tree is None:
1969
# If we don't have a tree, fall back to reading the
1970
# parent tree from the repository.
1971
self._cache_basis_inventory(leftmost_parent_id)
1973
inv = leftmost_parent_tree.inventory
1974
xml = self._create_basis_xml_from_inventory(
1975
leftmost_parent_id, inv)
1976
self._write_basis_inventory(xml)
1977
self._set_merges_from_parent_ids(parent_ids)
1979
def _cache_basis_inventory(self, new_revision):
1980
"""Cache new_revision as the basis inventory."""
1981
# TODO: this should allow the ready-to-use inventory to be passed in,
1982
# 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())]
1985
# this double handles the inventory - unpack and repack -
1986
# but is easier to understand. We can/should put a conditional
1987
# in here based on whether the inventory is in the latest format
1988
# - perhaps we should repack all inventories on a repository
1990
# the fast path is to copy the raw xml from the repository. If the
1991
# xml contains 'revision_id="', then we assume the right
1992
# revision_id is set. We must check for this full string, because a
1993
# root node id can legitimately look like 'revision_id' but cannot
1995
xml = self.branch.repository._get_inventory_xml(new_revision)
1996
firstline = xml.split('\n', 1)[0]
1997
if (not 'revision_id="' in firstline or
1998
'format="7"' not in firstline):
1999
inv = self.branch.repository._serializer.read_inventory_from_string(
2001
xml = self._create_basis_xml_from_inventory(new_revision, inv)
2002
self._write_basis_inventory(xml)
2003
except (errors.NoSuchRevision, errors.RevisionNotPresent):
2006
def _basis_inventory_name(self):
2007
return 'basis-inventory-cache'
2009
def _create_basis_xml_from_inventory(self, revision_id, inventory):
2010
"""Create the text that will be saved in basis-inventory"""
2011
inventory.revision_id = revision_id
2012
return xml7.serializer_v7.write_inventory_to_string(inventory)
2700
2014
@needs_tree_write_lock
2701
2015
def set_conflicts(self, conflicts):
2721
2035
raise errors.ConflictFormatError()
2722
2036
except StopIteration:
2723
2037
raise errors.ConflictFormatError()
2724
return _mod_conflicts.ConflictList.from_stanzas(RioReader(confile))
2038
reader = _mod_rio.RioReader(confile)
2039
return _mod_conflicts.ConflictList.from_stanzas(reader)
2726
2041
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):
2043
def read_basis_inventory(self):
2044
"""Read the cached basis inventory."""
2045
path = self._basis_inventory_name()
2046
return self._transport.get_bytes(path)
2049
def read_working_inventory(self):
2050
"""Read the working inventory.
2052
:raises errors.InventoryModified: read_working_inventory will fail
2053
when the current in memory inventory has been modified.
2055
# conceptually this should be an implementation detail of the tree.
2056
# XXX: Deprecate this.
2057
# ElementTree does its own conversion from UTF-8, so open in
2059
if self._inventory_is_modified:
2060
raise errors.InventoryModified(self)
2061
f = self._transport.get('inventory')
2063
result = self._deserialize(f)
2066
self._set_inventory(result, dirty=False)
2070
def get_root_id(self):
2071
"""Return the id of this trees root"""
2072
return self._inventory.root.file_id
2074
def has_id(self, file_id):
2075
# files that have been deleted are excluded
2076
inv = self.inventory
2077
if not inv.has_id(file_id):
2079
path = inv.id2path(file_id)
2080
return osutils.lexists(self.abspath(path))
2082
def has_or_had_id(self, file_id):
2083
if file_id == self.inventory.root.file_id:
2085
return self.inventory.has_id(file_id)
2087
__contains__ = has_id
2089
@symbol_versioning.deprecated_method(symbol_versioning.deprecated_in((2, 4, 0)))
2091
"""Iterate through file_ids for this tree.
2093
file_ids are in a WorkingTree if they are in the working inventory
2094
and the working file exists.
2096
inv = self._inventory
2097
for path, ie in inv.iter_entries():
2098
if osutils.lexists(self.abspath(path)):
2101
@needs_tree_write_lock
2102
def set_last_revision(self, new_revision):
2103
"""Change the last revision in the working tree."""
2104
if self._change_last_revision(new_revision):
2105
self._cache_basis_inventory(new_revision)
2107
def _get_check_refs(self):
2108
"""Return the references needed to perform a check of this tree.
2110
The default implementation returns no refs, and is only suitable for
2111
trees that have no local caching and can commit on ghosts at any time.
2113
:seealso: bzrlib.check for details about check_refs.
2118
def _check(self, references):
2119
"""Check the tree for consistency.
2121
:param references: A dict with keys matching the items returned by
2122
self._get_check_refs(), and values from looking those keys up in
2125
tree_basis = self.basis_tree()
2126
tree_basis.lock_read()
2128
repo_basis = references[('trees', self.last_revision())]
2129
if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2130
raise errors.BzrCheckError(
2131
"Mismatched basis inventory content.")
2137
def check_state(self):
2138
"""Check that the working state is/isn't valid."""
2139
check_refs = self._get_check_refs()
2141
for ref in check_refs:
2144
refs[ref] = self.branch.repository.revision_tree(value)
2147
@needs_tree_write_lock
2148
def reset_state(self, revision_ids=None):
2149
"""Reset the state of the working tree.
2151
This does a hard-reset to a last-known-good state. This is a way to
2152
fix if something got corrupted (like the .bzr/checkout/dirstate file)
2154
if revision_ids is None:
2155
revision_ids = self.get_parent_ids()
2156
if not revision_ids:
2157
rt = self.branch.repository.revision_tree(
2158
_mod_revision.NULL_REVISION)
2160
rt = self.branch.repository.revision_tree(revision_ids[0])
2161
self._write_inventory(rt.inventory)
2162
self.set_parent_ids(revision_ids)
2165
"""Write the in memory inventory to disk."""
2166
# TODO: Maybe this should only write on dirty ?
2167
if self._control_files._lock_mode != 'w':
2168
raise errors.NotWriteLocked(self)
2170
self._serialize(self._inventory, sio)
2172
self._transport.put_file('inventory', sio,
2173
mode=self.bzrdir._get_file_mode())
2174
self._inventory_is_modified = False
2177
def get_file_sha1(self, file_id, path=None, stat_value=None):
2179
path = self._inventory.id2path(file_id)
2180
return self._hashcache.get_sha1(path, stat_value)
2182
def get_file_mtime(self, file_id, path=None):
2183
"""See Tree.get_file_mtime."""
2185
path = self.inventory.id2path(file_id)
2186
return os.lstat(self.abspath(path)).st_mtime
2188
def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
2189
file_id = self.path2id(path)
2191
# For unversioned files on win32, we just assume they are not
2194
return self._inventory[file_id].executable
2196
def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
2197
mode = stat_result.st_mode
2198
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
2200
if not supports_executable():
2201
def is_executable(self, file_id, path=None):
2202
return self._inventory[file_id].executable
2204
_is_executable_from_path_and_stat = \
2205
_is_executable_from_path_and_stat_from_basis
2207
def is_executable(self, file_id, path=None):
2209
path = self.id2path(file_id)
2210
mode = os.lstat(self.abspath(path)).st_mode
2211
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
2213
_is_executable_from_path_and_stat = \
2214
_is_executable_from_path_and_stat_from_stat
2216
@needs_tree_write_lock
2217
def _add(self, files, ids, kinds):
2218
"""See MutableTree._add."""
2219
# TODO: Re-adding a file that is removed in the working copy
2220
# should probably put it back with the previous ID.
2221
# the read and write working inventory should not occur in this
2222
# function - they should be part of lock_write and unlock.
2223
inv = self.inventory
2224
for f, file_id, kind in zip(files, ids, kinds):
2226
inv.add_path(f, kind=kind)
2228
inv.add_path(f, kind=kind, file_id=file_id)
2229
self._inventory_is_modified = True
2231
def revision_tree(self, revision_id):
2232
"""See WorkingTree.revision_id."""
2233
if revision_id == self.last_revision():
2235
xml = self.read_basis_inventory()
2236
except errors.NoSuchFile:
2240
inv = xml7.serializer_v7.read_inventory_from_string(xml)
2241
# dont use the repository revision_tree api because we want
2242
# to supply the inventory.
2243
if inv.revision_id == revision_id:
2244
return revisiontree.InventoryRevisionTree(
2245
self.branch.repository, inv, revision_id)
2246
except errors.BadInventoryFormat:
2248
# raise if there was no inventory, or if we read the wrong inventory.
2249
raise errors.NoSuchRevisionInTree(self, revision_id)
2252
def annotate_iter(self, file_id, default_revision=CURRENT_REVISION):
2253
"""See Tree.annotate_iter
2255
This implementation will use the basis tree implementation if possible.
2256
Lines not in the basis are attributed to CURRENT_REVISION
2258
If there are pending merges, lines added by those merges will be
2259
incorrectly attributed to CURRENT_REVISION (but after committing, the
2260
attribution will be correct).
2262
maybe_file_parent_keys = []
2263
for parent_id in self.get_parent_ids():
2265
parent_tree = self.revision_tree(parent_id)
2266
except errors.NoSuchRevisionInTree:
2267
parent_tree = self.branch.repository.revision_tree(parent_id)
2268
parent_tree.lock_read()
2270
if file_id not in parent_tree:
2272
ie = parent_tree.inventory[file_id]
2273
if ie.kind != 'file':
2274
# Note: this is slightly unnecessary, because symlinks and
2275
# directories have a "text" which is the empty text, and we
2276
# know that won't mess up annotations. But it seems cleaner
2278
parent_text_key = (file_id, ie.revision)
2279
if parent_text_key not in maybe_file_parent_keys:
2280
maybe_file_parent_keys.append(parent_text_key)
2282
parent_tree.unlock()
2283
graph = _mod_graph.Graph(self.branch.repository.texts)
2284
heads = graph.heads(maybe_file_parent_keys)
2285
file_parent_keys = []
2286
for key in maybe_file_parent_keys:
2288
file_parent_keys.append(key)
2290
# Now we have the parents of this content
2291
annotator = self.branch.repository.texts.get_annotator()
2292
text = self.get_file_text(file_id)
2293
this_key =(file_id, default_revision)
2294
annotator.add_special_text(this_key, file_parent_keys, text)
2295
annotations = [(key[-1], line)
2296
for key, line in annotator.annotate_flat(this_key)]
2300
def merge_modified(self):
2301
"""Return a dictionary of files modified by a merge.
2303
The list is initialized by WorkingTree.set_merge_modified, which is
2304
typically called after we make some automatic updates to the tree
2307
This returns a map of file_id->sha1, containing only files which are
2308
still in the working inventory and have that text hash.
2311
hashfile = self._transport.get('merge-hashes')
2312
except errors.NoSuchFile:
2317
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
2318
raise errors.MergeModifiedFormatError()
2319
except StopIteration:
2320
raise errors.MergeModifiedFormatError()
2321
for s in _mod_rio.RioReader(hashfile):
2322
# RioReader reads in Unicode, so convert file_ids back to utf8
2323
file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
2324
if file_id not in self.inventory:
2326
text_hash = s.get("hash")
2327
if text_hash == self.get_file_sha1(file_id):
2328
merge_hashes[file_id] = text_hash
2334
def subsume(self, other_tree):
2335
def add_children(inventory, entry):
2336
for child_entry in entry.children.values():
2337
inventory._byid[child_entry.file_id] = child_entry
2338
if child_entry.kind == 'directory':
2339
add_children(inventory, child_entry)
2340
if other_tree.get_root_id() == self.get_root_id():
2341
raise errors.BadSubsumeSource(self, other_tree,
2342
'Trees have the same root')
2344
other_tree_path = self.relpath(other_tree.basedir)
2345
except errors.PathNotChild:
2346
raise errors.BadSubsumeSource(self, other_tree,
2347
'Tree is not contained by the other')
2348
new_root_parent = self.path2id(osutils.dirname(other_tree_path))
2349
if new_root_parent is None:
2350
raise errors.BadSubsumeSource(self, other_tree,
2351
'Parent directory is not versioned.')
2352
# We need to ensure that the result of a fetch will have a
2353
# versionedfile for the other_tree root, and only fetching into
2354
# RepositoryKnit2 guarantees that.
2355
if not self.branch.repository.supports_rich_root():
2356
raise errors.SubsumeTargetNeedsUpgrade(other_tree)
2357
other_tree.lock_tree_write()
2359
new_parents = other_tree.get_parent_ids()
2360
other_root = other_tree.inventory.root
2361
other_root.parent_id = new_root_parent
2362
other_root.name = osutils.basename(other_tree_path)
2363
self.inventory.add(other_root)
2364
add_children(self.inventory, other_root)
2365
self._write_inventory(self.inventory)
2366
# normally we don't want to fetch whole repositories, but i think
2367
# here we really do want to consolidate the whole thing.
2368
for parent_id in other_tree.get_parent_ids():
2369
self.branch.fetch(other_tree.branch, parent_id)
2370
self.add_parent_tree_id(parent_id)
2373
other_tree.bzrdir.retire_bzrdir()
2375
@needs_tree_write_lock
2376
def extract(self, file_id, format=None):
2377
"""Extract a subtree from this tree.
2379
A new branch will be created, relative to the path for this tree.
2383
segments = osutils.splitpath(path)
2384
transport = self.branch.bzrdir.root_transport
2385
for name in segments:
2386
transport = transport.clone(name)
2387
transport.ensure_base()
2390
sub_path = self.id2path(file_id)
2391
branch_transport = mkdirs(sub_path)
2393
format = self.bzrdir.cloning_metadir()
2394
branch_transport.ensure_base()
2395
branch_bzrdir = format.initialize_on_transport(branch_transport)
2397
repo = branch_bzrdir.find_repository()
2398
except errors.NoRepositoryPresent:
2399
repo = branch_bzrdir.create_repository()
2400
if not repo.supports_rich_root():
2401
raise errors.RootNotRich()
2402
new_branch = branch_bzrdir.create_branch()
2403
new_branch.pull(self.branch)
2404
for parent_id in self.get_parent_ids():
2405
new_branch.fetch(self.branch, parent_id)
2406
tree_transport = self.bzrdir.root_transport.clone(sub_path)
2407
if tree_transport.base != branch_transport.base:
2408
tree_bzrdir = format.initialize_on_transport(tree_transport)
2409
branch.BranchReferenceFormat().initialize(tree_bzrdir,
2410
target_branch=new_branch)
2412
tree_bzrdir = branch_bzrdir
2413
wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
2414
wt.set_parent_ids(self.get_parent_ids())
2415
my_inv = self.inventory
2416
child_inv = inventory.Inventory(root_id=None)
2417
new_root = my_inv[file_id]
2418
my_inv.remove_recursive_id(file_id)
2419
new_root.parent_id = None
2420
child_inv.add(new_root)
2421
self._write_inventory(my_inv)
2422
wt._write_inventory(child_inv)
2425
def list_files(self, include_root=False, from_dir=None, recursive=True):
2426
"""List all files as (path, class, kind, id, entry).
2428
Lists, but does not descend into unversioned directories.
2429
This does not include files that have been deleted in this
2430
tree. Skips the control directory.
2432
:param include_root: if True, return an entry for the root
2433
:param from_dir: start from this directory or None for the root
2434
:param recursive: whether to recurse into subdirectories or not
2436
# list_files is an iterator, so @needs_read_lock doesn't work properly
2437
# with it. So callers should be careful to always read_lock the tree.
2438
if not self.is_locked():
2439
raise errors.ObjectNotLocked(self)
2441
inv = self.inventory
2442
if from_dir is None and include_root is True:
2443
yield ('', 'V', 'directory', inv.root.file_id, inv.root)
2444
# Convert these into local objects to save lookup times
2445
pathjoin = osutils.pathjoin
2446
file_kind = self._kind
2448
# transport.base ends in a slash, we want the piece
2449
# between the last two slashes
2450
transport_base_dir = self.bzrdir.transport.base.rsplit('/', 2)[1]
2452
fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
2454
# directory file_id, relative path, absolute path, reverse sorted children
2455
if from_dir is not None:
2456
from_dir_id = inv.path2id(from_dir)
2457
if from_dir_id is None:
2458
# Directory not versioned
2460
from_dir_abspath = pathjoin(self.basedir, from_dir)
2462
from_dir_id = inv.root.file_id
2463
from_dir_abspath = self.basedir
2464
children = os.listdir(from_dir_abspath)
2466
# jam 20060527 The kernel sized tree seems equivalent whether we
2467
# use a deque and popleft to keep them sorted, or if we use a plain
2468
# list and just reverse() them.
2469
children = collections.deque(children)
2470
stack = [(from_dir_id, u'', from_dir_abspath, children)]
2472
from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
2475
f = children.popleft()
2476
## TODO: If we find a subdirectory with its own .bzr
2477
## directory, then that is a separate tree and we
2478
## should exclude it.
2480
# the bzrdir for this tree
2481
if transport_base_dir == f:
2484
# we know that from_dir_relpath and from_dir_abspath never end in a slash
2485
# and 'f' doesn't begin with one, we can do a string op, rather
2486
# than the checks of pathjoin(), all relative paths will have an extra slash
2488
fp = from_dir_relpath + '/' + f
2491
fap = from_dir_abspath + '/' + f
2493
dir_ie = inv[from_dir_id]
2494
if dir_ie.kind == 'directory':
2495
f_ie = dir_ie.children.get(f)
2500
elif self.is_ignored(fp[1:]):
2503
# we may not have found this file, because of a unicode
2504
# issue, or because the directory was actually a symlink.
2505
f_norm, can_access = osutils.normalized_filename(f)
2506
if f == f_norm or not can_access:
2507
# No change, so treat this file normally
2510
# this file can be accessed by a normalized path
2511
# check again if it is versioned
2512
# these lines are repeated here for performance
2514
fp = from_dir_relpath + '/' + f
2515
fap = from_dir_abspath + '/' + f
2516
f_ie = inv.get_child(from_dir_id, f)
2519
elif self.is_ignored(fp[1:]):
2526
# make a last minute entry
2528
yield fp[1:], c, fk, f_ie.file_id, f_ie
2531
yield fp[1:], c, fk, None, fk_entries[fk]()
2533
yield fp[1:], c, fk, None, TreeEntry()
2536
if fk != 'directory':
2539
# But do this child first if recursing down
2541
new_children = os.listdir(fap)
2543
new_children = collections.deque(new_children)
2544
stack.append((f_ie.file_id, fp, fap, new_children))
2545
# Break out of inner loop,
2546
# so that we start outer loop with child
2549
# if we finished all children, pop it off the stack
2552
@needs_tree_write_lock
2553
def move(self, from_paths, to_dir=None, after=False):
2556
to_dir must exist in the inventory.
2558
If to_dir exists and is a directory, the files are moved into
2559
it, keeping their old names.
2561
Note that to_dir is only the last component of the new name;
2562
this doesn't change the directory.
2564
For each entry in from_paths the move mode will be determined
2567
The first mode moves the file in the filesystem and updates the
2568
inventory. The second mode only updates the inventory without
2569
touching the file on the filesystem.
2571
move uses the second mode if 'after == True' and the target is
2572
either not versioned or newly added, and present in the working tree.
2574
move uses the second mode if 'after == False' and the source is
2575
versioned but no longer in the working tree, and the target is not
2576
versioned but present in the working tree.
2578
move uses the first mode if 'after == False' and the source is
2579
versioned and present in the working tree, and the target is not
2580
versioned and not present in the working tree.
2582
Everything else results in an error.
2584
This returns a list of (from_path, to_path) pairs for each
2585
entry that is moved.
2590
# check for deprecated use of signature
2592
raise TypeError('You must supply a target directory')
2593
# check destination directory
2594
if isinstance(from_paths, basestring):
2596
inv = self.inventory
2597
to_abs = self.abspath(to_dir)
2598
if not isdir(to_abs):
2599
raise errors.BzrMoveFailedError('',to_dir,
2600
errors.NotADirectory(to_abs))
2601
if not self.has_filename(to_dir):
2602
raise errors.BzrMoveFailedError('',to_dir,
2603
errors.NotInWorkingDirectory(to_dir))
2604
to_dir_id = inv.path2id(to_dir)
2605
if to_dir_id is None:
2606
raise errors.BzrMoveFailedError('',to_dir,
2607
errors.NotVersionedError(path=to_dir))
2609
to_dir_ie = inv[to_dir_id]
2610
if to_dir_ie.kind != 'directory':
2611
raise errors.BzrMoveFailedError('',to_dir,
2612
errors.NotADirectory(to_abs))
2614
# create rename entries and tuples
2615
for from_rel in from_paths:
2616
from_tail = splitpath(from_rel)[-1]
2617
from_id = inv.path2id(from_rel)
2619
raise errors.BzrMoveFailedError(from_rel,to_dir,
2620
errors.NotVersionedError(path=from_rel))
2622
from_entry = inv[from_id]
2623
from_parent_id = from_entry.parent_id
2624
to_rel = pathjoin(to_dir, from_tail)
2625
rename_entry = InventoryWorkingTree._RenameEntry(
2628
from_tail=from_tail,
2629
from_parent_id=from_parent_id,
2630
to_rel=to_rel, to_tail=from_tail,
2631
to_parent_id=to_dir_id)
2632
rename_entries.append(rename_entry)
2633
rename_tuples.append((from_rel, to_rel))
2635
# determine which move mode to use. checks also for movability
2636
rename_entries = self._determine_mv_mode(rename_entries, after)
2638
original_modified = self._inventory_is_modified
2641
self._inventory_is_modified = True
2642
self._move(rename_entries)
2644
# restore the inventory on error
2645
self._inventory_is_modified = original_modified
2647
self._write_inventory(inv)
2648
return rename_tuples
2650
@needs_tree_write_lock
2651
def rename_one(self, from_rel, to_rel, after=False):
2654
This can change the directory or the filename or both.
2656
rename_one has several 'modes' to work. First, it can rename a physical
2657
file and change the file_id. That is the normal mode. Second, it can
2658
only change the file_id without touching any physical file.
2660
rename_one uses the second mode if 'after == True' and 'to_rel' is not
2661
versioned but present in the working tree.
2663
rename_one uses the second mode if 'after == False' and 'from_rel' is
2664
versioned but no longer in the working tree, and 'to_rel' is not
2665
versioned but present in the working tree.
2667
rename_one uses the first mode if 'after == False' and 'from_rel' is
2668
versioned and present in the working tree, and 'to_rel' is not
2669
versioned and not present in the working tree.
2671
Everything else results in an error.
2673
inv = self.inventory
2676
# create rename entries and tuples
2677
from_tail = splitpath(from_rel)[-1]
2678
from_id = inv.path2id(from_rel)
2680
# if file is missing in the inventory maybe it's in the basis_tree
2681
basis_tree = self.branch.basis_tree()
2682
from_id = basis_tree.path2id(from_rel)
2684
raise errors.BzrRenameFailedError(from_rel,to_rel,
2685
errors.NotVersionedError(path=from_rel))
2686
# put entry back in the inventory so we can rename it
2687
from_entry = basis_tree.inventory[from_id].copy()
2690
from_entry = inv[from_id]
2691
from_parent_id = from_entry.parent_id
2692
to_dir, to_tail = os.path.split(to_rel)
2693
to_dir_id = inv.path2id(to_dir)
2694
rename_entry = InventoryWorkingTree._RenameEntry(from_rel=from_rel,
2696
from_tail=from_tail,
2697
from_parent_id=from_parent_id,
2698
to_rel=to_rel, to_tail=to_tail,
2699
to_parent_id=to_dir_id)
2700
rename_entries.append(rename_entry)
2702
# determine which move mode to use. checks also for movability
2703
rename_entries = self._determine_mv_mode(rename_entries, after)
2705
# check if the target changed directory and if the target directory is
2707
if to_dir_id is None:
2708
raise errors.BzrMoveFailedError(from_rel,to_rel,
2709
errors.NotVersionedError(path=to_dir))
2711
# all checks done. now we can continue with our actual work
2712
mutter('rename_one:\n'
2717
' to_dir_id {%s}\n',
2718
from_id, from_rel, to_rel, to_dir, to_dir_id)
2720
self._move(rename_entries)
2721
self._write_inventory(inv)
2723
class _RenameEntry(object):
2724
def __init__(self, from_rel, from_id, from_tail, from_parent_id,
2725
to_rel, to_tail, to_parent_id, only_change_inv=False,
2727
self.from_rel = from_rel
2728
self.from_id = from_id
2729
self.from_tail = from_tail
2730
self.from_parent_id = from_parent_id
2731
self.to_rel = to_rel
2732
self.to_tail = to_tail
2733
self.to_parent_id = to_parent_id
2734
self.change_id = change_id
2735
self.only_change_inv = only_change_inv
2737
def _determine_mv_mode(self, rename_entries, after=False):
2738
"""Determines for each from-to pair if both inventory and working tree
2739
or only the inventory has to be changed.
2741
Also does basic plausability tests.
2743
inv = self.inventory
2745
for rename_entry in rename_entries:
2746
# store to local variables for easier reference
2747
from_rel = rename_entry.from_rel
2748
from_id = rename_entry.from_id
2749
to_rel = rename_entry.to_rel
2750
to_id = inv.path2id(to_rel)
2751
only_change_inv = False
2754
# check the inventory for source and destination
2756
raise errors.BzrMoveFailedError(from_rel,to_rel,
2757
errors.NotVersionedError(path=from_rel))
2758
if to_id is not None:
2760
# allow it with --after but only if dest is newly added
2762
basis = self.basis_tree()
2765
if not basis.has_id(to_id):
2766
rename_entry.change_id = True
2771
raise errors.BzrMoveFailedError(from_rel,to_rel,
2772
errors.AlreadyVersionedError(path=to_rel))
2774
# try to determine the mode for rename (only change inv or change
2775
# inv and file system)
2777
if not self.has_filename(to_rel):
2778
raise errors.BzrMoveFailedError(from_id,to_rel,
2779
errors.NoSuchFile(path=to_rel,
2780
extra="New file has not been created yet"))
2781
only_change_inv = True
2782
elif not self.has_filename(from_rel) and self.has_filename(to_rel):
2783
only_change_inv = True
2784
elif self.has_filename(from_rel) and not self.has_filename(to_rel):
2785
only_change_inv = False
2786
elif (not self.case_sensitive
2787
and from_rel.lower() == to_rel.lower()
2788
and self.has_filename(from_rel)):
2789
only_change_inv = False
2791
# something is wrong, so lets determine what exactly
2792
if not self.has_filename(from_rel) and \
2793
not self.has_filename(to_rel):
2794
raise errors.BzrRenameFailedError(from_rel,to_rel,
2795
errors.PathsDoNotExist(paths=(str(from_rel),
2798
raise errors.RenameFailedFilesExist(from_rel, to_rel)
2799
rename_entry.only_change_inv = only_change_inv
2800
return rename_entries
2802
def _move(self, rename_entries):
2803
"""Moves a list of files.
2805
Depending on the value of the flag 'only_change_inv', the
2806
file will be moved on the file system or not.
2808
inv = self.inventory
2811
for entry in rename_entries:
2813
self._move_entry(entry)
2815
self._rollback_move(moved)
2819
def _rollback_move(self, moved):
2820
"""Try to rollback a previous move in case of an filesystem error."""
2821
inv = self.inventory
2824
self._move_entry(WorkingTree._RenameEntry(
2825
entry.to_rel, entry.from_id,
2826
entry.to_tail, entry.to_parent_id, entry.from_rel,
2827
entry.from_tail, entry.from_parent_id,
2828
entry.only_change_inv))
2829
except errors.BzrMoveFailedError, e:
2830
raise errors.BzrMoveFailedError( '', '', "Rollback failed."
2831
" The working tree is in an inconsistent state."
2832
" Please consider doing a 'bzr revert'."
2833
" Error message is: %s" % e)
2835
def _move_entry(self, entry):
2836
inv = self.inventory
2837
from_rel_abs = self.abspath(entry.from_rel)
2838
to_rel_abs = self.abspath(entry.to_rel)
2839
if from_rel_abs == to_rel_abs:
2840
raise errors.BzrMoveFailedError(entry.from_rel, entry.to_rel,
2841
"Source and target are identical.")
2843
if not entry.only_change_inv:
2845
osutils.rename(from_rel_abs, to_rel_abs)
2847
raise errors.BzrMoveFailedError(entry.from_rel,
2850
to_id = inv.path2id(entry.to_rel)
2851
inv.remove_recursive_id(to_id)
2852
inv.rename(entry.from_id, entry.to_parent_id, entry.to_tail)
2854
@needs_tree_write_lock
2855
def unversion(self, file_ids):
2856
"""Remove the file ids in file_ids from the current versioned set.
2858
When a file_id is unversioned, all of its children are automatically
2861
:param file_ids: The file ids to stop versioning.
2862
:raises: NoSuchId if any fileid is not currently versioned.
2864
for file_id in file_ids:
2865
if file_id not in self._inventory:
2866
raise errors.NoSuchId(self, file_id)
2867
for file_id in file_ids:
2868
if self._inventory.has_id(file_id):
2869
self._inventory.remove_recursive_id(file_id)
2871
# in the future this should just set a dirty bit to wait for the
2872
# final unlock. However, until all methods of workingtree start
2873
# with the current in -memory inventory rather than triggering
2874
# a read, it is more complex - we need to teach read_inventory
2875
# to know when to read, and when to not read first... and possibly
2876
# to save first when the in memory one may be corrupted.
2877
# so for now, we just only write it if it is indeed dirty.
2879
self._write_inventory(self._inventory)
2881
def stored_kind(self, file_id):
2882
"""See Tree.stored_kind"""
2883
return self.inventory[file_id].kind
2886
"""Yield all unversioned files in this WorkingTree.
2888
If there are any unversioned directories then only the directory is
2889
returned, not all its children. But if there are unversioned files
2890
under a versioned subdirectory, they are returned.
2892
Currently returned depth-first, sorted by name within directories.
2893
This is the same order used by 'osutils.walkdirs'.
2895
## TODO: Work from given directory downwards
2896
for path, dir_entry in self.inventory.directories():
2897
# mutter("search for unknowns in %r", path)
2898
dirabs = self.abspath(path)
2899
if not isdir(dirabs):
2900
# e.g. directory deleted
2904
for subf in os.listdir(dirabs):
2905
if self.bzrdir.is_control_filename(subf):
2907
if subf not in dir_entry.children:
2910
can_access) = osutils.normalized_filename(subf)
2911
except UnicodeDecodeError:
2912
path_os_enc = path.encode(osutils._fs_enc)
2913
relpath = path_os_enc + '/' + subf
2914
raise errors.BadFilenameEncoding(relpath,
2916
if subf_norm != subf and can_access:
2917
if subf_norm not in dir_entry.children:
2918
fl.append(subf_norm)
2924
subp = pathjoin(path, subf)
2927
def _walkdirs(self, prefix=""):
2928
"""Walk the directories of this tree.
2930
:param prefix: is used as the directrory to start with.
2931
:returns: a generator which yields items in the form::
2933
((curren_directory_path, fileid),
2934
[(file1_path, file1_name, file1_kind, None, file1_id,
2937
_directory = 'directory'
2938
# get the root in the inventory
2939
inv = self.inventory
2940
top_id = inv.path2id(prefix)
2944
pending = [(prefix, '', _directory, None, top_id, None)]
2947
currentdir = pending.pop()
2948
# 0 - relpath, 1- basename, 2- kind, 3- stat, 4-id, 5-kind
2949
top_id = currentdir[4]
2951
relroot = currentdir[0] + '/'
2954
# FIXME: stash the node in pending
2956
if entry.kind == 'directory':
2957
for name, child in entry.sorted_children():
2958
dirblock.append((relroot + name, name, child.kind, None,
2959
child.file_id, child.kind
2961
yield (currentdir[0], entry.file_id), dirblock
2962
# push the user specified dirs from dirblock
2963
for dir in reversed(dirblock):
2964
if dir[2] == _directory:
2968
class WorkingTreeFormatRegistry(controldir.ControlComponentFormatRegistry):
2969
"""Registry for working tree formats."""
2971
def __init__(self, other_registry=None):
2972
super(WorkingTreeFormatRegistry, self).__init__(other_registry)
2973
self._default_format = None
2974
self._default_format_key = None
2976
def get_default(self):
2977
"""Return the current default format."""
2978
if (self._default_format_key is not None and
2979
self._default_format is None):
2980
self._default_format = self.get(self._default_format_key)
2981
return self._default_format
2983
def set_default(self, format):
2984
"""Set the default format."""
2985
self._default_format = format
2986
self._default_format_key = None
2988
def set_default_key(self, format_string):
2989
"""Set the default format by its format string."""
2990
self._default_format_key = format_string
2991
self._default_format = None
2994
format_registry = WorkingTreeFormatRegistry()
2997
class WorkingTreeFormat(controldir.ControlComponentFormat):
2750
2998
"""An encapsulation of the initialization and open routines for a format.
2752
3000
Formats provide three things:
3101
@symbol_versioning.deprecated_method(
3102
symbol_versioning.deprecated_in((2, 4, 0)))
2827
3103
def register_format(klass, format):
2828
klass._formats[format.get_format_string()] = format
3104
format_registry.register(format)
3107
@symbol_versioning.deprecated_method(
3108
symbol_versioning.deprecated_in((2, 4, 0)))
3109
def register_extra_format(klass, format):
3110
format_registry.register_extra(format)
3113
@symbol_versioning.deprecated_method(
3114
symbol_versioning.deprecated_in((2, 4, 0)))
3115
def unregister_extra_format(klass, format):
3116
format_registry.unregister_extra(format)
3119
@symbol_versioning.deprecated_method(
3120
symbol_versioning.deprecated_in((2, 4, 0)))
3121
def get_formats(klass):
3122
return format_registry._get_all()
3125
@symbol_versioning.deprecated_method(
3126
symbol_versioning.deprecated_in((2, 4, 0)))
2831
3127
def set_default_format(klass, format):
2832
klass._default_format = format
3128
format_registry.set_default(format)
3131
@symbol_versioning.deprecated_method(
3132
symbol_versioning.deprecated_in((2, 4, 0)))
2835
3133
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(),
3134
format_registry.remove(format)
3137
format_registry.register_lazy("Bazaar Working Tree Format 4 (bzr 0.15)\n",
3138
"bzrlib.workingtree_4", "WorkingTreeFormat4")
3139
format_registry.register_lazy("Bazaar Working Tree Format 5 (bzr 1.11)\n",
3140
"bzrlib.workingtree_4", "WorkingTreeFormat5")
3141
format_registry.register_lazy("Bazaar Working Tree Format 6 (bzr 1.14)\n",
3142
"bzrlib.workingtree_4", "WorkingTreeFormat6")
3143
format_registry.register_lazy("Bazaar-NG Working Tree format 3",
3144
"bzrlib.workingtree_3", "WorkingTreeFormat3")
3145
format_registry.set_default_key("Bazaar Working Tree Format 6 (bzr 1.14)\n")
added
removed
bzrlib/workingtree.py
