2608
1814
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.
1817
class InventoryWorkingTree(WorkingTree,
1818
bzrlib.mutabletree.MutableInventoryTree):
1819
"""Base class for working trees that are inventory-oriented.
1821
The inventory is held in the `Branch` working-inventory, and the
1822
files are in a directory on disk.
1824
It is possible for a `WorkingTree` to have a filename which is
1825
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()
1828
def __init__(self, basedir='.',
1829
branch=DEPRECATED_PARAMETER,
1831
_control_files=None,
1835
"""Construct a InventoryWorkingTree instance. This is not a public API.
1837
:param branch: A branch to override probing for the branch.
1839
super(InventoryWorkingTree, self).__init__(basedir=basedir,
1840
branch=branch, _control_files=_control_files, _internal=_internal,
1841
_format=_format, _bzrdir=_bzrdir)
1843
if _inventory is None:
1844
# This will be acquired on lock_read() or lock_write()
1845
self._inventory_is_modified = False
1846
self._inventory = None
1848
# the caller of __init__ has provided an inventory,
1849
# we assume they know what they are doing - as its only
1850
# the Format factory and creation methods that are
1851
# permitted to do this.
1852
self._set_inventory(_inventory, dirty=False)
1854
def _set_inventory(self, inv, dirty):
1855
"""Set the internal cached inventory.
1857
:param inv: The inventory to set.
1858
:param dirty: A boolean indicating whether the inventory is the same
1859
logical inventory as whats on disk. If True the inventory is not
1860
the same and should be written to disk or data will be lost, if
1861
False then the inventory is the same as that on disk and any
1862
serialisation would be unneeded overhead.
1864
self._inventory = inv
1865
self._inventory_is_modified = dirty
1867
def _serialize(self, inventory, out_file):
1868
xml5.serializer_v5.write_inventory(self._inventory, out_file,
1871
def _deserialize(selt, in_file):
1872
return xml5.serializer_v5.read_inventory(in_file)
1874
@needs_tree_write_lock
1875
def _write_inventory(self, inv):
1876
"""Write inventory as the current inventory."""
1877
self._set_inventory(inv, dirty=True)
1880
# XXX: This method should be deprecated in favour of taking in a proper
1881
# new Inventory object.
1882
@needs_tree_write_lock
1883
def set_inventory(self, new_inventory_list):
1884
from bzrlib.inventory import (Inventory,
1888
inv = Inventory(self.get_root_id())
1889
for path, file_id, parent, kind in new_inventory_list:
1890
name = os.path.basename(path)
1893
# fixme, there should be a factory function inv,add_??
1894
if kind == 'directory':
1895
inv.add(InventoryDirectory(file_id, name, parent))
1896
elif kind == 'file':
1897
inv.add(InventoryFile(file_id, name, parent))
1898
elif kind == 'symlink':
1899
inv.add(InventoryLink(file_id, name, parent))
1901
raise errors.BzrError("unknown kind %r" % kind)
1902
self._write_inventory(inv)
1904
def _write_basis_inventory(self, xml):
1905
"""Write the basis inventory XML to the basis-inventory file"""
1906
path = self._basis_inventory_name()
1908
self._transport.put_file(path, sio,
1909
mode=self.bzrdir._get_file_mode())
1911
def _reset_data(self):
1912
"""Reset transient data that cannot be revalidated."""
1913
self._inventory_is_modified = False
1914
f = self._transport.get('inventory')
1916
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."""
1919
self._set_inventory(result, dirty=False)
1921
def _set_root_id(self, file_id):
1922
"""Set the root id for this tree, in a format specific manner.
1924
:param file_id: The file id to assign to the root. It must not be
1925
present in the current inventory or an error will occur. It must
1926
not be None, but rather a valid file id.
1928
inv = self._inventory
1929
orig_root_id = inv.root.file_id
1930
# TODO: it might be nice to exit early if there was nothing
1931
# to do, saving us from trigger a sync on unlock.
1932
self._inventory_is_modified = True
1933
# we preserve the root inventory entry object, but
1934
# unlinkit from the byid index
1935
del inv._byid[inv.root.file_id]
1936
inv.root.file_id = file_id
1937
# and link it into the index with the new changed id.
1938
inv._byid[inv.root.file_id] = inv.root
1939
# and finally update all children to reference the new id.
1940
# XXX: this should be safe to just look at the root.children
1941
# list, not the WHOLE INVENTORY.
1944
if entry.parent_id == orig_root_id:
1945
entry.parent_id = inv.root.file_id
1947
def all_file_ids(self):
1948
"""See Tree.iter_all_file_ids"""
1949
return set(self.inventory)
1951
@needs_tree_write_lock
1952
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
1953
"""See MutableTree.set_parent_trees."""
1954
parent_ids = [rev for (rev, tree) in parents_list]
1955
for revision_id in parent_ids:
1956
_mod_revision.check_not_reserved_id(revision_id)
1958
self._check_parents_for_ghosts(parent_ids,
1959
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
1961
parent_ids = self._filter_parent_ids_by_ancestry(parent_ids)
1963
if len(parent_ids) == 0:
1964
leftmost_parent_id = _mod_revision.NULL_REVISION
1965
leftmost_parent_tree = None
1967
leftmost_parent_id, leftmost_parent_tree = parents_list[0]
1969
if self._change_last_revision(leftmost_parent_id):
1970
if leftmost_parent_tree is None:
1971
# If we don't have a tree, fall back to reading the
1972
# parent tree from the repository.
1973
self._cache_basis_inventory(leftmost_parent_id)
1975
inv = leftmost_parent_tree.inventory
1976
xml = self._create_basis_xml_from_inventory(
1977
leftmost_parent_id, inv)
1978
self._write_basis_inventory(xml)
1979
self._set_merges_from_parent_ids(parent_ids)
1981
def _cache_basis_inventory(self, new_revision):
1982
"""Cache new_revision as the basis inventory."""
1983
# TODO: this should allow the ready-to-use inventory to be passed in,
1984
# 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())]
1987
# this double handles the inventory - unpack and repack -
1988
# but is easier to understand. We can/should put a conditional
1989
# in here based on whether the inventory is in the latest format
1990
# - perhaps we should repack all inventories on a repository
1992
# the fast path is to copy the raw xml from the repository. If the
1993
# xml contains 'revision_id="', then we assume the right
1994
# revision_id is set. We must check for this full string, because a
1995
# root node id can legitimately look like 'revision_id' but cannot
1997
xml = self.branch.repository._get_inventory_xml(new_revision)
1998
firstline = xml.split('\n', 1)[0]
1999
if (not 'revision_id="' in firstline or
2000
'format="7"' not in firstline):
2001
inv = self.branch.repository._serializer.read_inventory_from_string(
2003
xml = self._create_basis_xml_from_inventory(new_revision, inv)
2004
self._write_basis_inventory(xml)
2005
except (errors.NoSuchRevision, errors.RevisionNotPresent):
2008
def _basis_inventory_name(self):
2009
return 'basis-inventory-cache'
2011
def _create_basis_xml_from_inventory(self, revision_id, inventory):
2012
"""Create the text that will be saved in basis-inventory"""
2013
inventory.revision_id = revision_id
2014
return xml7.serializer_v7.write_inventory_to_string(inventory)
2700
2016
@needs_tree_write_lock
2701
2017
def set_conflicts(self, conflicts):
2721
2037
raise errors.ConflictFormatError()
2722
2038
except StopIteration:
2723
2039
raise errors.ConflictFormatError()
2724
return _mod_conflicts.ConflictList.from_stanzas(RioReader(confile))
2040
reader = _mod_rio.RioReader(confile)
2041
return _mod_conflicts.ConflictList.from_stanzas(reader)
2726
2043
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):
2045
def read_basis_inventory(self):
2046
"""Read the cached basis inventory."""
2047
path = self._basis_inventory_name()
2048
return self._transport.get_bytes(path)
2051
def read_working_inventory(self):
2052
"""Read the working inventory.
2054
:raises errors.InventoryModified: read_working_inventory will fail
2055
when the current in memory inventory has been modified.
2057
# conceptually this should be an implementation detail of the tree.
2058
# XXX: Deprecate this.
2059
# ElementTree does its own conversion from UTF-8, so open in
2061
if self._inventory_is_modified:
2062
raise errors.InventoryModified(self)
2063
f = self._transport.get('inventory')
2065
result = self._deserialize(f)
2068
self._set_inventory(result, dirty=False)
2072
def get_root_id(self):
2073
"""Return the id of this trees root"""
2074
return self._inventory.root.file_id
2076
def has_id(self, file_id):
2077
# files that have been deleted are excluded
2078
inv = self.inventory
2079
if not inv.has_id(file_id):
2081
path = inv.id2path(file_id)
2082
return osutils.lexists(self.abspath(path))
2084
def has_or_had_id(self, file_id):
2085
if file_id == self.inventory.root.file_id:
2087
return self.inventory.has_id(file_id)
2089
__contains__ = has_id
2091
@symbol_versioning.deprecated_method(symbol_versioning.deprecated_in((2, 4, 0)))
2093
"""Iterate through file_ids for this tree.
2095
file_ids are in a WorkingTree if they are in the working inventory
2096
and the working file exists.
2098
inv = self._inventory
2099
for path, ie in inv.iter_entries():
2100
if osutils.lexists(self.abspath(path)):
2103
@needs_tree_write_lock
2104
def set_last_revision(self, new_revision):
2105
"""Change the last revision in the working tree."""
2106
if self._change_last_revision(new_revision):
2107
self._cache_basis_inventory(new_revision)
2109
@needs_tree_write_lock
2110
def reset_state(self, revision_ids=None):
2111
"""Reset the state of the working tree.
2113
This does a hard-reset to a last-known-good state. This is a way to
2114
fix if something got corrupted (like the .bzr/checkout/dirstate file)
2116
if revision_ids is None:
2117
revision_ids = self.get_parent_ids()
2118
if not revision_ids:
2119
rt = self.branch.repository.revision_tree(
2120
_mod_revision.NULL_REVISION)
2122
rt = self.branch.repository.revision_tree(revision_ids[0])
2123
self._write_inventory(rt.inventory)
2124
self.set_parent_ids(revision_ids)
2127
"""Write the in memory inventory to disk."""
2128
# TODO: Maybe this should only write on dirty ?
2129
if self._control_files._lock_mode != 'w':
2130
raise errors.NotWriteLocked(self)
2132
self._serialize(self._inventory, sio)
2134
self._transport.put_file('inventory', sio,
2135
mode=self.bzrdir._get_file_mode())
2136
self._inventory_is_modified = False
2139
def get_file_sha1(self, file_id, path=None, stat_value=None):
2141
path = self._inventory.id2path(file_id)
2142
return self._hashcache.get_sha1(path, stat_value)
2144
def get_file_mtime(self, file_id, path=None):
2145
"""See Tree.get_file_mtime."""
2147
path = self.inventory.id2path(file_id)
2148
return os.lstat(self.abspath(path)).st_mtime
2150
def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
2151
file_id = self.path2id(path)
2153
# For unversioned files on win32, we just assume they are not
2156
return self._inventory[file_id].executable
2158
def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
2159
mode = stat_result.st_mode
2160
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
2162
if not supports_executable():
2163
def is_executable(self, file_id, path=None):
2164
return self._inventory[file_id].executable
2166
_is_executable_from_path_and_stat = \
2167
_is_executable_from_path_and_stat_from_basis
2169
def is_executable(self, file_id, path=None):
2171
path = self.id2path(file_id)
2172
mode = os.lstat(self.abspath(path)).st_mode
2173
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
2175
_is_executable_from_path_and_stat = \
2176
_is_executable_from_path_and_stat_from_stat
2178
@needs_tree_write_lock
2179
def _add(self, files, ids, kinds):
2180
"""See MutableTree._add."""
2181
# TODO: Re-adding a file that is removed in the working copy
2182
# should probably put it back with the previous ID.
2183
# the read and write working inventory should not occur in this
2184
# function - they should be part of lock_write and unlock.
2185
inv = self.inventory
2186
for f, file_id, kind in zip(files, ids, kinds):
2188
inv.add_path(f, kind=kind)
2190
inv.add_path(f, kind=kind, file_id=file_id)
2191
self._inventory_is_modified = True
2193
def revision_tree(self, revision_id):
2194
"""See WorkingTree.revision_id."""
2195
if revision_id == self.last_revision():
2197
xml = self.read_basis_inventory()
2198
except errors.NoSuchFile:
2202
inv = xml7.serializer_v7.read_inventory_from_string(xml)
2203
# dont use the repository revision_tree api because we want
2204
# to supply the inventory.
2205
if inv.revision_id == revision_id:
2206
return revisiontree.InventoryRevisionTree(
2207
self.branch.repository, inv, revision_id)
2208
except errors.BadInventoryFormat:
2210
# raise if there was no inventory, or if we read the wrong inventory.
2211
raise errors.NoSuchRevisionInTree(self, revision_id)
2214
def annotate_iter(self, file_id, default_revision=CURRENT_REVISION):
2215
"""See Tree.annotate_iter
2217
This implementation will use the basis tree implementation if possible.
2218
Lines not in the basis are attributed to CURRENT_REVISION
2220
If there are pending merges, lines added by those merges will be
2221
incorrectly attributed to CURRENT_REVISION (but after committing, the
2222
attribution will be correct).
2224
maybe_file_parent_keys = []
2225
for parent_id in self.get_parent_ids():
2227
parent_tree = self.revision_tree(parent_id)
2228
except errors.NoSuchRevisionInTree:
2229
parent_tree = self.branch.repository.revision_tree(parent_id)
2230
parent_tree.lock_read()
2232
if file_id not in parent_tree:
2234
ie = parent_tree.inventory[file_id]
2235
if ie.kind != 'file':
2236
# Note: this is slightly unnecessary, because symlinks and
2237
# directories have a "text" which is the empty text, and we
2238
# know that won't mess up annotations. But it seems cleaner
2240
parent_text_key = (file_id, ie.revision)
2241
if parent_text_key not in maybe_file_parent_keys:
2242
maybe_file_parent_keys.append(parent_text_key)
2244
parent_tree.unlock()
2245
graph = _mod_graph.Graph(self.branch.repository.texts)
2246
heads = graph.heads(maybe_file_parent_keys)
2247
file_parent_keys = []
2248
for key in maybe_file_parent_keys:
2250
file_parent_keys.append(key)
2252
# Now we have the parents of this content
2253
annotator = self.branch.repository.texts.get_annotator()
2254
text = self.get_file_text(file_id)
2255
this_key =(file_id, default_revision)
2256
annotator.add_special_text(this_key, file_parent_keys, text)
2257
annotations = [(key[-1], line)
2258
for key, line in annotator.annotate_flat(this_key)]
2262
def merge_modified(self):
2263
"""Return a dictionary of files modified by a merge.
2265
The list is initialized by WorkingTree.set_merge_modified, which is
2266
typically called after we make some automatic updates to the tree
2269
This returns a map of file_id->sha1, containing only files which are
2270
still in the working inventory and have that text hash.
2273
hashfile = self._transport.get('merge-hashes')
2274
except errors.NoSuchFile:
2279
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
2280
raise errors.MergeModifiedFormatError()
2281
except StopIteration:
2282
raise errors.MergeModifiedFormatError()
2283
for s in _mod_rio.RioReader(hashfile):
2284
# RioReader reads in Unicode, so convert file_ids back to utf8
2285
file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
2286
if file_id not in self.inventory:
2288
text_hash = s.get("hash")
2289
if text_hash == self.get_file_sha1(file_id):
2290
merge_hashes[file_id] = text_hash
2296
def subsume(self, other_tree):
2297
def add_children(inventory, entry):
2298
for child_entry in entry.children.values():
2299
inventory._byid[child_entry.file_id] = child_entry
2300
if child_entry.kind == 'directory':
2301
add_children(inventory, child_entry)
2302
if other_tree.get_root_id() == self.get_root_id():
2303
raise errors.BadSubsumeSource(self, other_tree,
2304
'Trees have the same root')
2306
other_tree_path = self.relpath(other_tree.basedir)
2307
except errors.PathNotChild:
2308
raise errors.BadSubsumeSource(self, other_tree,
2309
'Tree is not contained by the other')
2310
new_root_parent = self.path2id(osutils.dirname(other_tree_path))
2311
if new_root_parent is None:
2312
raise errors.BadSubsumeSource(self, other_tree,
2313
'Parent directory is not versioned.')
2314
# We need to ensure that the result of a fetch will have a
2315
# versionedfile for the other_tree root, and only fetching into
2316
# RepositoryKnit2 guarantees that.
2317
if not self.branch.repository.supports_rich_root():
2318
raise errors.SubsumeTargetNeedsUpgrade(other_tree)
2319
other_tree.lock_tree_write()
2321
new_parents = other_tree.get_parent_ids()
2322
other_root = other_tree.inventory.root
2323
other_root.parent_id = new_root_parent
2324
other_root.name = osutils.basename(other_tree_path)
2325
self.inventory.add(other_root)
2326
add_children(self.inventory, other_root)
2327
self._write_inventory(self.inventory)
2328
# normally we don't want to fetch whole repositories, but i think
2329
# here we really do want to consolidate the whole thing.
2330
for parent_id in other_tree.get_parent_ids():
2331
self.branch.fetch(other_tree.branch, parent_id)
2332
self.add_parent_tree_id(parent_id)
2335
other_tree.bzrdir.retire_bzrdir()
2337
@needs_tree_write_lock
2338
def extract(self, file_id, format=None):
2339
"""Extract a subtree from this tree.
2341
A new branch will be created, relative to the path for this tree.
2345
segments = osutils.splitpath(path)
2346
transport = self.branch.bzrdir.root_transport
2347
for name in segments:
2348
transport = transport.clone(name)
2349
transport.ensure_base()
2352
sub_path = self.id2path(file_id)
2353
branch_transport = mkdirs(sub_path)
2355
format = self.bzrdir.cloning_metadir()
2356
branch_transport.ensure_base()
2357
branch_bzrdir = format.initialize_on_transport(branch_transport)
2359
repo = branch_bzrdir.find_repository()
2360
except errors.NoRepositoryPresent:
2361
repo = branch_bzrdir.create_repository()
2362
if not repo.supports_rich_root():
2363
raise errors.RootNotRich()
2364
new_branch = branch_bzrdir.create_branch()
2365
new_branch.pull(self.branch)
2366
for parent_id in self.get_parent_ids():
2367
new_branch.fetch(self.branch, parent_id)
2368
tree_transport = self.bzrdir.root_transport.clone(sub_path)
2369
if tree_transport.base != branch_transport.base:
2370
tree_bzrdir = format.initialize_on_transport(tree_transport)
2371
branch.BranchReferenceFormat().initialize(tree_bzrdir,
2372
target_branch=new_branch)
2374
tree_bzrdir = branch_bzrdir
2375
wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
2376
wt.set_parent_ids(self.get_parent_ids())
2377
my_inv = self.inventory
2378
child_inv = inventory.Inventory(root_id=None)
2379
new_root = my_inv[file_id]
2380
my_inv.remove_recursive_id(file_id)
2381
new_root.parent_id = None
2382
child_inv.add(new_root)
2383
self._write_inventory(my_inv)
2384
wt._write_inventory(child_inv)
2387
def list_files(self, include_root=False, from_dir=None, recursive=True):
2388
"""List all files as (path, class, kind, id, entry).
2390
Lists, but does not descend into unversioned directories.
2391
This does not include files that have been deleted in this
2392
tree. Skips the control directory.
2394
:param include_root: if True, return an entry for the root
2395
:param from_dir: start from this directory or None for the root
2396
:param recursive: whether to recurse into subdirectories or not
2398
# list_files is an iterator, so @needs_read_lock doesn't work properly
2399
# with it. So callers should be careful to always read_lock the tree.
2400
if not self.is_locked():
2401
raise errors.ObjectNotLocked(self)
2403
inv = self.inventory
2404
if from_dir is None and include_root is True:
2405
yield ('', 'V', 'directory', inv.root.file_id, inv.root)
2406
# Convert these into local objects to save lookup times
2407
pathjoin = osutils.pathjoin
2408
file_kind = self._kind
2410
# transport.base ends in a slash, we want the piece
2411
# between the last two slashes
2412
transport_base_dir = self.bzrdir.transport.base.rsplit('/', 2)[1]
2414
fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
2416
# directory file_id, relative path, absolute path, reverse sorted children
2417
if from_dir is not None:
2418
from_dir_id = inv.path2id(from_dir)
2419
if from_dir_id is None:
2420
# Directory not versioned
2422
from_dir_abspath = pathjoin(self.basedir, from_dir)
2424
from_dir_id = inv.root.file_id
2425
from_dir_abspath = self.basedir
2426
children = os.listdir(from_dir_abspath)
2428
# jam 20060527 The kernel sized tree seems equivalent whether we
2429
# use a deque and popleft to keep them sorted, or if we use a plain
2430
# list and just reverse() them.
2431
children = collections.deque(children)
2432
stack = [(from_dir_id, u'', from_dir_abspath, children)]
2434
from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
2437
f = children.popleft()
2438
## TODO: If we find a subdirectory with its own .bzr
2439
## directory, then that is a separate tree and we
2440
## should exclude it.
2442
# the bzrdir for this tree
2443
if transport_base_dir == f:
2446
# we know that from_dir_relpath and from_dir_abspath never end in a slash
2447
# and 'f' doesn't begin with one, we can do a string op, rather
2448
# than the checks of pathjoin(), all relative paths will have an extra slash
2450
fp = from_dir_relpath + '/' + f
2453
fap = from_dir_abspath + '/' + f
2455
dir_ie = inv[from_dir_id]
2456
if dir_ie.kind == 'directory':
2457
f_ie = dir_ie.children.get(f)
2462
elif self.is_ignored(fp[1:]):
2465
# we may not have found this file, because of a unicode
2466
# issue, or because the directory was actually a symlink.
2467
f_norm, can_access = osutils.normalized_filename(f)
2468
if f == f_norm or not can_access:
2469
# No change, so treat this file normally
2472
# this file can be accessed by a normalized path
2473
# check again if it is versioned
2474
# these lines are repeated here for performance
2476
fp = from_dir_relpath + '/' + f
2477
fap = from_dir_abspath + '/' + f
2478
f_ie = inv.get_child(from_dir_id, f)
2481
elif self.is_ignored(fp[1:]):
2488
# make a last minute entry
2490
yield fp[1:], c, fk, f_ie.file_id, f_ie
2493
yield fp[1:], c, fk, None, fk_entries[fk]()
2495
yield fp[1:], c, fk, None, TreeEntry()
2498
if fk != 'directory':
2501
# But do this child first if recursing down
2503
new_children = os.listdir(fap)
2505
new_children = collections.deque(new_children)
2506
stack.append((f_ie.file_id, fp, fap, new_children))
2507
# Break out of inner loop,
2508
# so that we start outer loop with child
2511
# if we finished all children, pop it off the stack
2514
@needs_tree_write_lock
2515
def move(self, from_paths, to_dir=None, after=False):
2518
to_dir must exist in the inventory.
2520
If to_dir exists and is a directory, the files are moved into
2521
it, keeping their old names.
2523
Note that to_dir is only the last component of the new name;
2524
this doesn't change the directory.
2526
For each entry in from_paths the move mode will be determined
2529
The first mode moves the file in the filesystem and updates the
2530
inventory. The second mode only updates the inventory without
2531
touching the file on the filesystem.
2533
move uses the second mode if 'after == True' and the target is not
2534
versioned but present in the working tree.
2536
move uses the second mode if 'after == False' and the source is
2537
versioned but no longer in the working tree, and the target is not
2538
versioned but present in the working tree.
2540
move uses the first mode if 'after == False' and the source is
2541
versioned and present in the working tree, and the target is not
2542
versioned and not present in the working tree.
2544
Everything else results in an error.
2546
This returns a list of (from_path, to_path) pairs for each
2547
entry that is moved.
2552
# check for deprecated use of signature
2554
raise TypeError('You must supply a target directory')
2555
# check destination directory
2556
if isinstance(from_paths, basestring):
2558
inv = self.inventory
2559
to_abs = self.abspath(to_dir)
2560
if not isdir(to_abs):
2561
raise errors.BzrMoveFailedError('',to_dir,
2562
errors.NotADirectory(to_abs))
2563
if not self.has_filename(to_dir):
2564
raise errors.BzrMoveFailedError('',to_dir,
2565
errors.NotInWorkingDirectory(to_dir))
2566
to_dir_id = inv.path2id(to_dir)
2567
if to_dir_id is None:
2568
raise errors.BzrMoveFailedError('',to_dir,
2569
errors.NotVersionedError(path=to_dir))
2571
to_dir_ie = inv[to_dir_id]
2572
if to_dir_ie.kind != 'directory':
2573
raise errors.BzrMoveFailedError('',to_dir,
2574
errors.NotADirectory(to_abs))
2576
# create rename entries and tuples
2577
for from_rel in from_paths:
2578
from_tail = splitpath(from_rel)[-1]
2579
from_id = inv.path2id(from_rel)
2581
raise errors.BzrMoveFailedError(from_rel,to_dir,
2582
errors.NotVersionedError(path=from_rel))
2584
from_entry = inv[from_id]
2585
from_parent_id = from_entry.parent_id
2586
to_rel = pathjoin(to_dir, from_tail)
2587
rename_entry = InventoryWorkingTree._RenameEntry(
2590
from_tail=from_tail,
2591
from_parent_id=from_parent_id,
2592
to_rel=to_rel, to_tail=from_tail,
2593
to_parent_id=to_dir_id)
2594
rename_entries.append(rename_entry)
2595
rename_tuples.append((from_rel, to_rel))
2597
# determine which move mode to use. checks also for movability
2598
rename_entries = self._determine_mv_mode(rename_entries, after)
2600
original_modified = self._inventory_is_modified
2603
self._inventory_is_modified = True
2604
self._move(rename_entries)
2606
# restore the inventory on error
2607
self._inventory_is_modified = original_modified
2609
self._write_inventory(inv)
2610
return rename_tuples
2612
@needs_tree_write_lock
2613
def rename_one(self, from_rel, to_rel, after=False):
2616
This can change the directory or the filename or both.
2618
rename_one has several 'modes' to work. First, it can rename a physical
2619
file and change the file_id. That is the normal mode. Second, it can
2620
only change the file_id without touching any physical file.
2622
rename_one uses the second mode if 'after == True' and 'to_rel' is not
2623
versioned but present in the working tree.
2625
rename_one uses the second mode if 'after == False' and 'from_rel' is
2626
versioned but no longer in the working tree, and 'to_rel' is not
2627
versioned but present in the working tree.
2629
rename_one uses the first mode if 'after == False' and 'from_rel' is
2630
versioned and present in the working tree, and 'to_rel' is not
2631
versioned and not present in the working tree.
2633
Everything else results in an error.
2635
inv = self.inventory
2638
# create rename entries and tuples
2639
from_tail = splitpath(from_rel)[-1]
2640
from_id = inv.path2id(from_rel)
2642
# if file is missing in the inventory maybe it's in the basis_tree
2643
basis_tree = self.branch.basis_tree()
2644
from_id = basis_tree.path2id(from_rel)
2646
raise errors.BzrRenameFailedError(from_rel,to_rel,
2647
errors.NotVersionedError(path=from_rel))
2648
# put entry back in the inventory so we can rename it
2649
from_entry = basis_tree.inventory[from_id].copy()
2652
from_entry = inv[from_id]
2653
from_parent_id = from_entry.parent_id
2654
to_dir, to_tail = os.path.split(to_rel)
2655
to_dir_id = inv.path2id(to_dir)
2656
rename_entry = InventoryWorkingTree._RenameEntry(from_rel=from_rel,
2658
from_tail=from_tail,
2659
from_parent_id=from_parent_id,
2660
to_rel=to_rel, to_tail=to_tail,
2661
to_parent_id=to_dir_id)
2662
rename_entries.append(rename_entry)
2664
# determine which move mode to use. checks also for movability
2665
rename_entries = self._determine_mv_mode(rename_entries, after)
2667
# check if the target changed directory and if the target directory is
2669
if to_dir_id is None:
2670
raise errors.BzrMoveFailedError(from_rel,to_rel,
2671
errors.NotVersionedError(path=to_dir))
2673
# all checks done. now we can continue with our actual work
2674
mutter('rename_one:\n'
2679
' to_dir_id {%s}\n',
2680
from_id, from_rel, to_rel, to_dir, to_dir_id)
2682
self._move(rename_entries)
2683
self._write_inventory(inv)
2685
class _RenameEntry(object):
2686
def __init__(self, from_rel, from_id, from_tail, from_parent_id,
2687
to_rel, to_tail, to_parent_id, only_change_inv=False):
2688
self.from_rel = from_rel
2689
self.from_id = from_id
2690
self.from_tail = from_tail
2691
self.from_parent_id = from_parent_id
2692
self.to_rel = to_rel
2693
self.to_tail = to_tail
2694
self.to_parent_id = to_parent_id
2695
self.only_change_inv = only_change_inv
2697
def _determine_mv_mode(self, rename_entries, after=False):
2698
"""Determines for each from-to pair if both inventory and working tree
2699
or only the inventory has to be changed.
2701
Also does basic plausability tests.
2703
inv = self.inventory
2705
for rename_entry in rename_entries:
2706
# store to local variables for easier reference
2707
from_rel = rename_entry.from_rel
2708
from_id = rename_entry.from_id
2709
to_rel = rename_entry.to_rel
2710
to_id = inv.path2id(to_rel)
2711
only_change_inv = False
2713
# check the inventory for source and destination
2715
raise errors.BzrMoveFailedError(from_rel,to_rel,
2716
errors.NotVersionedError(path=from_rel))
2717
if to_id is not None:
2718
raise errors.BzrMoveFailedError(from_rel,to_rel,
2719
errors.AlreadyVersionedError(path=to_rel))
2721
# try to determine the mode for rename (only change inv or change
2722
# inv and file system)
2724
if not self.has_filename(to_rel):
2725
raise errors.BzrMoveFailedError(from_id,to_rel,
2726
errors.NoSuchFile(path=to_rel,
2727
extra="New file has not been created yet"))
2728
only_change_inv = True
2729
elif not self.has_filename(from_rel) and self.has_filename(to_rel):
2730
only_change_inv = True
2731
elif self.has_filename(from_rel) and not self.has_filename(to_rel):
2732
only_change_inv = False
2733
elif (not self.case_sensitive
2734
and from_rel.lower() == to_rel.lower()
2735
and self.has_filename(from_rel)):
2736
only_change_inv = False
2738
# something is wrong, so lets determine what exactly
2739
if not self.has_filename(from_rel) and \
2740
not self.has_filename(to_rel):
2741
raise errors.BzrRenameFailedError(from_rel,to_rel,
2742
errors.PathsDoNotExist(paths=(str(from_rel),
2745
raise errors.RenameFailedFilesExist(from_rel, to_rel)
2746
rename_entry.only_change_inv = only_change_inv
2747
return rename_entries
2749
def _move(self, rename_entries):
2750
"""Moves a list of files.
2752
Depending on the value of the flag 'only_change_inv', the
2753
file will be moved on the file system or not.
2755
inv = self.inventory
2758
for entry in rename_entries:
2760
self._move_entry(entry)
2762
self._rollback_move(moved)
2766
def _rollback_move(self, moved):
2767
"""Try to rollback a previous move in case of an filesystem error."""
2768
inv = self.inventory
2771
self._move_entry(WorkingTree._RenameEntry(
2772
entry.to_rel, entry.from_id,
2773
entry.to_tail, entry.to_parent_id, entry.from_rel,
2774
entry.from_tail, entry.from_parent_id,
2775
entry.only_change_inv))
2776
except errors.BzrMoveFailedError, e:
2777
raise errors.BzrMoveFailedError( '', '', "Rollback failed."
2778
" The working tree is in an inconsistent state."
2779
" Please consider doing a 'bzr revert'."
2780
" Error message is: %s" % e)
2782
def _move_entry(self, entry):
2783
inv = self.inventory
2784
from_rel_abs = self.abspath(entry.from_rel)
2785
to_rel_abs = self.abspath(entry.to_rel)
2786
if from_rel_abs == to_rel_abs:
2787
raise errors.BzrMoveFailedError(entry.from_rel, entry.to_rel,
2788
"Source and target are identical.")
2790
if not entry.only_change_inv:
2792
osutils.rename(from_rel_abs, to_rel_abs)
2794
raise errors.BzrMoveFailedError(entry.from_rel,
2796
inv.rename(entry.from_id, entry.to_parent_id, entry.to_tail)
2798
@needs_tree_write_lock
2799
def unversion(self, file_ids):
2800
"""Remove the file ids in file_ids from the current versioned set.
2802
When a file_id is unversioned, all of its children are automatically
2805
:param file_ids: The file ids to stop versioning.
2806
:raises: NoSuchId if any fileid is not currently versioned.
2808
for file_id in file_ids:
2809
if file_id not in self._inventory:
2810
raise errors.NoSuchId(self, file_id)
2811
for file_id in file_ids:
2812
if self._inventory.has_id(file_id):
2813
self._inventory.remove_recursive_id(file_id)
2815
# in the future this should just set a dirty bit to wait for the
2816
# final unlock. However, until all methods of workingtree start
2817
# with the current in -memory inventory rather than triggering
2818
# a read, it is more complex - we need to teach read_inventory
2819
# to know when to read, and when to not read first... and possibly
2820
# to save first when the in memory one may be corrupted.
2821
# so for now, we just only write it if it is indeed dirty.
2823
self._write_inventory(self._inventory)
2825
def stored_kind(self, file_id):
2826
"""See Tree.stored_kind"""
2827
return self.inventory[file_id].kind
2830
"""Yield all unversioned files in this WorkingTree.
2832
If there are any unversioned directories then only the directory is
2833
returned, not all its children. But if there are unversioned files
2834
under a versioned subdirectory, they are returned.
2836
Currently returned depth-first, sorted by name within directories.
2837
This is the same order used by 'osutils.walkdirs'.
2839
## TODO: Work from given directory downwards
2840
for path, dir_entry in self.inventory.directories():
2841
# mutter("search for unknowns in %r", path)
2842
dirabs = self.abspath(path)
2843
if not isdir(dirabs):
2844
# e.g. directory deleted
2848
for subf in os.listdir(dirabs):
2849
if self.bzrdir.is_control_filename(subf):
2851
if subf not in dir_entry.children:
2854
can_access) = osutils.normalized_filename(subf)
2855
except UnicodeDecodeError:
2856
path_os_enc = path.encode(osutils._fs_enc)
2857
relpath = path_os_enc + '/' + subf
2858
raise errors.BadFilenameEncoding(relpath,
2860
if subf_norm != subf and can_access:
2861
if subf_norm not in dir_entry.children:
2862
fl.append(subf_norm)
2868
subp = pathjoin(path, subf)
2871
def _walkdirs(self, prefix=""):
2872
"""Walk the directories of this tree.
2874
:prefix: is used as the directrory to start with.
2875
returns a generator which yields items in the form:
2876
((curren_directory_path, fileid),
2877
[(file1_path, file1_name, file1_kind, None, file1_id,
2880
_directory = 'directory'
2881
# get the root in the inventory
2882
inv = self.inventory
2883
top_id = inv.path2id(prefix)
2887
pending = [(prefix, '', _directory, None, top_id, None)]
2890
currentdir = pending.pop()
2891
# 0 - relpath, 1- basename, 2- kind, 3- stat, 4-id, 5-kind
2892
top_id = currentdir[4]
2894
relroot = currentdir[0] + '/'
2897
# FIXME: stash the node in pending
2899
if entry.kind == 'directory':
2900
for name, child in entry.sorted_children():
2901
dirblock.append((relroot + name, name, child.kind, None,
2902
child.file_id, child.kind
2904
yield (currentdir[0], entry.file_id), dirblock
2905
# push the user specified dirs from dirblock
2906
for dir in reversed(dirblock):
2907
if dir[2] == _directory:
2911
class WorkingTreeFormatRegistry(controldir.ControlComponentFormatRegistry):
2912
"""Registry for working tree formats."""
2914
def __init__(self, other_registry=None):
2915
super(WorkingTreeFormatRegistry, self).__init__(other_registry)
2916
self._default_format = None
2917
self._default_format_key = None
2919
def get_default(self):
2920
"""Return the current default format."""
2921
if (self._default_format_key is not None and
2922
self._default_format is None):
2923
self._default_format = self.get(self._default_format_key)
2924
return self._default_format
2926
def set_default(self, format):
2927
"""Set the default format."""
2928
self._default_format = format
2929
self._default_format_key = None
2931
def set_default_key(self, format_string):
2932
"""Set the default format by its format string."""
2933
self._default_format_key = format_string
2934
self._default_format = None
2937
format_registry = WorkingTreeFormatRegistry()
2940
class WorkingTreeFormat(controldir.ControlComponentFormat):
2750
2941
"""An encapsulation of the initialization and open routines for a format.
2752
2943
Formats provide three things:
3044
@symbol_versioning.deprecated_method(
3045
symbol_versioning.deprecated_in((2, 4, 0)))
2827
3046
def register_format(klass, format):
2828
klass._formats[format.get_format_string()] = format
3047
format_registry.register(format)
3050
@symbol_versioning.deprecated_method(
3051
symbol_versioning.deprecated_in((2, 4, 0)))
3052
def register_extra_format(klass, format):
3053
format_registry.register_extra(format)
3056
@symbol_versioning.deprecated_method(
3057
symbol_versioning.deprecated_in((2, 4, 0)))
3058
def unregister_extra_format(klass, format):
3059
format_registry.unregister_extra(format)
3062
@symbol_versioning.deprecated_method(
3063
symbol_versioning.deprecated_in((2, 4, 0)))
3064
def get_formats(klass):
3065
return format_registry._get_all()
3068
@symbol_versioning.deprecated_method(
3069
symbol_versioning.deprecated_in((2, 4, 0)))
2831
3070
def set_default_format(klass, format):
2832
klass._default_format = format
3071
format_registry.set_default(format)
3074
@symbol_versioning.deprecated_method(
3075
symbol_versioning.deprecated_in((2, 4, 0)))
2835
3076
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(),
3077
format_registry.remove(format)
3080
format_registry.register_lazy("Bazaar Working Tree Format 4 (bzr 0.15)\n",
3081
"bzrlib.workingtree_4", "WorkingTreeFormat4")
3082
format_registry.register_lazy("Bazaar Working Tree Format 5 (bzr 1.11)\n",
3083
"bzrlib.workingtree_4", "WorkingTreeFormat5")
3084
format_registry.register_lazy("Bazaar Working Tree Format 6 (bzr 1.14)\n",
3085
"bzrlib.workingtree_4", "WorkingTreeFormat6")
3086
format_registry.register_lazy("Bazaar-NG Working Tree format 3",
3087
"bzrlib.workingtree_3", "WorkingTreeFormat3")
3088
format_registry.set_default_key("Bazaar Working Tree Format 6 (bzr 1.14)\n")
added
removed
bzrlib/workingtree.py
