347
344
path = osutils.getcwd()
348
345
control, relpath = bzrdir.BzrDir.open_containing(path)
350
346
return control.open_workingtree(), relpath
349
def open_containing_paths(file_list, default_directory=None,
350
canonicalize=True, apply_view=True):
351
"""Open the WorkingTree that contains a set of paths.
353
Fail if the paths given are not all in a single tree.
355
This is used for the many command-line interfaces that take a list of
356
any number of files and that require they all be in the same tree.
358
if default_directory is None:
359
default_directory = u'.'
360
# recommended replacement for builtins.internal_tree_files
361
if file_list is None or len(file_list) == 0:
362
tree = WorkingTree.open_containing(default_directory)[0]
363
# XXX: doesn't really belong here, and seems to have the strange
364
# side effect of making it return a bunch of files, not the whole
365
# tree -- mbp 20100716
366
if tree.supports_views() and apply_view:
367
view_files = tree.views.lookup_view()
369
file_list = view_files
370
view_str = views.view_display_str(view_files)
371
note("Ignoring files outside view. View is %s" % view_str)
372
return tree, file_list
373
if default_directory == u'.':
376
seed = default_directory
377
file_list = [osutils.pathjoin(default_directory, f)
379
tree = WorkingTree.open_containing(seed)[0]
380
return tree, tree.safe_relpath_files(file_list, canonicalize,
381
apply_view=apply_view)
383
def safe_relpath_files(self, file_list, canonicalize=True, apply_view=True):
384
"""Convert file_list into a list of relpaths in tree.
386
:param self: A tree to operate on.
387
:param file_list: A list of user provided paths or None.
388
:param apply_view: if True and a view is set, apply it or check that
389
specified files are within it
390
:return: A list of relative paths.
391
:raises errors.PathNotChild: When a provided path is in a different self
394
if file_list is None:
396
if self.supports_views() and apply_view:
397
view_files = self.views.lookup_view()
401
# self.relpath exists as a "thunk" to osutils, but canonical_relpath
402
# doesn't - fix that up here before we enter the loop.
404
fixer = lambda p: osutils.canonical_relpath(self.basedir, p)
407
for filename in file_list:
408
relpath = fixer(osutils.dereference_path(filename))
409
if view_files and not osutils.is_inside_any(view_files, relpath):
410
raise errors.FileOutsideView(filename, view_files)
411
new_list.append(relpath)
353
415
def open_downlevel(path=None):
354
416
"""Open an unsupported working tree.
1380
1444
# check the inventory for source and destination
1381
1445
if from_id is None:
1382
1446
raise errors.BzrMoveFailedError(from_rel,to_rel,
1383
errors.NotVersionedError(path=str(from_rel)))
1447
errors.NotVersionedError(path=from_rel))
1384
1448
if to_id is not None:
1385
1449
raise errors.BzrMoveFailedError(from_rel,to_rel,
1386
errors.AlreadyVersionedError(path=str(to_rel)))
1450
errors.AlreadyVersionedError(path=to_rel))
1388
1452
# try to determine the mode for rename (only change inv or change
1389
1453
# inv and file system)
1391
1455
if not self.has_filename(to_rel):
1392
1456
raise errors.BzrMoveFailedError(from_id,to_rel,
1393
errors.NoSuchFile(path=str(to_rel),
1457
errors.NoSuchFile(path=to_rel,
1394
1458
extra="New file has not been created yet"))
1395
1459
only_change_inv = True
1396
1460
elif not self.has_filename(from_rel) and self.has_filename(to_rel):
1798
1853
raise errors.ObjectNotLocked(self)
1800
1855
def lock_read(self):
1801
"""See Branch.lock_read, and WorkingTree.unlock."""
1856
"""Lock the tree for reading.
1858
This also locks the branch, and can be unlocked via self.unlock().
1860
:return: A bzrlib.lock.LogicalLockResult.
1802
1862
if not self.is_locked():
1803
1863
self._reset_data()
1804
1864
self.branch.lock_read()
1806
return self._control_files.lock_read()
1866
self._control_files.lock_read()
1867
return LogicalLockResult(self.unlock)
1808
1869
self.branch.unlock()
1811
1872
def lock_tree_write(self):
1812
"""See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1873
"""See MutableTree.lock_tree_write, and WorkingTree.unlock.
1875
:return: A bzrlib.lock.LogicalLockResult.
1813
1877
if not self.is_locked():
1814
1878
self._reset_data()
1815
1879
self.branch.lock_read()
1817
return self._control_files.lock_write()
1881
self._control_files.lock_write()
1882
return LogicalLockResult(self.unlock)
1819
1884
self.branch.unlock()
1822
1887
def lock_write(self):
1823
"""See MutableTree.lock_write, and WorkingTree.unlock."""
1888
"""See MutableTree.lock_write, and WorkingTree.unlock.
1890
:return: A bzrlib.lock.LogicalLockResult.
1824
1892
if not self.is_locked():
1825
1893
self._reset_data()
1826
1894
self.branch.lock_write()
1828
return self._control_files.lock_write()
1896
self._control_files.lock_write()
1897
return LogicalLockResult(self.unlock)
1830
1899
self.branch.unlock()
2020
all_files = set() # specified and nested files
1952
2021
unknown_nested_files=set()
1953
2022
if to_file is None:
1954
2023
to_file = sys.stdout
2025
files_to_backup = []
1956
2027
def recurse_directory_to_add_files(directory):
1957
2028
# Recurse directory and add all files
1958
2029
# so we can check if they have changed.
1959
for parent_info, file_infos in\
1960
self.walkdirs(directory):
2030
for parent_info, file_infos in self.walkdirs(directory):
1961
2031
for relpath, basename, kind, lstat, fileid, kind in file_infos:
1962
2032
# Is it versioned or ignored?
1963
if self.path2id(relpath) or self.is_ignored(relpath):
2033
if self.path2id(relpath):
1964
2034
# Add nested content for deletion.
1965
new_files.add(relpath)
2035
all_files.add(relpath)
1967
# Files which are not versioned and not ignored
2037
# Files which are not versioned
1968
2038
# should be treated as unknown.
1969
unknown_nested_files.add((relpath, None, kind))
2039
files_to_backup.append(relpath)
1971
2041
for filename in files:
1972
2042
# Get file name into canonical form.
1973
2043
abspath = self.abspath(filename)
1974
2044
filename = self.relpath(abspath)
1975
2045
if len(filename) > 0:
1976
new_files.add(filename)
2046
all_files.add(filename)
1977
2047
recurse_directory_to_add_files(filename)
1979
files = list(new_files)
2049
files = list(all_files)
1981
2051
if len(files) == 0:
1982
2052
return # nothing to do
1987
2057
# Bail out if we are going to delete files we shouldn't
1988
2058
if not keep_files and not force:
1989
has_changed_files = len(unknown_nested_files) > 0
1990
if not has_changed_files:
1991
for (file_id, path, content_change, versioned, parent_id, name,
1992
kind, executable) in self.iter_changes(self.basis_tree(),
1993
include_unchanged=True, require_versioned=False,
1994
want_unversioned=True, specific_files=files):
1995
if versioned == (False, False):
1996
# The record is unknown ...
1997
if not self.is_ignored(path[1]):
1998
# ... but not ignored
1999
has_changed_files = True
2001
elif content_change and (kind[1] is not None):
2002
# Versioned and changed, but not deleted
2003
has_changed_files = True
2059
for (file_id, path, content_change, versioned, parent_id, name,
2060
kind, executable) in self.iter_changes(self.basis_tree(),
2061
include_unchanged=True, require_versioned=False,
2062
want_unversioned=True, specific_files=files):
2063
if versioned[0] == False:
2064
# The record is unknown or newly added
2065
files_to_backup.append(path[1])
2066
elif (content_change and (kind[1] is not None) and
2067
osutils.is_inside_any(files, path[1])):
2068
# Versioned and changed, but not deleted, and still
2069
# in one of the dirs to be deleted.
2070
files_to_backup.append(path[1])
2006
if has_changed_files:
2007
# Make delta show ALL applicable changes in error message.
2008
tree_delta = self.changes_from(self.basis_tree(),
2009
require_versioned=False, want_unversioned=True,
2010
specific_files=files)
2011
for unknown_file in unknown_nested_files:
2012
if unknown_file not in tree_delta.unversioned:
2013
tree_delta.unversioned.extend((unknown_file,))
2014
raise errors.BzrRemoveChangedFilesError(tree_delta)
2072
def backup(file_to_backup):
2073
backup_name = self.bzrdir._available_backup_name(file_to_backup)
2074
osutils.rename(abs_path, self.abspath(backup_name))
2075
return "removed %s (but kept a copy: %s)" % (file_to_backup,
2016
2078
# Build inv_delta and delete files where applicable,
2017
2079
# do this before any modifications to inventory.
2347
2415
def add_conflicts(self, arg):
2348
2416
raise errors.UnsupportedOperation(self.add_conflicts, self)
2351
2418
def conflicts(self):
2352
conflicts = _mod_conflicts.ConflictList()
2353
for conflicted in self._iter_conflicts():
2356
if file_kind(self.abspath(conflicted)) != "file":
2358
except errors.NoSuchFile:
2361
for suffix in ('.THIS', '.OTHER'):
2363
kind = file_kind(self.abspath(conflicted+suffix))
2366
except errors.NoSuchFile:
2370
ctype = {True: 'text conflict', False: 'contents conflict'}[text]
2371
conflicts.append(_mod_conflicts.Conflict.factory(ctype,
2373
file_id=self.path2id(conflicted)))
2419
raise NotImplementedError(self.conflicts)
2376
2421
def walkdirs(self, prefix=""):
2377
2422
"""Walk the directories of this tree.
2644
def check_state(self):
2645
"""Check that the working state is/isn't valid."""
2646
check_refs = self._get_check_refs()
2648
for ref in check_refs:
2651
refs[ref] = self.branch.repository.revision_tree(value)
2654
@needs_tree_write_lock
2655
def reset_state(self, revision_ids=None):
2656
"""Reset the state of the working tree.
2658
This does a hard-reset to a last-known-good state. This is a way to
2659
fix if something got corrupted (like the .bzr/checkout/dirstate file)
2661
if revision_ids is None:
2662
revision_ids = self.get_parent_ids()
2663
if not revision_ids:
2664
rt = self.branch.repository.revision_tree(
2665
_mod_revision.NULL_REVISION)
2667
rt = self.branch.repository.revision_tree(revision_ids[0])
2668
self._write_inventory(rt.inventory)
2669
self.set_parent_ids(revision_ids)
2598
2671
def _get_rules_searcher(self, default_searcher):
2599
2672
"""See Tree._get_rules_searcher."""
2600
2673
if self._rules_searcher is None:
2608
2681
return ShelfManager(self, self._transport)
2611
class WorkingTree2(WorkingTree):
2612
"""This is the Format 2 working tree.
2614
This was the first weave based working tree.
2615
- uses os locks for locking.
2616
- uses the branch last-revision.
2619
def __init__(self, *args, **kwargs):
2620
super(WorkingTree2, self).__init__(*args, **kwargs)
2621
# WorkingTree2 has more of a constraint that self._inventory must
2622
# exist. Because this is an older format, we don't mind the overhead
2623
# caused by the extra computation here.
2625
# Newer WorkingTree's should only have self._inventory set when they
2627
if self._inventory is None:
2628
self.read_working_inventory()
2630
def _get_check_refs(self):
2631
"""Return the references needed to perform a check of this tree."""
2632
return [('trees', self.last_revision())]
2634
def lock_tree_write(self):
2635
"""See WorkingTree.lock_tree_write().
2637
In Format2 WorkingTrees we have a single lock for the branch and tree
2638
so lock_tree_write() degrades to lock_write().
2640
self.branch.lock_write()
2642
return self._control_files.lock_write()
2644
self.branch.unlock()
2648
# do non-implementation specific cleanup
2651
# we share control files:
2652
if self._control_files._lock_count == 3:
2653
# _inventory_is_modified is always False during a read lock.
2654
if self._inventory_is_modified:
2656
self._write_hashcache_if_dirty()
2658
# reverse order of locking.
2660
return self._control_files.unlock()
2662
self.branch.unlock()
2665
2684
class WorkingTree3(WorkingTree):
2666
2685
"""This is the Format 3 working tree.
2740
2759
self.branch.unlock()
2743
def get_conflicted_stem(path):
2744
for suffix in _mod_conflicts.CONFLICT_SUFFIXES:
2745
if path.endswith(suffix):
2746
return path[:-len(suffix)]
2749
class WorkingTreeFormat(object):
2762
class WorkingTreeFormatRegistry(controldir.ControlComponentFormatRegistry):
2763
"""Registry for working tree formats."""
2765
def __init__(self, other_registry=None):
2766
super(WorkingTreeFormatRegistry, self).__init__(other_registry)
2767
self._default_format = None
2769
def get_default(self):
2770
"""Return the current default format."""
2771
return self._default_format
2773
def set_default(self, format):
2774
self._default_format = format
2777
format_registry = WorkingTreeFormatRegistry()
2780
class WorkingTreeFormat(controldir.ControlComponentFormat):
2750
2781
"""An encapsulation of the initialization and open routines for a format.
2752
2783
Formats provide three things:
2764
2795
object will be created every time regardless.
2767
_default_format = None
2768
"""The default format used for new trees."""
2771
"""The known formats."""
2773
2798
requires_rich_root = False
2775
2800
upgrade_recommended = False
2802
requires_normalized_unicode_filenames = False
2804
case_sensitive_filename = "FoRMaT"
2806
missing_parent_conflicts = False
2807
"""If this format supports missing parent conflicts."""
2778
2810
def find_format(klass, a_bzrdir):
2779
2811
"""Return the format for the working tree object in a_bzrdir."""
2781
2813
transport = a_bzrdir.get_workingtree_transport(None)
2782
2814
format_string = transport.get_bytes("format")
2783
return klass._formats[format_string]
2815
return format_registry.get(format_string)
2784
2816
except errors.NoSuchFile:
2785
2817
raise errors.NoWorkingTree(base=transport.base)
2786
2818
except KeyError:
2787
2819
raise errors.UnknownFormatError(format=format_string,
2788
2820
kind="working tree")
2822
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
2823
accelerator_tree=None, hardlink=False):
2824
"""Initialize a new working tree in a_bzrdir.
2826
:param a_bzrdir: BzrDir to initialize the working tree in.
2827
:param revision_id: allows creating a working tree at a different
2828
revision than the branch is at.
2829
:param from_branch: Branch to checkout
2830
:param accelerator_tree: A tree which can be used for retrieving file
2831
contents more quickly than the revision tree, i.e. a workingtree.
2832
The revision tree will be used for cases where accelerator_tree's
2833
content is different.
2834
:param hardlink: If true, hard-link files from accelerator_tree,
2837
raise NotImplementedError(self.initialize)
2790
2839
def __eq__(self, other):
2791
2840
return self.__class__ is other.__class__
2878
@symbol_versioning.deprecated_method(
2879
symbol_versioning.deprecated_in((2, 4, 0)))
2827
2880
def register_format(klass, format):
2828
klass._formats[format.get_format_string()] = format
2881
format_registry.register(format)
2884
@symbol_versioning.deprecated_method(
2885
symbol_versioning.deprecated_in((2, 4, 0)))
2886
def register_extra_format(klass, format):
2887
format_registry.register_extra(format)
2890
@symbol_versioning.deprecated_method(
2891
symbol_versioning.deprecated_in((2, 4, 0)))
2892
def unregister_extra_format(klass, format):
2893
format_registry.unregister_extra(format)
2896
@symbol_versioning.deprecated_method(
2897
symbol_versioning.deprecated_in((2, 4, 0)))
2898
def get_formats(klass):
2899
return format_registry._get_all()
2902
@symbol_versioning.deprecated_method(
2903
symbol_versioning.deprecated_in((2, 4, 0)))
2831
2904
def set_default_format(klass, format):
2832
klass._default_format = format
2905
format_registry.set_default(format)
2908
@symbol_versioning.deprecated_method(
2909
symbol_versioning.deprecated_in((2, 4, 0)))
2835
2910
def unregister_format(klass, format):
2836
del klass._formats[format.get_format_string()]
2839
class WorkingTreeFormat2(WorkingTreeFormat):
2840
"""The second working tree format.
2842
This format modified the hash cache from the format 1 hash cache.
2845
upgrade_recommended = True
2847
def get_format_description(self):
2848
"""See WorkingTreeFormat.get_format_description()."""
2849
return "Working tree format 2"
2851
def _stub_initialize_on_transport(self, transport, file_mode):
2852
"""Workaround: create control files for a remote working tree.
2854
This ensures that it can later be updated and dealt with locally,
2855
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2856
no working tree. (See bug #43064).
2859
inv = inventory.Inventory()
2860
xml5.serializer_v5.write_inventory(inv, sio, working=True)
2862
transport.put_file('inventory', sio, file_mode)
2863
transport.put_bytes('pending-merges', '', file_mode)
2865
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
2866
accelerator_tree=None, hardlink=False):
2867
"""See WorkingTreeFormat.initialize()."""
2868
if not isinstance(a_bzrdir.transport, LocalTransport):
2869
raise errors.NotLocalUrl(a_bzrdir.transport.base)
2870
if from_branch is not None:
2871
branch = from_branch
2873
branch = a_bzrdir.open_branch()
2874
if revision_id is None:
2875
revision_id = _mod_revision.ensure_null(branch.last_revision())
2878
branch.generate_revision_history(revision_id)
2881
inv = inventory.Inventory()
2882
wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2888
basis_tree = branch.repository.revision_tree(revision_id)
2889
if basis_tree.inventory.root is not None:
2890
wt.set_root_id(basis_tree.get_root_id())
2891
# set the parent list and cache the basis tree.
2892
if _mod_revision.is_null(revision_id):
2895
parent_trees = [(revision_id, basis_tree)]
2896
wt.set_parent_trees(parent_trees)
2897
transform.build_tree(basis_tree, wt)
2901
super(WorkingTreeFormat2, self).__init__()
2902
self._matchingbzrdir = bzrdir.BzrDirFormat6()
2904
def open(self, a_bzrdir, _found=False):
2905
"""Return the WorkingTree object for a_bzrdir
2907
_found is a private parameter, do not use it. It is used to indicate
2908
if format probing has already been done.
2911
# we are being called directly and must probe.
2912
raise NotImplementedError
2913
if not isinstance(a_bzrdir.transport, LocalTransport):
2914
raise errors.NotLocalUrl(a_bzrdir.transport.base)
2915
wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2911
format_registry.remove(format)
2921
2914
class WorkingTreeFormat3(WorkingTreeFormat):
2922
2915
"""The second working tree format updated to record a format marker.
3052
3047
__default_format = WorkingTreeFormat6()
3053
WorkingTreeFormat.register_format(__default_format)
3054
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3055
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3056
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3057
WorkingTreeFormat.set_default_format(__default_format)
3058
# formats which have no format string are not discoverable
3059
# and not independently creatable, so are not registered.
3060
_legacy_formats = [WorkingTreeFormat2(),
3048
format_registry.register_lazy("Bazaar Working Tree Format 4 (bzr 0.15)\n",
3049
"bzrlib.workingtree_4", "WorkingTreeFormat4")
3050
format_registry.register_lazy("Bazaar Working Tree Format 5 (bzr 1.11)\n",
3051
"bzrlib.workingtree_4", "WorkingTreeFormat5")
3052
format_registry.register_lazy("Bazaar Working Tree Format 6 (bzr 1.14)\n",
3053
"bzrlib.workingtree_4", "WorkingTreeFormat6")
3054
format_registry.register(WorkingTreeFormat3())
3055
format_registry.set_default(__default_format)
added
removed
bzrlib/workingtree.py
