1
1
# Copyright (C) 2005, 2006 Canonical Ltd
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
11
# GNU General Public License for more details.
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
39
39
# At the moment they may alias the inventory and have old copies of it in
40
40
# memory. (Now done? -- mbp 20060309)
42
from binascii import hexlify
42
44
from copy import deepcopy
43
45
from cStringIO import StringIO
55
from bzrlib import bzrdir, errors, ignores, osutils, urlutils
50
56
from bzrlib.atomicfile import AtomicFile
51
from bzrlib.branch import (Branch,
53
58
from bzrlib.conflicts import Conflict, ConflictList, CONFLICT_SUFFIXES
54
import bzrlib.bzrdir as bzrdir
55
59
from bzrlib.decorators import needs_read_lock, needs_write_lock
56
import bzrlib.errors as errors
57
60
from bzrlib.errors import (BzrCheckError,
59
62
ConflictFormatError,
61
63
WeaveRevisionNotPresent,
90
91
from bzrlib.progress import DummyProgress, ProgressPhase
91
92
from bzrlib.revision import NULL_REVISION
92
93
from bzrlib.rio import RioReader, rio_file, Stanza
93
from bzrlib.symbol_versioning import *
94
from bzrlib.textui import show_status
94
from bzrlib.symbol_versioning import (deprecated_passed,
100
from bzrlib.trace import mutter, note
96
101
from bzrlib.transform import build_tree
97
from bzrlib.trace import mutter, note
98
102
from bzrlib.transport import get_transport
99
103
from bzrlib.transport.local import LocalTransport
104
from bzrlib.textui import show_status
101
107
import bzrlib.xml5
110
# the regex removes any weird characters; we don't escape them
111
# but rather just pull them out
112
_gen_file_id_re = re.compile(r'[^\w.]')
113
_gen_id_suffix = None
117
def _next_id_suffix():
118
"""Create a new file id suffix that is reasonably unique.
120
On the first call we combine the current time with 64 bits of randomness
121
to give a highly probably globally unique number. Then each call in the same
122
process adds 1 to a serial number we append to that unique value.
124
# XXX TODO: change bzrlib.add.smart_add to call workingtree.add() rather
125
# than having to move the id randomness out of the inner loop like this.
126
# XXX TODO: for the global randomness this uses we should add the thread-id
127
# before the serial #.
128
global _gen_id_suffix, _gen_id_serial
129
if _gen_id_suffix is None:
130
_gen_id_suffix = "-%s-%s-" % (compact_date(time()), rand_chars(16))
132
return _gen_id_suffix + str(_gen_id_serial)
104
135
def gen_file_id(name):
105
"""Return new file id.
107
This should probably generate proper UUIDs, but for the moment we
108
cope with just randomness because running uuidgen every time is
111
from binascii import hexlify
112
from time import time
115
idx = name.rfind('/')
117
name = name[idx+1 : ]
118
idx = name.rfind('\\')
120
name = name[idx+1 : ]
122
# make it not a hidden file
123
name = name.lstrip('.')
125
# remove any wierd characters; we don't escape them but rather
127
name = re.sub(r'[^\w.]', '', name)
129
s = hexlify(rand_bytes(8))
130
return '-'.join((name, compact_date(time()), s))
136
"""Return new file id for the basename 'name'.
138
The uniqueness is supplied from _next_id_suffix.
140
# The real randomness is in the _next_id_suffix, the
141
# rest of the identifier is just to be nice.
143
# 1) Remove non-ascii word characters to keep the ids portable
144
# 2) squash to lowercase, so the file id doesn't have to
145
# be escaped (case insensitive filesystems would bork for ids
146
# that only differred in case without escaping).
147
# 3) truncate the filename to 20 chars. Long filenames also bork on some
149
# 4) Removing starting '.' characters to prevent the file ids from
150
# being considered hidden.
151
ascii_word_only = _gen_file_id_re.sub('', name.lower())
152
short_no_dots = ascii_word_only.lstrip('.')[:20]
153
return short_no_dots + _next_id_suffix()
133
156
def gen_root_id():
238
261
mutter("opening working tree %r", basedir)
239
262
if deprecated_passed(branch):
240
263
if not _internal:
241
warn("WorkingTree(..., branch=XXX) is deprecated as of bzr 0.8."
264
warnings.warn("WorkingTree(..., branch=XXX) is deprecated as of bzr 0.8."
242
265
" Please use bzrdir.open_workingtree() or"
243
266
" WorkingTree.open().",
244
267
DeprecationWarning,
270
self._branch = branch
249
self.branch = self.bzrdir.open_branch()
250
assert isinstance(self.branch, Branch), \
251
"branch %r is not a Branch" % self.branch
272
self._branch = self.bzrdir.open_branch()
252
273
self.basedir = realpath(basedir)
253
274
# if branch is at our basedir and is a format 6 or less
254
275
if isinstance(self._format, WorkingTreeFormat2):
255
276
# share control object
256
277
self._control_files = self.branch.control_files
258
# only ready for format 3
259
assert isinstance(self._format, WorkingTreeFormat3)
279
# assume all other formats have their own control files.
260
280
assert isinstance(_control_files, LockableFiles), \
261
281
"_control_files must be a LockableFiles, not %r" \
283
303
self._set_inventory(_inventory)
306
fget=lambda self: self._branch,
307
doc="""The branch this WorkingTree is connected to.
309
This cannot be set - it is reflective of the actual disk structure
310
the working tree has been constructed from.
313
def break_lock(self):
314
"""Break a lock if one is present from another instance.
316
Uses the ui factory to ask for confirmation if the lock may be from
319
This will probe the repository for its lock as well.
321
self._control_files.break_lock()
322
self.branch.break_lock()
285
324
def _set_inventory(self, inv):
325
assert inv.root is not None
286
326
self._inventory = inv
287
327
self.path2id = self._inventory.path2id
289
329
def is_control_filename(self, filename):
290
330
"""True if filename is the name of a control file in this tree.
332
:param filename: A filename within the tree. This is a relative path
333
from the root of this tree.
292
335
This is true IF and ONLY IF the filename is part of the meta data
293
336
that bzr controls in this tree. I.E. a random .bzr directory placed
294
337
on disk will not be a control file for this tree.
297
self.bzrdir.transport.relpath(self.abspath(filename))
299
except errors.PathNotChild:
339
return self.bzrdir.is_control_filename(filename)
303
342
def open(path=None, _unsupported=False):
352
394
return pathjoin(self.basedir, filename)
354
396
def basis_tree(self):
355
"""Return RevisionTree for the current last revision."""
397
"""Return RevisionTree for the current last revision.
399
If the left most parent is a ghost then the returned tree will be an
400
empty tree - one obtained by calling repository.revision_tree(None).
356
402
revision_id = self.last_revision()
357
403
if revision_id is not None:
359
405
xml = self.read_basis_inventory()
360
406
inv = bzrlib.xml5.serializer_v5.read_inventory_from_string(xml)
407
inv.root.revision = revision_id
361
408
except NoSuchFile:
363
410
if inv is not None and inv.revision_id == revision_id:
364
411
return bzrlib.tree.RevisionTree(self.branch.repository, inv,
366
413
# FIXME? RBC 20060403 should we cache the inventory here ?
367
return self.branch.repository.revision_tree(revision_id)
415
return self.branch.repository.revision_tree(revision_id)
416
except errors.RevisionNotPresent:
417
# the basis tree *may* be a ghost or a low level error may have
418
# occured. If the revision is present, its a problem, if its not
420
if self.branch.repository.has_revision(revision_id):
422
# the basis tree is a ghost so return an empty tree.
423
return self.branch.repository.revision_tree(None)
370
426
@deprecated_method(zero_eight)
405
461
return bzrdir.BzrDir.create_standalone_workingtree(directory)
407
def relpath(self, abs):
408
"""Return the local path portion from a given absolute path."""
409
return relpath(self.basedir, abs)
463
def relpath(self, path):
464
"""Return the local path portion from a given path.
466
The path may be absolute or relative. If its a relative path it is
467
interpreted relative to the python current working directory.
469
return relpath(self.basedir, path)
411
471
def has_filename(self, filename):
412
return bzrlib.osutils.lexists(self.abspath(filename))
472
return osutils.lexists(self.abspath(filename))
414
474
def get_file(self, file_id):
415
475
return self.get_file_byname(self.id2path(file_id))
477
def get_file_text(self, file_id):
478
return self.get_file(file_id).read()
417
480
def get_file_byname(self, filename):
418
481
return file(self.abspath(filename), 'rb')
483
def get_parent_ids(self):
484
"""See Tree.get_parent_ids.
486
This implementation reads the pending merges list and last_revision
487
value and uses that to decide what the parents list should be.
489
last_rev = self.last_revision()
494
other_parents = self.pending_merges()
495
return parents + other_parents
420
497
def get_root_id(self):
421
498
"""Return the id of this trees root"""
422
499
inv = self.read_working_inventory()
471
549
# but with branch a kwarg now, passing in args as is results in the
472
550
#message being used for the branch
473
551
args = (DEPRECATED_PARAMETER, message, ) + args
474
Commit().commit(working_tree=self, revprops=revprops, *args, **kwargs)
552
committed_id = Commit().commit( working_tree=self, revprops=revprops,
475
554
self._set_inventory(self.read_working_inventory())
477
557
def id2abspath(self, file_id):
478
558
return self.abspath(self.id2path(file_id))
496
576
return os.path.getsize(self.id2abspath(file_id))
499
def get_file_sha1(self, file_id):
500
path = self._inventory.id2path(file_id)
579
def get_file_sha1(self, file_id, path=None):
581
path = self._inventory.id2path(file_id)
501
582
return self._hashcache.get_sha1(path)
503
def is_executable(self, file_id):
504
if not supports_executable():
584
def get_file_mtime(self, file_id, path=None):
586
path = self._inventory.id2path(file_id)
587
return os.lstat(self.abspath(path)).st_mtime
589
if not supports_executable():
590
def is_executable(self, file_id, path=None):
505
591
return self._inventory[file_id].executable
507
path = self._inventory.id2path(file_id)
593
def is_executable(self, file_id, path=None):
595
path = self._inventory.id2path(file_id)
508
596
mode = os.lstat(self.abspath(path)).st_mode
509
return bool(stat.S_ISREG(mode) and stat.S_IEXEC&mode)
597
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
511
599
@needs_write_lock
512
600
def add(self, files, ids=None):
555
643
raise BzrError("cannot add top-level %r" % f)
557
645
fullpath = normpath(self.abspath(f))
560
647
kind = file_kind(fullpath)
561
648
except OSError, e:
562
649
if e.errno == errno.ENOENT:
563
650
raise NoSuchFile(fullpath)
564
# maybe something better?
565
raise BzrError('cannot add: not a regular file, symlink or directory: %s' % quotefn(f))
567
651
if not InventoryEntry.versionable_kind(kind):
568
raise BzrError('cannot add: not a versionable file ('
569
'i.e. regular file, symlink or directory): %s' % quotefn(f))
652
raise errors.BadFileKindError(filename=f, kind=kind)
571
653
if file_id is None:
572
file_id = gen_file_id(f)
573
inv.add_path(f, kind=kind, file_id=file_id)
654
inv.add_path(f, kind=kind)
656
inv.add_path(f, kind=kind, file_id=file_id)
575
mutter("add file %s file_id:{%s} kind=%r" % (f, file_id, kind))
576
658
self._write_inventory(inv)
578
660
@needs_write_lock
661
def add_parent_tree_id(self, revision_id, allow_leftmost_as_ghost=False):
662
"""Add revision_id as a parent.
664
This is equivalent to retrieving the current list of parent ids
665
and setting the list to its value plus revision_id.
667
:param revision_id: The revision id to add to the parent list. It may
668
be a ghost revision as long as its not the first parent to be added,
669
or the allow_leftmost_as_ghost parameter is set True.
670
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
672
parents = self.get_parent_ids() + [revision_id]
673
self.set_parent_ids(parents,
674
allow_leftmost_as_ghost=len(parents) > 1 or allow_leftmost_as_ghost)
677
def add_parent_tree(self, parent_tuple, allow_leftmost_as_ghost=False):
678
"""Add revision_id, tree tuple as a parent.
680
This is equivalent to retrieving the current list of parent trees
681
and setting the list to its value plus parent_tuple. See also
682
add_parent_tree_id - if you only have a parent id available it will be
683
simpler to use that api. If you have the parent already available, using
684
this api is preferred.
686
:param parent_tuple: The (revision id, tree) to add to the parent list.
687
If the revision_id is a ghost, pass None for the tree.
688
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
690
self.set_parent_ids(self.get_parent_ids() + [parent_tuple[0]],
691
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
579
694
def add_pending_merge(self, *revision_ids):
580
695
# TODO: Perhaps should check at this point that the
581
696
# history of the revision is actually present?
582
p = self.pending_merges()
697
parents = self.get_parent_ids()
584
699
for rev_id in revision_ids:
700
if rev_id in parents:
702
parents.append(rev_id)
590
self.set_pending_merges(p)
705
self.set_parent_ids(parents, allow_leftmost_as_ghost=True)
593
708
def pending_merges(self):
610
723
@needs_write_lock
724
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
725
"""Set the parent ids to revision_ids.
727
See also set_parent_trees. This api will try to retrieve the tree data
728
for each element of revision_ids from the trees repository. If you have
729
tree data already available, it is more efficient to use
730
set_parent_trees rather than set_parent_ids. set_parent_ids is however
731
an easier API to use.
733
:param revision_ids: The revision_ids to set as the parent ids of this
734
working tree. Any of these may be ghosts.
736
if len(revision_ids) > 0:
737
leftmost_id = revision_ids[0]
738
if (not allow_leftmost_as_ghost and not
739
self.branch.repository.has_revision(leftmost_id)):
740
raise errors.GhostRevisionUnusableHere(leftmost_id)
741
self.set_last_revision(leftmost_id)
743
self.set_last_revision(None)
744
merges = revision_ids[1:]
745
self._control_files.put_utf8('pending-merges', '\n'.join(merges))
748
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
749
"""Set the parents of the working tree.
751
:param parents_list: A list of (revision_id, tree) tuples.
752
If tree is None, then that element is treated as an unreachable
753
parent tree - i.e. a ghost.
755
# parent trees are not used in current format trees, delegate to
757
self.set_parent_ids([rev for (rev, tree) in parents_list],
758
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
611
761
def set_pending_merges(self, rev_list):
612
self._control_files.put_utf8('pending-merges', '\n'.join(rev_list))
762
parents = self.get_parent_ids()
763
leftmost = parents[:1]
764
new_parents = leftmost + rev_list
765
self.set_parent_ids(new_parents)
614
767
@needs_write_lock
615
768
def set_merge_modified(self, modified_hashes):
666
819
Skips the control directory.
668
821
inv = self._inventory
670
def descend(from_dir_relpath, from_dir_id, dp):
822
# Convert these into local objects to save lookup times
823
pathjoin = osutils.pathjoin
824
file_kind = osutils.file_kind
826
# transport.base ends in a slash, we want the piece
827
# between the last two slashes
828
transport_base_dir = self.bzrdir.transport.base.rsplit('/', 2)[1]
830
fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
832
# directory file_id, relative path, absolute path, reverse sorted children
833
children = os.listdir(self.basedir)
835
# jam 20060527 The kernel sized tree seems equivalent whether we
836
# use a deque and popleft to keep them sorted, or if we use a plain
837
# list and just reverse() them.
838
children = collections.deque(children)
839
stack = [(inv.root.file_id, u'', self.basedir, children)]
841
from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
844
f = children.popleft()
674
845
## TODO: If we find a subdirectory with its own .bzr
675
846
## directory, then that is a separate tree and we
676
847
## should exclude it.
678
849
# the bzrdir for this tree
679
if self.bzrdir.transport.base.endswith(f + '/'):
850
if transport_base_dir == f:
683
fp = appendpath(from_dir_relpath, f)
853
# we know that from_dir_relpath and from_dir_abspath never end in a slash
854
# and 'f' doesn't begin with one, we can do a string op, rather
855
# than the checks of pathjoin(), all relative paths will have an extra slash
857
fp = from_dir_relpath + '/' + f
686
fap = appendpath(dp, f)
860
fap = from_dir_abspath + '/' + f
688
862
f_ie = inv.get_child(from_dir_id, f)
691
elif self.is_ignored(fp):
865
elif self.is_ignored(fp[1:]):
868
# we may not have found this file, because of a unicode issue
869
f_norm, can_access = osutils.normalized_filename(f)
870
if f == f_norm or not can_access:
871
# No change, so treat this file normally
874
# this file can be accessed by a normalized path
875
# check again if it is versioned
876
# these lines are repeated here for performance
878
fp = from_dir_relpath + '/' + f
879
fap = from_dir_abspath + '/' + f
880
f_ie = inv.get_child(from_dir_id, f)
883
elif self.is_ignored(fp[1:]):
696
888
fk = file_kind(fap)
704
896
# make a last minute entry
898
yield fp[1:], c, fk, f_ie.file_id, f_ie
708
if fk == 'directory':
709
entry = TreeDirectory()
712
elif fk == 'symlink':
901
yield fp[1:], c, fk, None, fk_entries[fk]()
903
yield fp[1:], c, fk, None, TreeEntry()
717
yield fp, c, fk, (f_ie and f_ie.file_id), entry
719
906
if fk != 'directory':
723
# don't descend unversioned directories
726
for ff in descend(fp, f_ie.file_id, fap):
909
# But do this child first
910
new_children = os.listdir(fap)
912
new_children = collections.deque(new_children)
913
stack.append((f_ie.file_id, fp, fap, new_children))
914
# Break out of inner loop, so that we start outer loop with child
917
# if we finished all children, pop it off the stack
729
for f in descend(u'', inv.root.file_id, self.basedir):
732
921
@needs_write_lock
733
922
def move(self, from_paths, to_name):
906
1083
repository = self.branch.repository
907
1084
pb = bzrlib.ui.ui_factory.nested_progress_bar()
1086
new_basis_tree = self.branch.basis_tree()
909
1087
merge_inner(self.branch,
910
self.branch.basis_tree(),
916
self.set_last_revision(self.branch.last_revision())
1094
# TODO - dedup parents list with things merged by pull ?
1095
# reuse the revisiontree we merged against to set the new
1097
parent_trees = [(self.branch.last_revision(), new_basis_tree)]
1098
# we have to pull the merge trees out again, because
1099
# merge_inner has set the ids. - this corner is not yet
1100
# layered well enough to prevent double handling.
1101
merges = self.get_parent_ids()[1:]
1102
parent_trees.extend([
1103
(parent, repository.revision_tree(parent)) for
1105
self.set_parent_trees(parent_trees)
940
1129
for subf in os.listdir(dirabs):
942
and (subf not in dir_entry.children)):
1132
if subf not in dir_entry.children:
1133
subf_norm, can_access = osutils.normalized_filename(subf)
1134
if subf_norm != subf and can_access:
1135
if subf_norm not in dir_entry.children:
1136
fl.append(subf_norm)
947
subp = appendpath(path, subf)
1142
subp = pathjoin(path, subf)
1145
def _translate_ignore_rule(self, rule):
1146
"""Translate a single ignore rule to a regex.
1148
There are two types of ignore rules. Those that do not contain a / are
1149
matched against the tail of the filename (that is, they do not care
1150
what directory the file is in.) Rules which do contain a slash must
1151
match the entire path. As a special case, './' at the start of the
1152
string counts as a slash in the string but is removed before matching
1153
(e.g. ./foo.c, ./src/foo.c)
1155
:return: The translated regex.
1157
if rule[:2] in ('./', '.\\'):
1159
result = fnmatch.translate(rule[2:])
1160
elif '/' in rule or '\\' in rule:
1162
result = fnmatch.translate(rule)
1164
# default rule style.
1165
result = "(?:.*/)?(?!.*/)" + fnmatch.translate(rule)
1166
assert result[-1] == '$', "fnmatch.translate did not add the expected $"
1167
return "(" + result + ")"
1169
def _combine_ignore_rules(self, rules):
1170
"""Combine a list of ignore rules into a single regex object.
1172
Each individual rule is combined with | to form a big regex, which then
1173
has $ added to it to form something like ()|()|()$. The group index for
1174
each subregex's outermost group is placed in a dictionary mapping back
1175
to the rule. This allows quick identification of the matching rule that
1177
:return: a list of the compiled regex and the matching-group index
1178
dictionaries. We return a list because python complains if you try to
1179
combine more than 100 regexes.
1184
translated_rules = []
1186
translated_rule = self._translate_ignore_rule(rule)
1187
compiled_rule = re.compile(translated_rule)
1188
groups[next_group] = rule
1189
next_group += compiled_rule.groups
1190
translated_rules.append(translated_rule)
1191
if next_group == 99:
1192
result.append((re.compile("|".join(translated_rules)), groups))
1195
translated_rules = []
1196
if len(translated_rules):
1197
result.append((re.compile("|".join(translated_rules)), groups))
951
1200
def ignored_files(self):
952
1201
"""Yield list of PATH, IGNORE_PATTERN"""
959
1207
def get_ignore_list(self):
960
1208
"""Return list of ignore patterns.
962
1210
Cached in the Tree object after the first call.
964
if hasattr(self, '_ignorelist'):
965
return self._ignorelist
967
l = bzrlib.DEFAULT_IGNORE[:]
1212
ignoreset = getattr(self, '_ignoreset', None)
1213
if ignoreset is not None:
1216
ignore_globs = set(bzrlib.DEFAULT_IGNORE)
1217
ignore_globs.update(ignores.get_runtime_ignores())
1219
ignore_globs.update(ignores.get_user_ignores())
968
1221
if self.has_filename(bzrlib.IGNORE_FILENAME):
969
1222
f = self.get_file_byname(bzrlib.IGNORE_FILENAME)
970
l.extend([line.rstrip("\n\r") for line in f.readlines()])
1224
ignore_globs.update(ignores.parse_ignore_file(f))
1228
self._ignoreset = ignore_globs
1229
self._ignore_regex = self._combine_ignore_rules(ignore_globs)
1232
def _get_ignore_rules_as_regex(self):
1233
"""Return a regex of the ignore rules and a mapping dict.
1235
:return: (ignore rules compiled regex, dictionary mapping rule group
1236
indices to original rule.)
1238
if getattr(self, '_ignoreset', None) is None:
1239
self.get_ignore_list()
1240
return self._ignore_regex
975
1242
def is_ignored(self, filename):
976
1243
r"""Check whether the filename matches an ignore pattern.
990
1257
# treat dotfiles correctly and allows * to match /.
991
1258
# Eventually it should be replaced with something more
994
for pat in self.get_ignore_list():
995
if '/' in pat or '\\' in pat:
997
# as a special case, you can put ./ at the start of a
998
# pattern; this is good to match in the top-level
1001
if (pat[:2] == './') or (pat[:2] == '.\\'):
1005
if fnmatch.fnmatchcase(filename, newpat):
1008
if fnmatch.fnmatchcase(splitpath(filename)[-1], pat):
1261
rules = self._get_ignore_rules_as_regex()
1262
for regex, mapping in rules:
1263
match = regex.match(filename)
1264
if match is not None:
1265
# one or more of the groups in mapping will have a non-None
1267
groups = match.groups()
1268
rules = [mapping[group] for group in
1269
mapping if groups[group] is not None]
1013
1273
def kind(self, file_id):
1014
1274
return file_kind(self.id2abspath(file_id))
1059
1325
if new_revision is None:
1060
1326
self.branch.set_revision_history([])
1062
# current format is locked in with the branch
1063
revision_history = self.branch.revision_history()
1065
position = revision_history.index(new_revision)
1067
raise errors.NoSuchRevision(self.branch, new_revision)
1068
self.branch.set_revision_history(revision_history[:position + 1])
1329
self.branch.generate_revision_history(new_revision)
1330
except errors.NoSuchRevision:
1331
# not present in the repo - dont try to set it deeper than the tip
1332
self.branch.set_revision_history([new_revision])
1071
1335
def _cache_basis_inventory(self, new_revision):
1072
1336
"""Cache new_revision as the basis inventory."""
1337
# TODO: this should allow the ready-to-use inventory to be passed in,
1338
# as commit already has that ready-to-use [while the format is the
1074
1341
# this double handles the inventory - unpack and repack -
1075
1342
# but is easier to understand. We can/should put a conditional
1076
1343
# in here based on whether the inventory is in the latest format
1077
1344
# - perhaps we should repack all inventories on a repository
1079
inv = self.branch.repository.get_inventory(new_revision)
1080
inv.revision_id = new_revision
1081
xml = bzrlib.xml5.serializer_v5.write_inventory_to_string(inv)
1346
# the fast path is to copy the raw xml from the repository. If the
1347
# xml contains 'revision_id="', then we assume the right
1348
# revision_id is set. We must check for this full string, because a
1349
# root node id can legitimately look like 'revision_id' but cannot
1351
xml = self.branch.repository.get_inventory_xml(new_revision)
1352
if not 'revision_id="' in xml.split('\n', 1)[0]:
1353
inv = self.branch.repository.deserialise_inventory(
1355
inv.revision_id = new_revision
1356
xml = bzrlib.xml5.serializer_v5.write_inventory_to_string(inv)
1357
assert isinstance(xml, str), 'serialised xml must be bytestring.'
1083
1358
path = self._basis_inventory_name()
1084
self._control_files.put_utf8(path, xml)
1085
except WeaveRevisionNotPresent:
1360
self._control_files.put(path, sio)
1361
except (errors.NoSuchRevision, errors.RevisionNotPresent):
1088
1364
def read_basis_inventory(self):
1089
1365
"""Read the cached basis inventory."""
1090
1366
path = self._basis_inventory_name()
1091
return self._control_files.get_utf8(path).read()
1367
return self._control_files.get(path).read()
1093
1369
@needs_read_lock
1094
1370
def read_working_inventory(self):
1129
1405
# TODO: Perhaps make this just a warning, and continue?
1130
1406
# This tends to happen when
1131
1407
raise NotVersionedError(path=f)
1132
mutter("remove inventory entry %s {%s}", quotefn(f), fid)
1134
1409
# having remove it, it must be either ignored or unknown
1135
1410
if self.is_ignored(f):
1136
1411
new_status = 'I'
1138
1413
new_status = '?'
1139
show_status(new_status, inv[fid].kind, quotefn(f))
1414
show_status(new_status, inv[fid].kind, f, to_file=to_file)
1142
1417
self._write_inventory(inv)
1204
1479
between multiple working trees, i.e. via shared storage, then we
1205
1480
would probably want to lock both the local tree, and the branch.
1207
# FIXME: We want to write out the hashcache only when the last lock on
1208
# this working copy is released. Peeking at the lock count is a bit
1209
# of a nasty hack; probably it's better to have a transaction object,
1210
# which can do some finalization when it's either successfully or
1211
# unsuccessfully completed. (Denys's original patch did that.)
1212
# RBC 20060206 hookinhg into transaction will couple lock and transaction
1213
# wrongly. Hookinh into unllock on the control files object is fine though.
1215
# TODO: split this per format so there is no ugly if block
1216
if self._hashcache.needs_write and (
1217
# dedicated lock files
1218
self._control_files._lock_count==1 or
1220
(self._control_files is self.branch.control_files and
1221
self._control_files._lock_count==3)):
1222
self._hashcache.write()
1223
# reverse order of locking.
1224
result = self._control_files.unlock()
1226
self.branch.unlock()
1482
raise NotImplementedError(self.unlock)
1230
1484
@needs_write_lock
1231
1485
def update(self):
1248
1502
Do a 'normal' merge of the old branch basis if it is relevant.
1250
1504
old_tip = self.branch.update()
1251
if old_tip is not None:
1252
self.add_pending_merge(old_tip)
1253
self.branch.lock_read()
1256
if self.last_revision() != self.branch.last_revision():
1257
# merge tree state up to new branch tip.
1258
basis = self.basis_tree()
1259
to_tree = self.branch.basis_tree()
1260
result += merge_inner(self.branch,
1264
self.set_last_revision(self.branch.last_revision())
1265
if old_tip and old_tip != self.last_revision():
1266
# our last revision was not the prior branch last reivison
1267
# and we have converted that last revision to a pending merge.
1268
# base is somewhere between the branch tip now
1269
# and the now pending merge
1270
from bzrlib.revision import common_ancestor
1272
base_rev_id = common_ancestor(self.branch.last_revision(),
1274
self.branch.repository)
1275
except errors.NoCommonAncestor:
1277
base_tree = self.branch.repository.revision_tree(base_rev_id)
1278
other_tree = self.branch.repository.revision_tree(old_tip)
1279
result += merge_inner(self.branch,
1285
self.branch.unlock()
1505
# here if old_tip is not None, it is the old tip of the branch before
1506
# it was updated from the master branch. This should become a pending
1507
# merge in the working tree to preserve the user existing work. we
1508
# cant set that until we update the working trees last revision to be
1509
# one from the new branch, because it will just get absorbed by the
1510
# parent de-duplication logic.
1512
# We MUST save it even if an error occurs, because otherwise the users
1513
# local work is unreferenced and will appear to have been lost.
1516
if self.last_revision() != self.branch.last_revision():
1517
# merge tree state up to new branch tip.
1518
basis = self.basis_tree()
1519
to_tree = self.branch.basis_tree()
1520
result += merge_inner(self.branch,
1524
# TODO - dedup parents list with things merged by pull ?
1525
# reuse the tree we've updated to to set the basis:
1526
parent_trees = [(self.branch.last_revision(), to_tree)]
1527
merges = self.get_parent_ids()[1:]
1528
# Ideally we ask the tree for the trees here, that way the working
1529
# tree can decide whether to give us teh entire tree or give us a
1530
# lazy initialised tree. dirstate for instance will have the trees
1531
# in ram already, whereas a last-revision + basis-inventory tree
1532
# will not, but also does not need them when setting parents.
1533
for parent in merges:
1534
parent_trees.append(
1535
(parent, self.branch.repository.revision_tree(parent)))
1536
if old_tip is not None:
1537
parent_trees.append(
1538
(old_tip, self.branch.repository.revision_tree(old_tip)))
1539
self.set_parent_trees(parent_trees)
1541
# the working tree had the same last-revision as the master
1542
# branch did. We may still have pivot local work from the local
1543
# branch into old_tip:
1544
if old_tip is not None:
1545
self.add_parent_tree_id(old_tip)
1546
if old_tip and old_tip != self.last_revision():
1547
# our last revision was not the prior branch last revision
1548
# and we have converted that last revision to a pending merge.
1549
# base is somewhere between the branch tip now
1550
# and the now pending merge
1551
from bzrlib.revision import common_ancestor
1553
base_rev_id = common_ancestor(self.branch.last_revision(),
1555
self.branch.repository)
1556
except errors.NoCommonAncestor:
1558
base_tree = self.branch.repository.revision_tree(base_rev_id)
1559
other_tree = self.branch.repository.revision_tree(old_tip)
1560
result += merge_inner(self.branch,
1287
1566
@needs_write_lock
1288
1567
def _write_inventory(self, inv):
1306
1588
if file_kind(self.abspath(conflicted)) != "file":
1309
if e.errno == errno.ENOENT:
1590
except errors.NoSuchFile:
1313
1592
if text is True:
1314
1593
for suffix in ('.THIS', '.OTHER'):
1316
1595
kind = file_kind(self.abspath(conflicted+suffix))
1318
if e.errno == errno.ENOENT:
1598
except errors.NoSuchFile:
1326
1602
ctype = {True: 'text conflict', False: 'contents conflict'}[text]
1327
1603
conflicts.append(Conflict.factory(ctype, path=conflicted,
1329
1605
return conflicts
1608
class WorkingTree2(WorkingTree):
1609
"""This is the Format 2 working tree.
1611
This was the first weave based working tree.
1612
- uses os locks for locking.
1613
- uses the branch last-revision.
1617
# we share control files:
1618
if self._hashcache.needs_write and self._control_files._lock_count==3:
1619
self._hashcache.write()
1620
# reverse order of locking.
1622
return self._control_files.unlock()
1624
self.branch.unlock()
1332
1627
class WorkingTree3(WorkingTree):
1333
1628
"""This is the Format 3 working tree.
1486
1793
"""See WorkingTreeFormat.get_format_description()."""
1487
1794
return "Working tree format 2"
1796
def stub_initialize_remote(self, control_files):
1797
"""As a special workaround create critical control files for a remote working tree
1799
This ensures that it can later be updated and dealt with locally,
1800
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
1801
no working tree. (See bug #43064).
1805
bzrlib.xml5.serializer_v5.write_inventory(inv, sio)
1807
control_files.put('inventory', sio)
1809
control_files.put_utf8('pending-merges', '')
1489
1812
def initialize(self, a_bzrdir, revision_id=None):
1490
1813
"""See WorkingTreeFormat.initialize()."""
1491
1814
if not isinstance(a_bzrdir.transport, LocalTransport):
1577
1900
transport = a_bzrdir.get_workingtree_transport(self)
1578
1901
control_files = self._open_control_files(a_bzrdir)
1579
1902
control_files.create_lock()
1903
control_files.lock_write()
1580
1904
control_files.put_utf8('format', self.get_format_string())
1581
1905
branch = a_bzrdir.open_branch()
1582
1906
if revision_id is None:
1583
1907
revision_id = branch.last_revision()
1584
1908
inv = Inventory()
1585
wt = WorkingTree3(a_bzrdir.root_transport.base,
1909
wt = WorkingTree3(a_bzrdir.root_transport.local_abspath('.'),
1588
1912
_internal=True,
1590
1914
_bzrdir=a_bzrdir,
1591
1915
_control_files=control_files)
1592
wt._write_inventory(inv)
1593
wt.set_root_id(inv.root.file_id)
1594
wt.set_last_revision(revision_id)
1595
wt.set_pending_merges([])
1596
build_tree(wt.basis_tree(), wt)
1918
wt._write_inventory(inv)
1919
wt.set_root_id(inv.root.file_id)
1920
basis_tree = branch.repository.revision_tree(revision_id)
1921
wt.set_parent_trees([(revision_id, basis_tree)])
1922
build_tree(basis_tree, wt)
1925
control_files.unlock()
1599
1928
def __init__(self):
1611
1940
raise NotImplementedError
1612
1941
if not isinstance(a_bzrdir.transport, LocalTransport):
1613
1942
raise errors.NotLocalUrl(a_bzrdir.transport.base)
1614
control_files = self._open_control_files(a_bzrdir)
1615
return WorkingTree3(a_bzrdir.root_transport.base,
1943
return self._open(a_bzrdir, self._open_control_files(a_bzrdir))
1945
def _open(self, a_bzrdir, control_files):
1946
"""Open the tree itself.
1948
:param a_bzrdir: the dir for the tree.
1949
:param control_files: the control files for the tree.
1951
return WorkingTree3(a_bzrdir.root_transport.local_abspath('.'),
1616
1952
_internal=True,
1618
1954
_bzrdir=a_bzrdir,
1645
1981
self._transport_readonly_server = transport_readonly_server
1646
1982
self._formats = formats
1984
def _clone_test(self, test, bzrdir_format, workingtree_format, variation):
1985
"""Clone test for adaption."""
1986
new_test = deepcopy(test)
1987
new_test.transport_server = self._transport_server
1988
new_test.transport_readonly_server = self._transport_readonly_server
1989
new_test.bzrdir_format = bzrdir_format
1990
new_test.workingtree_format = workingtree_format
1991
def make_new_test_id():
1992
new_id = "%s(%s)" % (test.id(), variation)
1993
return lambda: new_id
1994
new_test.id = make_new_test_id()
1648
1997
def adapt(self, test):
1649
1998
from bzrlib.tests import TestSuite
1650
1999
result = TestSuite()
1651
2000
for workingtree_format, bzrdir_format in self._formats:
1652
new_test = deepcopy(test)
1653
new_test.transport_server = self._transport_server
1654
new_test.transport_readonly_server = self._transport_readonly_server
1655
new_test.bzrdir_format = bzrdir_format
1656
new_test.workingtree_format = workingtree_format
1657
def make_new_test_id():
1658
new_id = "%s(%s)" % (new_test.id(), workingtree_format.__class__.__name__)
1659
return lambda: new_id
1660
new_test.id = make_new_test_id()
2001
new_test = self._clone_test(
2004
workingtree_format, workingtree_format.__class__.__name__)
1661
2005
result.addTest(new_test)
added
removed
bzrlib/workingtree.py
