206
210
self._branch = self.bzrdir.open_branch()
207
211
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
212
self._control_files = _control_files
215
213
self._transport = self._control_files._transport
216
214
# update the whole cache up front and write to disk if anything changed;
217
215
# in the future we might want to do this more selectively
347
345
path = osutils.getcwd()
348
346
control, relpath = bzrdir.BzrDir.open_containing(path)
350
347
return control.open_workingtree(), relpath
350
def open_containing_paths(file_list, default_directory=None,
351
canonicalize=True, apply_view=True):
352
"""Open the WorkingTree that contains a set of paths.
354
Fail if the paths given are not all in a single tree.
356
This is used for the many command-line interfaces that take a list of
357
any number of files and that require they all be in the same tree.
359
if default_directory is None:
360
default_directory = u'.'
361
# recommended replacement for builtins.internal_tree_files
362
if file_list is None or len(file_list) == 0:
363
tree = WorkingTree.open_containing(default_directory)[0]
364
# XXX: doesn't really belong here, and seems to have the strange
365
# side effect of making it return a bunch of files, not the whole
366
# tree -- mbp 20100716
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
if default_directory == u'.':
377
seed = default_directory
378
file_list = [osutils.pathjoin(default_directory, f)
380
tree = WorkingTree.open_containing(seed)[0]
381
return tree, tree.safe_relpath_files(file_list, canonicalize,
382
apply_view=apply_view)
384
def safe_relpath_files(self, file_list, canonicalize=True, apply_view=True):
385
"""Convert file_list into a list of relpaths in tree.
387
:param self: A tree to operate on.
388
:param file_list: A list of user provided paths or None.
389
:param apply_view: if True and a view is set, apply it or check that
390
specified files are within it
391
:return: A list of relative paths.
392
:raises errors.PathNotChild: When a provided path is in a different self
395
if file_list is None:
397
if self.supports_views() and apply_view:
398
view_files = self.views.lookup_view()
402
# self.relpath exists as a "thunk" to osutils, but canonical_relpath
403
# doesn't - fix that up here before we enter the loop.
405
fixer = lambda p: osutils.canonical_relpath(self.basedir, p)
408
for filename in file_list:
409
relpath = fixer(osutils.dereference_path(filename))
410
if view_files and not osutils.is_inside_any(view_files, relpath):
411
raise errors.FileOutsideView(filename, view_files)
412
new_list.append(relpath)
353
416
def open_downlevel(path=None):
354
417
"""Open an unsupported working tree.
368
431
return True, None
370
433
return True, tree
371
transport = get_transport(location)
372
iterator = bzrdir.BzrDir.find_bzrdirs(transport, evaluate=evaluate,
434
t = transport.get_transport(location)
435
iterator = bzrdir.BzrDir.find_bzrdirs(t, evaluate=evaluate,
373
436
list_current=list_current)
374
return [t for t in iterator if t is not None]
437
return [tr for tr in iterator if tr is not None]
376
439
# should be deprecated - this is slow and in any case treating them as a
377
440
# container is (we now know) bad style -- mbp 20070302
462
525
return (file_obj, stat_value)
464
527
def get_file_text(self, file_id, path=None, filtered=True):
465
return self.get_file(file_id, path=path, filtered=filtered).read()
528
my_file = self.get_file(file_id, path=path, filtered=filtered)
530
return my_file.read()
467
534
def get_file_byname(self, filename, filtered=True):
468
535
path = self.abspath(filename)
523
590
# Now we have the parents of this content
524
591
annotator = self.branch.repository.texts.get_annotator()
525
text = self.get_file(file_id).read()
592
text = self.get_file_text(file_id)
526
593
this_key =(file_id, default_revision)
527
594
annotator.add_special_text(this_key, file_parent_keys, text)
528
595
annotations = [(key[-1], line)
1202
1269
# absolute path
1203
1270
fap = from_dir_abspath + '/' + f
1205
f_ie = inv.get_child(from_dir_id, f)
1272
dir_ie = inv[from_dir_id]
1273
if dir_ie.kind == 'directory':
1274
f_ie = dir_ie.children.get(f)
1208
1279
elif self.is_ignored(fp[1:]):
1211
# we may not have found this file, because of a unicode issue
1282
# we may not have found this file, because of a unicode
1283
# issue, or because the directory was actually a symlink.
1212
1284
f_norm, can_access = osutils.normalized_filename(f)
1213
1285
if f == f_norm or not can_access:
1214
1286
# No change, so treat this file normally
1298
1370
# check for deprecated use of signature
1299
1371
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',
1372
raise TypeError('You must supply a target directory')
1308
1373
# check destination directory
1309
1374
if isinstance(from_paths, basestring):
1310
1375
raise ValueError()
1380
1445
# check the inventory for source and destination
1381
1446
if from_id is None:
1382
1447
raise errors.BzrMoveFailedError(from_rel,to_rel,
1383
errors.NotVersionedError(path=str(from_rel)))
1448
errors.NotVersionedError(path=from_rel))
1384
1449
if to_id is not None:
1385
1450
raise errors.BzrMoveFailedError(from_rel,to_rel,
1386
errors.AlreadyVersionedError(path=str(to_rel)))
1451
errors.AlreadyVersionedError(path=to_rel))
1388
1453
# try to determine the mode for rename (only change inv or change
1389
1454
# inv and file system)
1391
1456
if not self.has_filename(to_rel):
1392
1457
raise errors.BzrMoveFailedError(from_id,to_rel,
1393
errors.NoSuchFile(path=str(to_rel),
1458
errors.NoSuchFile(path=to_rel,
1394
1459
extra="New file has not been created yet"))
1395
1460
only_change_inv = True
1396
1461
elif not self.has_filename(from_rel) and self.has_filename(to_rel):
1601
1666
@needs_write_lock
1602
1667
def pull(self, source, overwrite=False, stop_revision=None,
1603
change_reporter=None, possible_transports=None, local=False):
1668
change_reporter=None, possible_transports=None, local=False,
1604
1670
source.lock_read()
1606
1672
old_revision_info = self.branch.last_revision_info()
1798
1865
raise errors.ObjectNotLocked(self)
1800
1867
def lock_read(self):
1801
"""See Branch.lock_read, and WorkingTree.unlock."""
1868
"""Lock the tree for reading.
1870
This also locks the branch, and can be unlocked via self.unlock().
1872
:return: A bzrlib.lock.LogicalLockResult.
1802
1874
if not self.is_locked():
1803
1875
self._reset_data()
1804
1876
self.branch.lock_read()
1806
return self._control_files.lock_read()
1878
self._control_files.lock_read()
1879
return LogicalLockResult(self.unlock)
1808
1881
self.branch.unlock()
1811
1884
def lock_tree_write(self):
1812
"""See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1885
"""See MutableTree.lock_tree_write, and WorkingTree.unlock.
1887
:return: A bzrlib.lock.LogicalLockResult.
1813
1889
if not self.is_locked():
1814
1890
self._reset_data()
1815
1891
self.branch.lock_read()
1817
return self._control_files.lock_write()
1893
self._control_files.lock_write()
1894
return LogicalLockResult(self.unlock)
1819
1896
self.branch.unlock()
1822
1899
def lock_write(self):
1823
"""See MutableTree.lock_write, and WorkingTree.unlock."""
1900
"""See MutableTree.lock_write, and WorkingTree.unlock.
1902
:return: A bzrlib.lock.LogicalLockResult.
1824
1904
if not self.is_locked():
1825
1905
self._reset_data()
1826
1906
self.branch.lock_write()
1828
return self._control_files.lock_write()
1908
self._control_files.lock_write()
1909
return LogicalLockResult(self.unlock)
1830
1911
self.branch.unlock()
2032
all_files = set() # specified and nested files
1952
2033
unknown_nested_files=set()
1953
2034
if to_file is None:
1954
2035
to_file = sys.stdout
2037
files_to_backup = []
1956
2039
def recurse_directory_to_add_files(directory):
1957
2040
# Recurse directory and add all files
1958
2041
# so we can check if they have changed.
1959
for parent_info, file_infos in\
1960
self.walkdirs(directory):
2042
for parent_info, file_infos in self.walkdirs(directory):
1961
2043
for relpath, basename, kind, lstat, fileid, kind in file_infos:
1962
2044
# Is it versioned or ignored?
1963
if self.path2id(relpath) or self.is_ignored(relpath):
2045
if self.path2id(relpath):
1964
2046
# Add nested content for deletion.
1965
new_files.add(relpath)
2047
all_files.add(relpath)
1967
# Files which are not versioned and not ignored
2049
# Files which are not versioned
1968
2050
# should be treated as unknown.
1969
unknown_nested_files.add((relpath, None, kind))
2051
files_to_backup.append(relpath)
1971
2053
for filename in files:
1972
2054
# Get file name into canonical form.
1973
2055
abspath = self.abspath(filename)
1974
2056
filename = self.relpath(abspath)
1975
2057
if len(filename) > 0:
1976
new_files.add(filename)
2058
all_files.add(filename)
1977
2059
recurse_directory_to_add_files(filename)
1979
files = list(new_files)
2061
files = list(all_files)
1981
2063
if len(files) == 0:
1982
2064
return # nothing to do
1987
2069
# Bail out if we are going to delete files we shouldn't
1988
2070
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
2071
for (file_id, path, content_change, versioned, parent_id, name,
2072
kind, executable) in self.iter_changes(self.basis_tree(),
2073
include_unchanged=True, require_versioned=False,
2074
want_unversioned=True, specific_files=files):
2075
if versioned[0] == False:
2076
# The record is unknown or newly added
2077
files_to_backup.append(path[1])
2078
elif (content_change and (kind[1] is not None) and
2079
osutils.is_inside_any(files, path[1])):
2080
# Versioned and changed, but not deleted, and still
2081
# in one of the dirs to be deleted.
2082
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)
2084
def backup(file_to_backup):
2085
backup_name = self.bzrdir._available_backup_name(file_to_backup)
2086
osutils.rename(abs_path, self.abspath(backup_name))
2087
return "removed %s (but kept a copy: %s)" % (file_to_backup,
2016
2090
# Build inv_delta and delete files where applicable,
2017
2091
# do this before any modifications to inventory.
2041
2115
len(os.listdir(abs_path)) > 0):
2043
2117
osutils.rmtree(abs_path)
2118
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,)
2122
if f in files_to_backup:
2125
osutils.delete_any(abs_path)
2126
message = "deleted %s" % (f,)
2050
2127
elif message is not None:
2051
2128
# Only care if we haven't done anything yet.
2052
2129
message = "%s does not exist." % (f,)
2189
2266
_marker = object()
2191
2268
def update(self, change_reporter=None, possible_transports=None,
2192
revision=None, old_tip=_marker):
2269
revision=None, old_tip=_marker, show_base=False):
2193
2270
"""Update a working tree along its branch.
2195
2272
This will update the branch if its bound too, which means we have
2233
2310
if old_tip is self._marker:
2235
return self._update_tree(old_tip, change_reporter, revision)
2312
return self._update_tree(old_tip, change_reporter, revision, show_base)
2239
2316
@needs_tree_write_lock
2240
def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
2317
def _update_tree(self, old_tip=None, change_reporter=None, revision=None,
2241
2319
"""Update a tree to the master branch.
2243
2321
:param old_tip: if supplied, the previous tip revision the branch,
2270
2348
other_tree = self.branch.repository.revision_tree(old_tip)
2271
2349
nb_conflicts = merge.merge_inner(self.branch, other_tree,
2272
2350
base_tree, this_tree=self,
2273
change_reporter=change_reporter)
2351
change_reporter=change_reporter,
2352
show_base=show_base)
2274
2353
if nb_conflicts:
2275
2354
self.add_parent_tree((old_tip, other_tree))
2276
2355
trace.note('Rerun update after fixing the conflicts.')
2301
2380
nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2302
2381
this_tree=self,
2303
change_reporter=change_reporter)
2382
change_reporter=change_reporter,
2383
show_base=show_base)
2304
2384
self.set_last_revision(revision)
2305
2385
# TODO - dedup parents list with things merged by pull ?
2306
2386
# reuse the tree we've updated to to set the basis:
2679
def check_state(self):
2680
"""Check that the working state is/isn't valid."""
2681
check_refs = self._get_check_refs()
2683
for ref in check_refs:
2686
refs[ref] = self.branch.repository.revision_tree(value)
2689
@needs_tree_write_lock
2690
def reset_state(self, revision_ids=None):
2691
"""Reset the state of the working tree.
2693
This does a hard-reset to a last-known-good state. This is a way to
2694
fix if something got corrupted (like the .bzr/checkout/dirstate file)
2696
if revision_ids is None:
2697
revision_ids = self.get_parent_ids()
2698
if not revision_ids:
2699
rt = self.branch.repository.revision_tree(
2700
_mod_revision.NULL_REVISION)
2702
rt = self.branch.repository.revision_tree(revision_ids[0])
2703
self._write_inventory(rt.inventory)
2704
self.set_parent_ids(revision_ids)
2598
2706
def _get_rules_searcher(self, default_searcher):
2599
2707
"""See Tree._get_rules_searcher."""
2600
2708
if self._rules_searcher is None:
2771
2883
"""The known formats."""
2886
"""Extra formats that can not be used in a metadir."""
2773
2888
requires_rich_root = False
2775
2890
upgrade_recommended = False
2892
requires_normalized_unicode_filenames = False
2894
case_sensitive_filename = "FoRMaT"
2896
missing_parent_conflicts = False
2897
"""If this format supports missing parent conflicts."""
2778
2900
def find_format(klass, a_bzrdir):
2779
2901
"""Return the format for the working tree object in a_bzrdir."""
2828
2950
klass._formats[format.get_format_string()] = format
2953
def register_extra_format(klass, format):
2954
klass._extra_formats.append(format)
2957
def unregister_extra_format(klass, format):
2958
klass._extra_formats.remove(format)
2961
def get_formats(klass):
2962
return klass._formats.values() + klass._extra_formats
2831
2965
def set_default_format(klass, format):
2832
2966
klass._default_format = format
3055
3199
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3056
3200
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3057
3201
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(),
3202
# Register extra formats which have no format string are not discoverable
3203
# and not independently creatable. They are implicitly created as part of
3204
# e.g. older Bazaar formats or foreign formats.
3205
WorkingTreeFormat.register_extra_format(WorkingTreeFormat2())
added
removed
bzrlib/workingtree.py
