25
25
At the moment every WorkingTree has its own branch. Remote
26
26
WorkingTrees aren't supported.
28
To get a WorkingTree, call Branch.working_tree():
28
To get a WorkingTree, call bzrdir.open_workingtree() or
29
WorkingTree.open(dir).
32
# TODO: Don't allow WorkingTrees to be constructed for remote branches if
35
# FIXME: I don't know if writing out the cache from the destructor is really a
36
# good idea, because destructors are considered poor taste in Python, and it's
37
# not predictable when it will be written out.
32
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
39
34
# TODO: Give the workingtree sole responsibility for the working inventory;
40
35
# remove the variable and references to it from the branch. This may require
41
36
# updating the commit code so as to update the inventory within the working
42
37
# copy, and making sure there's only one WorkingTree for any directory on disk.
43
# At the momenthey may alias the inventory and have old copies of it in memory.
38
# At the moment they may alias the inventory and have old copies of it in
39
# memory. (Now done? -- mbp 20060309)
41
from copy import deepcopy
42
from cStringIO import StringIO
49
from bzrlib.branch import Branch, needs_read_lock, needs_write_lock, quotefn
49
from bzrlib.atomicfile import AtomicFile
50
from bzrlib.branch import (Branch,
52
import bzrlib.bzrdir as bzrdir
53
from bzrlib.decorators import needs_read_lock, needs_write_lock
54
import bzrlib.errors as errors
55
from bzrlib.errors import (BzrCheckError,
58
WeaveRevisionNotPresent,
62
MergeModifiedFormatError)
63
from bzrlib.inventory import InventoryEntry, Inventory
64
from bzrlib.lockable_files import LockableFiles, TransportLock
65
from bzrlib.lockdir import LockDir
66
from bzrlib.merge import merge_inner, transform_tree
67
from bzrlib.osutils import (
85
from bzrlib.progress import DummyProgress, ProgressPhase
86
from bzrlib.revision import NULL_REVISION
87
from bzrlib.rio import RioReader, RioWriter, Stanza
88
from bzrlib.symbol_versioning import *
89
from bzrlib.textui import show_status
51
from bzrlib.osutils import appendpath, file_kind, isdir, splitpath, relpath
52
from bzrlib.errors import BzrCheckError, DivergedBranches, NotVersionedError
53
91
from bzrlib.trace import mutter
92
from bzrlib.transform import build_tree
93
from bzrlib.transport import get_transport
94
from bzrlib.transport.local import LocalTransport
99
def gen_file_id(name):
100
"""Return new file id.
102
This should probably generate proper UUIDs, but for the moment we
103
cope with just randomness because running uuidgen every time is
106
from binascii import hexlify
107
from time import time
110
idx = name.rfind('/')
112
name = name[idx+1 : ]
113
idx = name.rfind('\\')
115
name = name[idx+1 : ]
117
# make it not a hidden file
118
name = name.lstrip('.')
120
# remove any wierd characters; we don't escape them but rather
122
name = re.sub(r'[^\w.]', '', name)
124
s = hexlify(rand_bytes(8))
125
return '-'.join((name, compact_date(time()), s))
129
"""Return a new tree-root file id."""
130
return gen_file_id('TREE_ROOT')
56
133
class TreeEntry(object):
126
209
(branch.base is not cross checked, because for remote branches that
127
210
would be meaningless).
212
self._format = _format
213
self.bzrdir = _bzrdir
215
# not created via open etc.
216
warn("WorkingTree() is deprecated as of bzr version 0.8. "
217
"Please use bzrdir.open_workingtree or WorkingTree.open().",
220
wt = WorkingTree.open(basedir)
221
self.branch = wt.branch
222
self.basedir = wt.basedir
223
self._control_files = wt._control_files
224
self._hashcache = wt._hashcache
225
self._set_inventory(wt._inventory)
226
self._format = wt._format
227
self.bzrdir = wt.bzrdir
129
228
from bzrlib.hashcache import HashCache
130
229
from bzrlib.trace import note, mutter
131
230
assert isinstance(basedir, basestring), \
132
231
"base directory %r is not a string" % basedir
134
branch = Branch.open(basedir)
135
assert isinstance(branch, Branch), \
136
"branch %r is not a Branch" % branch
137
self._inventory = branch.inventory
138
self.path2id = self._inventory.path2id
140
self.basedir = basedir
232
basedir = safe_unicode(basedir)
233
mutter("opening working tree %r", basedir)
234
if deprecated_passed(branch):
236
warn("WorkingTree(..., branch=XXX) is deprecated as of bzr 0.8."
237
" Please use bzrdir.open_workingtree() or WorkingTree.open().",
243
self.branch = self.bzrdir.open_branch()
244
assert isinstance(self.branch, Branch), \
245
"branch %r is not a Branch" % self.branch
246
self.basedir = realpath(basedir)
247
# if branch is at our basedir and is a format 6 or less
248
if isinstance(self._format, WorkingTreeFormat2):
249
# share control object
250
self._control_files = self.branch.control_files
252
# only ready for format 3
253
assert isinstance(self._format, WorkingTreeFormat3)
254
assert isinstance(_control_files, LockableFiles), \
255
"_control_files must be a LockableFiles, not %r" \
257
self._control_files = _control_files
142
258
# update the whole cache up front and write to disk if anything changed;
143
259
# in the future we might want to do this more selectively
144
260
# two possible ways offer themselves : in self._unlock, write the cache
145
261
# if needed, or, when the cache sees a change, append it to the hash
146
262
# cache file, and have the parser take the most recent entry for a
147
263
# given path only.
148
hc = self._hashcache = HashCache(basedir)
264
cache_filename = self.bzrdir.get_workingtree_transport(None).abspath('stat-cache')
265
hc = self._hashcache = HashCache(basedir, cache_filename, self._control_files._file_mode)
267
# is this scan needed ? it makes things kinda slow.
152
270
if hc.needs_write:
153
271
mutter("write hc")
274
if _inventory is None:
275
self._set_inventory(self.read_working_inventory())
277
self._set_inventory(_inventory)
279
def _set_inventory(self, inv):
280
self._inventory = inv
281
self.path2id = self._inventory.path2id
283
def is_control_filename(self, filename):
284
"""True if filename is the name of a control file in this tree.
286
This is true IF and ONLY IF the filename is part of the meta data
287
that bzr controls in this tree. I.E. a random .bzr directory placed
288
on disk will not be a control file for this tree.
291
self.bzrdir.transport.relpath(self.abspath(filename))
293
except errors.PathNotChild:
297
def open(path=None, _unsupported=False):
298
"""Open an existing working tree at path.
302
path = os.path.getcwdu()
303
control = bzrdir.BzrDir.open(path, _unsupported)
304
return control.open_workingtree(_unsupported)
307
def open_containing(path=None):
308
"""Open an existing working tree which has its root about path.
310
This probes for a working tree at path and searches upwards from there.
312
Basically we keep looking up until we find the control directory or
313
run into /. If there isn't one, raises NotBranchError.
314
TODO: give this a new exception.
315
If there is one, it is returned, along with the unused portion of path.
319
control, relpath = bzrdir.BzrDir.open_containing(path)
320
return control.open_workingtree(), relpath
323
def open_downlevel(path=None):
324
"""Open an unsupported working tree.
326
Only intended for advanced situations like upgrading part of a bzrdir.
328
return WorkingTree.open(path, _unsupported=True)
156
330
def __iter__(self):
157
331
"""Iterate through file_ids for this tree.
164
338
if bzrlib.osutils.lexists(self.abspath(path)):
168
341
def __repr__(self):
169
342
return "<%s of %s>" % (self.__class__.__name__,
170
343
getattr(self, 'basedir', None))
174
345
def abspath(self, filename):
175
return os.path.join(self.basedir, filename)
177
def relpath(self, abspath):
346
return pathjoin(self.basedir, filename)
348
def basis_tree(self):
349
"""Return RevisionTree for the current last revision."""
350
revision_id = self.last_revision()
351
if revision_id is not None:
353
xml = self.read_basis_inventory(revision_id)
354
inv = bzrlib.xml5.serializer_v5.read_inventory_from_string(xml)
355
return bzrlib.tree.RevisionTree(self.branch.repository, inv,
359
return self.branch.repository.revision_tree(revision_id)
362
@deprecated_method(zero_eight)
363
def create(branch, directory):
364
"""Create a workingtree for branch at directory.
366
If existing_directory already exists it must have a .bzr directory.
367
If it does not exist, it will be created.
369
This returns a new WorkingTree object for the new checkout.
371
TODO FIXME RBC 20060124 when we have checkout formats in place this
372
should accept an optional revisionid to checkout [and reject this if
373
checking out into the same dir as a pre-checkout-aware branch format.]
375
XXX: When BzrDir is present, these should be created through that
378
warn('delete WorkingTree.create', stacklevel=3)
379
transport = get_transport(directory)
380
if branch.bzrdir.root_transport.base == transport.base:
382
return branch.bzrdir.create_workingtree()
383
# different directory,
384
# create a branch reference
385
# and now a working tree.
386
raise NotImplementedError
389
@deprecated_method(zero_eight)
390
def create_standalone(directory):
391
"""Create a checkout and a branch and a repo at directory.
393
Directory must exist and be empty.
395
please use BzrDir.create_standalone_workingtree
397
return bzrdir.BzrDir.create_standalone_workingtree(directory)
399
def relpath(self, abs):
178
400
"""Return the local path portion from a given absolute path."""
179
return relpath(self.basedir, abspath)
401
return relpath(self.basedir, abs)
181
403
def has_filename(self, filename):
182
404
return bzrlib.osutils.lexists(self.abspath(filename))
187
409
def get_file_byname(self, filename):
188
410
return file(self.abspath(filename), 'rb')
412
def get_root_id(self):
413
"""Return the id of this trees root"""
414
inv = self.read_working_inventory()
415
return inv.root.file_id
190
417
def _get_store_filename(self, file_id):
191
## XXX: badly named; this isn't in the store at all
418
## XXX: badly named; this is not in the store at all
192
419
return self.abspath(self.id2path(file_id))
422
def clone(self, to_bzrdir, revision_id=None, basis=None):
423
"""Duplicate this working tree into to_bzr, including all state.
425
Specifically modified files are kept as modified, but
426
ignored and unknown files are discarded.
428
If you want to make a new line of development, see bzrdir.sprout()
431
If not None, the cloned tree will have its last revision set to
432
revision, and and difference between the source trees last revision
433
and this one merged in.
436
If not None, a closer copy of a tree which may have some files in
437
common, and which file content should be preferentially copied from.
439
# assumes the target bzr dir format is compatible.
440
result = self._format.initialize(to_bzrdir)
441
self.copy_content_into(result, revision_id)
445
def copy_content_into(self, tree, revision_id=None):
446
"""Copy the current content and user files of this tree into tree."""
447
if revision_id is None:
448
transform_tree(tree, self)
450
# TODO now merge from tree.last_revision to revision
451
transform_tree(tree, self)
452
tree.set_last_revision(revision_id)
455
def commit(self, message=None, revprops=None, *args, **kwargs):
456
# avoid circular imports
457
from bzrlib.commit import Commit
460
if not 'branch-nick' in revprops:
461
revprops['branch-nick'] = self.branch.nick
462
# args for wt.commit start at message from the Commit.commit method,
463
# but with branch a kwarg now, passing in args as is results in the
464
#message being used for the branch
465
args = (DEPRECATED_PARAMETER, message, ) + args
466
Commit().commit(working_tree=self, revprops=revprops, *args, **kwargs)
467
self._set_inventory(self.read_working_inventory())
195
469
def id2abspath(self, file_id):
196
470
return self.abspath(self.id2path(file_id))
199
472
def has_id(self, file_id):
200
473
# files that have been deleted are excluded
201
474
inv = self._inventory
210
483
return self.inventory.has_id(file_id)
212
485
__contains__ = has_id
215
487
def get_file_size(self, file_id):
216
488
return os.path.getsize(self.id2abspath(file_id))
218
491
def get_file_sha1(self, file_id):
219
492
path = self._inventory.id2path(file_id)
220
493
return self._hashcache.get_sha1(path)
223
495
def is_executable(self, file_id):
496
if not supports_executable():
225
497
return self._inventory[file_id].executable
227
499
path = self._inventory.id2path(file_id)
228
500
mode = os.lstat(self.abspath(path)).st_mode
229
501
return bool(stat.S_ISREG(mode) and stat.S_IEXEC&mode)
504
def add(self, files, ids=None):
505
"""Make files versioned.
507
Note that the command line normally calls smart_add instead,
508
which can automatically recurse.
510
This adds the files to the inventory, so that they will be
511
recorded by the next commit.
514
List of paths to add, relative to the base of the tree.
517
If set, use these instead of automatically generated ids.
518
Must be the same length as the list of files, but may
519
contain None for ids that are to be autogenerated.
521
TODO: Perhaps have an option to add the ids even if the files do
524
TODO: Perhaps callback with the ids and paths as they're added.
526
# TODO: Re-adding a file that is removed in the working copy
527
# should probably put it back with the previous ID.
528
if isinstance(files, basestring):
529
assert(ids is None or isinstance(ids, basestring))
535
ids = [None] * len(files)
537
assert(len(ids) == len(files))
539
inv = self.read_working_inventory()
540
for f,file_id in zip(files, ids):
541
if self.is_control_filename(f):
542
raise BzrError("cannot add control file %s" % quotefn(f))
547
raise BzrError("cannot add top-level %r" % f)
549
fullpath = normpath(self.abspath(f))
552
kind = file_kind(fullpath)
554
if e.errno == errno.ENOENT:
555
raise NoSuchFile(fullpath)
556
# maybe something better?
557
raise BzrError('cannot add: not a regular file, symlink or directory: %s' % quotefn(f))
559
if not InventoryEntry.versionable_kind(kind):
560
raise BzrError('cannot add: not a versionable file ('
561
'i.e. regular file, symlink or directory): %s' % quotefn(f))
564
file_id = gen_file_id(f)
565
inv.add_path(f, kind=kind, file_id=file_id)
567
mutter("add file %s file_id:{%s} kind=%r" % (f, file_id, kind))
568
self._write_inventory(inv)
571
def add_pending_merge(self, *revision_ids):
572
# TODO: Perhaps should check at this point that the
573
# history of the revision is actually present?
574
p = self.pending_merges()
576
for rev_id in revision_ids:
582
self.set_pending_merges(p)
585
def pending_merges(self):
586
"""Return a list of pending merges.
588
These are revisions that have been merged into the working
589
directory but not yet committed.
592
merges_file = self._control_files.get_utf8('pending-merges')
594
if e.errno != errno.ENOENT:
598
for l in merges_file.readlines():
599
p.append(l.rstrip('\n'))
603
def set_pending_merges(self, rev_list):
604
self._control_files.put_utf8('pending-merges', '\n'.join(rev_list))
607
def set_merge_modified(self, modified_hashes):
609
my_file.write(MERGE_MODIFIED_HEADER_1 + '\n')
610
writer = RioWriter(my_file)
611
for file_id, hash in modified_hashes.iteritems():
612
s = Stanza(file_id=file_id, hash=hash)
613
writer.write_stanza(s)
615
self._control_files.put('merge-hashes', my_file)
618
def merge_modified(self):
620
hashfile = self._control_files.get('merge-hashes')
625
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
626
raise MergeModifiedFormatError()
627
except StopIteration:
628
raise MergeModifiedFormatError()
629
for s in RioReader(hashfile):
630
file_id = s.get("file_id")
632
if hash == self.get_file_sha1(file_id):
633
merge_hashes[file_id] = hash
231
636
def get_symlink_target(self, file_id):
232
637
return os.readlink(self.id2abspath(file_id))
309
715
for ff in descend(fp, f_ie.file_id, fap):
312
for f in descend('', inv.root.file_id, self.basedir):
718
for f in descend(u'', inv.root.file_id, self.basedir):
722
def move(self, from_paths, to_name):
725
to_name must exist in the inventory.
727
If to_name exists and is a directory, the files are moved into
728
it, keeping their old names.
730
Note that to_name is only the last component of the new name;
731
this doesn't change the directory.
733
This returns a list of (from_path, to_path) pairs for each
737
## TODO: Option to move IDs only
738
assert not isinstance(from_paths, basestring)
740
to_abs = self.abspath(to_name)
741
if not isdir(to_abs):
742
raise BzrError("destination %r is not a directory" % to_abs)
743
if not self.has_filename(to_name):
744
raise BzrError("destination %r not in working directory" % to_abs)
745
to_dir_id = inv.path2id(to_name)
746
if to_dir_id == None and to_name != '':
747
raise BzrError("destination %r is not a versioned directory" % to_name)
748
to_dir_ie = inv[to_dir_id]
749
if to_dir_ie.kind not in ('directory', 'root_directory'):
750
raise BzrError("destination %r is not a directory" % to_abs)
752
to_idpath = inv.get_idpath(to_dir_id)
755
if not self.has_filename(f):
756
raise BzrError("%r does not exist in working tree" % f)
757
f_id = inv.path2id(f)
759
raise BzrError("%r is not versioned" % f)
760
name_tail = splitpath(f)[-1]
761
dest_path = appendpath(to_name, name_tail)
762
if self.has_filename(dest_path):
763
raise BzrError("destination %r already exists" % dest_path)
764
if f_id in to_idpath:
765
raise BzrError("can't move %r to a subdirectory of itself" % f)
767
# OK, so there's a race here, it's possible that someone will
768
# create a file in this interval and then the rename might be
769
# left half-done. But we should have caught most problems.
770
orig_inv = deepcopy(self.inventory)
773
name_tail = splitpath(f)[-1]
774
dest_path = appendpath(to_name, name_tail)
775
result.append((f, dest_path))
776
inv.rename(inv.path2id(f), to_dir_id, name_tail)
778
rename(self.abspath(f), self.abspath(dest_path))
780
raise BzrError("failed to rename %r to %r: %s" %
781
(f, dest_path, e[1]),
782
["rename rolled back"])
784
# restore the inventory on error
785
self._set_inventory(orig_inv)
787
self._write_inventory(inv)
791
def rename_one(self, from_rel, to_rel):
794
This can change the directory or the filename or both.
797
if not self.has_filename(from_rel):
798
raise BzrError("can't rename: old working file %r does not exist" % from_rel)
799
if self.has_filename(to_rel):
800
raise BzrError("can't rename: new working file %r already exists" % to_rel)
802
file_id = inv.path2id(from_rel)
804
raise BzrError("can't rename: old name %r is not versioned" % from_rel)
807
from_parent = entry.parent_id
808
from_name = entry.name
810
if inv.path2id(to_rel):
811
raise BzrError("can't rename: new name %r is already versioned" % to_rel)
813
to_dir, to_tail = os.path.split(to_rel)
814
to_dir_id = inv.path2id(to_dir)
815
if to_dir_id == None and to_dir != '':
816
raise BzrError("can't determine destination directory id for %r" % to_dir)
818
mutter("rename_one:")
819
mutter(" file_id {%s}" % file_id)
820
mutter(" from_rel %r" % from_rel)
821
mutter(" to_rel %r" % to_rel)
822
mutter(" to_dir %r" % to_dir)
823
mutter(" to_dir_id {%s}" % to_dir_id)
825
inv.rename(file_id, to_dir_id, to_tail)
827
from_abs = self.abspath(from_rel)
828
to_abs = self.abspath(to_rel)
830
rename(from_abs, to_abs)
832
inv.rename(file_id, from_parent, from_name)
833
raise BzrError("failed to rename %r to %r: %s"
834
% (from_abs, to_abs, e[1]),
835
["rename rolled back"])
836
self._write_inventory(inv)
317
839
def unknowns(self):
840
"""Return all unknown files.
842
These are files in the working directory that are not versioned or
843
control files or ignored.
845
>>> from bzrlib.bzrdir import ScratchDir
846
>>> d = ScratchDir(files=['foo', 'foo~'])
847
>>> b = d.open_branch()
848
>>> tree = d.open_workingtree()
849
>>> map(str, tree.unknowns())
852
>>> list(b.unknowns())
854
>>> tree.remove('foo')
855
>>> list(b.unknowns())
318
858
for subp in self.extras():
319
859
if not self.is_ignored(subp):
449
996
def kind(self, file_id):
450
997
return file_kind(self.id2abspath(file_id))
1000
def last_revision(self):
1001
"""Return the last revision id of this working tree.
1003
In early branch formats this was == the branch last_revision,
1004
but that cannot be relied upon - for working tree operations,
1005
always use tree.last_revision().
1007
return self.branch.last_revision()
452
1009
def lock_read(self):
453
1010
"""See Branch.lock_read, and WorkingTree.unlock."""
454
return self.branch.lock_read()
1011
self.branch.lock_read()
1013
return self._control_files.lock_read()
1015
self.branch.unlock()
456
1018
def lock_write(self):
457
1019
"""See Branch.lock_write, and WorkingTree.unlock."""
458
return self.branch.lock_write()
1020
self.branch.lock_write()
1022
return self._control_files.lock_write()
1024
self.branch.unlock()
1027
def _basis_inventory_name(self, revision_id):
1028
return 'basis-inventory.%s' % revision_id
1031
def set_last_revision(self, new_revision, old_revision=None):
1032
"""Change the last revision in the working tree."""
1033
self._remove_old_basis(old_revision)
1034
if self._change_last_revision(new_revision):
1035
self._cache_basis_inventory(new_revision)
1037
def _change_last_revision(self, new_revision):
1038
"""Template method part of set_last_revision to perform the change."""
1039
if new_revision is None:
1040
self.branch.set_revision_history([])
1042
# current format is locked in with the branch
1043
revision_history = self.branch.revision_history()
1045
position = revision_history.index(new_revision)
1047
raise errors.NoSuchRevision(self.branch, new_revision)
1048
self.branch.set_revision_history(revision_history[:position + 1])
1051
def _cache_basis_inventory(self, new_revision):
1052
"""Cache new_revision as the basis inventory."""
1054
xml = self.branch.repository.get_inventory_xml(new_revision)
1055
path = self._basis_inventory_name(new_revision)
1056
self._control_files.put_utf8(path, xml)
1057
except WeaveRevisionNotPresent:
1060
def _remove_old_basis(self, old_revision):
1061
"""Remove the old basis inventory 'old_revision'."""
1062
if old_revision is not None:
1064
path = self._basis_inventory_name(old_revision)
1065
path = self._control_files._escape(path)
1066
self._control_files._transport.delete(path)
1070
def read_basis_inventory(self, revision_id):
1071
"""Read the cached basis inventory."""
1072
path = self._basis_inventory_name(revision_id)
1073
return self._control_files.get_utf8(path).read()
1076
def read_working_inventory(self):
1077
"""Read the working inventory."""
1078
# ElementTree does its own conversion from UTF-8, so open in
1080
result = bzrlib.xml5.serializer_v5.read_inventory(
1081
self._control_files.get('inventory'))
1082
self._set_inventory(result)
460
1085
@needs_write_lock
461
1086
def remove(self, files, verbose=False):
496
1121
show_status(new_status, inv[fid].kind, quotefn(f))
499
self.branch._write_inventory(inv)
1124
self._write_inventory(inv)
1127
def revert(self, filenames, old_tree=None, backups=True,
1128
pb=DummyProgress()):
1129
from transform import revert
1130
if old_tree is None:
1131
old_tree = self.basis_tree()
1132
revert(self, old_tree, filenames, backups, pb)
1133
if not len(filenames):
1134
self.set_pending_merges([])
1137
def set_inventory(self, new_inventory_list):
1138
from bzrlib.inventory import (Inventory,
1143
inv = Inventory(self.get_root_id())
1144
for path, file_id, parent, kind in new_inventory_list:
1145
name = os.path.basename(path)
1148
# fixme, there should be a factory function inv,add_??
1149
if kind == 'directory':
1150
inv.add(InventoryDirectory(file_id, name, parent))
1151
elif kind == 'file':
1152
inv.add(InventoryFile(file_id, name, parent))
1153
elif kind == 'symlink':
1154
inv.add(InventoryLink(file_id, name, parent))
1156
raise BzrError("unknown kind %r" % kind)
1157
self._write_inventory(inv)
1160
def set_root_id(self, file_id):
1161
"""Set the root id for this tree."""
1162
inv = self.read_working_inventory()
1163
orig_root_id = inv.root.file_id
1164
del inv._byid[inv.root.file_id]
1165
inv.root.file_id = file_id
1166
inv._byid[inv.root.file_id] = inv.root
1169
if entry.parent_id == orig_root_id:
1170
entry.parent_id = inv.root.file_id
1171
self._write_inventory(inv)
501
1173
def unlock(self):
502
1174
"""See Branch.unlock.
507
1179
between multiple working trees, i.e. via shared storage, then we
508
1180
would probably want to lock both the local tree, and the branch.
510
return self.branch.unlock()
1182
# FIXME: We want to write out the hashcache only when the last lock on
1183
# this working copy is released. Peeking at the lock count is a bit
1184
# of a nasty hack; probably it's better to have a transaction object,
1185
# which can do some finalization when it's either successfully or
1186
# unsuccessfully completed. (Denys's original patch did that.)
1187
# RBC 20060206 hookinhg into transaction will couple lock and transaction
1188
# wrongly. Hookinh into unllock on the control files object is fine though.
1190
# TODO: split this per format so there is no ugly if block
1191
if self._hashcache.needs_write and (
1192
# dedicated lock files
1193
self._control_files._lock_count==1 or
1195
(self._control_files is self.branch.control_files and
1196
self._control_files._lock_count==3)):
1197
self._hashcache.write()
1198
# reverse order of locking.
1199
result = self._control_files.unlock()
1201
self.branch.unlock()
1207
"""Update a working tree along its branch.
1209
This will update the branch if its bound too, which means we have multiple trees involved:
1210
The new basis tree of the master.
1211
The old basis tree of the branch.
1212
The old basis tree of the working tree.
1213
The current working tree state.
1214
pathologically all three may be different, and non ancestors of each other.
1215
Conceptually we want to:
1216
Preserve the wt.basis->wt.state changes
1217
Transform the wt.basis to the new master basis.
1218
Apply a merge of the old branch basis to get any 'local' changes from it into the tree.
1219
Restore the wt.basis->wt.state changes.
1221
There isn't a single operation at the moment to do that, so we:
1222
Merge current state -> basis tree of the master w.r.t. the old tree basis.
1223
Do a 'normal' merge of the old branch basis if it is relevant.
1225
old_tip = self.branch.update()
1226
if old_tip is not None:
1227
self.add_pending_merge(old_tip)
1228
self.branch.lock_read()
1231
if self.last_revision() != self.branch.last_revision():
1232
# merge tree state up to new branch tip.
1233
basis = self.basis_tree()
1234
to_tree = self.branch.basis_tree()
1235
result += merge_inner(self.branch,
1239
self.set_last_revision(self.branch.last_revision())
1240
if old_tip and old_tip != self.last_revision():
1241
# our last revision was not the prior branch last reivison
1242
# and we have converted that last revision to a pending merge.
1243
# base is somewhere between the branch tip now
1244
# and the now pending merge
1245
from bzrlib.revision import common_ancestor
1247
base_rev_id = common_ancestor(self.branch.last_revision(),
1249
self.branch.repository)
1250
except errors.NoCommonAncestor:
1252
base_tree = self.branch.repository.revision_tree(base_rev_id)
1253
other_tree = self.branch.repository.revision_tree(old_tip)
1254
result += merge_inner(self.branch,
1260
self.branch.unlock()
1263
def _write_inventory(self, inv):
1264
"""Write inventory as the current inventory."""
1266
bzrlib.xml5.serializer_v5.write_inventory(inv, sio)
1268
self._control_files.put('inventory', sio)
1269
self._set_inventory(inv)
1270
mutter('wrote working inventory')
1273
class WorkingTree3(WorkingTree):
1274
"""This is the Format 3 working tree.
1276
This differs from the base WorkingTree by:
1277
- having its own file lock
1278
- having its own last-revision property.
1280
This is new in bzr 0.8
1284
def last_revision(self):
1285
"""See WorkingTree.last_revision."""
1287
return self._control_files.get_utf8('last-revision').read()
1291
def _change_last_revision(self, revision_id):
1292
"""See WorkingTree._change_last_revision."""
1293
if revision_id is None or revision_id == NULL_REVISION:
1295
self._control_files._transport.delete('last-revision')
1296
except errors.NoSuchFile:
1301
self.branch.revision_history().index(revision_id)
1303
raise errors.NoSuchRevision(self.branch, revision_id)
1304
self._control_files.put_utf8('last-revision', revision_id)
513
1308
CONFLICT_SUFFIXES = ('.THIS', '.BASE', '.OTHER')
515
1310
for suffix in CONFLICT_SUFFIXES:
516
1311
if path.endswith(suffix):
517
1312
return path[:-len(suffix)]
1314
@deprecated_function(zero_eight)
1315
def is_control_file(filename):
1316
"""See WorkingTree.is_control_filename(filename)."""
1317
## FIXME: better check
1318
filename = normpath(filename)
1319
while filename != '':
1320
head, tail = os.path.split(filename)
1321
## mutter('check %r for control file' % ((head, tail),))
1324
if filename == head:
1330
class WorkingTreeFormat(object):
1331
"""An encapsulation of the initialization and open routines for a format.
1333
Formats provide three things:
1334
* An initialization routine,
1338
Formats are placed in an dict by their format string for reference
1339
during workingtree opening. Its not required that these be instances, they
1340
can be classes themselves with class methods - it simply depends on
1341
whether state is needed for a given format or not.
1343
Once a format is deprecated, just deprecate the initialize and open
1344
methods on the format class. Do not deprecate the object, as the
1345
object will be created every time regardless.
1348
_default_format = None
1349
"""The default format used for new trees."""
1352
"""The known formats."""
1355
def find_format(klass, a_bzrdir):
1356
"""Return the format for the working tree object in a_bzrdir."""
1358
transport = a_bzrdir.get_workingtree_transport(None)
1359
format_string = transport.get("format").read()
1360
return klass._formats[format_string]
1362
raise errors.NoWorkingTree(base=transport.base)
1364
raise errors.UnknownFormatError(format_string)
1367
def get_default_format(klass):
1368
"""Return the current default format."""
1369
return klass._default_format
1371
def get_format_string(self):
1372
"""Return the ASCII format string that identifies this format."""
1373
raise NotImplementedError(self.get_format_string)
1375
def is_supported(self):
1376
"""Is this format supported?
1378
Supported formats can be initialized and opened.
1379
Unsupported formats may not support initialization or committing or
1380
some other features depending on the reason for not being supported.
1385
def register_format(klass, format):
1386
klass._formats[format.get_format_string()] = format
1389
def set_default_format(klass, format):
1390
klass._default_format = format
1393
def unregister_format(klass, format):
1394
assert klass._formats[format.get_format_string()] is format
1395
del klass._formats[format.get_format_string()]
1399
class WorkingTreeFormat2(WorkingTreeFormat):
1400
"""The second working tree format.
1402
This format modified the hash cache from the format 1 hash cache.
1405
def initialize(self, a_bzrdir, revision_id=None):
1406
"""See WorkingTreeFormat.initialize()."""
1407
if not isinstance(a_bzrdir.transport, LocalTransport):
1408
raise errors.NotLocalUrl(a_bzrdir.transport.base)
1409
branch = a_bzrdir.open_branch()
1410
if revision_id is not None:
1413
revision_history = branch.revision_history()
1415
position = revision_history.index(revision_id)
1417
raise errors.NoSuchRevision(branch, revision_id)
1418
branch.set_revision_history(revision_history[:position + 1])
1421
revision = branch.last_revision()
1423
wt = WorkingTree(a_bzrdir.root_transport.base,
1429
wt._write_inventory(inv)
1430
wt.set_root_id(inv.root.file_id)
1431
wt.set_last_revision(revision)
1432
wt.set_pending_merges([])
1433
build_tree(wt.basis_tree(), wt)
1437
super(WorkingTreeFormat2, self).__init__()
1438
self._matchingbzrdir = bzrdir.BzrDirFormat6()
1440
def open(self, a_bzrdir, _found=False):
1441
"""Return the WorkingTree object for a_bzrdir
1443
_found is a private parameter, do not use it. It is used to indicate
1444
if format probing has already been done.
1447
# we are being called directly and must probe.
1448
raise NotImplementedError
1449
if not isinstance(a_bzrdir.transport, LocalTransport):
1450
raise errors.NotLocalUrl(a_bzrdir.transport.base)
1451
return WorkingTree(a_bzrdir.root_transport.base,
1457
class WorkingTreeFormat3(WorkingTreeFormat):
1458
"""The second working tree format updated to record a format marker.
1461
- exists within a metadir controlling .bzr
1462
- includes an explicit version marker for the workingtree control
1463
files, separate from the BzrDir format
1464
- modifies the hash cache format
1466
- uses a LockDir to guard access to the repository
1469
def get_format_string(self):
1470
"""See WorkingTreeFormat.get_format_string()."""
1471
return "Bazaar-NG Working Tree format 3"
1473
_lock_file_name = 'lock'
1474
_lock_class = LockDir
1476
def _open_control_files(self, a_bzrdir):
1477
transport = a_bzrdir.get_workingtree_transport(None)
1478
return LockableFiles(transport, self._lock_file_name,
1481
def initialize(self, a_bzrdir, revision_id=None):
1482
"""See WorkingTreeFormat.initialize().
1484
revision_id allows creating a working tree at a differnet
1485
revision than the branch is at.
1487
if not isinstance(a_bzrdir.transport, LocalTransport):
1488
raise errors.NotLocalUrl(a_bzrdir.transport.base)
1489
transport = a_bzrdir.get_workingtree_transport(self)
1490
control_files = self._open_control_files(a_bzrdir)
1491
control_files.create_lock()
1492
control_files.put_utf8('format', self.get_format_string())
1493
branch = a_bzrdir.open_branch()
1494
if revision_id is None:
1495
revision_id = branch.last_revision()
1497
wt = WorkingTree3(a_bzrdir.root_transport.base,
1503
_control_files=control_files)
1504
wt._write_inventory(inv)
1505
wt.set_root_id(inv.root.file_id)
1506
wt.set_last_revision(revision_id)
1507
wt.set_pending_merges([])
1508
build_tree(wt.basis_tree(), wt)
1512
super(WorkingTreeFormat3, self).__init__()
1513
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1515
def open(self, a_bzrdir, _found=False):
1516
"""Return the WorkingTree object for a_bzrdir
1518
_found is a private parameter, do not use it. It is used to indicate
1519
if format probing has already been done.
1522
# we are being called directly and must probe.
1523
raise NotImplementedError
1524
if not isinstance(a_bzrdir.transport, LocalTransport):
1525
raise errors.NotLocalUrl(a_bzrdir.transport.base)
1526
control_files = self._open_control_files(a_bzrdir)
1527
return WorkingTree3(a_bzrdir.root_transport.base,
1531
_control_files=control_files)
1534
return self.get_format_string()
1537
# formats which have no format string are not discoverable
1538
# and not independently creatable, so are not registered.
1539
__default_format = WorkingTreeFormat3()
1540
WorkingTreeFormat.register_format(__default_format)
1541
WorkingTreeFormat.set_default_format(__default_format)
1542
_legacy_formats = [WorkingTreeFormat2(),
1546
class WorkingTreeTestProviderAdapter(object):
1547
"""A tool to generate a suite testing multiple workingtree formats at once.
1549
This is done by copying the test once for each transport and injecting
1550
the transport_server, transport_readonly_server, and workingtree_format
1551
classes into each copy. Each copy is also given a new id() to make it
1555
def __init__(self, transport_server, transport_readonly_server, formats):
1556
self._transport_server = transport_server
1557
self._transport_readonly_server = transport_readonly_server
1558
self._formats = formats
1560
def adapt(self, test):
1561
from bzrlib.tests import TestSuite
1562
result = TestSuite()
1563
for workingtree_format, bzrdir_format in self._formats:
1564
new_test = deepcopy(test)
1565
new_test.transport_server = self._transport_server
1566
new_test.transport_readonly_server = self._transport_readonly_server
1567
new_test.bzrdir_format = bzrdir_format
1568
new_test.workingtree_format = workingtree_format
1569
def make_new_test_id():
1570
new_id = "%s(%s)" % (new_test.id(), workingtree_format.__class__.__name__)
1571
return lambda: new_id
1572
new_test.id = make_new_test_id()
1573
result.addTest(new_test)
added
removed
bzrlib/workingtree.py
