91
82
supports_executable,
93
from bzrlib.progress import DummyProgress, ProgressPhase
84
from bzrlib.progress import DummyProgress
94
85
from bzrlib.revision import NULL_REVISION
95
import bzrlib.revisiontree
96
from bzrlib.rio import RioReader, rio_file, Stanza
97
from bzrlib.symbol_versioning import (deprecated_passed,
100
DEPRECATED_PARAMETER,
104
from bzrlib.trace import mutter, note
86
from bzrlib.symbol_versioning import *
87
from bzrlib.textui import show_status
89
from bzrlib.trace import mutter
105
90
from bzrlib.transform import build_tree
106
91
from bzrlib.transport import get_transport
107
92
from bzrlib.transport.local import LocalTransport
108
from bzrlib.textui import show_status
110
94
import bzrlib.xml5
113
# the regex removes any weird characters; we don't escape them
114
# but rather just pull them out
115
_gen_file_id_re = re.compile(r'[^\w.]')
116
_gen_id_suffix = None
120
def _next_id_suffix():
121
"""Create a new file id suffix that is reasonably unique.
123
On the first call we combine the current time with 64 bits of randomness
124
to give a highly probably globally unique number. Then each call in the same
125
process adds 1 to a serial number we append to that unique value.
127
# XXX TODO: change bzrlib.add.smart_add to call workingtree.add() rather
128
# than having to move the id randomness out of the inner loop like this.
129
# XXX TODO: for the global randomness this uses we should add the thread-id
130
# before the serial #.
131
global _gen_id_suffix, _gen_id_serial
132
if _gen_id_suffix is None:
133
_gen_id_suffix = "-%s-%s-" % (compact_date(time()), rand_chars(16))
135
return _gen_id_suffix + str(_gen_id_serial)
138
97
def gen_file_id(name):
139
"""Return new file id for the basename 'name'.
141
The uniqueness is supplied from _next_id_suffix.
143
# The real randomness is in the _next_id_suffix, the
144
# rest of the identifier is just to be nice.
146
# 1) Remove non-ascii word characters to keep the ids portable
147
# 2) squash to lowercase, so the file id doesn't have to
148
# be escaped (case insensitive filesystems would bork for ids
149
# that only differred in case without escaping).
150
# 3) truncate the filename to 20 chars. Long filenames also bork on some
152
# 4) Removing starting '.' characters to prevent the file ids from
153
# being considered hidden.
154
ascii_word_only = _gen_file_id_re.sub('', name.lower())
155
short_no_dots = ascii_word_only.lstrip('.')[:20]
156
return short_no_dots + _next_id_suffix()
98
"""Return new file id.
100
This should probably generate proper UUIDs, but for the moment we
101
cope with just randomness because running uuidgen every time is
104
from binascii import hexlify
105
from time import time
108
idx = name.rfind('/')
110
name = name[idx+1 : ]
111
idx = name.rfind('\\')
113
name = name[idx+1 : ]
115
# make it not a hidden file
116
name = name.lstrip('.')
118
# remove any wierd characters; we don't escape them but rather
120
name = re.sub(r'[^\w.]', '', name)
122
s = hexlify(rand_bytes(8))
123
return '-'.join((name, compact_date(time()), s))
159
126
def gen_root_id():
264
231
mutter("opening working tree %r", basedir)
265
232
if deprecated_passed(branch):
266
233
if not _internal:
267
warnings.warn("WorkingTree(..., branch=XXX) is deprecated as of bzr 0.8."
268
" Please use bzrdir.open_workingtree() or"
269
" WorkingTree.open().",
234
warn("WorkingTree(..., branch=XXX) is deprecated as of bzr 0.8."
235
" Please use bzrdir.open_workingtree() or WorkingTree.open().",
270
236
DeprecationWarning,
273
self._branch = branch
275
self._branch = self.bzrdir.open_branch()
241
self.branch = self.bzrdir.open_branch()
242
assert isinstance(self.branch, Branch), \
243
"branch %r is not a Branch" % self.branch
276
244
self.basedir = realpath(basedir)
277
245
# if branch is at our basedir and is a format 6 or less
278
246
if isinstance(self._format, WorkingTreeFormat2):
279
247
# share control object
280
248
self._control_files = self.branch.control_files
249
elif _control_files is not None:
250
assert False, "not done yet"
251
# self._control_files = _control_files
282
# assume all other formats have their own control files.
283
assert isinstance(_control_files, LockableFiles), \
284
"_control_files must be a LockableFiles, not %r" \
286
self._control_files = _control_files
253
# only ready for format 3
254
assert isinstance(self._format, WorkingTreeFormat3)
255
self._control_files = LockableFiles(
256
self.bzrdir.get_workingtree_transport(None),
287
259
# update the whole cache up front and write to disk if anything changed;
288
260
# in the future we might want to do this more selectively
289
261
# two possible ways offer themselves : in self._unlock, write the cache
290
262
# if needed, or, when the cache sees a change, append it to the hash
291
263
# cache file, and have the parser take the most recent entry for a
292
264
# given path only.
293
cache_filename = self.bzrdir.get_workingtree_transport(None).local_abspath('stat-cache')
265
cache_filename = self.bzrdir.get_workingtree_transport(None).abspath('stat-cache')
294
266
hc = self._hashcache = HashCache(basedir, cache_filename, self._control_files._file_mode)
296
268
# is this scan needed ? it makes things kinda slow.
299
271
if hc.needs_write:
300
272
mutter("write hc")
562
484
return os.path.getsize(self.id2abspath(file_id))
565
def get_file_sha1(self, file_id, path=None):
567
path = self._inventory.id2path(file_id)
487
def get_file_sha1(self, file_id):
488
path = self._inventory.id2path(file_id)
568
489
return self._hashcache.get_sha1(path)
570
def get_file_mtime(self, file_id, path=None):
572
path = self._inventory.id2path(file_id)
573
return os.lstat(self.abspath(path)).st_mtime
575
if not supports_executable():
576
def is_executable(self, file_id, path=None):
491
def is_executable(self, file_id):
492
if not supports_executable():
577
493
return self._inventory[file_id].executable
579
def is_executable(self, file_id, path=None):
581
path = self._inventory.id2path(file_id)
495
path = self._inventory.id2path(file_id)
582
496
mode = os.lstat(self.abspath(path)).st_mode
583
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
497
return bool(stat.S_ISREG(mode) and stat.S_IEXEC&mode)
585
499
@needs_write_lock
586
def _add(self, files, ids, kinds):
587
"""See MutableTree._add."""
500
def add(self, files, ids=None):
501
"""Make files versioned.
503
Note that the command line normally calls smart_add instead,
504
which can automatically recurse.
506
This adds the files to the inventory, so that they will be
507
recorded by the next commit.
510
List of paths to add, relative to the base of the tree.
513
If set, use these instead of automatically generated ids.
514
Must be the same length as the list of files, but may
515
contain None for ids that are to be autogenerated.
517
TODO: Perhaps have an option to add the ids even if the files do
520
TODO: Perhaps callback with the ids and paths as they're added.
588
522
# TODO: Re-adding a file that is removed in the working copy
589
523
# should probably put it back with the previous ID.
590
# the read and write working inventory should not occur in this
591
# function - they should be part of lock_write and unlock.
524
if isinstance(files, basestring):
525
assert(ids is None or isinstance(ids, basestring))
531
ids = [None] * len(files)
533
assert(len(ids) == len(files))
592
535
inv = self.read_working_inventory()
593
for f, file_id, kind in zip(files, ids, kinds):
594
assert kind is not None
536
for f,file_id in zip(files, ids):
537
if self.is_control_filename(f):
538
raise BzrError("cannot add control file %s" % quotefn(f))
543
raise BzrError("cannot add top-level %r" % f)
545
fullpath = normpath(self.abspath(f))
548
kind = file_kind(fullpath)
550
if e.errno == errno.ENOENT:
551
raise NoSuchFile(fullpath)
552
# maybe something better?
553
raise BzrError('cannot add: not a regular file, symlink or directory: %s' % quotefn(f))
555
if not InventoryEntry.versionable_kind(kind):
556
raise BzrError('cannot add: not a versionable file ('
557
'i.e. regular file, symlink or directory): %s' % quotefn(f))
595
559
if file_id is None:
596
inv.add_path(f, kind=kind)
598
inv.add_path(f, kind=kind, file_id=file_id)
560
file_id = gen_file_id(f)
561
inv.add_path(f, kind=kind, file_id=file_id)
563
mutter("add file %s file_id:{%s} kind=%r" % (f, file_id, kind))
599
564
self._write_inventory(inv)
601
@needs_tree_write_lock
602
def _gather_kinds(self, files, kinds):
603
"""See MutableTree._gather_kinds."""
604
for pos, f in enumerate(files):
605
if kinds[pos] is None:
606
fullpath = normpath(self.abspath(f))
608
kinds[pos] = file_kind(fullpath)
610
if e.errno == errno.ENOENT:
611
raise NoSuchFile(fullpath)
613
566
@needs_write_lock
614
def add_parent_tree_id(self, revision_id, allow_leftmost_as_ghost=False):
615
"""Add revision_id as a parent.
617
This is equivalent to retrieving the current list of parent ids
618
and setting the list to its value plus revision_id.
620
:param revision_id: The revision id to add to the parent list. It may
621
be a ghost revision as long as its not the first parent to be added,
622
or the allow_leftmost_as_ghost parameter is set True.
623
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
625
parents = self.get_parent_ids() + [revision_id]
626
self.set_parent_ids(parents,
627
allow_leftmost_as_ghost=len(parents) > 1 or allow_leftmost_as_ghost)
629
@needs_tree_write_lock
630
def add_parent_tree(self, parent_tuple, allow_leftmost_as_ghost=False):
631
"""Add revision_id, tree tuple as a parent.
633
This is equivalent to retrieving the current list of parent trees
634
and setting the list to its value plus parent_tuple. See also
635
add_parent_tree_id - if you only have a parent id available it will be
636
simpler to use that api. If you have the parent already available, using
637
this api is preferred.
639
:param parent_tuple: The (revision id, tree) to add to the parent list.
640
If the revision_id is a ghost, pass None for the tree.
641
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
643
parent_ids = self.get_parent_ids() + [parent_tuple[0]]
644
if len(parent_ids) > 1:
645
# the leftmost may have already been a ghost, preserve that if it
647
allow_leftmost_as_ghost = True
648
self.set_parent_ids(parent_ids,
649
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
651
@needs_tree_write_lock
652
567
def add_pending_merge(self, *revision_ids):
653
568
# TODO: Perhaps should check at this point that the
654
569
# history of the revision is actually present?
655
parents = self.get_parent_ids()
570
p = self.pending_merges()
657
572
for rev_id in revision_ids:
658
if rev_id in parents:
660
parents.append(rev_id)
663
self.set_parent_ids(parents, allow_leftmost_as_ghost=True)
578
self.set_pending_merges(p)
665
@deprecated_method(zero_eleven)
667
581
def pending_merges(self):
668
582
"""Return a list of pending merges.
670
584
These are revisions that have been merged into the working
671
585
directory but not yet committed.
673
As of 0.11 this is deprecated. Please see WorkingTree.get_parent_ids()
674
instead - which is available on all tree objects.
676
return self.get_parent_ids()[1:]
678
@needs_tree_write_lock
679
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
680
"""Set the parent ids to revision_ids.
682
See also set_parent_trees. This api will try to retrieve the tree data
683
for each element of revision_ids from the trees repository. If you have
684
tree data already available, it is more efficient to use
685
set_parent_trees rather than set_parent_ids. set_parent_ids is however
686
an easier API to use.
688
:param revision_ids: The revision_ids to set as the parent ids of this
689
working tree. Any of these may be ghosts.
691
if len(revision_ids) > 0:
692
leftmost_id = revision_ids[0]
693
if (not allow_leftmost_as_ghost and not
694
self.branch.repository.has_revision(leftmost_id)):
695
raise errors.GhostRevisionUnusableHere(leftmost_id)
696
self.set_last_revision(leftmost_id)
698
self.set_last_revision(None)
699
merges = revision_ids[1:]
700
self._control_files.put_utf8('pending-merges', '\n'.join(merges))
702
@needs_tree_write_lock
703
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
704
"""See MutableTree.set_parent_trees."""
705
# parent trees are not used in current format trees, delegate to
707
self.set_parent_ids([rev for (rev, tree) in parents_list],
708
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
710
@needs_tree_write_lock
588
merges_file = self._control_files.get_utf8('pending-merges')
590
if e.errno != errno.ENOENT:
594
for l in merges_file.readlines():
595
p.append(l.rstrip('\n'))
711
599
def set_pending_merges(self, rev_list):
712
parents = self.get_parent_ids()
713
leftmost = parents[:1]
714
new_parents = leftmost + rev_list
715
self.set_parent_ids(new_parents)
717
@needs_tree_write_lock
718
def set_merge_modified(self, modified_hashes):
720
for file_id, hash in modified_hashes.iteritems():
721
yield Stanza(file_id=file_id, hash=hash)
722
self._put_rio('merge-hashes', iter_stanzas(), MERGE_MODIFIED_HEADER_1)
724
@needs_tree_write_lock
725
def _put_rio(self, filename, stanzas, header):
726
my_file = rio_file(stanzas, header)
727
self._control_files.put(filename, my_file)
729
@needs_write_lock # because merge pulls data into the branch.
730
def merge_from_branch(self, branch, to_revision=None):
731
"""Merge from a branch into this working tree.
733
:param branch: The branch to merge from.
734
:param to_revision: If non-None, the merge will merge to to_revision, but
735
not beyond it. to_revision does not need to be in the history of
736
the branch when it is supplied. If None, to_revision defaults to
737
branch.last_revision().
739
from bzrlib.merge import Merger, Merge3Merger
740
pb = bzrlib.ui.ui_factory.nested_progress_bar()
742
merger = Merger(self.branch, this_tree=self, pb=pb)
743
merger.pp = ProgressPhase("Merge phase", 5, pb)
744
merger.pp.next_phase()
745
# check that there are no
747
merger.check_basis(check_clean=True, require_commits=False)
748
if to_revision is None:
749
to_revision = branch.last_revision()
750
merger.other_rev_id = to_revision
751
if merger.other_rev_id is None:
752
raise error.NoCommits(branch)
753
self.branch.fetch(branch, last_revision=merger.other_rev_id)
754
merger.other_basis = merger.other_rev_id
755
merger.other_tree = self.branch.repository.revision_tree(
757
merger.pp.next_phase()
759
if merger.base_rev_id == merger.other_rev_id:
760
raise errors.PointlessMerge
761
merger.backup_files = False
762
merger.merge_type = Merge3Merger
763
merger.set_interesting_files(None)
764
merger.show_base = False
765
merger.reprocess = False
766
conflicts = merger.do_merge()
773
def merge_modified(self):
775
hashfile = self._control_files.get('merge-hashes')
780
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
781
raise MergeModifiedFormatError()
782
except StopIteration:
783
raise MergeModifiedFormatError()
784
for s in RioReader(hashfile):
785
file_id = s.get("file_id")
786
if file_id not in self.inventory:
789
if hash == self.get_file_sha1(file_id):
790
merge_hashes[file_id] = hash
794
def mkdir(self, path, file_id=None):
795
"""See MutableTree.mkdir()."""
797
file_id = gen_file_id(os.path.basename(path))
798
os.mkdir(self.abspath(path))
799
self.add(path, file_id, 'directory')
600
self._control_files.put_utf8('pending-merges', '\n'.join(rev_list))
802
602
def get_symlink_target(self, file_id):
803
603
return os.readlink(self.id2abspath(file_id))
821
621
Skips the control directory.
823
623
inv = self._inventory
824
# Convert these into local objects to save lookup times
825
pathjoin = osutils.pathjoin
826
file_kind = osutils.file_kind
828
# transport.base ends in a slash, we want the piece
829
# between the last two slashes
830
transport_base_dir = self.bzrdir.transport.base.rsplit('/', 2)[1]
832
fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
834
# directory file_id, relative path, absolute path, reverse sorted children
835
children = os.listdir(self.basedir)
837
# jam 20060527 The kernel sized tree seems equivalent whether we
838
# use a deque and popleft to keep them sorted, or if we use a plain
839
# list and just reverse() them.
840
children = collections.deque(children)
841
stack = [(inv.root.file_id, u'', self.basedir, children)]
843
from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
846
f = children.popleft()
625
def descend(from_dir_relpath, from_dir_id, dp):
847
629
## TODO: If we find a subdirectory with its own .bzr
848
630
## directory, then that is a separate tree and we
849
631
## should exclude it.
851
633
# the bzrdir for this tree
852
if transport_base_dir == f:
634
if self.bzrdir.transport.base.endswith(f + '/'):
855
# we know that from_dir_relpath and from_dir_abspath never end in a slash
856
# and 'f' doesn't begin with one, we can do a string op, rather
857
# than the checks of pathjoin(), all relative paths will have an extra slash
859
fp = from_dir_relpath + '/' + f
638
fp = appendpath(from_dir_relpath, f)
862
fap = from_dir_abspath + '/' + f
641
fap = appendpath(dp, f)
864
643
f_ie = inv.get_child(from_dir_id, f)
867
elif self.is_ignored(fp[1:]):
646
elif self.is_ignored(fp):
870
# we may not have found this file, because of a unicode issue
871
f_norm, can_access = osutils.normalized_filename(f)
872
if f == f_norm or not can_access:
873
# No change, so treat this file normally
876
# this file can be accessed by a normalized path
877
# check again if it is versioned
878
# these lines are repeated here for performance
880
fp = from_dir_relpath + '/' + f
881
fap = from_dir_abspath + '/' + f
882
f_ie = inv.get_child(from_dir_id, f)
885
elif self.is_ignored(fp[1:]):
890
651
fk = file_kind(fap)
1166
880
for subf in os.listdir(dirabs):
1169
if subf not in dir_entry.children:
1170
subf_norm, can_access = osutils.normalized_filename(subf)
1171
if subf_norm != subf and can_access:
1172
if subf_norm not in dir_entry.children:
1173
fl.append(subf_norm)
882
and (subf not in dir_entry.children)):
1179
subp = pathjoin(path, subf)
887
subp = appendpath(path, subf)
1182
def _translate_ignore_rule(self, rule):
1183
"""Translate a single ignore rule to a regex.
1185
There are two types of ignore rules. Those that do not contain a / are
1186
matched against the tail of the filename (that is, they do not care
1187
what directory the file is in.) Rules which do contain a slash must
1188
match the entire path. As a special case, './' at the start of the
1189
string counts as a slash in the string but is removed before matching
1190
(e.g. ./foo.c, ./src/foo.c)
1192
:return: The translated regex.
1194
if rule[:2] in ('./', '.\\'):
1196
result = fnmatch.translate(rule[2:])
1197
elif '/' in rule or '\\' in rule:
1199
result = fnmatch.translate(rule)
1201
# default rule style.
1202
result = "(?:.*/)?(?!.*/)" + fnmatch.translate(rule)
1203
assert result[-1] == '$', "fnmatch.translate did not add the expected $"
1204
return "(" + result + ")"
1206
def _combine_ignore_rules(self, rules):
1207
"""Combine a list of ignore rules into a single regex object.
1209
Each individual rule is combined with | to form a big regex, which then
1210
has $ added to it to form something like ()|()|()$. The group index for
1211
each subregex's outermost group is placed in a dictionary mapping back
1212
to the rule. This allows quick identification of the matching rule that
1214
:return: a list of the compiled regex and the matching-group index
1215
dictionaries. We return a list because python complains if you try to
1216
combine more than 100 regexes.
1221
translated_rules = []
1223
translated_rule = self._translate_ignore_rule(rule)
1224
compiled_rule = re.compile(translated_rule)
1225
groups[next_group] = rule
1226
next_group += compiled_rule.groups
1227
translated_rules.append(translated_rule)
1228
if next_group == 99:
1229
result.append((re.compile("|".join(translated_rules)), groups))
1232
translated_rules = []
1233
if len(translated_rules):
1234
result.append((re.compile("|".join(translated_rules)), groups))
1237
891
def ignored_files(self):
1238
892
"""Yield list of PATH, IGNORE_PATTERN"""
1239
893
for subp in self.extras():
1240
894
pat = self.is_ignored(subp)
1244
899
def get_ignore_list(self):
1245
900
"""Return list of ignore patterns.
1247
902
Cached in the Tree object after the first call.
1249
ignoreset = getattr(self, '_ignoreset', None)
1250
if ignoreset is not None:
1253
ignore_globs = set(bzrlib.DEFAULT_IGNORE)
1254
ignore_globs.update(ignores.get_runtime_ignores())
1256
ignore_globs.update(ignores.get_user_ignores())
904
if hasattr(self, '_ignorelist'):
905
return self._ignorelist
907
l = bzrlib.DEFAULT_IGNORE[:]
1258
908
if self.has_filename(bzrlib.IGNORE_FILENAME):
1259
909
f = self.get_file_byname(bzrlib.IGNORE_FILENAME)
1261
ignore_globs.update(ignores.parse_ignore_file(f))
1265
self._ignoreset = ignore_globs
1266
self._ignore_regex = self._combine_ignore_rules(ignore_globs)
1269
def _get_ignore_rules_as_regex(self):
1270
"""Return a regex of the ignore rules and a mapping dict.
1272
:return: (ignore rules compiled regex, dictionary mapping rule group
1273
indices to original rule.)
1275
if getattr(self, '_ignoreset', None) is None:
1276
self.get_ignore_list()
1277
return self._ignore_regex
910
l.extend([line.rstrip("\n\r") for line in f.readlines()])
1279
915
def is_ignored(self, filename):
1280
916
r"""Check whether the filename matches an ignore pattern.
1355
981
self.branch.unlock()
1358
def get_physical_lock_status(self):
1359
return self._control_files.get_physical_lock_status()
1361
def _basis_inventory_name(self):
1362
return 'basis-inventory-cache'
1364
@needs_tree_write_lock
1365
def set_last_revision(self, new_revision):
984
def _basis_inventory_name(self, revision_id):
985
return 'basis-inventory.%s' % revision_id
988
def set_last_revision(self, new_revision, old_revision=None):
1366
989
"""Change the last revision in the working tree."""
990
self._remove_old_basis(old_revision)
1367
991
if self._change_last_revision(new_revision):
1368
992
self._cache_basis_inventory(new_revision)
1370
994
def _change_last_revision(self, new_revision):
1371
"""Template method part of set_last_revision to perform the change.
1373
This is used to allow WorkingTree3 instances to not affect branch
1374
when their last revision is set.
995
"""Template method part of set_last_revision to perform the change."""
1376
996
if new_revision is None:
1377
997
self.branch.set_revision_history([])
999
# current format is locked in with the branch
1000
revision_history = self.branch.revision_history()
1380
self.branch.generate_revision_history(new_revision)
1381
except errors.NoSuchRevision:
1382
# not present in the repo - dont try to set it deeper than the tip
1383
self.branch.set_revision_history([new_revision])
1002
position = revision_history.index(new_revision)
1004
raise errors.NoSuchRevision(self.branch, new_revision)
1005
self.branch.set_revision_history(revision_history[:position + 1])
1386
1008
def _cache_basis_inventory(self, new_revision):
1387
1009
"""Cache new_revision as the basis inventory."""
1388
# TODO: this should allow the ready-to-use inventory to be passed in,
1389
# as commit already has that ready-to-use [while the format is the
1392
# this double handles the inventory - unpack and repack -
1393
# but is easier to understand. We can/should put a conditional
1394
# in here based on whether the inventory is in the latest format
1395
# - perhaps we should repack all inventories on a repository
1397
# the fast path is to copy the raw xml from the repository. If the
1398
# xml contains 'revision_id="', then we assume the right
1399
# revision_id is set. We must check for this full string, because a
1400
# root node id can legitimately look like 'revision_id' but cannot
1402
1011
xml = self.branch.repository.get_inventory_xml(new_revision)
1403
firstline = xml.split('\n', 1)[0]
1404
if (not 'revision_id="' in firstline or
1405
'format="6"' not in firstline):
1406
inv = self.branch.repository.deserialise_inventory(
1408
inv.revision_id = new_revision
1409
xml = bzrlib.xml6.serializer_v6.write_inventory_to_string(inv)
1410
assert isinstance(xml, str), 'serialised xml must be bytestring.'
1411
path = self._basis_inventory_name()
1413
self._control_files.put(path, sio)
1414
except (errors.NoSuchRevision, errors.RevisionNotPresent):
1012
path = self._basis_inventory_name(new_revision)
1013
self._control_files.put_utf8(path, xml)
1014
except WeaveRevisionNotPresent:
1417
def read_basis_inventory(self):
1017
def _remove_old_basis(self, old_revision):
1018
"""Remove the old basis inventory 'old_revision'."""
1019
if old_revision is not None:
1021
path = self._basis_inventory_name(old_revision)
1022
path = self._control_files._escape(path)
1023
self._control_files._transport.delete(path)
1027
def read_basis_inventory(self, revision_id):
1418
1028
"""Read the cached basis inventory."""
1419
path = self._basis_inventory_name()
1420
return self._control_files.get(path).read()
1029
path = self._basis_inventory_name(revision_id)
1030
return self._control_files.get_utf8(path).read()
1422
1032
@needs_read_lock
1423
1033
def read_working_inventory(self):
1532
1136
between multiple working trees, i.e. via shared storage, then we
1533
1137
would probably want to lock both the local tree, and the branch.
1535
raise NotImplementedError(self.unlock)
1139
# FIXME: We want to write out the hashcache only when the last lock on
1140
# this working copy is released. Peeking at the lock count is a bit
1141
# of a nasty hack; probably it's better to have a transaction object,
1142
# which can do some finalization when it's either successfully or
1143
# unsuccessfully completed. (Denys's original patch did that.)
1144
# RBC 20060206 hookinhg into transaction will couple lock and transaction
1145
# wrongly. Hookinh into unllock on the control files object is fine though.
1147
# TODO: split this per format so there is no ugly if block
1148
if self._hashcache.needs_write and (
1149
# dedicated lock files
1150
self._control_files._lock_count==1 or
1152
(self._control_files is self.branch.control_files and
1153
self._control_files._lock_count==3)):
1154
self._hashcache.write()
1155
# reverse order of locking.
1156
result = self._control_files.unlock()
1158
self.branch.unlock()
1537
1162
@needs_write_lock
1538
1163
def update(self):
1539
"""Update a working tree along its branch.
1541
This will update the branch if its bound too, which means we have multiple trees involved:
1542
The new basis tree of the master.
1543
The old basis tree of the branch.
1544
The old basis tree of the working tree.
1545
The current working tree state.
1546
pathologically all three may be different, and non ancestors of each other.
1547
Conceptually we want to:
1548
Preserve the wt.basis->wt.state changes
1549
Transform the wt.basis to the new master basis.
1550
Apply a merge of the old branch basis to get any 'local' changes from it into the tree.
1551
Restore the wt.basis->wt.state changes.
1553
There isn't a single operation at the moment to do that, so we:
1554
Merge current state -> basis tree of the master w.r.t. the old tree basis.
1555
Do a 'normal' merge of the old branch basis if it is relevant.
1557
old_tip = self.branch.update()
1558
# here if old_tip is not None, it is the old tip of the branch before
1559
# it was updated from the master branch. This should become a pending
1560
# merge in the working tree to preserve the user existing work. we
1561
# cant set that until we update the working trees last revision to be
1562
# one from the new branch, because it will just get absorbed by the
1563
# parent de-duplication logic.
1565
# We MUST save it even if an error occurs, because otherwise the users
1566
# local work is unreferenced and will appear to have been lost.
1164
self.branch.lock_read()
1570
last_rev = self.get_parent_ids()[0]
1573
if last_rev != self.branch.last_revision():
1574
# merge tree state up to new branch tip.
1166
if self.last_revision() == self.branch.last_revision():
1575
1168
basis = self.basis_tree()
1576
1169
to_tree = self.branch.basis_tree()
1577
result += merge_inner(self.branch,
1581
# TODO - dedup parents list with things merged by pull ?
1582
# reuse the tree we've updated to to set the basis:
1583
parent_trees = [(self.branch.last_revision(), to_tree)]
1584
merges = self.get_parent_ids()[1:]
1585
# Ideally we ask the tree for the trees here, that way the working
1586
# tree can decide whether to give us teh entire tree or give us a
1587
# lazy initialised tree. dirstate for instance will have the trees
1588
# in ram already, whereas a last-revision + basis-inventory tree
1589
# will not, but also does not need them when setting parents.
1590
for parent in merges:
1591
parent_trees.append(
1592
(parent, self.branch.repository.revision_tree(parent)))
1593
if old_tip is not None:
1594
parent_trees.append(
1595
(old_tip, self.branch.repository.revision_tree(old_tip)))
1596
self.set_parent_trees(parent_trees)
1597
last_rev = parent_trees[0][0]
1599
# the working tree had the same last-revision as the master
1600
# branch did. We may still have pivot local work from the local
1601
# branch into old_tip:
1602
if old_tip is not None:
1603
self.add_parent_tree_id(old_tip)
1604
if old_tip and old_tip != last_rev:
1605
# our last revision was not the prior branch last revision
1606
# and we have converted that last revision to a pending merge.
1607
# base is somewhere between the branch tip now
1608
# and the now pending merge
1609
from bzrlib.revision import common_ancestor
1611
base_rev_id = common_ancestor(self.branch.last_revision(),
1613
self.branch.repository)
1614
except errors.NoCommonAncestor:
1616
base_tree = self.branch.repository.revision_tree(base_rev_id)
1617
other_tree = self.branch.repository.revision_tree(old_tip)
1618
result += merge_inner(self.branch,
1170
result = merge_inner(self.branch,
1174
self.set_last_revision(self.branch.last_revision())
1177
self.branch.unlock()
1624
@needs_tree_write_lock
1625
1180
def _write_inventory(self, inv):
1626
1181
"""Write inventory as the current inventory."""
1627
1182
sio = StringIO()
1935
1372
class WorkingTreeFormat3(WorkingTreeFormat):
1936
1373
"""The second working tree format updated to record a format marker.
1939
- exists within a metadir controlling .bzr
1940
- includes an explicit version marker for the workingtree control
1941
files, separate from the BzrDir format
1942
- modifies the hash cache format
1944
- uses a LockDir to guard access for writes.
1375
This format modified the hash cache from the format 1 hash cache.
1947
1378
def get_format_string(self):
1948
1379
"""See WorkingTreeFormat.get_format_string()."""
1949
1380
return "Bazaar-NG Working Tree format 3"
1951
def get_format_description(self):
1952
"""See WorkingTreeFormat.get_format_description()."""
1953
return "Working tree format 3"
1955
_lock_file_name = 'lock'
1956
_lock_class = LockDir
1958
def _open_control_files(self, a_bzrdir):
1959
transport = a_bzrdir.get_workingtree_transport(None)
1960
return LockableFiles(transport, self._lock_file_name,
1963
1382
def initialize(self, a_bzrdir, revision_id=None):
1964
1383
"""See WorkingTreeFormat.initialize().
1966
revision_id allows creating a working tree at a different
1385
revision_id allows creating a working tree at a differnet
1967
1386
revision than the branch is at.
1969
1388
if not isinstance(a_bzrdir.transport, LocalTransport):
1970
1389
raise errors.NotLocalUrl(a_bzrdir.transport.base)
1971
1390
transport = a_bzrdir.get_workingtree_transport(self)
1972
control_files = self._open_control_files(a_bzrdir)
1973
control_files.create_lock()
1974
control_files.lock_write()
1391
control_files = LockableFiles(transport, 'lock')
1975
1392
control_files.put_utf8('format', self.get_format_string())
1976
1393
branch = a_bzrdir.open_branch()
1977
1394
if revision_id is None:
1978
1395
revision_id = branch.last_revision()
1979
1396
inv = Inventory()
1980
wt = WorkingTree3(a_bzrdir.root_transport.local_abspath('.'),
1397
wt = WorkingTree3(a_bzrdir.root_transport.base,
1983
1400
_internal=True,
1986
_control_files=control_files)
1987
wt.lock_tree_write()
1989
wt._write_inventory(inv)
1990
wt.set_root_id(inv.root.file_id)
1991
basis_tree = branch.repository.revision_tree(revision_id)
1992
if revision_id == bzrlib.revision.NULL_REVISION:
1993
wt.set_parent_trees([])
1995
wt.set_parent_trees([(revision_id, basis_tree)])
1996
build_tree(basis_tree, wt)
1999
control_files.unlock()
1403
wt._write_inventory(inv)
1404
wt.set_root_id(inv.root.file_id)
1405
wt.set_last_revision(revision_id)
1406
wt.set_pending_merges([])
1407
build_tree(wt.basis_tree(), wt)
2002
1410
def __init__(self):