2608
1847
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.
1850
class InventoryWorkingTree(WorkingTree,
1851
bzrlib.mutabletree.MutableInventoryTree):
1852
"""Base class for working trees that are inventory-oriented.
1854
The inventory is held in the `Branch` working-inventory, and the
1855
files are in a directory on disk.
1857
It is possible for a `WorkingTree` to have a filename which is
1858
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()
1861
def __init__(self, basedir='.',
1862
branch=DEPRECATED_PARAMETER,
1864
_control_files=None,
1868
"""Construct a InventoryWorkingTree instance. This is not a public API.
1870
:param branch: A branch to override probing for the branch.
1872
super(InventoryWorkingTree, self).__init__(basedir=basedir,
1873
branch=branch, _control_files=_control_files, _internal=_internal,
1874
_format=_format, _bzrdir=_bzrdir)
1876
if _inventory is None:
1877
# This will be acquired on lock_read() or lock_write()
1878
self._inventory_is_modified = False
1879
self._inventory = None
1881
# the caller of __init__ has provided an inventory,
1882
# we assume they know what they are doing - as its only
1883
# the Format factory and creation methods that are
1884
# permitted to do this.
1885
self._set_inventory(_inventory, dirty=False)
1887
def _set_inventory(self, inv, dirty):
1888
"""Set the internal cached inventory.
1890
:param inv: The inventory to set.
1891
:param dirty: A boolean indicating whether the inventory is the same
1892
logical inventory as whats on disk. If True the inventory is not
1893
the same and should be written to disk or data will be lost, if
1894
False then the inventory is the same as that on disk and any
1895
serialisation would be unneeded overhead.
1897
self._inventory = inv
1898
self._inventory_is_modified = dirty
1900
def _serialize(self, inventory, out_file):
1901
xml5.serializer_v5.write_inventory(self._inventory, out_file,
1904
def _deserialize(selt, in_file):
1905
return xml5.serializer_v5.read_inventory(in_file)
1907
@needs_tree_write_lock
1908
def _write_inventory(self, inv):
1909
"""Write inventory as the current inventory."""
1910
self._set_inventory(inv, dirty=True)
1913
# XXX: This method should be deprecated in favour of taking in a proper
1914
# new Inventory object.
1915
@needs_tree_write_lock
1916
def set_inventory(self, new_inventory_list):
1917
from bzrlib.inventory import (Inventory,
1921
inv = Inventory(self.get_root_id())
1922
for path, file_id, parent, kind in new_inventory_list:
1923
name = os.path.basename(path)
1926
# fixme, there should be a factory function inv,add_??
1927
if kind == 'directory':
1928
inv.add(InventoryDirectory(file_id, name, parent))
1929
elif kind == 'file':
1930
inv.add(InventoryFile(file_id, name, parent))
1931
elif kind == 'symlink':
1932
inv.add(InventoryLink(file_id, name, parent))
1934
raise errors.BzrError("unknown kind %r" % kind)
1935
self._write_inventory(inv)
1937
def _write_basis_inventory(self, xml):
1938
"""Write the basis inventory XML to the basis-inventory file"""
1939
path = self._basis_inventory_name()
1941
self._transport.put_file(path, sio,
1942
mode=self.bzrdir._get_file_mode())
1944
def _reset_data(self):
1945
"""Reset transient data that cannot be revalidated."""
1946
self._inventory_is_modified = False
1947
f = self._transport.get('inventory')
1949
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."""
1952
self._set_inventory(result, dirty=False)
1954
def _set_root_id(self, file_id):
1955
"""Set the root id for this tree, in a format specific manner.
1957
:param file_id: The file id to assign to the root. It must not be
1958
present in the current inventory or an error will occur. It must
1959
not be None, but rather a valid file id.
1961
inv = self._inventory
1962
orig_root_id = inv.root.file_id
1963
# TODO: it might be nice to exit early if there was nothing
1964
# to do, saving us from trigger a sync on unlock.
1965
self._inventory_is_modified = True
1966
# we preserve the root inventory entry object, but
1967
# unlinkit from the byid index
1968
del inv._byid[inv.root.file_id]
1969
inv.root.file_id = file_id
1970
# and link it into the index with the new changed id.
1971
inv._byid[inv.root.file_id] = inv.root
1972
# and finally update all children to reference the new id.
1973
# XXX: this should be safe to just look at the root.children
1974
# list, not the WHOLE INVENTORY.
1977
if entry.parent_id == orig_root_id:
1978
entry.parent_id = inv.root.file_id
1980
def all_file_ids(self):
1981
"""See Tree.iter_all_file_ids"""
1982
return set(self.inventory)
1984
@needs_tree_write_lock
1985
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
1986
"""See MutableTree.set_parent_trees."""
1987
parent_ids = [rev for (rev, tree) in parents_list]
1988
for revision_id in parent_ids:
1989
_mod_revision.check_not_reserved_id(revision_id)
1991
self._check_parents_for_ghosts(parent_ids,
1992
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
1994
parent_ids = self._filter_parent_ids_by_ancestry(parent_ids)
1996
if len(parent_ids) == 0:
1997
leftmost_parent_id = _mod_revision.NULL_REVISION
1998
leftmost_parent_tree = None
2000
leftmost_parent_id, leftmost_parent_tree = parents_list[0]
2002
if self._change_last_revision(leftmost_parent_id):
2003
if leftmost_parent_tree is None:
2004
# If we don't have a tree, fall back to reading the
2005
# parent tree from the repository.
2006
self._cache_basis_inventory(leftmost_parent_id)
2008
inv = leftmost_parent_tree.inventory
2009
xml = self._create_basis_xml_from_inventory(
2010
leftmost_parent_id, inv)
2011
self._write_basis_inventory(xml)
2012
self._set_merges_from_parent_ids(parent_ids)
2014
def _cache_basis_inventory(self, new_revision):
2015
"""Cache new_revision as the basis inventory."""
2016
# TODO: this should allow the ready-to-use inventory to be passed in,
2017
# 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())]
2020
# this double handles the inventory - unpack and repack -
2021
# but is easier to understand. We can/should put a conditional
2022
# in here based on whether the inventory is in the latest format
2023
# - perhaps we should repack all inventories on a repository
2025
# the fast path is to copy the raw xml from the repository. If the
2026
# xml contains 'revision_id="', then we assume the right
2027
# revision_id is set. We must check for this full string, because a
2028
# root node id can legitimately look like 'revision_id' but cannot
2030
xml = self.branch.repository._get_inventory_xml(new_revision)
2031
firstline = xml.split('\n', 1)[0]
2032
if (not 'revision_id="' in firstline or
2033
'format="7"' not in firstline):
2034
inv = self.branch.repository._serializer.read_inventory_from_string(
2036
xml = self._create_basis_xml_from_inventory(new_revision, inv)
2037
self._write_basis_inventory(xml)
2038
except (errors.NoSuchRevision, errors.RevisionNotPresent):
2041
def _basis_inventory_name(self):
2042
return 'basis-inventory-cache'
2044
def _create_basis_xml_from_inventory(self, revision_id, inventory):
2045
"""Create the text that will be saved in basis-inventory"""
2046
inventory.revision_id = revision_id
2047
return xml7.serializer_v7.write_inventory_to_string(inventory)
2700
2049
@needs_tree_write_lock
2701
2050
def set_conflicts(self, conflicts):
2721
2070
raise errors.ConflictFormatError()
2722
2071
except StopIteration:
2723
2072
raise errors.ConflictFormatError()
2724
return _mod_conflicts.ConflictList.from_stanzas(RioReader(confile))
2073
reader = _mod_rio.RioReader(confile)
2074
return _mod_conflicts.ConflictList.from_stanzas(reader)
2726
2076
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):
2078
def read_basis_inventory(self):
2079
"""Read the cached basis inventory."""
2080
path = self._basis_inventory_name()
2081
return self._transport.get_bytes(path)
2084
def read_working_inventory(self):
2085
"""Read the working inventory.
2087
:raises errors.InventoryModified: read_working_inventory will fail
2088
when the current in memory inventory has been modified.
2090
# conceptually this should be an implementation detail of the tree.
2091
# XXX: Deprecate this.
2092
# ElementTree does its own conversion from UTF-8, so open in
2094
if self._inventory_is_modified:
2095
raise errors.InventoryModified(self)
2096
f = self._transport.get('inventory')
2098
result = self._deserialize(f)
2101
self._set_inventory(result, dirty=False)
2105
def get_root_id(self):
2106
"""Return the id of this trees root"""
2107
return self._inventory.root.file_id
2109
def has_id(self, file_id):
2110
# files that have been deleted are excluded
2111
inv = self.inventory
2112
if not inv.has_id(file_id):
2114
path = inv.id2path(file_id)
2115
return osutils.lexists(self.abspath(path))
2117
def has_or_had_id(self, file_id):
2118
if file_id == self.inventory.root.file_id:
2120
return self.inventory.has_id(file_id)
2122
__contains__ = has_id
2124
@symbol_versioning.deprecated_method(symbol_versioning.deprecated_in((2, 4, 0)))
2126
"""Iterate through file_ids for this tree.
2128
file_ids are in a WorkingTree if they are in the working inventory
2129
and the working file exists.
2131
inv = self._inventory
2132
for path, ie in inv.iter_entries():
2133
if osutils.lexists(self.abspath(path)):
2136
@needs_tree_write_lock
2137
def set_last_revision(self, new_revision):
2138
"""Change the last revision in the working tree."""
2139
if self._change_last_revision(new_revision):
2140
self._cache_basis_inventory(new_revision)
2142
@needs_tree_write_lock
2143
def reset_state(self, revision_ids=None):
2144
"""Reset the state of the working tree.
2146
This does a hard-reset to a last-known-good state. This is a way to
2147
fix if something got corrupted (like the .bzr/checkout/dirstate file)
2149
if revision_ids is None:
2150
revision_ids = self.get_parent_ids()
2151
if not revision_ids:
2152
rt = self.branch.repository.revision_tree(
2153
_mod_revision.NULL_REVISION)
2155
rt = self.branch.repository.revision_tree(revision_ids[0])
2156
self._write_inventory(rt.inventory)
2157
self.set_parent_ids(revision_ids)
2160
"""Write the in memory inventory to disk."""
2161
# TODO: Maybe this should only write on dirty ?
2162
if self._control_files._lock_mode != 'w':
2163
raise errors.NotWriteLocked(self)
2165
self._serialize(self._inventory, sio)
2167
self._transport.put_file('inventory', sio,
2168
mode=self.bzrdir._get_file_mode())
2169
self._inventory_is_modified = False
2172
def get_file_sha1(self, file_id, path=None, stat_value=None):
2174
path = self._inventory.id2path(file_id)
2175
return self._hashcache.get_sha1(path, stat_value)
2177
def get_file_mtime(self, file_id, path=None):
2178
"""See Tree.get_file_mtime."""
2180
path = self.inventory.id2path(file_id)
2181
return os.lstat(self.abspath(path)).st_mtime
2183
def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
2184
file_id = self.path2id(path)
2186
# For unversioned files on win32, we just assume they are not
2189
return self._inventory[file_id].executable
2191
def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
2192
mode = stat_result.st_mode
2193
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
2195
if not supports_executable():
2196
def is_executable(self, file_id, path=None):
2197
return self._inventory[file_id].executable
2199
_is_executable_from_path_and_stat = \
2200
_is_executable_from_path_and_stat_from_basis
2202
def is_executable(self, file_id, path=None):
2204
path = self.id2path(file_id)
2205
mode = os.lstat(self.abspath(path)).st_mode
2206
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
2208
_is_executable_from_path_and_stat = \
2209
_is_executable_from_path_and_stat_from_stat
2211
@needs_tree_write_lock
2212
def _add(self, files, ids, kinds):
2213
"""See MutableTree._add."""
2214
# TODO: Re-adding a file that is removed in the working copy
2215
# should probably put it back with the previous ID.
2216
# the read and write working inventory should not occur in this
2217
# function - they should be part of lock_write and unlock.
2218
inv = self.inventory
2219
for f, file_id, kind in zip(files, ids, kinds):
2221
inv.add_path(f, kind=kind)
2223
inv.add_path(f, kind=kind, file_id=file_id)
2224
self._inventory_is_modified = True
2226
def revision_tree(self, revision_id):
2227
"""See WorkingTree.revision_id."""
2228
if revision_id == self.last_revision():
2230
xml = self.read_basis_inventory()
2231
except errors.NoSuchFile:
2235
inv = xml7.serializer_v7.read_inventory_from_string(xml)
2236
# dont use the repository revision_tree api because we want
2237
# to supply the inventory.
2238
if inv.revision_id == revision_id:
2239
return revisiontree.InventoryRevisionTree(
2240
self.branch.repository, inv, revision_id)
2241
except errors.BadInventoryFormat:
2243
# raise if there was no inventory, or if we read the wrong inventory.
2244
raise errors.NoSuchRevisionInTree(self, revision_id)
2247
def annotate_iter(self, file_id, default_revision=CURRENT_REVISION):
2248
"""See Tree.annotate_iter
2250
This implementation will use the basis tree implementation if possible.
2251
Lines not in the basis are attributed to CURRENT_REVISION
2253
If there are pending merges, lines added by those merges will be
2254
incorrectly attributed to CURRENT_REVISION (but after committing, the
2255
attribution will be correct).
2257
maybe_file_parent_keys = []
2258
for parent_id in self.get_parent_ids():
2260
parent_tree = self.revision_tree(parent_id)
2261
except errors.NoSuchRevisionInTree:
2262
parent_tree = self.branch.repository.revision_tree(parent_id)
2263
parent_tree.lock_read()
2265
if file_id not in parent_tree:
2267
ie = parent_tree.inventory[file_id]
2268
if ie.kind != 'file':
2269
# Note: this is slightly unnecessary, because symlinks and
2270
# directories have a "text" which is the empty text, and we
2271
# know that won't mess up annotations. But it seems cleaner
2273
parent_text_key = (file_id, ie.revision)
2274
if parent_text_key not in maybe_file_parent_keys:
2275
maybe_file_parent_keys.append(parent_text_key)
2277
parent_tree.unlock()
2278
graph = _mod_graph.Graph(self.branch.repository.texts)
2279
heads = graph.heads(maybe_file_parent_keys)
2280
file_parent_keys = []
2281
for key in maybe_file_parent_keys:
2283
file_parent_keys.append(key)
2285
# Now we have the parents of this content
2286
annotator = self.branch.repository.texts.get_annotator()
2287
text = self.get_file_text(file_id)
2288
this_key =(file_id, default_revision)
2289
annotator.add_special_text(this_key, file_parent_keys, text)
2290
annotations = [(key[-1], line)
2291
for key, line in annotator.annotate_flat(this_key)]
2295
def merge_modified(self):
2296
"""Return a dictionary of files modified by a merge.
2298
The list is initialized by WorkingTree.set_merge_modified, which is
2299
typically called after we make some automatic updates to the tree
2302
This returns a map of file_id->sha1, containing only files which are
2303
still in the working inventory and have that text hash.
2306
hashfile = self._transport.get('merge-hashes')
2307
except errors.NoSuchFile:
2312
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
2313
raise errors.MergeModifiedFormatError()
2314
except StopIteration:
2315
raise errors.MergeModifiedFormatError()
2316
for s in _mod_rio.RioReader(hashfile):
2317
# RioReader reads in Unicode, so convert file_ids back to utf8
2318
file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
2319
if file_id not in self.inventory:
2321
text_hash = s.get("hash")
2322
if text_hash == self.get_file_sha1(file_id):
2323
merge_hashes[file_id] = text_hash
2329
def subsume(self, other_tree):
2330
def add_children(inventory, entry):
2331
for child_entry in entry.children.values():
2332
inventory._byid[child_entry.file_id] = child_entry
2333
if child_entry.kind == 'directory':
2334
add_children(inventory, child_entry)
2335
if other_tree.get_root_id() == self.get_root_id():
2336
raise errors.BadSubsumeSource(self, other_tree,
2337
'Trees have the same root')
2339
other_tree_path = self.relpath(other_tree.basedir)
2340
except errors.PathNotChild:
2341
raise errors.BadSubsumeSource(self, other_tree,
2342
'Tree is not contained by the other')
2343
new_root_parent = self.path2id(osutils.dirname(other_tree_path))
2344
if new_root_parent is None:
2345
raise errors.BadSubsumeSource(self, other_tree,
2346
'Parent directory is not versioned.')
2347
# We need to ensure that the result of a fetch will have a
2348
# versionedfile for the other_tree root, and only fetching into
2349
# RepositoryKnit2 guarantees that.
2350
if not self.branch.repository.supports_rich_root():
2351
raise errors.SubsumeTargetNeedsUpgrade(other_tree)
2352
other_tree.lock_tree_write()
2354
new_parents = other_tree.get_parent_ids()
2355
other_root = other_tree.inventory.root
2356
other_root.parent_id = new_root_parent
2357
other_root.name = osutils.basename(other_tree_path)
2358
self.inventory.add(other_root)
2359
add_children(self.inventory, other_root)
2360
self._write_inventory(self.inventory)
2361
# normally we don't want to fetch whole repositories, but i think
2362
# here we really do want to consolidate the whole thing.
2363
for parent_id in other_tree.get_parent_ids():
2364
self.branch.fetch(other_tree.branch, parent_id)
2365
self.add_parent_tree_id(parent_id)
2368
other_tree.bzrdir.retire_bzrdir()
2370
@needs_tree_write_lock
2371
def extract(self, file_id, format=None):
2372
"""Extract a subtree from this tree.
2374
A new branch will be created, relative to the path for this tree.
2378
segments = osutils.splitpath(path)
2379
transport = self.branch.bzrdir.root_transport
2380
for name in segments:
2381
transport = transport.clone(name)
2382
transport.ensure_base()
2385
sub_path = self.id2path(file_id)
2386
branch_transport = mkdirs(sub_path)
2388
format = self.bzrdir.cloning_metadir()
2389
branch_transport.ensure_base()
2390
branch_bzrdir = format.initialize_on_transport(branch_transport)
2392
repo = branch_bzrdir.find_repository()
2393
except errors.NoRepositoryPresent:
2394
repo = branch_bzrdir.create_repository()
2395
if not repo.supports_rich_root():
2396
raise errors.RootNotRich()
2397
new_branch = branch_bzrdir.create_branch()
2398
new_branch.pull(self.branch)
2399
for parent_id in self.get_parent_ids():
2400
new_branch.fetch(self.branch, parent_id)
2401
tree_transport = self.bzrdir.root_transport.clone(sub_path)
2402
if tree_transport.base != branch_transport.base:
2403
tree_bzrdir = format.initialize_on_transport(tree_transport)
2404
branch.BranchReferenceFormat().initialize(tree_bzrdir,
2405
target_branch=new_branch)
2407
tree_bzrdir = branch_bzrdir
2408
wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
2409
wt.set_parent_ids(self.get_parent_ids())
2410
my_inv = self.inventory
2411
child_inv = inventory.Inventory(root_id=None)
2412
new_root = my_inv[file_id]
2413
my_inv.remove_recursive_id(file_id)
2414
new_root.parent_id = None
2415
child_inv.add(new_root)
2416
self._write_inventory(my_inv)
2417
wt._write_inventory(child_inv)
2420
def list_files(self, include_root=False, from_dir=None, recursive=True):
2421
"""List all files as (path, class, kind, id, entry).
2423
Lists, but does not descend into unversioned directories.
2424
This does not include files that have been deleted in this
2425
tree. Skips the control directory.
2427
:param include_root: if True, return an entry for the root
2428
:param from_dir: start from this directory or None for the root
2429
:param recursive: whether to recurse into subdirectories or not
2431
# list_files is an iterator, so @needs_read_lock doesn't work properly
2432
# with it. So callers should be careful to always read_lock the tree.
2433
if not self.is_locked():
2434
raise errors.ObjectNotLocked(self)
2436
inv = self.inventory
2437
if from_dir is None and include_root is True:
2438
yield ('', 'V', 'directory', inv.root.file_id, inv.root)
2439
# Convert these into local objects to save lookup times
2440
pathjoin = osutils.pathjoin
2441
file_kind = self._kind
2443
# transport.base ends in a slash, we want the piece
2444
# between the last two slashes
2445
transport_base_dir = self.bzrdir.transport.base.rsplit('/', 2)[1]
2447
fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
2449
# directory file_id, relative path, absolute path, reverse sorted children
2450
if from_dir is not None:
2451
from_dir_id = inv.path2id(from_dir)
2452
if from_dir_id is None:
2453
# Directory not versioned
2455
from_dir_abspath = pathjoin(self.basedir, from_dir)
2457
from_dir_id = inv.root.file_id
2458
from_dir_abspath = self.basedir
2459
children = os.listdir(from_dir_abspath)
2461
# jam 20060527 The kernel sized tree seems equivalent whether we
2462
# use a deque and popleft to keep them sorted, or if we use a plain
2463
# list and just reverse() them.
2464
children = collections.deque(children)
2465
stack = [(from_dir_id, u'', from_dir_abspath, children)]
2467
from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
2470
f = children.popleft()
2471
## TODO: If we find a subdirectory with its own .bzr
2472
## directory, then that is a separate tree and we
2473
## should exclude it.
2475
# the bzrdir for this tree
2476
if transport_base_dir == f:
2479
# we know that from_dir_relpath and from_dir_abspath never end in a slash
2480
# and 'f' doesn't begin with one, we can do a string op, rather
2481
# than the checks of pathjoin(), all relative paths will have an extra slash
2483
fp = from_dir_relpath + '/' + f
2486
fap = from_dir_abspath + '/' + f
2488
dir_ie = inv[from_dir_id]
2489
if dir_ie.kind == 'directory':
2490
f_ie = dir_ie.children.get(f)
2495
elif self.is_ignored(fp[1:]):
2498
# we may not have found this file, because of a unicode
2499
# issue, or because the directory was actually a symlink.
2500
f_norm, can_access = osutils.normalized_filename(f)
2501
if f == f_norm or not can_access:
2502
# No change, so treat this file normally
2505
# this file can be accessed by a normalized path
2506
# check again if it is versioned
2507
# these lines are repeated here for performance
2509
fp = from_dir_relpath + '/' + f
2510
fap = from_dir_abspath + '/' + f
2511
f_ie = inv.get_child(from_dir_id, f)
2514
elif self.is_ignored(fp[1:]):
2521
# make a last minute entry
2523
yield fp[1:], c, fk, f_ie.file_id, f_ie
2526
yield fp[1:], c, fk, None, fk_entries[fk]()
2528
yield fp[1:], c, fk, None, TreeEntry()
2531
if fk != 'directory':
2534
# But do this child first if recursing down
2536
new_children = os.listdir(fap)
2538
new_children = collections.deque(new_children)
2539
stack.append((f_ie.file_id, fp, fap, new_children))
2540
# Break out of inner loop,
2541
# so that we start outer loop with child
2544
# if we finished all children, pop it off the stack
2547
@needs_tree_write_lock
2548
def move(self, from_paths, to_dir=None, after=False):
2551
to_dir must exist in the inventory.
2553
If to_dir exists and is a directory, the files are moved into
2554
it, keeping their old names.
2556
Note that to_dir is only the last component of the new name;
2557
this doesn't change the directory.
2559
For each entry in from_paths the move mode will be determined
2562
The first mode moves the file in the filesystem and updates the
2563
inventory. The second mode only updates the inventory without
2564
touching the file on the filesystem.
2566
move uses the second mode if 'after == True' and the target is not
2567
versioned but present in the working tree.
2569
move uses the second mode if 'after == False' and the source is
2570
versioned but no longer in the working tree, and the target is not
2571
versioned but present in the working tree.
2573
move uses the first mode if 'after == False' and the source is
2574
versioned and present in the working tree, and the target is not
2575
versioned and not present in the working tree.
2577
Everything else results in an error.
2579
This returns a list of (from_path, to_path) pairs for each
2580
entry that is moved.
2585
# check for deprecated use of signature
2587
raise TypeError('You must supply a target directory')
2588
# check destination directory
2589
if isinstance(from_paths, basestring):
2591
inv = self.inventory
2592
to_abs = self.abspath(to_dir)
2593
if not isdir(to_abs):
2594
raise errors.BzrMoveFailedError('',to_dir,
2595
errors.NotADirectory(to_abs))
2596
if not self.has_filename(to_dir):
2597
raise errors.BzrMoveFailedError('',to_dir,
2598
errors.NotInWorkingDirectory(to_dir))
2599
to_dir_id = inv.path2id(to_dir)
2600
if to_dir_id is None:
2601
raise errors.BzrMoveFailedError('',to_dir,
2602
errors.NotVersionedError(path=to_dir))
2604
to_dir_ie = inv[to_dir_id]
2605
if to_dir_ie.kind != 'directory':
2606
raise errors.BzrMoveFailedError('',to_dir,
2607
errors.NotADirectory(to_abs))
2609
# create rename entries and tuples
2610
for from_rel in from_paths:
2611
from_tail = splitpath(from_rel)[-1]
2612
from_id = inv.path2id(from_rel)
2614
raise errors.BzrMoveFailedError(from_rel,to_dir,
2615
errors.NotVersionedError(path=from_rel))
2617
from_entry = inv[from_id]
2618
from_parent_id = from_entry.parent_id
2619
to_rel = pathjoin(to_dir, from_tail)
2620
rename_entry = InventoryWorkingTree._RenameEntry(
2623
from_tail=from_tail,
2624
from_parent_id=from_parent_id,
2625
to_rel=to_rel, to_tail=from_tail,
2626
to_parent_id=to_dir_id)
2627
rename_entries.append(rename_entry)
2628
rename_tuples.append((from_rel, to_rel))
2630
# determine which move mode to use. checks also for movability
2631
rename_entries = self._determine_mv_mode(rename_entries, after)
2633
original_modified = self._inventory_is_modified
2636
self._inventory_is_modified = True
2637
self._move(rename_entries)
2639
# restore the inventory on error
2640
self._inventory_is_modified = original_modified
2642
self._write_inventory(inv)
2643
return rename_tuples
2645
@needs_tree_write_lock
2646
def rename_one(self, from_rel, to_rel, after=False):
2649
This can change the directory or the filename or both.
2651
rename_one has several 'modes' to work. First, it can rename a physical
2652
file and change the file_id. That is the normal mode. Second, it can
2653
only change the file_id without touching any physical file.
2655
rename_one uses the second mode if 'after == True' and 'to_rel' is not
2656
versioned but present in the working tree.
2658
rename_one uses the second mode if 'after == False' and 'from_rel' is
2659
versioned but no longer in the working tree, and 'to_rel' is not
2660
versioned but present in the working tree.
2662
rename_one uses the first mode if 'after == False' and 'from_rel' is
2663
versioned and present in the working tree, and 'to_rel' is not
2664
versioned and not present in the working tree.
2666
Everything else results in an error.
2668
inv = self.inventory
2671
# create rename entries and tuples
2672
from_tail = splitpath(from_rel)[-1]
2673
from_id = inv.path2id(from_rel)
2675
# if file is missing in the inventory maybe it's in the basis_tree
2676
basis_tree = self.branch.basis_tree()
2677
from_id = basis_tree.path2id(from_rel)
2679
raise errors.BzrRenameFailedError(from_rel,to_rel,
2680
errors.NotVersionedError(path=from_rel))
2681
# put entry back in the inventory so we can rename it
2682
from_entry = basis_tree.inventory[from_id].copy()
2685
from_entry = inv[from_id]
2686
from_parent_id = from_entry.parent_id
2687
to_dir, to_tail = os.path.split(to_rel)
2688
to_dir_id = inv.path2id(to_dir)
2689
rename_entry = InventoryWorkingTree._RenameEntry(from_rel=from_rel,
2691
from_tail=from_tail,
2692
from_parent_id=from_parent_id,
2693
to_rel=to_rel, to_tail=to_tail,
2694
to_parent_id=to_dir_id)
2695
rename_entries.append(rename_entry)
2697
# determine which move mode to use. checks also for movability
2698
rename_entries = self._determine_mv_mode(rename_entries, after)
2700
# check if the target changed directory and if the target directory is
2702
if to_dir_id is None:
2703
raise errors.BzrMoveFailedError(from_rel,to_rel,
2704
errors.NotVersionedError(path=to_dir))
2706
# all checks done. now we can continue with our actual work
2707
mutter('rename_one:\n'
2712
' to_dir_id {%s}\n',
2713
from_id, from_rel, to_rel, to_dir, to_dir_id)
2715
self._move(rename_entries)
2716
self._write_inventory(inv)
2718
class _RenameEntry(object):
2719
def __init__(self, from_rel, from_id, from_tail, from_parent_id,
2720
to_rel, to_tail, to_parent_id, only_change_inv=False):
2721
self.from_rel = from_rel
2722
self.from_id = from_id
2723
self.from_tail = from_tail
2724
self.from_parent_id = from_parent_id
2725
self.to_rel = to_rel
2726
self.to_tail = to_tail
2727
self.to_parent_id = to_parent_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
2746
# check the inventory for source and destination
2748
raise errors.BzrMoveFailedError(from_rel,to_rel,
2749
errors.NotVersionedError(path=from_rel))
2750
if to_id is not None:
2751
raise errors.BzrMoveFailedError(from_rel,to_rel,
2752
errors.AlreadyVersionedError(path=to_rel))
2754
# try to determine the mode for rename (only change inv or change
2755
# inv and file system)
2757
if not self.has_filename(to_rel):
2758
raise errors.BzrMoveFailedError(from_id,to_rel,
2759
errors.NoSuchFile(path=to_rel,
2760
extra="New file has not been created yet"))
2761
only_change_inv = True
2762
elif not self.has_filename(from_rel) and self.has_filename(to_rel):
2763
only_change_inv = True
2764
elif self.has_filename(from_rel) and not self.has_filename(to_rel):
2765
only_change_inv = False
2766
elif (not self.case_sensitive
2767
and from_rel.lower() == to_rel.lower()
2768
and self.has_filename(from_rel)):
2769
only_change_inv = False
2771
# something is wrong, so lets determine what exactly
2772
if not self.has_filename(from_rel) and \
2773
not self.has_filename(to_rel):
2774
raise errors.BzrRenameFailedError(from_rel,to_rel,
2775
errors.PathsDoNotExist(paths=(str(from_rel),
2778
raise errors.RenameFailedFilesExist(from_rel, to_rel)
2779
rename_entry.only_change_inv = only_change_inv
2780
return rename_entries
2782
def _move(self, rename_entries):
2783
"""Moves a list of files.
2785
Depending on the value of the flag 'only_change_inv', the
2786
file will be moved on the file system or not.
2788
inv = self.inventory
2791
for entry in rename_entries:
2793
self._move_entry(entry)
2795
self._rollback_move(moved)
2799
def _rollback_move(self, moved):
2800
"""Try to rollback a previous move in case of an filesystem error."""
2801
inv = self.inventory
2804
self._move_entry(WorkingTree._RenameEntry(
2805
entry.to_rel, entry.from_id,
2806
entry.to_tail, entry.to_parent_id, entry.from_rel,
2807
entry.from_tail, entry.from_parent_id,
2808
entry.only_change_inv))
2809
except errors.BzrMoveFailedError, e:
2810
raise errors.BzrMoveFailedError( '', '', "Rollback failed."
2811
" The working tree is in an inconsistent state."
2812
" Please consider doing a 'bzr revert'."
2813
" Error message is: %s" % e)
2815
def _move_entry(self, entry):
2816
inv = self.inventory
2817
from_rel_abs = self.abspath(entry.from_rel)
2818
to_rel_abs = self.abspath(entry.to_rel)
2819
if from_rel_abs == to_rel_abs:
2820
raise errors.BzrMoveFailedError(entry.from_rel, entry.to_rel,
2821
"Source and target are identical.")
2823
if not entry.only_change_inv:
2825
osutils.rename(from_rel_abs, to_rel_abs)
2827
raise errors.BzrMoveFailedError(entry.from_rel,
2829
inv.rename(entry.from_id, entry.to_parent_id, entry.to_tail)
2831
@needs_tree_write_lock
2832
def unversion(self, file_ids):
2833
"""Remove the file ids in file_ids from the current versioned set.
2835
When a file_id is unversioned, all of its children are automatically
2838
:param file_ids: The file ids to stop versioning.
2839
:raises: NoSuchId if any fileid is not currently versioned.
2841
for file_id in file_ids:
2842
if file_id not in self._inventory:
2843
raise errors.NoSuchId(self, file_id)
2844
for file_id in file_ids:
2845
if self._inventory.has_id(file_id):
2846
self._inventory.remove_recursive_id(file_id)
2848
# in the future this should just set a dirty bit to wait for the
2849
# final unlock. However, until all methods of workingtree start
2850
# with the current in -memory inventory rather than triggering
2851
# a read, it is more complex - we need to teach read_inventory
2852
# to know when to read, and when to not read first... and possibly
2853
# to save first when the in memory one may be corrupted.
2854
# so for now, we just only write it if it is indeed dirty.
2856
self._write_inventory(self._inventory)
2858
def stored_kind(self, file_id):
2859
"""See Tree.stored_kind"""
2860
return self.inventory[file_id].kind
2863
"""Yield all unversioned files in this WorkingTree.
2865
If there are any unversioned directories then only the directory is
2866
returned, not all its children. But if there are unversioned files
2867
under a versioned subdirectory, they are returned.
2869
Currently returned depth-first, sorted by name within directories.
2870
This is the same order used by 'osutils.walkdirs'.
2872
## TODO: Work from given directory downwards
2873
for path, dir_entry in self.inventory.directories():
2874
# mutter("search for unknowns in %r", path)
2875
dirabs = self.abspath(path)
2876
if not isdir(dirabs):
2877
# e.g. directory deleted
2881
for subf in os.listdir(dirabs):
2882
if self.bzrdir.is_control_filename(subf):
2884
if subf not in dir_entry.children:
2887
can_access) = osutils.normalized_filename(subf)
2888
except UnicodeDecodeError:
2889
path_os_enc = path.encode(osutils._fs_enc)
2890
relpath = path_os_enc + '/' + subf
2891
raise errors.BadFilenameEncoding(relpath,
2893
if subf_norm != subf and can_access:
2894
if subf_norm not in dir_entry.children:
2895
fl.append(subf_norm)
2901
subp = pathjoin(path, subf)
2904
def _walkdirs(self, prefix=""):
2905
"""Walk the directories of this tree.
2907
:prefix: is used as the directrory to start with.
2908
returns a generator which yields items in the form:
2909
((curren_directory_path, fileid),
2910
[(file1_path, file1_name, file1_kind, None, file1_id,
2913
_directory = 'directory'
2914
# get the root in the inventory
2915
inv = self.inventory
2916
top_id = inv.path2id(prefix)
2920
pending = [(prefix, '', _directory, None, top_id, None)]
2923
currentdir = pending.pop()
2924
# 0 - relpath, 1- basename, 2- kind, 3- stat, 4-id, 5-kind
2925
top_id = currentdir[4]
2927
relroot = currentdir[0] + '/'
2930
# FIXME: stash the node in pending
2932
if entry.kind == 'directory':
2933
for name, child in entry.sorted_children():
2934
dirblock.append((relroot + name, name, child.kind, None,
2935
child.file_id, child.kind
2937
yield (currentdir[0], entry.file_id), dirblock
2938
# push the user specified dirs from dirblock
2939
for dir in reversed(dirblock):
2940
if dir[2] == _directory:
2944
class WorkingTreeFormatRegistry(controldir.ControlComponentFormatRegistry):
2945
"""Registry for working tree formats."""
2947
def __init__(self, other_registry=None):
2948
super(WorkingTreeFormatRegistry, self).__init__(other_registry)
2949
self._default_format = None
2950
self._default_format_key = None
2952
def get_default(self):
2953
"""Return the current default format."""
2954
if (self._default_format_key is not None and
2955
self._default_format is None):
2956
self._default_format = self.get(self._default_format_key)
2957
return self._default_format
2959
def set_default(self, format):
2960
"""Set the default format."""
2961
self._default_format = format
2962
self._default_format_key = None
2964
def set_default_key(self, format_string):
2965
"""Set the default format by its format string."""
2966
self._default_format_key = format_string
2967
self._default_format = None
2970
format_registry = WorkingTreeFormatRegistry()
2973
class WorkingTreeFormat(controldir.ControlComponentFormat):
2750
2974
"""An encapsulation of the initialization and open routines for a format.
2752
2976
Formats provide three things:
3077
@symbol_versioning.deprecated_method(
3078
symbol_versioning.deprecated_in((2, 4, 0)))
2827
3079
def register_format(klass, format):
2828
klass._formats[format.get_format_string()] = format
3080
format_registry.register(format)
3083
@symbol_versioning.deprecated_method(
3084
symbol_versioning.deprecated_in((2, 4, 0)))
3085
def register_extra_format(klass, format):
3086
format_registry.register_extra(format)
3089
@symbol_versioning.deprecated_method(
3090
symbol_versioning.deprecated_in((2, 4, 0)))
3091
def unregister_extra_format(klass, format):
3092
format_registry.unregister_extra(format)
3095
@symbol_versioning.deprecated_method(
3096
symbol_versioning.deprecated_in((2, 4, 0)))
3097
def get_formats(klass):
3098
return format_registry._get_all()
3101
@symbol_versioning.deprecated_method(
3102
symbol_versioning.deprecated_in((2, 4, 0)))
2831
3103
def set_default_format(klass, format):
2832
klass._default_format = format
3104
format_registry.set_default(format)
3107
@symbol_versioning.deprecated_method(
3108
symbol_versioning.deprecated_in((2, 4, 0)))
2835
3109
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(),
3110
format_registry.remove(format)
3113
format_registry.register_lazy("Bazaar Working Tree Format 4 (bzr 0.15)\n",
3114
"bzrlib.workingtree_4", "WorkingTreeFormat4")
3115
format_registry.register_lazy("Bazaar Working Tree Format 5 (bzr 1.11)\n",
3116
"bzrlib.workingtree_4", "WorkingTreeFormat5")
3117
format_registry.register_lazy("Bazaar Working Tree Format 6 (bzr 1.14)\n",
3118
"bzrlib.workingtree_4", "WorkingTreeFormat6")
3119
format_registry.register_lazy("Bazaar-NG Working Tree format 3",
3120
"bzrlib.workingtree_3", "WorkingTreeFormat3")
3121
format_registry.set_default_key("Bazaar Working Tree Format 6 (bzr 1.14)\n")
added
removed
bzrlib/workingtree.py
