60
62
revision as _mod_revision,
70
from bzrlib.transport import get_transport
71
72
from bzrlib.workingtree_4 import (
74
73
WorkingTreeFormat6,
78
77
from bzrlib import symbol_versioning
79
78
from bzrlib.decorators import needs_read_lock, needs_write_lock
79
from bzrlib.lock import LogicalLockResult
80
80
from bzrlib.lockable_files import LockableFiles
81
81
from bzrlib.lockdir import LockDir
82
82
import bzrlib.mutabletree
206
209
self._branch = self.bzrdir.open_branch()
207
210
self.basedir = realpath(basedir)
208
# if branch is at our basedir and is a format 6 or less
209
if isinstance(self._format, WorkingTreeFormat2):
210
# share control object
211
self._control_files = self.branch.control_files
213
# assume all other formats have their own control files.
214
self._control_files = _control_files
211
self._control_files = _control_files
215
212
self._transport = self._control_files._transport
216
213
# update the whole cache up front and write to disk if anything changed;
217
214
# in the future we might want to do this more selectively
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.
368
430
return True, None
370
432
return True, tree
371
transport = get_transport(location)
372
iterator = bzrdir.BzrDir.find_bzrdirs(transport, evaluate=evaluate,
433
t = transport.get_transport(location)
434
iterator = bzrdir.BzrDir.find_bzrdirs(t, evaluate=evaluate,
373
435
list_current=list_current)
374
return [t for t in iterator if t is not None]
436
return [tr for tr in iterator if tr is not None]
376
438
# should be deprecated - this is slow and in any case treating them as a
377
439
# container is (we now know) bad style -- mbp 20070302
462
524
return (file_obj, stat_value)
464
526
def get_file_text(self, file_id, path=None, filtered=True):
465
return self.get_file(file_id, path=path, filtered=filtered).read()
527
my_file = self.get_file(file_id, path=path, filtered=filtered)
529
return my_file.read()
467
533
def get_file_byname(self, filename, filtered=True):
468
534
path = self.abspath(filename)
523
589
# Now we have the parents of this content
524
590
annotator = self.branch.repository.texts.get_annotator()
525
text = self.get_file(file_id).read()
591
text = self.get_file_text(file_id)
526
592
this_key =(file_id, default_revision)
527
593
annotator.add_special_text(this_key, file_parent_keys, text)
528
594
annotations = [(key[-1], line)
1202
1268
# absolute path
1203
1269
fap = from_dir_abspath + '/' + f
1205
f_ie = inv.get_child(from_dir_id, f)
1271
dir_ie = inv[from_dir_id]
1272
if dir_ie.kind == 'directory':
1273
f_ie = dir_ie.children.get(f)
1208
1278
elif self.is_ignored(fp[1:]):
1211
# we may not have found this file, because of a unicode issue
1281
# we may not have found this file, because of a unicode
1282
# issue, or because the directory was actually a symlink.
1212
1283
f_norm, can_access = osutils.normalized_filename(f)
1213
1284
if f == f_norm or not can_access:
1214
1285
# No change, so treat this file normally
1298
1369
# check for deprecated use of signature
1299
1370
if to_dir is None:
1300
to_dir = kwargs.get('to_name', None)
1302
raise TypeError('You must supply a target directory')
1304
symbol_versioning.warn('The parameter to_name was deprecated'
1305
' in version 0.13. Use to_dir instead',
1371
raise TypeError('You must supply a target directory')
1308
1372
# check destination directory
1309
1373
if isinstance(from_paths, basestring):
1310
1374
raise ValueError()
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):
1601
1665
@needs_write_lock
1602
1666
def pull(self, source, overwrite=False, stop_revision=None,
1603
change_reporter=None, possible_transports=None, local=False):
1667
change_reporter=None, possible_transports=None, local=False,
1604
1669
source.lock_read()
1606
1671
old_revision_info = self.branch.last_revision_info()
1798
1864
raise errors.ObjectNotLocked(self)
1800
1866
def lock_read(self):
1801
"""See Branch.lock_read, and WorkingTree.unlock."""
1867
"""Lock the tree for reading.
1869
This also locks the branch, and can be unlocked via self.unlock().
1871
:return: A bzrlib.lock.LogicalLockResult.
1802
1873
if not self.is_locked():
1803
1874
self._reset_data()
1804
1875
self.branch.lock_read()
1806
return self._control_files.lock_read()
1877
self._control_files.lock_read()
1878
return LogicalLockResult(self.unlock)
1808
1880
self.branch.unlock()
1811
1883
def lock_tree_write(self):
1812
"""See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1884
"""See MutableTree.lock_tree_write, and WorkingTree.unlock.
1886
:return: A bzrlib.lock.LogicalLockResult.
1813
1888
if not self.is_locked():
1814
1889
self._reset_data()
1815
1890
self.branch.lock_read()
1817
return self._control_files.lock_write()
1892
self._control_files.lock_write()
1893
return LogicalLockResult(self.unlock)
1819
1895
self.branch.unlock()
1822
1898
def lock_write(self):
1823
"""See MutableTree.lock_write, and WorkingTree.unlock."""
1899
"""See MutableTree.lock_write, and WorkingTree.unlock.
1901
:return: A bzrlib.lock.LogicalLockResult.
1824
1903
if not self.is_locked():
1825
1904
self._reset_data()
1826
1905
self.branch.lock_write()
1828
return self._control_files.lock_write()
1907
self._control_files.lock_write()
1908
return LogicalLockResult(self.unlock)
1830
1910
self.branch.unlock()
2031
all_files = set() # specified and nested files
1952
2032
unknown_nested_files=set()
1953
2033
if to_file is None:
1954
2034
to_file = sys.stdout
2036
files_to_backup = []
1956
2038
def recurse_directory_to_add_files(directory):
1957
2039
# Recurse directory and add all files
1958
2040
# so we can check if they have changed.
1959
for parent_info, file_infos in\
1960
self.walkdirs(directory):
2041
for parent_info, file_infos in self.walkdirs(directory):
1961
2042
for relpath, basename, kind, lstat, fileid, kind in file_infos:
1962
2043
# Is it versioned or ignored?
1963
if self.path2id(relpath) or self.is_ignored(relpath):
2044
if self.path2id(relpath):
1964
2045
# Add nested content for deletion.
1965
new_files.add(relpath)
2046
all_files.add(relpath)
1967
# Files which are not versioned and not ignored
2048
# Files which are not versioned
1968
2049
# should be treated as unknown.
1969
unknown_nested_files.add((relpath, None, kind))
2050
files_to_backup.append(relpath)
1971
2052
for filename in files:
1972
2053
# Get file name into canonical form.
1973
2054
abspath = self.abspath(filename)
1974
2055
filename = self.relpath(abspath)
1975
2056
if len(filename) > 0:
1976
new_files.add(filename)
2057
all_files.add(filename)
1977
2058
recurse_directory_to_add_files(filename)
1979
files = list(new_files)
2060
files = list(all_files)
1981
2062
if len(files) == 0:
1982
2063
return # nothing to do
1987
2068
# Bail out if we are going to delete files we shouldn't
1988
2069
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
2070
for (file_id, path, content_change, versioned, parent_id, name,
2071
kind, executable) in self.iter_changes(self.basis_tree(),
2072
include_unchanged=True, require_versioned=False,
2073
want_unversioned=True, specific_files=files):
2074
if versioned[0] == False:
2075
# The record is unknown or newly added
2076
files_to_backup.append(path[1])
2077
elif (content_change and (kind[1] is not None) and
2078
osutils.is_inside_any(files, path[1])):
2079
# Versioned and changed, but not deleted, and still
2080
# in one of the dirs to be deleted.
2081
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)
2083
def backup(file_to_backup):
2084
backup_name = self.bzrdir._available_backup_name(file_to_backup)
2085
osutils.rename(abs_path, self.abspath(backup_name))
2086
return "removed %s (but kept a copy: %s)" % (file_to_backup,
2016
2089
# Build inv_delta and delete files where applicable,
2017
2090
# do this before any modifications to inventory.
2041
2114
len(os.listdir(abs_path)) > 0):
2043
2116
osutils.rmtree(abs_path)
2117
message = "deleted %s" % (f,)
2045
message = "%s is not an empty directory "\
2046
"and won't be deleted." % (f,)
2048
osutils.delete_any(abs_path)
2049
message = "deleted %s" % (f,)
2121
if f in files_to_backup:
2124
osutils.delete_any(abs_path)
2125
message = "deleted %s" % (f,)
2050
2126
elif message is not None:
2051
2127
# Only care if we haven't done anything yet.
2052
2128
message = "%s does not exist." % (f,)
2189
2265
_marker = object()
2191
2267
def update(self, change_reporter=None, possible_transports=None,
2192
revision=None, old_tip=_marker):
2268
revision=None, old_tip=_marker, show_base=False):
2193
2269
"""Update a working tree along its branch.
2195
2271
This will update the branch if its bound too, which means we have
2233
2309
if old_tip is self._marker:
2235
return self._update_tree(old_tip, change_reporter, revision)
2311
return self._update_tree(old_tip, change_reporter, revision, show_base)
2239
2315
@needs_tree_write_lock
2240
def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
2316
def _update_tree(self, old_tip=None, change_reporter=None, revision=None,
2241
2318
"""Update a tree to the master branch.
2243
2320
:param old_tip: if supplied, the previous tip revision the branch,
2270
2347
other_tree = self.branch.repository.revision_tree(old_tip)
2271
2348
nb_conflicts = merge.merge_inner(self.branch, other_tree,
2272
2349
base_tree, this_tree=self,
2273
change_reporter=change_reporter)
2350
change_reporter=change_reporter,
2351
show_base=show_base)
2274
2352
if nb_conflicts:
2275
2353
self.add_parent_tree((old_tip, other_tree))
2276
2354
trace.note('Rerun update after fixing the conflicts.')
2301
2379
nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2302
2380
this_tree=self,
2303
change_reporter=change_reporter)
2381
change_reporter=change_reporter,
2382
show_base=show_base)
2304
2383
self.set_last_revision(revision)
2305
2384
# TODO - dedup parents list with things merged by pull ?
2306
2385
# reuse the tree we've updated to to set the basis:
2678
def check_state(self):
2679
"""Check that the working state is/isn't valid."""
2680
check_refs = self._get_check_refs()
2682
for ref in check_refs:
2685
refs[ref] = self.branch.repository.revision_tree(value)
2688
@needs_tree_write_lock
2689
def reset_state(self, revision_ids=None):
2690
"""Reset the state of the working tree.
2692
This does a hard-reset to a last-known-good state. This is a way to
2693
fix if something got corrupted (like the .bzr/checkout/dirstate file)
2695
if revision_ids is None:
2696
revision_ids = self.get_parent_ids()
2697
if not revision_ids:
2698
rt = self.branch.repository.revision_tree(
2699
_mod_revision.NULL_REVISION)
2701
rt = self.branch.repository.revision_tree(revision_ids[0])
2702
self._write_inventory(rt.inventory)
2703
self.set_parent_ids(revision_ids)
2598
2705
def _get_rules_searcher(self, default_searcher):
2599
2706
"""See Tree._get_rules_searcher."""
2600
2707
if self._rules_searcher is None:
2746
2857
return path[:-len(suffix)]
2860
class WorkingTreeFormatRegistry(controldir.ControlDirComponentFormatRegistry):
2861
"""Registry for working tree formats."""
2863
def __init__(self, other_registry=None):
2864
super(WorkingTreeFormatRegistry, self).__init__(other_registry)
2865
self._default_format = None
2867
def get_default(self):
2868
"""Return the current default format."""
2869
return self._default_format
2871
def set_default(self, format):
2872
self._default_format = format
2875
format_registry = WorkingTreeFormatRegistry()
2749
2878
class WorkingTreeFormat(object):
2750
2879
"""An encapsulation of the initialization and open routines for a format.
2764
2893
object will be created every time regardless.
2767
_default_format = None
2768
"""The default format used for new trees."""
2771
"""The known formats."""
2773
2896
requires_rich_root = False
2775
2898
upgrade_recommended = False
2900
requires_normalized_unicode_filenames = False
2902
case_sensitive_filename = "FoRMaT"
2904
missing_parent_conflicts = False
2905
"""If this format supports missing parent conflicts."""
2778
2908
def find_format(klass, a_bzrdir):
2779
2909
"""Return the format for the working tree object in a_bzrdir."""
2781
2911
transport = a_bzrdir.get_workingtree_transport(None)
2782
2912
format_string = transport.get_bytes("format")
2783
return klass._formats[format_string]
2913
return format_registry.get(format_string)
2784
2914
except errors.NoSuchFile:
2785
2915
raise errors.NoWorkingTree(base=transport.base)
2786
2916
except KeyError:
2794
2924
return not (self == other)
2927
@symbol_versioning.deprecated_method(
2928
symbol_versioning.deprecated_in((2, 4, 0)))
2797
2929
def get_default_format(klass):
2798
2930
"""Return the current default format."""
2799
return klass._default_format
2931
return format_registry.get_default()
2801
2933
def get_format_string(self):
2802
2934
"""Return the ASCII format string that identifies this format."""
2959
@symbol_versioning.deprecated_method(
2960
symbol_versioning.deprecated_in((2, 4, 0)))
2827
2961
def register_format(klass, format):
2828
klass._formats[format.get_format_string()] = format
2962
format_registry.register(format)
2965
@symbol_versioning.deprecated_method(
2966
symbol_versioning.deprecated_in((2, 4, 0)))
2967
def register_extra_format(klass, format):
2968
format_registry.register_extra(format)
2971
@symbol_versioning.deprecated_method(
2972
symbol_versioning.deprecated_in((2, 4, 0)))
2973
def unregister_extra_format(klass, format):
2974
format_registry.unregister_extra(format)
2977
@symbol_versioning.deprecated_method(
2978
symbol_versioning.deprecated_in((2, 4, 0)))
2979
def get_formats(klass):
2980
return format_registry._get_all()
2983
@symbol_versioning.deprecated_method(
2984
symbol_versioning.deprecated_in((2, 4, 0)))
2831
2985
def set_default_format(klass, format):
2832
klass._default_format = format
2986
format_registry.set_default(format)
2989
@symbol_versioning.deprecated_method(
2990
symbol_versioning.deprecated_in((2, 4, 0)))
2835
2991
def unregister_format(klass, format):
2836
del klass._formats[format.get_format_string()]
2992
format_registry.remove(format)
2839
2995
class WorkingTreeFormat2(WorkingTreeFormat):
3052
3218
__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(),
3219
format_registry.register_lazy("Bazaar Working Tree Format 4 (bzr 0.15)\n",
3220
"bzrlib.workingtree_4", "WorkingTreeFormat4")
3221
format_registry.register_lazy("Bazaar Working Tree Format 5 (bzr 1.11)\n",
3222
"bzrlib.workingtree_4", "WorkingTreeFormat5")
3223
format_registry.register_lazy("Bazaar Working Tree Format 6 (bzr 1.14)\n",
3224
"bzrlib.workingtree_4", "WorkingTreeFormat6")
3225
format_registry.register(WorkingTreeFormat3())
3226
format_registry.set_default(__default_format)
3227
# Register extra formats which have no format string are not discoverable
3228
# and not independently creatable. They are implicitly created as part of
3229
# e.g. older Bazaar formats or foreign formats.
3230
format_registry.register_extra(WorkingTreeFormat2())
added
removed
bzrlib/workingtree.py
