37
38
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
38
ReusingTransform, NotVersionedError, CantMoveRoot,
39
ReusingTransform, CantMoveRoot,
39
40
ExistingLimbo, ImmortalLimbo, NoFinalPath,
40
41
UnableCreateSymlink)
41
42
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
928
929
return _PreviewTree(self)
930
def commit(self, branch, message, merge_parents=None, strict=False):
931
def commit(self, branch, message, merge_parents=None, strict=False,
932
timestamp=None, timezone=None, committer=None, authors=None,
933
revprops=None, revision_id=None):
931
934
"""Commit the result of this TreeTransform to a branch.
933
936
:param branch: The branch to commit to.
934
937
:param message: The message to attach to the commit.
935
:param merge_parents: Additional parents specified by pending merges.
938
:param merge_parents: Additional parent revision-ids specified by
940
:param strict: If True, abort the commit if there are unversioned
942
:param timestamp: if not None, seconds-since-epoch for the time and
943
date. (May be a float.)
944
:param timezone: Optional timezone for timestamp, as an offset in
946
:param committer: Optional committer in email-id format.
947
(e.g. "J Random Hacker <jrandom@example.com>")
948
:param authors: Optional list of authors in email-id format.
949
:param revprops: Optional dictionary of revision properties.
950
:param revision_id: Optional revision id. (Specifying a revision-id
951
may reduce performance for some non-native formats.)
936
952
:return: The revision_id of the revision committed.
938
954
self._check_malformed()
955
971
if self._tree.get_revision_id() != last_rev_id:
956
972
raise ValueError('TreeTransform not based on branch basis: %s' %
957
973
self._tree.get_revision_id())
958
builder = branch.get_commit_builder(parent_ids)
974
revprops = commit.Commit.update_revprops(revprops, branch, authors)
975
builder = branch.get_commit_builder(parent_ids,
980
revision_id=revision_id)
959
981
preview = self.get_preview_tree()
960
982
list(builder.record_iter_changes(preview, last_rev_id,
961
983
self.iter_changes()))
1635
1657
or trans_id in self._new_parent):
1637
1659
mover.rename(full_path, self._limbo_name(trans_id))
1660
except errors.TransformRenameFailed, e:
1639
1661
if e.errno != errno.ENOENT:
1666
1688
if trans_id in self._needs_rename:
1668
1690
mover.rename(self._limbo_name(trans_id), full_path)
1691
except errors.TransformRenameFailed, e:
1670
1692
# We may be renaming a dangling inventory id
1671
1693
if e.errno != errno.ENOENT:
1770
1792
parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
1771
1793
self._iter_parent_trees()]
1772
1794
vf.add_lines((file_id, tree_revision), parent_keys,
1773
self.get_file(file_id).readlines())
1795
self.get_file_lines(file_id))
1774
1796
repo = self._get_repository()
1775
1797
base_vf = repo.texts
1776
1798
if base_vf not in vf.fallback_versionedfiles:
1798
1820
executable = self.is_executable(file_id, path)
1799
1821
return kind, executable, None
1823
def is_locked(self):
1801
1826
def lock_read(self):
1802
1827
# Perhaps in theory, this should lock the TreeTransform?
1805
1830
def unlock(self):
2266
2291
for num, _unused in enumerate(wt.all_file_ids()):
2267
2292
if num > 0: # more than just a root
2268
2293
raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir)
2269
existing_files = set()
2270
for dir, files in wt.walkdirs():
2271
existing_files.update(f[0] for f in files)
2272
2294
file_trans_id = {}
2273
2295
top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2274
2296
pp = ProgressPhase("Build phase", 2, top_pb)
2298
2320
precomputed_delta = []
2300
2322
precomputed_delta = None
2323
# Check if tree inventory has content. If so, we populate
2324
# existing_files with the directory content. If there are no
2325
# entries we skip populating existing_files as its not used.
2326
# This improves performance and unncessary work on large
2327
# directory trees. (#501307)
2329
existing_files = set()
2330
for dir, files in wt.walkdirs():
2331
existing_files.update(f[0] for f in files)
2301
2332
for num, (tree_path, entry) in \
2302
2333
enumerate(tree.inventory.iter_entries_by_dir()):
2303
2334
pb.update("Building tree", num - len(deferred_contents), total)
2435
2466
if entry.kind == "directory":
2437
2468
if entry.kind == "file":
2438
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2469
f = file(target_path, 'rb')
2471
if tree.get_file_text(file_id) == f.read():
2440
2475
elif entry.kind == "symlink":
2441
2476
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2901
2936
"""Rename a file from one path to another."""
2903
2938
osutils.rename(from_, to)
2939
except (IOError, OSError), e:
2905
2940
if e.errno in (errno.EEXIST, errno.ENOTEMPTY):
2906
2941
raise errors.FileExists(to, str(e))
2942
# normal OSError doesn't include filenames so it's hard to see where
2943
# the problem is, see https://bugs.launchpad.net/bzr/+bug/491763
2944
raise errors.TransformRenameFailed(from_, to, str(e), e.errno)
2908
2945
self.past_renames.append((from_, to))
2910
2947
def pre_delete(self, from_, to):
2920
2957
def rollback(self):
2921
2958
"""Reverse all renames that have been performed"""
2922
2959
for from_, to in reversed(self.past_renames):
2923
osutils.rename(to, from_)
2961
osutils.rename(to, from_)
2962
except (OSError, IOError), e:
2963
raise errors.TransformRenameFailed(to, from_, str(e), e.errno)
2924
2964
# after rollback, don't reuse _FileMover
2925
2965
past_renames = None
2926
2966
pending_deletions = None
added
removed
bzrlib/transform.py
