2680
1842
return ShelfManager(self, self._transport)
2683
class WorkingTree2(WorkingTree):
2684
"""This is the Format 2 working tree.
2686
This was the first weave based working tree.
2687
- uses os locks for locking.
2688
- uses the branch last-revision.
1845
class InventoryWorkingTree(WorkingTree,
1846
bzrlib.mutabletree.MutableInventoryTree):
1847
"""Base class for working trees that are inventory-oriented.
1849
The inventory is held in the `Branch` working-inventory, and the
1850
files are in a directory on disk.
1852
It is possible for a `WorkingTree` to have a filename which is
1853
not listed in the Inventory and vice versa.
2691
def __init__(self, *args, **kwargs):
2692
super(WorkingTree2, self).__init__(*args, **kwargs)
2693
# WorkingTree2 has more of a constraint that self._inventory must
2694
# exist. Because this is an older format, we don't mind the overhead
2695
# caused by the extra computation here.
2697
# Newer WorkingTree's should only have self._inventory set when they
2699
if self._inventory is None:
2700
self.read_working_inventory()
2702
def _get_check_refs(self):
2703
"""Return the references needed to perform a check of this tree."""
2704
return [('trees', self.last_revision())]
2706
def lock_tree_write(self):
2707
"""See WorkingTree.lock_tree_write().
2709
In Format2 WorkingTrees we have a single lock for the branch and tree
2710
so lock_tree_write() degrades to lock_write().
2712
:return: An object with an unlock method which will release the lock
2715
self.branch.lock_write()
2717
self._control_files.lock_write()
2720
self.branch.unlock()
2724
# do non-implementation specific cleanup
2727
# we share control files:
2728
if self._control_files._lock_count == 3:
2729
# _inventory_is_modified is always False during a read lock.
2730
if self._inventory_is_modified:
2732
self._write_hashcache_if_dirty()
2734
# reverse order of locking.
2736
return self._control_files.unlock()
1856
def __init__(self, basedir='.',
1857
branch=DEPRECATED_PARAMETER,
1859
_control_files=None,
1863
"""Construct a InventoryWorkingTree instance. This is not a public API.
1865
:param branch: A branch to override probing for the branch.
1867
super(InventoryWorkingTree, self).__init__(basedir=basedir,
1868
branch=branch, _control_files=_control_files, _internal=_internal,
1869
_format=_format, _bzrdir=_bzrdir)
1871
if _inventory is None:
1872
# This will be acquired on lock_read() or lock_write()
1873
self._inventory_is_modified = False
1874
self._inventory = None
1876
# the caller of __init__ has provided an inventory,
1877
# we assume they know what they are doing - as its only
1878
# the Format factory and creation methods that are
1879
# permitted to do this.
1880
self._set_inventory(_inventory, dirty=False)
1882
def _set_inventory(self, inv, dirty):
1883
"""Set the internal cached inventory.
1885
:param inv: The inventory to set.
1886
:param dirty: A boolean indicating whether the inventory is the same
1887
logical inventory as whats on disk. If True the inventory is not
1888
the same and should be written to disk or data will be lost, if
1889
False then the inventory is the same as that on disk and any
1890
serialisation would be unneeded overhead.
1892
self._inventory = inv
1893
self._inventory_is_modified = dirty
1895
def _serialize(self, inventory, out_file):
1896
xml5.serializer_v5.write_inventory(self._inventory, out_file,
1899
def _deserialize(selt, in_file):
1900
return xml5.serializer_v5.read_inventory(in_file)
1902
@needs_tree_write_lock
1903
def _write_inventory(self, inv):
1904
"""Write inventory as the current inventory."""
1905
self._set_inventory(inv, dirty=True)
1908
# XXX: This method should be deprecated in favour of taking in a proper
1909
# new Inventory object.
1910
@needs_tree_write_lock
1911
def set_inventory(self, new_inventory_list):
1912
from bzrlib.inventory import (Inventory,
1916
inv = Inventory(self.get_root_id())
1917
for path, file_id, parent, kind in new_inventory_list:
1918
name = os.path.basename(path)
1921
# fixme, there should be a factory function inv,add_??
1922
if kind == 'directory':
1923
inv.add(InventoryDirectory(file_id, name, parent))
1924
elif kind == 'file':
1925
inv.add(InventoryFile(file_id, name, parent))
1926
elif kind == 'symlink':
1927
inv.add(InventoryLink(file_id, name, parent))
1929
raise errors.BzrError("unknown kind %r" % kind)
1930
self._write_inventory(inv)
1932
def _write_basis_inventory(self, xml):
1933
"""Write the basis inventory XML to the basis-inventory file"""
1934
path = self._basis_inventory_name()
1936
self._transport.put_file(path, sio,
1937
mode=self.bzrdir._get_file_mode())
1939
def _reset_data(self):
1940
"""Reset transient data that cannot be revalidated."""
1941
self._inventory_is_modified = False
1942
f = self._transport.get('inventory')
1944
result = self._deserialize(f)
2738
self.branch.unlock()
2741
class WorkingTree3(WorkingTree):
2742
"""This is the Format 3 working tree.
2744
This differs from the base WorkingTree by:
2745
- having its own file lock
2746
- having its own last-revision property.
2748
This is new in bzr 0.8
2752
def _last_revision(self):
2753
"""See Mutable.last_revision."""
1947
self._set_inventory(result, dirty=False)
1949
def _set_root_id(self, file_id):
1950
"""Set the root id for this tree, in a format specific manner.
1952
:param file_id: The file id to assign to the root. It must not be
1953
present in the current inventory or an error will occur. It must
1954
not be None, but rather a valid file id.
1956
inv = self._inventory
1957
orig_root_id = inv.root.file_id
1958
# TODO: it might be nice to exit early if there was nothing
1959
# to do, saving us from trigger a sync on unlock.
1960
self._inventory_is_modified = True
1961
# we preserve the root inventory entry object, but
1962
# unlinkit from the byid index
1963
del inv._byid[inv.root.file_id]
1964
inv.root.file_id = file_id
1965
# and link it into the index with the new changed id.
1966
inv._byid[inv.root.file_id] = inv.root
1967
# and finally update all children to reference the new id.
1968
# XXX: this should be safe to just look at the root.children
1969
# list, not the WHOLE INVENTORY.
1972
if entry.parent_id == orig_root_id:
1973
entry.parent_id = inv.root.file_id
1975
def all_file_ids(self):
1976
"""See Tree.iter_all_file_ids"""
1977
return set(self.inventory)
1979
@needs_tree_write_lock
1980
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
1981
"""See MutableTree.set_parent_trees."""
1982
parent_ids = [rev for (rev, tree) in parents_list]
1983
for revision_id in parent_ids:
1984
_mod_revision.check_not_reserved_id(revision_id)
1986
self._check_parents_for_ghosts(parent_ids,
1987
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
1989
parent_ids = self._filter_parent_ids_by_ancestry(parent_ids)
1991
if len(parent_ids) == 0:
1992
leftmost_parent_id = _mod_revision.NULL_REVISION
1993
leftmost_parent_tree = None
1995
leftmost_parent_id, leftmost_parent_tree = parents_list[0]
1997
if self._change_last_revision(leftmost_parent_id):
1998
if leftmost_parent_tree is None:
1999
# If we don't have a tree, fall back to reading the
2000
# parent tree from the repository.
2001
self._cache_basis_inventory(leftmost_parent_id)
2003
inv = leftmost_parent_tree.inventory
2004
xml = self._create_basis_xml_from_inventory(
2005
leftmost_parent_id, inv)
2006
self._write_basis_inventory(xml)
2007
self._set_merges_from_parent_ids(parent_ids)
2009
def _cache_basis_inventory(self, new_revision):
2010
"""Cache new_revision as the basis inventory."""
2011
# TODO: this should allow the ready-to-use inventory to be passed in,
2012
# as commit already has that ready-to-use [while the format is the
2755
return self._transport.get_bytes('last-revision')
2756
except errors.NoSuchFile:
2757
return _mod_revision.NULL_REVISION
2759
def _change_last_revision(self, revision_id):
2760
"""See WorkingTree._change_last_revision."""
2761
if revision_id is None or revision_id == _mod_revision.NULL_REVISION:
2763
self._transport.delete('last-revision')
2764
except errors.NoSuchFile:
2768
self._transport.put_bytes('last-revision', revision_id,
2769
mode=self.bzrdir._get_file_mode())
2772
def _get_check_refs(self):
2773
"""Return the references needed to perform a check of this tree."""
2774
return [('trees', self.last_revision())]
2015
# this double handles the inventory - unpack and repack -
2016
# but is easier to understand. We can/should put a conditional
2017
# in here based on whether the inventory is in the latest format
2018
# - perhaps we should repack all inventories on a repository
2020
# the fast path is to copy the raw xml from the repository. If the
2021
# xml contains 'revision_id="', then we assume the right
2022
# revision_id is set. We must check for this full string, because a
2023
# root node id can legitimately look like 'revision_id' but cannot
2025
xml = self.branch.repository._get_inventory_xml(new_revision)
2026
firstline = xml.split('\n', 1)[0]
2027
if (not 'revision_id="' in firstline or
2028
'format="7"' not in firstline):
2029
inv = self.branch.repository._serializer.read_inventory_from_string(
2031
xml = self._create_basis_xml_from_inventory(new_revision, inv)
2032
self._write_basis_inventory(xml)
2033
except (errors.NoSuchRevision, errors.RevisionNotPresent):
2036
def _basis_inventory_name(self):
2037
return 'basis-inventory-cache'
2039
def _create_basis_xml_from_inventory(self, revision_id, inventory):
2040
"""Create the text that will be saved in basis-inventory"""
2041
inventory.revision_id = revision_id
2042
return xml7.serializer_v7.write_inventory_to_string(inventory)
2776
2044
@needs_tree_write_lock
2777
2045
def set_conflicts(self, conflicts):
2797
2065
raise errors.ConflictFormatError()
2798
2066
except StopIteration:
2799
2067
raise errors.ConflictFormatError()
2800
return _mod_conflicts.ConflictList.from_stanzas(RioReader(confile))
2068
reader = _mod_rio.RioReader(confile)
2069
return _mod_conflicts.ConflictList.from_stanzas(reader)
2802
2071
confile.close()
2805
# do non-implementation specific cleanup
2807
if self._control_files._lock_count == 1:
2808
# _inventory_is_modified is always False during a read lock.
2809
if self._inventory_is_modified:
2811
self._write_hashcache_if_dirty()
2812
# reverse order of locking.
2814
return self._control_files.unlock()
2816
self.branch.unlock()
2819
def get_conflicted_stem(path):
2820
for suffix in _mod_conflicts.CONFLICT_SUFFIXES:
2821
if path.endswith(suffix):
2822
return path[:-len(suffix)]
2825
class WorkingTreeFormat(object):
2073
def read_basis_inventory(self):
2074
"""Read the cached basis inventory."""
2075
path = self._basis_inventory_name()
2076
return self._transport.get_bytes(path)
2079
def read_working_inventory(self):
2080
"""Read the working inventory.
2082
:raises errors.InventoryModified: read_working_inventory will fail
2083
when the current in memory inventory has been modified.
2085
# conceptually this should be an implementation detail of the tree.
2086
# XXX: Deprecate this.
2087
# ElementTree does its own conversion from UTF-8, so open in
2089
if self._inventory_is_modified:
2090
raise errors.InventoryModified(self)
2091
f = self._transport.get('inventory')
2093
result = self._deserialize(f)
2096
self._set_inventory(result, dirty=False)
2100
def get_root_id(self):
2101
"""Return the id of this trees root"""
2102
return self._inventory.root.file_id
2104
def has_id(self, file_id):
2105
# files that have been deleted are excluded
2106
inv = self.inventory
2107
if not inv.has_id(file_id):
2109
path = inv.id2path(file_id)
2110
return osutils.lexists(self.abspath(path))
2112
def has_or_had_id(self, file_id):
2113
if file_id == self.inventory.root.file_id:
2115
return self.inventory.has_id(file_id)
2117
__contains__ = has_id
2119
@symbol_versioning.deprecated_method(symbol_versioning.deprecated_in((2, 4, 0)))
2121
"""Iterate through file_ids for this tree.
2123
file_ids are in a WorkingTree if they are in the working inventory
2124
and the working file exists.
2126
inv = self._inventory
2127
for path, ie in inv.iter_entries():
2128
if osutils.lexists(self.abspath(path)):
2131
@needs_tree_write_lock
2132
def set_last_revision(self, new_revision):
2133
"""Change the last revision in the working tree."""
2134
if self._change_last_revision(new_revision):
2135
self._cache_basis_inventory(new_revision)
2137
@needs_tree_write_lock
2138
def reset_state(self, revision_ids=None):
2139
"""Reset the state of the working tree.
2141
This does a hard-reset to a last-known-good state. This is a way to
2142
fix if something got corrupted (like the .bzr/checkout/dirstate file)
2144
if revision_ids is None:
2145
revision_ids = self.get_parent_ids()
2146
if not revision_ids:
2147
rt = self.branch.repository.revision_tree(
2148
_mod_revision.NULL_REVISION)
2150
rt = self.branch.repository.revision_tree(revision_ids[0])
2151
self._write_inventory(rt.inventory)
2152
self.set_parent_ids(revision_ids)
2155
"""Write the in memory inventory to disk."""
2156
# TODO: Maybe this should only write on dirty ?
2157
if self._control_files._lock_mode != 'w':
2158
raise errors.NotWriteLocked(self)
2160
self._serialize(self._inventory, sio)
2162
self._transport.put_file('inventory', sio,
2163
mode=self.bzrdir._get_file_mode())
2164
self._inventory_is_modified = False
2167
def get_file_sha1(self, file_id, path=None, stat_value=None):
2169
path = self._inventory.id2path(file_id)
2170
return self._hashcache.get_sha1(path, stat_value)
2172
def get_file_mtime(self, file_id, path=None):
2173
"""See Tree.get_file_mtime."""
2175
path = self.inventory.id2path(file_id)
2176
return os.lstat(self.abspath(path)).st_mtime
2178
def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
2179
file_id = self.path2id(path)
2181
# For unversioned files on win32, we just assume they are not
2184
return self._inventory[file_id].executable
2186
def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
2187
mode = stat_result.st_mode
2188
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
2190
if not supports_executable():
2191
def is_executable(self, file_id, path=None):
2192
return self._inventory[file_id].executable
2194
_is_executable_from_path_and_stat = \
2195
_is_executable_from_path_and_stat_from_basis
2197
def is_executable(self, file_id, path=None):
2199
path = self.id2path(file_id)
2200
mode = os.lstat(self.abspath(path)).st_mode
2201
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
2203
_is_executable_from_path_and_stat = \
2204
_is_executable_from_path_and_stat_from_stat
2206
@needs_tree_write_lock
2207
def _add(self, files, ids, kinds):
2208
"""See MutableTree._add."""
2209
# TODO: Re-adding a file that is removed in the working copy
2210
# should probably put it back with the previous ID.
2211
# the read and write working inventory should not occur in this
2212
# function - they should be part of lock_write and unlock.
2213
inv = self.inventory
2214
for f, file_id, kind in zip(files, ids, kinds):
2216
inv.add_path(f, kind=kind)
2218
inv.add_path(f, kind=kind, file_id=file_id)
2219
self._inventory_is_modified = True
2221
def revision_tree(self, revision_id):
2222
"""See WorkingTree.revision_id."""
2223
if revision_id == self.last_revision():
2225
xml = self.read_basis_inventory()
2226
except errors.NoSuchFile:
2230
inv = xml7.serializer_v7.read_inventory_from_string(xml)
2231
# dont use the repository revision_tree api because we want
2232
# to supply the inventory.
2233
if inv.revision_id == revision_id:
2234
return revisiontree.InventoryRevisionTree(
2235
self.branch.repository, inv, revision_id)
2236
except errors.BadInventoryFormat:
2238
# raise if there was no inventory, or if we read the wrong inventory.
2239
raise errors.NoSuchRevisionInTree(self, revision_id)
2242
def annotate_iter(self, file_id, default_revision=CURRENT_REVISION):
2243
"""See Tree.annotate_iter
2245
This implementation will use the basis tree implementation if possible.
2246
Lines not in the basis are attributed to CURRENT_REVISION
2248
If there are pending merges, lines added by those merges will be
2249
incorrectly attributed to CURRENT_REVISION (but after committing, the
2250
attribution will be correct).
2252
maybe_file_parent_keys = []
2253
for parent_id in self.get_parent_ids():
2255
parent_tree = self.revision_tree(parent_id)
2256
except errors.NoSuchRevisionInTree:
2257
parent_tree = self.branch.repository.revision_tree(parent_id)
2258
parent_tree.lock_read()
2260
if file_id not in parent_tree:
2262
ie = parent_tree.inventory[file_id]
2263
if ie.kind != 'file':
2264
# Note: this is slightly unnecessary, because symlinks and
2265
# directories have a "text" which is the empty text, and we
2266
# know that won't mess up annotations. But it seems cleaner
2268
parent_text_key = (file_id, ie.revision)
2269
if parent_text_key not in maybe_file_parent_keys:
2270
maybe_file_parent_keys.append(parent_text_key)
2272
parent_tree.unlock()
2273
graph = _mod_graph.Graph(self.branch.repository.texts)
2274
heads = graph.heads(maybe_file_parent_keys)
2275
file_parent_keys = []
2276
for key in maybe_file_parent_keys:
2278
file_parent_keys.append(key)
2280
# Now we have the parents of this content
2281
annotator = self.branch.repository.texts.get_annotator()
2282
text = self.get_file_text(file_id)
2283
this_key =(file_id, default_revision)
2284
annotator.add_special_text(this_key, file_parent_keys, text)
2285
annotations = [(key[-1], line)
2286
for key, line in annotator.annotate_flat(this_key)]
2290
def merge_modified(self):
2291
"""Return a dictionary of files modified by a merge.
2293
The list is initialized by WorkingTree.set_merge_modified, which is
2294
typically called after we make some automatic updates to the tree
2297
This returns a map of file_id->sha1, containing only files which are
2298
still in the working inventory and have that text hash.
2301
hashfile = self._transport.get('merge-hashes')
2302
except errors.NoSuchFile:
2307
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
2308
raise errors.MergeModifiedFormatError()
2309
except StopIteration:
2310
raise errors.MergeModifiedFormatError()
2311
for s in _mod_rio.RioReader(hashfile):
2312
# RioReader reads in Unicode, so convert file_ids back to utf8
2313
file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
2314
if file_id not in self.inventory:
2316
text_hash = s.get("hash")
2317
if text_hash == self.get_file_sha1(file_id):
2318
merge_hashes[file_id] = text_hash
2324
def subsume(self, other_tree):
2325
def add_children(inventory, entry):
2326
for child_entry in entry.children.values():
2327
inventory._byid[child_entry.file_id] = child_entry
2328
if child_entry.kind == 'directory':
2329
add_children(inventory, child_entry)
2330
if other_tree.get_root_id() == self.get_root_id():
2331
raise errors.BadSubsumeSource(self, other_tree,
2332
'Trees have the same root')
2334
other_tree_path = self.relpath(other_tree.basedir)
2335
except errors.PathNotChild:
2336
raise errors.BadSubsumeSource(self, other_tree,
2337
'Tree is not contained by the other')
2338
new_root_parent = self.path2id(osutils.dirname(other_tree_path))
2339
if new_root_parent is None:
2340
raise errors.BadSubsumeSource(self, other_tree,
2341
'Parent directory is not versioned.')
2342
# We need to ensure that the result of a fetch will have a
2343
# versionedfile for the other_tree root, and only fetching into
2344
# RepositoryKnit2 guarantees that.
2345
if not self.branch.repository.supports_rich_root():
2346
raise errors.SubsumeTargetNeedsUpgrade(other_tree)
2347
other_tree.lock_tree_write()
2349
new_parents = other_tree.get_parent_ids()
2350
other_root = other_tree.inventory.root
2351
other_root.parent_id = new_root_parent
2352
other_root.name = osutils.basename(other_tree_path)
2353
self.inventory.add(other_root)
2354
add_children(self.inventory, other_root)
2355
self._write_inventory(self.inventory)
2356
# normally we don't want to fetch whole repositories, but i think
2357
# here we really do want to consolidate the whole thing.
2358
for parent_id in other_tree.get_parent_ids():
2359
self.branch.fetch(other_tree.branch, parent_id)
2360
self.add_parent_tree_id(parent_id)
2363
other_tree.bzrdir.retire_bzrdir()
2365
@needs_tree_write_lock
2366
def extract(self, file_id, format=None):
2367
"""Extract a subtree from this tree.
2369
A new branch will be created, relative to the path for this tree.
2373
segments = osutils.splitpath(path)
2374
transport = self.branch.bzrdir.root_transport
2375
for name in segments:
2376
transport = transport.clone(name)
2377
transport.ensure_base()
2380
sub_path = self.id2path(file_id)
2381
branch_transport = mkdirs(sub_path)
2383
format = self.bzrdir.cloning_metadir()
2384
branch_transport.ensure_base()
2385
branch_bzrdir = format.initialize_on_transport(branch_transport)
2387
repo = branch_bzrdir.find_repository()
2388
except errors.NoRepositoryPresent:
2389
repo = branch_bzrdir.create_repository()
2390
if not repo.supports_rich_root():
2391
raise errors.RootNotRich()
2392
new_branch = branch_bzrdir.create_branch()
2393
new_branch.pull(self.branch)
2394
for parent_id in self.get_parent_ids():
2395
new_branch.fetch(self.branch, parent_id)
2396
tree_transport = self.bzrdir.root_transport.clone(sub_path)
2397
if tree_transport.base != branch_transport.base:
2398
tree_bzrdir = format.initialize_on_transport(tree_transport)
2399
branch.BranchReferenceFormat().initialize(tree_bzrdir,
2400
target_branch=new_branch)
2402
tree_bzrdir = branch_bzrdir
2403
wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
2404
wt.set_parent_ids(self.get_parent_ids())
2405
my_inv = self.inventory
2406
child_inv = inventory.Inventory(root_id=None)
2407
new_root = my_inv[file_id]
2408
my_inv.remove_recursive_id(file_id)
2409
new_root.parent_id = None
2410
child_inv.add(new_root)
2411
self._write_inventory(my_inv)
2412
wt._write_inventory(child_inv)
2415
def list_files(self, include_root=False, from_dir=None, recursive=True):
2416
"""List all files as (path, class, kind, id, entry).
2418
Lists, but does not descend into unversioned directories.
2419
This does not include files that have been deleted in this
2420
tree. Skips the control directory.
2422
:param include_root: if True, return an entry for the root
2423
:param from_dir: start from this directory or None for the root
2424
:param recursive: whether to recurse into subdirectories or not
2426
# list_files is an iterator, so @needs_read_lock doesn't work properly
2427
# with it. So callers should be careful to always read_lock the tree.
2428
if not self.is_locked():
2429
raise errors.ObjectNotLocked(self)
2431
inv = self.inventory
2432
if from_dir is None and include_root is True:
2433
yield ('', 'V', 'directory', inv.root.file_id, inv.root)
2434
# Convert these into local objects to save lookup times
2435
pathjoin = osutils.pathjoin
2436
file_kind = self._kind
2438
# transport.base ends in a slash, we want the piece
2439
# between the last two slashes
2440
transport_base_dir = self.bzrdir.transport.base.rsplit('/', 2)[1]
2442
fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
2444
# directory file_id, relative path, absolute path, reverse sorted children
2445
if from_dir is not None:
2446
from_dir_id = inv.path2id(from_dir)
2447
if from_dir_id is None:
2448
# Directory not versioned
2450
from_dir_abspath = pathjoin(self.basedir, from_dir)
2452
from_dir_id = inv.root.file_id
2453
from_dir_abspath = self.basedir
2454
children = os.listdir(from_dir_abspath)
2456
# jam 20060527 The kernel sized tree seems equivalent whether we
2457
# use a deque and popleft to keep them sorted, or if we use a plain
2458
# list and just reverse() them.
2459
children = collections.deque(children)
2460
stack = [(from_dir_id, u'', from_dir_abspath, children)]
2462
from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
2465
f = children.popleft()
2466
## TODO: If we find a subdirectory with its own .bzr
2467
## directory, then that is a separate tree and we
2468
## should exclude it.
2470
# the bzrdir for this tree
2471
if transport_base_dir == f:
2474
# we know that from_dir_relpath and from_dir_abspath never end in a slash
2475
# and 'f' doesn't begin with one, we can do a string op, rather
2476
# than the checks of pathjoin(), all relative paths will have an extra slash
2478
fp = from_dir_relpath + '/' + f
2481
fap = from_dir_abspath + '/' + f
2483
dir_ie = inv[from_dir_id]
2484
if dir_ie.kind == 'directory':
2485
f_ie = dir_ie.children.get(f)
2490
elif self.is_ignored(fp[1:]):
2493
# we may not have found this file, because of a unicode
2494
# issue, or because the directory was actually a symlink.
2495
f_norm, can_access = osutils.normalized_filename(f)
2496
if f == f_norm or not can_access:
2497
# No change, so treat this file normally
2500
# this file can be accessed by a normalized path
2501
# check again if it is versioned
2502
# these lines are repeated here for performance
2504
fp = from_dir_relpath + '/' + f
2505
fap = from_dir_abspath + '/' + f
2506
f_ie = inv.get_child(from_dir_id, f)
2509
elif self.is_ignored(fp[1:]):
2516
# make a last minute entry
2518
yield fp[1:], c, fk, f_ie.file_id, f_ie
2521
yield fp[1:], c, fk, None, fk_entries[fk]()
2523
yield fp[1:], c, fk, None, TreeEntry()
2526
if fk != 'directory':
2529
# But do this child first if recursing down
2531
new_children = os.listdir(fap)
2533
new_children = collections.deque(new_children)
2534
stack.append((f_ie.file_id, fp, fap, new_children))
2535
# Break out of inner loop,
2536
# so that we start outer loop with child
2539
# if we finished all children, pop it off the stack
2542
@needs_tree_write_lock
2543
def move(self, from_paths, to_dir=None, after=False):
2546
to_dir must exist in the inventory.
2548
If to_dir exists and is a directory, the files are moved into
2549
it, keeping their old names.
2551
Note that to_dir is only the last component of the new name;
2552
this doesn't change the directory.
2554
For each entry in from_paths the move mode will be determined
2557
The first mode moves the file in the filesystem and updates the
2558
inventory. The second mode only updates the inventory without
2559
touching the file on the filesystem.
2561
move uses the second mode if 'after == True' and the target is not
2562
versioned but present in the working tree.
2564
move uses the second mode if 'after == False' and the source is
2565
versioned but no longer in the working tree, and the target is not
2566
versioned but present in the working tree.
2568
move uses the first mode if 'after == False' and the source is
2569
versioned and present in the working tree, and the target is not
2570
versioned and not present in the working tree.
2572
Everything else results in an error.
2574
This returns a list of (from_path, to_path) pairs for each
2575
entry that is moved.
2580
# check for deprecated use of signature
2582
raise TypeError('You must supply a target directory')
2583
# check destination directory
2584
if isinstance(from_paths, basestring):
2586
inv = self.inventory
2587
to_abs = self.abspath(to_dir)
2588
if not isdir(to_abs):
2589
raise errors.BzrMoveFailedError('',to_dir,
2590
errors.NotADirectory(to_abs))
2591
if not self.has_filename(to_dir):
2592
raise errors.BzrMoveFailedError('',to_dir,
2593
errors.NotInWorkingDirectory(to_dir))
2594
to_dir_id = inv.path2id(to_dir)
2595
if to_dir_id is None:
2596
raise errors.BzrMoveFailedError('',to_dir,
2597
errors.NotVersionedError(path=to_dir))
2599
to_dir_ie = inv[to_dir_id]
2600
if to_dir_ie.kind != 'directory':
2601
raise errors.BzrMoveFailedError('',to_dir,
2602
errors.NotADirectory(to_abs))
2604
# create rename entries and tuples
2605
for from_rel in from_paths:
2606
from_tail = splitpath(from_rel)[-1]
2607
from_id = inv.path2id(from_rel)
2609
raise errors.BzrMoveFailedError(from_rel,to_dir,
2610
errors.NotVersionedError(path=from_rel))
2612
from_entry = inv[from_id]
2613
from_parent_id = from_entry.parent_id
2614
to_rel = pathjoin(to_dir, from_tail)
2615
rename_entry = InventoryWorkingTree._RenameEntry(
2618
from_tail=from_tail,
2619
from_parent_id=from_parent_id,
2620
to_rel=to_rel, to_tail=from_tail,
2621
to_parent_id=to_dir_id)
2622
rename_entries.append(rename_entry)
2623
rename_tuples.append((from_rel, to_rel))
2625
# determine which move mode to use. checks also for movability
2626
rename_entries = self._determine_mv_mode(rename_entries, after)
2628
original_modified = self._inventory_is_modified
2631
self._inventory_is_modified = True
2632
self._move(rename_entries)
2634
# restore the inventory on error
2635
self._inventory_is_modified = original_modified
2637
self._write_inventory(inv)
2638
return rename_tuples
2640
@needs_tree_write_lock
2641
def rename_one(self, from_rel, to_rel, after=False):
2644
This can change the directory or the filename or both.
2646
rename_one has several 'modes' to work. First, it can rename a physical
2647
file and change the file_id. That is the normal mode. Second, it can
2648
only change the file_id without touching any physical file.
2650
rename_one uses the second mode if 'after == True' and 'to_rel' is not
2651
versioned but present in the working tree.
2653
rename_one uses the second mode if 'after == False' and 'from_rel' is
2654
versioned but no longer in the working tree, and 'to_rel' is not
2655
versioned but present in the working tree.
2657
rename_one uses the first mode if 'after == False' and 'from_rel' is
2658
versioned and present in the working tree, and 'to_rel' is not
2659
versioned and not present in the working tree.
2661
Everything else results in an error.
2663
inv = self.inventory
2666
# create rename entries and tuples
2667
from_tail = splitpath(from_rel)[-1]
2668
from_id = inv.path2id(from_rel)
2670
# if file is missing in the inventory maybe it's in the basis_tree
2671
basis_tree = self.branch.basis_tree()
2672
from_id = basis_tree.path2id(from_rel)
2674
raise errors.BzrRenameFailedError(from_rel,to_rel,
2675
errors.NotVersionedError(path=from_rel))
2676
# put entry back in the inventory so we can rename it
2677
from_entry = basis_tree.inventory[from_id].copy()
2680
from_entry = inv[from_id]
2681
from_parent_id = from_entry.parent_id
2682
to_dir, to_tail = os.path.split(to_rel)
2683
to_dir_id = inv.path2id(to_dir)
2684
rename_entry = InventoryWorkingTree._RenameEntry(from_rel=from_rel,
2686
from_tail=from_tail,
2687
from_parent_id=from_parent_id,
2688
to_rel=to_rel, to_tail=to_tail,
2689
to_parent_id=to_dir_id)
2690
rename_entries.append(rename_entry)
2692
# determine which move mode to use. checks also for movability
2693
rename_entries = self._determine_mv_mode(rename_entries, after)
2695
# check if the target changed directory and if the target directory is
2697
if to_dir_id is None:
2698
raise errors.BzrMoveFailedError(from_rel,to_rel,
2699
errors.NotVersionedError(path=to_dir))
2701
# all checks done. now we can continue with our actual work
2702
mutter('rename_one:\n'
2707
' to_dir_id {%s}\n',
2708
from_id, from_rel, to_rel, to_dir, to_dir_id)
2710
self._move(rename_entries)
2711
self._write_inventory(inv)
2713
class _RenameEntry(object):
2714
def __init__(self, from_rel, from_id, from_tail, from_parent_id,
2715
to_rel, to_tail, to_parent_id, only_change_inv=False):
2716
self.from_rel = from_rel
2717
self.from_id = from_id
2718
self.from_tail = from_tail
2719
self.from_parent_id = from_parent_id
2720
self.to_rel = to_rel
2721
self.to_tail = to_tail
2722
self.to_parent_id = to_parent_id
2723
self.only_change_inv = only_change_inv
2725
def _determine_mv_mode(self, rename_entries, after=False):
2726
"""Determines for each from-to pair if both inventory and working tree
2727
or only the inventory has to be changed.
2729
Also does basic plausability tests.
2731
inv = self.inventory
2733
for rename_entry in rename_entries:
2734
# store to local variables for easier reference
2735
from_rel = rename_entry.from_rel
2736
from_id = rename_entry.from_id
2737
to_rel = rename_entry.to_rel
2738
to_id = inv.path2id(to_rel)
2739
only_change_inv = False
2741
# check the inventory for source and destination
2743
raise errors.BzrMoveFailedError(from_rel,to_rel,
2744
errors.NotVersionedError(path=from_rel))
2745
if to_id is not None:
2746
raise errors.BzrMoveFailedError(from_rel,to_rel,
2747
errors.AlreadyVersionedError(path=to_rel))
2749
# try to determine the mode for rename (only change inv or change
2750
# inv and file system)
2752
if not self.has_filename(to_rel):
2753
raise errors.BzrMoveFailedError(from_id,to_rel,
2754
errors.NoSuchFile(path=to_rel,
2755
extra="New file has not been created yet"))
2756
only_change_inv = True
2757
elif not self.has_filename(from_rel) and self.has_filename(to_rel):
2758
only_change_inv = True
2759
elif self.has_filename(from_rel) and not self.has_filename(to_rel):
2760
only_change_inv = False
2761
elif (not self.case_sensitive
2762
and from_rel.lower() == to_rel.lower()
2763
and self.has_filename(from_rel)):
2764
only_change_inv = False
2766
# something is wrong, so lets determine what exactly
2767
if not self.has_filename(from_rel) and \
2768
not self.has_filename(to_rel):
2769
raise errors.BzrRenameFailedError(from_rel,to_rel,
2770
errors.PathsDoNotExist(paths=(str(from_rel),
2773
raise errors.RenameFailedFilesExist(from_rel, to_rel)
2774
rename_entry.only_change_inv = only_change_inv
2775
return rename_entries
2777
def _move(self, rename_entries):
2778
"""Moves a list of files.
2780
Depending on the value of the flag 'only_change_inv', the
2781
file will be moved on the file system or not.
2783
inv = self.inventory
2786
for entry in rename_entries:
2788
self._move_entry(entry)
2790
self._rollback_move(moved)
2794
def _rollback_move(self, moved):
2795
"""Try to rollback a previous move in case of an filesystem error."""
2796
inv = self.inventory
2799
self._move_entry(WorkingTree._RenameEntry(
2800
entry.to_rel, entry.from_id,
2801
entry.to_tail, entry.to_parent_id, entry.from_rel,
2802
entry.from_tail, entry.from_parent_id,
2803
entry.only_change_inv))
2804
except errors.BzrMoveFailedError, e:
2805
raise errors.BzrMoveFailedError( '', '', "Rollback failed."
2806
" The working tree is in an inconsistent state."
2807
" Please consider doing a 'bzr revert'."
2808
" Error message is: %s" % e)
2810
def _move_entry(self, entry):
2811
inv = self.inventory
2812
from_rel_abs = self.abspath(entry.from_rel)
2813
to_rel_abs = self.abspath(entry.to_rel)
2814
if from_rel_abs == to_rel_abs:
2815
raise errors.BzrMoveFailedError(entry.from_rel, entry.to_rel,
2816
"Source and target are identical.")
2818
if not entry.only_change_inv:
2820
osutils.rename(from_rel_abs, to_rel_abs)
2822
raise errors.BzrMoveFailedError(entry.from_rel,
2824
inv.rename(entry.from_id, entry.to_parent_id, entry.to_tail)
2826
@needs_tree_write_lock
2827
def unversion(self, file_ids):
2828
"""Remove the file ids in file_ids from the current versioned set.
2830
When a file_id is unversioned, all of its children are automatically
2833
:param file_ids: The file ids to stop versioning.
2834
:raises: NoSuchId if any fileid is not currently versioned.
2836
for file_id in file_ids:
2837
if file_id not in self._inventory:
2838
raise errors.NoSuchId(self, file_id)
2839
for file_id in file_ids:
2840
if self._inventory.has_id(file_id):
2841
self._inventory.remove_recursive_id(file_id)
2843
# in the future this should just set a dirty bit to wait for the
2844
# final unlock. However, until all methods of workingtree start
2845
# with the current in -memory inventory rather than triggering
2846
# a read, it is more complex - we need to teach read_inventory
2847
# to know when to read, and when to not read first... and possibly
2848
# to save first when the in memory one may be corrupted.
2849
# so for now, we just only write it if it is indeed dirty.
2851
self._write_inventory(self._inventory)
2853
def stored_kind(self, file_id):
2854
"""See Tree.stored_kind"""
2855
return self.inventory[file_id].kind
2858
"""Yield all unversioned files in this WorkingTree.
2860
If there are any unversioned directories then only the directory is
2861
returned, not all its children. But if there are unversioned files
2862
under a versioned subdirectory, they are returned.
2864
Currently returned depth-first, sorted by name within directories.
2865
This is the same order used by 'osutils.walkdirs'.
2867
## TODO: Work from given directory downwards
2868
for path, dir_entry in self.inventory.directories():
2869
# mutter("search for unknowns in %r", path)
2870
dirabs = self.abspath(path)
2871
if not isdir(dirabs):
2872
# e.g. directory deleted
2876
for subf in os.listdir(dirabs):
2877
if self.bzrdir.is_control_filename(subf):
2879
if subf not in dir_entry.children:
2882
can_access) = osutils.normalized_filename(subf)
2883
except UnicodeDecodeError:
2884
path_os_enc = path.encode(osutils._fs_enc)
2885
relpath = path_os_enc + '/' + subf
2886
raise errors.BadFilenameEncoding(relpath,
2888
if subf_norm != subf and can_access:
2889
if subf_norm not in dir_entry.children:
2890
fl.append(subf_norm)
2896
subp = pathjoin(path, subf)
2899
def _walkdirs(self, prefix=""):
2900
"""Walk the directories of this tree.
2902
:prefix: is used as the directrory to start with.
2903
returns a generator which yields items in the form:
2904
((curren_directory_path, fileid),
2905
[(file1_path, file1_name, file1_kind, None, file1_id,
2908
_directory = 'directory'
2909
# get the root in the inventory
2910
inv = self.inventory
2911
top_id = inv.path2id(prefix)
2915
pending = [(prefix, '', _directory, None, top_id, None)]
2918
currentdir = pending.pop()
2919
# 0 - relpath, 1- basename, 2- kind, 3- stat, 4-id, 5-kind
2920
top_id = currentdir[4]
2922
relroot = currentdir[0] + '/'
2925
# FIXME: stash the node in pending
2927
if entry.kind == 'directory':
2928
for name, child in entry.sorted_children():
2929
dirblock.append((relroot + name, name, child.kind, None,
2930
child.file_id, child.kind
2932
yield (currentdir[0], entry.file_id), dirblock
2933
# push the user specified dirs from dirblock
2934
for dir in reversed(dirblock):
2935
if dir[2] == _directory:
2939
class WorkingTreeFormatRegistry(controldir.ControlComponentFormatRegistry):
2940
"""Registry for working tree formats."""
2942
def __init__(self, other_registry=None):
2943
super(WorkingTreeFormatRegistry, self).__init__(other_registry)
2944
self._default_format = None
2945
self._default_format_key = None
2947
def get_default(self):
2948
"""Return the current default format."""
2949
if (self._default_format_key is not None and
2950
self._default_format is None):
2951
self._default_format = self.get(self._default_format_key)
2952
return self._default_format
2954
def set_default(self, format):
2955
"""Set the default format."""
2956
self._default_format = format
2957
self._default_format_key = None
2959
def set_default_key(self, format_string):
2960
"""Set the default format by its format string."""
2961
self._default_format_key = format_string
2962
self._default_format = None
2965
format_registry = WorkingTreeFormatRegistry()
2968
class WorkingTreeFormat(controldir.ControlComponentFormat):
2826
2969
"""An encapsulation of the initialization and open routines for a format.
2828
2971
Formats provide three things:
3072
@symbol_versioning.deprecated_method(
3073
symbol_versioning.deprecated_in((2, 4, 0)))
2903
3074
def register_format(klass, format):
2904
klass._formats[format.get_format_string()] = format
3075
format_registry.register(format)
3078
@symbol_versioning.deprecated_method(
3079
symbol_versioning.deprecated_in((2, 4, 0)))
3080
def register_extra_format(klass, format):
3081
format_registry.register_extra(format)
3084
@symbol_versioning.deprecated_method(
3085
symbol_versioning.deprecated_in((2, 4, 0)))
3086
def unregister_extra_format(klass, format):
3087
format_registry.unregister_extra(format)
3090
@symbol_versioning.deprecated_method(
3091
symbol_versioning.deprecated_in((2, 4, 0)))
3092
def get_formats(klass):
3093
return format_registry._get_all()
3096
@symbol_versioning.deprecated_method(
3097
symbol_versioning.deprecated_in((2, 4, 0)))
2907
3098
def set_default_format(klass, format):
2908
klass._default_format = format
3099
format_registry.set_default(format)
3102
@symbol_versioning.deprecated_method(
3103
symbol_versioning.deprecated_in((2, 4, 0)))
2911
3104
def unregister_format(klass, format):
2912
del klass._formats[format.get_format_string()]
2915
class WorkingTreeFormat2(WorkingTreeFormat):
2916
"""The second working tree format.
2918
This format modified the hash cache from the format 1 hash cache.
2921
upgrade_recommended = True
2923
def get_format_description(self):
2924
"""See WorkingTreeFormat.get_format_description()."""
2925
return "Working tree format 2"
2927
def _stub_initialize_on_transport(self, transport, file_mode):
2928
"""Workaround: create control files for a remote working tree.
2930
This ensures that it can later be updated and dealt with locally,
2931
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2932
no working tree. (See bug #43064).
2935
inv = inventory.Inventory()
2936
xml5.serializer_v5.write_inventory(inv, sio, working=True)
2938
transport.put_file('inventory', sio, file_mode)
2939
transport.put_bytes('pending-merges', '', file_mode)
2941
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
2942
accelerator_tree=None, hardlink=False):
2943
"""See WorkingTreeFormat.initialize()."""
2944
if not isinstance(a_bzrdir.transport, LocalTransport):
2945
raise errors.NotLocalUrl(a_bzrdir.transport.base)
2946
if from_branch is not None:
2947
branch = from_branch
2949
branch = a_bzrdir.open_branch()
2950
if revision_id is None:
2951
revision_id = _mod_revision.ensure_null(branch.last_revision())
2954
branch.generate_revision_history(revision_id)
2957
inv = inventory.Inventory()
2958
wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2964
basis_tree = branch.repository.revision_tree(revision_id)
2965
if basis_tree.inventory.root is not None:
2966
wt.set_root_id(basis_tree.get_root_id())
2967
# set the parent list and cache the basis tree.
2968
if _mod_revision.is_null(revision_id):
2971
parent_trees = [(revision_id, basis_tree)]
2972
wt.set_parent_trees(parent_trees)
2973
transform.build_tree(basis_tree, wt)
2977
super(WorkingTreeFormat2, self).__init__()
2978
self._matchingbzrdir = bzrdir.BzrDirFormat6()
2980
def open(self, a_bzrdir, _found=False):
2981
"""Return the WorkingTree object for a_bzrdir
2983
_found is a private parameter, do not use it. It is used to indicate
2984
if format probing has already been done.
2987
# we are being called directly and must probe.
2988
raise NotImplementedError
2989
if not isinstance(a_bzrdir.transport, LocalTransport):
2990
raise errors.NotLocalUrl(a_bzrdir.transport.base)
2991
wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2997
class WorkingTreeFormat3(WorkingTreeFormat):
2998
"""The second working tree format updated to record a format marker.
3001
- exists within a metadir controlling .bzr
3002
- includes an explicit version marker for the workingtree control
3003
files, separate from the BzrDir format
3004
- modifies the hash cache format
3006
- uses a LockDir to guard access for writes.
3009
upgrade_recommended = True
3011
def get_format_string(self):
3012
"""See WorkingTreeFormat.get_format_string()."""
3013
return "Bazaar-NG Working Tree format 3"
3015
def get_format_description(self):
3016
"""See WorkingTreeFormat.get_format_description()."""
3017
return "Working tree format 3"
3019
_lock_file_name = 'lock'
3020
_lock_class = LockDir
3022
_tree_class = WorkingTree3
3024
def __get_matchingbzrdir(self):
3025
return bzrdir.BzrDirMetaFormat1()
3027
_matchingbzrdir = property(__get_matchingbzrdir)
3029
def _open_control_files(self, a_bzrdir):
3030
transport = a_bzrdir.get_workingtree_transport(None)
3031
return LockableFiles(transport, self._lock_file_name,
3034
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
3035
accelerator_tree=None, hardlink=False):
3036
"""See WorkingTreeFormat.initialize().
3038
:param revision_id: if supplied, create a working tree at a different
3039
revision than the branch is at.
3040
:param accelerator_tree: A tree which can be used for retrieving file
3041
contents more quickly than the revision tree, i.e. a workingtree.
3042
The revision tree will be used for cases where accelerator_tree's
3043
content is different.
3044
:param hardlink: If true, hard-link files from accelerator_tree,
3047
if not isinstance(a_bzrdir.transport, LocalTransport):
3048
raise errors.NotLocalUrl(a_bzrdir.transport.base)
3049
transport = a_bzrdir.get_workingtree_transport(self)
3050
control_files = self._open_control_files(a_bzrdir)
3051
control_files.create_lock()
3052
control_files.lock_write()
3053
transport.put_bytes('format', self.get_format_string(),
3054
mode=a_bzrdir._get_file_mode())
3055
if from_branch is not None:
3056
branch = from_branch
3058
branch = a_bzrdir.open_branch()
3059
if revision_id is None:
3060
revision_id = _mod_revision.ensure_null(branch.last_revision())
3061
# WorkingTree3 can handle an inventory which has a unique root id.
3062
# as of bzr 0.12. However, bzr 0.11 and earlier fail to handle
3063
# those trees. And because there isn't a format bump inbetween, we
3064
# are maintaining compatibility with older clients.
3065
# inv = Inventory(root_id=gen_root_id())
3066
inv = self._initial_inventory()
3067
wt = self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
3073
_control_files=control_files)
3074
wt.lock_tree_write()
3076
basis_tree = branch.repository.revision_tree(revision_id)
3077
# only set an explicit root id if there is one to set.
3078
if basis_tree.inventory.root is not None:
3079
wt.set_root_id(basis_tree.get_root_id())
3080
if revision_id == _mod_revision.NULL_REVISION:
3081
wt.set_parent_trees([])
3083
wt.set_parent_trees([(revision_id, basis_tree)])
3084
transform.build_tree(basis_tree, wt)
3086
# Unlock in this order so that the unlock-triggers-flush in
3087
# WorkingTree is given a chance to fire.
3088
control_files.unlock()
3092
def _initial_inventory(self):
3093
return inventory.Inventory()
3096
super(WorkingTreeFormat3, self).__init__()
3098
def open(self, a_bzrdir, _found=False):
3099
"""Return the WorkingTree object for a_bzrdir
3101
_found is a private parameter, do not use it. It is used to indicate
3102
if format probing has already been done.
3105
# we are being called directly and must probe.
3106
raise NotImplementedError
3107
if not isinstance(a_bzrdir.transport, LocalTransport):
3108
raise errors.NotLocalUrl(a_bzrdir.transport.base)
3109
wt = self._open(a_bzrdir, self._open_control_files(a_bzrdir))
3112
def _open(self, a_bzrdir, control_files):
3113
"""Open the tree itself.
3115
:param a_bzrdir: the dir for the tree.
3116
:param control_files: the control files for the tree.
3118
return self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
3122
_control_files=control_files)
3125
return self.get_format_string()
3128
__default_format = WorkingTreeFormat6()
3129
WorkingTreeFormat.register_format(__default_format)
3130
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3131
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3132
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3133
WorkingTreeFormat.set_default_format(__default_format)
3134
# formats which have no format string are not discoverable
3135
# and not independently creatable, so are not registered.
3136
_legacy_formats = [WorkingTreeFormat2(),
3105
format_registry.remove(format)
3108
format_registry.register_lazy("Bazaar Working Tree Format 4 (bzr 0.15)\n",
3109
"bzrlib.workingtree_4", "WorkingTreeFormat4")
3110
format_registry.register_lazy("Bazaar Working Tree Format 5 (bzr 1.11)\n",
3111
"bzrlib.workingtree_4", "WorkingTreeFormat5")
3112
format_registry.register_lazy("Bazaar Working Tree Format 6 (bzr 1.14)\n",
3113
"bzrlib.workingtree_4", "WorkingTreeFormat6")
3114
format_registry.register_lazy("Bazaar-NG Working Tree format 3",
3115
"bzrlib.workingtree_3", "WorkingTreeFormat3")
3116
format_registry.set_default_key("Bazaar Working Tree Format 6 (bzr 1.14)\n")
added
removed
bzrlib/workingtree.py
