1
# Copyright (C) 2005-2011 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
"""WorkingTree object and friends.
19
A WorkingTree represents the editable working copy of a branch.
20
Operations which represent the WorkingTree are also done here,
21
such as renaming or adding files.
23
At the moment every WorkingTree has its own branch. Remote
24
WorkingTrees aren't supported.
26
To get a WorkingTree, call controldir.open_workingtree() or
27
WorkingTree.open(dir).
30
from __future__ import absolute_import
39
from .lazy_import import lazy_import
40
lazy_import(globals(), """
45
conflicts as _mod_conflicts,
47
filters as _mod_filters,
49
revision as _mod_revision,
54
from breezy.bzr import (
59
from .controldir import (
61
ControlComponentFormatRegistry,
62
ControlComponentFormat,
69
from .i18n import gettext
70
from . import mutabletree
71
from .trace import mutter, note
74
ERROR_PATH_NOT_FOUND = 3 # WindowsError errno code, equivalent to ENOENT
77
class SettingFileIdUnsupported(errors.BzrError):
79
_fmt = "This format does not support setting file ids."
82
class ShelvingUnsupported(errors.BzrError):
84
_fmt = "This format does not support shelving changes."
87
class WorkingTree(mutabletree.MutableTree, ControlComponent):
90
:ivar basedir: The root of the tree on disk. This is a unicode path object
91
(as opposed to a URL).
94
# override this to set the strategy for storing views
95
def _make_views(self):
96
return views.DisabledViews(self)
98
def __init__(self, basedir='.',
104
"""Construct a WorkingTree instance. This is not a public API.
106
:param branch: A branch to override probing for the branch.
108
self._format = _format
109
self.controldir = _controldir
111
raise errors.BzrError("Please use controldir.open_workingtree or "
112
"WorkingTree.open() to obtain a WorkingTree.")
113
basedir = osutils.safe_unicode(basedir)
114
mutter("opening working tree %r", basedir)
115
if branch is not None:
116
self._branch = branch
118
self._branch = self.controldir.open_branch()
119
self.basedir = osutils.realpath(basedir)
120
self._transport = _transport
121
self._rules_searcher = None
122
self.views = self._make_views()
125
def user_transport(self):
126
return self.controldir.user_transport
129
def control_transport(self):
130
return self._transport
132
def is_control_filename(self, filename):
133
"""True if filename is the name of a control file in this tree.
135
:param filename: A filename within the tree. This is a relative path
136
from the root of this tree.
138
This is true IF and ONLY IF the filename is part of the meta data
139
that bzr controls in this tree. I.E. a random .bzr directory placed
140
on disk will not be a control file for this tree.
142
return self.controldir.is_control_filename(filename)
145
fget=lambda self: self._branch,
146
doc="""The branch this WorkingTree is connected to.
148
This cannot be set - it is reflective of the actual disk structure
149
the working tree has been constructed from.
152
def has_versioned_directories(self):
153
"""See `Tree.has_versioned_directories`."""
154
return self._format.supports_versioned_directories
156
def supports_merge_modified(self):
157
"""Indicate whether this workingtree supports storing merge_modified.
159
return self._format.supports_merge_modified
161
def _supports_executable(self):
162
if sys.platform == 'win32':
164
# FIXME: Ideally this should check the file system
167
def break_lock(self):
168
"""Break a lock if one is present from another instance.
170
Uses the ui factory to ask for confirmation if the lock may be from
173
This will probe the repository for its lock as well.
175
raise NotImplementedError(self.break_lock)
177
def requires_rich_root(self):
178
return self._format.requires_rich_root
180
def supports_tree_reference(self):
183
def supports_content_filtering(self):
184
return self._format.supports_content_filtering()
186
def supports_views(self):
187
return self.views.supports_views()
189
def supports_setting_file_ids(self):
190
return self._format.supports_setting_file_ids
192
def get_config_stack(self):
193
"""Retrieve the config stack for this tree.
195
:return: A ``breezy.config.Stack``
197
# For the moment, just provide the branch config stack.
198
return self.branch.get_config_stack()
201
def open(path=None, _unsupported=False):
202
"""Open an existing working tree at path.
206
path = osutils.getcwd()
207
control = ControlDir.open(path, _unsupported=_unsupported)
208
return control.open_workingtree(unsupported=_unsupported)
211
def open_containing(path=None):
212
"""Open an existing working tree which has its root about path.
214
This probes for a working tree at path and searches upwards from there.
216
Basically we keep looking up until we find the control directory or
217
run into /. If there isn't one, raises NotBranchError.
218
TODO: give this a new exception.
219
If there is one, it is returned, along with the unused portion of path.
221
:return: The WorkingTree that contains 'path', and the rest of path
224
path = osutils.getcwd()
225
control, relpath = ControlDir.open_containing(path)
226
return control.open_workingtree(), relpath
229
def open_containing_paths(file_list, default_directory=None,
230
canonicalize=True, apply_view=True):
231
"""Open the WorkingTree that contains a set of paths.
233
Fail if the paths given are not all in a single tree.
235
This is used for the many command-line interfaces that take a list of
236
any number of files and that require they all be in the same tree.
238
if default_directory is None:
239
default_directory = u'.'
240
# recommended replacement for builtins.internal_tree_files
241
if file_list is None or len(file_list) == 0:
242
tree = WorkingTree.open_containing(default_directory)[0]
243
# XXX: doesn't really belong here, and seems to have the strange
244
# side effect of making it return a bunch of files, not the whole
245
# tree -- mbp 20100716
246
if tree.supports_views() and apply_view:
247
view_files = tree.views.lookup_view()
249
file_list = view_files
250
view_str = views.view_display_str(view_files)
251
note(gettext("Ignoring files outside view. View is %s") % view_str)
252
return tree, file_list
253
if default_directory == u'.':
256
seed = default_directory
257
file_list = [osutils.pathjoin(default_directory, f)
259
tree = WorkingTree.open_containing(seed)[0]
260
return tree, tree.safe_relpath_files(file_list, canonicalize,
261
apply_view=apply_view)
263
def safe_relpath_files(self, file_list, canonicalize=True, apply_view=True):
264
"""Convert file_list into a list of relpaths in tree.
266
:param self: A tree to operate on.
267
:param file_list: A list of user provided paths or None.
268
:param apply_view: if True and a view is set, apply it or check that
269
specified files are within it
270
:return: A list of relative paths.
271
:raises errors.PathNotChild: When a provided path is in a different self
274
if file_list is None:
276
if self.supports_views() and apply_view:
277
view_files = self.views.lookup_view()
281
# self.relpath exists as a "thunk" to osutils, but canonical_relpath
282
# doesn't - fix that up here before we enter the loop.
285
return osutils.canonical_relpath(self.basedir, p)
288
for filename in file_list:
289
relpath = fixer(osutils.dereference_path(filename))
290
if view_files and not osutils.is_inside_any(view_files, relpath):
291
raise views.FileOutsideView(filename, view_files)
292
new_list.append(relpath)
296
def open_downlevel(path=None):
297
"""Open an unsupported working tree.
299
Only intended for advanced situations like upgrading part of a controldir.
301
return WorkingTree.open(path, _unsupported=True)
304
return "<%s of %s>" % (self.__class__.__name__,
305
getattr(self, 'basedir', None))
307
def abspath(self, filename):
308
return osutils.pathjoin(self.basedir, filename)
310
def basis_tree(self):
311
"""Return RevisionTree for the current last revision.
313
If the left most parent is a ghost then the returned tree will be an
314
empty tree - one obtained by calling
315
repository.revision_tree(NULL_REVISION).
318
revision_id = self.get_parent_ids()[0]
320
# no parents, return an empty revision tree.
321
# in the future this should return the tree for
322
# 'empty:' - the implicit root empty tree.
323
return self.branch.repository.revision_tree(
324
_mod_revision.NULL_REVISION)
326
return self.revision_tree(revision_id)
327
except errors.NoSuchRevision:
329
# No cached copy available, retrieve from the repository.
330
# FIXME? RBC 20060403 should we cache the tree locally
333
return self.branch.repository.revision_tree(revision_id)
334
except (errors.RevisionNotPresent, errors.NoSuchRevision):
335
# the basis tree *may* be a ghost or a low level error may have
336
# occurred. If the revision is present, its a problem, if its not
338
if self.branch.repository.has_revision(revision_id):
340
# the basis tree is a ghost so return an empty tree.
341
return self.branch.repository.revision_tree(
342
_mod_revision.NULL_REVISION)
344
def relpath(self, path):
345
"""Return the local path portion from a given path.
347
The path may be absolute or relative. If its a relative path it is
348
interpreted relative to the python current working directory.
350
return osutils.relpath(self.basedir, path)
352
def has_filename(self, filename):
353
return osutils.lexists(self.abspath(filename))
355
def get_file(self, path, filtered=True):
356
return self.get_file_with_stat(path, filtered=filtered)[0]
358
def get_file_with_stat(self, path, filtered=True,
359
_fstat=osutils.fstat):
360
"""See Tree.get_file_with_stat."""
361
abspath = self.abspath(path)
363
file_obj = open(abspath, 'rb')
364
except EnvironmentError as e:
365
if e.errno == errno.ENOENT:
366
raise errors.NoSuchFile(path)
368
stat_value = _fstat(file_obj.fileno())
369
if filtered and self.supports_content_filtering():
370
filters = self._content_filter_stack(path)
371
file_obj = _mod_filters.filtered_input_file(file_obj, filters)
372
return (file_obj, stat_value)
374
def get_file_text(self, path, filtered=True):
375
with self.get_file(path, filtered=filtered) as my_file:
376
return my_file.read()
378
def get_file_lines(self, path, filtered=True):
379
"""See Tree.get_file_lines()"""
380
with self.get_file(path, filtered=filtered) as file:
381
return file.readlines()
383
def get_parent_ids(self):
384
"""See Tree.get_parent_ids.
386
This implementation reads the pending merges list and last_revision
387
value and uses that to decide what the parents list should be.
389
last_rev = _mod_revision.ensure_null(self._last_revision())
390
if _mod_revision.NULL_REVISION == last_rev:
395
merges_bytes = self._transport.get_bytes('pending-merges')
396
except errors.NoSuchFile:
399
for l in osutils.split_lines(merges_bytes):
400
revision_id = l.rstrip(b'\n')
401
parents.append(revision_id)
404
def get_root_id(self):
405
"""Return the id of this trees root"""
406
raise NotImplementedError(self.get_root_id)
408
def clone(self, to_controldir, revision_id=None):
409
"""Duplicate this working tree into to_bzr, including all state.
411
Specifically modified files are kept as modified, but
412
ignored and unknown files are discarded.
414
If you want to make a new line of development, see ControlDir.sprout()
417
If not None, the cloned tree will have its last revision set to
418
revision, and difference between the source trees last revision
419
and this one merged in.
421
with self.lock_read():
422
# assumes the target bzr dir format is compatible.
423
result = to_controldir.create_workingtree()
424
self.copy_content_into(result, revision_id)
427
def copy_content_into(self, tree, revision_id=None):
428
"""Copy the current content and user files of this tree into tree."""
429
with self.lock_read():
430
tree.set_root_id(self.get_root_id())
431
if revision_id is None:
432
merge.transform_tree(tree, self)
434
# TODO now merge from tree.last_revision to revision (to
435
# preserve user local changes)
437
other_tree = self.revision_tree(revision_id)
438
except errors.NoSuchRevision:
439
other_tree = self.branch.repository.revision_tree(
442
merge.transform_tree(tree, other_tree)
443
if revision_id == _mod_revision.NULL_REVISION:
446
new_parents = [revision_id]
447
tree.set_parent_ids(new_parents)
449
def get_file_size(self, path):
450
"""See Tree.get_file_size"""
451
# XXX: this returns the on-disk size; it should probably return the
454
return os.path.getsize(self.abspath(path))
456
if e.errno != errno.ENOENT:
461
def _gather_kinds(self, files, kinds):
462
"""See MutableTree._gather_kinds."""
463
with self.lock_tree_write():
464
for pos, f in enumerate(files):
465
if kinds[pos] is None:
466
fullpath = osutils.normpath(self.abspath(f))
468
kinds[pos] = osutils.file_kind(fullpath)
470
if e.errno == errno.ENOENT:
471
raise errors.NoSuchFile(fullpath)
473
def add_parent_tree_id(self, revision_id, allow_leftmost_as_ghost=False):
474
"""Add revision_id as a parent.
476
This is equivalent to retrieving the current list of parent ids
477
and setting the list to its value plus revision_id.
479
:param revision_id: The revision id to add to the parent list. It may
480
be a ghost revision as long as its not the first parent to be
481
added, or the allow_leftmost_as_ghost parameter is set True.
482
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
484
with self.lock_write():
485
parents = self.get_parent_ids() + [revision_id]
486
self.set_parent_ids(parents, allow_leftmost_as_ghost=len(parents) > 1
487
or allow_leftmost_as_ghost)
489
def add_parent_tree(self, parent_tuple, allow_leftmost_as_ghost=False):
490
"""Add revision_id, tree tuple as a parent.
492
This is equivalent to retrieving the current list of parent trees
493
and setting the list to its value plus parent_tuple. See also
494
add_parent_tree_id - if you only have a parent id available it will be
495
simpler to use that api. If you have the parent already available, using
496
this api is preferred.
498
:param parent_tuple: The (revision id, tree) to add to the parent list.
499
If the revision_id is a ghost, pass None for the tree.
500
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
502
with self.lock_tree_write():
503
parent_ids = self.get_parent_ids() + [parent_tuple[0]]
504
if len(parent_ids) > 1:
505
# the leftmost may have already been a ghost, preserve that if it
507
allow_leftmost_as_ghost = True
508
self.set_parent_ids(parent_ids,
509
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
511
def add_pending_merge(self, *revision_ids):
512
with self.lock_tree_write():
513
# TODO: Perhaps should check at this point that the
514
# history of the revision is actually present?
515
parents = self.get_parent_ids()
517
for rev_id in revision_ids:
518
if rev_id in parents:
520
parents.append(rev_id)
523
self.set_parent_ids(parents, allow_leftmost_as_ghost=True)
525
def path_content_summary(self, path, _lstat=os.lstat,
526
_mapper=osutils.file_kind_from_stat_mode):
527
"""See Tree.path_content_summary."""
528
abspath = self.abspath(path)
530
stat_result = _lstat(abspath)
532
if getattr(e, 'errno', None) == errno.ENOENT:
534
return ('missing', None, None, None)
535
# propagate other errors
537
kind = _mapper(stat_result.st_mode)
539
return self._file_content_summary(path, stat_result)
540
elif kind == 'directory':
541
# perhaps it looks like a plain directory, but it's really a
543
if self._directory_is_tree_reference(path):
544
kind = 'tree-reference'
545
return kind, None, None, None
546
elif kind == 'symlink':
547
target = osutils.readlink(abspath)
548
return ('symlink', None, None, target)
550
return (kind, None, None, None)
552
def _file_content_summary(self, path, stat_result):
553
size = stat_result.st_size
554
executable = self._is_executable_from_path_and_stat(path, stat_result)
555
# try for a stat cache lookup
556
return ('file', size, executable, self._sha_from_stat(
559
def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
560
"""Common ghost checking functionality from set_parent_*.
562
This checks that the left hand-parent exists if there are any
565
if len(revision_ids) > 0:
566
leftmost_id = revision_ids[0]
567
if (not allow_leftmost_as_ghost and not
568
self.branch.repository.has_revision(leftmost_id)):
569
raise errors.GhostRevisionUnusableHere(leftmost_id)
571
def _set_merges_from_parent_ids(self, parent_ids):
572
merges = parent_ids[1:]
573
self._transport.put_bytes('pending-merges', b'\n'.join(merges),
574
mode=self.controldir._get_file_mode())
576
def _filter_parent_ids_by_ancestry(self, revision_ids):
577
"""Check that all merged revisions are proper 'heads'.
579
This will always return the first revision_id, and any merged revisions
582
if len(revision_ids) == 0:
584
graph = self.branch.repository.get_graph()
585
heads = graph.heads(revision_ids)
586
new_revision_ids = revision_ids[:1]
587
for revision_id in revision_ids[1:]:
588
if revision_id in heads and revision_id not in new_revision_ids:
589
new_revision_ids.append(revision_id)
590
if new_revision_ids != revision_ids:
591
mutter('requested to set revision_ids = %s,'
592
' but filtered to %s', revision_ids, new_revision_ids)
593
return new_revision_ids
595
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
596
"""Set the parent ids to revision_ids.
598
See also set_parent_trees. This api will try to retrieve the tree data
599
for each element of revision_ids from the trees repository. If you have
600
tree data already available, it is more efficient to use
601
set_parent_trees rather than set_parent_ids. set_parent_ids is however
602
an easier API to use.
604
:param revision_ids: The revision_ids to set as the parent ids of this
605
working tree. Any of these may be ghosts.
607
with self.lock_tree_write():
608
self._check_parents_for_ghosts(revision_ids,
609
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
610
for revision_id in revision_ids:
611
_mod_revision.check_not_reserved_id(revision_id)
613
revision_ids = self._filter_parent_ids_by_ancestry(revision_ids)
615
if len(revision_ids) > 0:
616
self.set_last_revision(revision_ids[0])
618
self.set_last_revision(_mod_revision.NULL_REVISION)
620
self._set_merges_from_parent_ids(revision_ids)
622
def set_pending_merges(self, rev_list):
623
with self.lock_tree_write():
624
parents = self.get_parent_ids()
625
leftmost = parents[:1]
626
new_parents = leftmost + rev_list
627
self.set_parent_ids(new_parents)
629
def set_merge_modified(self, modified_hashes):
630
"""Set the merge modified hashes."""
631
raise NotImplementedError(self.set_merge_modified)
633
def _sha_from_stat(self, path, stat_result):
634
"""Get a sha digest from the tree's stat cache.
636
The default implementation assumes no stat cache is present.
638
:param path: The path.
639
:param stat_result: The stat result being looked up.
643
def merge_from_branch(self, branch, to_revision=None, from_revision=None,
644
merge_type=None, force=False):
645
"""Merge from a branch into this working tree.
647
:param branch: The branch to merge from.
648
:param to_revision: If non-None, the merge will merge to to_revision,
649
but not beyond it. to_revision does not need to be in the history
650
of the branch when it is supplied. If None, to_revision defaults to
651
branch.last_revision().
653
from .merge import Merger, Merge3Merger
654
with self.lock_write():
655
merger = Merger(self.branch, this_tree=self)
656
# check that there are no local alterations
657
if not force and self.has_changes():
658
raise errors.UncommittedChanges(self)
659
if to_revision is None:
660
to_revision = _mod_revision.ensure_null(branch.last_revision())
661
merger.other_rev_id = to_revision
662
if _mod_revision.is_null(merger.other_rev_id):
663
raise errors.NoCommits(branch)
664
self.branch.fetch(branch, last_revision=merger.other_rev_id)
665
merger.other_basis = merger.other_rev_id
666
merger.other_tree = self.branch.repository.revision_tree(
668
merger.other_branch = branch
669
if from_revision is None:
672
merger.set_base_revision(from_revision, branch)
673
if merger.base_rev_id == merger.other_rev_id:
674
raise errors.PointlessMerge
675
merger.backup_files = False
676
if merge_type is None:
677
merger.merge_type = Merge3Merger
679
merger.merge_type = merge_type
680
merger.set_interesting_files(None)
681
merger.show_base = False
682
merger.reprocess = False
683
conflicts = merger.do_merge()
687
def merge_modified(self):
688
"""Return a dictionary of files modified by a merge.
690
The list is initialized by WorkingTree.set_merge_modified, which is
691
typically called after we make some automatic updates to the tree
694
This returns a map of file_id->sha1, containing only files which are
695
still in the working tree and have that text hash.
697
raise NotImplementedError(self.merge_modified)
699
def mkdir(self, path, file_id=None):
700
"""See MutableTree.mkdir()."""
702
if self.supports_setting_file_ids():
703
file_id = generate_ids.gen_file_id(os.path.basename(path))
705
if not self.supports_setting_file_ids():
706
raise SettingFileIdUnsupported()
707
with self.lock_write():
708
os.mkdir(self.abspath(path))
709
self.add(path, file_id, 'directory')
712
def get_symlink_target(self, path):
713
abspath = self.abspath(path)
714
target = osutils.readlink(abspath)
717
def subsume(self, other_tree):
718
raise NotImplementedError(self.subsume)
720
def _directory_is_tree_reference(self, relpath):
721
raise NotImplementedError(self._directory_is_tree_reference)
723
def extract(self, path, format=None):
724
"""Extract a subtree from this tree.
726
A new branch will be created, relative to the path for this tree.
728
raise NotImplementedError(self.extract)
731
"""Write the in memory meta data to disk."""
732
raise NotImplementedError(self.flush)
734
def kind(self, relpath):
735
return osutils.file_kind(self.abspath(relpath))
737
def list_files(self, include_root=False, from_dir=None, recursive=True):
738
"""List all files as (path, class, kind, id, entry).
740
Lists, but does not descend into unversioned directories.
741
This does not include files that have been deleted in this
742
tree. Skips the control directory.
744
:param include_root: if True, return an entry for the root
745
:param from_dir: start from this directory or None for the root
746
:param recursive: whether to recurse into subdirectories or not
748
raise NotImplementedError(self.list_files)
750
def move(self, from_paths, to_dir=None, after=False):
753
to_dir must be known to the working tree.
755
If to_dir exists and is a directory, the files are moved into
756
it, keeping their old names.
758
Note that to_dir is only the last component of the new name;
759
this doesn't change the directory.
761
For each entry in from_paths the move mode will be determined
764
The first mode moves the file in the filesystem and updates the
765
working tree metadata. The second mode only updates the working tree
766
metadata without touching the file on the filesystem.
768
move uses the second mode if 'after == True' and the target is not
769
versioned but present in the working tree.
771
move uses the second mode if 'after == False' and the source is
772
versioned but no longer in the working tree, and the target is not
773
versioned but present in the working tree.
775
move uses the first mode if 'after == False' and the source is
776
versioned and present in the working tree, and the target is not
777
versioned and not present in the working tree.
779
Everything else results in an error.
781
This returns a list of (from_path, to_path) pairs for each
784
raise NotImplementedError(self.move)
786
def copy_one(self, from_rel, to_rel):
787
"""Copy a file in the tree to a new location.
789
This default implementation just copies the file, then
792
:param from_rel: From location (relative to tree root)
793
:param to_rel: Target location (relative to tree root)
795
shutil.copyfile(self.abspath(from_rel), self.abspath(to_rel))
799
"""Return all unknown files.
801
These are files in the working directory that are not versioned or
802
control files or ignored.
804
with self.lock_read():
805
# force the extras method to be fully executed before returning, to
806
# prevent race conditions with the lock
808
[subp for subp in self.extras() if not self.is_ignored(subp)])
810
def unversion(self, paths):
811
"""Remove the path in pahs from the current versioned set.
813
When a path is unversioned, all of its children are automatically
816
:param paths: The paths to stop versioning.
817
:raises NoSuchFile: if any path is not currently versioned.
819
raise NotImplementedError(self.unversion)
821
def pull(self, source, overwrite=False, stop_revision=None,
822
change_reporter=None, possible_transports=None, local=False,
824
with self.lock_write(), source.lock_read():
825
old_revision_info = self.branch.last_revision_info()
826
basis_tree = self.basis_tree()
827
count = self.branch.pull(source, overwrite, stop_revision,
828
possible_transports=possible_transports,
830
new_revision_info = self.branch.last_revision_info()
831
if new_revision_info != old_revision_info:
832
repository = self.branch.repository
833
if repository._format.fast_deltas:
834
parent_ids = self.get_parent_ids()
836
basis_id = parent_ids[0]
837
basis_tree = repository.revision_tree(basis_id)
838
with basis_tree.lock_read():
839
new_basis_tree = self.branch.basis_tree()
845
change_reporter=change_reporter,
847
basis_root_id = basis_tree.get_root_id()
848
new_root_id = new_basis_tree.get_root_id()
849
if new_root_id is not None and basis_root_id != new_root_id:
850
self.set_root_id(new_root_id)
851
# TODO - dedup parents list with things merged by pull ?
852
# reuse the revisiontree we merged against to set the new
855
if self.branch.last_revision() != _mod_revision.NULL_REVISION:
857
(self.branch.last_revision(), new_basis_tree))
858
# we have to pull the merge trees out again, because
859
# merge_inner has set the ids. - this corner is not yet
860
# layered well enough to prevent double handling.
861
# XXX TODO: Fix the double handling: telling the tree about
862
# the already known parent data is wasteful.
863
merges = self.get_parent_ids()[1:]
864
parent_trees.extend([
865
(parent, repository.revision_tree(parent)) for
867
self.set_parent_trees(parent_trees)
870
def put_file_bytes_non_atomic(self, path, bytes):
871
"""See MutableTree.put_file_bytes_non_atomic."""
872
with self.lock_write(), open(self.abspath(path), 'wb') as stream:
876
"""Yield all unversioned files in this WorkingTree.
878
If there are any unversioned directories and the file format
879
supports versioning directories, then only the directory is returned,
880
not all its children. But if there are unversioned files under a
881
versioned subdirectory, they are returned.
883
Currently returned depth-first, sorted by name within directories.
884
This is the same order used by 'osutils.walkdirs'.
886
raise NotImplementedError(self.extras)
888
def ignored_files(self):
889
"""Yield list of PATH, IGNORE_PATTERN"""
890
for subp in self.extras():
891
pat = self.is_ignored(subp)
895
def is_ignored(self, filename):
896
r"""Check whether the filename matches an ignore pattern.
898
raise NotImplementedError(self.is_ignored)
900
def stored_kind(self, path):
901
"""See Tree.stored_kind"""
902
raise NotImplementedError(self.stored_kind)
904
def _comparison_data(self, entry, path):
905
abspath = self.abspath(path)
907
stat_value = os.lstat(abspath)
909
if getattr(e, 'errno', None) == errno.ENOENT:
916
mode = stat_value.st_mode
917
kind = osutils.file_kind_from_stat_mode(mode)
918
if not self._supports_executable():
919
executable = entry is not None and entry.executable
921
executable = bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
922
return kind, executable, stat_value
924
def last_revision(self):
925
"""Return the last revision of the branch for this tree.
927
This format tree does not support a separate marker for last-revision
928
compared to the branch.
930
See MutableTree.last_revision
932
return self._last_revision()
934
def _last_revision(self):
935
"""helper for get_parent_ids."""
936
with self.lock_read():
937
return _mod_revision.ensure_null(self.branch.last_revision())
940
"""Check if this tree is locked."""
941
raise NotImplementedError(self.is_locked)
944
"""Lock the tree for reading.
946
This also locks the branch, and can be unlocked via self.unlock().
948
:return: A breezy.lock.LogicalLockResult.
950
raise NotImplementedError(self.lock_read)
952
def lock_tree_write(self):
953
"""See MutableTree.lock_tree_write, and WorkingTree.unlock.
955
:return: A breezy.lock.LogicalLockResult.
957
raise NotImplementedError(self.lock_tree_write)
959
def lock_write(self):
960
"""See MutableTree.lock_write, and WorkingTree.unlock.
962
:return: A breezy.lock.LogicalLockResult.
964
raise NotImplementedError(self.lock_write)
966
def get_physical_lock_status(self):
967
raise NotImplementedError(self.get_physical_lock_status)
969
def set_last_revision(self, new_revision):
970
"""Change the last revision in the working tree."""
971
raise NotImplementedError(self.set_last_revision)
973
def _change_last_revision(self, new_revision):
974
"""Template method part of set_last_revision to perform the change.
976
This is used to allow WorkingTree3 instances to not affect branch
977
when their last revision is set.
979
if _mod_revision.is_null(new_revision):
980
self.branch.set_last_revision_info(0, new_revision)
982
_mod_revision.check_not_reserved_id(new_revision)
984
self.branch.generate_revision_history(new_revision)
985
except errors.NoSuchRevision:
986
# not present in the repo - dont try to set it deeper than the tip
987
self.branch._set_revision_history([new_revision])
990
def remove(self, files, verbose=False, to_file=None, keep_files=True,
992
"""Remove nominated files from the working tree metadata.
994
:files: File paths relative to the basedir.
995
:keep_files: If true, the files will also be kept.
996
:force: Delete files and directories, even if they are changed and
997
even if the directories are not empty.
999
raise NotImplementedError(self.remove)
1001
def revert(self, filenames=None, old_tree=None, backups=True,
1002
pb=None, report_changes=False):
1003
from .conflicts import resolve
1004
with self.lock_tree_write():
1005
if old_tree is None:
1006
basis_tree = self.basis_tree()
1007
basis_tree.lock_read()
1008
old_tree = basis_tree
1012
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
1014
if filenames is None and len(self.get_parent_ids()) > 1:
1016
last_revision = self.last_revision()
1017
if last_revision != _mod_revision.NULL_REVISION:
1018
if basis_tree is None:
1019
basis_tree = self.basis_tree()
1020
basis_tree.lock_read()
1021
parent_trees.append((last_revision, basis_tree))
1022
self.set_parent_trees(parent_trees)
1025
resolve(self, filenames, ignore_misses=True, recursive=True)
1027
if basis_tree is not None:
1031
def store_uncommitted(self):
1032
"""Store uncommitted changes from the tree in the branch."""
1033
raise NotImplementedError(self.store_uncommitted)
1035
def restore_uncommitted(self):
1036
"""Restore uncommitted changes from the branch into the tree."""
1037
raise NotImplementedError(self.restore_uncommitted)
1039
def revision_tree(self, revision_id):
1040
"""See Tree.revision_tree.
1042
For trees that can be obtained from the working tree, this
1043
will do so. For other trees, it will fall back to the repository.
1045
raise NotImplementedError(self.revision_tree)
1047
def set_root_id(self, file_id):
1048
"""Set the root id for this tree."""
1049
if not self.supports_setting_file_ids():
1050
raise SettingFileIdUnsupported()
1051
with self.lock_tree_write():
1055
'WorkingTree.set_root_id with fileid=None')
1056
file_id = osutils.safe_file_id(file_id)
1057
self._set_root_id(file_id)
1059
def _set_root_id(self, file_id):
1060
"""Set the root id for this tree, in a format specific manner.
1062
:param file_id: The file id to assign to the root. It must not be
1063
present in the current inventory or an error will occur. It must
1064
not be None, but rather a valid file id.
1066
raise NotImplementedError(self._set_root_id)
1069
"""See Branch.unlock.
1071
WorkingTree locking just uses the Branch locking facilities.
1072
This is current because all working trees have an embedded branch
1073
within them. IF in the future, we were to make branch data shareable
1074
between multiple working trees, i.e. via shared storage, then we
1075
would probably want to lock both the local tree, and the branch.
1077
raise NotImplementedError(self.unlock)
1081
def update(self, change_reporter=None, possible_transports=None,
1082
revision=None, old_tip=_marker, show_base=False):
1083
"""Update a working tree along its branch.
1085
This will update the branch if its bound too, which means we have
1086
multiple trees involved:
1088
- The new basis tree of the master.
1089
- The old basis tree of the branch.
1090
- The old basis tree of the working tree.
1091
- The current working tree state.
1093
Pathologically, all three may be different, and non-ancestors of each
1094
other. Conceptually we want to:
1096
- Preserve the wt.basis->wt.state changes
1097
- Transform the wt.basis to the new master basis.
1098
- Apply a merge of the old branch basis to get any 'local' changes from
1100
- Restore the wt.basis->wt.state changes.
1102
There isn't a single operation at the moment to do that, so we:
1104
- Merge current state -> basis tree of the master w.r.t. the old tree
1106
- Do a 'normal' merge of the old branch basis if it is relevant.
1108
:param revision: The target revision to update to. Must be in the
1110
:param old_tip: If branch.update() has already been run, the value it
1111
returned (old tip of the branch or None). _marker is used
1114
if self.branch.get_bound_location() is not None:
1116
update_branch = (old_tip is self._marker)
1118
self.lock_tree_write()
1119
update_branch = False
1122
old_tip = self.branch.update(possible_transports)
1124
if old_tip is self._marker:
1126
return self._update_tree(old_tip, change_reporter, revision, show_base)
1130
def _update_tree(self, old_tip=None, change_reporter=None, revision=None,
1132
"""Update a tree to the master branch.
1134
:param old_tip: if supplied, the previous tip revision the branch,
1135
before it was changed to the master branch's tip.
1137
# here if old_tip is not None, it is the old tip of the branch before
1138
# it was updated from the master branch. This should become a pending
1139
# merge in the working tree to preserve the user existing work. we
1140
# cant set that until we update the working trees last revision to be
1141
# one from the new branch, because it will just get absorbed by the
1142
# parent de-duplication logic.
1144
# We MUST save it even if an error occurs, because otherwise the users
1145
# local work is unreferenced and will appear to have been lost.
1147
with self.lock_tree_write():
1150
last_rev = self.get_parent_ids()[0]
1152
last_rev = _mod_revision.NULL_REVISION
1153
if revision is None:
1154
revision = self.branch.last_revision()
1156
old_tip = old_tip or _mod_revision.NULL_REVISION
1158
if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
1159
# the branch we are bound to was updated
1160
# merge those changes in first
1161
base_tree = self.basis_tree()
1162
other_tree = self.branch.repository.revision_tree(old_tip)
1163
nb_conflicts = merge.merge_inner(self.branch, other_tree,
1164
base_tree, this_tree=self,
1165
change_reporter=change_reporter,
1166
show_base=show_base)
1168
self.add_parent_tree((old_tip, other_tree))
1169
note(gettext('Rerun update after fixing the conflicts.'))
1172
if last_rev != _mod_revision.ensure_null(revision):
1173
# the working tree is up to date with the branch
1174
# we can merge the specified revision from master
1175
to_tree = self.branch.repository.revision_tree(revision)
1176
to_root_id = to_tree.get_root_id()
1178
basis = self.basis_tree()
1179
with basis.lock_read():
1180
if (basis.get_root_id() is None or basis.get_root_id() != to_root_id):
1181
self.set_root_id(to_root_id)
1184
# determine the branch point
1185
graph = self.branch.repository.get_graph()
1186
base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
1188
base_tree = self.branch.repository.revision_tree(base_rev_id)
1190
nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
1192
change_reporter=change_reporter,
1193
show_base=show_base)
1194
self.set_last_revision(revision)
1195
# TODO - dedup parents list with things merged by pull ?
1196
# reuse the tree we've updated to to set the basis:
1197
parent_trees = [(revision, to_tree)]
1198
merges = self.get_parent_ids()[1:]
1199
# Ideally we ask the tree for the trees here, that way the working
1200
# tree can decide whether to give us the entire tree or give us a
1201
# lazy initialised tree. dirstate for instance will have the trees
1202
# in ram already, whereas a last-revision + basis-inventory tree
1203
# will not, but also does not need them when setting parents.
1204
for parent in merges:
1205
parent_trees.append(
1206
(parent, self.branch.repository.revision_tree(parent)))
1207
if not _mod_revision.is_null(old_tip):
1208
parent_trees.append(
1209
(old_tip, self.branch.repository.revision_tree(old_tip)))
1210
self.set_parent_trees(parent_trees)
1211
last_rev = parent_trees[0][0]
1214
def set_conflicts(self, arg):
1215
raise errors.UnsupportedOperation(self.set_conflicts, self)
1217
def add_conflicts(self, arg):
1218
raise errors.UnsupportedOperation(self.add_conflicts, self)
1220
def conflicts(self):
1221
raise NotImplementedError(self.conflicts)
1223
def walkdirs(self, prefix=""):
1224
"""Walk the directories of this tree.
1226
returns a generator which yields items in the form:
1227
((curren_directory_path, fileid),
1228
[(file1_path, file1_name, file1_kind, (lstat), file1_id,
1231
This API returns a generator, which is only valid during the current
1232
tree transaction - within a single lock_read or lock_write duration.
1234
If the tree is not locked, it may cause an error to be raised,
1235
depending on the tree implementation.
1237
raise NotImplementedError(self.walkdirs)
1239
def auto_resolve(self):
1240
"""Automatically resolve text conflicts according to contents.
1242
Only text conflicts are auto_resolvable. Files with no conflict markers
1243
are considered 'resolved', because bzr always puts conflict markers
1244
into files that have text conflicts. The corresponding .THIS .BASE and
1245
.OTHER files are deleted, as per 'resolve'.
1247
:return: a tuple of ConflictLists: (un_resolved, resolved).
1249
with self.lock_tree_write():
1250
un_resolved = _mod_conflicts.ConflictList()
1251
resolved = _mod_conflicts.ConflictList()
1252
conflict_re = re.compile(b'^(<{7}|={7}|>{7})')
1253
for conflict in self.conflicts():
1254
path = self.id2path(conflict.file_id)
1255
if (conflict.typestring != 'text conflict' or
1256
self.kind(path) != 'file'):
1257
un_resolved.append(conflict)
1259
with open(self.abspath(path), 'rb') as my_file:
1260
for line in my_file:
1261
if conflict_re.search(line):
1262
un_resolved.append(conflict)
1265
resolved.append(conflict)
1266
resolved.remove_files(self)
1267
self.set_conflicts(un_resolved)
1268
return un_resolved, resolved
1270
def _validate(self):
1271
"""Validate internal structures.
1273
This is meant mostly for the test suite. To give it a chance to detect
1274
corruption after actions have occurred. The default implementation is a
1277
:return: None. An exception should be raised if there is an error.
1281
def check_state(self):
1282
"""Check that the working state is/isn't valid."""
1283
raise NotImplementedError(self.check_state)
1285
def reset_state(self, revision_ids=None):
1286
"""Reset the state of the working tree.
1288
This does a hard-reset to a last-known-good state. This is a way to
1289
fix if something got corrupted (like the .bzr/checkout/dirstate file)
1291
raise NotImplementedError(self.reset_state)
1293
def _get_rules_searcher(self, default_searcher):
1294
"""See Tree._get_rules_searcher."""
1295
if self._rules_searcher is None:
1296
self._rules_searcher = super(WorkingTree,
1297
self)._get_rules_searcher(default_searcher)
1298
return self._rules_searcher
1300
def get_shelf_manager(self):
1301
"""Return the ShelfManager for this WorkingTree."""
1302
raise NotImplementedError(self.get_shelf_manager)
1304
def get_canonical_paths(self, paths):
1305
"""Like get_canonical_path() but works on multiple items.
1307
:param paths: A sequence of paths relative to the root of the tree.
1308
:return: A list of paths, with each item the corresponding input path
1309
adjusted to account for existing elements that match case
1312
with self.lock_read():
1316
def get_canonical_path(self, path):
1317
"""Returns the first item in the tree that matches a path.
1319
This is meant to allow case-insensitive path lookups on e.g.
1322
If a path matches exactly, it is returned. If no path matches exactly
1323
but more than one path matches according to the underlying file system,
1324
it is implementation defined which is returned.
1326
If no path matches according to the file system, the input path is
1327
returned, but with as many path entries that do exist changed to their
1330
If you need to resolve many names from the same tree, you should
1331
use get_canonical_paths() to avoid O(N) behaviour.
1333
:param path: A paths relative to the root of the tree.
1334
:return: The input path adjusted to account for existing elements
1335
that match case insensitively.
1337
with self.lock_read():
1338
return next(self.get_canonical_paths([path]))
1341
class WorkingTreeFormatRegistry(ControlComponentFormatRegistry):
1342
"""Registry for working tree formats."""
1344
def __init__(self, other_registry=None):
1345
super(WorkingTreeFormatRegistry, self).__init__(other_registry)
1346
self._default_format = None
1347
self._default_format_key = None
1349
def get_default(self):
1350
"""Return the current default format."""
1351
if (self._default_format_key is not None and
1352
self._default_format is None):
1353
self._default_format = self.get(self._default_format_key)
1354
return self._default_format
1356
def set_default(self, format):
1357
"""Set the default format."""
1358
self._default_format = format
1359
self._default_format_key = None
1361
def set_default_key(self, format_string):
1362
"""Set the default format by its format string."""
1363
self._default_format_key = format_string
1364
self._default_format = None
1367
format_registry = WorkingTreeFormatRegistry()
1370
class WorkingTreeFormat(ControlComponentFormat):
1371
"""An encapsulation of the initialization and open routines for a format.
1373
Formats provide three things:
1374
* An initialization routine,
1378
Formats are placed in an dict by their format string for reference
1379
during workingtree opening. Its not required that these be instances, they
1380
can be classes themselves with class methods - it simply depends on
1381
whether state is needed for a given format or not.
1383
Once a format is deprecated, just deprecate the initialize and open
1384
methods on the format class. Do not deprecate the object, as the
1385
object will be created every time regardless.
1388
requires_rich_root = False
1390
upgrade_recommended = False
1392
requires_normalized_unicode_filenames = False
1394
case_sensitive_filename = "FoRMaT"
1396
missing_parent_conflicts = False
1397
"""If this format supports missing parent conflicts."""
1399
supports_versioned_directories = None
1401
supports_merge_modified = True
1402
"""If this format supports storing merge modified hashes."""
1404
supports_setting_file_ids = True
1405
"""If this format allows setting the file id."""
1407
supports_store_uncommitted = True
1408
"""If this format supports shelve-like functionality."""
1410
supports_leftmost_parent_id_as_ghost = True
1412
supports_righthand_parent_id_as_ghost = True
1414
ignore_filename = None
1415
"""Name of file with ignore patterns, if any. """
1417
def initialize(self, controldir, revision_id=None, from_branch=None,
1418
accelerator_tree=None, hardlink=False):
1419
"""Initialize a new working tree in controldir.
1421
:param controldir: ControlDir to initialize the working tree in.
1422
:param revision_id: allows creating a working tree at a different
1423
revision than the branch is at.
1424
:param from_branch: Branch to checkout
1425
:param accelerator_tree: A tree which can be used for retrieving file
1426
contents more quickly than the revision tree, i.e. a workingtree.
1427
The revision tree will be used for cases where accelerator_tree's
1428
content is different.
1429
:param hardlink: If true, hard-link files from accelerator_tree,
1432
raise NotImplementedError(self.initialize)
1434
def __eq__(self, other):
1435
return self.__class__ is other.__class__
1437
def __ne__(self, other):
1438
return not (self == other)
1440
def get_format_description(self):
1441
"""Return the short description for this format."""
1442
raise NotImplementedError(self.get_format_description)
1444
def is_supported(self):
1445
"""Is this format supported?
1447
Supported formats can be initialized and opened.
1448
Unsupported formats may not support initialization or committing or
1449
some other features depending on the reason for not being supported.
1453
def supports_content_filtering(self):
1454
"""True if this format supports content filtering."""
1457
def supports_views(self):
1458
"""True if this format supports stored views."""
1461
def get_controldir_for_branch(self):
1462
"""Get the control directory format for creating branches.
1464
This is to support testing of working tree formats that can not exist
1465
in the same control directory as a branch.
1467
return self._matchingcontroldir
1470
format_registry.register_lazy(b"Bazaar Working Tree Format 4 (bzr 0.15)\n",
1471
"breezy.bzr.workingtree_4", "WorkingTreeFormat4")
1472
format_registry.register_lazy(b"Bazaar Working Tree Format 5 (bzr 1.11)\n",
1473
"breezy.bzr.workingtree_4", "WorkingTreeFormat5")
1474
format_registry.register_lazy(b"Bazaar Working Tree Format 6 (bzr 1.14)\n",
1475
"breezy.bzr.workingtree_4", "WorkingTreeFormat6")
1476
format_registry.register_lazy(b"Bazaar-NG Working Tree format 3",
1477
"breezy.bzr.workingtree_3", "WorkingTreeFormat3")
1478
format_registry.set_default_key(b"Bazaar Working Tree Format 6 (bzr 1.14)\n")
added
removed
breezy/workingtree.py
