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
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
548
# but with branch a kwarg now, passing in args as is results in the
472
549
#message being used for the branch
473
550
args = (DEPRECATED_PARAMETER, message, ) + args
474
Commit().commit(working_tree=self, revprops=revprops, *args, **kwargs)
551
committed_id = Commit().commit( working_tree=self, revprops=revprops,
475
553
self._set_inventory(self.read_working_inventory())
477
556
def id2abspath(self, file_id):
478
557
return self.abspath(self.id2path(file_id))
496
575
return os.path.getsize(self.id2abspath(file_id))
499
def get_file_sha1(self, file_id):
500
path = self._inventory.id2path(file_id)
578
def get_file_sha1(self, file_id, path=None):
580
path = self._inventory.id2path(file_id)
501
581
return self._hashcache.get_sha1(path)
503
def is_executable(self, file_id):
504
if not supports_executable():
583
def get_file_mtime(self, file_id, path=None):
585
path = self._inventory.id2path(file_id)
586
return os.lstat(self.abspath(path)).st_mtime
588
if not supports_executable():
589
def is_executable(self, file_id, path=None):
505
590
return self._inventory[file_id].executable
507
path = self._inventory.id2path(file_id)
592
def is_executable(self, file_id, path=None):
594
path = self._inventory.id2path(file_id)
508
595
mode = os.lstat(self.abspath(path)).st_mode
509
return bool(stat.S_ISREG(mode) and stat.S_IEXEC&mode)
596
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
511
598
@needs_write_lock
512
599
def add(self, files, ids=None):
555
642
raise BzrError("cannot add top-level %r" % f)
557
644
fullpath = normpath(self.abspath(f))
560
646
kind = file_kind(fullpath)
561
647
except OSError, e:
562
648
if e.errno == errno.ENOENT:
563
649
raise NoSuchFile(fullpath)
564
# maybe something better?
565
raise BzrError('cannot add: not a regular file, symlink or directory: %s' % quotefn(f))
567
650
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))
651
raise errors.BadFileKindError(filename=f, kind=kind)
571
652
if file_id is None:
572
file_id = gen_file_id(f)
573
inv.add_path(f, kind=kind, file_id=file_id)
653
inv.add_path(f, kind=kind)
655
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
657
self._write_inventory(inv)
578
659
@needs_write_lock
660
def add_parent_tree_id(self, revision_id, allow_leftmost_as_ghost=False):
661
"""Add revision_id as a parent.
663
This is equivalent to retrieving the current list of parent ids
664
and setting the list to its value plus revision_id.
666
:param revision_id: The revision id to add to the parent list. It may
667
be a ghost revision as long as its not the first parent to be added,
668
or the allow_leftmost_as_ghost parameter is set True.
669
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
671
parents = self.get_parent_ids() + [revision_id]
672
self.set_parent_ids(parents,
673
allow_leftmost_as_ghost=len(parents) > 1 or allow_leftmost_as_ghost)
676
def add_parent_tree(self, parent_tuple, allow_leftmost_as_ghost=False):
677
"""Add revision_id, tree tuple as a parent.
679
This is equivalent to retrieving the current list of parent trees
680
and setting the list to its value plus parent_tuple. See also
681
add_parent_tree_id - if you only have a parent id available it will be
682
simpler to use that api. If you have the parent already available, using
683
this api is preferred.
685
:param parent_tuple: The (revision id, tree) to add to the parent list.
686
If the revision_id is a ghost, pass None for the tree.
687
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
689
self.set_parent_ids(self.get_parent_ids() + [parent_tuple[0]],
690
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
579
693
def add_pending_merge(self, *revision_ids):
580
694
# TODO: Perhaps should check at this point that the
581
695
# history of the revision is actually present?
582
696
p = self.pending_merges()
697
existing_parents = self.get_parent_ids()
584
699
for rev_id in revision_ids:
702
if rev_id in existing_parents:
610
725
@needs_write_lock
726
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
727
"""Set the parent ids to revision_ids.
729
See also set_parent_trees. This api will try to retrieve the tree data
730
for each element of revision_ids from the trees repository. If you have
731
tree data already available, it is more efficient to use
732
set_parent_trees rather than set_parent_ids. set_parent_ids is however
733
an easier API to use.
735
:param revision_ids: The revision_ids to set as the parent ids of this
736
working tree. Any of these may be ghosts.
739
for rev_id in revision_ids:
742
(rev_id, self.branch.repository.revision_tree(rev_id)))
743
except errors.RevisionNotPresent:
744
trees.append((rev_id, None))
745
self.set_parent_trees(trees,
746
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
749
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
750
"""Set the parents of the working tree.
752
:param parents_list: A list of (revision_id, tree) tuples.
753
If tree is None, then that element is treated as an unreachable
754
parent tree - i.e. a ghost.
756
if len(parents_list) > 0:
757
leftmost_id = parents_list[0][0]
758
if (not allow_leftmost_as_ghost and not
759
self.branch.repository.has_revision(leftmost_id)):
760
raise errors.GhostRevisionUnusableHere(leftmost_id)
761
self.set_last_revision(leftmost_id)
763
self.set_last_revision(None)
764
merges = parents_list[1:]
765
self.set_pending_merges([revid for revid, tree in merges])
611
768
def set_pending_merges(self, rev_list):
769
if self.last_revision() is None:
770
new_last_list = rev_list[:1]
771
rev_list = rev_list[1:]
773
self.set_last_revision(new_last_list[0])
612
774
self._control_files.put_utf8('pending-merges', '\n'.join(rev_list))
614
776
@needs_write_lock
666
828
Skips the control directory.
668
830
inv = self._inventory
670
def descend(from_dir_relpath, from_dir_id, dp):
831
# Convert these into local objects to save lookup times
832
pathjoin = osutils.pathjoin
833
file_kind = osutils.file_kind
835
# transport.base ends in a slash, we want the piece
836
# between the last two slashes
837
transport_base_dir = self.bzrdir.transport.base.rsplit('/', 2)[1]
839
fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
841
# directory file_id, relative path, absolute path, reverse sorted children
842
children = os.listdir(self.basedir)
844
# jam 20060527 The kernel sized tree seems equivalent whether we
845
# use a deque and popleft to keep them sorted, or if we use a plain
846
# list and just reverse() them.
847
children = collections.deque(children)
848
stack = [(inv.root.file_id, u'', self.basedir, children)]
850
from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
853
f = children.popleft()
674
854
## TODO: If we find a subdirectory with its own .bzr
675
855
## directory, then that is a separate tree and we
676
856
## should exclude it.
678
858
# the bzrdir for this tree
679
if self.bzrdir.transport.base.endswith(f + '/'):
859
if transport_base_dir == f:
683
fp = appendpath(from_dir_relpath, f)
862
# we know that from_dir_relpath and from_dir_abspath never end in a slash
863
# and 'f' doesn't begin with one, we can do a string op, rather
864
# than the checks of pathjoin(), all relative paths will have an extra slash
866
fp = from_dir_relpath + '/' + f
686
fap = appendpath(dp, f)
869
fap = from_dir_abspath + '/' + f
688
871
f_ie = inv.get_child(from_dir_id, f)
691
elif self.is_ignored(fp):
874
elif self.is_ignored(fp[1:]):
877
# we may not have found this file, because of a unicode issue
878
f_norm, can_access = osutils.normalized_filename(f)
879
if f == f_norm or not can_access:
880
# No change, so treat this file normally
883
# this file can be accessed by a normalized path
884
# check again if it is versioned
885
# these lines are repeated here for performance
887
fp = from_dir_relpath + '/' + f
888
fap = from_dir_abspath + '/' + f
889
f_ie = inv.get_child(from_dir_id, f)
892
elif self.is_ignored(fp[1:]):
696
897
fk = file_kind(fap)
704
905
# make a last minute entry
907
yield fp[1:], c, fk, f_ie.file_id, f_ie
708
if fk == 'directory':
709
entry = TreeDirectory()
712
elif fk == 'symlink':
910
yield fp[1:], c, fk, None, fk_entries[fk]()
912
yield fp[1:], c, fk, None, TreeEntry()
717
yield fp, c, fk, (f_ie and f_ie.file_id), entry
719
915
if fk != 'directory':
723
# don't descend unversioned directories
726
for ff in descend(fp, f_ie.file_id, fap):
918
# But do this child first
919
new_children = os.listdir(fap)
921
new_children = collections.deque(new_children)
922
stack.append((f_ie.file_id, fp, fap, new_children))
923
# Break out of inner loop, so that we start outer loop with child
926
# if we finished all children, pop it off the stack
729
for f in descend(u'', inv.root.file_id, self.basedir):
732
930
@needs_write_lock
733
931
def move(self, from_paths, to_name):
853
1051
These are files in the working directory that are not versioned or
854
1052
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
1054
for subp in self.extras():
870
1055
if not self.is_ignored(subp):
940
1126
for subf in os.listdir(dirabs):
942
and (subf not in dir_entry.children)):
1129
if subf not in dir_entry.children:
1130
subf_norm, can_access = osutils.normalized_filename(subf)
1131
if subf_norm != subf and can_access:
1132
if subf_norm not in dir_entry.children:
1133
fl.append(subf_norm)
947
subp = appendpath(path, subf)
1139
subp = pathjoin(path, subf)
1142
def _translate_ignore_rule(self, rule):
1143
"""Translate a single ignore rule to a regex.
1145
There are two types of ignore rules. Those that do not contain a / are
1146
matched against the tail of the filename (that is, they do not care
1147
what directory the file is in.) Rules which do contain a slash must
1148
match the entire path. As a special case, './' at the start of the
1149
string counts as a slash in the string but is removed before matching
1150
(e.g. ./foo.c, ./src/foo.c)
1152
:return: The translated regex.
1154
if rule[:2] in ('./', '.\\'):
1156
result = fnmatch.translate(rule[2:])
1157
elif '/' in rule or '\\' in rule:
1159
result = fnmatch.translate(rule)
1161
# default rule style.
1162
result = "(?:.*/)?(?!.*/)" + fnmatch.translate(rule)
1163
assert result[-1] == '$', "fnmatch.translate did not add the expected $"
1164
return "(" + result + ")"
1166
def _combine_ignore_rules(self, rules):
1167
"""Combine a list of ignore rules into a single regex object.
1169
Each individual rule is combined with | to form a big regex, which then
1170
has $ added to it to form something like ()|()|()$. The group index for
1171
each subregex's outermost group is placed in a dictionary mapping back
1172
to the rule. This allows quick identification of the matching rule that
1174
:return: a list of the compiled regex and the matching-group index
1175
dictionaries. We return a list because python complains if you try to
1176
combine more than 100 regexes.
1181
translated_rules = []
1183
translated_rule = self._translate_ignore_rule(rule)
1184
compiled_rule = re.compile(translated_rule)
1185
groups[next_group] = rule
1186
next_group += compiled_rule.groups
1187
translated_rules.append(translated_rule)
1188
if next_group == 99:
1189
result.append((re.compile("|".join(translated_rules)), groups))
1192
translated_rules = []
1193
if len(translated_rules):
1194
result.append((re.compile("|".join(translated_rules)), groups))
951
1197
def ignored_files(self):
952
1198
"""Yield list of PATH, IGNORE_PATTERN"""
959
1204
def get_ignore_list(self):
960
1205
"""Return list of ignore patterns.
962
1207
Cached in the Tree object after the first call.
964
if hasattr(self, '_ignorelist'):
965
return self._ignorelist
967
l = bzrlib.DEFAULT_IGNORE[:]
1209
ignoreset = getattr(self, '_ignoreset', None)
1210
if ignoreset is not None:
1213
ignore_globs = set(bzrlib.DEFAULT_IGNORE)
1214
ignore_globs.update(ignores.get_runtime_ignores())
1216
ignore_globs.update(ignores.get_user_ignores())
968
1218
if self.has_filename(bzrlib.IGNORE_FILENAME):
969
1219
f = self.get_file_byname(bzrlib.IGNORE_FILENAME)
970
l.extend([line.rstrip("\n\r") for line in f.readlines()])
1221
ignore_globs.update(ignores.parse_ignore_file(f))
1225
self._ignoreset = ignore_globs
1226
self._ignore_regex = self._combine_ignore_rules(ignore_globs)
1229
def _get_ignore_rules_as_regex(self):
1230
"""Return a regex of the ignore rules and a mapping dict.
1232
:return: (ignore rules compiled regex, dictionary mapping rule group
1233
indices to original rule.)
1235
if getattr(self, '_ignoreset', None) is None:
1236
self.get_ignore_list()
1237
return self._ignore_regex
975
1239
def is_ignored(self, filename):
976
1240
r"""Check whether the filename matches an ignore pattern.
990
1254
# treat dotfiles correctly and allows * to match /.
991
1255
# 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):
1258
rules = self._get_ignore_rules_as_regex()
1259
for regex, mapping in rules:
1260
match = regex.match(filename)
1261
if match is not None:
1262
# one or more of the groups in mapping will have a non-None
1264
groups = match.groups()
1265
rules = [mapping[group] for group in
1266
mapping if groups[group] is not None]
1013
1270
def kind(self, file_id):
1014
1271
return file_kind(self.id2abspath(file_id))
1059
1322
if new_revision is None:
1060
1323
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])
1326
self.branch.generate_revision_history(new_revision)
1327
except errors.NoSuchRevision:
1328
# not present in the repo - dont try to set it deeper than the tip
1329
self.branch.set_revision_history([new_revision])
1071
1332
def _cache_basis_inventory(self, new_revision):
1072
1333
"""Cache new_revision as the basis inventory."""
1334
# TODO: this should allow the ready-to-use inventory to be passed in,
1335
# as commit already has that ready-to-use [while the format is the
1074
1338
# this double handles the inventory - unpack and repack -
1075
1339
# but is easier to understand. We can/should put a conditional
1076
1340
# in here based on whether the inventory is in the latest format
1077
1341
# - 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)
1343
# the fast path is to copy the raw xml from the repository. If the
1344
# xml contains 'revision_id="', then we assume the right
1345
# revision_id is set. We must check for this full string, because a
1346
# root node id can legitimately look like 'revision_id' but cannot
1348
xml = self.branch.repository.get_inventory_xml(new_revision)
1349
if not 'revision_id="' in xml.split('\n', 1)[0]:
1350
inv = self.branch.repository.deserialise_inventory(
1352
inv.revision_id = new_revision
1353
xml = bzrlib.xml5.serializer_v5.write_inventory_to_string(inv)
1354
assert isinstance(xml, str), 'serialised xml must be bytestring.'
1083
1355
path = self._basis_inventory_name()
1084
self._control_files.put_utf8(path, xml)
1085
except WeaveRevisionNotPresent:
1357
self._control_files.put(path, sio)
1358
except (errors.NoSuchRevision, errors.RevisionNotPresent):
1088
1361
def read_basis_inventory(self):
1089
1362
"""Read the cached basis inventory."""
1090
1363
path = self._basis_inventory_name()
1091
return self._control_files.get_utf8(path).read()
1364
return self._control_files.get(path).read()
1093
1366
@needs_read_lock
1094
1367
def read_working_inventory(self):
1129
1402
# TODO: Perhaps make this just a warning, and continue?
1130
1403
# This tends to happen when
1131
1404
raise NotVersionedError(path=f)
1132
mutter("remove inventory entry %s {%s}", quotefn(f), fid)
1134
1406
# having remove it, it must be either ignored or unknown
1135
1407
if self.is_ignored(f):
1136
1408
new_status = 'I'
1138
1410
new_status = '?'
1139
show_status(new_status, inv[fid].kind, quotefn(f))
1411
show_status(new_status, inv[fid].kind, f, to_file=to_file)
1142
1414
self._write_inventory(inv)
1204
1476
between multiple working trees, i.e. via shared storage, then we
1205
1477
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()
1479
raise NotImplementedError(self.unlock)
1230
1481
@needs_write_lock
1231
1482
def update(self):
1248
1499
Do a 'normal' merge of the old branch basis if it is relevant.
1250
1501
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,
1502
# here if old_tip is not None, it is the old tip of the branch before
1503
# it was updated from the master branch. This should become a pending
1504
# merge in the working tree to preserve the user existing work. we
1505
# cant set that until we update the working trees last revision to be
1506
# one from the new branch, because it will just get absorbed by the
1507
# parent de-duplication logic.
1509
# We MUST save it even if an error occurs, because otherwise the users
1510
# local work is unreferenced and will appear to have been lost.
1513
if self.last_revision() != self.branch.last_revision():
1514
# merge tree state up to new branch tip.
1515
basis = self.basis_tree()
1516
to_tree = self.branch.basis_tree()
1517
result += merge_inner(self.branch,
1521
# when we have set_parent_ids/set_parent_trees we can
1522
# set the pending merge from old tip here if needed. We cant
1523
# set a pending merge for old tip until we've changed the
1524
# primary parent because it will typically have the same value.
1264
1526
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()
1528
if old_tip is not None:
1529
self.add_pending_merge(old_tip)
1531
# the working tree had the same last-revision as the master
1532
# branch did. We may still have pivot local work from the local
1533
# branch into old_tip:
1534
if old_tip is not None:
1535
self.add_pending_merge(old_tip)
1536
if old_tip and old_tip != self.last_revision():
1537
# our last revision was not the prior branch last revision
1538
# and we have converted that last revision to a pending merge.
1539
# base is somewhere between the branch tip now
1540
# and the now pending merge
1541
from bzrlib.revision import common_ancestor
1543
base_rev_id = common_ancestor(self.branch.last_revision(),
1545
self.branch.repository)
1546
except errors.NoCommonAncestor:
1548
base_tree = self.branch.repository.revision_tree(base_rev_id)
1549
other_tree = self.branch.repository.revision_tree(old_tip)
1550
result += merge_inner(self.branch,
1287
1556
@needs_write_lock
1288
1557
def _write_inventory(self, inv):
1306
1578
if file_kind(self.abspath(conflicted)) != "file":
1309
if e.errno == errno.ENOENT:
1580
except errors.NoSuchFile:
1313
1582
if text is True:
1314
1583
for suffix in ('.THIS', '.OTHER'):
1316
1585
kind = file_kind(self.abspath(conflicted+suffix))
1318
if e.errno == errno.ENOENT:
1588
except errors.NoSuchFile:
1326
1592
ctype = {True: 'text conflict', False: 'contents conflict'}[text]
1327
1593
conflicts.append(Conflict.factory(ctype, path=conflicted,
1329
1595
return conflicts
1598
class WorkingTree2(WorkingTree):
1599
"""This is the Format 2 working tree.
1601
This was the first weave based working tree.
1602
- uses os locks for locking.
1603
- uses the branch last-revision.
1607
# we share control files:
1608
if self._hashcache.needs_write and self._control_files._lock_count==3:
1609
self._hashcache.write()
1610
# reverse order of locking.
1612
return self._control_files.unlock()
1614
self.branch.unlock()
1332
1617
class WorkingTree3(WorkingTree):
1333
1618
"""This is the Format 3 working tree.
1486
1783
"""See WorkingTreeFormat.get_format_description()."""
1487
1784
return "Working tree format 2"
1786
def stub_initialize_remote(self, control_files):
1787
"""As a special workaround create critical control files for a remote working tree
1789
This ensures that it can later be updated and dealt with locally,
1790
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
1791
no working tree. (See bug #43064).
1795
bzrlib.xml5.serializer_v5.write_inventory(inv, sio)
1797
control_files.put('inventory', sio)
1799
control_files.put_utf8('pending-merges', '')
1489
1802
def initialize(self, a_bzrdir, revision_id=None):
1490
1803
"""See WorkingTreeFormat.initialize()."""
1491
1804
if not isinstance(a_bzrdir.transport, LocalTransport):
1577
1890
transport = a_bzrdir.get_workingtree_transport(self)
1578
1891
control_files = self._open_control_files(a_bzrdir)
1579
1892
control_files.create_lock()
1893
control_files.lock_write()
1580
1894
control_files.put_utf8('format', self.get_format_string())
1581
1895
branch = a_bzrdir.open_branch()
1582
1896
if revision_id is None:
1583
1897
revision_id = branch.last_revision()
1584
1898
inv = Inventory()
1585
wt = WorkingTree3(a_bzrdir.root_transport.base,
1899
wt = WorkingTree3(a_bzrdir.root_transport.local_abspath('.'),
1588
1902
_internal=True,
1590
1904
_bzrdir=a_bzrdir,
1591
1905
_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)
1908
wt._write_inventory(inv)
1909
wt.set_root_id(inv.root.file_id)
1910
wt.set_last_revision(revision_id)
1911
wt.set_pending_merges([])
1912
build_tree(wt.basis_tree(), wt)
1915
control_files.unlock()
1599
1918
def __init__(self):
1611
1930
raise NotImplementedError
1612
1931
if not isinstance(a_bzrdir.transport, LocalTransport):
1613
1932
raise errors.NotLocalUrl(a_bzrdir.transport.base)
1614
control_files = self._open_control_files(a_bzrdir)
1615
return WorkingTree3(a_bzrdir.root_transport.base,
1933
return self._open(a_bzrdir, self._open_control_files(a_bzrdir))
1935
def _open(self, a_bzrdir, control_files):
1936
"""Open the tree itself.
1938
:param a_bzrdir: the dir for the tree.
1939
:param control_files: the control files for the tree.
1941
return WorkingTree3(a_bzrdir.root_transport.local_abspath('.'),
1616
1942
_internal=True,
1618
1944
_bzrdir=a_bzrdir,
1645
1971
self._transport_readonly_server = transport_readonly_server
1646
1972
self._formats = formats
1974
def _clone_test(self, test, bzrdir_format, workingtree_format, variation):
1975
"""Clone test for adaption."""
1976
new_test = deepcopy(test)
1977
new_test.transport_server = self._transport_server
1978
new_test.transport_readonly_server = self._transport_readonly_server
1979
new_test.bzrdir_format = bzrdir_format
1980
new_test.workingtree_format = workingtree_format
1981
def make_new_test_id():
1982
new_id = "%s(%s)" % (test.id(), variation)
1983
return lambda: new_id
1984
new_test.id = make_new_test_id()
1648
1987
def adapt(self, test):
1649
1988
from bzrlib.tests import TestSuite
1650
1989
result = TestSuite()
1651
1990
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()
1991
new_test = self._clone_test(
1994
workingtree_format, workingtree_format.__class__.__name__)
1661
1995
result.addTest(new_test)
added
removed
bzrlib/workingtree.py
