2608
1805
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.
1808
class InventoryWorkingTree(WorkingTree,
1809
bzrlib.mutabletree.MutableInventoryTree):
1810
"""Base class for working trees that are inventory-oriented.
1812
The inventory is held in the `Branch` working-inventory, and the
1813
files are in a directory on disk.
1815
It is possible for a `WorkingTree` to have a filename which is
1816
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()
1819
def __init__(self, basedir='.',
1820
branch=DEPRECATED_PARAMETER,
1822
_control_files=None,
1826
"""Construct a InventoryWorkingTree instance. This is not a public API.
1828
:param branch: A branch to override probing for the branch.
1830
super(InventoryWorkingTree, self).__init__(basedir=basedir,
1831
branch=branch, _control_files=_control_files, _internal=_internal,
1832
_format=_format, _bzrdir=_bzrdir)
1834
if _inventory is None:
1835
# This will be acquired on lock_read() or lock_write()
1836
self._inventory_is_modified = False
1837
self._inventory = None
1839
# the caller of __init__ has provided an inventory,
1840
# we assume they know what they are doing - as its only
1841
# the Format factory and creation methods that are
1842
# permitted to do this.
1843
self._set_inventory(_inventory, dirty=False)
1845
def _set_inventory(self, inv, dirty):
1846
"""Set the internal cached inventory.
1848
:param inv: The inventory to set.
1849
:param dirty: A boolean indicating whether the inventory is the same
1850
logical inventory as whats on disk. If True the inventory is not
1851
the same and should be written to disk or data will be lost, if
1852
False then the inventory is the same as that on disk and any
1853
serialisation would be unneeded overhead.
1855
self._inventory = inv
1856
self._inventory_is_modified = dirty
1858
def _serialize(self, inventory, out_file):
1859
xml5.serializer_v5.write_inventory(self._inventory, out_file,
1862
def _deserialize(selt, in_file):
1863
return xml5.serializer_v5.read_inventory(in_file)
1865
@needs_tree_write_lock
1866
def _write_inventory(self, inv):
1867
"""Write inventory as the current inventory."""
1868
self._set_inventory(inv, dirty=True)
1871
# XXX: This method should be deprecated in favour of taking in a proper
1872
# new Inventory object.
1873
@needs_tree_write_lock
1874
def set_inventory(self, new_inventory_list):
1875
from bzrlib.inventory import (Inventory,
1879
inv = Inventory(self.get_root_id())
1880
for path, file_id, parent, kind in new_inventory_list:
1881
name = os.path.basename(path)
1884
# fixme, there should be a factory function inv,add_??
1885
if kind == 'directory':
1886
inv.add(InventoryDirectory(file_id, name, parent))
1887
elif kind == 'file':
1888
inv.add(InventoryFile(file_id, name, parent))
1889
elif kind == 'symlink':
1890
inv.add(InventoryLink(file_id, name, parent))
1892
raise errors.BzrError("unknown kind %r" % kind)
1893
self._write_inventory(inv)
1895
def _write_basis_inventory(self, xml):
1896
"""Write the basis inventory XML to the basis-inventory file"""
1897
path = self._basis_inventory_name()
1899
self._transport.put_file(path, sio,
1900
mode=self.bzrdir._get_file_mode())
1902
def _reset_data(self):
1903
"""Reset transient data that cannot be revalidated."""
1904
self._inventory_is_modified = False
1905
f = self._transport.get('inventory')
1907
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."""
1910
self._set_inventory(result, dirty=False)
1912
def _set_root_id(self, file_id):
1913
"""Set the root id for this tree, in a format specific manner.
1915
:param file_id: The file id to assign to the root. It must not be
1916
present in the current inventory or an error will occur. It must
1917
not be None, but rather a valid file id.
1919
inv = self._inventory
1920
orig_root_id = inv.root.file_id
1921
# TODO: it might be nice to exit early if there was nothing
1922
# to do, saving us from trigger a sync on unlock.
1923
self._inventory_is_modified = True
1924
# we preserve the root inventory entry object, but
1925
# unlinkit from the byid index
1926
del inv._byid[inv.root.file_id]
1927
inv.root.file_id = file_id
1928
# and link it into the index with the new changed id.
1929
inv._byid[inv.root.file_id] = inv.root
1930
# and finally update all children to reference the new id.
1931
# XXX: this should be safe to just look at the root.children
1932
# list, not the WHOLE INVENTORY.
1935
if entry.parent_id == orig_root_id:
1936
entry.parent_id = inv.root.file_id
1938
def all_file_ids(self):
1939
"""See Tree.iter_all_file_ids"""
1940
return set(self.inventory)
1942
@needs_tree_write_lock
1943
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
1944
"""See MutableTree.set_parent_trees."""
1945
parent_ids = [rev for (rev, tree) in parents_list]
1946
for revision_id in parent_ids:
1947
_mod_revision.check_not_reserved_id(revision_id)
1949
self._check_parents_for_ghosts(parent_ids,
1950
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
1952
parent_ids = self._filter_parent_ids_by_ancestry(parent_ids)
1954
if len(parent_ids) == 0:
1955
leftmost_parent_id = _mod_revision.NULL_REVISION
1956
leftmost_parent_tree = None
1958
leftmost_parent_id, leftmost_parent_tree = parents_list[0]
1960
if self._change_last_revision(leftmost_parent_id):
1961
if leftmost_parent_tree is None:
1962
# If we don't have a tree, fall back to reading the
1963
# parent tree from the repository.
1964
self._cache_basis_inventory(leftmost_parent_id)
1966
inv = leftmost_parent_tree.inventory
1967
xml = self._create_basis_xml_from_inventory(
1968
leftmost_parent_id, inv)
1969
self._write_basis_inventory(xml)
1970
self._set_merges_from_parent_ids(parent_ids)
1972
def _cache_basis_inventory(self, new_revision):
1973
"""Cache new_revision as the basis inventory."""
1974
# TODO: this should allow the ready-to-use inventory to be passed in,
1975
# 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())]
1978
# this double handles the inventory - unpack and repack -
1979
# but is easier to understand. We can/should put a conditional
1980
# in here based on whether the inventory is in the latest format
1981
# - perhaps we should repack all inventories on a repository
1983
# the fast path is to copy the raw xml from the repository. If the
1984
# xml contains 'revision_id="', then we assume the right
1985
# revision_id is set. We must check for this full string, because a
1986
# root node id can legitimately look like 'revision_id' but cannot
1988
xml = self.branch.repository._get_inventory_xml(new_revision)
1989
firstline = xml.split('\n', 1)[0]
1990
if (not 'revision_id="' in firstline or
1991
'format="7"' not in firstline):
1992
inv = self.branch.repository._serializer.read_inventory_from_string(
1994
xml = self._create_basis_xml_from_inventory(new_revision, inv)
1995
self._write_basis_inventory(xml)
1996
except (errors.NoSuchRevision, errors.RevisionNotPresent):
1999
def _basis_inventory_name(self):
2000
return 'basis-inventory-cache'
2002
def _create_basis_xml_from_inventory(self, revision_id, inventory):
2003
"""Create the text that will be saved in basis-inventory"""
2004
inventory.revision_id = revision_id
2005
return xml7.serializer_v7.write_inventory_to_string(inventory)
2700
2007
@needs_tree_write_lock
2701
2008
def set_conflicts(self, conflicts):
2721
2028
raise errors.ConflictFormatError()
2722
2029
except StopIteration:
2723
2030
raise errors.ConflictFormatError()
2724
return _mod_conflicts.ConflictList.from_stanzas(RioReader(confile))
2031
reader = _mod_rio.RioReader(confile)
2032
return _mod_conflicts.ConflictList.from_stanzas(reader)
2726
2034
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):
2036
def read_basis_inventory(self):
2037
"""Read the cached basis inventory."""
2038
path = self._basis_inventory_name()
2039
return self._transport.get_bytes(path)
2042
def read_working_inventory(self):
2043
"""Read the working inventory.
2045
:raises errors.InventoryModified: read_working_inventory will fail
2046
when the current in memory inventory has been modified.
2048
# conceptually this should be an implementation detail of the tree.
2049
# XXX: Deprecate this.
2050
# ElementTree does its own conversion from UTF-8, so open in
2052
if self._inventory_is_modified:
2053
raise errors.InventoryModified(self)
2054
f = self._transport.get('inventory')
2056
result = self._deserialize(f)
2059
self._set_inventory(result, dirty=False)
2063
def get_root_id(self):
2064
"""Return the id of this trees root"""
2065
return self._inventory.root.file_id
2067
def has_id(self, file_id):
2068
# files that have been deleted are excluded
2069
inv = self.inventory
2070
if not inv.has_id(file_id):
2072
path = inv.id2path(file_id)
2073
return osutils.lexists(self.abspath(path))
2075
def has_or_had_id(self, file_id):
2076
if file_id == self.inventory.root.file_id:
2078
return self.inventory.has_id(file_id)
2080
__contains__ = has_id
2082
@symbol_versioning.deprecated_method(symbol_versioning.deprecated_in((2, 4, 0)))
2084
"""Iterate through file_ids for this tree.
2086
file_ids are in a WorkingTree if they are in the working inventory
2087
and the working file exists.
2089
inv = self._inventory
2090
for path, ie in inv.iter_entries():
2091
if osutils.lexists(self.abspath(path)):
2094
@needs_tree_write_lock
2095
def set_last_revision(self, new_revision):
2096
"""Change the last revision in the working tree."""
2097
if self._change_last_revision(new_revision):
2098
self._cache_basis_inventory(new_revision)
2100
def _get_check_refs(self):
2101
"""Return the references needed to perform a check of this tree.
2103
The default implementation returns no refs, and is only suitable for
2104
trees that have no local caching and can commit on ghosts at any time.
2106
:seealso: bzrlib.check for details about check_refs.
2111
def _check(self, references):
2112
"""Check the tree for consistency.
2114
:param references: A dict with keys matching the items returned by
2115
self._get_check_refs(), and values from looking those keys up in
2118
tree_basis = self.basis_tree()
2119
tree_basis.lock_read()
2121
repo_basis = references[('trees', self.last_revision())]
2122
if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2123
raise errors.BzrCheckError(
2124
"Mismatched basis inventory content.")
2130
def check_state(self):
2131
"""Check that the working state is/isn't valid."""
2132
check_refs = self._get_check_refs()
2134
for ref in check_refs:
2137
refs[ref] = self.branch.repository.revision_tree(value)
2140
@needs_tree_write_lock
2141
def reset_state(self, revision_ids=None):
2142
"""Reset the state of the working tree.
2144
This does a hard-reset to a last-known-good state. This is a way to
2145
fix if something got corrupted (like the .bzr/checkout/dirstate file)
2147
if revision_ids is None:
2148
revision_ids = self.get_parent_ids()
2149
if not revision_ids:
2150
rt = self.branch.repository.revision_tree(
2151
_mod_revision.NULL_REVISION)
2153
rt = self.branch.repository.revision_tree(revision_ids[0])
2154
self._write_inventory(rt.inventory)
2155
self.set_parent_ids(revision_ids)
2158
"""Write the in memory inventory to disk."""
2159
# TODO: Maybe this should only write on dirty ?
2160
if self._control_files._lock_mode != 'w':
2161
raise errors.NotWriteLocked(self)
2163
self._serialize(self._inventory, sio)
2165
self._transport.put_file('inventory', sio,
2166
mode=self.bzrdir._get_file_mode())
2167
self._inventory_is_modified = False
2170
def get_file_sha1(self, file_id, path=None, stat_value=None):
2172
path = self._inventory.id2path(file_id)
2173
return self._hashcache.get_sha1(path, stat_value)
2175
def get_file_mtime(self, file_id, path=None):
2176
"""See Tree.get_file_mtime."""
2178
path = self.inventory.id2path(file_id)
2179
return os.lstat(self.abspath(path)).st_mtime
2181
def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
2182
file_id = self.path2id(path)
2184
# For unversioned files on win32, we just assume they are not
2187
return self._inventory[file_id].executable
2189
def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
2190
mode = stat_result.st_mode
2191
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
2193
if not supports_executable():
2194
def is_executable(self, file_id, path=None):
2195
return self._inventory[file_id].executable
2197
_is_executable_from_path_and_stat = \
2198
_is_executable_from_path_and_stat_from_basis
2200
def is_executable(self, file_id, path=None):
2202
path = self.id2path(file_id)
2203
mode = os.lstat(self.abspath(path)).st_mode
2204
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
2206
_is_executable_from_path_and_stat = \
2207
_is_executable_from_path_and_stat_from_stat
2209
@needs_tree_write_lock
2210
def _add(self, files, ids, kinds):
2211
"""See MutableTree._add."""
2212
# TODO: Re-adding a file that is removed in the working copy
2213
# should probably put it back with the previous ID.
2214
# the read and write working inventory should not occur in this
2215
# function - they should be part of lock_write and unlock.
2216
inv = self.inventory
2217
for f, file_id, kind in zip(files, ids, kinds):
2219
inv.add_path(f, kind=kind)
2221
inv.add_path(f, kind=kind, file_id=file_id)
2222
self._inventory_is_modified = True
2224
def revision_tree(self, revision_id):
2225
"""See WorkingTree.revision_id."""
2226
if revision_id == self.last_revision():
2228
xml = self.read_basis_inventory()
2229
except errors.NoSuchFile:
2233
inv = xml7.serializer_v7.read_inventory_from_string(xml)
2234
# dont use the repository revision_tree api because we want
2235
# to supply the inventory.
2236
if inv.revision_id == revision_id:
2237
return revisiontree.InventoryRevisionTree(
2238
self.branch.repository, inv, revision_id)
2239
except errors.BadInventoryFormat:
2241
# raise if there was no inventory, or if we read the wrong inventory.
2242
raise errors.NoSuchRevisionInTree(self, revision_id)
2245
def annotate_iter(self, file_id, default_revision=CURRENT_REVISION):
2246
"""See Tree.annotate_iter
2248
This implementation will use the basis tree implementation if possible.
2249
Lines not in the basis are attributed to CURRENT_REVISION
2251
If there are pending merges, lines added by those merges will be
2252
incorrectly attributed to CURRENT_REVISION (but after committing, the
2253
attribution will be correct).
2255
maybe_file_parent_keys = []
2256
for parent_id in self.get_parent_ids():
2258
parent_tree = self.revision_tree(parent_id)
2259
except errors.NoSuchRevisionInTree:
2260
parent_tree = self.branch.repository.revision_tree(parent_id)
2261
parent_tree.lock_read()
2263
if file_id not in parent_tree:
2265
ie = parent_tree.inventory[file_id]
2266
if ie.kind != 'file':
2267
# Note: this is slightly unnecessary, because symlinks and
2268
# directories have a "text" which is the empty text, and we
2269
# know that won't mess up annotations. But it seems cleaner
2271
parent_text_key = (file_id, ie.revision)
2272
if parent_text_key not in maybe_file_parent_keys:
2273
maybe_file_parent_keys.append(parent_text_key)
2275
parent_tree.unlock()
2276
graph = _mod_graph.Graph(self.branch.repository.texts)
2277
heads = graph.heads(maybe_file_parent_keys)
2278
file_parent_keys = []
2279
for key in maybe_file_parent_keys:
2281
file_parent_keys.append(key)
2283
# Now we have the parents of this content
2284
annotator = self.branch.repository.texts.get_annotator()
2285
text = self.get_file_text(file_id)
2286
this_key =(file_id, default_revision)
2287
annotator.add_special_text(this_key, file_parent_keys, text)
2288
annotations = [(key[-1], line)
2289
for key, line in annotator.annotate_flat(this_key)]
2293
def merge_modified(self):
2294
"""Return a dictionary of files modified by a merge.
2296
The list is initialized by WorkingTree.set_merge_modified, which is
2297
typically called after we make some automatic updates to the tree
2300
This returns a map of file_id->sha1, containing only files which are
2301
still in the working inventory and have that text hash.
2304
hashfile = self._transport.get('merge-hashes')
2305
except errors.NoSuchFile:
2310
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
2311
raise errors.MergeModifiedFormatError()
2312
except StopIteration:
2313
raise errors.MergeModifiedFormatError()
2314
for s in _mod_rio.RioReader(hashfile):
2315
# RioReader reads in Unicode, so convert file_ids back to utf8
2316
file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
2317
if file_id not in self.inventory:
2319
text_hash = s.get("hash")
2320
if text_hash == self.get_file_sha1(file_id):
2321
merge_hashes[file_id] = text_hash
2327
def subsume(self, other_tree):
2328
def add_children(inventory, entry):
2329
for child_entry in entry.children.values():
2330
inventory._byid[child_entry.file_id] = child_entry
2331
if child_entry.kind == 'directory':
2332
add_children(inventory, child_entry)
2333
if other_tree.get_root_id() == self.get_root_id():
2334
raise errors.BadSubsumeSource(self, other_tree,
2335
'Trees have the same root')
2337
other_tree_path = self.relpath(other_tree.basedir)
2338
except errors.PathNotChild:
2339
raise errors.BadSubsumeSource(self, other_tree,
2340
'Tree is not contained by the other')
2341
new_root_parent = self.path2id(osutils.dirname(other_tree_path))
2342
if new_root_parent is None:
2343
raise errors.BadSubsumeSource(self, other_tree,
2344
'Parent directory is not versioned.')
2345
# We need to ensure that the result of a fetch will have a
2346
# versionedfile for the other_tree root, and only fetching into
2347
# RepositoryKnit2 guarantees that.
2348
if not self.branch.repository.supports_rich_root():
2349
raise errors.SubsumeTargetNeedsUpgrade(other_tree)
2350
other_tree.lock_tree_write()
2352
new_parents = other_tree.get_parent_ids()
2353
other_root = other_tree.inventory.root
2354
other_root.parent_id = new_root_parent
2355
other_root.name = osutils.basename(other_tree_path)
2356
self.inventory.add(other_root)
2357
add_children(self.inventory, other_root)
2358
self._write_inventory(self.inventory)
2359
# normally we don't want to fetch whole repositories, but i think
2360
# here we really do want to consolidate the whole thing.
2361
for parent_id in other_tree.get_parent_ids():
2362
self.branch.fetch(other_tree.branch, parent_id)
2363
self.add_parent_tree_id(parent_id)
2366
other_tree.bzrdir.retire_bzrdir()
2368
@needs_tree_write_lock
2369
def extract(self, file_id, format=None):
2370
"""Extract a subtree from this tree.
2372
A new branch will be created, relative to the path for this tree.
2376
segments = osutils.splitpath(path)
2377
transport = self.branch.bzrdir.root_transport
2378
for name in segments:
2379
transport = transport.clone(name)
2380
transport.ensure_base()
2383
sub_path = self.id2path(file_id)
2384
branch_transport = mkdirs(sub_path)
2386
format = self.bzrdir.cloning_metadir()
2387
branch_transport.ensure_base()
2388
branch_bzrdir = format.initialize_on_transport(branch_transport)
2390
repo = branch_bzrdir.find_repository()
2391
except errors.NoRepositoryPresent:
2392
repo = branch_bzrdir.create_repository()
2393
if not repo.supports_rich_root():
2394
raise errors.RootNotRich()
2395
new_branch = branch_bzrdir.create_branch()
2396
new_branch.pull(self.branch)
2397
for parent_id in self.get_parent_ids():
2398
new_branch.fetch(self.branch, parent_id)
2399
tree_transport = self.bzrdir.root_transport.clone(sub_path)
2400
if tree_transport.base != branch_transport.base:
2401
tree_bzrdir = format.initialize_on_transport(tree_transport)
2402
branch.BranchReferenceFormat().initialize(tree_bzrdir,
2403
target_branch=new_branch)
2405
tree_bzrdir = branch_bzrdir
2406
wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
2407
wt.set_parent_ids(self.get_parent_ids())
2408
my_inv = self.inventory
2409
child_inv = inventory.Inventory(root_id=None)
2410
new_root = my_inv[file_id]
2411
my_inv.remove_recursive_id(file_id)
2412
new_root.parent_id = None
2413
child_inv.add(new_root)
2414
self._write_inventory(my_inv)
2415
wt._write_inventory(child_inv)
2418
def list_files(self, include_root=False, from_dir=None, recursive=True):
2419
"""List all files as (path, class, kind, id, entry).
2421
Lists, but does not descend into unversioned directories.
2422
This does not include files that have been deleted in this
2423
tree. Skips the control directory.
2425
:param include_root: if True, return an entry for the root
2426
:param from_dir: start from this directory or None for the root
2427
:param recursive: whether to recurse into subdirectories or not
2429
# list_files is an iterator, so @needs_read_lock doesn't work properly
2430
# with it. So callers should be careful to always read_lock the tree.
2431
if not self.is_locked():
2432
raise errors.ObjectNotLocked(self)
2434
inv = self.inventory
2435
if from_dir is None and include_root is True:
2436
yield ('', 'V', 'directory', inv.root.file_id, inv.root)
2437
# Convert these into local objects to save lookup times
2438
pathjoin = osutils.pathjoin
2439
file_kind = self._kind
2441
# transport.base ends in a slash, we want the piece
2442
# between the last two slashes
2443
transport_base_dir = self.bzrdir.transport.base.rsplit('/', 2)[1]
2445
fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
2447
# directory file_id, relative path, absolute path, reverse sorted children
2448
if from_dir is not None:
2449
from_dir_id = inv.path2id(from_dir)
2450
if from_dir_id is None:
2451
# Directory not versioned
2453
from_dir_abspath = pathjoin(self.basedir, from_dir)
2455
from_dir_id = inv.root.file_id
2456
from_dir_abspath = self.basedir
2457
children = os.listdir(from_dir_abspath)
2459
# jam 20060527 The kernel sized tree seems equivalent whether we
2460
# use a deque and popleft to keep them sorted, or if we use a plain
2461
# list and just reverse() them.
2462
children = collections.deque(children)
2463
stack = [(from_dir_id, u'', from_dir_abspath, children)]
2465
from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
2468
f = children.popleft()
2469
## TODO: If we find a subdirectory with its own .bzr
2470
## directory, then that is a separate tree and we
2471
## should exclude it.
2473
# the bzrdir for this tree
2474
if transport_base_dir == f:
2477
# we know that from_dir_relpath and from_dir_abspath never end in a slash
2478
# and 'f' doesn't begin with one, we can do a string op, rather
2479
# than the checks of pathjoin(), all relative paths will have an extra slash
2481
fp = from_dir_relpath + '/' + f
2484
fap = from_dir_abspath + '/' + f
2486
dir_ie = inv[from_dir_id]
2487
if dir_ie.kind == 'directory':
2488
f_ie = dir_ie.children.get(f)
2493
elif self.is_ignored(fp[1:]):
2496
# we may not have found this file, because of a unicode
2497
# issue, or because the directory was actually a symlink.
2498
f_norm, can_access = osutils.normalized_filename(f)
2499
if f == f_norm or not can_access:
2500
# No change, so treat this file normally
2503
# this file can be accessed by a normalized path
2504
# check again if it is versioned
2505
# these lines are repeated here for performance
2507
fp = from_dir_relpath + '/' + f
2508
fap = from_dir_abspath + '/' + f
2509
f_ie = inv.get_child(from_dir_id, f)
2512
elif self.is_ignored(fp[1:]):
2519
# make a last minute entry
2521
yield fp[1:], c, fk, f_ie.file_id, f_ie
2524
yield fp[1:], c, fk, None, fk_entries[fk]()
2526
yield fp[1:], c, fk, None, TreeEntry()
2529
if fk != 'directory':
2532
# But do this child first if recursing down
2534
new_children = os.listdir(fap)
2536
new_children = collections.deque(new_children)
2537
stack.append((f_ie.file_id, fp, fap, new_children))
2538
# Break out of inner loop,
2539
# so that we start outer loop with child
2542
# if we finished all children, pop it off the stack
2545
@needs_tree_write_lock
2546
def move(self, from_paths, to_dir=None, after=False):
2549
to_dir must exist in the inventory.
2551
If to_dir exists and is a directory, the files are moved into
2552
it, keeping their old names.
2554
Note that to_dir is only the last component of the new name;
2555
this doesn't change the directory.
2557
For each entry in from_paths the move mode will be determined
2560
The first mode moves the file in the filesystem and updates the
2561
inventory. The second mode only updates the inventory without
2562
touching the file on the filesystem.
2564
move uses the second mode if 'after == True' and the target is
2565
either not versioned or newly added, and present in the working tree.
2567
move uses the second mode if 'after == False' and the source is
2568
versioned but no longer in the working tree, and the target is not
2569
versioned but present in the working tree.
2571
move uses the first mode if 'after == False' and the source is
2572
versioned and present in the working tree, and the target is not
2573
versioned and not present in the working tree.
2575
Everything else results in an error.
2577
This returns a list of (from_path, to_path) pairs for each
2578
entry that is moved.
2583
# check for deprecated use of signature
2585
raise TypeError('You must supply a target directory')
2586
# check destination directory
2587
if isinstance(from_paths, basestring):
2589
inv = self.inventory
2590
to_abs = self.abspath(to_dir)
2591
if not isdir(to_abs):
2592
raise errors.BzrMoveFailedError('',to_dir,
2593
errors.NotADirectory(to_abs))
2594
if not self.has_filename(to_dir):
2595
raise errors.BzrMoveFailedError('',to_dir,
2596
errors.NotInWorkingDirectory(to_dir))
2597
to_dir_id = inv.path2id(to_dir)
2598
if to_dir_id is None:
2599
raise errors.BzrMoveFailedError('',to_dir,
2600
errors.NotVersionedError(path=to_dir))
2602
to_dir_ie = inv[to_dir_id]
2603
if to_dir_ie.kind != 'directory':
2604
raise errors.BzrMoveFailedError('',to_dir,
2605
errors.NotADirectory(to_abs))
2607
# create rename entries and tuples
2608
for from_rel in from_paths:
2609
from_tail = splitpath(from_rel)[-1]
2610
from_id = inv.path2id(from_rel)
2612
raise errors.BzrMoveFailedError(from_rel,to_dir,
2613
errors.NotVersionedError(path=from_rel))
2615
from_entry = inv[from_id]
2616
from_parent_id = from_entry.parent_id
2617
to_rel = pathjoin(to_dir, from_tail)
2618
rename_entry = InventoryWorkingTree._RenameEntry(
2621
from_tail=from_tail,
2622
from_parent_id=from_parent_id,
2623
to_rel=to_rel, to_tail=from_tail,
2624
to_parent_id=to_dir_id)
2625
rename_entries.append(rename_entry)
2626
rename_tuples.append((from_rel, to_rel))
2628
# determine which move mode to use. checks also for movability
2629
rename_entries = self._determine_mv_mode(rename_entries, after)
2631
original_modified = self._inventory_is_modified
2634
self._inventory_is_modified = True
2635
self._move(rename_entries)
2637
# restore the inventory on error
2638
self._inventory_is_modified = original_modified
2640
self._write_inventory(inv)
2641
return rename_tuples
2643
@needs_tree_write_lock
2644
def rename_one(self, from_rel, to_rel, after=False):
2647
This can change the directory or the filename or both.
2649
rename_one has several 'modes' to work. First, it can rename a physical
2650
file and change the file_id. That is the normal mode. Second, it can
2651
only change the file_id without touching any physical file.
2653
rename_one uses the second mode if 'after == True' and 'to_rel' is not
2654
versioned but present in the working tree.
2656
rename_one uses the second mode if 'after == False' and 'from_rel' is
2657
versioned but no longer in the working tree, and 'to_rel' is not
2658
versioned but present in the working tree.
2660
rename_one uses the first mode if 'after == False' and 'from_rel' is
2661
versioned and present in the working tree, and 'to_rel' is not
2662
versioned and not present in the working tree.
2664
Everything else results in an error.
2666
inv = self.inventory
2669
# create rename entries and tuples
2670
from_tail = splitpath(from_rel)[-1]
2671
from_id = inv.path2id(from_rel)
2673
# if file is missing in the inventory maybe it's in the basis_tree
2674
basis_tree = self.branch.basis_tree()
2675
from_id = basis_tree.path2id(from_rel)
2677
raise errors.BzrRenameFailedError(from_rel,to_rel,
2678
errors.NotVersionedError(path=from_rel))
2679
# put entry back in the inventory so we can rename it
2680
from_entry = basis_tree.inventory[from_id].copy()
2683
from_entry = inv[from_id]
2684
from_parent_id = from_entry.parent_id
2685
to_dir, to_tail = os.path.split(to_rel)
2686
to_dir_id = inv.path2id(to_dir)
2687
rename_entry = InventoryWorkingTree._RenameEntry(from_rel=from_rel,
2689
from_tail=from_tail,
2690
from_parent_id=from_parent_id,
2691
to_rel=to_rel, to_tail=to_tail,
2692
to_parent_id=to_dir_id)
2693
rename_entries.append(rename_entry)
2695
# determine which move mode to use. checks also for movability
2696
rename_entries = self._determine_mv_mode(rename_entries, after)
2698
# check if the target changed directory and if the target directory is
2700
if to_dir_id is None:
2701
raise errors.BzrMoveFailedError(from_rel,to_rel,
2702
errors.NotVersionedError(path=to_dir))
2704
# all checks done. now we can continue with our actual work
2705
mutter('rename_one:\n'
2710
' to_dir_id {%s}\n',
2711
from_id, from_rel, to_rel, to_dir, to_dir_id)
2713
self._move(rename_entries)
2714
self._write_inventory(inv)
2716
class _RenameEntry(object):
2717
def __init__(self, from_rel, from_id, from_tail, from_parent_id,
2718
to_rel, to_tail, to_parent_id, only_change_inv=False,
2720
self.from_rel = from_rel
2721
self.from_id = from_id
2722
self.from_tail = from_tail
2723
self.from_parent_id = from_parent_id
2724
self.to_rel = to_rel
2725
self.to_tail = to_tail
2726
self.to_parent_id = to_parent_id
2727
self.change_id = change_id
2728
self.only_change_inv = only_change_inv
2730
def _determine_mv_mode(self, rename_entries, after=False):
2731
"""Determines for each from-to pair if both inventory and working tree
2732
or only the inventory has to be changed.
2734
Also does basic plausability tests.
2736
inv = self.inventory
2738
for rename_entry in rename_entries:
2739
# store to local variables for easier reference
2740
from_rel = rename_entry.from_rel
2741
from_id = rename_entry.from_id
2742
to_rel = rename_entry.to_rel
2743
to_id = inv.path2id(to_rel)
2744
only_change_inv = False
2747
# check the inventory for source and destination
2749
raise errors.BzrMoveFailedError(from_rel,to_rel,
2750
errors.NotVersionedError(path=from_rel))
2751
if to_id is not None:
2753
# allow it with --after but only if dest is newly added
2755
basis = self.basis_tree()
2758
if not basis.has_id(to_id):
2759
rename_entry.change_id = True
2764
raise errors.BzrMoveFailedError(from_rel,to_rel,
2765
errors.AlreadyVersionedError(path=to_rel))
2767
# try to determine the mode for rename (only change inv or change
2768
# inv and file system)
2770
if not self.has_filename(to_rel):
2771
raise errors.BzrMoveFailedError(from_id,to_rel,
2772
errors.NoSuchFile(path=to_rel,
2773
extra="New file has not been created yet"))
2774
only_change_inv = True
2775
elif not self.has_filename(from_rel) and self.has_filename(to_rel):
2776
only_change_inv = True
2777
elif self.has_filename(from_rel) and not self.has_filename(to_rel):
2778
only_change_inv = False
2779
elif (not self.case_sensitive
2780
and from_rel.lower() == to_rel.lower()
2781
and self.has_filename(from_rel)):
2782
only_change_inv = False
2784
# something is wrong, so lets determine what exactly
2785
if not self.has_filename(from_rel) and \
2786
not self.has_filename(to_rel):
2787
raise errors.BzrRenameFailedError(from_rel,to_rel,
2788
errors.PathsDoNotExist(paths=(str(from_rel),
2791
raise errors.RenameFailedFilesExist(from_rel, to_rel)
2792
rename_entry.only_change_inv = only_change_inv
2793
return rename_entries
2795
def _move(self, rename_entries):
2796
"""Moves a list of files.
2798
Depending on the value of the flag 'only_change_inv', the
2799
file will be moved on the file system or not.
2801
inv = self.inventory
2804
for entry in rename_entries:
2806
self._move_entry(entry)
2808
self._rollback_move(moved)
2812
def _rollback_move(self, moved):
2813
"""Try to rollback a previous move in case of an filesystem error."""
2814
inv = self.inventory
2817
self._move_entry(WorkingTree._RenameEntry(
2818
entry.to_rel, entry.from_id,
2819
entry.to_tail, entry.to_parent_id, entry.from_rel,
2820
entry.from_tail, entry.from_parent_id,
2821
entry.only_change_inv))
2822
except errors.BzrMoveFailedError, e:
2823
raise errors.BzrMoveFailedError( '', '', "Rollback failed."
2824
" The working tree is in an inconsistent state."
2825
" Please consider doing a 'bzr revert'."
2826
" Error message is: %s" % e)
2828
def _move_entry(self, entry):
2829
inv = self.inventory
2830
from_rel_abs = self.abspath(entry.from_rel)
2831
to_rel_abs = self.abspath(entry.to_rel)
2832
if from_rel_abs == to_rel_abs:
2833
raise errors.BzrMoveFailedError(entry.from_rel, entry.to_rel,
2834
"Source and target are identical.")
2836
if not entry.only_change_inv:
2838
osutils.rename(from_rel_abs, to_rel_abs)
2840
raise errors.BzrMoveFailedError(entry.from_rel,
2843
to_id = inv.path2id(entry.to_rel)
2844
inv.remove_recursive_id(to_id)
2845
inv.rename(entry.from_id, entry.to_parent_id, entry.to_tail)
2847
@needs_tree_write_lock
2848
def unversion(self, file_ids):
2849
"""Remove the file ids in file_ids from the current versioned set.
2851
When a file_id is unversioned, all of its children are automatically
2854
:param file_ids: The file ids to stop versioning.
2855
:raises: NoSuchId if any fileid is not currently versioned.
2857
for file_id in file_ids:
2858
if file_id not in self._inventory:
2859
raise errors.NoSuchId(self, file_id)
2860
for file_id in file_ids:
2861
if self._inventory.has_id(file_id):
2862
self._inventory.remove_recursive_id(file_id)
2864
# in the future this should just set a dirty bit to wait for the
2865
# final unlock. However, until all methods of workingtree start
2866
# with the current in -memory inventory rather than triggering
2867
# a read, it is more complex - we need to teach read_inventory
2868
# to know when to read, and when to not read first... and possibly
2869
# to save first when the in memory one may be corrupted.
2870
# so for now, we just only write it if it is indeed dirty.
2872
self._write_inventory(self._inventory)
2874
def stored_kind(self, file_id):
2875
"""See Tree.stored_kind"""
2876
return self.inventory[file_id].kind
2879
"""Yield all unversioned files in this WorkingTree.
2881
If there are any unversioned directories then only the directory is
2882
returned, not all its children. But if there are unversioned files
2883
under a versioned subdirectory, they are returned.
2885
Currently returned depth-first, sorted by name within directories.
2886
This is the same order used by 'osutils.walkdirs'.
2888
## TODO: Work from given directory downwards
2889
for path, dir_entry in self.inventory.directories():
2890
# mutter("search for unknowns in %r", path)
2891
dirabs = self.abspath(path)
2892
if not isdir(dirabs):
2893
# e.g. directory deleted
2897
for subf in os.listdir(dirabs):
2898
if self.bzrdir.is_control_filename(subf):
2900
if subf not in dir_entry.children:
2903
can_access) = osutils.normalized_filename(subf)
2904
except UnicodeDecodeError:
2905
path_os_enc = path.encode(osutils._fs_enc)
2906
relpath = path_os_enc + '/' + subf
2907
raise errors.BadFilenameEncoding(relpath,
2909
if subf_norm != subf and can_access:
2910
if subf_norm not in dir_entry.children:
2911
fl.append(subf_norm)
2917
subp = pathjoin(path, subf)
2920
def _walkdirs(self, prefix=""):
2921
"""Walk the directories of this tree.
2923
:param prefix: is used as the directrory to start with.
2924
:returns: a generator which yields items in the form::
2926
((curren_directory_path, fileid),
2927
[(file1_path, file1_name, file1_kind, None, file1_id,
2930
_directory = 'directory'
2931
# get the root in the inventory
2932
inv = self.inventory
2933
top_id = inv.path2id(prefix)
2937
pending = [(prefix, '', _directory, None, top_id, None)]
2940
currentdir = pending.pop()
2941
# 0 - relpath, 1- basename, 2- kind, 3- stat, 4-id, 5-kind
2942
top_id = currentdir[4]
2944
relroot = currentdir[0] + '/'
2947
# FIXME: stash the node in pending
2949
if entry.kind == 'directory':
2950
for name, child in entry.sorted_children():
2951
dirblock.append((relroot + name, name, child.kind, None,
2952
child.file_id, child.kind
2954
yield (currentdir[0], entry.file_id), dirblock
2955
# push the user specified dirs from dirblock
2956
for dir in reversed(dirblock):
2957
if dir[2] == _directory:
2961
class WorkingTreeFormatRegistry(controldir.ControlComponentFormatRegistry):
2962
"""Registry for working tree formats."""
2964
def __init__(self, other_registry=None):
2965
super(WorkingTreeFormatRegistry, self).__init__(other_registry)
2966
self._default_format = None
2967
self._default_format_key = None
2969
def get_default(self):
2970
"""Return the current default format."""
2971
if (self._default_format_key is not None and
2972
self._default_format is None):
2973
self._default_format = self.get(self._default_format_key)
2974
return self._default_format
2976
def set_default(self, format):
2977
"""Set the default format."""
2978
self._default_format = format
2979
self._default_format_key = None
2981
def set_default_key(self, format_string):
2982
"""Set the default format by its format string."""
2983
self._default_format_key = format_string
2984
self._default_format = None
2987
format_registry = WorkingTreeFormatRegistry()
2990
class WorkingTreeFormat(controldir.ControlComponentFormat):
2750
2991
"""An encapsulation of the initialization and open routines for a format.
2752
2993
Formats provide three things:
3094
@symbol_versioning.deprecated_method(
3095
symbol_versioning.deprecated_in((2, 4, 0)))
2827
3096
def register_format(klass, format):
2828
klass._formats[format.get_format_string()] = format
3097
format_registry.register(format)
3100
@symbol_versioning.deprecated_method(
3101
symbol_versioning.deprecated_in((2, 4, 0)))
3102
def register_extra_format(klass, format):
3103
format_registry.register_extra(format)
3106
@symbol_versioning.deprecated_method(
3107
symbol_versioning.deprecated_in((2, 4, 0)))
3108
def unregister_extra_format(klass, format):
3109
format_registry.unregister_extra(format)
3112
@symbol_versioning.deprecated_method(
3113
symbol_versioning.deprecated_in((2, 4, 0)))
3114
def get_formats(klass):
3115
return format_registry._get_all()
3118
@symbol_versioning.deprecated_method(
3119
symbol_versioning.deprecated_in((2, 4, 0)))
2831
3120
def set_default_format(klass, format):
2832
klass._default_format = format
3121
format_registry.set_default(format)
3124
@symbol_versioning.deprecated_method(
3125
symbol_versioning.deprecated_in((2, 4, 0)))
2835
3126
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(),
3127
format_registry.remove(format)
3130
format_registry.register_lazy("Bazaar Working Tree Format 4 (bzr 0.15)\n",
3131
"bzrlib.workingtree_4", "WorkingTreeFormat4")
3132
format_registry.register_lazy("Bazaar Working Tree Format 5 (bzr 1.11)\n",
3133
"bzrlib.workingtree_4", "WorkingTreeFormat5")
3134
format_registry.register_lazy("Bazaar Working Tree Format 6 (bzr 1.14)\n",
3135
"bzrlib.workingtree_4", "WorkingTreeFormat6")
3136
format_registry.register_lazy("Bazaar-NG Working Tree format 3",
3137
"bzrlib.workingtree_3", "WorkingTreeFormat3")
3138
format_registry.set_default_key("Bazaar Working Tree Format 6 (bzr 1.14)\n")
added
removed
bzrlib/workingtree.py
