351
347
path = osutils.getcwd()
352
348
control, relpath = bzrdir.BzrDir.open_containing(path)
353
350
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
353
def open_downlevel(path=None):
415
354
"""Open an unsupported working tree.
429
368
return True, None
431
370
return True, tree
432
t = transport.get_transport(location)
433
iterator = bzrdir.BzrDir.find_bzrdirs(t, evaluate=evaluate,
371
transport = get_transport(location)
372
iterator = bzrdir.BzrDir.find_bzrdirs(transport, evaluate=evaluate,
434
373
list_current=list_current)
435
return [tr for tr in iterator if tr is not None]
374
return [t for t in iterator if t is not None]
437
376
# should be deprecated - this is slow and in any case treating them as a
438
377
# container is (we now know) bad style -- mbp 20070302
523
462
return (file_obj, stat_value)
525
464
def get_file_text(self, file_id, path=None, filtered=True):
526
my_file = self.get_file(file_id, path=path, filtered=filtered)
528
return my_file.read()
465
return self.get_file(file_id, path=path, filtered=filtered).read()
532
467
def get_file_byname(self, filename, filtered=True):
533
468
path = self.abspath(filename)
588
523
# Now we have the parents of this content
589
524
annotator = self.branch.repository.texts.get_annotator()
590
text = self.get_file_text(file_id)
525
text = self.get_file(file_id).read()
591
526
this_key =(file_id, default_revision)
592
527
annotator.add_special_text(this_key, file_parent_keys, text)
593
528
annotations = [(key[-1], line)
1267
1202
# absolute path
1268
1203
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)
1205
f_ie = inv.get_child(from_dir_id, f)
1277
1208
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.
1211
# we may not have found this file, because of a unicode issue
1282
1212
f_norm, can_access = osutils.normalized_filename(f)
1283
1213
if f == f_norm or not can_access:
1284
1214
# No change, so treat this file normally
1368
1298
# check for deprecated use of signature
1369
1299
if to_dir is None:
1370
raise TypeError('You must supply a target directory')
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
1308
# check destination directory
1372
1309
if isinstance(from_paths, basestring):
1373
1310
raise ValueError()
1664
1601
@needs_write_lock
1665
1602
def pull(self, source, overwrite=False, stop_revision=None,
1666
change_reporter=None, possible_transports=None, local=False,
1603
change_reporter=None, possible_transports=None, local=False):
1668
1604
source.lock_read()
1670
1606
old_revision_info = self.branch.last_revision_info()
1863
1798
raise errors.ObjectNotLocked(self)
1865
1800
def lock_read(self):
1866
"""Lock the tree for reading.
1868
This also locks the branch, and can be unlocked via self.unlock().
1870
:return: A bzrlib.lock.LogicalLockResult.
1801
"""See Branch.lock_read, and WorkingTree.unlock."""
1872
1802
if not self.is_locked():
1873
1803
self._reset_data()
1874
1804
self.branch.lock_read()
1876
self._control_files.lock_read()
1877
return LogicalLockResult(self.unlock)
1806
return self._control_files.lock_read()
1879
1808
self.branch.unlock()
1882
1811
def lock_tree_write(self):
1883
"""See MutableTree.lock_tree_write, and WorkingTree.unlock.
1885
:return: A bzrlib.lock.LogicalLockResult.
1812
"""See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1887
1813
if not self.is_locked():
1888
1814
self._reset_data()
1889
1815
self.branch.lock_read()
1891
self._control_files.lock_write()
1892
return LogicalLockResult(self.unlock)
1817
return self._control_files.lock_write()
1894
1819
self.branch.unlock()
1897
1822
def lock_write(self):
1898
"""See MutableTree.lock_write, and WorkingTree.unlock.
1900
:return: A bzrlib.lock.LogicalLockResult.
1823
"""See MutableTree.lock_write, and WorkingTree.unlock."""
1902
1824
if not self.is_locked():
1903
1825
self._reset_data()
1904
1826
self.branch.lock_write()
1906
self._control_files.lock_write()
1907
return LogicalLockResult(self.unlock)
1828
return self._control_files.lock_write()
1909
1830
self.branch.unlock()
2030
all_files = set() # specified and nested files
2031
1952
unknown_nested_files=set()
2032
1953
if to_file is None:
2033
1954
to_file = sys.stdout
2035
files_to_backup = []
2037
1956
def recurse_directory_to_add_files(directory):
2038
1957
# Recurse directory and add all files
2039
1958
# so we can check if they have changed.
2040
for parent_info, file_infos in self.walkdirs(directory):
1959
for parent_info, file_infos in\
1960
self.walkdirs(directory):
2041
1961
for relpath, basename, kind, lstat, fileid, kind in file_infos:
2042
1962
# Is it versioned or ignored?
2043
if self.path2id(relpath):
1963
if self.path2id(relpath) or self.is_ignored(relpath):
2044
1964
# Add nested content for deletion.
2045
all_files.add(relpath)
1965
new_files.add(relpath)
2047
# Files which are not versioned
1967
# Files which are not versioned and not ignored
2048
1968
# should be treated as unknown.
2049
files_to_backup.append(relpath)
1969
unknown_nested_files.add((relpath, None, kind))
2051
1971
for filename in files:
2052
1972
# Get file name into canonical form.
2053
1973
abspath = self.abspath(filename)
2054
1974
filename = self.relpath(abspath)
2055
1975
if len(filename) > 0:
2056
all_files.add(filename)
1976
new_files.add(filename)
2057
1977
recurse_directory_to_add_files(filename)
2059
files = list(all_files)
1979
files = list(new_files)
2061
1981
if len(files) == 0:
2062
1982
return # nothing to do
2067
1987
# Bail out if we are going to delete files we shouldn't
2068
1988
if not keep_files and not force:
2069
for (file_id, path, content_change, versioned, parent_id, name,
2070
kind, executable) in self.iter_changes(self.basis_tree(),
2071
include_unchanged=True, require_versioned=False,
2072
want_unversioned=True, specific_files=files):
2073
if versioned[0] == False:
2074
# The record is unknown or newly added
2075
files_to_backup.append(path[1])
2076
elif (content_change and (kind[1] is not None) and
2077
osutils.is_inside_any(files, path[1])):
2078
# Versioned and changed, but not deleted, and still
2079
# in one of the dirs to be deleted.
2080
files_to_backup.append(path[1])
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
2082
def backup(file_to_backup):
2083
backup_name = self.bzrdir.generate_backup_name(file_to_backup)
2084
osutils.rename(abs_path, self.abspath(backup_name))
2085
return "removed %s (but kept a copy: %s)" % (file_to_backup, backup_name)
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)
2087
2016
# Build inv_delta and delete files where applicable,
2088
2017
# do this before any modifications to inventory.
2112
2041
len(os.listdir(abs_path)) > 0):
2114
2043
osutils.rmtree(abs_path)
2115
message = "deleted %s" % (f,)
2045
message = "%s is not an empty directory "\
2046
"and won't be deleted." % (f,)
2119
if f in files_to_backup:
2122
osutils.delete_any(abs_path)
2123
message = "deleted %s" % (f,)
2048
osutils.delete_any(abs_path)
2049
message = "deleted %s" % (f,)
2124
2050
elif message is not None:
2125
2051
# Only care if we haven't done anything yet.
2126
2052
message = "%s does not exist." % (f,)
2263
2189
_marker = object()
2265
2191
def update(self, change_reporter=None, possible_transports=None,
2266
revision=None, old_tip=_marker, show_base=False):
2192
revision=None, old_tip=_marker):
2267
2193
"""Update a working tree along its branch.
2269
2195
This will update the branch if its bound too, which means we have
2307
2233
if old_tip is self._marker:
2309
return self._update_tree(old_tip, change_reporter, revision, show_base)
2235
return self._update_tree(old_tip, change_reporter, revision)
2313
2239
@needs_tree_write_lock
2314
def _update_tree(self, old_tip=None, change_reporter=None, revision=None,
2240
def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
2316
2241
"""Update a tree to the master branch.
2318
2243
:param old_tip: if supplied, the previous tip revision the branch,
2345
2270
other_tree = self.branch.repository.revision_tree(old_tip)
2346
2271
nb_conflicts = merge.merge_inner(self.branch, other_tree,
2347
2272
base_tree, this_tree=self,
2348
change_reporter=change_reporter,
2349
show_base=show_base)
2273
change_reporter=change_reporter)
2350
2274
if nb_conflicts:
2351
2275
self.add_parent_tree((old_tip, other_tree))
2352
2276
trace.note('Rerun update after fixing the conflicts.')
2377
2301
nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2378
2302
this_tree=self,
2379
change_reporter=change_reporter,
2380
show_base=show_base)
2303
change_reporter=change_reporter)
2381
2304
self.set_last_revision(revision)
2382
2305
# TODO - dedup parents list with things merged by pull ?
2383
2306
# reuse the tree we've updated to to set the basis:
added
removed
bzrlib/workingtree.py
