29
29
WorkingTree.open(dir).
32
# TODO: Give the workingtree sole responsibility for the working inventory;
33
# remove the variable and references to it from the branch. This may require
34
# updating the commit code so as to update the inventory within the working
35
# copy, and making sure there's only one WorkingTree for any directory on disk.
36
# At the moment they may alias the inventory and have old copies of it in
37
# memory. (Now done? -- mbp 20060309)
39
33
from cStringIO import StringIO
101
96
from bzrlib.filters import filtered_input_file
102
97
from bzrlib.trace import mutter, note
103
98
from bzrlib.transport.local import LocalTransport
104
from bzrlib.progress import ProgressPhase
105
99
from bzrlib.revision import CURRENT_REVISION
106
100
from bzrlib.rio import RioReader, rio_file, Stanza
107
101
from bzrlib.symbol_versioning import (
345
351
path = osutils.getcwd()
346
352
control, relpath = bzrdir.BzrDir.open_containing(path)
348
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)
351
414
def open_downlevel(path=None):
352
415
"""Open an unsupported working tree.
366
429
return True, None
368
431
return True, tree
369
transport = get_transport(location)
370
iterator = bzrdir.BzrDir.find_bzrdirs(transport, evaluate=evaluate,
432
t = transport.get_transport(location)
433
iterator = bzrdir.BzrDir.find_bzrdirs(t, evaluate=evaluate,
371
434
list_current=list_current)
372
return [t for t in iterator if t is not None]
435
return [tr for tr in iterator if tr is not None]
374
437
# should be deprecated - this is slow and in any case treating them as a
375
438
# container is (we now know) bad style -- mbp 20070302
460
523
return (file_obj, stat_value)
462
525
def get_file_text(self, file_id, path=None, filtered=True):
463
return self.get_file(file_id, path=path, filtered=filtered).read()
526
my_file = self.get_file(file_id, path=path, filtered=filtered)
528
return my_file.read()
465
532
def get_file_byname(self, filename, filtered=True):
466
533
path = self.abspath(filename)
521
588
# Now we have the parents of this content
522
589
annotator = self.branch.repository.texts.get_annotator()
523
text = self.get_file(file_id).read()
590
text = self.get_file_text(file_id)
524
591
this_key =(file_id, default_revision)
525
592
annotator.add_special_text(this_key, file_parent_keys, text)
526
593
annotations = [(key[-1], line)
1094
1161
tree_transport = self.bzrdir.root_transport.clone(sub_path)
1095
1162
if tree_transport.base != branch_transport.base:
1096
1163
tree_bzrdir = format.initialize_on_transport(tree_transport)
1097
branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1164
branch.BranchReferenceFormat().initialize(tree_bzrdir,
1165
target_branch=new_branch)
1099
1167
tree_bzrdir = branch_bzrdir
1100
1168
wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1199
1267
# absolute path
1200
1268
fap = from_dir_abspath + '/' + f
1202
f_ie = inv.get_child(from_dir_id, f)
1270
dir_ie = inv[from_dir_id]
1271
if dir_ie.kind == 'directory':
1272
f_ie = dir_ie.children.get(f)
1205
1277
elif self.is_ignored(fp[1:]):
1208
# we may not have found this file, because of a unicode issue
1280
# we may not have found this file, because of a unicode
1281
# issue, or because the directory was actually a symlink.
1209
1282
f_norm, can_access = osutils.normalized_filename(f)
1210
1283
if f == f_norm or not can_access:
1211
1284
# No change, so treat this file normally
1295
1368
# check for deprecated use of signature
1296
1369
if to_dir is None:
1297
to_dir = kwargs.get('to_name', None)
1299
raise TypeError('You must supply a target directory')
1301
symbol_versioning.warn('The parameter to_name was deprecated'
1302
' in version 0.13. Use to_dir instead',
1370
raise TypeError('You must supply a target directory')
1305
1371
# check destination directory
1306
1372
if isinstance(from_paths, basestring):
1307
1373
raise ValueError()
1598
1664
@needs_write_lock
1599
1665
def pull(self, source, overwrite=False, stop_revision=None,
1600
change_reporter=None, possible_transports=None, local=False):
1666
change_reporter=None, possible_transports=None, local=False,
1601
1668
source.lock_read()
1603
1670
old_revision_info = self.branch.last_revision_info()
1795
1863
raise errors.ObjectNotLocked(self)
1797
1865
def lock_read(self):
1798
"""See Branch.lock_read, and WorkingTree.unlock."""
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.
1799
1872
if not self.is_locked():
1800
1873
self._reset_data()
1801
1874
self.branch.lock_read()
1803
return self._control_files.lock_read()
1876
self._control_files.lock_read()
1877
return LogicalLockResult(self.unlock)
1805
1879
self.branch.unlock()
1808
1882
def lock_tree_write(self):
1809
"""See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1883
"""See MutableTree.lock_tree_write, and WorkingTree.unlock.
1885
:return: A bzrlib.lock.LogicalLockResult.
1810
1887
if not self.is_locked():
1811
1888
self._reset_data()
1812
1889
self.branch.lock_read()
1814
return self._control_files.lock_write()
1891
self._control_files.lock_write()
1892
return LogicalLockResult(self.unlock)
1816
1894
self.branch.unlock()
1819
1897
def lock_write(self):
1820
"""See MutableTree.lock_write, and WorkingTree.unlock."""
1898
"""See MutableTree.lock_write, and WorkingTree.unlock.
1900
:return: A bzrlib.lock.LogicalLockResult.
1821
1902
if not self.is_locked():
1822
1903
self._reset_data()
1823
1904
self.branch.lock_write()
1825
return self._control_files.lock_write()
1906
self._control_files.lock_write()
1907
return LogicalLockResult(self.unlock)
1827
1909
self.branch.unlock()
2030
all_files = set() # specified and nested files
1949
2031
unknown_nested_files=set()
1950
2032
if to_file is None:
1951
2033
to_file = sys.stdout
2035
files_to_backup = []
1953
2037
def recurse_directory_to_add_files(directory):
1954
2038
# Recurse directory and add all files
1955
2039
# so we can check if they have changed.
1956
for parent_info, file_infos in\
1957
self.walkdirs(directory):
2040
for parent_info, file_infos in self.walkdirs(directory):
1958
2041
for relpath, basename, kind, lstat, fileid, kind in file_infos:
1959
2042
# Is it versioned or ignored?
1960
if self.path2id(relpath) or self.is_ignored(relpath):
2043
if self.path2id(relpath):
1961
2044
# Add nested content for deletion.
1962
new_files.add(relpath)
2045
all_files.add(relpath)
1964
# Files which are not versioned and not ignored
2047
# Files which are not versioned
1965
2048
# should be treated as unknown.
1966
unknown_nested_files.add((relpath, None, kind))
2049
files_to_backup.append(relpath)
1968
2051
for filename in files:
1969
2052
# Get file name into canonical form.
1970
2053
abspath = self.abspath(filename)
1971
2054
filename = self.relpath(abspath)
1972
2055
if len(filename) > 0:
1973
new_files.add(filename)
2056
all_files.add(filename)
1974
2057
recurse_directory_to_add_files(filename)
1976
files = list(new_files)
2059
files = list(all_files)
1978
2061
if len(files) == 0:
1979
2062
return # nothing to do
1984
2067
# Bail out if we are going to delete files we shouldn't
1985
2068
if not keep_files and not force:
1986
has_changed_files = len(unknown_nested_files) > 0
1987
if not has_changed_files:
1988
for (file_id, path, content_change, versioned, parent_id, name,
1989
kind, executable) in self.iter_changes(self.basis_tree(),
1990
include_unchanged=True, require_versioned=False,
1991
want_unversioned=True, specific_files=files):
1992
if versioned == (False, False):
1993
# The record is unknown ...
1994
if not self.is_ignored(path[1]):
1995
# ... but not ignored
1996
has_changed_files = True
1998
elif content_change and (kind[1] is not None):
1999
# Versioned and changed, but not deleted
2000
has_changed_files = True
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])
2003
if has_changed_files:
2004
# Make delta show ALL applicable changes in error message.
2005
tree_delta = self.changes_from(self.basis_tree(),
2006
require_versioned=False, want_unversioned=True,
2007
specific_files=files)
2008
for unknown_file in unknown_nested_files:
2009
if unknown_file not in tree_delta.unversioned:
2010
tree_delta.unversioned.extend((unknown_file,))
2011
raise errors.BzrRemoveChangedFilesError(tree_delta)
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)
2013
2087
# Build inv_delta and delete files where applicable,
2014
2088
# do this before any modifications to inventory.
2038
2112
len(os.listdir(abs_path)) > 0):
2040
2114
osutils.rmtree(abs_path)
2115
message = "deleted %s" % (f,)
2042
message = "%s is not an empty directory "\
2043
"and won't be deleted." % (f,)
2045
osutils.delete_any(abs_path)
2046
message = "deleted %s" % (f,)
2119
if f in files_to_backup:
2122
osutils.delete_any(abs_path)
2123
message = "deleted %s" % (f,)
2047
2124
elif message is not None:
2048
2125
# Only care if we haven't done anything yet.
2049
2126
message = "%s does not exist." % (f,)
2186
2263
_marker = object()
2188
2265
def update(self, change_reporter=None, possible_transports=None,
2189
revision=None, old_tip=_marker):
2266
revision=None, old_tip=_marker, show_base=False):
2190
2267
"""Update a working tree along its branch.
2192
2269
This will update the branch if its bound too, which means we have
2230
2307
if old_tip is self._marker:
2232
return self._update_tree(old_tip, change_reporter, revision)
2309
return self._update_tree(old_tip, change_reporter, revision, show_base)
2236
2313
@needs_tree_write_lock
2237
def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
2314
def _update_tree(self, old_tip=None, change_reporter=None, revision=None,
2238
2316
"""Update a tree to the master branch.
2240
2318
:param old_tip: if supplied, the previous tip revision the branch,
2270
2345
other_tree = self.branch.repository.revision_tree(old_tip)
2271
2346
nb_conflicts = merge.merge_inner(self.branch, other_tree,
2272
2347
base_tree, this_tree=self,
2273
change_reporter=change_reporter)
2348
change_reporter=change_reporter,
2349
show_base=show_base)
2274
2350
if nb_conflicts:
2275
2351
self.add_parent_tree((old_tip, other_tree))
2276
2352
trace.note('Rerun update after fixing the conflicts.')
2301
2377
nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2302
2378
this_tree=self,
2303
change_reporter=change_reporter)
2379
change_reporter=change_reporter,
2380
show_base=show_base)
2304
2381
self.set_last_revision(revision)
2305
2382
# TODO - dedup parents list with things merged by pull ?
2306
2383
# reuse the tree we've updated to to set the basis:
added
removed
bzrlib/workingtree.py
