25
25
from cStringIO import StringIO
29
28
from bzrlib.lazy_import import lazy_import
30
29
lazy_import(globals(), """
30
from bisect import bisect_left
32
from copy import deepcopy
35
41
from bzrlib import (
44
conflicts as _mod_conflicts,
43
revision as _mod_revision,
49
59
import bzrlib.branch
60
from bzrlib.transport import get_transport
64
from bzrlib import symbol_versioning
53
65
from bzrlib.decorators import needs_read_lock, needs_write_lock
54
from bzrlib.filters import filtered_input_file, internal_size_sha_file_byname
55
from bzrlib.inventory import Inventory, ROOT_ID, entry_factory
66
from bzrlib.inventory import InventoryEntry, Inventory, ROOT_ID, entry_factory
67
from bzrlib.lockable_files import LockableFiles, TransportLock
68
from bzrlib.lockdir import LockDir
69
import bzrlib.mutabletree
56
70
from bzrlib.mutabletree import needs_tree_write_lock
57
71
from bzrlib.osutils import (
64
from bzrlib.trace import mutter
83
from bzrlib.trace import mutter, note
65
84
from bzrlib.transport.local import LocalTransport
66
from bzrlib.tree import InterTree
85
from bzrlib.progress import DummyProgress, ProgressPhase
86
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
87
from bzrlib.rio import RioReader, rio_file, Stanza
88
from bzrlib.symbol_versioning import (deprecated_passed,
67
96
from bzrlib.tree import Tree
68
97
from bzrlib.workingtree import WorkingTree, WorkingTree3, WorkingTreeFormat3
71
class DirStateWorkingTree(WorkingTree3):
100
class WorkingTree4(WorkingTree3):
101
"""This is the Format 4 working tree.
103
This differs from WorkingTree3 by:
104
- having a consolidated internal dirstate.
105
- not having a regular inventory attribute.
107
This is new in bzr TODO FIXME SETMEBEFORE MERGE.
72
110
def __init__(self, basedir,
74
112
_control_files=None,
111
166
state = self.current_dirstate()
112
167
for f, file_id, kind in zip(files, ids, kinds):
115
# special case tree root handling.
116
if f == '' and self.path2id(f) == ROOT_ID:
117
state.set_path_id('', generate_ids.gen_file_id(f))
119
171
if file_id is None:
120
172
file_id = generate_ids.gen_file_id(f)
121
173
# deliberately add the file with no cached stat or sha1
122
174
# - on the first access it will be gathered, and we can
123
175
# always change this once tests are all passing.
124
176
state.add(f, file_id, kind, None, '')
125
self._make_dirty(reset_inventory=True)
127
def _make_dirty(self, reset_inventory):
128
"""Make the tree state dirty.
130
:param reset_inventory: True if the cached inventory should be removed
131
(presuming there is one).
133
177
self._dirty = True
134
if reset_inventory and self._inventory is not None:
135
self._inventory = None
137
@needs_tree_write_lock
138
def add_reference(self, sub_tree):
139
# use standard implementation, which calls back to self._add
141
# So we don't store the reference_revision in the working dirstate,
142
# it's just recorded at the moment of commit.
143
self._add_reference(sub_tree)
145
def break_lock(self):
146
"""Break a lock if one is present from another instance.
148
Uses the ui factory to ask for confirmation if the lock may be from
151
This will probe the repository for its lock as well.
153
# if the dirstate is locked by an active process, reject the break lock
156
if self._dirstate is None:
160
state = self._current_dirstate()
161
if state._lock_token is not None:
162
# we already have it locked. sheese, cant break our own lock.
163
raise errors.LockActive(self.basedir)
166
# try for a write lock - need permission to get one anyhow
169
except errors.LockContention:
170
# oslocks fail when a process is still live: fail.
171
# TODO: get the locked lockdir info and give to the user to
172
# assist in debugging.
173
raise errors.LockActive(self.basedir)
178
self._dirstate = None
179
self._control_files.break_lock()
180
self.branch.break_lock()
182
def _comparison_data(self, entry, path):
183
kind, executable, stat_value = \
184
WorkingTree3._comparison_data(self, entry, path)
185
# it looks like a plain directory, but it's really a reference -- see
187
if (self._repo_supports_tree_reference and kind == 'directory'
188
and entry is not None and entry.kind == 'tree-reference'):
189
kind = 'tree-reference'
190
return kind, executable, stat_value
193
def commit(self, message=None, revprops=None, *args, **kwargs):
194
# mark the tree as dirty post commit - commit
195
# can change the current versioned list by doing deletes.
196
result = WorkingTree3.commit(self, message, revprops, *args, **kwargs)
197
self._make_dirty(reset_inventory=True)
200
179
def current_dirstate(self):
201
"""Return the current dirstate object.
180
"""Return the current dirstate object.
203
182
This is not part of the tree interface and only exposed for ease of
206
:raises errors.NotWriteLocked: when not in a lock.
208
self._must_be_locked()
209
return self._current_dirstate()
211
def _current_dirstate(self):
212
"""Internal function that does not check lock status.
214
This is needed for break_lock which also needs the dirstate.
185
:raises errors.NotWriteLocked: when not in a lock.
186
XXX: This should probably be errors.NotLocked.
188
if not self._control_files._lock_count:
189
raise errors.ObjectNotLocked(self)
216
190
if self._dirstate is not None:
217
191
return self._dirstate
218
192
local_path = self.bzrdir.get_workingtree_transport(None
219
193
).local_abspath('dirstate')
220
self._dirstate = dirstate.DirState.on_file(local_path,
221
self._sha1_provider())
194
self._dirstate = dirstate.DirState.on_file(local_path)
222
195
return self._dirstate
224
def _sha1_provider(self):
225
"""A function that returns a SHA1Provider suitable for this tree.
227
:return: None if content filtering is not supported by this tree.
228
Otherwise, a SHA1Provider is returned that sha's the canonical
229
form of files, i.e. after read filters are applied.
231
if self.supports_content_filtering():
232
return ContentFilterAwareSHA1Provider(self)
236
197
def filter_unversioned_files(self, paths):
237
"""Filter out paths that are versioned.
198
"""Filter out paths that are not versioned.
239
200
:return: set of paths.
429
332
def has_id(self, file_id):
430
333
state = self.current_dirstate()
334
file_id = osutils.safe_file_id(file_id)
431
335
row, parents = self._get_entry(file_id=file_id)
434
338
return osutils.lexists(pathjoin(
435
339
self.basedir, row[0].decode('utf8'), row[1].decode('utf8')))
437
def has_or_had_id(self, file_id):
438
state = self.current_dirstate()
439
row, parents = self._get_entry(file_id=file_id)
440
return row is not None
443
def id2path(self, file_id):
444
"Convert a file-id to a path."
445
state = self.current_dirstate()
446
entry = self._get_entry(file_id=file_id)
447
if entry == (None, None):
448
raise errors.NoSuchId(tree=self, file_id=file_id)
449
path_utf8 = osutils.pathjoin(entry[0][0], entry[0][1])
450
return path_utf8.decode('utf8')
452
def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
453
entry = self._get_entry(path=path)
454
if entry == (None, None):
455
return False # Missing entries are not executable
456
return entry[1][0][3] # Executable?
458
if not osutils.supports_executable():
459
def is_executable(self, file_id, path=None):
460
"""Test if a file is executable or not.
462
Note: The caller is expected to take a read-lock before calling this.
464
entry = self._get_entry(file_id=file_id, path=path)
465
if entry == (None, None):
467
return entry[1][0][3]
469
_is_executable_from_path_and_stat = \
470
_is_executable_from_path_and_stat_from_basis
472
def is_executable(self, file_id, path=None):
473
"""Test if a file is executable or not.
475
Note: The caller is expected to take a read-lock before calling this.
477
self._must_be_locked()
479
path = self.id2path(file_id)
480
mode = os.lstat(self.abspath(path)).st_mode
481
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
483
def all_file_ids(self):
484
"""See Tree.iter_all_file_ids"""
485
self._must_be_locked()
487
for key, tree_details in self.current_dirstate()._iter_entries():
488
if tree_details[0][0] in ('a', 'r'): # relocated
342
def id2path(self, fileid):
343
fileid = osutils.safe_file_id(fileid)
344
inv = self._get_inventory()
345
return inv.id2path(fileid)
346
# TODO: jam 20070222 At present dirstate is very slow at id => path,
347
# while inventory is very fast at it. So for now, just generate
348
# the inventory and do the id => path check.
349
# In the future, we want to make dirstate better at id=>path
350
# checks so that we don't have to create the inventory.
351
# state = self.current_dirstate()
352
# key, tree_details = state._get_entry(0, fileid_utf8=fileid)
353
# return os.path.join(*key[0:2]).decode('utf8')
494
356
def __iter__(self):
565
377
return parent_ids[0]
567
return _mod_revision.NULL_REVISION
570
"""See Branch.lock_read, and WorkingTree.unlock."""
571
self.branch.lock_read()
573
self._control_files.lock_read()
575
state = self.current_dirstate()
576
if not state._lock_token:
578
# set our support for tree references from the repository in
580
self._repo_supports_tree_reference = getattr(
581
self.branch.repository._format, "supports_tree_reference",
584
self._control_files.unlock()
590
def _lock_self_write(self):
591
"""This should be called after the branch is locked."""
593
self._control_files.lock_write()
595
state = self.current_dirstate()
596
if not state._lock_token:
598
# set our support for tree references from the repository in
600
self._repo_supports_tree_reference = getattr(
601
self.branch.repository._format, "supports_tree_reference",
604
self._control_files.unlock()
610
def lock_tree_write(self):
611
"""See MutableTree.lock_tree_write, and WorkingTree.unlock."""
612
self.branch.lock_read()
613
self._lock_self_write()
615
def lock_write(self):
616
"""See MutableTree.lock_write, and WorkingTree.unlock."""
617
self.branch.lock_write()
618
self._lock_self_write()
620
381
@needs_tree_write_lock
621
def move(self, from_paths, to_dir, after=False):
382
def move(self, from_paths, to_dir=None, after=False, **kwargs):
622
383
"""See WorkingTree.move()."""
624
384
if not from_paths:
626
387
state = self.current_dirstate()
627
if isinstance(from_paths, basestring):
389
# check for deprecated use of signature
391
to_dir = kwargs.get('to_name', None)
393
raise TypeError('You must supply a target directory')
395
symbol_versioning.warn('The parameter to_name was deprecated'
396
' in version 0.13. Use to_dir instead',
399
assert not isinstance(from_paths, basestring)
629
400
to_dir_utf8 = to_dir.encode('utf8')
630
401
to_entry_dirname, to_basename = os.path.split(to_dir_utf8)
631
id_index = state._get_id_index()
632
402
# check destination directory
633
403
# get the details for it
634
404
to_entry_block_index, to_entry_entry_index, dir_present, entry_present = \
635
405
state._get_block_entry_index(to_entry_dirname, to_basename, 0)
636
406
if not entry_present:
637
407
raise errors.BzrMoveFailedError('', to_dir,
638
errors.NotVersionedError(to_dir))
408
errors.NotInWorkingDirectory(to_dir))
639
409
to_entry = state._dirblocks[to_entry_block_index][1][to_entry_entry_index]
640
410
# get a handle on the block itself.
641
411
to_block_index = state._ensure_block(
653
423
if self._inventory is not None:
654
424
update_inventory = True
655
425
inv = self.inventory
426
to_dir_ie = inv[to_dir_id]
656
427
to_dir_id = to_entry[0][2]
657
to_dir_ie = inv[to_dir_id]
659
429
update_inventory = False
662
def move_one(old_entry, from_path_utf8, minikind, executable,
663
fingerprint, packed_stat, size,
664
to_block, to_key, to_path_utf8):
665
state._make_absent(old_entry)
666
from_key = old_entry[0]
668
lambda:state.update_minimal(from_key,
670
executable=executable,
671
fingerprint=fingerprint,
672
packed_stat=packed_stat,
674
path_utf8=from_path_utf8))
675
state.update_minimal(to_key,
677
executable=executable,
678
fingerprint=fingerprint,
679
packed_stat=packed_stat,
681
path_utf8=to_path_utf8)
682
added_entry_index, _ = state._find_entry_index(to_key, to_block[1])
683
new_entry = to_block[1][added_entry_index]
684
rollbacks.append(lambda:state._make_absent(new_entry))
431
# create rename entries and tuples
686
432
for from_rel in from_paths:
687
433
# from_rel is 'pathinroot/foo/bar'
688
from_rel_utf8 = from_rel.encode('utf8')
689
from_dirname, from_tail = osutils.split(from_rel)
690
from_dirname, from_tail_utf8 = osutils.split(from_rel_utf8)
434
from_dirname, from_tail = os.path.split(from_rel)
435
from_dirname = from_dirname.encode('utf8')
691
436
from_entry = self._get_entry(path=from_rel)
692
437
if from_entry == (None, None):
693
438
raise errors.BzrMoveFailedError(from_rel,to_dir,
694
errors.NotVersionedError(path=from_rel))
439
errors.NotVersionedError(path=str(from_rel)))
696
441
from_id = from_entry[0][2]
697
442
to_rel = pathjoin(to_dir, from_tail)
698
to_rel_utf8 = pathjoin(to_dir_utf8, from_tail_utf8)
699
443
item_to_entry = self._get_entry(path=to_rel)
700
444
if item_to_entry != (None, None):
701
445
raise errors.BzrMoveFailedError(from_rel, to_rel,
764
504
lambda: inv.rename(from_id, current_parent, from_tail))
765
505
# finally do the rename in the dirstate, which is a little
766
506
# tricky to rollback, but least likely to need it.
507
basename = from_tail.encode('utf8')
767
508
old_block_index, old_entry_index, dir_present, file_present = \
768
state._get_block_entry_index(from_dirname, from_tail_utf8, 0)
509
state._get_block_entry_index(from_dirname, basename, 0)
769
510
old_block = state._dirblocks[old_block_index][1]
770
old_entry = old_block[old_entry_index]
771
from_key, old_entry_details = old_entry
772
cur_details = old_entry_details[0]
511
old_entry_details = old_block[old_entry_index][1]
773
512
# remove the old row
513
from_key = old_block[old_entry_index][0]
774
514
to_key = ((to_block[0],) + from_key[1:3])
775
minikind = cur_details[0]
776
move_one(old_entry, from_path_utf8=from_rel_utf8,
778
executable=cur_details[3],
779
fingerprint=cur_details[1],
780
packed_stat=cur_details[4],
784
to_path_utf8=to_rel_utf8)
787
def update_dirblock(from_dir, to_key, to_dir_utf8):
788
"""Recursively update all entries in this dirblock."""
790
raise AssertionError("renaming root not supported")
791
from_key = (from_dir, '')
792
from_block_idx, present = \
793
state._find_block_index_from_key(from_key)
795
# This is the old record, if it isn't present, then
796
# there is theoretically nothing to update.
797
# (Unless it isn't present because of lazy loading,
798
# but we don't do that yet)
800
from_block = state._dirblocks[from_block_idx]
801
to_block_index, to_entry_index, _, _ = \
802
state._get_block_entry_index(to_key[0], to_key[1], 0)
803
to_block_index = state._ensure_block(
804
to_block_index, to_entry_index, to_dir_utf8)
805
to_block = state._dirblocks[to_block_index]
807
# Grab a copy since move_one may update the list.
808
for entry in from_block[1][:]:
809
if not (entry[0][0] == from_dir):
810
raise AssertionError()
811
cur_details = entry[1][0]
812
to_key = (to_dir_utf8, entry[0][1], entry[0][2])
813
from_path_utf8 = osutils.pathjoin(entry[0][0], entry[0][1])
814
to_path_utf8 = osutils.pathjoin(to_dir_utf8, entry[0][1])
815
minikind = cur_details[0]
817
# Deleted children of a renamed directory
818
# Do not need to be updated.
819
# Children that have been renamed out of this
820
# directory should also not be updated
822
move_one(entry, from_path_utf8=from_path_utf8,
824
executable=cur_details[3],
825
fingerprint=cur_details[1],
826
packed_stat=cur_details[4],
830
to_path_utf8=to_path_utf8)
832
# We need to move all the children of this
834
update_dirblock(from_path_utf8, to_key,
836
update_dirblock(from_rel_utf8, to_key, to_rel_utf8)
515
state._make_absent(old_block[old_entry_index])
516
minikind = old_entry_details[0][0]
517
kind = dirstate.DirState._minikind_to_kind[minikind]
519
lambda:state.update_minimal(from_key,
521
num_present_parents=len(old_entry_details) - 1,
522
executable=old_entry_details[0][3],
523
fingerprint=old_entry_details[0][1],
524
packed_stat=old_entry_details[0][4],
525
size=old_entry_details[0][2],
526
id_index=state._get_id_index(),
527
path_utf8=from_rel.encode('utf8')))
528
# create new row in current block
529
state.update_minimal(to_key,
531
num_present_parents=len(old_entry_details) - 1,
532
executable=old_entry_details[0][3],
533
fingerprint=old_entry_details[0][1],
534
packed_stat=old_entry_details[0][4],
535
size=old_entry_details[0][2],
536
id_index=state._get_id_index(),
537
path_utf8=to_rel.encode('utf8'))
538
added_entry_index, _ = state._find_entry_index(to_key, to_block[1])
539
new_entry = to_block[added_entry_index]
540
rollbacks.append(lambda:state._make_absent(new_entry))
541
if new_entry[1][0][0] == 'd':
542
import pdb;pdb.set_trace()
543
# if a directory, rename all the contents of child blocks
544
# adding rollbacks as each is inserted to remove them and
545
# restore the original
546
# TODO: large scale slice assignment.
548
# save old list region
549
# move up or down the old region
550
# add rollback to move the region back
551
# assign new list to new region
838
554
rollback_rename()
840
result.append((from_rel, to_rel))
841
556
state._dirblock_state = dirstate.DirState.IN_MEMORY_MODIFIED
842
self._make_dirty(reset_inventory=False)
846
def _must_be_locked(self):
847
if not self._control_files._lock_count:
848
raise errors.ObjectNotLocked(self)
559
return #rename_tuples
850
561
def _new_tree(self):
851
562
"""Initialize the state in this tree to be a new tree."""
1077
762
raise errors.GhostRevisionUnusableHere(parents_list[0][0])
1081
parent_ids = [rev_id for rev_id, tree in parents_list]
1082
graph = self.branch.repository.get_graph()
1083
heads = graph.heads(parent_ids)
1084
accepted_revisions = set()
1086
765
# convert absent trees to the null tree, which we convert back to
1087
766
# missing on access.
1088
767
for rev_id, tree in parents_list:
1089
if len(accepted_revisions) > 0:
1090
# we always accept the first tree
1091
if rev_id in accepted_revisions or rev_id not in heads:
1092
# We have already included either this tree, or its
1093
# descendent, so we skip it.
1095
_mod_revision.check_not_reserved_id(rev_id)
768
rev_id = osutils.safe_revision_id(rev_id)
1096
769
if tree is not None:
1097
770
real_trees.append((rev_id, tree))
1099
772
real_trees.append((rev_id,
1100
self.branch.repository.revision_tree(
1101
_mod_revision.NULL_REVISION)))
773
self.branch.repository.revision_tree(None)))
1102
774
ghosts.append(rev_id)
1103
accepted_revisions.add(rev_id)
1104
775
dirstate.set_parent_trees(real_trees, ghosts=ghosts)
1105
self._make_dirty(reset_inventory=False)
1107
778
def _set_root_id(self, file_id):
1108
779
"""See WorkingTree.set_root_id."""
1109
780
state = self.current_dirstate()
1110
781
state.set_path_id('', file_id)
1111
if state._dirblock_state == dirstate.DirState.IN_MEMORY_MODIFIED:
1112
self._make_dirty(reset_inventory=True)
1114
def _sha_from_stat(self, path, stat_result):
1115
"""Get a sha digest from the tree's stat cache.
1117
The default implementation assumes no stat cache is present.
1119
:param path: The path.
1120
:param stat_result: The stat result being looked up.
1122
return self.current_dirstate().sha1_from_stat(path, stat_result)
1125
def supports_tree_reference(self):
1126
return self._repo_supports_tree_reference
782
self._dirty = state._dirblock_state == dirstate.DirState.IN_MEMORY_MODIFIED
1128
784
def unlock(self):
1129
785
"""Unlock in format 4 trees needs to write the entire dirstate."""
1130
# do non-implementation specific cleanup
1133
786
if self._control_files._lock_count == 1:
787
self._write_hashcache_if_dirty()
1134
788
# eventually we should do signature checking during read locks for
1135
789
# dirstate updates.
1136
790
if self._control_files._lock_mode == 'w':
1139
if self._dirstate is not None:
1140
# This is a no-op if there are no modifications.
1141
self._dirstate.save()
1142
self._dirstate.unlock()
1143
# TODO: jam 20070301 We shouldn't have to wipe the dirstate at this
1144
# point. Instead, it could check if the header has been
1145
# modified when it is locked, and if not, it can hang on to
1146
# the data it has in memory.
1147
793
self._dirstate = None
1148
794
self._inventory = None
1149
795
# reverse order of locking.
1231
872
block_index += 1
1232
873
if ids_to_unversion:
1233
874
raise errors.NoSuchId(self, iter(ids_to_unversion).next())
1234
self._make_dirty(reset_inventory=False)
1235
876
# have to change the legacy inventory too.
1236
877
if self._inventory is not None:
1237
878
for file_id in file_ids:
1238
879
self._inventory.remove_recursive_id(file_id)
1240
881
@needs_tree_write_lock
1241
def rename_one(self, from_rel, to_rel, after=False):
1242
"""See WorkingTree.rename_one"""
1244
WorkingTree.rename_one(self, from_rel, to_rel, after)
1246
@needs_tree_write_lock
1247
def apply_inventory_delta(self, changes):
1248
"""See MutableTree.apply_inventory_delta"""
1249
state = self.current_dirstate()
1250
state.update_by_delta(changes)
1251
self._make_dirty(reset_inventory=True)
1253
def update_basis_by_delta(self, new_revid, delta):
1254
"""See MutableTree.update_basis_by_delta."""
1255
if self.last_revision() == new_revid:
1256
raise AssertionError()
1257
self.current_dirstate().update_basis_by_delta(delta, new_revid)
1260
def _validate(self):
1261
self._dirstate._validate()
1263
@needs_tree_write_lock
1264
882
def _write_inventory(self, inv):
1265
883
"""Write inventory as the current inventory."""
1267
raise AssertionError("attempting to write an inventory when the "
1268
"dirstate is dirty will lose pending changes")
1269
had_inventory = self._inventory is not None
1270
# Setting self._inventory = None forces the dirstate to regenerate the
1271
# working inventory. We do this because self.inventory may be inv, or
1272
# may have been modified, and either case would prevent a clean delta
1274
self._inventory = None
1276
delta = inv._make_delta(self.inventory)
1278
self.apply_inventory_delta(delta)
1280
self._inventory = inv
884
assert not self._dirty, "attempting to write an inventory when the dirstate is dirty will cause data loss"
885
self.current_dirstate().set_state_from_inventory(inv)
1284
class ContentFilterAwareSHA1Provider(dirstate.SHA1Provider):
1286
def __init__(self, tree):
1289
def sha1(self, abspath):
1290
"""See dirstate.SHA1Provider.sha1()."""
1291
filters = self.tree._content_filter_stack(
1292
self.tree.relpath(osutils.safe_unicode(abspath)))
1293
return internal_size_sha_file_byname(abspath, filters)[1]
1295
def stat_and_sha1(self, abspath):
1296
"""See dirstate.SHA1Provider.stat_and_sha1()."""
1297
filters = self.tree._content_filter_stack(
1298
self.tree.relpath(osutils.safe_unicode(abspath)))
1299
file_obj = file(abspath, 'rb', 65000)
1301
statvalue = os.fstat(file_obj.fileno())
1303
file_obj = filtered_input_file(file_obj, filters)
1304
sha1 = osutils.size_sha_file(file_obj)[1]
1307
return statvalue, sha1
1310
class ContentFilteringDirStateWorkingTree(DirStateWorkingTree):
1311
"""Dirstate working tree that supports content filtering.
1313
The dirstate holds the hash and size of the canonical form of the file,
1314
and most methods must return that.
1317
def _file_content_summary(self, path, stat_result):
1318
# This is to support the somewhat obsolete path_content_summary method
1319
# with content filtering: see
1320
# <https://bugs.edge.launchpad.net/bzr/+bug/415508>.
1322
# If the dirstate cache is up to date and knows the hash and size,
1324
# Otherwise if there are no content filters, return the on-disk size
1325
# and leave the hash blank.
1326
# Otherwise, read and filter the on-disk file and use its size and
1329
# The dirstate doesn't store the size of the canonical form so we
1330
# can't trust it for content-filtered trees. We just return None.
1331
dirstate_sha1 = self._dirstate.sha1_from_stat(path, stat_result)
1332
executable = self._is_executable_from_path_and_stat(path, stat_result)
1333
return ('file', None, executable, dirstate_sha1)
1336
class WorkingTree4(DirStateWorkingTree):
1337
"""This is the Format 4 working tree.
1339
This differs from WorkingTree3 by:
1340
- Having a consolidated internal dirstate, stored in a
1341
randomly-accessible sorted file on disk.
1342
- Not having a regular inventory attribute. One can be synthesized
1343
on demand but this is expensive and should be avoided.
1345
This is new in bzr 0.15.
1349
class WorkingTree5(ContentFilteringDirStateWorkingTree):
1350
"""This is the Format 5 working tree.
1352
This differs from WorkingTree4 by:
1353
- Supporting content filtering.
1355
This is new in bzr 1.11.
1359
class WorkingTree6(ContentFilteringDirStateWorkingTree):
1360
"""This is the Format 6 working tree.
1362
This differs from WorkingTree5 by:
1363
- Supporting a current view that may mask the set of files in a tree
1364
impacted by most user operations.
1366
This is new in bzr 1.14.
1369
def _make_views(self):
1370
return views.PathBasedViews(self)
1373
class DirStateWorkingTreeFormat(WorkingTreeFormat3):
1375
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
1376
accelerator_tree=None, hardlink=False):
890
class WorkingTreeFormat4(WorkingTreeFormat3):
891
"""The first consolidated dirstate working tree format.
894
- exists within a metadir controlling .bzr
895
- includes an explicit version marker for the workingtree control
896
files, separate from the BzrDir format
897
- modifies the hash cache format
898
- is new in bzr TODO FIXME SETBEFOREMERGE
899
- uses a LockDir to guard access to it.
902
def get_format_string(self):
903
"""See WorkingTreeFormat.get_format_string()."""
904
return "Bazaar Working Tree format 4\n"
906
def get_format_description(self):
907
"""See WorkingTreeFormat.get_format_description()."""
908
return "Working tree format 4"
910
def initialize(self, a_bzrdir, revision_id=None):
1377
911
"""See WorkingTreeFormat.initialize().
1379
:param revision_id: allows creating a working tree at a different
913
revision_id allows creating a working tree at a different
1380
914
revision than the branch is at.
1381
:param accelerator_tree: A tree which can be used for retrieving file
1382
contents more quickly than the revision tree, i.e. a workingtree.
1383
The revision tree will be used for cases where accelerator_tree's
1384
content is different.
1385
:param hardlink: If true, hard-link files from accelerator_tree,
1388
These trees get an initial random root id, if their repository supports
1389
rich root data, TREE_ROOT otherwise.
916
revision_id = osutils.safe_revision_id(revision_id)
1391
917
if not isinstance(a_bzrdir.transport, LocalTransport):
1392
918
raise errors.NotLocalUrl(a_bzrdir.transport.base)
1393
919
transport = a_bzrdir.get_workingtree_transport(self)
1394
920
control_files = self._open_control_files(a_bzrdir)
1395
921
control_files.create_lock()
1396
922
control_files.lock_write()
1397
transport.put_bytes('format', self.get_format_string(),
1398
mode=a_bzrdir._get_file_mode())
1399
if from_branch is not None:
1400
branch = from_branch
1402
branch = a_bzrdir.open_branch()
923
control_files.put_utf8('format', self.get_format_string())
924
branch = a_bzrdir.open_branch()
1403
925
if revision_id is None:
1404
926
revision_id = branch.last_revision()
1405
927
local_path = transport.local_abspath('dirstate')
1406
# write out new dirstate (must exist when we create the tree)
1407
state = dirstate.DirState.initialize(local_path)
1410
wt = self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
928
dirstate.DirState.initialize(local_path)
929
wt = WorkingTree4(a_bzrdir.root_transport.local_abspath('.'),
1413
932
_bzrdir=a_bzrdir,
1414
933
_control_files=control_files)
1416
wt.lock_tree_write()
1418
self._init_custom_control_files(wt)
1419
if revision_id in (None, _mod_revision.NULL_REVISION):
1420
if branch.repository.supports_rich_root():
1421
wt._set_root_id(generate_ids.gen_root_id())
1423
wt._set_root_id(ROOT_ID)
1426
# frequently, we will get here due to branching. The accelerator
1427
# tree will be the tree from the branch, so the desired basis
1428
# tree will often be a parent of the accelerator tree.
1429
if accelerator_tree is not None:
1431
basis = accelerator_tree.revision_tree(revision_id)
1432
except errors.NoSuchRevision:
1435
basis = branch.repository.revision_tree(revision_id)
1436
if revision_id == _mod_revision.NULL_REVISION:
1439
parents_list = [(revision_id, basis)]
937
#wt.current_dirstate().set_path_id('', NEWROOT)
938
wt.set_last_revision(revision_id)
940
basis = wt.basis_tree()
1440
941
basis.lock_read()
1442
wt.set_parent_trees(parents_list, allow_leftmost_as_ghost=True)
1444
# if the basis has a root id we have to use that; otherwise we
1445
# use a new random one
1446
basis_root_id = basis.get_root_id()
1447
if basis_root_id is not None:
1448
wt._set_root_id(basis_root_id)
1450
if wt.supports_content_filtering():
1451
# The original tree may not have the same content filters
1452
# applied so we can't safely build the inventory delta from
1454
delta_from_tree = False
1456
delta_from_tree = True
1457
# delta_from_tree is safe even for DirStateRevisionTrees,
1458
# because wt4.apply_inventory_delta does not mutate the input
1459
# inventory entries.
1460
transform.build_tree(basis, wt, accelerator_tree,
1462
delta_from_tree=delta_from_tree)
942
transform.build_tree(basis, wt)
1466
945
control_files.unlock()
1470
def _init_custom_control_files(self, wt):
1471
"""Subclasses with custom control files should override this method.
1473
The working tree and control files are locked for writing when this
1476
:param wt: the WorkingTree object
1479
950
def _open(self, a_bzrdir, control_files):
1480
951
"""Open the tree itself.
1482
953
:param a_bzrdir: the dir for the tree.
1483
954
:param control_files: the control files for the tree.
1485
return self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
956
return WorkingTree4(a_bzrdir.root_transport.local_abspath('.'),
1486
957
branch=a_bzrdir.open_branch(),
1488
959
_bzrdir=a_bzrdir,
1489
960
_control_files=control_files)
1491
def __get_matchingbzrdir(self):
1492
return self._get_matchingbzrdir()
1494
def _get_matchingbzrdir(self):
1495
"""Overrideable method to get a bzrdir for testing."""
1496
# please test against something that will let us do tree references
1497
return bzrdir.format_registry.make_bzrdir(
1498
'dirstate-with-subtree')
1500
_matchingbzrdir = property(__get_matchingbzrdir)
1503
class WorkingTreeFormat4(DirStateWorkingTreeFormat):
1504
"""The first consolidated dirstate working tree format.
1507
- exists within a metadir controlling .bzr
1508
- includes an explicit version marker for the workingtree control
1509
files, separate from the BzrDir format
1510
- modifies the hash cache format
1511
- is new in bzr 0.15
1512
- uses a LockDir to guard access to it.
1515
upgrade_recommended = False
1517
_tree_class = WorkingTree4
1519
def get_format_string(self):
1520
"""See WorkingTreeFormat.get_format_string()."""
1521
return "Bazaar Working Tree Format 4 (bzr 0.15)\n"
1523
def get_format_description(self):
1524
"""See WorkingTreeFormat.get_format_description()."""
1525
return "Working tree format 4"
1528
class WorkingTreeFormat5(DirStateWorkingTreeFormat):
1529
"""WorkingTree format supporting content filtering.
1532
upgrade_recommended = False
1534
_tree_class = WorkingTree5
1536
def get_format_string(self):
1537
"""See WorkingTreeFormat.get_format_string()."""
1538
return "Bazaar Working Tree Format 5 (bzr 1.11)\n"
1540
def get_format_description(self):
1541
"""See WorkingTreeFormat.get_format_description()."""
1542
return "Working tree format 5"
1544
def supports_content_filtering(self):
1548
class WorkingTreeFormat6(DirStateWorkingTreeFormat):
1549
"""WorkingTree format supporting views.
1552
upgrade_recommended = False
1554
_tree_class = WorkingTree6
1556
def get_format_string(self):
1557
"""See WorkingTreeFormat.get_format_string()."""
1558
return "Bazaar Working Tree Format 6 (bzr 1.14)\n"
1560
def get_format_description(self):
1561
"""See WorkingTreeFormat.get_format_description()."""
1562
return "Working tree format 6"
1564
def _init_custom_control_files(self, wt):
1565
"""Subclasses with custom control files should override this method."""
1566
wt._transport.put_bytes('views', '', mode=wt.bzrdir._get_file_mode())
1568
def supports_content_filtering(self):
1571
def supports_views(self):
1575
963
class DirStateRevisionTree(Tree):
1576
"""A revision tree pulling the inventory from a dirstate.
1578
Note that this is one of the historical (ie revision) trees cached in the
1579
dirstate for easy access, not the workingtree.
964
"""A revision tree pulling the inventory from a dirstate."""
1582
966
def __init__(self, dirstate, revision_id, repository):
1583
967
self._dirstate = dirstate
1584
self._revision_id = revision_id
968
self._revision_id = osutils.safe_revision_id(revision_id)
1585
969
self._repository = repository
1586
970
self._inventory = None
1587
971
self._locked = 0
1588
self._dirstate_locked = False
1589
self._repo_supports_tree_reference = getattr(
1590
repository._format, "supports_tree_reference",
1594
return "<%s of %s in %s>" % \
1595
(self.__class__.__name__, self._revision_id, self._dirstate)
1597
def annotate_iter(self, file_id,
1598
default_revision=_mod_revision.CURRENT_REVISION):
973
def annotate_iter(self, file_id):
1599
974
"""See Tree.annotate_iter"""
1600
text_key = (file_id, self.inventory[file_id].revision)
1601
annotations = self._repository.texts.annotate(text_key)
1602
return [(key[-1], line) for (key, line) in annotations]
975
w = self._repository.weave_store.get_weave(file_id,
976
self._repository.get_transaction())
977
return w.annotate_iter(self.inventory[file_id].revision)
1604
def _get_ancestors(self, default_revision):
1605
return set(self._repository.get_ancestry(self._revision_id,
1607
979
def _comparison_data(self, entry, path):
1608
980
"""See Tree._comparison_data."""
1609
981
if entry is None:
1623
995
pred = self.has_filename
1624
996
return set((p for p in paths if not pred(p)))
1626
def get_root_id(self):
1627
return self.path2id('')
1629
def id2path(self, file_id):
1630
"Convert a file-id to a path."
1631
entry = self._get_entry(file_id=file_id)
1632
if entry == (None, None):
1633
raise errors.NoSuchId(tree=self, file_id=file_id)
1634
path_utf8 = osutils.pathjoin(entry[0][0], entry[0][1])
1635
return path_utf8.decode('utf8')
1637
def iter_references(self):
1638
if not self._repo_supports_tree_reference:
1639
# When the repo doesn't support references, we will have nothing to
1642
# Otherwise, fall back to the default implementation
1643
return super(DirStateRevisionTree, self).iter_references()
1645
def _get_parent_index(self):
1646
"""Return the index in the dirstate referenced by this tree."""
1647
return self._dirstate.get_parent_ids().index(self._revision_id) + 1
1649
998
def _get_entry(self, file_id=None, path=None):
1650
999
"""Get the dirstate row for file_id or path.
1652
1001
If either file_id or path is supplied, it is used as the key to lookup.
1653
1002
If both are supplied, the fastest lookup is used, and an error is
1654
1003
raised if they do not both point at the same row.
1656
1005
:param file_id: An optional unicode file_id to be looked up.
1657
1006
:param path: An optional unicode path to be looked up.
1658
1007
:return: The dirstate row tuple for path/file_id, or (None, None)
1660
1009
if file_id is None and path is None:
1661
1010
raise errors.BzrError('must supply file_id or path')
1011
file_id = osutils.safe_file_id(file_id)
1662
1012
if path is not None:
1663
1013
path = path.encode('utf8')
1664
parent_index = self._get_parent_index()
1014
parent_index = self._dirstate.get_parent_ids().index(self._revision_id) + 1
1665
1015
return self._dirstate._get_entry(parent_index, fileid_utf8=file_id, path_utf8=path)
1667
1017
def _generate_inventory(self):
1668
1018
"""Create and set self.inventory from the dirstate object.
1670
(So this is only called the first time the inventory is requested for
1671
this tree; it then remains in memory until it's out of date.)
1673
1020
This is relatively expensive: we have to walk the entire dirstate.
1675
if not self._locked:
1676
raise AssertionError(
1677
'cannot generate inventory of an unlocked '
1678
'dirstate revision tree')
1021
Ideally we would not, and instead would """
1022
assert self._locked, 'cannot generate inventory of an unlocked '\
1023
'dirstate revision tree'
1679
1024
# separate call for profiling - makes it clear where the costs are.
1680
1025
self._dirstate._read_dirblocks_if_needed()
1681
if self._revision_id not in self._dirstate.get_parent_ids():
1682
raise AssertionError(
1683
'parent %s has disappeared from %s' % (
1684
self._revision_id, self._dirstate.get_parent_ids()))
1026
assert self._revision_id in self._dirstate.get_parent_ids(), \
1027
'parent %s has disappeared from %s' % (
1028
self._revision_id, self._dirstate.get_parent_ids())
1685
1029
parent_index = self._dirstate.get_parent_ids().index(self._revision_id) + 1
1686
1030
# This is identical now to the WorkingTree _generate_inventory except
1687
1031
# for the tree index use.
1688
1032
root_key, current_entry = self._dirstate._get_entry(parent_index, path_utf8='')
1689
1033
current_id = root_key[2]
1690
if current_entry[parent_index][0] != 'd':
1691
raise AssertionError()
1034
assert current_entry[parent_index][0] == 'd'
1692
1035
inv = Inventory(root_id=current_id, revision_id=self._revision_id)
1693
1036
inv.root.revision = current_entry[parent_index][4]
1694
1037
# Turn some things into local variables
1721
1064
if kind == 'file':
1722
1065
inv_entry.executable = executable
1723
1066
inv_entry.text_size = size
1724
inv_entry.text_sha1 = fingerprint
1067
inv_entry.text_sha1 = link_or_sha1
1725
1068
elif kind == 'directory':
1726
1069
parent_ies[(dirname + '/' + name).strip('/')] = inv_entry
1727
1070
elif kind == 'symlink':
1728
1071
inv_entry.executable = False
1729
inv_entry.text_size = None
1730
inv_entry.symlink_target = utf8_decode(fingerprint)[0]
1731
elif kind == 'tree-reference':
1732
inv_entry.reference_revision = fingerprint or None
1072
inv_entry.text_size = size
1073
inv_entry.symlink_target = utf8_decode(link_or_sha1)[0]
1734
raise AssertionError("cannot convert entry %r into an InventoryEntry"
1075
raise Exception, kind
1736
1076
# These checks cost us around 40ms on a 55k entry tree
1737
if file_id in inv_byid:
1738
raise AssertionError('file_id %s already in'
1739
' inventory as %s' % (file_id, inv_byid[file_id]))
1740
if name_unicode in parent_ie.children:
1741
raise AssertionError('name %r already in parent'
1077
assert file_id not in inv_byid
1078
assert name_unicode not in parent_ie.children
1743
1079
inv_byid[file_id] = inv_entry
1744
1080
parent_ie.children[name_unicode] = inv_entry
1745
1081
self._inventory = inv
1747
def get_file_mtime(self, file_id, path=None):
1748
"""Return the modification time for this record.
1750
We return the timestamp of the last-changed revision.
1752
# Make sure the file exists
1753
entry = self._get_entry(file_id, path=path)
1754
if entry == (None, None): # do we raise?
1756
parent_index = self._get_parent_index()
1757
last_changed_revision = entry[1][parent_index][4]
1759
rev = self._repository.get_revision(last_changed_revision)
1760
except errors.NoSuchRevision:
1761
raise errors.FileTimestampUnavailable(self.id2path(file_id))
1762
return rev.timestamp
1764
1083
def get_file_sha1(self, file_id, path=None, stat_value=None):
1765
entry = self._get_entry(file_id=file_id, path=path)
1766
parent_index = self._get_parent_index()
1767
parent_details = entry[1][parent_index]
1768
if parent_details[0] == 'f':
1769
return parent_details[1]
1084
# TODO: if path is present, fast-path on that, as inventory
1085
# might not be present
1086
ie = self.inventory[file_id]
1087
if ie.kind == "file":
1772
def get_file(self, file_id, path=None):
1091
def get_file(self, file_id):
1773
1092
return StringIO(self.get_file_text(file_id))
1094
def get_file_lines(self, file_id):
1095
ie = self.inventory[file_id]
1096
return self._repository.weave_store.get_weave(file_id,
1097
self._repository.get_transaction()).get_lines(ie.revision)
1775
1099
def get_file_size(self, file_id):
1776
"""See Tree.get_file_size"""
1777
1100
return self.inventory[file_id].text_size
1779
def get_file_text(self, file_id, path=None):
1780
_, content = list(self.iter_files_bytes([(file_id, None)]))[0]
1781
return ''.join(content)
1783
def get_reference_revision(self, file_id, path=None):
1784
return self.inventory[file_id].reference_revision
1786
def iter_files_bytes(self, desired_files):
1787
"""See Tree.iter_files_bytes.
1789
This version is implemented on top of Repository.iter_files_bytes"""
1790
parent_index = self._get_parent_index()
1791
repo_desired_files = []
1792
for file_id, identifier in desired_files:
1793
entry = self._get_entry(file_id)
1794
if entry == (None, None):
1795
raise errors.NoSuchId(self, file_id)
1796
repo_desired_files.append((file_id, entry[1][parent_index][4],
1798
return self._repository.iter_files_bytes(repo_desired_files)
1800
def get_symlink_target(self, file_id):
1801
entry = self._get_entry(file_id=file_id)
1802
parent_index = self._get_parent_index()
1803
if entry[1][parent_index][0] != 'l':
1806
target = entry[1][parent_index][1]
1807
target = target.decode('utf8')
1102
def get_file_text(self, file_id):
1103
return ''.join(self.get_file_lines(file_id))
1810
1105
def get_revision_id(self):
1811
1106
"""Return the revision id for this tree."""
1947
1200
for dir in reversed(dirblock):
1948
1201
if dir[2] == _directory:
1949
1202
pending.append((dir[0], dir[4]))
1952
class InterDirStateTree(InterTree):
1953
"""Fast path optimiser for changes_from with dirstate trees.
1955
This is used only when both trees are in the dirstate working file, and
1956
the source is any parent within the dirstate, and the destination is
1957
the current working tree of the same dirstate.
1959
# this could be generalized to allow comparisons between any trees in the
1960
# dirstate, and possibly between trees stored in different dirstates.
1962
def __init__(self, source, target):
1963
super(InterDirStateTree, self).__init__(source, target)
1964
if not InterDirStateTree.is_compatible(source, target):
1965
raise Exception, "invalid source %r and target %r" % (source, target)
1968
def make_source_parent_tree(source, target):
1969
"""Change the source tree into a parent of the target."""
1970
revid = source.commit('record tree')
1971
target.branch.repository.fetch(source.branch.repository, revid)
1972
target.set_parent_ids([revid])
1973
return target.basis_tree(), target
1976
def make_source_parent_tree_python_dirstate(klass, test_case, source, target):
1977
result = klass.make_source_parent_tree(source, target)
1978
result[1]._iter_changes = dirstate.ProcessEntryPython
1982
def make_source_parent_tree_compiled_dirstate(klass, test_case, source,
1984
from bzrlib.tests.test__dirstate_helpers import \
1985
compiled_dirstate_helpers_feature
1986
test_case.requireFeature(compiled_dirstate_helpers_feature)
1987
from bzrlib._dirstate_helpers_pyx import ProcessEntryC
1988
result = klass.make_source_parent_tree(source, target)
1989
result[1]._iter_changes = ProcessEntryC
1992
_matching_from_tree_format = WorkingTreeFormat4()
1993
_matching_to_tree_format = WorkingTreeFormat4()
1996
def _test_mutable_trees_to_test_trees(klass, test_case, source, target):
1997
# This method shouldn't be called, because we have python and C
1998
# specific flavours.
1999
raise NotImplementedError
2001
def iter_changes(self, include_unchanged=False,
2002
specific_files=None, pb=None, extra_trees=[],
2003
require_versioned=True, want_unversioned=False):
2004
"""Return the changes from source to target.
2006
:return: An iterator that yields tuples. See InterTree.iter_changes
2008
:param specific_files: An optional list of file paths to restrict the
2009
comparison to. When mapping filenames to ids, all matches in all
2010
trees (including optional extra_trees) are used, and all children of
2011
matched directories are included.
2012
:param include_unchanged: An optional boolean requesting the inclusion of
2013
unchanged entries in the result.
2014
:param extra_trees: An optional list of additional trees to use when
2015
mapping the contents of specific_files (paths) to file_ids.
2016
:param require_versioned: If True, all files in specific_files must be
2017
versioned in one of source, target, extra_trees or
2018
PathsNotVersionedError is raised.
2019
:param want_unversioned: Should unversioned files be returned in the
2020
output. An unversioned file is defined as one with (False, False)
2021
for the versioned pair.
2023
# TODO: handle extra trees in the dirstate.
2024
if (extra_trees or specific_files == []):
2025
# we can't fast-path these cases (yet)
2026
return super(InterDirStateTree, self).iter_changes(
2027
include_unchanged, specific_files, pb, extra_trees,
2028
require_versioned, want_unversioned=want_unversioned)
2029
parent_ids = self.target.get_parent_ids()
2030
if not (self.source._revision_id in parent_ids
2031
or self.source._revision_id == _mod_revision.NULL_REVISION):
2032
raise AssertionError(
2033
"revision {%s} is not stored in {%s}, but %s "
2034
"can only be used for trees stored in the dirstate"
2035
% (self.source._revision_id, self.target, self.iter_changes))
2037
if self.source._revision_id == _mod_revision.NULL_REVISION:
2039
indices = (target_index,)
2041
if not (self.source._revision_id in parent_ids):
2042
raise AssertionError(
2043
"Failure: source._revision_id: %s not in target.parent_ids(%s)" % (
2044
self.source._revision_id, parent_ids))
2045
source_index = 1 + parent_ids.index(self.source._revision_id)
2046
indices = (source_index, target_index)
2047
# -- make all specific_files utf8 --
2049
specific_files_utf8 = set()
2050
for path in specific_files:
2051
# Note, if there are many specific files, using cache_utf8
2052
# would be good here.
2053
specific_files_utf8.add(path.encode('utf8'))
2054
specific_files = specific_files_utf8
2056
specific_files = set([''])
2057
# -- specific_files is now a utf8 path set --
2059
# -- get the state object and prepare it.
2060
state = self.target.current_dirstate()
2061
state._read_dirblocks_if_needed()
2062
if require_versioned:
2063
# -- check all supplied paths are versioned in a search tree. --
2065
for path in specific_files:
2066
path_entries = state._entries_for_path(path)
2067
if not path_entries:
2068
# this specified path is not present at all: error
2069
not_versioned.append(path)
2071
found_versioned = False
2072
# for each id at this path
2073
for entry in path_entries:
2075
for index in indices:
2076
if entry[1][index][0] != 'a': # absent
2077
found_versioned = True
2078
# all good: found a versioned cell
2080
if not found_versioned:
2081
# none of the indexes was not 'absent' at all ids for this
2083
not_versioned.append(path)
2084
if len(not_versioned) > 0:
2085
raise errors.PathsNotVersionedError(not_versioned)
2086
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2087
search_specific_files = osutils.minimum_path_selection(specific_files)
2089
use_filesystem_for_exec = (sys.platform != 'win32')
2090
iter_changes = self.target._iter_changes(include_unchanged,
2091
use_filesystem_for_exec, search_specific_files, state,
2092
source_index, target_index, want_unversioned, self.target)
2093
return iter_changes.iter_changes()
2096
def is_compatible(source, target):
2097
# the target must be a dirstate working tree
2098
if not isinstance(target, DirStateWorkingTree):
2100
# the source must be a revtree or dirstate rev tree.
2101
if not isinstance(source,
2102
(revisiontree.RevisionTree, DirStateRevisionTree)):
2104
# the source revid must be in the target dirstate
2105
if not (source._revision_id == _mod_revision.NULL_REVISION or
2106
source._revision_id in target.get_parent_ids()):
2107
# TODO: what about ghosts? it may well need to
2108
# check for them explicitly.
2112
InterTree.register_optimiser(InterDirStateTree)
2115
class Converter3to4(object):
2116
"""Perform an in-place upgrade of format 3 to format 4 trees."""
2119
self.target_format = WorkingTreeFormat4()
2121
def convert(self, tree):
2122
# lock the control files not the tree, so that we dont get tree
2123
# on-unlock behaviours, and so that noone else diddles with the
2124
# tree during upgrade.
2125
tree._control_files.lock_write()
2127
tree.read_working_inventory()
2128
self.create_dirstate_data(tree)
2129
self.update_format(tree)
2130
self.remove_xml_files(tree)
2132
tree._control_files.unlock()
2134
def create_dirstate_data(self, tree):
2135
"""Create the dirstate based data for tree."""
2136
local_path = tree.bzrdir.get_workingtree_transport(None
2137
).local_abspath('dirstate')
2138
state = dirstate.DirState.from_tree(tree, local_path)
2142
def remove_xml_files(self, tree):
2143
"""Remove the oldformat 3 data."""
2144
transport = tree.bzrdir.get_workingtree_transport(None)
2145
for path in ['basis-inventory-cache', 'inventory', 'last-revision',
2146
'pending-merges', 'stat-cache']:
2148
transport.delete(path)
2149
except errors.NoSuchFile:
2150
# some files are optional - just deal.
2153
def update_format(self, tree):
2154
"""Change the format marker."""
2155
tree._transport.put_bytes('format',
2156
self.target_format.get_format_string(),
2157
mode=tree.bzrdir._get_file_mode())
2160
class Converter4to5(object):
2161
"""Perform an in-place upgrade of format 4 to format 5 trees."""
2164
self.target_format = WorkingTreeFormat5()
2166
def convert(self, tree):
2167
# lock the control files not the tree, so that we don't get tree
2168
# on-unlock behaviours, and so that no-one else diddles with the
2169
# tree during upgrade.
2170
tree._control_files.lock_write()
2172
self.update_format(tree)
2174
tree._control_files.unlock()
2176
def update_format(self, tree):
2177
"""Change the format marker."""
2178
tree._transport.put_bytes('format',
2179
self.target_format.get_format_string(),
2180
mode=tree.bzrdir._get_file_mode())
2183
class Converter4or5to6(object):
2184
"""Perform an in-place upgrade of format 4 or 5 to format 6 trees."""
2187
self.target_format = WorkingTreeFormat6()
2189
def convert(self, tree):
2190
# lock the control files not the tree, so that we don't get tree
2191
# on-unlock behaviours, and so that no-one else diddles with the
2192
# tree during upgrade.
2193
tree._control_files.lock_write()
2195
self.init_custom_control_files(tree)
2196
self.update_format(tree)
2198
tree._control_files.unlock()
2200
def init_custom_control_files(self, tree):
2201
"""Initialize custom control files."""
2202
tree._transport.put_bytes('views', '',
2203
mode=tree.bzrdir._get_file_mode())
2205
def update_format(self, tree):
2206
"""Change the format marker."""
2207
tree._transport.put_bytes('format',
2208
self.target_format.get_format_string(),
2209
mode=tree.bzrdir._get_file_mode())
added
removed
bzrlib/workingtree_4.py
