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():
218
241
self.bzrdir = _bzrdir
219
242
if not _internal:
220
243
# not created via open etc.
221
warn("WorkingTree() is deprecated as of bzr version 0.8. "
244
warnings.warn("WorkingTree() is deprecated as of bzr version 0.8. "
222
245
"Please use bzrdir.open_workingtree or WorkingTree.open().",
223
246
DeprecationWarning,
225
248
wt = WorkingTree.open(basedir)
226
self.branch = wt.branch
249
self._branch = wt.branch
227
250
self.basedir = wt.basedir
228
251
self._control_files = wt._control_files
229
252
self._hashcache = wt._hashcache
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" \
267
287
# if needed, or, when the cache sees a change, append it to the hash
268
288
# cache file, and have the parser take the most recent entry for a
269
289
# given path only.
270
cache_filename = self.bzrdir.get_workingtree_transport(None).abspath('stat-cache')
290
cache_filename = self.bzrdir.get_workingtree_transport(None).local_abspath('stat-cache')
271
291
hc = self._hashcache = HashCache(basedir, cache_filename, self._control_files._file_mode)
273
293
# is this scan needed ? it makes things kinda slow.
276
296
if hc.needs_write:
277
297
mutter("write hc")
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):
319
358
run into /. If there isn't one, raises NotBranchError.
320
359
TODO: give this a new exception.
321
360
If there is one, it is returned, along with the unused portion of path.
362
:return: The WorkingTree that contains 'path', and the rest of path
365
path = osutils.getcwd()
325
366
control, relpath = bzrdir.BzrDir.open_containing(path)
326
368
return control.open_workingtree(), relpath
359
401
xml = self.read_basis_inventory()
360
402
inv = bzrlib.xml5.serializer_v5.read_inventory_from_string(xml)
403
inv.root.revision = revision_id
361
404
except NoSuchFile:
363
406
if inv is not None and inv.revision_id == revision_id:
364
407
return bzrlib.tree.RevisionTree(self.branch.repository, inv,
366
409
# FIXME? RBC 20060403 should we cache the inventory here ?
367
return self.branch.repository.revision_tree(revision_id)
411
return self.branch.repository.revision_tree(revision_id)
412
except errors.RevisionNotPresent:
413
# the basis tree *may* be a ghost or a low level error may have
414
# occured. If the revision is present, its a problem, if its not
416
if self.branch.repository.has_revision(revision_id):
418
# the basis tree is a ghost
419
return self.branch.repository.revision_tree(None)
370
422
@deprecated_method(zero_eight)
405
457
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)
459
def relpath(self, path):
460
"""Return the local path portion from a given path.
462
The path may be absolute or relative. If its a relative path it is
463
interpreted relative to the python current working directory.
465
return relpath(self.basedir, path)
411
467
def has_filename(self, filename):
412
return bzrlib.osutils.lexists(self.abspath(filename))
468
return osutils.lexists(self.abspath(filename))
414
470
def get_file(self, file_id):
415
471
return self.get_file_byname(self.id2path(file_id))
473
def get_file_text(self, file_id):
474
return self.get_file(file_id).read()
417
476
def get_file_byname(self, filename):
418
477
return file(self.abspath(filename), 'rb')
479
def get_parent_ids(self):
480
"""See Tree.get_parent_ids.
482
This implementation reads the pending merges list and last_revision
483
value and uses that to decide what the parents list should be.
485
last_rev = self.last_revision()
490
other_parents = self.pending_merges()
491
return parents + other_parents
420
493
def get_root_id(self):
421
494
"""Return the id of this trees root"""
422
495
inv = self.read_working_inventory()
455
528
if revision_id is None:
456
529
transform_tree(tree, self)
458
# TODO now merge from tree.last_revision to revision
531
# TODO now merge from tree.last_revision to revision (to preserve
532
# user local changes)
459
533
transform_tree(tree, self)
460
tree.set_last_revision(revision_id)
534
tree.set_parent_ids([revision_id])
462
536
@needs_write_lock
463
537
def commit(self, message=None, revprops=None, *args, **kwargs):
471
545
# but with branch a kwarg now, passing in args as is results in the
472
546
#message being used for the branch
473
547
args = (DEPRECATED_PARAMETER, message, ) + args
474
Commit().commit(working_tree=self, revprops=revprops, *args, **kwargs)
548
committed_id = Commit().commit( working_tree=self, revprops=revprops,
475
550
self._set_inventory(self.read_working_inventory())
477
553
def id2abspath(self, file_id):
478
554
return self.abspath(self.id2path(file_id))
496
572
return os.path.getsize(self.id2abspath(file_id))
499
def get_file_sha1(self, file_id):
500
path = self._inventory.id2path(file_id)
575
def get_file_sha1(self, file_id, path=None):
577
path = self._inventory.id2path(file_id)
501
578
return self._hashcache.get_sha1(path)
503
def is_executable(self, file_id):
504
if not supports_executable():
580
def get_file_mtime(self, file_id, path=None):
582
path = self._inventory.id2path(file_id)
583
return os.lstat(self.abspath(path)).st_mtime
585
if not supports_executable():
586
def is_executable(self, file_id, path=None):
505
587
return self._inventory[file_id].executable
507
path = self._inventory.id2path(file_id)
589
def is_executable(self, file_id, path=None):
591
path = self._inventory.id2path(file_id)
508
592
mode = os.lstat(self.abspath(path)).st_mode
509
return bool(stat.S_ISREG(mode) and stat.S_IEXEC&mode)
593
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
511
595
@needs_write_lock
512
596
def add(self, files, ids=None):
555
639
raise BzrError("cannot add top-level %r" % f)
557
641
fullpath = normpath(self.abspath(f))
560
643
kind = file_kind(fullpath)
561
644
except OSError, e:
562
645
if e.errno == errno.ENOENT:
563
646
raise NoSuchFile(fullpath)
564
# maybe something better?
565
raise BzrError('cannot add: not a regular file, symlink or directory: %s' % quotefn(f))
567
647
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))
648
raise errors.BadFileKindError(filename=f, kind=kind)
571
649
if file_id is None:
572
file_id = gen_file_id(f)
573
inv.add_path(f, kind=kind, file_id=file_id)
650
inv.add_path(f, kind=kind)
652
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
654
self._write_inventory(inv)
578
656
@needs_write_lock
657
def add_parent_tree_id(self, revision_id, allow_leftmost_as_ghost=False):
658
"""Add revision_id as a parent.
660
This is equivalent to retrieving the current list of parent ids
661
and setting the list to its value plus revision_id.
663
:param revision_id: The revision id to add to the parent list. It may
666
self.set_parent_ids(self.get_parent_ids() + [revision_id],
667
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
670
def add_parent_tree(self, parent_tuple, allow_leftmost_as_ghost=False):
671
"""Add revision_id, tree tuple as a parent.
673
This is equivalent to retrieving the current list of parent trees
674
and setting the list to its value plus parent_tuple. See also
675
add_parent_tree_id - if you only have a parent id available it will be
676
simpler to use that api. If you have the parent already available, using
677
this api is preferred.
679
:param parent_tuple: The (revision id, tree) to add to the parent list. If the revision_id is a ghost, pass None for the tree.
681
self.set_parent_ids(self.get_parent_ids() + [parent_tuple[0]],
682
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
579
685
def add_pending_merge(self, *revision_ids):
580
686
# TODO: Perhaps should check at this point that the
581
687
# history of the revision is actually present?
582
688
p = self.pending_merges()
689
existing_parents = self.get_parent_ids()
584
691
for rev_id in revision_ids:
694
if rev_id in existing_parents:
610
717
@needs_write_lock
718
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
719
"""Set the parent ids to revision_ids.
721
See also set_parent_trees. This api will try to retrieve the tree data
722
for each element of revision_ids from the trees repository. If you have
723
tree data already available, it is more efficient to use
724
set_parent_trees rather than set_parent_ids. set_parent_ids is however
725
an easier API to use.
727
:param revision_ids: The revision_ids to set as the parent ids of this
728
working tree. Any of these may be ghosts.
731
for rev_id in revision_ids:
734
(rev_id, self.branch.repository.revision_tree(rev_id)))
735
except errors.RevisionNotPresent:
736
trees.append((rev_id, None))
738
self.set_parent_trees(trees,
739
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
742
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
743
"""Set the parents of the working tree.
745
:param parents_list: A list of (revision_id, tree) tuples.
746
If tree is None, then that element is treated as an unreachable
747
parent tree - i.e. a ghost.
749
parent = parents_list[:1]
751
if (not allow_leftmost_as_ghost and not
752
self.branch.repository.has_revision(parent[0][0])):
753
raise errors.GhostRevision(parent[0][0])
754
self.set_last_revision(parent[0][0])
756
self.set_last_revision(None)
757
merges = parents_list[1:]
758
self.set_pending_merges([revid for revid, tree in merges])
611
761
def set_pending_merges(self, rev_list):
762
if self.last_revision() is None:
763
new_last_list = rev_list[:1]
764
rev_list = rev_list[1:]
766
self.set_last_revision(new_last_list[0])
612
767
self._control_files.put_utf8('pending-merges', '\n'.join(rev_list))
614
769
@needs_write_lock
666
821
Skips the control directory.
668
823
inv = self._inventory
670
def descend(from_dir_relpath, from_dir_id, dp):
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()
674
847
## TODO: If we find a subdirectory with its own .bzr
675
848
## directory, then that is a separate tree and we
676
849
## should exclude it.
678
851
# the bzrdir for this tree
679
if self.bzrdir.transport.base.endswith(f + '/'):
852
if transport_base_dir == f:
683
fp = appendpath(from_dir_relpath, 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
686
fap = appendpath(dp, f)
862
fap = from_dir_abspath + '/' + f
688
864
f_ie = inv.get_child(from_dir_id, f)
691
elif self.is_ignored(fp):
867
elif self.is_ignored(fp[1:]):
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:]):
696
890
fk = file_kind(fap)
704
898
# make a last minute entry
900
yield fp[1:], c, fk, f_ie.file_id, f_ie
708
if fk == 'directory':
709
entry = TreeDirectory()
712
elif fk == 'symlink':
903
yield fp[1:], c, fk, None, fk_entries[fk]()
905
yield fp[1:], c, fk, None, TreeEntry()
717
yield fp, c, fk, (f_ie and f_ie.file_id), entry
719
908
if fk != 'directory':
723
# don't descend unversioned directories
726
for ff in descend(fp, f_ie.file_id, fap):
911
# But do this child first
912
new_children = os.listdir(fap)
914
new_children = collections.deque(new_children)
915
stack.append((f_ie.file_id, fp, fap, new_children))
916
# Break out of inner loop, so that we start outer loop with child
919
# if we finished all children, pop it off the stack
729
for f in descend(u'', inv.root.file_id, self.basedir):
732
923
@needs_write_lock
733
924
def move(self, from_paths, to_name):
853
1044
These are files in the working directory that are not versioned or
854
1045
control files or ignored.
856
>>> from bzrlib.bzrdir import ScratchDir
857
>>> d = ScratchDir(files=['foo', 'foo~'])
858
>>> b = d.open_branch()
859
>>> tree = d.open_workingtree()
860
>>> map(str, tree.unknowns())
863
>>> list(b.unknowns())
865
>>> tree.remove('foo')
866
>>> list(b.unknowns())
869
1047
for subp in self.extras():
870
1048
if not self.is_ignored(subp):
906
1085
repository = self.branch.repository
907
1086
pb = bzrlib.ui.ui_factory.nested_progress_bar()
1088
new_basis_tree = self.branch.basis_tree()
909
1089
merge_inner(self.branch,
910
self.branch.basis_tree(),
916
self.set_last_revision(self.branch.last_revision())
1096
# TODO - dedup parents list with things merged by pull ?
1097
# reuse the revisiontree we merged against to set the new
1099
parent_trees = [(self.branch.last_revision(), new_basis_tree)]
1100
# we have to pull the merge trees out again, because
1101
# merge_inner has set the ids. - this corner is not yet
1102
# layered well enough to prevent double handling.
1103
merges = self.get_parent_ids()[1:]
1104
parent_trees.extend([
1105
(parent, repository.revision_tree(parent)) for
1107
self.set_parent_trees(parent_trees)
940
1131
for subf in os.listdir(dirabs):
942
and (subf not in dir_entry.children)):
1134
if subf not in dir_entry.children:
1135
subf_norm, can_access = osutils.normalized_filename(subf)
1136
if subf_norm != subf and can_access:
1137
if subf_norm not in dir_entry.children:
1138
fl.append(subf_norm)
947
subp = appendpath(path, subf)
1144
subp = pathjoin(path, subf)
1147
def _translate_ignore_rule(self, rule):
1148
"""Translate a single ignore rule to a regex.
1150
There are two types of ignore rules. Those that do not contain a / are
1151
matched against the tail of the filename (that is, they do not care
1152
what directory the file is in.) Rules which do contain a slash must
1153
match the entire path. As a special case, './' at the start of the
1154
string counts as a slash in the string but is removed before matching
1155
(e.g. ./foo.c, ./src/foo.c)
1157
:return: The translated regex.
1159
if rule[:2] in ('./', '.\\'):
1161
result = fnmatch.translate(rule[2:])
1162
elif '/' in rule or '\\' in rule:
1164
result = fnmatch.translate(rule)
1166
# default rule style.
1167
result = "(?:.*/)?(?!.*/)" + fnmatch.translate(rule)
1168
assert result[-1] == '$', "fnmatch.translate did not add the expected $"
1169
return "(" + result + ")"
1171
def _combine_ignore_rules(self, rules):
1172
"""Combine a list of ignore rules into a single regex object.
1174
Each individual rule is combined with | to form a big regex, which then
1175
has $ added to it to form something like ()|()|()$. The group index for
1176
each subregex's outermost group is placed in a dictionary mapping back
1177
to the rule. This allows quick identification of the matching rule that
1179
:return: a list of the compiled regex and the matching-group index
1180
dictionaries. We return a list because python complains if you try to
1181
combine more than 100 regexes.
1186
translated_rules = []
1188
translated_rule = self._translate_ignore_rule(rule)
1189
compiled_rule = re.compile(translated_rule)
1190
groups[next_group] = rule
1191
next_group += compiled_rule.groups
1192
translated_rules.append(translated_rule)
1193
if next_group == 99:
1194
result.append((re.compile("|".join(translated_rules)), groups))
1197
translated_rules = []
1198
if len(translated_rules):
1199
result.append((re.compile("|".join(translated_rules)), groups))
951
1202
def ignored_files(self):
952
1203
"""Yield list of PATH, IGNORE_PATTERN"""
959
1209
def get_ignore_list(self):
960
1210
"""Return list of ignore patterns.
962
1212
Cached in the Tree object after the first call.
964
if hasattr(self, '_ignorelist'):
965
return self._ignorelist
967
l = bzrlib.DEFAULT_IGNORE[:]
1214
ignoreset = getattr(self, '_ignoreset', None)
1215
if ignoreset is not None:
1218
ignore_globs = set(bzrlib.DEFAULT_IGNORE)
1219
ignore_globs.update(ignores.get_runtime_ignores())
1221
ignore_globs.update(ignores.get_user_ignores())
968
1223
if self.has_filename(bzrlib.IGNORE_FILENAME):
969
1224
f = self.get_file_byname(bzrlib.IGNORE_FILENAME)
970
l.extend([line.rstrip("\n\r") for line in f.readlines()])
1226
ignore_globs.update(ignores.parse_ignore_file(f))
1230
self._ignoreset = ignore_globs
1231
self._ignore_regex = self._combine_ignore_rules(ignore_globs)
1234
def _get_ignore_rules_as_regex(self):
1235
"""Return a regex of the ignore rules and a mapping dict.
1237
:return: (ignore rules compiled regex, dictionary mapping rule group
1238
indices to original rule.)
1240
if getattr(self, '_ignoreset', None) is None:
1241
self.get_ignore_list()
1242
return self._ignore_regex
975
1244
def is_ignored(self, filename):
976
1245
r"""Check whether the filename matches an ignore pattern.
990
1259
# treat dotfiles correctly and allows * to match /.
991
1260
# 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):
1263
rules = self._get_ignore_rules_as_regex()
1264
for regex, mapping in rules:
1265
match = regex.match(filename)
1266
if match is not None:
1267
# one or more of the groups in mapping will have a non-None
1269
groups = match.groups()
1270
rules = [mapping[group] for group in
1271
mapping if groups[group] is not None]
1013
1275
def kind(self, file_id):
1014
1276
return file_kind(self.id2abspath(file_id))
1059
1327
if new_revision is None:
1060
1328
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])
1331
self.branch.generate_revision_history(new_revision)
1332
except errors.NoSuchRevision:
1333
# not present in the repo - dont try to set it deeper than the tip
1334
self.branch.set_revision_history([new_revision])
1071
1337
def _cache_basis_inventory(self, new_revision):
1072
1338
"""Cache new_revision as the basis inventory."""
1339
# TODO: this should allow the ready-to-use inventory to be passed in,
1340
# as commit already has that ready-to-use [while the format is the
1074
1343
# this double handles the inventory - unpack and repack -
1075
1344
# but is easier to understand. We can/should put a conditional
1076
1345
# in here based on whether the inventory is in the latest format
1077
1346
# - 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)
1348
# the fast path is to copy the raw xml from the repository. If the
1349
# xml contains 'revision_id="', then we assume the right
1350
# revision_id is set. We must check for this full string, because a
1351
# root node id can legitimately look like 'revision_id' but cannot
1353
xml = self.branch.repository.get_inventory_xml(new_revision)
1354
if not 'revision_id="' in xml.split('\n', 1)[0]:
1355
inv = self.branch.repository.deserialise_inventory(
1357
inv.revision_id = new_revision
1358
xml = bzrlib.xml5.serializer_v5.write_inventory_to_string(inv)
1359
assert isinstance(xml, str), 'serialised xml must be bytestring.'
1083
1360
path = self._basis_inventory_name()
1084
self._control_files.put_utf8(path, xml)
1085
except WeaveRevisionNotPresent:
1362
self._control_files.put(path, sio)
1363
except (errors.NoSuchRevision, errors.RevisionNotPresent):
1088
1366
def read_basis_inventory(self):
1089
1367
"""Read the cached basis inventory."""
1090
1368
path = self._basis_inventory_name()
1091
return self._control_files.get_utf8(path).read()
1369
return self._control_files.get(path).read()
1093
1371
@needs_read_lock
1094
1372
def read_working_inventory(self):
1129
1407
# TODO: Perhaps make this just a warning, and continue?
1130
1408
# This tends to happen when
1131
1409
raise NotVersionedError(path=f)
1132
mutter("remove inventory entry %s {%s}", quotefn(f), fid)
1134
1411
# having remove it, it must be either ignored or unknown
1135
1412
if self.is_ignored(f):
1136
1413
new_status = 'I'
1138
1415
new_status = '?'
1139
show_status(new_status, inv[fid].kind, quotefn(f))
1416
show_status(new_status, inv[fid].kind, f, to_file=to_file)
1142
1419
self._write_inventory(inv)
1204
1481
between multiple working trees, i.e. via shared storage, then we
1205
1482
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()
1484
raise NotImplementedError(self.unlock)
1230
1486
@needs_write_lock
1231
1487
def update(self):
1263
1516
this_tree=self)
1264
1517
self.set_last_revision(self.branch.last_revision())
1518
# TODO - dedup parents list with things merged by pull ?
1519
# reuse the tree we've updated to to set the basis:
1520
parent_trees = [(self.branch.last_revision(), to_tree)]
1521
merges = self.get_parent_ids()[1:]
1522
# pull the other trees out of the repository. This could be
1523
# better expressed - for instance by inserting a parent, and
1524
# that would remove duplication.
1525
parent_trees.extend([
1526
(parent, self.branch.repository.revision_tree(parent)) for
1528
self.set_parent_trees(parent_trees)
1265
1529
if old_tip and old_tip != self.last_revision():
1266
# our last revision was not the prior branch last reivison
1530
# our last revision was not the prior branch last revision
1267
1531
# and we have converted that last revision to a pending merge.
1268
1532
# base is somewhere between the branch tip now
1269
1533
# and the now pending merge
1306
1574
if file_kind(self.abspath(conflicted)) != "file":
1309
if e.errno == errno.ENOENT:
1576
except errors.NoSuchFile:
1313
1578
if text is True:
1314
1579
for suffix in ('.THIS', '.OTHER'):
1316
1581
kind = file_kind(self.abspath(conflicted+suffix))
1318
if e.errno == errno.ENOENT:
1584
except errors.NoSuchFile:
1326
1588
ctype = {True: 'text conflict', False: 'contents conflict'}[text]
1327
1589
conflicts.append(Conflict.factory(ctype, path=conflicted,
1329
1591
return conflicts
1594
class WorkingTree2(WorkingTree):
1595
"""This is the Format 2 working tree.
1597
This was the first weave based working tree.
1598
- uses os locks for locking.
1599
- uses the branch last-revision.
1603
# we share control files:
1604
if self._hashcache.needs_write and self._control_files._lock_count==3:
1605
self._hashcache.write()
1606
# reverse order of locking.
1608
return self._control_files.unlock()
1610
self.branch.unlock()
1332
1613
class WorkingTree3(WorkingTree):
1333
1614
"""This is the Format 3 working tree.
1486
1779
"""See WorkingTreeFormat.get_format_description()."""
1487
1780
return "Working tree format 2"
1782
def stub_initialize_remote(self, control_files):
1783
"""As a special workaround create critical control files for a remote working tree
1785
This ensures that it can later be updated and dealt with locally,
1786
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
1787
no working tree. (See bug #43064).
1791
bzrlib.xml5.serializer_v5.write_inventory(inv, sio)
1793
control_files.put('inventory', sio)
1795
control_files.put_utf8('pending-merges', '')
1489
1798
def initialize(self, a_bzrdir, revision_id=None):
1490
1799
"""See WorkingTreeFormat.initialize()."""
1491
1800
if not isinstance(a_bzrdir.transport, LocalTransport):
1512
1821
_bzrdir=a_bzrdir)
1513
1822
wt._write_inventory(inv)
1514
1823
wt.set_root_id(inv.root.file_id)
1515
wt.set_last_revision(revision)
1516
wt.set_pending_merges([])
1517
build_tree(wt.basis_tree(), wt)
1824
basis_tree = branch.repository.revision_tree(revision)
1825
wt.set_parent_trees([(revision, basis_tree)])
1826
build_tree(basis_tree, wt)
1520
1829
def __init__(self):
1577
1886
transport = a_bzrdir.get_workingtree_transport(self)
1578
1887
control_files = self._open_control_files(a_bzrdir)
1579
1888
control_files.create_lock()
1889
control_files.lock_write()
1580
1890
control_files.put_utf8('format', self.get_format_string())
1581
1891
branch = a_bzrdir.open_branch()
1582
1892
if revision_id is None:
1583
1893
revision_id = branch.last_revision()
1584
1894
inv = Inventory()
1585
wt = WorkingTree3(a_bzrdir.root_transport.base,
1895
wt = WorkingTree3(a_bzrdir.root_transport.local_abspath('.'),
1588
1898
_internal=True,
1590
1900
_bzrdir=a_bzrdir,
1591
1901
_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)
1904
wt._write_inventory(inv)
1905
wt.set_root_id(inv.root.file_id)
1906
basis_tree = branch.repository.revision_tree(revision_id)
1907
wt.set_parent_trees([(revision_id, basis_tree)])
1908
build_tree(basis_tree, wt)
1911
control_files.unlock()
1599
1914
def __init__(self):
1611
1926
raise NotImplementedError
1612
1927
if not isinstance(a_bzrdir.transport, LocalTransport):
1613
1928
raise errors.NotLocalUrl(a_bzrdir.transport.base)
1614
control_files = self._open_control_files(a_bzrdir)
1615
return WorkingTree3(a_bzrdir.root_transport.base,
1929
return self._open(a_bzrdir, self._open_control_files(a_bzrdir))
1931
def _open(self, a_bzrdir, control_files):
1932
"""Open the tree itself.
1934
:param a_bzrdir: the dir for the tree.
1935
:param control_files: the control files for the tree.
1937
return WorkingTree3(a_bzrdir.root_transport.local_abspath('.'),
1616
1938
_internal=True,
1618
1940
_bzrdir=a_bzrdir,
1645
1967
self._transport_readonly_server = transport_readonly_server
1646
1968
self._formats = formats
1970
def _clone_test(self, test, bzrdir_format, workingtree_format, variation):
1971
"""Clone test for adaption."""
1972
new_test = deepcopy(test)
1973
new_test.transport_server = self._transport_server
1974
new_test.transport_readonly_server = self._transport_readonly_server
1975
new_test.bzrdir_format = bzrdir_format
1976
new_test.workingtree_format = workingtree_format
1977
def make_new_test_id():
1978
new_id = "%s(%s)" % (test.id(), variation)
1979
return lambda: new_id
1980
new_test.id = make_new_test_id()
1648
1983
def adapt(self, test):
1649
1984
from bzrlib.tests import TestSuite
1650
1985
result = TestSuite()
1651
1986
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()
1987
new_test = self._clone_test(
1990
workingtree_format, workingtree_format.__class__.__name__)
1661
1991
result.addTest(new_test)