2608
1811
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.
1814
class InventoryWorkingTree(WorkingTree,
1815
bzrlib.mutabletree.MutableInventoryTree):
1816
"""Base class for working trees that are inventory-oriented.
1818
The inventory is held in the `Branch` working-inventory, and the
1819
files are in a directory on disk.
1821
It is possible for a `WorkingTree` to have a filename which is
1822
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()
1825
def __init__(self, basedir='.',
1826
branch=DEPRECATED_PARAMETER,
1828
_control_files=None,
1832
"""Construct a InventoryWorkingTree instance. This is not a public API.
1834
:param branch: A branch to override probing for the branch.
1836
super(InventoryWorkingTree, self).__init__(basedir=basedir,
1837
branch=branch, _control_files=_control_files, _internal=_internal,
1838
_format=_format, _bzrdir=_bzrdir)
1840
if _inventory is None:
1841
# This will be acquired on lock_read() or lock_write()
1842
self._inventory_is_modified = False
1843
self._inventory = None
1845
# the caller of __init__ has provided an inventory,
1846
# we assume they know what they are doing - as its only
1847
# the Format factory and creation methods that are
1848
# permitted to do this.
1849
self._set_inventory(_inventory, dirty=False)
1851
def _set_inventory(self, inv, dirty):
1852
"""Set the internal cached inventory.
1854
:param inv: The inventory to set.
1855
:param dirty: A boolean indicating whether the inventory is the same
1856
logical inventory as whats on disk. If True the inventory is not
1857
the same and should be written to disk or data will be lost, if
1858
False then the inventory is the same as that on disk and any
1859
serialisation would be unneeded overhead.
1861
self._inventory = inv
1862
self._inventory_is_modified = dirty
1864
def _serialize(self, inventory, out_file):
1865
xml5.serializer_v5.write_inventory(self._inventory, out_file,
1868
def _deserialize(selt, in_file):
1869
return xml5.serializer_v5.read_inventory(in_file)
1871
@needs_tree_write_lock
1872
def _write_inventory(self, inv):
1873
"""Write inventory as the current inventory."""
1874
self._set_inventory(inv, dirty=True)
1877
# XXX: This method should be deprecated in favour of taking in a proper
1878
# new Inventory object.
1879
@needs_tree_write_lock
1880
def set_inventory(self, new_inventory_list):
1881
from bzrlib.inventory import (Inventory,
1885
inv = Inventory(self.get_root_id())
1886
for path, file_id, parent, kind in new_inventory_list:
1887
name = os.path.basename(path)
1890
# fixme, there should be a factory function inv,add_??
1891
if kind == 'directory':
1892
inv.add(InventoryDirectory(file_id, name, parent))
1893
elif kind == 'file':
1894
inv.add(InventoryFile(file_id, name, parent))
1895
elif kind == 'symlink':
1896
inv.add(InventoryLink(file_id, name, parent))
1898
raise errors.BzrError("unknown kind %r" % kind)
1899
self._write_inventory(inv)
1901
def _write_basis_inventory(self, xml):
1902
"""Write the basis inventory XML to the basis-inventory file"""
1903
path = self._basis_inventory_name()
1905
self._transport.put_file(path, sio,
1906
mode=self.bzrdir._get_file_mode())
1908
def _reset_data(self):
1909
"""Reset transient data that cannot be revalidated."""
1910
self._inventory_is_modified = False
1911
f = self._transport.get('inventory')
1913
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."""
1916
self._set_inventory(result, dirty=False)
1918
def _set_root_id(self, file_id):
1919
"""Set the root id for this tree, in a format specific manner.
1921
:param file_id: The file id to assign to the root. It must not be
1922
present in the current inventory or an error will occur. It must
1923
not be None, but rather a valid file id.
1925
inv = self._inventory
1926
orig_root_id = inv.root.file_id
1927
# TODO: it might be nice to exit early if there was nothing
1928
# to do, saving us from trigger a sync on unlock.
1929
self._inventory_is_modified = True
1930
# we preserve the root inventory entry object, but
1931
# unlinkit from the byid index
1932
del inv._byid[inv.root.file_id]
1933
inv.root.file_id = file_id
1934
# and link it into the index with the new changed id.
1935
inv._byid[inv.root.file_id] = inv.root
1936
# and finally update all children to reference the new id.
1937
# XXX: this should be safe to just look at the root.children
1938
# list, not the WHOLE INVENTORY.
1941
if entry.parent_id == orig_root_id:
1942
entry.parent_id = inv.root.file_id
1944
def all_file_ids(self):
1945
"""See Tree.iter_all_file_ids"""
1946
return set(self.inventory)
1948
@needs_tree_write_lock
1949
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
1950
"""See MutableTree.set_parent_trees."""
1951
parent_ids = [rev for (rev, tree) in parents_list]
1952
for revision_id in parent_ids:
1953
_mod_revision.check_not_reserved_id(revision_id)
1955
self._check_parents_for_ghosts(parent_ids,
1956
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
1958
parent_ids = self._filter_parent_ids_by_ancestry(parent_ids)
1960
if len(parent_ids) == 0:
1961
leftmost_parent_id = _mod_revision.NULL_REVISION
1962
leftmost_parent_tree = None
1964
leftmost_parent_id, leftmost_parent_tree = parents_list[0]
1966
if self._change_last_revision(leftmost_parent_id):
1967
if leftmost_parent_tree is None:
1968
# If we don't have a tree, fall back to reading the
1969
# parent tree from the repository.
1970
self._cache_basis_inventory(leftmost_parent_id)
1972
inv = leftmost_parent_tree.inventory
1973
xml = self._create_basis_xml_from_inventory(
1974
leftmost_parent_id, inv)
1975
self._write_basis_inventory(xml)
1976
self._set_merges_from_parent_ids(parent_ids)
1978
def _cache_basis_inventory(self, new_revision):
1979
"""Cache new_revision as the basis inventory."""
1980
# TODO: this should allow the ready-to-use inventory to be passed in,
1981
# 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())]
1984
# this double handles the inventory - unpack and repack -
1985
# but is easier to understand. We can/should put a conditional
1986
# in here based on whether the inventory is in the latest format
1987
# - perhaps we should repack all inventories on a repository
1989
# the fast path is to copy the raw xml from the repository. If the
1990
# xml contains 'revision_id="', then we assume the right
1991
# revision_id is set. We must check for this full string, because a
1992
# root node id can legitimately look like 'revision_id' but cannot
1994
xml = self.branch.repository._get_inventory_xml(new_revision)
1995
firstline = xml.split('\n', 1)[0]
1996
if (not 'revision_id="' in firstline or
1997
'format="7"' not in firstline):
1998
inv = self.branch.repository._serializer.read_inventory_from_string(
2000
xml = self._create_basis_xml_from_inventory(new_revision, inv)
2001
self._write_basis_inventory(xml)
2002
except (errors.NoSuchRevision, errors.RevisionNotPresent):
2005
def _basis_inventory_name(self):
2006
return 'basis-inventory-cache'
2008
def _create_basis_xml_from_inventory(self, revision_id, inventory):
2009
"""Create the text that will be saved in basis-inventory"""
2010
inventory.revision_id = revision_id
2011
return xml7.serializer_v7.write_inventory_to_string(inventory)
2700
2013
@needs_tree_write_lock
2701
2014
def set_conflicts(self, conflicts):
2721
2034
raise errors.ConflictFormatError()
2722
2035
except StopIteration:
2723
2036
raise errors.ConflictFormatError()
2724
return _mod_conflicts.ConflictList.from_stanzas(RioReader(confile))
2037
reader = _mod_rio.RioReader(confile)
2038
return _mod_conflicts.ConflictList.from_stanzas(reader)
2726
2040
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):
2042
def read_basis_inventory(self):
2043
"""Read the cached basis inventory."""
2044
path = self._basis_inventory_name()
2045
return self._transport.get_bytes(path)
2048
def read_working_inventory(self):
2049
"""Read the working inventory.
2051
:raises errors.InventoryModified: read_working_inventory will fail
2052
when the current in memory inventory has been modified.
2054
# conceptually this should be an implementation detail of the tree.
2055
# XXX: Deprecate this.
2056
# ElementTree does its own conversion from UTF-8, so open in
2058
if self._inventory_is_modified:
2059
raise errors.InventoryModified(self)
2060
f = self._transport.get('inventory')
2062
result = self._deserialize(f)
2065
self._set_inventory(result, dirty=False)
2069
def get_root_id(self):
2070
"""Return the id of this trees root"""
2071
return self._inventory.root.file_id
2073
def has_id(self, file_id):
2074
# files that have been deleted are excluded
2075
inv = self.inventory
2076
if not inv.has_id(file_id):
2078
path = inv.id2path(file_id)
2079
return osutils.lexists(self.abspath(path))
2081
def has_or_had_id(self, file_id):
2082
if file_id == self.inventory.root.file_id:
2084
return self.inventory.has_id(file_id)
2086
__contains__ = has_id
2088
@symbol_versioning.deprecated_method(symbol_versioning.deprecated_in((2, 4, 0)))
2090
"""Iterate through file_ids for this tree.
2092
file_ids are in a WorkingTree if they are in the working inventory
2093
and the working file exists.
2095
inv = self._inventory
2096
for path, ie in inv.iter_entries():
2097
if osutils.lexists(self.abspath(path)):
2100
@needs_tree_write_lock
2101
def set_last_revision(self, new_revision):
2102
"""Change the last revision in the working tree."""
2103
if self._change_last_revision(new_revision):
2104
self._cache_basis_inventory(new_revision)
2106
def _get_check_refs(self):
2107
"""Return the references needed to perform a check of this tree.
2109
The default implementation returns no refs, and is only suitable for
2110
trees that have no local caching and can commit on ghosts at any time.
2112
:seealso: bzrlib.check for details about check_refs.
2117
def _check(self, references):
2118
"""Check the tree for consistency.
2120
:param references: A dict with keys matching the items returned by
2121
self._get_check_refs(), and values from looking those keys up in
2124
tree_basis = self.basis_tree()
2125
tree_basis.lock_read()
2127
repo_basis = references[('trees', self.last_revision())]
2128
if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2129
raise errors.BzrCheckError(
2130
"Mismatched basis inventory content.")
2136
def check_state(self):
2137
"""Check that the working state is/isn't valid."""
2138
check_refs = self._get_check_refs()
2140
for ref in check_refs:
2143
refs[ref] = self.branch.repository.revision_tree(value)
2146
@needs_tree_write_lock
2147
def reset_state(self, revision_ids=None):
2148
"""Reset the state of the working tree.
2150
This does a hard-reset to a last-known-good state. This is a way to
2151
fix if something got corrupted (like the .bzr/checkout/dirstate file)
2153
if revision_ids is None:
2154
revision_ids = self.get_parent_ids()
2155
if not revision_ids:
2156
rt = self.branch.repository.revision_tree(
2157
_mod_revision.NULL_REVISION)
2159
rt = self.branch.repository.revision_tree(revision_ids[0])
2160
self._write_inventory(rt.inventory)
2161
self.set_parent_ids(revision_ids)
2164
"""Write the in memory inventory to disk."""
2165
# TODO: Maybe this should only write on dirty ?
2166
if self._control_files._lock_mode != 'w':
2167
raise errors.NotWriteLocked(self)
2169
self._serialize(self._inventory, sio)
2171
self._transport.put_file('inventory', sio,
2172
mode=self.bzrdir._get_file_mode())
2173
self._inventory_is_modified = False
2176
def get_file_sha1(self, file_id, path=None, stat_value=None):
2178
path = self._inventory.id2path(file_id)
2179
return self._hashcache.get_sha1(path, stat_value)
2181
def get_file_mtime(self, file_id, path=None):
2182
"""See Tree.get_file_mtime."""
2184
path = self.inventory.id2path(file_id)
2185
return os.lstat(self.abspath(path)).st_mtime
2187
def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
2188
file_id = self.path2id(path)
2190
# For unversioned files on win32, we just assume they are not
2193
return self._inventory[file_id].executable
2195
def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
2196
mode = stat_result.st_mode
2197
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
2199
if not supports_executable():
2200
def is_executable(self, file_id, path=None):
2201
return self._inventory[file_id].executable
2203
_is_executable_from_path_and_stat = \
2204
_is_executable_from_path_and_stat_from_basis
2206
def is_executable(self, file_id, path=None):
2208
path = self.id2path(file_id)
2209
mode = os.lstat(self.abspath(path)).st_mode
2210
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
2212
_is_executable_from_path_and_stat = \
2213
_is_executable_from_path_and_stat_from_stat
2215
@needs_tree_write_lock
2216
def _add(self, files, ids, kinds):
2217
"""See MutableTree._add."""
2218
# TODO: Re-adding a file that is removed in the working copy
2219
# should probably put it back with the previous ID.
2220
# the read and write working inventory should not occur in this
2221
# function - they should be part of lock_write and unlock.
2222
inv = self.inventory
2223
for f, file_id, kind in zip(files, ids, kinds):
2225
inv.add_path(f, kind=kind)
2227
inv.add_path(f, kind=kind, file_id=file_id)
2228
self._inventory_is_modified = True
2230
def revision_tree(self, revision_id):
2231
"""See WorkingTree.revision_id."""
2232
if revision_id == self.last_revision():
2234
xml = self.read_basis_inventory()
2235
except errors.NoSuchFile:
2239
inv = xml7.serializer_v7.read_inventory_from_string(xml)
2240
# dont use the repository revision_tree api because we want
2241
# to supply the inventory.
2242
if inv.revision_id == revision_id:
2243
return revisiontree.InventoryRevisionTree(
2244
self.branch.repository, inv, revision_id)
2245
except errors.BadInventoryFormat:
2247
# raise if there was no inventory, or if we read the wrong inventory.
2248
raise errors.NoSuchRevisionInTree(self, revision_id)
2251
def annotate_iter(self, file_id, default_revision=CURRENT_REVISION):
2252
"""See Tree.annotate_iter
2254
This implementation will use the basis tree implementation if possible.
2255
Lines not in the basis are attributed to CURRENT_REVISION
2257
If there are pending merges, lines added by those merges will be
2258
incorrectly attributed to CURRENT_REVISION (but after committing, the
2259
attribution will be correct).
2261
maybe_file_parent_keys = []
2262
for parent_id in self.get_parent_ids():
2264
parent_tree = self.revision_tree(parent_id)
2265
except errors.NoSuchRevisionInTree:
2266
parent_tree = self.branch.repository.revision_tree(parent_id)
2267
parent_tree.lock_read()
2269
if file_id not in parent_tree:
2271
ie = parent_tree.inventory[file_id]
2272
if ie.kind != 'file':
2273
# Note: this is slightly unnecessary, because symlinks and
2274
# directories have a "text" which is the empty text, and we
2275
# know that won't mess up annotations. But it seems cleaner
2277
parent_text_key = (file_id, ie.revision)
2278
if parent_text_key not in maybe_file_parent_keys:
2279
maybe_file_parent_keys.append(parent_text_key)
2281
parent_tree.unlock()
2282
graph = _mod_graph.Graph(self.branch.repository.texts)
2283
heads = graph.heads(maybe_file_parent_keys)
2284
file_parent_keys = []
2285
for key in maybe_file_parent_keys:
2287
file_parent_keys.append(key)
2289
# Now we have the parents of this content
2290
annotator = self.branch.repository.texts.get_annotator()
2291
text = self.get_file_text(file_id)
2292
this_key =(file_id, default_revision)
2293
annotator.add_special_text(this_key, file_parent_keys, text)
2294
annotations = [(key[-1], line)
2295
for key, line in annotator.annotate_flat(this_key)]
2299
def merge_modified(self):
2300
"""Return a dictionary of files modified by a merge.
2302
The list is initialized by WorkingTree.set_merge_modified, which is
2303
typically called after we make some automatic updates to the tree
2306
This returns a map of file_id->sha1, containing only files which are
2307
still in the working inventory and have that text hash.
2310
hashfile = self._transport.get('merge-hashes')
2311
except errors.NoSuchFile:
2316
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
2317
raise errors.MergeModifiedFormatError()
2318
except StopIteration:
2319
raise errors.MergeModifiedFormatError()
2320
for s in _mod_rio.RioReader(hashfile):
2321
# RioReader reads in Unicode, so convert file_ids back to utf8
2322
file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
2323
if file_id not in self.inventory:
2325
text_hash = s.get("hash")
2326
if text_hash == self.get_file_sha1(file_id):
2327
merge_hashes[file_id] = text_hash
2333
def subsume(self, other_tree):
2334
def add_children(inventory, entry):
2335
for child_entry in entry.children.values():
2336
inventory._byid[child_entry.file_id] = child_entry
2337
if child_entry.kind == 'directory':
2338
add_children(inventory, child_entry)
2339
if other_tree.get_root_id() == self.get_root_id():
2340
raise errors.BadSubsumeSource(self, other_tree,
2341
'Trees have the same root')
2343
other_tree_path = self.relpath(other_tree.basedir)
2344
except errors.PathNotChild:
2345
raise errors.BadSubsumeSource(self, other_tree,
2346
'Tree is not contained by the other')
2347
new_root_parent = self.path2id(osutils.dirname(other_tree_path))
2348
if new_root_parent is None:
2349
raise errors.BadSubsumeSource(self, other_tree,
2350
'Parent directory is not versioned.')
2351
# We need to ensure that the result of a fetch will have a
2352
# versionedfile for the other_tree root, and only fetching into
2353
# RepositoryKnit2 guarantees that.
2354
if not self.branch.repository.supports_rich_root():
2355
raise errors.SubsumeTargetNeedsUpgrade(other_tree)
2356
other_tree.lock_tree_write()
2358
new_parents = other_tree.get_parent_ids()
2359
other_root = other_tree.inventory.root
2360
other_root.parent_id = new_root_parent
2361
other_root.name = osutils.basename(other_tree_path)
2362
self.inventory.add(other_root)
2363
add_children(self.inventory, other_root)
2364
self._write_inventory(self.inventory)
2365
# normally we don't want to fetch whole repositories, but i think
2366
# here we really do want to consolidate the whole thing.
2367
for parent_id in other_tree.get_parent_ids():
2368
self.branch.fetch(other_tree.branch, parent_id)
2369
self.add_parent_tree_id(parent_id)
2372
other_tree.bzrdir.retire_bzrdir()
2374
@needs_tree_write_lock
2375
def extract(self, file_id, format=None):
2376
"""Extract a subtree from this tree.
2378
A new branch will be created, relative to the path for this tree.
2382
segments = osutils.splitpath(path)
2383
transport = self.branch.bzrdir.root_transport
2384
for name in segments:
2385
transport = transport.clone(name)
2386
transport.ensure_base()
2389
sub_path = self.id2path(file_id)
2390
branch_transport = mkdirs(sub_path)
2392
format = self.bzrdir.cloning_metadir()
2393
branch_transport.ensure_base()
2394
branch_bzrdir = format.initialize_on_transport(branch_transport)
2396
repo = branch_bzrdir.find_repository()
2397
except errors.NoRepositoryPresent:
2398
repo = branch_bzrdir.create_repository()
2399
if not repo.supports_rich_root():
2400
raise errors.RootNotRich()
2401
new_branch = branch_bzrdir.create_branch()
2402
new_branch.pull(self.branch)
2403
for parent_id in self.get_parent_ids():
2404
new_branch.fetch(self.branch, parent_id)
2405
tree_transport = self.bzrdir.root_transport.clone(sub_path)
2406
if tree_transport.base != branch_transport.base:
2407
tree_bzrdir = format.initialize_on_transport(tree_transport)
2408
branch.BranchReferenceFormat().initialize(tree_bzrdir,
2409
target_branch=new_branch)
2411
tree_bzrdir = branch_bzrdir
2412
wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
2413
wt.set_parent_ids(self.get_parent_ids())
2414
my_inv = self.inventory
2415
child_inv = inventory.Inventory(root_id=None)
2416
new_root = my_inv[file_id]
2417
my_inv.remove_recursive_id(file_id)
2418
new_root.parent_id = None
2419
child_inv.add(new_root)
2420
self._write_inventory(my_inv)
2421
wt._write_inventory(child_inv)
2424
def list_files(self, include_root=False, from_dir=None, recursive=True):
2425
"""List all files as (path, class, kind, id, entry).
2427
Lists, but does not descend into unversioned directories.
2428
This does not include files that have been deleted in this
2429
tree. Skips the control directory.
2431
:param include_root: if True, return an entry for the root
2432
:param from_dir: start from this directory or None for the root
2433
:param recursive: whether to recurse into subdirectories or not
2435
# list_files is an iterator, so @needs_read_lock doesn't work properly
2436
# with it. So callers should be careful to always read_lock the tree.
2437
if not self.is_locked():
2438
raise errors.ObjectNotLocked(self)
2440
inv = self.inventory
2441
if from_dir is None and include_root is True:
2442
yield ('', 'V', 'directory', inv.root.file_id, inv.root)
2443
# Convert these into local objects to save lookup times
2444
pathjoin = osutils.pathjoin
2445
file_kind = self._kind
2447
# transport.base ends in a slash, we want the piece
2448
# between the last two slashes
2449
transport_base_dir = self.bzrdir.transport.base.rsplit('/', 2)[1]
2451
fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
2453
# directory file_id, relative path, absolute path, reverse sorted children
2454
if from_dir is not None:
2455
from_dir_id = inv.path2id(from_dir)
2456
if from_dir_id is None:
2457
# Directory not versioned
2459
from_dir_abspath = pathjoin(self.basedir, from_dir)
2461
from_dir_id = inv.root.file_id
2462
from_dir_abspath = self.basedir
2463
children = os.listdir(from_dir_abspath)
2465
# jam 20060527 The kernel sized tree seems equivalent whether we
2466
# use a deque and popleft to keep them sorted, or if we use a plain
2467
# list and just reverse() them.
2468
children = collections.deque(children)
2469
stack = [(from_dir_id, u'', from_dir_abspath, children)]
2471
from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
2474
f = children.popleft()
2475
## TODO: If we find a subdirectory with its own .bzr
2476
## directory, then that is a separate tree and we
2477
## should exclude it.
2479
# the bzrdir for this tree
2480
if transport_base_dir == f:
2483
# we know that from_dir_relpath and from_dir_abspath never end in a slash
2484
# and 'f' doesn't begin with one, we can do a string op, rather
2485
# than the checks of pathjoin(), all relative paths will have an extra slash
2487
fp = from_dir_relpath + '/' + f
2490
fap = from_dir_abspath + '/' + f
2492
dir_ie = inv[from_dir_id]
2493
if dir_ie.kind == 'directory':
2494
f_ie = dir_ie.children.get(f)
2499
elif self.is_ignored(fp[1:]):
2502
# we may not have found this file, because of a unicode
2503
# issue, or because the directory was actually a symlink.
2504
f_norm, can_access = osutils.normalized_filename(f)
2505
if f == f_norm or not can_access:
2506
# No change, so treat this file normally
2509
# this file can be accessed by a normalized path
2510
# check again if it is versioned
2511
# these lines are repeated here for performance
2513
fp = from_dir_relpath + '/' + f
2514
fap = from_dir_abspath + '/' + f
2515
f_ie = inv.get_child(from_dir_id, f)
2518
elif self.is_ignored(fp[1:]):
2525
# make a last minute entry
2527
yield fp[1:], c, fk, f_ie.file_id, f_ie
2530
yield fp[1:], c, fk, None, fk_entries[fk]()
2532
yield fp[1:], c, fk, None, TreeEntry()
2535
if fk != 'directory':
2538
# But do this child first if recursing down
2540
new_children = os.listdir(fap)
2542
new_children = collections.deque(new_children)
2543
stack.append((f_ie.file_id, fp, fap, new_children))
2544
# Break out of inner loop,
2545
# so that we start outer loop with child
2548
# if we finished all children, pop it off the stack
2551
@needs_tree_write_lock
2552
def move(self, from_paths, to_dir=None, after=False):
2555
to_dir must exist in the inventory.
2557
If to_dir exists and is a directory, the files are moved into
2558
it, keeping their old names.
2560
Note that to_dir is only the last component of the new name;
2561
this doesn't change the directory.
2563
For each entry in from_paths the move mode will be determined
2566
The first mode moves the file in the filesystem and updates the
2567
inventory. The second mode only updates the inventory without
2568
touching the file on the filesystem.
2570
move uses the second mode if 'after == True' and the target is not
2571
versioned but present in the working tree.
2573
move uses the second mode if 'after == False' and the source is
2574
versioned but no longer in the working tree, and the target is not
2575
versioned but present in the working tree.
2577
move uses the first mode if 'after == False' and the source is
2578
versioned and present in the working tree, and the target is not
2579
versioned and not present in the working tree.
2581
Everything else results in an error.
2583
This returns a list of (from_path, to_path) pairs for each
2584
entry that is moved.
2589
# check for deprecated use of signature
2591
raise TypeError('You must supply a target directory')
2592
# check destination directory
2593
if isinstance(from_paths, basestring):
2595
inv = self.inventory
2596
to_abs = self.abspath(to_dir)
2597
if not isdir(to_abs):
2598
raise errors.BzrMoveFailedError('',to_dir,
2599
errors.NotADirectory(to_abs))
2600
if not self.has_filename(to_dir):
2601
raise errors.BzrMoveFailedError('',to_dir,
2602
errors.NotInWorkingDirectory(to_dir))
2603
to_dir_id = inv.path2id(to_dir)
2604
if to_dir_id is None:
2605
raise errors.BzrMoveFailedError('',to_dir,
2606
errors.NotVersionedError(path=to_dir))
2608
to_dir_ie = inv[to_dir_id]
2609
if to_dir_ie.kind != 'directory':
2610
raise errors.BzrMoveFailedError('',to_dir,
2611
errors.NotADirectory(to_abs))
2613
# create rename entries and tuples
2614
for from_rel in from_paths:
2615
from_tail = splitpath(from_rel)[-1]
2616
from_id = inv.path2id(from_rel)
2618
raise errors.BzrMoveFailedError(from_rel,to_dir,
2619
errors.NotVersionedError(path=from_rel))
2621
from_entry = inv[from_id]
2622
from_parent_id = from_entry.parent_id
2623
to_rel = pathjoin(to_dir, from_tail)
2624
rename_entry = InventoryWorkingTree._RenameEntry(
2627
from_tail=from_tail,
2628
from_parent_id=from_parent_id,
2629
to_rel=to_rel, to_tail=from_tail,
2630
to_parent_id=to_dir_id)
2631
rename_entries.append(rename_entry)
2632
rename_tuples.append((from_rel, to_rel))
2634
# determine which move mode to use. checks also for movability
2635
rename_entries = self._determine_mv_mode(rename_entries, after)
2637
original_modified = self._inventory_is_modified
2640
self._inventory_is_modified = True
2641
self._move(rename_entries)
2643
# restore the inventory on error
2644
self._inventory_is_modified = original_modified
2646
self._write_inventory(inv)
2647
return rename_tuples
2649
@needs_tree_write_lock
2650
def rename_one(self, from_rel, to_rel, after=False):
2653
This can change the directory or the filename or both.
2655
rename_one has several 'modes' to work. First, it can rename a physical
2656
file and change the file_id. That is the normal mode. Second, it can
2657
only change the file_id without touching any physical file.
2659
rename_one uses the second mode if 'after == True' and 'to_rel' is not
2660
versioned but present in the working tree.
2662
rename_one uses the second mode if 'after == False' and 'from_rel' is
2663
versioned but no longer in the working tree, and 'to_rel' is not
2664
versioned but present in the working tree.
2666
rename_one uses the first mode if 'after == False' and 'from_rel' is
2667
versioned and present in the working tree, and 'to_rel' is not
2668
versioned and not present in the working tree.
2670
Everything else results in an error.
2672
inv = self.inventory
2675
# create rename entries and tuples
2676
from_tail = splitpath(from_rel)[-1]
2677
from_id = inv.path2id(from_rel)
2679
# if file is missing in the inventory maybe it's in the basis_tree
2680
basis_tree = self.branch.basis_tree()
2681
from_id = basis_tree.path2id(from_rel)
2683
raise errors.BzrRenameFailedError(from_rel,to_rel,
2684
errors.NotVersionedError(path=from_rel))
2685
# put entry back in the inventory so we can rename it
2686
from_entry = basis_tree.inventory[from_id].copy()
2689
from_entry = inv[from_id]
2690
from_parent_id = from_entry.parent_id
2691
to_dir, to_tail = os.path.split(to_rel)
2692
to_dir_id = inv.path2id(to_dir)
2693
rename_entry = InventoryWorkingTree._RenameEntry(from_rel=from_rel,
2695
from_tail=from_tail,
2696
from_parent_id=from_parent_id,
2697
to_rel=to_rel, to_tail=to_tail,
2698
to_parent_id=to_dir_id)
2699
rename_entries.append(rename_entry)
2701
# determine which move mode to use. checks also for movability
2702
rename_entries = self._determine_mv_mode(rename_entries, after)
2704
# check if the target changed directory and if the target directory is
2706
if to_dir_id is None:
2707
raise errors.BzrMoveFailedError(from_rel,to_rel,
2708
errors.NotVersionedError(path=to_dir))
2710
# all checks done. now we can continue with our actual work
2711
mutter('rename_one:\n'
2716
' to_dir_id {%s}\n',
2717
from_id, from_rel, to_rel, to_dir, to_dir_id)
2719
self._move(rename_entries)
2720
self._write_inventory(inv)
2722
class _RenameEntry(object):
2723
def __init__(self, from_rel, from_id, from_tail, from_parent_id,
2724
to_rel, to_tail, to_parent_id, only_change_inv=False):
2725
self.from_rel = from_rel
2726
self.from_id = from_id
2727
self.from_tail = from_tail
2728
self.from_parent_id = from_parent_id
2729
self.to_rel = to_rel
2730
self.to_tail = to_tail
2731
self.to_parent_id = to_parent_id
2732
self.only_change_inv = only_change_inv
2734
def _determine_mv_mode(self, rename_entries, after=False):
2735
"""Determines for each from-to pair if both inventory and working tree
2736
or only the inventory has to be changed.
2738
Also does basic plausability tests.
2740
inv = self.inventory
2742
for rename_entry in rename_entries:
2743
# store to local variables for easier reference
2744
from_rel = rename_entry.from_rel
2745
from_id = rename_entry.from_id
2746
to_rel = rename_entry.to_rel
2747
to_id = inv.path2id(to_rel)
2748
only_change_inv = False
2750
# check the inventory for source and destination
2752
raise errors.BzrMoveFailedError(from_rel,to_rel,
2753
errors.NotVersionedError(path=from_rel))
2754
if to_id is not None:
2755
raise errors.BzrMoveFailedError(from_rel,to_rel,
2756
errors.AlreadyVersionedError(path=to_rel))
2758
# try to determine the mode for rename (only change inv or change
2759
# inv and file system)
2761
if not self.has_filename(to_rel):
2762
raise errors.BzrMoveFailedError(from_id,to_rel,
2763
errors.NoSuchFile(path=to_rel,
2764
extra="New file has not been created yet"))
2765
only_change_inv = True
2766
elif not self.has_filename(from_rel) and self.has_filename(to_rel):
2767
only_change_inv = True
2768
elif self.has_filename(from_rel) and not self.has_filename(to_rel):
2769
only_change_inv = False
2770
elif (not self.case_sensitive
2771
and from_rel.lower() == to_rel.lower()
2772
and self.has_filename(from_rel)):
2773
only_change_inv = False
2775
# something is wrong, so lets determine what exactly
2776
if not self.has_filename(from_rel) and \
2777
not self.has_filename(to_rel):
2778
raise errors.BzrRenameFailedError(from_rel,to_rel,
2779
errors.PathsDoNotExist(paths=(str(from_rel),
2782
raise errors.RenameFailedFilesExist(from_rel, to_rel)
2783
rename_entry.only_change_inv = only_change_inv
2784
return rename_entries
2786
def _move(self, rename_entries):
2787
"""Moves a list of files.
2789
Depending on the value of the flag 'only_change_inv', the
2790
file will be moved on the file system or not.
2792
inv = self.inventory
2795
for entry in rename_entries:
2797
self._move_entry(entry)
2799
self._rollback_move(moved)
2803
def _rollback_move(self, moved):
2804
"""Try to rollback a previous move in case of an filesystem error."""
2805
inv = self.inventory
2808
self._move_entry(WorkingTree._RenameEntry(
2809
entry.to_rel, entry.from_id,
2810
entry.to_tail, entry.to_parent_id, entry.from_rel,
2811
entry.from_tail, entry.from_parent_id,
2812
entry.only_change_inv))
2813
except errors.BzrMoveFailedError, e:
2814
raise errors.BzrMoveFailedError( '', '', "Rollback failed."
2815
" The working tree is in an inconsistent state."
2816
" Please consider doing a 'bzr revert'."
2817
" Error message is: %s" % e)
2819
def _move_entry(self, entry):
2820
inv = self.inventory
2821
from_rel_abs = self.abspath(entry.from_rel)
2822
to_rel_abs = self.abspath(entry.to_rel)
2823
if from_rel_abs == to_rel_abs:
2824
raise errors.BzrMoveFailedError(entry.from_rel, entry.to_rel,
2825
"Source and target are identical.")
2827
if not entry.only_change_inv:
2829
osutils.rename(from_rel_abs, to_rel_abs)
2831
raise errors.BzrMoveFailedError(entry.from_rel,
2833
inv.rename(entry.from_id, entry.to_parent_id, entry.to_tail)
2835
@needs_tree_write_lock
2836
def unversion(self, file_ids):
2837
"""Remove the file ids in file_ids from the current versioned set.
2839
When a file_id is unversioned, all of its children are automatically
2842
:param file_ids: The file ids to stop versioning.
2843
:raises: NoSuchId if any fileid is not currently versioned.
2845
for file_id in file_ids:
2846
if file_id not in self._inventory:
2847
raise errors.NoSuchId(self, file_id)
2848
for file_id in file_ids:
2849
if self._inventory.has_id(file_id):
2850
self._inventory.remove_recursive_id(file_id)
2852
# in the future this should just set a dirty bit to wait for the
2853
# final unlock. However, until all methods of workingtree start
2854
# with the current in -memory inventory rather than triggering
2855
# a read, it is more complex - we need to teach read_inventory
2856
# to know when to read, and when to not read first... and possibly
2857
# to save first when the in memory one may be corrupted.
2858
# so for now, we just only write it if it is indeed dirty.
2860
self._write_inventory(self._inventory)
2862
def stored_kind(self, file_id):
2863
"""See Tree.stored_kind"""
2864
return self.inventory[file_id].kind
2867
"""Yield all unversioned files in this WorkingTree.
2869
If there are any unversioned directories then only the directory is
2870
returned, not all its children. But if there are unversioned files
2871
under a versioned subdirectory, they are returned.
2873
Currently returned depth-first, sorted by name within directories.
2874
This is the same order used by 'osutils.walkdirs'.
2876
## TODO: Work from given directory downwards
2877
for path, dir_entry in self.inventory.directories():
2878
# mutter("search for unknowns in %r", path)
2879
dirabs = self.abspath(path)
2880
if not isdir(dirabs):
2881
# e.g. directory deleted
2885
for subf in os.listdir(dirabs):
2886
if self.bzrdir.is_control_filename(subf):
2888
if subf not in dir_entry.children:
2891
can_access) = osutils.normalized_filename(subf)
2892
except UnicodeDecodeError:
2893
path_os_enc = path.encode(osutils._fs_enc)
2894
relpath = path_os_enc + '/' + subf
2895
raise errors.BadFilenameEncoding(relpath,
2897
if subf_norm != subf and can_access:
2898
if subf_norm not in dir_entry.children:
2899
fl.append(subf_norm)
2905
subp = pathjoin(path, subf)
2908
def _walkdirs(self, prefix=""):
2909
"""Walk the directories of this tree.
2911
:prefix: is used as the directrory to start with.
2912
returns a generator which yields items in the form:
2913
((curren_directory_path, fileid),
2914
[(file1_path, file1_name, file1_kind, None, file1_id,
2917
_directory = 'directory'
2918
# get the root in the inventory
2919
inv = self.inventory
2920
top_id = inv.path2id(prefix)
2924
pending = [(prefix, '', _directory, None, top_id, None)]
2927
currentdir = pending.pop()
2928
# 0 - relpath, 1- basename, 2- kind, 3- stat, 4-id, 5-kind
2929
top_id = currentdir[4]
2931
relroot = currentdir[0] + '/'
2934
# FIXME: stash the node in pending
2936
if entry.kind == 'directory':
2937
for name, child in entry.sorted_children():
2938
dirblock.append((relroot + name, name, child.kind, None,
2939
child.file_id, child.kind
2941
yield (currentdir[0], entry.file_id), dirblock
2942
# push the user specified dirs from dirblock
2943
for dir in reversed(dirblock):
2944
if dir[2] == _directory:
2948
class WorkingTreeFormatRegistry(controldir.ControlComponentFormatRegistry):
2949
"""Registry for working tree formats."""
2951
def __init__(self, other_registry=None):
2952
super(WorkingTreeFormatRegistry, self).__init__(other_registry)
2953
self._default_format = None
2954
self._default_format_key = None
2956
def get_default(self):
2957
"""Return the current default format."""
2958
if (self._default_format_key is not None and
2959
self._default_format is None):
2960
self._default_format = self.get(self._default_format_key)
2961
return self._default_format
2963
def set_default(self, format):
2964
"""Set the default format."""
2965
self._default_format = format
2966
self._default_format_key = None
2968
def set_default_key(self, format_string):
2969
"""Set the default format by its format string."""
2970
self._default_format_key = format_string
2971
self._default_format = None
2974
format_registry = WorkingTreeFormatRegistry()
2977
class WorkingTreeFormat(controldir.ControlComponentFormat):
2750
2978
"""An encapsulation of the initialization and open routines for a format.
2752
2980
Formats provide three things:
3081
@symbol_versioning.deprecated_method(
3082
symbol_versioning.deprecated_in((2, 4, 0)))
2827
3083
def register_format(klass, format):
2828
klass._formats[format.get_format_string()] = format
3084
format_registry.register(format)
3087
@symbol_versioning.deprecated_method(
3088
symbol_versioning.deprecated_in((2, 4, 0)))
3089
def register_extra_format(klass, format):
3090
format_registry.register_extra(format)
3093
@symbol_versioning.deprecated_method(
3094
symbol_versioning.deprecated_in((2, 4, 0)))
3095
def unregister_extra_format(klass, format):
3096
format_registry.unregister_extra(format)
3099
@symbol_versioning.deprecated_method(
3100
symbol_versioning.deprecated_in((2, 4, 0)))
3101
def get_formats(klass):
3102
return format_registry._get_all()
3105
@symbol_versioning.deprecated_method(
3106
symbol_versioning.deprecated_in((2, 4, 0)))
2831
3107
def set_default_format(klass, format):
2832
klass._default_format = format
3108
format_registry.set_default(format)
3111
@symbol_versioning.deprecated_method(
3112
symbol_versioning.deprecated_in((2, 4, 0)))
2835
3113
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(),
3114
format_registry.remove(format)
3117
format_registry.register_lazy("Bazaar Working Tree Format 4 (bzr 0.15)\n",
3118
"bzrlib.workingtree_4", "WorkingTreeFormat4")
3119
format_registry.register_lazy("Bazaar Working Tree Format 5 (bzr 1.11)\n",
3120
"bzrlib.workingtree_4", "WorkingTreeFormat5")
3121
format_registry.register_lazy("Bazaar Working Tree Format 6 (bzr 1.14)\n",
3122
"bzrlib.workingtree_4", "WorkingTreeFormat6")
3123
format_registry.register_lazy("Bazaar-NG Working Tree format 3",
3124
"bzrlib.workingtree_3", "WorkingTreeFormat3")
3125
format_registry.set_default_key("Bazaar Working Tree Format 6 (bzr 1.14)\n")
added
removed
bzrlib/workingtree.py
