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
347
350
path = osutils.getcwd()
348
351
control, relpath = bzrdir.BzrDir.open_containing(path)
350
352
return control.open_workingtree(), relpath
355
def open_containing_paths(file_list, default_directory='.',
356
canonicalize=True, apply_view=True):
357
"""Open the WorkingTree that contains a set of paths.
359
Fail if the paths given are not all in a single tree.
361
This is used for the many command-line interfaces that take a list of
362
any number of files and that require they all be in the same tree.
364
# recommended replacement for builtins.internal_tree_files
365
if file_list is None or len(file_list) == 0:
366
tree = WorkingTree.open_containing(default_directory)[0]
367
if tree.supports_views() and apply_view:
368
view_files = tree.views.lookup_view()
370
file_list = view_files
371
view_str = views.view_display_str(view_files)
372
note("Ignoring files outside view. View is %s" % view_str)
373
return tree, file_list
374
tree = WorkingTree.open_containing(file_list[0])[0]
375
return tree, tree.safe_relpath_files(file_list, canonicalize,
376
apply_view=apply_view)
378
def safe_relpath_files(self, file_list, canonicalize=True, apply_view=True):
379
"""Convert file_list into a list of relpaths in tree.
381
:param self: A tree to operate on.
382
:param file_list: A list of user provided paths or None.
383
:param apply_view: if True and a view is set, apply it or check that
384
specified files are within it
385
:return: A list of relative paths.
386
:raises errors.PathNotChild: When a provided path is in a different self
389
if file_list is None:
391
if self.supports_views() and apply_view:
392
view_files = self.views.lookup_view()
396
# self.relpath exists as a "thunk" to osutils, but canonical_relpath
397
# doesn't - fix that up here before we enter the loop.
399
fixer = lambda p: osutils.canonical_relpath(self.basedir, p)
402
for filename in file_list:
403
relpath = fixer(osutils.dereference_path(filename))
404
if view_files and not osutils.is_inside_any(view_files, relpath):
405
raise errors.FileOutsideView(filename, view_files)
406
new_list.append(relpath)
353
410
def open_downlevel(path=None):
354
411
"""Open an unsupported working tree.
368
425
return True, None
370
427
return True, tree
371
transport = get_transport(location)
372
iterator = bzrdir.BzrDir.find_bzrdirs(transport, evaluate=evaluate,
428
t = transport.get_transport(location)
429
iterator = bzrdir.BzrDir.find_bzrdirs(t, evaluate=evaluate,
373
430
list_current=list_current)
374
return [t for t in iterator if t is not None]
431
return [tr for tr in iterator if tr is not None]
376
433
# should be deprecated - this is slow and in any case treating them as a
377
434
# container is (we now know) bad style -- mbp 20070302
462
519
return (file_obj, stat_value)
464
521
def get_file_text(self, file_id, path=None, filtered=True):
465
return self.get_file(file_id, path=path, filtered=filtered).read()
522
my_file = self.get_file(file_id, path=path, filtered=filtered)
524
return my_file.read()
467
528
def get_file_byname(self, filename, filtered=True):
468
529
path = self.abspath(filename)
523
584
# Now we have the parents of this content
524
585
annotator = self.branch.repository.texts.get_annotator()
525
text = self.get_file(file_id).read()
586
text = self.get_file_text(file_id)
526
587
this_key =(file_id, default_revision)
527
588
annotator.add_special_text(this_key, file_parent_keys, text)
528
589
annotations = [(key[-1], line)
1798
1859
raise errors.ObjectNotLocked(self)
1800
1861
def lock_read(self):
1801
"""See Branch.lock_read, and WorkingTree.unlock."""
1862
"""Lock the tree for reading.
1864
This also locks the branch, and can be unlocked via self.unlock().
1866
:return: A bzrlib.lock.LogicalLockResult.
1802
1868
if not self.is_locked():
1803
1869
self._reset_data()
1804
1870
self.branch.lock_read()
1806
return self._control_files.lock_read()
1872
self._control_files.lock_read()
1873
return LogicalLockResult(self.unlock)
1808
1875
self.branch.unlock()
1811
1878
def lock_tree_write(self):
1812
"""See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1879
"""See MutableTree.lock_tree_write, and WorkingTree.unlock.
1881
:return: A bzrlib.lock.LogicalLockResult.
1813
1883
if not self.is_locked():
1814
1884
self._reset_data()
1815
1885
self.branch.lock_read()
1817
return self._control_files.lock_write()
1887
self._control_files.lock_write()
1888
return LogicalLockResult(self.unlock)
1819
1890
self.branch.unlock()
1822
1893
def lock_write(self):
1823
"""See MutableTree.lock_write, and WorkingTree.unlock."""
1894
"""See MutableTree.lock_write, and WorkingTree.unlock.
1896
:return: A bzrlib.lock.LogicalLockResult.
1824
1898
if not self.is_locked():
1825
1899
self._reset_data()
1826
1900
self.branch.lock_write()
1828
return self._control_files.lock_write()
1902
self._control_files.lock_write()
1903
return LogicalLockResult(self.unlock)
1830
1905
self.branch.unlock()
1956
2031
def recurse_directory_to_add_files(directory):
1957
2032
# Recurse directory and add all files
1958
2033
# so we can check if they have changed.
1959
for parent_info, file_infos in\
1960
self.walkdirs(directory):
2034
for parent_info, file_infos in self.walkdirs(directory):
1961
2035
for relpath, basename, kind, lstat, fileid, kind in file_infos:
1962
2036
# Is it versioned or ignored?
1963
2037
if self.path2id(relpath) or self.is_ignored(relpath):
1998
2072
# ... but not ignored
1999
2073
has_changed_files = True
2001
elif content_change and (kind[1] is not None):
2002
# Versioned and changed, but not deleted
2075
elif (content_change and (kind[1] is not None) and
2076
osutils.is_inside_any(files, path[1])):
2077
# Versioned and changed, but not deleted, and still
2078
# in one of the dirs to be deleted.
2003
2079
has_changed_files = True
added
removed
bzrlib/workingtree.py
