2608
1841
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.
1844
class InventoryWorkingTree(WorkingTree,
1845
bzrlib.mutabletree.MutableInventoryTree):
1846
"""Base class for working trees that are inventory-oriented.
1848
The inventory is held in the `Branch` working-inventory, and the
1849
files are in a directory on disk.
1851
It is possible for a `WorkingTree` to have a filename which is
1852
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()
1855
def __init__(self, basedir='.',
1856
branch=DEPRECATED_PARAMETER,
1858
_control_files=None,
1862
"""Construct a InventoryWorkingTree instance. This is not a public API.
1864
:param branch: A branch to override probing for the branch.
1866
super(InventoryWorkingTree, self).__init__(basedir=basedir,
1867
branch=branch, _control_files=_control_files, _internal=_internal,
1868
_format=_format, _bzrdir=_bzrdir)
1870
if _inventory is None:
1871
# This will be acquired on lock_read() or lock_write()
1872
self._inventory_is_modified = False
1873
self._inventory = None
1875
# the caller of __init__ has provided an inventory,
1876
# we assume they know what they are doing - as its only
1877
# the Format factory and creation methods that are
1878
# permitted to do this.
1879
self._set_inventory(_inventory, dirty=False)
1881
def _set_inventory(self, inv, dirty):
1882
"""Set the internal cached inventory.
1884
:param inv: The inventory to set.
1885
:param dirty: A boolean indicating whether the inventory is the same
1886
logical inventory as whats on disk. If True the inventory is not
1887
the same and should be written to disk or data will be lost, if
1888
False then the inventory is the same as that on disk and any
1889
serialisation would be unneeded overhead.
1891
self._inventory = inv
1892
self._inventory_is_modified = dirty
1894
def _serialize(self, inventory, out_file):
1895
xml5.serializer_v5.write_inventory(self._inventory, out_file,
1898
def _deserialize(selt, in_file):
1899
return xml5.serializer_v5.read_inventory(in_file)
1901
@needs_tree_write_lock
1902
def _write_inventory(self, inv):
1903
"""Write inventory as the current inventory."""
1904
self._set_inventory(inv, dirty=True)
1907
# XXX: This method should be deprecated in favour of taking in a proper
1908
# new Inventory object.
1909
@needs_tree_write_lock
1910
def set_inventory(self, new_inventory_list):
1911
from bzrlib.inventory import (Inventory,
1915
inv = Inventory(self.get_root_id())
1916
for path, file_id, parent, kind in new_inventory_list:
1917
name = os.path.basename(path)
1920
# fixme, there should be a factory function inv,add_??
1921
if kind == 'directory':
1922
inv.add(InventoryDirectory(file_id, name, parent))
1923
elif kind == 'file':
1924
inv.add(InventoryFile(file_id, name, parent))
1925
elif kind == 'symlink':
1926
inv.add(InventoryLink(file_id, name, parent))
1928
raise errors.BzrError("unknown kind %r" % kind)
1929
self._write_inventory(inv)
1931
def _write_basis_inventory(self, xml):
1932
"""Write the basis inventory XML to the basis-inventory file"""
1933
path = self._basis_inventory_name()
1935
self._transport.put_file(path, sio,
1936
mode=self.bzrdir._get_file_mode())
1938
def _reset_data(self):
1939
"""Reset transient data that cannot be revalidated."""
1940
self._inventory_is_modified = False
1941
f = self._transport.get('inventory')
1943
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."""
1946
self._set_inventory(result, dirty=False)
1948
def _set_root_id(self, file_id):
1949
"""Set the root id for this tree, in a format specific manner.
1951
:param file_id: The file id to assign to the root. It must not be
1952
present in the current inventory or an error will occur. It must
1953
not be None, but rather a valid file id.
1955
inv = self._inventory
1956
orig_root_id = inv.root.file_id
1957
# TODO: it might be nice to exit early if there was nothing
1958
# to do, saving us from trigger a sync on unlock.
1959
self._inventory_is_modified = True
1960
# we preserve the root inventory entry object, but
1961
# unlinkit from the byid index
1962
del inv._byid[inv.root.file_id]
1963
inv.root.file_id = file_id
1964
# and link it into the index with the new changed id.
1965
inv._byid[inv.root.file_id] = inv.root
1966
# and finally update all children to reference the new id.
1967
# XXX: this should be safe to just look at the root.children
1968
# list, not the WHOLE INVENTORY.
1971
if entry.parent_id == orig_root_id:
1972
entry.parent_id = inv.root.file_id
1974
def all_file_ids(self):
1975
"""See Tree.iter_all_file_ids"""
1976
return set(self.inventory)
1978
@needs_tree_write_lock
1979
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
1980
"""See MutableTree.set_parent_trees."""
1981
parent_ids = [rev for (rev, tree) in parents_list]
1982
for revision_id in parent_ids:
1983
_mod_revision.check_not_reserved_id(revision_id)
1985
self._check_parents_for_ghosts(parent_ids,
1986
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
1988
parent_ids = self._filter_parent_ids_by_ancestry(parent_ids)
1990
if len(parent_ids) == 0:
1991
leftmost_parent_id = _mod_revision.NULL_REVISION
1992
leftmost_parent_tree = None
1994
leftmost_parent_id, leftmost_parent_tree = parents_list[0]
1996
if self._change_last_revision(leftmost_parent_id):
1997
if leftmost_parent_tree is None:
1998
# If we don't have a tree, fall back to reading the
1999
# parent tree from the repository.
2000
self._cache_basis_inventory(leftmost_parent_id)
2002
inv = leftmost_parent_tree.inventory
2003
xml = self._create_basis_xml_from_inventory(
2004
leftmost_parent_id, inv)
2005
self._write_basis_inventory(xml)
2006
self._set_merges_from_parent_ids(parent_ids)
2008
def _cache_basis_inventory(self, new_revision):
2009
"""Cache new_revision as the basis inventory."""
2010
# TODO: this should allow the ready-to-use inventory to be passed in,
2011
# 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())]
2014
# this double handles the inventory - unpack and repack -
2015
# but is easier to understand. We can/should put a conditional
2016
# in here based on whether the inventory is in the latest format
2017
# - perhaps we should repack all inventories on a repository
2019
# the fast path is to copy the raw xml from the repository. If the
2020
# xml contains 'revision_id="', then we assume the right
2021
# revision_id is set. We must check for this full string, because a
2022
# root node id can legitimately look like 'revision_id' but cannot
2024
xml = self.branch.repository._get_inventory_xml(new_revision)
2025
firstline = xml.split('\n', 1)[0]
2026
if (not 'revision_id="' in firstline or
2027
'format="7"' not in firstline):
2028
inv = self.branch.repository._serializer.read_inventory_from_string(
2030
xml = self._create_basis_xml_from_inventory(new_revision, inv)
2031
self._write_basis_inventory(xml)
2032
except (errors.NoSuchRevision, errors.RevisionNotPresent):
2035
def _basis_inventory_name(self):
2036
return 'basis-inventory-cache'
2038
def _create_basis_xml_from_inventory(self, revision_id, inventory):
2039
"""Create the text that will be saved in basis-inventory"""
2040
inventory.revision_id = revision_id
2041
return xml7.serializer_v7.write_inventory_to_string(inventory)
2700
2043
@needs_tree_write_lock
2701
2044
def set_conflicts(self, conflicts):
2721
2064
raise errors.ConflictFormatError()
2722
2065
except StopIteration:
2723
2066
raise errors.ConflictFormatError()
2724
return _mod_conflicts.ConflictList.from_stanzas(RioReader(confile))
2067
reader = _mod_rio.RioReader(confile)
2068
return _mod_conflicts.ConflictList.from_stanzas(reader)
2726
2070
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):
2072
def read_basis_inventory(self):
2073
"""Read the cached basis inventory."""
2074
path = self._basis_inventory_name()
2075
return self._transport.get_bytes(path)
2078
def read_working_inventory(self):
2079
"""Read the working inventory.
2081
:raises errors.InventoryModified: read_working_inventory will fail
2082
when the current in memory inventory has been modified.
2084
# conceptually this should be an implementation detail of the tree.
2085
# XXX: Deprecate this.
2086
# ElementTree does its own conversion from UTF-8, so open in
2088
if self._inventory_is_modified:
2089
raise errors.InventoryModified(self)
2090
f = self._transport.get('inventory')
2092
result = self._deserialize(f)
2095
self._set_inventory(result, dirty=False)
2099
def get_root_id(self):
2100
"""Return the id of this trees root"""
2101
return self._inventory.root.file_id
2103
def has_id(self, file_id):
2104
# files that have been deleted are excluded
2105
inv = self.inventory
2106
if not inv.has_id(file_id):
2108
path = inv.id2path(file_id)
2109
return osutils.lexists(self.abspath(path))
2111
def has_or_had_id(self, file_id):
2112
if file_id == self.inventory.root.file_id:
2114
return self.inventory.has_id(file_id)
2116
__contains__ = has_id
2118
# should be deprecated - this is slow and in any case treating them as a
2119
# container is (we now know) bad style -- mbp 20070302
2120
## @deprecated_method(zero_fifteen)
2122
"""Iterate through file_ids for this tree.
2124
file_ids are in a WorkingTree if they are in the working inventory
2125
and the working file exists.
2127
inv = self._inventory
2128
for path, ie in inv.iter_entries():
2129
if osutils.lexists(self.abspath(path)):
2132
@needs_tree_write_lock
2133
def set_last_revision(self, new_revision):
2134
"""Change the last revision in the working tree."""
2135
if self._change_last_revision(new_revision):
2136
self._cache_basis_inventory(new_revision)
2138
@needs_tree_write_lock
2139
def reset_state(self, revision_ids=None):
2140
"""Reset the state of the working tree.
2142
This does a hard-reset to a last-known-good state. This is a way to
2143
fix if something got corrupted (like the .bzr/checkout/dirstate file)
2145
if revision_ids is None:
2146
revision_ids = self.get_parent_ids()
2147
if not revision_ids:
2148
rt = self.branch.repository.revision_tree(
2149
_mod_revision.NULL_REVISION)
2151
rt = self.branch.repository.revision_tree(revision_ids[0])
2152
self._write_inventory(rt.inventory)
2153
self.set_parent_ids(revision_ids)
2156
"""Write the in memory inventory to disk."""
2157
# TODO: Maybe this should only write on dirty ?
2158
if self._control_files._lock_mode != 'w':
2159
raise errors.NotWriteLocked(self)
2161
self._serialize(self._inventory, sio)
2163
self._transport.put_file('inventory', sio,
2164
mode=self.bzrdir._get_file_mode())
2165
self._inventory_is_modified = False
2168
def get_file_sha1(self, file_id, path=None, stat_value=None):
2170
path = self._inventory.id2path(file_id)
2171
return self._hashcache.get_sha1(path, stat_value)
2173
def get_file_mtime(self, file_id, path=None):
2174
"""See Tree.get_file_mtime."""
2176
path = self.inventory.id2path(file_id)
2177
return os.lstat(self.abspath(path)).st_mtime
2179
def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
2180
file_id = self.path2id(path)
2182
# For unversioned files on win32, we just assume they are not
2185
return self._inventory[file_id].executable
2187
def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
2188
mode = stat_result.st_mode
2189
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
2191
if not supports_executable():
2192
def is_executable(self, file_id, path=None):
2193
return self._inventory[file_id].executable
2195
_is_executable_from_path_and_stat = \
2196
_is_executable_from_path_and_stat_from_basis
2198
def is_executable(self, file_id, path=None):
2200
path = self.id2path(file_id)
2201
mode = os.lstat(self.abspath(path)).st_mode
2202
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
2204
_is_executable_from_path_and_stat = \
2205
_is_executable_from_path_and_stat_from_stat
2207
@needs_tree_write_lock
2208
def _add(self, files, ids, kinds):
2209
"""See MutableTree._add."""
2210
# TODO: Re-adding a file that is removed in the working copy
2211
# should probably put it back with the previous ID.
2212
# the read and write working inventory should not occur in this
2213
# function - they should be part of lock_write and unlock.
2214
inv = self.inventory
2215
for f, file_id, kind in zip(files, ids, kinds):
2217
inv.add_path(f, kind=kind)
2219
inv.add_path(f, kind=kind, file_id=file_id)
2220
self._inventory_is_modified = True
2222
def revision_tree(self, revision_id):
2223
"""See WorkingTree.revision_id."""
2224
if revision_id == self.last_revision():
2226
xml = self.read_basis_inventory()
2227
except errors.NoSuchFile:
2231
inv = xml7.serializer_v7.read_inventory_from_string(xml)
2232
# dont use the repository revision_tree api because we want
2233
# to supply the inventory.
2234
if inv.revision_id == revision_id:
2235
return revisiontree.InventoryRevisionTree(
2236
self.branch.repository, inv, revision_id)
2237
except errors.BadInventoryFormat:
2239
# raise if there was no inventory, or if we read the wrong inventory.
2240
raise errors.NoSuchRevisionInTree(self, revision_id)
2243
def annotate_iter(self, file_id, default_revision=CURRENT_REVISION):
2244
"""See Tree.annotate_iter
2246
This implementation will use the basis tree implementation if possible.
2247
Lines not in the basis are attributed to CURRENT_REVISION
2249
If there are pending merges, lines added by those merges will be
2250
incorrectly attributed to CURRENT_REVISION (but after committing, the
2251
attribution will be correct).
2253
maybe_file_parent_keys = []
2254
for parent_id in self.get_parent_ids():
2256
parent_tree = self.revision_tree(parent_id)
2257
except errors.NoSuchRevisionInTree:
2258
parent_tree = self.branch.repository.revision_tree(parent_id)
2259
parent_tree.lock_read()
2261
if file_id not in parent_tree:
2263
ie = parent_tree.inventory[file_id]
2264
if ie.kind != 'file':
2265
# Note: this is slightly unnecessary, because symlinks and
2266
# directories have a "text" which is the empty text, and we
2267
# know that won't mess up annotations. But it seems cleaner
2269
parent_text_key = (file_id, ie.revision)
2270
if parent_text_key not in maybe_file_parent_keys:
2271
maybe_file_parent_keys.append(parent_text_key)
2273
parent_tree.unlock()
2274
graph = _mod_graph.Graph(self.branch.repository.texts)
2275
heads = graph.heads(maybe_file_parent_keys)
2276
file_parent_keys = []
2277
for key in maybe_file_parent_keys:
2279
file_parent_keys.append(key)
2281
# Now we have the parents of this content
2282
annotator = self.branch.repository.texts.get_annotator()
2283
text = self.get_file_text(file_id)
2284
this_key =(file_id, default_revision)
2285
annotator.add_special_text(this_key, file_parent_keys, text)
2286
annotations = [(key[-1], line)
2287
for key, line in annotator.annotate_flat(this_key)]
2291
def merge_modified(self):
2292
"""Return a dictionary of files modified by a merge.
2294
The list is initialized by WorkingTree.set_merge_modified, which is
2295
typically called after we make some automatic updates to the tree
2298
This returns a map of file_id->sha1, containing only files which are
2299
still in the working inventory and have that text hash.
2302
hashfile = self._transport.get('merge-hashes')
2303
except errors.NoSuchFile:
2308
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
2309
raise errors.MergeModifiedFormatError()
2310
except StopIteration:
2311
raise errors.MergeModifiedFormatError()
2312
for s in _mod_rio.RioReader(hashfile):
2313
# RioReader reads in Unicode, so convert file_ids back to utf8
2314
file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
2315
if file_id not in self.inventory:
2317
text_hash = s.get("hash")
2318
if text_hash == self.get_file_sha1(file_id):
2319
merge_hashes[file_id] = text_hash
2325
def subsume(self, other_tree):
2326
def add_children(inventory, entry):
2327
for child_entry in entry.children.values():
2328
inventory._byid[child_entry.file_id] = child_entry
2329
if child_entry.kind == 'directory':
2330
add_children(inventory, child_entry)
2331
if other_tree.get_root_id() == self.get_root_id():
2332
raise errors.BadSubsumeSource(self, other_tree,
2333
'Trees have the same root')
2335
other_tree_path = self.relpath(other_tree.basedir)
2336
except errors.PathNotChild:
2337
raise errors.BadSubsumeSource(self, other_tree,
2338
'Tree is not contained by the other')
2339
new_root_parent = self.path2id(osutils.dirname(other_tree_path))
2340
if new_root_parent is None:
2341
raise errors.BadSubsumeSource(self, other_tree,
2342
'Parent directory is not versioned.')
2343
# We need to ensure that the result of a fetch will have a
2344
# versionedfile for the other_tree root, and only fetching into
2345
# RepositoryKnit2 guarantees that.
2346
if not self.branch.repository.supports_rich_root():
2347
raise errors.SubsumeTargetNeedsUpgrade(other_tree)
2348
other_tree.lock_tree_write()
2350
new_parents = other_tree.get_parent_ids()
2351
other_root = other_tree.inventory.root
2352
other_root.parent_id = new_root_parent
2353
other_root.name = osutils.basename(other_tree_path)
2354
self.inventory.add(other_root)
2355
add_children(self.inventory, other_root)
2356
self._write_inventory(self.inventory)
2357
# normally we don't want to fetch whole repositories, but i think
2358
# here we really do want to consolidate the whole thing.
2359
for parent_id in other_tree.get_parent_ids():
2360
self.branch.fetch(other_tree.branch, parent_id)
2361
self.add_parent_tree_id(parent_id)
2364
other_tree.bzrdir.retire_bzrdir()
2366
@needs_tree_write_lock
2367
def extract(self, file_id, format=None):
2368
"""Extract a subtree from this tree.
2370
A new branch will be created, relative to the path for this tree.
2374
segments = osutils.splitpath(path)
2375
transport = self.branch.bzrdir.root_transport
2376
for name in segments:
2377
transport = transport.clone(name)
2378
transport.ensure_base()
2381
sub_path = self.id2path(file_id)
2382
branch_transport = mkdirs(sub_path)
2384
format = self.bzrdir.cloning_metadir()
2385
branch_transport.ensure_base()
2386
branch_bzrdir = format.initialize_on_transport(branch_transport)
2388
repo = branch_bzrdir.find_repository()
2389
except errors.NoRepositoryPresent:
2390
repo = branch_bzrdir.create_repository()
2391
if not repo.supports_rich_root():
2392
raise errors.RootNotRich()
2393
new_branch = branch_bzrdir.create_branch()
2394
new_branch.pull(self.branch)
2395
for parent_id in self.get_parent_ids():
2396
new_branch.fetch(self.branch, parent_id)
2397
tree_transport = self.bzrdir.root_transport.clone(sub_path)
2398
if tree_transport.base != branch_transport.base:
2399
tree_bzrdir = format.initialize_on_transport(tree_transport)
2400
branch.BranchReferenceFormat().initialize(tree_bzrdir,
2401
target_branch=new_branch)
2403
tree_bzrdir = branch_bzrdir
2404
wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
2405
wt.set_parent_ids(self.get_parent_ids())
2406
my_inv = self.inventory
2407
child_inv = inventory.Inventory(root_id=None)
2408
new_root = my_inv[file_id]
2409
my_inv.remove_recursive_id(file_id)
2410
new_root.parent_id = None
2411
child_inv.add(new_root)
2412
self._write_inventory(my_inv)
2413
wt._write_inventory(child_inv)
2416
def list_files(self, include_root=False, from_dir=None, recursive=True):
2417
"""List all files as (path, class, kind, id, entry).
2419
Lists, but does not descend into unversioned directories.
2420
This does not include files that have been deleted in this
2421
tree. Skips the control directory.
2423
:param include_root: if True, return an entry for the root
2424
:param from_dir: start from this directory or None for the root
2425
:param recursive: whether to recurse into subdirectories or not
2427
# list_files is an iterator, so @needs_read_lock doesn't work properly
2428
# with it. So callers should be careful to always read_lock the tree.
2429
if not self.is_locked():
2430
raise errors.ObjectNotLocked(self)
2432
inv = self.inventory
2433
if from_dir is None and include_root is True:
2434
yield ('', 'V', 'directory', inv.root.file_id, inv.root)
2435
# Convert these into local objects to save lookup times
2436
pathjoin = osutils.pathjoin
2437
file_kind = self._kind
2439
# transport.base ends in a slash, we want the piece
2440
# between the last two slashes
2441
transport_base_dir = self.bzrdir.transport.base.rsplit('/', 2)[1]
2443
fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
2445
# directory file_id, relative path, absolute path, reverse sorted children
2446
if from_dir is not None:
2447
from_dir_id = inv.path2id(from_dir)
2448
if from_dir_id is None:
2449
# Directory not versioned
2451
from_dir_abspath = pathjoin(self.basedir, from_dir)
2453
from_dir_id = inv.root.file_id
2454
from_dir_abspath = self.basedir
2455
children = os.listdir(from_dir_abspath)
2457
# jam 20060527 The kernel sized tree seems equivalent whether we
2458
# use a deque and popleft to keep them sorted, or if we use a plain
2459
# list and just reverse() them.
2460
children = collections.deque(children)
2461
stack = [(from_dir_id, u'', from_dir_abspath, children)]
2463
from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
2466
f = children.popleft()
2467
## TODO: If we find a subdirectory with its own .bzr
2468
## directory, then that is a separate tree and we
2469
## should exclude it.
2471
# the bzrdir for this tree
2472
if transport_base_dir == f:
2475
# we know that from_dir_relpath and from_dir_abspath never end in a slash
2476
# and 'f' doesn't begin with one, we can do a string op, rather
2477
# than the checks of pathjoin(), all relative paths will have an extra slash
2479
fp = from_dir_relpath + '/' + f
2482
fap = from_dir_abspath + '/' + f
2484
dir_ie = inv[from_dir_id]
2485
if dir_ie.kind == 'directory':
2486
f_ie = dir_ie.children.get(f)
2491
elif self.is_ignored(fp[1:]):
2494
# we may not have found this file, because of a unicode
2495
# issue, or because the directory was actually a symlink.
2496
f_norm, can_access = osutils.normalized_filename(f)
2497
if f == f_norm or not can_access:
2498
# No change, so treat this file normally
2501
# this file can be accessed by a normalized path
2502
# check again if it is versioned
2503
# these lines are repeated here for performance
2505
fp = from_dir_relpath + '/' + f
2506
fap = from_dir_abspath + '/' + f
2507
f_ie = inv.get_child(from_dir_id, f)
2510
elif self.is_ignored(fp[1:]):
2517
# make a last minute entry
2519
yield fp[1:], c, fk, f_ie.file_id, f_ie
2522
yield fp[1:], c, fk, None, fk_entries[fk]()
2524
yield fp[1:], c, fk, None, TreeEntry()
2527
if fk != 'directory':
2530
# But do this child first if recursing down
2532
new_children = os.listdir(fap)
2534
new_children = collections.deque(new_children)
2535
stack.append((f_ie.file_id, fp, fap, new_children))
2536
# Break out of inner loop,
2537
# so that we start outer loop with child
2540
# if we finished all children, pop it off the stack
2543
@needs_tree_write_lock
2544
def move(self, from_paths, to_dir=None, after=False):
2547
to_dir must exist in the inventory.
2549
If to_dir exists and is a directory, the files are moved into
2550
it, keeping their old names.
2552
Note that to_dir is only the last component of the new name;
2553
this doesn't change the directory.
2555
For each entry in from_paths the move mode will be determined
2558
The first mode moves the file in the filesystem and updates the
2559
inventory. The second mode only updates the inventory without
2560
touching the file on the filesystem.
2562
move uses the second mode if 'after == True' and the target is not
2563
versioned but present in the working tree.
2565
move uses the second mode if 'after == False' and the source is
2566
versioned but no longer in the working tree, and the target is not
2567
versioned but present in the working tree.
2569
move uses the first mode if 'after == False' and the source is
2570
versioned and present in the working tree, and the target is not
2571
versioned and not present in the working tree.
2573
Everything else results in an error.
2575
This returns a list of (from_path, to_path) pairs for each
2576
entry that is moved.
2581
# check for deprecated use of signature
2583
raise TypeError('You must supply a target directory')
2584
# check destination directory
2585
if isinstance(from_paths, basestring):
2587
inv = self.inventory
2588
to_abs = self.abspath(to_dir)
2589
if not isdir(to_abs):
2590
raise errors.BzrMoveFailedError('',to_dir,
2591
errors.NotADirectory(to_abs))
2592
if not self.has_filename(to_dir):
2593
raise errors.BzrMoveFailedError('',to_dir,
2594
errors.NotInWorkingDirectory(to_dir))
2595
to_dir_id = inv.path2id(to_dir)
2596
if to_dir_id is None:
2597
raise errors.BzrMoveFailedError('',to_dir,
2598
errors.NotVersionedError(path=to_dir))
2600
to_dir_ie = inv[to_dir_id]
2601
if to_dir_ie.kind != 'directory':
2602
raise errors.BzrMoveFailedError('',to_dir,
2603
errors.NotADirectory(to_abs))
2605
# create rename entries and tuples
2606
for from_rel in from_paths:
2607
from_tail = splitpath(from_rel)[-1]
2608
from_id = inv.path2id(from_rel)
2610
raise errors.BzrMoveFailedError(from_rel,to_dir,
2611
errors.NotVersionedError(path=from_rel))
2613
from_entry = inv[from_id]
2614
from_parent_id = from_entry.parent_id
2615
to_rel = pathjoin(to_dir, from_tail)
2616
rename_entry = InventoryWorkingTree._RenameEntry(
2619
from_tail=from_tail,
2620
from_parent_id=from_parent_id,
2621
to_rel=to_rel, to_tail=from_tail,
2622
to_parent_id=to_dir_id)
2623
rename_entries.append(rename_entry)
2624
rename_tuples.append((from_rel, to_rel))
2626
# determine which move mode to use. checks also for movability
2627
rename_entries = self._determine_mv_mode(rename_entries, after)
2629
original_modified = self._inventory_is_modified
2632
self._inventory_is_modified = True
2633
self._move(rename_entries)
2635
# restore the inventory on error
2636
self._inventory_is_modified = original_modified
2638
self._write_inventory(inv)
2639
return rename_tuples
2641
@needs_tree_write_lock
2642
def rename_one(self, from_rel, to_rel, after=False):
2645
This can change the directory or the filename or both.
2647
rename_one has several 'modes' to work. First, it can rename a physical
2648
file and change the file_id. That is the normal mode. Second, it can
2649
only change the file_id without touching any physical file.
2651
rename_one uses the second mode if 'after == True' and 'to_rel' is not
2652
versioned but present in the working tree.
2654
rename_one uses the second mode if 'after == False' and 'from_rel' is
2655
versioned but no longer in the working tree, and 'to_rel' is not
2656
versioned but present in the working tree.
2658
rename_one uses the first mode if 'after == False' and 'from_rel' is
2659
versioned and present in the working tree, and 'to_rel' is not
2660
versioned and not present in the working tree.
2662
Everything else results in an error.
2664
inv = self.inventory
2667
# create rename entries and tuples
2668
from_tail = splitpath(from_rel)[-1]
2669
from_id = inv.path2id(from_rel)
2671
# if file is missing in the inventory maybe it's in the basis_tree
2672
basis_tree = self.branch.basis_tree()
2673
from_id = basis_tree.path2id(from_rel)
2675
raise errors.BzrRenameFailedError(from_rel,to_rel,
2676
errors.NotVersionedError(path=from_rel))
2677
# put entry back in the inventory so we can rename it
2678
from_entry = basis_tree.inventory[from_id].copy()
2681
from_entry = inv[from_id]
2682
from_parent_id = from_entry.parent_id
2683
to_dir, to_tail = os.path.split(to_rel)
2684
to_dir_id = inv.path2id(to_dir)
2685
rename_entry = InventoryWorkingTree._RenameEntry(from_rel=from_rel,
2687
from_tail=from_tail,
2688
from_parent_id=from_parent_id,
2689
to_rel=to_rel, to_tail=to_tail,
2690
to_parent_id=to_dir_id)
2691
rename_entries.append(rename_entry)
2693
# determine which move mode to use. checks also for movability
2694
rename_entries = self._determine_mv_mode(rename_entries, after)
2696
# check if the target changed directory and if the target directory is
2698
if to_dir_id is None:
2699
raise errors.BzrMoveFailedError(from_rel,to_rel,
2700
errors.NotVersionedError(path=to_dir))
2702
# all checks done. now we can continue with our actual work
2703
mutter('rename_one:\n'
2708
' to_dir_id {%s}\n',
2709
from_id, from_rel, to_rel, to_dir, to_dir_id)
2711
self._move(rename_entries)
2712
self._write_inventory(inv)
2714
class _RenameEntry(object):
2715
def __init__(self, from_rel, from_id, from_tail, from_parent_id,
2716
to_rel, to_tail, to_parent_id, only_change_inv=False):
2717
self.from_rel = from_rel
2718
self.from_id = from_id
2719
self.from_tail = from_tail
2720
self.from_parent_id = from_parent_id
2721
self.to_rel = to_rel
2722
self.to_tail = to_tail
2723
self.to_parent_id = to_parent_id
2724
self.only_change_inv = only_change_inv
2726
def _determine_mv_mode(self, rename_entries, after=False):
2727
"""Determines for each from-to pair if both inventory and working tree
2728
or only the inventory has to be changed.
2730
Also does basic plausability tests.
2732
inv = self.inventory
2734
for rename_entry in rename_entries:
2735
# store to local variables for easier reference
2736
from_rel = rename_entry.from_rel
2737
from_id = rename_entry.from_id
2738
to_rel = rename_entry.to_rel
2739
to_id = inv.path2id(to_rel)
2740
only_change_inv = False
2742
# check the inventory for source and destination
2744
raise errors.BzrMoveFailedError(from_rel,to_rel,
2745
errors.NotVersionedError(path=from_rel))
2746
if to_id is not None:
2747
raise errors.BzrMoveFailedError(from_rel,to_rel,
2748
errors.AlreadyVersionedError(path=to_rel))
2750
# try to determine the mode for rename (only change inv or change
2751
# inv and file system)
2753
if not self.has_filename(to_rel):
2754
raise errors.BzrMoveFailedError(from_id,to_rel,
2755
errors.NoSuchFile(path=to_rel,
2756
extra="New file has not been created yet"))
2757
only_change_inv = True
2758
elif not self.has_filename(from_rel) and self.has_filename(to_rel):
2759
only_change_inv = True
2760
elif self.has_filename(from_rel) and not self.has_filename(to_rel):
2761
only_change_inv = False
2762
elif (not self.case_sensitive
2763
and from_rel.lower() == to_rel.lower()
2764
and self.has_filename(from_rel)):
2765
only_change_inv = False
2767
# something is wrong, so lets determine what exactly
2768
if not self.has_filename(from_rel) and \
2769
not self.has_filename(to_rel):
2770
raise errors.BzrRenameFailedError(from_rel,to_rel,
2771
errors.PathsDoNotExist(paths=(str(from_rel),
2774
raise errors.RenameFailedFilesExist(from_rel, to_rel)
2775
rename_entry.only_change_inv = only_change_inv
2776
return rename_entries
2778
def _move(self, rename_entries):
2779
"""Moves a list of files.
2781
Depending on the value of the flag 'only_change_inv', the
2782
file will be moved on the file system or not.
2784
inv = self.inventory
2787
for entry in rename_entries:
2789
self._move_entry(entry)
2791
self._rollback_move(moved)
2795
def _rollback_move(self, moved):
2796
"""Try to rollback a previous move in case of an filesystem error."""
2797
inv = self.inventory
2800
self._move_entry(WorkingTree._RenameEntry(
2801
entry.to_rel, entry.from_id,
2802
entry.to_tail, entry.to_parent_id, entry.from_rel,
2803
entry.from_tail, entry.from_parent_id,
2804
entry.only_change_inv))
2805
except errors.BzrMoveFailedError, e:
2806
raise errors.BzrMoveFailedError( '', '', "Rollback failed."
2807
" The working tree is in an inconsistent state."
2808
" Please consider doing a 'bzr revert'."
2809
" Error message is: %s" % e)
2811
def _move_entry(self, entry):
2812
inv = self.inventory
2813
from_rel_abs = self.abspath(entry.from_rel)
2814
to_rel_abs = self.abspath(entry.to_rel)
2815
if from_rel_abs == to_rel_abs:
2816
raise errors.BzrMoveFailedError(entry.from_rel, entry.to_rel,
2817
"Source and target are identical.")
2819
if not entry.only_change_inv:
2821
osutils.rename(from_rel_abs, to_rel_abs)
2823
raise errors.BzrMoveFailedError(entry.from_rel,
2825
inv.rename(entry.from_id, entry.to_parent_id, entry.to_tail)
2827
@needs_tree_write_lock
2828
def unversion(self, file_ids):
2829
"""Remove the file ids in file_ids from the current versioned set.
2831
When a file_id is unversioned, all of its children are automatically
2834
:param file_ids: The file ids to stop versioning.
2835
:raises: NoSuchId if any fileid is not currently versioned.
2837
for file_id in file_ids:
2838
if file_id not in self._inventory:
2839
raise errors.NoSuchId(self, file_id)
2840
for file_id in file_ids:
2841
if self._inventory.has_id(file_id):
2842
self._inventory.remove_recursive_id(file_id)
2844
# in the future this should just set a dirty bit to wait for the
2845
# final unlock. However, until all methods of workingtree start
2846
# with the current in -memory inventory rather than triggering
2847
# a read, it is more complex - we need to teach read_inventory
2848
# to know when to read, and when to not read first... and possibly
2849
# to save first when the in memory one may be corrupted.
2850
# so for now, we just only write it if it is indeed dirty.
2852
self._write_inventory(self._inventory)
2854
def stored_kind(self, file_id):
2855
"""See Tree.stored_kind"""
2856
return self.inventory[file_id].kind
2859
"""Yield all unversioned files in this WorkingTree.
2861
If there are any unversioned directories then only the directory is
2862
returned, not all its children. But if there are unversioned files
2863
under a versioned subdirectory, they are returned.
2865
Currently returned depth-first, sorted by name within directories.
2866
This is the same order used by 'osutils.walkdirs'.
2868
## TODO: Work from given directory downwards
2869
for path, dir_entry in self.inventory.directories():
2870
# mutter("search for unknowns in %r", path)
2871
dirabs = self.abspath(path)
2872
if not isdir(dirabs):
2873
# e.g. directory deleted
2877
for subf in os.listdir(dirabs):
2878
if self.bzrdir.is_control_filename(subf):
2880
if subf not in dir_entry.children:
2883
can_access) = osutils.normalized_filename(subf)
2884
except UnicodeDecodeError:
2885
path_os_enc = path.encode(osutils._fs_enc)
2886
relpath = path_os_enc + '/' + subf
2887
raise errors.BadFilenameEncoding(relpath,
2889
if subf_norm != subf and can_access:
2890
if subf_norm not in dir_entry.children:
2891
fl.append(subf_norm)
2897
subp = pathjoin(path, subf)
2900
def _walkdirs(self, prefix=""):
2901
"""Walk the directories of this tree.
2903
:prefix: is used as the directrory to start with.
2904
returns a generator which yields items in the form:
2905
((curren_directory_path, fileid),
2906
[(file1_path, file1_name, file1_kind, None, file1_id,
2909
_directory = 'directory'
2910
# get the root in the inventory
2911
inv = self.inventory
2912
top_id = inv.path2id(prefix)
2916
pending = [(prefix, '', _directory, None, top_id, None)]
2919
currentdir = pending.pop()
2920
# 0 - relpath, 1- basename, 2- kind, 3- stat, 4-id, 5-kind
2921
top_id = currentdir[4]
2923
relroot = currentdir[0] + '/'
2926
# FIXME: stash the node in pending
2928
if entry.kind == 'directory':
2929
for name, child in entry.sorted_children():
2930
dirblock.append((relroot + name, name, child.kind, None,
2931
child.file_id, child.kind
2933
yield (currentdir[0], entry.file_id), dirblock
2934
# push the user specified dirs from dirblock
2935
for dir in reversed(dirblock):
2936
if dir[2] == _directory:
2940
class WorkingTreeFormatRegistry(controldir.ControlComponentFormatRegistry):
2941
"""Registry for working tree formats."""
2943
def __init__(self, other_registry=None):
2944
super(WorkingTreeFormatRegistry, self).__init__(other_registry)
2945
self._default_format = None
2946
self._default_format_key = None
2948
def get_default(self):
2949
"""Return the current default format."""
2950
if (self._default_format_key is not None and
2951
self._default_format is None):
2952
self._default_format = self.get(self._default_format_key)
2953
return self._default_format
2955
def set_default(self, format):
2956
"""Set the default format."""
2957
self._default_format = format
2958
self._default_format_key = None
2960
def set_default_key(self, format_string):
2961
"""Set the default format by its format string."""
2962
self._default_format_key = format_string
2963
self._default_format = None
2966
format_registry = WorkingTreeFormatRegistry()
2969
class WorkingTreeFormat(controldir.ControlComponentFormat):
2750
2970
"""An encapsulation of the initialization and open routines for a format.
2752
2972
Formats provide three things:
3073
@symbol_versioning.deprecated_method(
3074
symbol_versioning.deprecated_in((2, 4, 0)))
2827
3075
def register_format(klass, format):
2828
klass._formats[format.get_format_string()] = format
3076
format_registry.register(format)
3079
@symbol_versioning.deprecated_method(
3080
symbol_versioning.deprecated_in((2, 4, 0)))
3081
def register_extra_format(klass, format):
3082
format_registry.register_extra(format)
3085
@symbol_versioning.deprecated_method(
3086
symbol_versioning.deprecated_in((2, 4, 0)))
3087
def unregister_extra_format(klass, format):
3088
format_registry.unregister_extra(format)
3091
@symbol_versioning.deprecated_method(
3092
symbol_versioning.deprecated_in((2, 4, 0)))
3093
def get_formats(klass):
3094
return format_registry._get_all()
3097
@symbol_versioning.deprecated_method(
3098
symbol_versioning.deprecated_in((2, 4, 0)))
2831
3099
def set_default_format(klass, format):
2832
klass._default_format = format
3100
format_registry.set_default(format)
3103
@symbol_versioning.deprecated_method(
3104
symbol_versioning.deprecated_in((2, 4, 0)))
2835
3105
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(),
3106
format_registry.remove(format)
3109
format_registry.register_lazy("Bazaar Working Tree Format 4 (bzr 0.15)\n",
3110
"bzrlib.workingtree_4", "WorkingTreeFormat4")
3111
format_registry.register_lazy("Bazaar Working Tree Format 5 (bzr 1.11)\n",
3112
"bzrlib.workingtree_4", "WorkingTreeFormat5")
3113
format_registry.register_lazy("Bazaar Working Tree Format 6 (bzr 1.14)\n",
3114
"bzrlib.workingtree_4", "WorkingTreeFormat6")
3115
format_registry.register_lazy("Bazaar-NG Working Tree format 3",
3116
"bzrlib.workingtree_3", "WorkingTreeFormat3")
3117
format_registry.set_default_key("Bazaar Working Tree Format 6 (bzr 1.14)\n")
added
removed
bzrlib/workingtree.py
