2608
1817
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.
1820
class InventoryWorkingTree(WorkingTree,
1821
bzrlib.mutabletree.MutableInventoryTree):
1822
"""Base class for working trees that are inventory-oriented.
1824
The inventory is held in the `Branch` working-inventory, and the
1825
files are in a directory on disk.
1827
It is possible for a `WorkingTree` to have a filename which is
1828
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()
1831
def __init__(self, basedir='.',
1832
branch=DEPRECATED_PARAMETER,
1834
_control_files=None,
1838
"""Construct a InventoryWorkingTree instance. This is not a public API.
1840
:param branch: A branch to override probing for the branch.
1842
super(InventoryWorkingTree, self).__init__(basedir=basedir,
1843
branch=branch, _control_files=_control_files, _internal=_internal,
1844
_format=_format, _bzrdir=_bzrdir)
1846
if _inventory is None:
1847
# This will be acquired on lock_read() or lock_write()
1848
self._inventory_is_modified = False
1849
self._inventory = None
1851
# the caller of __init__ has provided an inventory,
1852
# we assume they know what they are doing - as its only
1853
# the Format factory and creation methods that are
1854
# permitted to do this.
1855
self._set_inventory(_inventory, dirty=False)
1857
def _set_inventory(self, inv, dirty):
1858
"""Set the internal cached inventory.
1860
:param inv: The inventory to set.
1861
:param dirty: A boolean indicating whether the inventory is the same
1862
logical inventory as whats on disk. If True the inventory is not
1863
the same and should be written to disk or data will be lost, if
1864
False then the inventory is the same as that on disk and any
1865
serialisation would be unneeded overhead.
1867
self._inventory = inv
1868
self._inventory_is_modified = dirty
1870
def _serialize(self, inventory, out_file):
1871
xml5.serializer_v5.write_inventory(self._inventory, out_file,
1874
def _deserialize(selt, in_file):
1875
return xml5.serializer_v5.read_inventory(in_file)
1877
@needs_tree_write_lock
1878
def _write_inventory(self, inv):
1879
"""Write inventory as the current inventory."""
1880
self._set_inventory(inv, dirty=True)
1883
# XXX: This method should be deprecated in favour of taking in a proper
1884
# new Inventory object.
1885
@needs_tree_write_lock
1886
def set_inventory(self, new_inventory_list):
1887
from bzrlib.inventory import (Inventory,
1891
inv = Inventory(self.get_root_id())
1892
for path, file_id, parent, kind in new_inventory_list:
1893
name = os.path.basename(path)
1896
# fixme, there should be a factory function inv,add_??
1897
if kind == 'directory':
1898
inv.add(InventoryDirectory(file_id, name, parent))
1899
elif kind == 'file':
1900
inv.add(InventoryFile(file_id, name, parent))
1901
elif kind == 'symlink':
1902
inv.add(InventoryLink(file_id, name, parent))
1904
raise errors.BzrError("unknown kind %r" % kind)
1905
self._write_inventory(inv)
1907
def _write_basis_inventory(self, xml):
1908
"""Write the basis inventory XML to the basis-inventory file"""
1909
path = self._basis_inventory_name()
1911
self._transport.put_file(path, sio,
1912
mode=self.bzrdir._get_file_mode())
1914
def _reset_data(self):
1915
"""Reset transient data that cannot be revalidated."""
1916
self._inventory_is_modified = False
1917
f = self._transport.get('inventory')
1919
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."""
1922
self._set_inventory(result, dirty=False)
1924
def _set_root_id(self, file_id):
1925
"""Set the root id for this tree, in a format specific manner.
1927
:param file_id: The file id to assign to the root. It must not be
1928
present in the current inventory or an error will occur. It must
1929
not be None, but rather a valid file id.
1931
inv = self._inventory
1932
orig_root_id = inv.root.file_id
1933
# TODO: it might be nice to exit early if there was nothing
1934
# to do, saving us from trigger a sync on unlock.
1935
self._inventory_is_modified = True
1936
# we preserve the root inventory entry object, but
1937
# unlinkit from the byid index
1938
del inv._byid[inv.root.file_id]
1939
inv.root.file_id = file_id
1940
# and link it into the index with the new changed id.
1941
inv._byid[inv.root.file_id] = inv.root
1942
# and finally update all children to reference the new id.
1943
# XXX: this should be safe to just look at the root.children
1944
# list, not the WHOLE INVENTORY.
1947
if entry.parent_id == orig_root_id:
1948
entry.parent_id = inv.root.file_id
1950
def all_file_ids(self):
1951
"""See Tree.iter_all_file_ids"""
1952
return set(self.inventory)
1954
@needs_tree_write_lock
1955
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
1956
"""See MutableTree.set_parent_trees."""
1957
parent_ids = [rev for (rev, tree) in parents_list]
1958
for revision_id in parent_ids:
1959
_mod_revision.check_not_reserved_id(revision_id)
1961
self._check_parents_for_ghosts(parent_ids,
1962
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
1964
parent_ids = self._filter_parent_ids_by_ancestry(parent_ids)
1966
if len(parent_ids) == 0:
1967
leftmost_parent_id = _mod_revision.NULL_REVISION
1968
leftmost_parent_tree = None
1970
leftmost_parent_id, leftmost_parent_tree = parents_list[0]
1972
if self._change_last_revision(leftmost_parent_id):
1973
if leftmost_parent_tree is None:
1974
# If we don't have a tree, fall back to reading the
1975
# parent tree from the repository.
1976
self._cache_basis_inventory(leftmost_parent_id)
1978
inv = leftmost_parent_tree.inventory
1979
xml = self._create_basis_xml_from_inventory(
1980
leftmost_parent_id, inv)
1981
self._write_basis_inventory(xml)
1982
self._set_merges_from_parent_ids(parent_ids)
1984
def _cache_basis_inventory(self, new_revision):
1985
"""Cache new_revision as the basis inventory."""
1986
# TODO: this should allow the ready-to-use inventory to be passed in,
1987
# 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())]
1990
# this double handles the inventory - unpack and repack -
1991
# but is easier to understand. We can/should put a conditional
1992
# in here based on whether the inventory is in the latest format
1993
# - perhaps we should repack all inventories on a repository
1995
# the fast path is to copy the raw xml from the repository. If the
1996
# xml contains 'revision_id="', then we assume the right
1997
# revision_id is set. We must check for this full string, because a
1998
# root node id can legitimately look like 'revision_id' but cannot
2000
xml = self.branch.repository._get_inventory_xml(new_revision)
2001
firstline = xml.split('\n', 1)[0]
2002
if (not 'revision_id="' in firstline or
2003
'format="7"' not in firstline):
2004
inv = self.branch.repository._serializer.read_inventory_from_string(
2006
xml = self._create_basis_xml_from_inventory(new_revision, inv)
2007
self._write_basis_inventory(xml)
2008
except (errors.NoSuchRevision, errors.RevisionNotPresent):
2011
def _basis_inventory_name(self):
2012
return 'basis-inventory-cache'
2014
def _create_basis_xml_from_inventory(self, revision_id, inventory):
2015
"""Create the text that will be saved in basis-inventory"""
2016
inventory.revision_id = revision_id
2017
return xml7.serializer_v7.write_inventory_to_string(inventory)
2700
2019
@needs_tree_write_lock
2701
2020
def set_conflicts(self, conflicts):
2721
2040
raise errors.ConflictFormatError()
2722
2041
except StopIteration:
2723
2042
raise errors.ConflictFormatError()
2724
return _mod_conflicts.ConflictList.from_stanzas(RioReader(confile))
2043
reader = _mod_rio.RioReader(confile)
2044
return _mod_conflicts.ConflictList.from_stanzas(reader)
2726
2046
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):
2048
def read_basis_inventory(self):
2049
"""Read the cached basis inventory."""
2050
path = self._basis_inventory_name()
2051
return self._transport.get_bytes(path)
2054
def read_working_inventory(self):
2055
"""Read the working inventory.
2057
:raises errors.InventoryModified: read_working_inventory will fail
2058
when the current in memory inventory has been modified.
2060
# conceptually this should be an implementation detail of the tree.
2061
# XXX: Deprecate this.
2062
# ElementTree does its own conversion from UTF-8, so open in
2064
if self._inventory_is_modified:
2065
raise errors.InventoryModified(self)
2066
f = self._transport.get('inventory')
2068
result = self._deserialize(f)
2071
self._set_inventory(result, dirty=False)
2075
def get_root_id(self):
2076
"""Return the id of this trees root"""
2077
return self._inventory.root.file_id
2079
def has_id(self, file_id):
2080
# files that have been deleted are excluded
2081
inv = self.inventory
2082
if not inv.has_id(file_id):
2084
path = inv.id2path(file_id)
2085
return osutils.lexists(self.abspath(path))
2087
def has_or_had_id(self, file_id):
2088
if file_id == self.inventory.root.file_id:
2090
return self.inventory.has_id(file_id)
2092
@symbol_versioning.deprecated_method(symbol_versioning.deprecated_in((2, 4, 0)))
2094
"""Iterate through file_ids for this tree.
2096
file_ids are in a WorkingTree if they are in the working inventory
2097
and the working file exists.
2099
inv = self._inventory
2100
for path, ie in inv.iter_entries():
2101
if osutils.lexists(self.abspath(path)):
2104
@needs_tree_write_lock
2105
def set_last_revision(self, new_revision):
2106
"""Change the last revision in the working tree."""
2107
if self._change_last_revision(new_revision):
2108
self._cache_basis_inventory(new_revision)
2110
def _get_check_refs(self):
2111
"""Return the references needed to perform a check of this tree.
2113
The default implementation returns no refs, and is only suitable for
2114
trees that have no local caching and can commit on ghosts at any time.
2116
:seealso: bzrlib.check for details about check_refs.
2121
def _check(self, references):
2122
"""Check the tree for consistency.
2124
:param references: A dict with keys matching the items returned by
2125
self._get_check_refs(), and values from looking those keys up in
2128
tree_basis = self.basis_tree()
2129
tree_basis.lock_read()
2131
repo_basis = references[('trees', self.last_revision())]
2132
if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2133
raise errors.BzrCheckError(
2134
"Mismatched basis inventory content.")
2140
def check_state(self):
2141
"""Check that the working state is/isn't valid."""
2142
check_refs = self._get_check_refs()
2144
for ref in check_refs:
2147
refs[ref] = self.branch.repository.revision_tree(value)
2150
@needs_tree_write_lock
2151
def reset_state(self, revision_ids=None):
2152
"""Reset the state of the working tree.
2154
This does a hard-reset to a last-known-good state. This is a way to
2155
fix if something got corrupted (like the .bzr/checkout/dirstate file)
2157
if revision_ids is None:
2158
revision_ids = self.get_parent_ids()
2159
if not revision_ids:
2160
rt = self.branch.repository.revision_tree(
2161
_mod_revision.NULL_REVISION)
2163
rt = self.branch.repository.revision_tree(revision_ids[0])
2164
self._write_inventory(rt.inventory)
2165
self.set_parent_ids(revision_ids)
2168
"""Write the in memory inventory to disk."""
2169
# TODO: Maybe this should only write on dirty ?
2170
if self._control_files._lock_mode != 'w':
2171
raise errors.NotWriteLocked(self)
2173
self._serialize(self._inventory, sio)
2175
self._transport.put_file('inventory', sio,
2176
mode=self.bzrdir._get_file_mode())
2177
self._inventory_is_modified = False
2180
def get_file_sha1(self, file_id, path=None, stat_value=None):
2182
path = self._inventory.id2path(file_id)
2183
return self._hashcache.get_sha1(path, stat_value)
2185
def get_file_mtime(self, file_id, path=None):
2186
"""See Tree.get_file_mtime."""
2188
path = self.inventory.id2path(file_id)
2189
return os.lstat(self.abspath(path)).st_mtime
2191
def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
2192
file_id = self.path2id(path)
2194
# For unversioned files on win32, we just assume they are not
2197
return self._inventory[file_id].executable
2199
def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
2200
mode = stat_result.st_mode
2201
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
2203
if not supports_executable():
2204
def is_executable(self, file_id, path=None):
2205
return self._inventory[file_id].executable
2207
_is_executable_from_path_and_stat = \
2208
_is_executable_from_path_and_stat_from_basis
2210
def is_executable(self, file_id, path=None):
2212
path = self.id2path(file_id)
2213
mode = os.lstat(self.abspath(path)).st_mode
2214
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
2216
_is_executable_from_path_and_stat = \
2217
_is_executable_from_path_and_stat_from_stat
2219
@needs_tree_write_lock
2220
def _add(self, files, ids, kinds):
2221
"""See MutableTree._add."""
2222
# TODO: Re-adding a file that is removed in the working copy
2223
# should probably put it back with the previous ID.
2224
# the read and write working inventory should not occur in this
2225
# function - they should be part of lock_write and unlock.
2226
inv = self.inventory
2227
for f, file_id, kind in zip(files, ids, kinds):
2229
inv.add_path(f, kind=kind)
2231
inv.add_path(f, kind=kind, file_id=file_id)
2232
self._inventory_is_modified = True
2234
def revision_tree(self, revision_id):
2235
"""See WorkingTree.revision_id."""
2236
if revision_id == self.last_revision():
2238
xml = self.read_basis_inventory()
2239
except errors.NoSuchFile:
2243
inv = xml7.serializer_v7.read_inventory_from_string(xml)
2244
# dont use the repository revision_tree api because we want
2245
# to supply the inventory.
2246
if inv.revision_id == revision_id:
2247
return revisiontree.InventoryRevisionTree(
2248
self.branch.repository, inv, revision_id)
2249
except errors.BadInventoryFormat:
2251
# raise if there was no inventory, or if we read the wrong inventory.
2252
raise errors.NoSuchRevisionInTree(self, revision_id)
2255
def annotate_iter(self, file_id, default_revision=CURRENT_REVISION):
2256
"""See Tree.annotate_iter
2258
This implementation will use the basis tree implementation if possible.
2259
Lines not in the basis are attributed to CURRENT_REVISION
2261
If there are pending merges, lines added by those merges will be
2262
incorrectly attributed to CURRENT_REVISION (but after committing, the
2263
attribution will be correct).
2265
maybe_file_parent_keys = []
2266
for parent_id in self.get_parent_ids():
2268
parent_tree = self.revision_tree(parent_id)
2269
except errors.NoSuchRevisionInTree:
2270
parent_tree = self.branch.repository.revision_tree(parent_id)
2271
parent_tree.lock_read()
2273
if not parent_tree.has_id(file_id):
2275
ie = parent_tree.inventory[file_id]
2276
if ie.kind != 'file':
2277
# Note: this is slightly unnecessary, because symlinks and
2278
# directories have a "text" which is the empty text, and we
2279
# know that won't mess up annotations. But it seems cleaner
2281
parent_text_key = (file_id, ie.revision)
2282
if parent_text_key not in maybe_file_parent_keys:
2283
maybe_file_parent_keys.append(parent_text_key)
2285
parent_tree.unlock()
2286
graph = _mod_graph.Graph(self.branch.repository.texts)
2287
heads = graph.heads(maybe_file_parent_keys)
2288
file_parent_keys = []
2289
for key in maybe_file_parent_keys:
2291
file_parent_keys.append(key)
2293
# Now we have the parents of this content
2294
annotator = self.branch.repository.texts.get_annotator()
2295
text = self.get_file_text(file_id)
2296
this_key =(file_id, default_revision)
2297
annotator.add_special_text(this_key, file_parent_keys, text)
2298
annotations = [(key[-1], line)
2299
for key, line in annotator.annotate_flat(this_key)]
2303
def merge_modified(self):
2304
"""Return a dictionary of files modified by a merge.
2306
The list is initialized by WorkingTree.set_merge_modified, which is
2307
typically called after we make some automatic updates to the tree
2310
This returns a map of file_id->sha1, containing only files which are
2311
still in the working inventory and have that text hash.
2314
hashfile = self._transport.get('merge-hashes')
2315
except errors.NoSuchFile:
2320
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
2321
raise errors.MergeModifiedFormatError()
2322
except StopIteration:
2323
raise errors.MergeModifiedFormatError()
2324
for s in _mod_rio.RioReader(hashfile):
2325
# RioReader reads in Unicode, so convert file_ids back to utf8
2326
file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
2327
if not self.inventory.has_id(file_id):
2329
text_hash = s.get("hash")
2330
if text_hash == self.get_file_sha1(file_id):
2331
merge_hashes[file_id] = text_hash
2337
def subsume(self, other_tree):
2338
def add_children(inventory, entry):
2339
for child_entry in entry.children.values():
2340
inventory._byid[child_entry.file_id] = child_entry
2341
if child_entry.kind == 'directory':
2342
add_children(inventory, child_entry)
2343
if other_tree.get_root_id() == self.get_root_id():
2344
raise errors.BadSubsumeSource(self, other_tree,
2345
'Trees have the same root')
2347
other_tree_path = self.relpath(other_tree.basedir)
2348
except errors.PathNotChild:
2349
raise errors.BadSubsumeSource(self, other_tree,
2350
'Tree is not contained by the other')
2351
new_root_parent = self.path2id(osutils.dirname(other_tree_path))
2352
if new_root_parent is None:
2353
raise errors.BadSubsumeSource(self, other_tree,
2354
'Parent directory is not versioned.')
2355
# We need to ensure that the result of a fetch will have a
2356
# versionedfile for the other_tree root, and only fetching into
2357
# RepositoryKnit2 guarantees that.
2358
if not self.branch.repository.supports_rich_root():
2359
raise errors.SubsumeTargetNeedsUpgrade(other_tree)
2360
other_tree.lock_tree_write()
2362
new_parents = other_tree.get_parent_ids()
2363
other_root = other_tree.inventory.root
2364
other_root.parent_id = new_root_parent
2365
other_root.name = osutils.basename(other_tree_path)
2366
self.inventory.add(other_root)
2367
add_children(self.inventory, other_root)
2368
self._write_inventory(self.inventory)
2369
# normally we don't want to fetch whole repositories, but i think
2370
# here we really do want to consolidate the whole thing.
2371
for parent_id in other_tree.get_parent_ids():
2372
self.branch.fetch(other_tree.branch, parent_id)
2373
self.add_parent_tree_id(parent_id)
2376
other_tree.bzrdir.retire_bzrdir()
2378
@needs_tree_write_lock
2379
def extract(self, file_id, format=None):
2380
"""Extract a subtree from this tree.
2382
A new branch will be created, relative to the path for this tree.
2386
segments = osutils.splitpath(path)
2387
transport = self.branch.bzrdir.root_transport
2388
for name in segments:
2389
transport = transport.clone(name)
2390
transport.ensure_base()
2393
sub_path = self.id2path(file_id)
2394
branch_transport = mkdirs(sub_path)
2396
format = self.bzrdir.cloning_metadir()
2397
branch_transport.ensure_base()
2398
branch_bzrdir = format.initialize_on_transport(branch_transport)
2400
repo = branch_bzrdir.find_repository()
2401
except errors.NoRepositoryPresent:
2402
repo = branch_bzrdir.create_repository()
2403
if not repo.supports_rich_root():
2404
raise errors.RootNotRich()
2405
new_branch = branch_bzrdir.create_branch()
2406
new_branch.pull(self.branch)
2407
for parent_id in self.get_parent_ids():
2408
new_branch.fetch(self.branch, parent_id)
2409
tree_transport = self.bzrdir.root_transport.clone(sub_path)
2410
if tree_transport.base != branch_transport.base:
2411
tree_bzrdir = format.initialize_on_transport(tree_transport)
2412
branch.BranchReferenceFormat().initialize(tree_bzrdir,
2413
target_branch=new_branch)
2415
tree_bzrdir = branch_bzrdir
2416
wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
2417
wt.set_parent_ids(self.get_parent_ids())
2418
my_inv = self.inventory
2419
child_inv = inventory.Inventory(root_id=None)
2420
new_root = my_inv[file_id]
2421
my_inv.remove_recursive_id(file_id)
2422
new_root.parent_id = None
2423
child_inv.add(new_root)
2424
self._write_inventory(my_inv)
2425
wt._write_inventory(child_inv)
2428
def list_files(self, include_root=False, from_dir=None, recursive=True):
2429
"""List all files as (path, class, kind, id, entry).
2431
Lists, but does not descend into unversioned directories.
2432
This does not include files that have been deleted in this
2433
tree. Skips the control directory.
2435
:param include_root: if True, return an entry for the root
2436
:param from_dir: start from this directory or None for the root
2437
:param recursive: whether to recurse into subdirectories or not
2439
# list_files is an iterator, so @needs_read_lock doesn't work properly
2440
# with it. So callers should be careful to always read_lock the tree.
2441
if not self.is_locked():
2442
raise errors.ObjectNotLocked(self)
2444
inv = self.inventory
2445
if from_dir is None and include_root is True:
2446
yield ('', 'V', 'directory', inv.root.file_id, inv.root)
2447
# Convert these into local objects to save lookup times
2448
pathjoin = osutils.pathjoin
2449
file_kind = self._kind
2451
# transport.base ends in a slash, we want the piece
2452
# between the last two slashes
2453
transport_base_dir = self.bzrdir.transport.base.rsplit('/', 2)[1]
2455
fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
2457
# directory file_id, relative path, absolute path, reverse sorted children
2458
if from_dir is not None:
2459
from_dir_id = inv.path2id(from_dir)
2460
if from_dir_id is None:
2461
# Directory not versioned
2463
from_dir_abspath = pathjoin(self.basedir, from_dir)
2465
from_dir_id = inv.root.file_id
2466
from_dir_abspath = self.basedir
2467
children = os.listdir(from_dir_abspath)
2469
# jam 20060527 The kernel sized tree seems equivalent whether we
2470
# use a deque and popleft to keep them sorted, or if we use a plain
2471
# list and just reverse() them.
2472
children = collections.deque(children)
2473
stack = [(from_dir_id, u'', from_dir_abspath, children)]
2475
from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
2478
f = children.popleft()
2479
## TODO: If we find a subdirectory with its own .bzr
2480
## directory, then that is a separate tree and we
2481
## should exclude it.
2483
# the bzrdir for this tree
2484
if transport_base_dir == f:
2487
# we know that from_dir_relpath and from_dir_abspath never end in a slash
2488
# and 'f' doesn't begin with one, we can do a string op, rather
2489
# than the checks of pathjoin(), all relative paths will have an extra slash
2491
fp = from_dir_relpath + '/' + f
2494
fap = from_dir_abspath + '/' + f
2496
dir_ie = inv[from_dir_id]
2497
if dir_ie.kind == 'directory':
2498
f_ie = dir_ie.children.get(f)
2503
elif self.is_ignored(fp[1:]):
2506
# we may not have found this file, because of a unicode
2507
# issue, or because the directory was actually a symlink.
2508
f_norm, can_access = osutils.normalized_filename(f)
2509
if f == f_norm or not can_access:
2510
# No change, so treat this file normally
2513
# this file can be accessed by a normalized path
2514
# check again if it is versioned
2515
# these lines are repeated here for performance
2517
fp = from_dir_relpath + '/' + f
2518
fap = from_dir_abspath + '/' + f
2519
f_ie = inv.get_child(from_dir_id, f)
2522
elif self.is_ignored(fp[1:]):
2529
# make a last minute entry
2531
yield fp[1:], c, fk, f_ie.file_id, f_ie
2534
yield fp[1:], c, fk, None, fk_entries[fk]()
2536
yield fp[1:], c, fk, None, TreeEntry()
2539
if fk != 'directory':
2542
# But do this child first if recursing down
2544
new_children = os.listdir(fap)
2546
new_children = collections.deque(new_children)
2547
stack.append((f_ie.file_id, fp, fap, new_children))
2548
# Break out of inner loop,
2549
# so that we start outer loop with child
2552
# if we finished all children, pop it off the stack
2555
@needs_tree_write_lock
2556
def move(self, from_paths, to_dir=None, after=False):
2559
to_dir must exist in the inventory.
2561
If to_dir exists and is a directory, the files are moved into
2562
it, keeping their old names.
2564
Note that to_dir is only the last component of the new name;
2565
this doesn't change the directory.
2567
For each entry in from_paths the move mode will be determined
2570
The first mode moves the file in the filesystem and updates the
2571
inventory. The second mode only updates the inventory without
2572
touching the file on the filesystem.
2574
move uses the second mode if 'after == True' and the target is not
2575
versioned but present in the working tree.
2577
move uses the second mode if 'after == False' and the source is
2578
versioned but no longer in the working tree, and the target is not
2579
versioned but present in the working tree.
2581
move uses the first mode if 'after == False' and the source is
2582
versioned and present in the working tree, and the target is not
2583
versioned and not present in the working tree.
2585
Everything else results in an error.
2587
This returns a list of (from_path, to_path) pairs for each
2588
entry that is moved.
2593
# check for deprecated use of signature
2595
raise TypeError('You must supply a target directory')
2596
# check destination directory
2597
if isinstance(from_paths, basestring):
2599
inv = self.inventory
2600
to_abs = self.abspath(to_dir)
2601
if not isdir(to_abs):
2602
raise errors.BzrMoveFailedError('',to_dir,
2603
errors.NotADirectory(to_abs))
2604
if not self.has_filename(to_dir):
2605
raise errors.BzrMoveFailedError('',to_dir,
2606
errors.NotInWorkingDirectory(to_dir))
2607
to_dir_id = inv.path2id(to_dir)
2608
if to_dir_id is None:
2609
raise errors.BzrMoveFailedError('',to_dir,
2610
errors.NotVersionedError(path=to_dir))
2612
to_dir_ie = inv[to_dir_id]
2613
if to_dir_ie.kind != 'directory':
2614
raise errors.BzrMoveFailedError('',to_dir,
2615
errors.NotADirectory(to_abs))
2617
# create rename entries and tuples
2618
for from_rel in from_paths:
2619
from_tail = splitpath(from_rel)[-1]
2620
from_id = inv.path2id(from_rel)
2622
raise errors.BzrMoveFailedError(from_rel,to_dir,
2623
errors.NotVersionedError(path=from_rel))
2625
from_entry = inv[from_id]
2626
from_parent_id = from_entry.parent_id
2627
to_rel = pathjoin(to_dir, from_tail)
2628
rename_entry = InventoryWorkingTree._RenameEntry(
2631
from_tail=from_tail,
2632
from_parent_id=from_parent_id,
2633
to_rel=to_rel, to_tail=from_tail,
2634
to_parent_id=to_dir_id)
2635
rename_entries.append(rename_entry)
2636
rename_tuples.append((from_rel, to_rel))
2638
# determine which move mode to use. checks also for movability
2639
rename_entries = self._determine_mv_mode(rename_entries, after)
2641
original_modified = self._inventory_is_modified
2644
self._inventory_is_modified = True
2645
self._move(rename_entries)
2647
# restore the inventory on error
2648
self._inventory_is_modified = original_modified
2650
self._write_inventory(inv)
2651
return rename_tuples
2653
@needs_tree_write_lock
2654
def rename_one(self, from_rel, to_rel, after=False):
2657
This can change the directory or the filename or both.
2659
rename_one has several 'modes' to work. First, it can rename a physical
2660
file and change the file_id. That is the normal mode. Second, it can
2661
only change the file_id without touching any physical file.
2663
rename_one uses the second mode if 'after == True' and 'to_rel' is not
2664
versioned but present in the working tree.
2666
rename_one uses the second mode if 'after == False' and 'from_rel' is
2667
versioned but no longer in the working tree, and 'to_rel' is not
2668
versioned but present in the working tree.
2670
rename_one uses the first mode if 'after == False' and 'from_rel' is
2671
versioned and present in the working tree, and 'to_rel' is not
2672
versioned and not present in the working tree.
2674
Everything else results in an error.
2676
inv = self.inventory
2679
# create rename entries and tuples
2680
from_tail = splitpath(from_rel)[-1]
2681
from_id = inv.path2id(from_rel)
2683
# if file is missing in the inventory maybe it's in the basis_tree
2684
basis_tree = self.branch.basis_tree()
2685
from_id = basis_tree.path2id(from_rel)
2687
raise errors.BzrRenameFailedError(from_rel,to_rel,
2688
errors.NotVersionedError(path=from_rel))
2689
# put entry back in the inventory so we can rename it
2690
from_entry = basis_tree.inventory[from_id].copy()
2693
from_entry = inv[from_id]
2694
from_parent_id = from_entry.parent_id
2695
to_dir, to_tail = os.path.split(to_rel)
2696
to_dir_id = inv.path2id(to_dir)
2697
rename_entry = InventoryWorkingTree._RenameEntry(from_rel=from_rel,
2699
from_tail=from_tail,
2700
from_parent_id=from_parent_id,
2701
to_rel=to_rel, to_tail=to_tail,
2702
to_parent_id=to_dir_id)
2703
rename_entries.append(rename_entry)
2705
# determine which move mode to use. checks also for movability
2706
rename_entries = self._determine_mv_mode(rename_entries, after)
2708
# check if the target changed directory and if the target directory is
2710
if to_dir_id is None:
2711
raise errors.BzrMoveFailedError(from_rel,to_rel,
2712
errors.NotVersionedError(path=to_dir))
2714
# all checks done. now we can continue with our actual work
2715
mutter('rename_one:\n'
2720
' to_dir_id {%s}\n',
2721
from_id, from_rel, to_rel, to_dir, to_dir_id)
2723
self._move(rename_entries)
2724
self._write_inventory(inv)
2726
class _RenameEntry(object):
2727
def __init__(self, from_rel, from_id, from_tail, from_parent_id,
2728
to_rel, to_tail, to_parent_id, only_change_inv=False):
2729
self.from_rel = from_rel
2730
self.from_id = from_id
2731
self.from_tail = from_tail
2732
self.from_parent_id = from_parent_id
2733
self.to_rel = to_rel
2734
self.to_tail = to_tail
2735
self.to_parent_id = to_parent_id
2736
self.only_change_inv = only_change_inv
2738
def _determine_mv_mode(self, rename_entries, after=False):
2739
"""Determines for each from-to pair if both inventory and working tree
2740
or only the inventory has to be changed.
2742
Also does basic plausability tests.
2744
inv = self.inventory
2746
for rename_entry in rename_entries:
2747
# store to local variables for easier reference
2748
from_rel = rename_entry.from_rel
2749
from_id = rename_entry.from_id
2750
to_rel = rename_entry.to_rel
2751
to_id = inv.path2id(to_rel)
2752
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:
2759
raise errors.BzrMoveFailedError(from_rel,to_rel,
2760
errors.AlreadyVersionedError(path=to_rel))
2762
# try to determine the mode for rename (only change inv or change
2763
# inv and file system)
2765
if not self.has_filename(to_rel):
2766
raise errors.BzrMoveFailedError(from_id,to_rel,
2767
errors.NoSuchFile(path=to_rel,
2768
extra="New file has not been created yet"))
2769
only_change_inv = True
2770
elif not self.has_filename(from_rel) and self.has_filename(to_rel):
2771
only_change_inv = True
2772
elif self.has_filename(from_rel) and not self.has_filename(to_rel):
2773
only_change_inv = False
2774
elif (not self.case_sensitive
2775
and from_rel.lower() == to_rel.lower()
2776
and self.has_filename(from_rel)):
2777
only_change_inv = False
2779
# something is wrong, so lets determine what exactly
2780
if not self.has_filename(from_rel) and \
2781
not self.has_filename(to_rel):
2782
raise errors.BzrRenameFailedError(from_rel,to_rel,
2783
errors.PathsDoNotExist(paths=(str(from_rel),
2786
raise errors.RenameFailedFilesExist(from_rel, to_rel)
2787
rename_entry.only_change_inv = only_change_inv
2788
return rename_entries
2790
def _move(self, rename_entries):
2791
"""Moves a list of files.
2793
Depending on the value of the flag 'only_change_inv', the
2794
file will be moved on the file system or not.
2796
inv = self.inventory
2799
for entry in rename_entries:
2801
self._move_entry(entry)
2803
self._rollback_move(moved)
2807
def _rollback_move(self, moved):
2808
"""Try to rollback a previous move in case of an filesystem error."""
2809
inv = self.inventory
2812
self._move_entry(WorkingTree._RenameEntry(
2813
entry.to_rel, entry.from_id,
2814
entry.to_tail, entry.to_parent_id, entry.from_rel,
2815
entry.from_tail, entry.from_parent_id,
2816
entry.only_change_inv))
2817
except errors.BzrMoveFailedError, e:
2818
raise errors.BzrMoveFailedError( '', '', "Rollback failed."
2819
" The working tree is in an inconsistent state."
2820
" Please consider doing a 'bzr revert'."
2821
" Error message is: %s" % e)
2823
def _move_entry(self, entry):
2824
inv = self.inventory
2825
from_rel_abs = self.abspath(entry.from_rel)
2826
to_rel_abs = self.abspath(entry.to_rel)
2827
if from_rel_abs == to_rel_abs:
2828
raise errors.BzrMoveFailedError(entry.from_rel, entry.to_rel,
2829
"Source and target are identical.")
2831
if not entry.only_change_inv:
2833
osutils.rename(from_rel_abs, to_rel_abs)
2835
raise errors.BzrMoveFailedError(entry.from_rel,
2837
inv.rename(entry.from_id, entry.to_parent_id, entry.to_tail)
2839
@needs_tree_write_lock
2840
def unversion(self, file_ids):
2841
"""Remove the file ids in file_ids from the current versioned set.
2843
When a file_id is unversioned, all of its children are automatically
2846
:param file_ids: The file ids to stop versioning.
2847
:raises: NoSuchId if any fileid is not currently versioned.
2849
for file_id in file_ids:
2850
if not self._inventory.has_id(file_id):
2851
raise errors.NoSuchId(self, file_id)
2852
for file_id in file_ids:
2853
if self._inventory.has_id(file_id):
2854
self._inventory.remove_recursive_id(file_id)
2856
# in the future this should just set a dirty bit to wait for the
2857
# final unlock. However, until all methods of workingtree start
2858
# with the current in -memory inventory rather than triggering
2859
# a read, it is more complex - we need to teach read_inventory
2860
# to know when to read, and when to not read first... and possibly
2861
# to save first when the in memory one may be corrupted.
2862
# so for now, we just only write it if it is indeed dirty.
2864
self._write_inventory(self._inventory)
2866
def stored_kind(self, file_id):
2867
"""See Tree.stored_kind"""
2868
return self.inventory[file_id].kind
2871
"""Yield all unversioned files in this WorkingTree.
2873
If there are any unversioned directories then only the directory is
2874
returned, not all its children. But if there are unversioned files
2875
under a versioned subdirectory, they are returned.
2877
Currently returned depth-first, sorted by name within directories.
2878
This is the same order used by 'osutils.walkdirs'.
2880
## TODO: Work from given directory downwards
2881
for path, dir_entry in self.inventory.directories():
2882
# mutter("search for unknowns in %r", path)
2883
dirabs = self.abspath(path)
2884
if not isdir(dirabs):
2885
# e.g. directory deleted
2889
for subf in os.listdir(dirabs):
2890
if self.bzrdir.is_control_filename(subf):
2892
if subf not in dir_entry.children:
2895
can_access) = osutils.normalized_filename(subf)
2896
except UnicodeDecodeError:
2897
path_os_enc = path.encode(osutils._fs_enc)
2898
relpath = path_os_enc + '/' + subf
2899
raise errors.BadFilenameEncoding(relpath,
2901
if subf_norm != subf and can_access:
2902
if subf_norm not in dir_entry.children:
2903
fl.append(subf_norm)
2909
subp = pathjoin(path, subf)
2912
def _walkdirs(self, prefix=""):
2913
"""Walk the directories of this tree.
2915
:param prefix: is used as the directrory to start with.
2916
:returns: a generator which yields items in the form::
2918
((curren_directory_path, fileid),
2919
[(file1_path, file1_name, file1_kind, None, file1_id,
2922
_directory = 'directory'
2923
# get the root in the inventory
2924
inv = self.inventory
2925
top_id = inv.path2id(prefix)
2929
pending = [(prefix, '', _directory, None, top_id, None)]
2932
currentdir = pending.pop()
2933
# 0 - relpath, 1- basename, 2- kind, 3- stat, 4-id, 5-kind
2934
top_id = currentdir[4]
2936
relroot = currentdir[0] + '/'
2939
# FIXME: stash the node in pending
2941
if entry.kind == 'directory':
2942
for name, child in entry.sorted_children():
2943
dirblock.append((relroot + name, name, child.kind, None,
2944
child.file_id, child.kind
2946
yield (currentdir[0], entry.file_id), dirblock
2947
# push the user specified dirs from dirblock
2948
for dir in reversed(dirblock):
2949
if dir[2] == _directory:
2953
class WorkingTreeFormatRegistry(controldir.ControlComponentFormatRegistry):
2954
"""Registry for working tree formats."""
2956
def __init__(self, other_registry=None):
2957
super(WorkingTreeFormatRegistry, self).__init__(other_registry)
2958
self._default_format = None
2959
self._default_format_key = None
2961
def get_default(self):
2962
"""Return the current default format."""
2963
if (self._default_format_key is not None and
2964
self._default_format is None):
2965
self._default_format = self.get(self._default_format_key)
2966
return self._default_format
2968
def set_default(self, format):
2969
"""Set the default format."""
2970
self._default_format = format
2971
self._default_format_key = None
2973
def set_default_key(self, format_string):
2974
"""Set the default format by its format string."""
2975
self._default_format_key = format_string
2976
self._default_format = None
2979
format_registry = WorkingTreeFormatRegistry()
2982
class WorkingTreeFormat(controldir.ControlComponentFormat):
2750
2983
"""An encapsulation of the initialization and open routines for a format.
2752
2985
Formats provide three things:
3086
@symbol_versioning.deprecated_method(
3087
symbol_versioning.deprecated_in((2, 4, 0)))
2827
3088
def register_format(klass, format):
2828
klass._formats[format.get_format_string()] = format
3089
format_registry.register(format)
3092
@symbol_versioning.deprecated_method(
3093
symbol_versioning.deprecated_in((2, 4, 0)))
3094
def register_extra_format(klass, format):
3095
format_registry.register_extra(format)
3098
@symbol_versioning.deprecated_method(
3099
symbol_versioning.deprecated_in((2, 4, 0)))
3100
def unregister_extra_format(klass, format):
3101
format_registry.unregister_extra(format)
3104
@symbol_versioning.deprecated_method(
3105
symbol_versioning.deprecated_in((2, 4, 0)))
3106
def get_formats(klass):
3107
return format_registry._get_all()
3110
@symbol_versioning.deprecated_method(
3111
symbol_versioning.deprecated_in((2, 4, 0)))
2831
3112
def set_default_format(klass, format):
2832
klass._default_format = format
3113
format_registry.set_default(format)
3116
@symbol_versioning.deprecated_method(
3117
symbol_versioning.deprecated_in((2, 4, 0)))
2835
3118
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(),
3119
format_registry.remove(format)
3122
format_registry.register_lazy("Bazaar Working Tree Format 4 (bzr 0.15)\n",
3123
"bzrlib.workingtree_4", "WorkingTreeFormat4")
3124
format_registry.register_lazy("Bazaar Working Tree Format 5 (bzr 1.11)\n",
3125
"bzrlib.workingtree_4", "WorkingTreeFormat5")
3126
format_registry.register_lazy("Bazaar Working Tree Format 6 (bzr 1.14)\n",
3127
"bzrlib.workingtree_4", "WorkingTreeFormat6")
3128
format_registry.register_lazy("Bazaar-NG Working Tree format 3",
3129
"bzrlib.workingtree_3", "WorkingTreeFormat3")
3130
format_registry.set_default_key("Bazaar Working Tree Format 6 (bzr 1.14)\n")
added
removed
bzrlib/workingtree.py
