351
350
path = osutils.getcwd()
352
351
control, relpath = bzrdir.BzrDir.open_containing(path)
353
353
return control.open_workingtree(), relpath
356
def open_containing_paths(file_list, default_directory='.',
357
canonicalize=True, apply_view=True):
358
"""Open the WorkingTree that contains a set of paths.
360
Fail if the paths given are not all in a single tree.
362
This is used for the many command-line interfaces that take a list of
363
any number of files and that require they all be in the same tree.
365
# recommended replacement for builtins.internal_tree_files
366
if file_list is None or len(file_list) == 0:
367
tree = WorkingTree.open_containing(default_directory)[0]
368
# XXX: doesn't really belong here, and seems to have the strange
369
# side effect of making it return a bunch of files, not the whole
370
# tree -- mbp 20100716
371
if tree.supports_views() and apply_view:
372
view_files = tree.views.lookup_view()
374
file_list = view_files
375
view_str = views.view_display_str(view_files)
376
note("Ignoring files outside view. View is %s" % view_str)
377
return tree, file_list
378
tree = WorkingTree.open_containing(file_list[0])[0]
379
return tree, tree.safe_relpath_files(file_list, canonicalize,
380
apply_view=apply_view)
382
def safe_relpath_files(self, file_list, canonicalize=True, apply_view=True):
383
"""Convert file_list into a list of relpaths in tree.
385
:param self: A tree to operate on.
386
:param file_list: A list of user provided paths or None.
387
:param apply_view: if True and a view is set, apply it or check that
388
specified files are within it
389
:return: A list of relative paths.
390
:raises errors.PathNotChild: When a provided path is in a different self
393
if file_list is None:
395
if self.supports_views() and apply_view:
396
view_files = self.views.lookup_view()
400
# self.relpath exists as a "thunk" to osutils, but canonical_relpath
401
# doesn't - fix that up here before we enter the loop.
403
fixer = lambda p: osutils.canonical_relpath(self.basedir, p)
406
for filename in file_list:
407
relpath = fixer(osutils.dereference_path(filename))
408
if view_files and not osutils.is_inside_any(view_files, relpath):
409
raise errors.FileOutsideView(filename, view_files)
410
new_list.append(relpath)
414
356
def open_downlevel(path=None):
415
357
"""Open an unsupported working tree.
1267
1209
# absolute path
1268
1210
fap = from_dir_abspath + '/' + f
1270
dir_ie = inv[from_dir_id]
1271
if dir_ie.kind == 'directory':
1272
f_ie = dir_ie.children.get(f)
1212
f_ie = inv.get_child(from_dir_id, f)
1277
1215
elif self.is_ignored(fp[1:]):
1280
# we may not have found this file, because of a unicode
1281
# issue, or because the directory was actually a symlink.
1218
# we may not have found this file, because of a unicode issue
1282
1219
f_norm, can_access = osutils.normalized_filename(f)
1283
1220
if f == f_norm or not can_access:
1284
1221
# No change, so treat this file normally
1368
1305
# check for deprecated use of signature
1369
1306
if to_dir is None:
1370
raise TypeError('You must supply a target directory')
1307
to_dir = kwargs.get('to_name', None)
1309
raise TypeError('You must supply a target directory')
1311
symbol_versioning.warn('The parameter to_name was deprecated'
1312
' in version 0.13. Use to_dir instead',
1371
1315
# check destination directory
1372
1316
if isinstance(from_paths, basestring):
1373
1317
raise ValueError()
2028
all_files = set() # specified and nested files
2029
1973
unknown_nested_files=set()
2030
1974
if to_file is None:
2031
1975
to_file = sys.stdout
2033
files_to_backup = []
2035
1977
def recurse_directory_to_add_files(directory):
2036
1978
# Recurse directory and add all files
2037
1979
# so we can check if they have changed.
2038
1980
for parent_info, file_infos in self.walkdirs(directory):
2039
1981
for relpath, basename, kind, lstat, fileid, kind in file_infos:
2040
1982
# Is it versioned or ignored?
2041
if self.path2id(relpath):
1983
if self.path2id(relpath) or self.is_ignored(relpath):
2042
1984
# Add nested content for deletion.
2043
all_files.add(relpath)
1985
new_files.add(relpath)
2045
# Files which are not versioned
1987
# Files which are not versioned and not ignored
2046
1988
# should be treated as unknown.
2047
files_to_backup.append(relpath)
1989
unknown_nested_files.add((relpath, None, kind))
2049
1991
for filename in files:
2050
1992
# Get file name into canonical form.
2051
1993
abspath = self.abspath(filename)
2052
1994
filename = self.relpath(abspath)
2053
1995
if len(filename) > 0:
2054
all_files.add(filename)
1996
new_files.add(filename)
2055
1997
recurse_directory_to_add_files(filename)
2057
files = list(all_files)
1999
files = list(new_files)
2059
2001
if len(files) == 0:
2060
2002
return # nothing to do
2065
2007
# Bail out if we are going to delete files we shouldn't
2066
2008
if not keep_files and not force:
2067
for (file_id, path, content_change, versioned, parent_id, name,
2068
kind, executable) in self.iter_changes(self.basis_tree(),
2069
include_unchanged=True, require_versioned=False,
2070
want_unversioned=True, specific_files=files):
2071
if versioned[0] == False:
2072
# The record is unknown or newly added
2073
files_to_backup.append(path[1])
2074
elif (content_change and (kind[1] is not None) and
2075
osutils.is_inside_any(files, path[1])):
2076
# Versioned and changed, but not deleted, and still
2077
# in one of the dirs to be deleted.
2078
files_to_backup.append(path[1])
2009
has_changed_files = len(unknown_nested_files) > 0
2010
if not has_changed_files:
2011
for (file_id, path, content_change, versioned, parent_id, name,
2012
kind, executable) in self.iter_changes(self.basis_tree(),
2013
include_unchanged=True, require_versioned=False,
2014
want_unversioned=True, specific_files=files):
2015
if versioned == (False, False):
2016
# The record is unknown ...
2017
if not self.is_ignored(path[1]):
2018
# ... but not ignored
2019
has_changed_files = True
2021
elif (content_change and (kind[1] is not None) and
2022
osutils.is_inside_any(files, path[1])):
2023
# Versioned and changed, but not deleted, and still
2024
# in one of the dirs to be deleted.
2025
has_changed_files = True
2080
def backup(file_to_backup):
2081
backup_name = self.bzrdir.generate_backup_name(file_to_backup)
2082
osutils.rename(abs_path, self.abspath(backup_name))
2083
return "removed %s (but kept a copy: %s)" % (file_to_backup, backup_name)
2028
if has_changed_files:
2029
# Make delta show ALL applicable changes in error message.
2030
tree_delta = self.changes_from(self.basis_tree(),
2031
require_versioned=False, want_unversioned=True,
2032
specific_files=files)
2033
for unknown_file in unknown_nested_files:
2034
if unknown_file not in tree_delta.unversioned:
2035
tree_delta.unversioned.extend((unknown_file,))
2036
raise errors.BzrRemoveChangedFilesError(tree_delta)
2085
2038
# Build inv_delta and delete files where applicable,
2086
2039
# do this before any modifications to inventory.
2110
2063
len(os.listdir(abs_path)) > 0):
2112
2065
osutils.rmtree(abs_path)
2113
message = "deleted %s" % (f,)
2067
message = "%s is not an empty directory "\
2068
"and won't be deleted." % (f,)
2117
if f in files_to_backup:
2120
osutils.delete_any(abs_path)
2121
message = "deleted %s" % (f,)
2070
osutils.delete_any(abs_path)
2071
message = "deleted %s" % (f,)
2122
2072
elif message is not None:
2123
2073
# Only care if we haven't done anything yet.
2124
2074
message = "%s does not exist." % (f,)
added
removed
bzrlib/workingtree.py
