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()
495
merges_file = self._control_files.get_utf8('pending-merges')
499
for l in merges_file.readlines():
500
parents.append(l.rstrip('\n'))
420
503
def get_root_id(self):
421
504
"""Return the id of this trees root"""
422
505
inv = self.read_working_inventory()
471
555
# but with branch a kwarg now, passing in args as is results in the
472
556
#message being used for the branch
473
557
args = (DEPRECATED_PARAMETER, message, ) + args
474
Commit().commit(working_tree=self, revprops=revprops, *args, **kwargs)
558
committed_id = Commit().commit( working_tree=self, revprops=revprops,
475
560
self._set_inventory(self.read_working_inventory())
477
563
def id2abspath(self, file_id):
478
564
return self.abspath(self.id2path(file_id))
496
582
return os.path.getsize(self.id2abspath(file_id))
499
def get_file_sha1(self, file_id):
500
path = self._inventory.id2path(file_id)
585
def get_file_sha1(self, file_id, path=None):
587
path = self._inventory.id2path(file_id)
501
588
return self._hashcache.get_sha1(path)
503
def is_executable(self, file_id):
504
if not supports_executable():
590
def get_file_mtime(self, file_id, path=None):
592
path = self._inventory.id2path(file_id)
593
return os.lstat(self.abspath(path)).st_mtime
595
if not supports_executable():
596
def is_executable(self, file_id, path=None):
505
597
return self._inventory[file_id].executable
507
path = self._inventory.id2path(file_id)
599
def is_executable(self, file_id, path=None):
601
path = self._inventory.id2path(file_id)
508
602
mode = os.lstat(self.abspath(path)).st_mode
509
return bool(stat.S_ISREG(mode) and stat.S_IEXEC&mode)
603
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
511
605
@needs_write_lock
512
606
def add(self, files, ids=None):
555
649
raise BzrError("cannot add top-level %r" % f)
557
651
fullpath = normpath(self.abspath(f))
560
653
kind = file_kind(fullpath)
561
654
except OSError, e:
562
655
if e.errno == errno.ENOENT:
563
656
raise NoSuchFile(fullpath)
564
# maybe something better?
565
raise BzrError('cannot add: not a regular file, symlink or directory: %s' % quotefn(f))
567
657
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))
658
raise errors.BadFileKindError(filename=f, kind=kind)
571
659
if file_id is None:
572
file_id = gen_file_id(f)
573
inv.add_path(f, kind=kind, file_id=file_id)
660
inv.add_path(f, kind=kind)
662
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
664
self._write_inventory(inv)
578
666
@needs_write_lock
667
def add_parent_tree_id(self, revision_id, allow_leftmost_as_ghost=False):
668
"""Add revision_id as a parent.
670
This is equivalent to retrieving the current list of parent ids
671
and setting the list to its value plus revision_id.
673
:param revision_id: The revision id to add to the parent list. It may
674
be a ghost revision as long as its not the first parent to be added,
675
or the allow_leftmost_as_ghost parameter is set True.
676
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
678
parents = self.get_parent_ids() + [revision_id]
679
self.set_parent_ids(parents,
680
allow_leftmost_as_ghost=len(parents) > 1 or allow_leftmost_as_ghost)
683
def add_parent_tree(self, parent_tuple, allow_leftmost_as_ghost=False):
684
"""Add revision_id, tree tuple as a parent.
686
This is equivalent to retrieving the current list of parent trees
687
and setting the list to its value plus parent_tuple. See also
688
add_parent_tree_id - if you only have a parent id available it will be
689
simpler to use that api. If you have the parent already available, using
690
this api is preferred.
692
:param parent_tuple: The (revision id, tree) to add to the parent list.
693
If the revision_id is a ghost, pass None for the tree.
694
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
696
self.set_parent_ids(self.get_parent_ids() + [parent_tuple[0]],
697
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
579
700
def add_pending_merge(self, *revision_ids):
580
701
# TODO: Perhaps should check at this point that the
581
702
# history of the revision is actually present?
582
p = self.pending_merges()
703
parents = self.get_parent_ids()
584
705
for rev_id in revision_ids:
706
if rev_id in parents:
708
parents.append(rev_id)
590
self.set_pending_merges(p)
711
self.set_parent_ids(parents, allow_leftmost_as_ghost=True)
593
714
def pending_merges(self):
596
717
These are revisions that have been merged into the working
597
718
directory but not yet committed.
600
merges_file = self._control_files.get_utf8('pending-merges')
602
if e.errno != errno.ENOENT:
606
for l in merges_file.readlines():
607
p.append(l.rstrip('\n'))
720
return self.get_parent_ids()[1:]
723
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
724
"""Set the parent ids to revision_ids.
726
See also set_parent_trees. This api will try to retrieve the tree data
727
for each element of revision_ids from the trees repository. If you have
728
tree data already available, it is more efficient to use
729
set_parent_trees rather than set_parent_ids. set_parent_ids is however
730
an easier API to use.
732
:param revision_ids: The revision_ids to set as the parent ids of this
733
working tree. Any of these may be ghosts.
735
if len(revision_ids) > 0:
736
leftmost_id = revision_ids[0]
737
if (not allow_leftmost_as_ghost and not
738
self.branch.repository.has_revision(leftmost_id)):
739
raise errors.GhostRevisionUnusableHere(leftmost_id)
740
self.set_last_revision(leftmost_id)
742
self.set_last_revision(None)
743
merges = revision_ids[1:]
744
self._control_files.put_utf8('pending-merges', '\n'.join(merges))
747
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
748
"""Set the parents of the working tree.
750
:param parents_list: A list of (revision_id, tree) tuples.
751
If tree is None, then that element is treated as an unreachable
752
parent tree - i.e. a ghost.
754
# parent trees are not used in current format trees, delegate to
756
self.set_parent_ids([rev for (rev, tree) in parents_list],
757
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
610
759
@needs_write_lock
611
760
def set_pending_merges(self, rev_list):
612
self._control_files.put_utf8('pending-merges', '\n'.join(rev_list))
761
parents = self.get_parent_ids()
762
leftmost = parents[:1]
763
new_parents = leftmost + rev_list
764
self.set_parent_ids(new_parents)
614
766
@needs_write_lock
615
767
def set_merge_modified(self, modified_hashes):
666
818
Skips the control directory.
668
820
inv = self._inventory
670
def descend(from_dir_relpath, from_dir_id, dp):
821
# Convert these into local objects to save lookup times
822
pathjoin = osutils.pathjoin
823
file_kind = osutils.file_kind
825
# transport.base ends in a slash, we want the piece
826
# between the last two slashes
827
transport_base_dir = self.bzrdir.transport.base.rsplit('/', 2)[1]
829
fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
831
# directory file_id, relative path, absolute path, reverse sorted children
832
children = os.listdir(self.basedir)
834
# jam 20060527 The kernel sized tree seems equivalent whether we
835
# use a deque and popleft to keep them sorted, or if we use a plain
836
# list and just reverse() them.
837
children = collections.deque(children)
838
stack = [(inv.root.file_id, u'', self.basedir, children)]
840
from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
843
f = children.popleft()
674
844
## TODO: If we find a subdirectory with its own .bzr
675
845
## directory, then that is a separate tree and we
676
846
## should exclude it.
678
848
# the bzrdir for this tree
679
if self.bzrdir.transport.base.endswith(f + '/'):
849
if transport_base_dir == f:
683
fp = appendpath(from_dir_relpath, f)
852
# we know that from_dir_relpath and from_dir_abspath never end in a slash
853
# and 'f' doesn't begin with one, we can do a string op, rather
854
# than the checks of pathjoin(), all relative paths will have an extra slash
856
fp = from_dir_relpath + '/' + f
686
fap = appendpath(dp, f)
859
fap = from_dir_abspath + '/' + f
688
861
f_ie = inv.get_child(from_dir_id, f)
691
elif self.is_ignored(fp):
864
elif self.is_ignored(fp[1:]):
867
# we may not have found this file, because of a unicode issue
868
f_norm, can_access = osutils.normalized_filename(f)
869
if f == f_norm or not can_access:
870
# No change, so treat this file normally
873
# this file can be accessed by a normalized path
874
# check again if it is versioned
875
# these lines are repeated here for performance
877
fp = from_dir_relpath + '/' + f
878
fap = from_dir_abspath + '/' + f
879
f_ie = inv.get_child(from_dir_id, f)
882
elif self.is_ignored(fp[1:]):
696
887
fk = file_kind(fap)
704
895
# make a last minute entry
897
yield fp[1:], c, fk, f_ie.file_id, f_ie
708
if fk == 'directory':
709
entry = TreeDirectory()
712
elif fk == 'symlink':
900
yield fp[1:], c, fk, None, fk_entries[fk]()
902
yield fp[1:], c, fk, None, TreeEntry()
717
yield fp, c, fk, (f_ie and f_ie.file_id), entry
719
905
if fk != 'directory':
723
# don't descend unversioned directories
726
for ff in descend(fp, f_ie.file_id, fap):
908
# But do this child first
909
new_children = os.listdir(fap)
911
new_children = collections.deque(new_children)
912
stack.append((f_ie.file_id, fp, fap, new_children))
913
# Break out of inner loop, so that we start outer loop with child
916
# if we finished all children, pop it off the stack
729
for f in descend(u'', inv.root.file_id, self.basedir):
732
920
@needs_write_lock
733
921
def move(self, from_paths, to_name):
906
1082
repository = self.branch.repository
907
1083
pb = bzrlib.ui.ui_factory.nested_progress_bar()
1085
new_basis_tree = self.branch.basis_tree()
909
1086
merge_inner(self.branch,
910
self.branch.basis_tree(),
916
self.set_last_revision(self.branch.last_revision())
1093
# TODO - dedup parents list with things merged by pull ?
1094
# reuse the revisiontree we merged against to set the new
1096
parent_trees = [(self.branch.last_revision(), new_basis_tree)]
1097
# we have to pull the merge trees out again, because
1098
# merge_inner has set the ids. - this corner is not yet
1099
# layered well enough to prevent double handling.
1100
merges = self.get_parent_ids()[1:]
1101
parent_trees.extend([
1102
(parent, repository.revision_tree(parent)) for
1104
self.set_parent_trees(parent_trees)
940
1128
for subf in os.listdir(dirabs):
942
and (subf not in dir_entry.children)):
1131
if subf not in dir_entry.children:
1132
subf_norm, can_access = osutils.normalized_filename(subf)
1133
if subf_norm != subf and can_access:
1134
if subf_norm not in dir_entry.children:
1135
fl.append(subf_norm)
947
subp = appendpath(path, subf)
1141
subp = pathjoin(path, subf)
1144
def _translate_ignore_rule(self, rule):
1145
"""Translate a single ignore rule to a regex.
1147
There are two types of ignore rules. Those that do not contain a / are
1148
matched against the tail of the filename (that is, they do not care
1149
what directory the file is in.) Rules which do contain a slash must
1150
match the entire path. As a special case, './' at the start of the
1151
string counts as a slash in the string but is removed before matching
1152
(e.g. ./foo.c, ./src/foo.c)
1154
:return: The translated regex.
1156
if rule[:2] in ('./', '.\\'):
1158
result = fnmatch.translate(rule[2:])
1159
elif '/' in rule or '\\' in rule:
1161
result = fnmatch.translate(rule)
1163
# default rule style.
1164
result = "(?:.*/)?(?!.*/)" + fnmatch.translate(rule)
1165
assert result[-1] == '$', "fnmatch.translate did not add the expected $"
1166
return "(" + result + ")"
1168
def _combine_ignore_rules(self, rules):
1169
"""Combine a list of ignore rules into a single regex object.
1171
Each individual rule is combined with | to form a big regex, which then
1172
has $ added to it to form something like ()|()|()$. The group index for
1173
each subregex's outermost group is placed in a dictionary mapping back
1174
to the rule. This allows quick identification of the matching rule that
1176
:return: a list of the compiled regex and the matching-group index
1177
dictionaries. We return a list because python complains if you try to
1178
combine more than 100 regexes.
1183
translated_rules = []
1185
translated_rule = self._translate_ignore_rule(rule)
1186
compiled_rule = re.compile(translated_rule)
1187
groups[next_group] = rule
1188
next_group += compiled_rule.groups
1189
translated_rules.append(translated_rule)
1190
if next_group == 99:
1191
result.append((re.compile("|".join(translated_rules)), groups))
1194
translated_rules = []
1195
if len(translated_rules):
1196
result.append((re.compile("|".join(translated_rules)), groups))
951
1199
def ignored_files(self):
952
1200
"""Yield list of PATH, IGNORE_PATTERN"""
959
1206
def get_ignore_list(self):
960
1207
"""Return list of ignore patterns.
962
1209
Cached in the Tree object after the first call.
964
if hasattr(self, '_ignorelist'):
965
return self._ignorelist
967
l = bzrlib.DEFAULT_IGNORE[:]
1211
ignoreset = getattr(self, '_ignoreset', None)
1212
if ignoreset is not None:
1215
ignore_globs = set(bzrlib.DEFAULT_IGNORE)
1216
ignore_globs.update(ignores.get_runtime_ignores())
1218
ignore_globs.update(ignores.get_user_ignores())
968
1220
if self.has_filename(bzrlib.IGNORE_FILENAME):
969
1221
f = self.get_file_byname(bzrlib.IGNORE_FILENAME)
970
l.extend([line.rstrip("\n\r") for line in f.readlines()])
1223
ignore_globs.update(ignores.parse_ignore_file(f))
1227
self._ignoreset = ignore_globs
1228
self._ignore_regex = self._combine_ignore_rules(ignore_globs)
1231
def _get_ignore_rules_as_regex(self):
1232
"""Return a regex of the ignore rules and a mapping dict.
1234
:return: (ignore rules compiled regex, dictionary mapping rule group
1235
indices to original rule.)
1237
if getattr(self, '_ignoreset', None) is None:
1238
self.get_ignore_list()
1239
return self._ignore_regex
975
1241
def is_ignored(self, filename):
976
1242
r"""Check whether the filename matches an ignore pattern.
990
1256
# treat dotfiles correctly and allows * to match /.
991
1257
# 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):
1260
rules = self._get_ignore_rules_as_regex()
1261
for regex, mapping in rules:
1262
match = regex.match(filename)
1263
if match is not None:
1264
# one or more of the groups in mapping will have a non-None
1266
groups = match.groups()
1267
rules = [mapping[group] for group in
1268
mapping if groups[group] is not None]
1013
1272
def kind(self, file_id):
1014
1273
return file_kind(self.id2abspath(file_id))
1059
1324
if new_revision is None:
1060
1325
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])
1328
self.branch.generate_revision_history(new_revision)
1329
except errors.NoSuchRevision:
1330
# not present in the repo - dont try to set it deeper than the tip
1331
self.branch.set_revision_history([new_revision])
1071
1334
def _cache_basis_inventory(self, new_revision):
1072
1335
"""Cache new_revision as the basis inventory."""
1336
# TODO: this should allow the ready-to-use inventory to be passed in,
1337
# as commit already has that ready-to-use [while the format is the
1074
1340
# this double handles the inventory - unpack and repack -
1075
1341
# but is easier to understand. We can/should put a conditional
1076
1342
# in here based on whether the inventory is in the latest format
1077
1343
# - 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)
1345
# the fast path is to copy the raw xml from the repository. If the
1346
# xml contains 'revision_id="', then we assume the right
1347
# revision_id is set. We must check for this full string, because a
1348
# root node id can legitimately look like 'revision_id' but cannot
1350
xml = self.branch.repository.get_inventory_xml(new_revision)
1351
if not 'revision_id="' in xml.split('\n', 1)[0]:
1352
inv = self.branch.repository.deserialise_inventory(
1354
inv.revision_id = new_revision
1355
xml = bzrlib.xml5.serializer_v5.write_inventory_to_string(inv)
1356
assert isinstance(xml, str), 'serialised xml must be bytestring.'
1083
1357
path = self._basis_inventory_name()
1084
self._control_files.put_utf8(path, xml)
1085
except WeaveRevisionNotPresent:
1359
self._control_files.put(path, sio)
1360
except (errors.NoSuchRevision, errors.RevisionNotPresent):
1088
1363
def read_basis_inventory(self):
1089
1364
"""Read the cached basis inventory."""
1090
1365
path = self._basis_inventory_name()
1091
return self._control_files.get_utf8(path).read()
1366
return self._control_files.get(path).read()
1093
1368
@needs_read_lock
1094
1369
def read_working_inventory(self):
1129
1404
# TODO: Perhaps make this just a warning, and continue?
1130
1405
# This tends to happen when
1131
1406
raise NotVersionedError(path=f)
1132
mutter("remove inventory entry %s {%s}", quotefn(f), fid)
1134
1408
# having remove it, it must be either ignored or unknown
1135
1409
if self.is_ignored(f):
1136
1410
new_status = 'I'
1138
1412
new_status = '?'
1139
show_status(new_status, inv[fid].kind, quotefn(f))
1413
show_status(new_status, inv[fid].kind, f, to_file=to_file)
1142
1416
self._write_inventory(inv)
1204
1478
between multiple working trees, i.e. via shared storage, then we
1205
1479
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()
1481
raise NotImplementedError(self.unlock)
1230
1483
@needs_write_lock
1231
1484
def update(self):
1248
1501
Do a 'normal' merge of the old branch basis if it is relevant.
1250
1503
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()
1504
# here if old_tip is not None, it is the old tip of the branch before
1505
# it was updated from the master branch. This should become a pending
1506
# merge in the working tree to preserve the user existing work. we
1507
# cant set that until we update the working trees last revision to be
1508
# one from the new branch, because it will just get absorbed by the
1509
# parent de-duplication logic.
1511
# We MUST save it even if an error occurs, because otherwise the users
1512
# local work is unreferenced and will appear to have been lost.
1515
if self.last_revision() != self.branch.last_revision():
1516
# merge tree state up to new branch tip.
1517
basis = self.basis_tree()
1518
to_tree = self.branch.basis_tree()
1519
result += merge_inner(self.branch,
1523
# TODO - dedup parents list with things merged by pull ?
1524
# reuse the tree we've updated to to set the basis:
1525
parent_trees = [(self.branch.last_revision(), to_tree)]
1526
merges = self.get_parent_ids()[1:]
1527
# Ideally we ask the tree for the trees here, that way the working
1528
# tree can decide whether to give us teh entire tree or give us a
1529
# lazy initialised tree. dirstate for instance will have the trees
1530
# in ram already, whereas a last-revision + basis-inventory tree
1531
# will not, but also does not need them when setting parents.
1532
for parent in merges:
1533
parent_trees.append(
1534
(parent, self.branch.repository.revision_tree(parent)))
1535
if old_tip is not None:
1536
parent_trees.append(
1537
(old_tip, self.branch.repository.revision_tree(old_tip)))
1538
self.set_parent_trees(parent_trees)
1540
# the working tree had the same last-revision as the master
1541
# branch did. We may still have pivot local work from the local
1542
# branch into old_tip:
1543
if old_tip is not None:
1544
self.add_parent_tree_id(old_tip)
1545
if old_tip and old_tip != self.last_revision():
1546
# our last revision was not the prior branch last revision
1547
# and we have converted that last revision to a pending merge.
1548
# base is somewhere between the branch tip now
1549
# and the now pending merge
1550
from bzrlib.revision import common_ancestor
1552
base_rev_id = common_ancestor(self.branch.last_revision(),
1554
self.branch.repository)
1555
except errors.NoCommonAncestor:
1557
base_tree = self.branch.repository.revision_tree(base_rev_id)
1558
other_tree = self.branch.repository.revision_tree(old_tip)
1559
result += merge_inner(self.branch,
1287
1565
@needs_write_lock
1288
1566
def _write_inventory(self, inv):
1306
1587
if file_kind(self.abspath(conflicted)) != "file":
1309
if e.errno == errno.ENOENT:
1589
except errors.NoSuchFile:
1313
1591
if text is True:
1314
1592
for suffix in ('.THIS', '.OTHER'):
1316
1594
kind = file_kind(self.abspath(conflicted+suffix))
1318
if e.errno == errno.ENOENT:
1597
except errors.NoSuchFile:
1326
1601
ctype = {True: 'text conflict', False: 'contents conflict'}[text]
1327
1602
conflicts.append(Conflict.factory(ctype, path=conflicted,
1329
1604
return conflicts
1607
class WorkingTree2(WorkingTree):
1608
"""This is the Format 2 working tree.
1610
This was the first weave based working tree.
1611
- uses os locks for locking.
1612
- uses the branch last-revision.
1616
# we share control files:
1617
if self._hashcache.needs_write and self._control_files._lock_count==3:
1618
self._hashcache.write()
1619
# reverse order of locking.
1621
return self._control_files.unlock()
1623
self.branch.unlock()
1332
1626
class WorkingTree3(WorkingTree):
1333
1627
"""This is the Format 3 working tree.
1486
1792
"""See WorkingTreeFormat.get_format_description()."""
1487
1793
return "Working tree format 2"
1795
def stub_initialize_remote(self, control_files):
1796
"""As a special workaround create critical control files for a remote working tree
1798
This ensures that it can later be updated and dealt with locally,
1799
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
1800
no working tree. (See bug #43064).
1804
bzrlib.xml5.serializer_v5.write_inventory(inv, sio)
1806
control_files.put('inventory', sio)
1808
control_files.put_utf8('pending-merges', '')
1489
1811
def initialize(self, a_bzrdir, revision_id=None):
1490
1812
"""See WorkingTreeFormat.initialize()."""
1491
1813
if not isinstance(a_bzrdir.transport, LocalTransport):
1577
1899
transport = a_bzrdir.get_workingtree_transport(self)
1578
1900
control_files = self._open_control_files(a_bzrdir)
1579
1901
control_files.create_lock()
1902
control_files.lock_write()
1580
1903
control_files.put_utf8('format', self.get_format_string())
1581
1904
branch = a_bzrdir.open_branch()
1582
1905
if revision_id is None:
1583
1906
revision_id = branch.last_revision()
1584
1907
inv = Inventory()
1585
wt = WorkingTree3(a_bzrdir.root_transport.base,
1908
wt = WorkingTree3(a_bzrdir.root_transport.local_abspath('.'),
1588
1911
_internal=True,
1590
1913
_bzrdir=a_bzrdir,
1591
1914
_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)
1917
wt._write_inventory(inv)
1918
wt.set_root_id(inv.root.file_id)
1919
basis_tree = branch.repository.revision_tree(revision_id)
1920
wt.set_parent_trees([(revision_id, basis_tree)])
1921
build_tree(basis_tree, wt)
1924
control_files.unlock()
1599
1927
def __init__(self):
1611
1939
raise NotImplementedError
1612
1940
if not isinstance(a_bzrdir.transport, LocalTransport):
1613
1941
raise errors.NotLocalUrl(a_bzrdir.transport.base)
1614
control_files = self._open_control_files(a_bzrdir)
1615
return WorkingTree3(a_bzrdir.root_transport.base,
1942
return self._open(a_bzrdir, self._open_control_files(a_bzrdir))
1944
def _open(self, a_bzrdir, control_files):
1945
"""Open the tree itself.
1947
:param a_bzrdir: the dir for the tree.
1948
:param control_files: the control files for the tree.
1950
return WorkingTree3(a_bzrdir.root_transport.local_abspath('.'),
1616
1951
_internal=True,
1618
1953
_bzrdir=a_bzrdir,
1645
1980
self._transport_readonly_server = transport_readonly_server
1646
1981
self._formats = formats
1983
def _clone_test(self, test, bzrdir_format, workingtree_format, variation):
1984
"""Clone test for adaption."""
1985
new_test = deepcopy(test)
1986
new_test.transport_server = self._transport_server
1987
new_test.transport_readonly_server = self._transport_readonly_server
1988
new_test.bzrdir_format = bzrdir_format
1989
new_test.workingtree_format = workingtree_format
1990
def make_new_test_id():
1991
new_id = "%s(%s)" % (test.id(), variation)
1992
return lambda: new_id
1993
new_test.id = make_new_test_id()
1648
1996
def adapt(self, test):
1649
1997
from bzrlib.tests import TestSuite
1650
1998
result = TestSuite()
1651
1999
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()
2000
new_test = self._clone_test(
2003
workingtree_format, workingtree_format.__class__.__name__)
1661
2004
result.addTest(new_test)
added
removed
bzrlib/workingtree.py
