1
# Copyright (C) 2006-2011 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
from __future__ import absolute_import
21
from stat import S_ISREG, S_IEXEC
25
config as _mod_config,
32
lazy_import.lazy_import(globals(), """
43
revision as _mod_revision,
47
from breezy.bzr import (
51
from breezy.i18n import gettext
53
from .errors import (DuplicateKey, MalformedTransform,
54
ReusingTransform, CantMoveRoot,
55
ImmortalLimbo, NoFinalPath,
57
from .filters import filtered_output_bytes, ContentFilterContext
58
from .mutabletree import MutableTree
59
from .osutils import (
67
from .progress import ProgressPhase
78
ROOT_PARENT = "root-parent"
81
def unique_add(map, key, value):
83
raise DuplicateKey(key=key)
87
class _TransformResults(object):
88
def __init__(self, modified_paths, rename_count):
90
self.modified_paths = modified_paths
91
self.rename_count = rename_count
94
class TreeTransformBase(object):
95
"""The base class for TreeTransform and its kin."""
97
def __init__(self, tree, pb=None, case_sensitive=True):
100
:param tree: The tree that will be transformed, but not necessarily
103
:param case_sensitive: If True, the target of the transform is
104
case sensitive, not just case preserving.
106
object.__init__(self)
109
# mapping of trans_id -> new basename
111
# mapping of trans_id -> new parent trans_id
112
self._new_parent = {}
113
# mapping of trans_id with new contents -> new file_kind
114
self._new_contents = {}
115
# mapping of trans_id => (sha1 of content, stat_value)
116
self._observed_sha1s = {}
117
# Set of trans_ids whose contents will be removed
118
self._removed_contents = set()
119
# Mapping of trans_id -> new execute-bit value
120
self._new_executability = {}
121
# Mapping of trans_id -> new tree-reference value
122
self._new_reference_revision = {}
123
# Mapping of trans_id -> new file_id
125
# Mapping of old file-id -> trans_id
126
self._non_present_ids = {}
127
# Mapping of new file_id -> trans_id
129
# Set of trans_ids that will be removed
130
self._removed_id = set()
131
# Mapping of path in old tree -> trans_id
132
self._tree_path_ids = {}
133
# Mapping trans_id -> path in old tree
134
self._tree_id_paths = {}
135
# The trans_id that will be used as the tree root
136
if tree.is_versioned(''):
137
self._new_root = self.trans_id_tree_path('')
139
self._new_root = None
140
# Indicator of whether the transform has been applied
144
# Whether the target is case sensitive
145
self._case_sensitive_target = case_sensitive
146
# A counter of how many files have been renamed
147
self.rename_count = 0
150
"""Support Context Manager API."""
153
def __exit__(self, exc_type, exc_val, exc_tb):
154
"""Support Context Manager API."""
158
"""Release the working tree lock, if held.
160
This is required if apply has not been invoked, but can be invoked
163
if self._tree is None:
165
for hook in MutableTree.hooks['post_transform']:
166
hook(self._tree, self)
170
def __get_root(self):
171
return self._new_root
173
root = property(__get_root)
175
def _assign_id(self):
176
"""Produce a new tranform id"""
177
new_id = "new-%s" % self._id_number
181
def create_path(self, name, parent):
182
"""Assign a transaction id to a new path"""
183
trans_id = self._assign_id()
184
unique_add(self._new_name, trans_id, name)
185
unique_add(self._new_parent, trans_id, parent)
188
def adjust_path(self, name, parent, trans_id):
189
"""Change the path that is assigned to a transaction id."""
191
raise ValueError("Parent trans-id may not be None")
192
if trans_id == self._new_root:
194
self._new_name[trans_id] = name
195
self._new_parent[trans_id] = parent
197
def adjust_root_path(self, name, parent):
198
"""Emulate moving the root by moving all children, instead.
200
We do this by undoing the association of root's transaction id with the
201
current tree. This allows us to create a new directory with that
202
transaction id. We unversion the root directory and version the
203
physically new directory, and hope someone versions the tree root
206
old_root = self._new_root
207
old_root_file_id = self.final_file_id(old_root)
208
# force moving all children of root
209
for child_id in self.iter_tree_children(old_root):
210
if child_id != parent:
211
self.adjust_path(self.final_name(child_id),
212
self.final_parent(child_id), child_id)
213
file_id = self.final_file_id(child_id)
214
if file_id is not None:
215
self.unversion_file(child_id)
216
self.version_file(file_id, child_id)
218
# the physical root needs a new transaction id
219
self._tree_path_ids.pop("")
220
self._tree_id_paths.pop(old_root)
221
self._new_root = self.trans_id_tree_path('')
222
if parent == old_root:
223
parent = self._new_root
224
self.adjust_path(name, parent, old_root)
225
self.create_directory(old_root)
226
self.version_file(old_root_file_id, old_root)
227
self.unversion_file(self._new_root)
229
def fixup_new_roots(self):
230
"""Reinterpret requests to change the root directory
232
Instead of creating a root directory, or moving an existing directory,
233
all the attributes and children of the new root are applied to the
234
existing root directory.
236
This means that the old root trans-id becomes obsolete, so it is
237
recommended only to invoke this after the root trans-id has become
241
new_roots = [k for k, v in viewitems(self._new_parent)
243
if len(new_roots) < 1:
245
if len(new_roots) != 1:
246
raise ValueError('A tree cannot have two roots!')
247
if self._new_root is None:
248
self._new_root = new_roots[0]
250
old_new_root = new_roots[0]
251
# unversion the new root's directory.
252
if self.final_kind(self._new_root) is None:
253
file_id = self.final_file_id(old_new_root)
255
file_id = self.final_file_id(self._new_root)
256
if old_new_root in self._new_id:
257
self.cancel_versioning(old_new_root)
259
self.unversion_file(old_new_root)
260
# if, at this stage, root still has an old file_id, zap it so we can
261
# stick a new one in.
262
if (self.tree_file_id(self._new_root) is not None
263
and self._new_root not in self._removed_id):
264
self.unversion_file(self._new_root)
265
if file_id is not None:
266
self.version_file(file_id, self._new_root)
268
# Now move children of new root into old root directory.
269
# Ensure all children are registered with the transaction, but don't
270
# use directly-- some tree children have new parents
271
list(self.iter_tree_children(old_new_root))
272
# Move all children of new root into old root directory.
273
for child in self.by_parent().get(old_new_root, []):
274
self.adjust_path(self.final_name(child), self._new_root, child)
276
# Ensure old_new_root has no directory.
277
if old_new_root in self._new_contents:
278
self.cancel_creation(old_new_root)
280
self.delete_contents(old_new_root)
282
# prevent deletion of root directory.
283
if self._new_root in self._removed_contents:
284
self.cancel_deletion(self._new_root)
286
# destroy path info for old_new_root.
287
del self._new_parent[old_new_root]
288
del self._new_name[old_new_root]
290
def trans_id_file_id(self, file_id):
291
"""Determine or set the transaction id associated with a file ID.
292
A new id is only created for file_ids that were never present. If
293
a transaction has been unversioned, it is deliberately still returned.
294
(this will likely lead to an unversioned parent conflict.)
297
raise ValueError('None is not a valid file id')
298
if file_id in self._r_new_id and self._r_new_id[file_id] is not None:
299
return self._r_new_id[file_id]
302
path = self._tree.id2path(file_id)
303
except errors.NoSuchId:
304
if file_id in self._non_present_ids:
305
return self._non_present_ids[file_id]
307
trans_id = self._assign_id()
308
self._non_present_ids[file_id] = trans_id
311
return self.trans_id_tree_path(path)
313
def trans_id_tree_path(self, path):
314
"""Determine (and maybe set) the transaction ID for a tree path."""
315
path = self.canonical_path(path)
316
if path not in self._tree_path_ids:
317
self._tree_path_ids[path] = self._assign_id()
318
self._tree_id_paths[self._tree_path_ids[path]] = path
319
return self._tree_path_ids[path]
321
def get_tree_parent(self, trans_id):
322
"""Determine id of the parent in the tree."""
323
path = self._tree_id_paths[trans_id]
326
return self.trans_id_tree_path(os.path.dirname(path))
328
def delete_contents(self, trans_id):
329
"""Schedule the contents of a path entry for deletion"""
330
kind = self.tree_kind(trans_id)
332
self._removed_contents.add(trans_id)
334
def cancel_deletion(self, trans_id):
335
"""Cancel a scheduled deletion"""
336
self._removed_contents.remove(trans_id)
338
def unversion_file(self, trans_id):
339
"""Schedule a path entry to become unversioned"""
340
self._removed_id.add(trans_id)
342
def delete_versioned(self, trans_id):
343
"""Delete and unversion a versioned file"""
344
self.delete_contents(trans_id)
345
self.unversion_file(trans_id)
347
def set_executability(self, executability, trans_id):
348
"""Schedule setting of the 'execute' bit
349
To unschedule, set to None
351
if executability is None:
352
del self._new_executability[trans_id]
354
unique_add(self._new_executability, trans_id, executability)
356
def set_tree_reference(self, revision_id, trans_id):
357
"""Set the reference associated with a directory"""
358
unique_add(self._new_reference_revision, trans_id, revision_id)
360
def version_file(self, file_id, trans_id):
361
"""Schedule a file to become versioned."""
364
unique_add(self._new_id, trans_id, file_id)
365
unique_add(self._r_new_id, file_id, trans_id)
367
def cancel_versioning(self, trans_id):
368
"""Undo a previous versioning of a file"""
369
file_id = self._new_id[trans_id]
370
del self._new_id[trans_id]
371
del self._r_new_id[file_id]
373
def new_paths(self, filesystem_only=False):
374
"""Determine the paths of all new and changed files.
376
:param filesystem_only: if True, only calculate values for files
377
that require renames or execute bit changes.
381
stale_ids = self._needs_rename.difference(self._new_name)
382
stale_ids.difference_update(self._new_parent)
383
stale_ids.difference_update(self._new_contents)
384
stale_ids.difference_update(self._new_id)
385
needs_rename = self._needs_rename.difference(stale_ids)
386
id_sets = (needs_rename, self._new_executability)
388
id_sets = (self._new_name, self._new_parent, self._new_contents,
389
self._new_id, self._new_executability)
390
for id_set in id_sets:
391
new_ids.update(id_set)
392
return sorted(FinalPaths(self).get_paths(new_ids))
394
def _inventory_altered(self):
395
"""Determine which trans_ids need new Inventory entries.
397
An new entry is needed when anything that would be reflected by an
398
inventory entry changes, including file name, file_id, parent file_id,
399
file kind, and the execute bit.
401
Some care is taken to return entries with real changes, not cases
402
where the value is deleted and then restored to its original value,
403
but some actually unchanged values may be returned.
405
:returns: A list of (path, trans_id) for all items requiring an
406
inventory change. Ordered by path.
409
# Find entries whose file_ids are new (or changed).
410
new_file_id = set(t for t in self._new_id
411
if self._new_id[t] != self.tree_file_id(t))
412
for id_set in [self._new_name, self._new_parent, new_file_id,
413
self._new_executability]:
414
changed_ids.update(id_set)
415
# removing implies a kind change
416
changed_kind = set(self._removed_contents)
418
changed_kind.intersection_update(self._new_contents)
419
# Ignore entries that are already known to have changed.
420
changed_kind.difference_update(changed_ids)
421
# to keep only the truly changed ones
422
changed_kind = (t for t in changed_kind
423
if self.tree_kind(t) != self.final_kind(t))
424
# all kind changes will alter the inventory
425
changed_ids.update(changed_kind)
426
# To find entries with changed parent_ids, find parents which existed,
427
# but changed file_id.
428
# Now add all their children to the set.
429
for parent_trans_id in new_file_id:
430
changed_ids.update(self.iter_tree_children(parent_trans_id))
431
return sorted(FinalPaths(self).get_paths(changed_ids))
433
def final_kind(self, trans_id):
434
"""Determine the final file kind, after any changes applied.
436
:return: None if the file does not exist/has no contents. (It is
437
conceivable that a path would be created without the corresponding
438
contents insertion command)
440
if trans_id in self._new_contents:
441
return self._new_contents[trans_id]
442
elif trans_id in self._removed_contents:
445
return self.tree_kind(trans_id)
447
def tree_path(self, trans_id):
448
"""Determine the tree path associated with the trans_id."""
449
return self._tree_id_paths.get(trans_id)
451
def tree_file_id(self, trans_id):
452
"""Determine the file id associated with the trans_id in the tree"""
453
path = self.tree_path(trans_id)
456
# the file is old; the old id is still valid
457
if self._new_root == trans_id:
458
return self._tree.get_root_id()
459
return self._tree.path2id(path)
461
def final_file_id(self, trans_id):
462
"""Determine the file id after any changes are applied, or None.
464
None indicates that the file will not be versioned after changes are
468
return self._new_id[trans_id]
470
if trans_id in self._removed_id:
472
return self.tree_file_id(trans_id)
474
def inactive_file_id(self, trans_id):
475
"""Return the inactive file_id associated with a transaction id.
476
That is, the one in the tree or in non_present_ids.
477
The file_id may actually be active, too.
479
file_id = self.tree_file_id(trans_id)
480
if file_id is not None:
482
for key, value in viewitems(self._non_present_ids):
483
if value == trans_id:
486
def final_parent(self, trans_id):
487
"""Determine the parent file_id, after any changes are applied.
489
ROOT_PARENT is returned for the tree root.
492
return self._new_parent[trans_id]
494
return self.get_tree_parent(trans_id)
496
def final_name(self, trans_id):
497
"""Determine the final filename, after all changes are applied."""
499
return self._new_name[trans_id]
502
return os.path.basename(self._tree_id_paths[trans_id])
504
raise NoFinalPath(trans_id, self)
507
"""Return a map of parent: children for known parents.
509
Only new paths and parents of tree files with assigned ids are used.
512
items = list(viewitems(self._new_parent))
513
items.extend((t, self.final_parent(t))
514
for t in list(self._tree_id_paths))
515
for trans_id, parent_id in items:
516
if parent_id not in by_parent:
517
by_parent[parent_id] = set()
518
by_parent[parent_id].add(trans_id)
521
def path_changed(self, trans_id):
522
"""Return True if a trans_id's path has changed."""
523
return (trans_id in self._new_name) or (trans_id in self._new_parent)
525
def new_contents(self, trans_id):
526
return (trans_id in self._new_contents)
528
def find_conflicts(self):
529
"""Find any violations of inventory or filesystem invariants"""
530
if self._done is True:
531
raise ReusingTransform()
533
# ensure all children of all existent parents are known
534
# all children of non-existent parents are known, by definition.
535
self._add_tree_children()
536
by_parent = self.by_parent()
537
conflicts.extend(self._unversioned_parents(by_parent))
538
conflicts.extend(self._parent_loops())
539
conflicts.extend(self._duplicate_entries(by_parent))
540
conflicts.extend(self._duplicate_ids())
541
conflicts.extend(self._parent_type_conflicts(by_parent))
542
conflicts.extend(self._improper_versioning())
543
conflicts.extend(self._executability_conflicts())
544
conflicts.extend(self._overwrite_conflicts())
547
def _check_malformed(self):
548
conflicts = self.find_conflicts()
549
if len(conflicts) != 0:
550
raise MalformedTransform(conflicts=conflicts)
552
def _add_tree_children(self):
553
"""Add all the children of all active parents to the known paths.
555
Active parents are those which gain children, and those which are
556
removed. This is a necessary first step in detecting conflicts.
558
parents = list(self.by_parent())
559
parents.extend([t for t in self._removed_contents if
560
self.tree_kind(t) == 'directory'])
561
for trans_id in self._removed_id:
562
path = self.tree_path(trans_id)
564
if self._tree.stored_kind(path) == 'directory':
565
parents.append(trans_id)
566
elif self.tree_kind(trans_id) == 'directory':
567
parents.append(trans_id)
569
for parent_id in parents:
570
# ensure that all children are registered with the transaction
571
list(self.iter_tree_children(parent_id))
573
def _has_named_child(self, name, parent_id, known_children):
574
"""Does a parent already have a name child.
576
:param name: The searched for name.
578
:param parent_id: The parent for which the check is made.
580
:param known_children: The already known children. This should have
581
been recently obtained from `self.by_parent.get(parent_id)`
582
(or will be if None is passed).
584
if known_children is None:
585
known_children = self.by_parent().get(parent_id, [])
586
for child in known_children:
587
if self.final_name(child) == name:
589
parent_path = self._tree_id_paths.get(parent_id, None)
590
if parent_path is None:
591
# No parent... no children
593
child_path = joinpath(parent_path, name)
594
child_id = self._tree_path_ids.get(child_path, None)
596
# Not known by the tree transform yet, check the filesystem
597
return osutils.lexists(self._tree.abspath(child_path))
599
raise AssertionError('child_id is missing: %s, %s, %s'
600
% (name, parent_id, child_id))
602
def _available_backup_name(self, name, target_id):
603
"""Find an available backup name.
605
:param name: The basename of the file.
607
:param target_id: The directory trans_id where the backup should
610
known_children = self.by_parent().get(target_id, [])
611
return osutils.available_backup_name(
613
lambda base: self._has_named_child(
614
base, target_id, known_children))
616
def _parent_loops(self):
617
"""No entry should be its own ancestor"""
619
for trans_id in self._new_parent:
622
while parent_id != ROOT_PARENT:
625
parent_id = self.final_parent(parent_id)
628
if parent_id == trans_id:
629
conflicts.append(('parent loop', trans_id))
630
if parent_id in seen:
634
def _unversioned_parents(self, by_parent):
635
"""If parent directories are versioned, children must be versioned."""
637
for parent_id, children in viewitems(by_parent):
638
if parent_id == ROOT_PARENT:
640
if self.final_file_id(parent_id) is not None:
642
for child_id in children:
643
if self.final_file_id(child_id) is not None:
644
conflicts.append(('unversioned parent', parent_id))
648
def _improper_versioning(self):
649
"""Cannot version a file with no contents, or a bad type.
651
However, existing entries with no contents are okay.
654
for trans_id in self._new_id:
655
kind = self.final_kind(trans_id)
657
conflicts.append(('versioning no contents', trans_id))
659
if not self._tree.versionable_kind(kind):
660
conflicts.append(('versioning bad kind', trans_id, kind))
663
def _executability_conflicts(self):
664
"""Check for bad executability changes.
666
Only versioned files may have their executability set, because
667
1. only versioned entries can have executability under windows
668
2. only files can be executable. (The execute bit on a directory
669
does not indicate searchability)
672
for trans_id in self._new_executability:
673
if self.final_file_id(trans_id) is None:
674
conflicts.append(('unversioned executability', trans_id))
676
if self.final_kind(trans_id) != "file":
677
conflicts.append(('non-file executability', trans_id))
680
def _overwrite_conflicts(self):
681
"""Check for overwrites (not permitted on Win32)"""
683
for trans_id in self._new_contents:
684
if self.tree_kind(trans_id) is None:
686
if trans_id not in self._removed_contents:
687
conflicts.append(('overwrite', trans_id,
688
self.final_name(trans_id)))
691
def _duplicate_entries(self, by_parent):
692
"""No directory may have two entries with the same name."""
694
if (self._new_name, self._new_parent) == ({}, {}):
696
for children in viewvalues(by_parent):
698
for child_tid in children:
699
name = self.final_name(child_tid)
701
# Keep children only if they still exist in the end
702
if not self._case_sensitive_target:
704
name_ids.append((name, child_tid))
708
for name, trans_id in name_ids:
709
kind = self.final_kind(trans_id)
710
file_id = self.final_file_id(trans_id)
711
if kind is None and file_id is None:
713
if name == last_name:
714
conflicts.append(('duplicate', last_trans_id, trans_id,
717
last_trans_id = trans_id
720
def _duplicate_ids(self):
721
"""Each inventory id may only be used once"""
724
all_ids = self._tree.all_file_ids()
725
except errors.UnsupportedOperation:
726
# it's okay for non-file-id trees to raise UnsupportedOperation.
728
removed_tree_ids = set((self.tree_file_id(trans_id) for trans_id in
730
active_tree_ids = all_ids.difference(removed_tree_ids)
731
for trans_id, file_id in viewitems(self._new_id):
732
if file_id in active_tree_ids:
733
path = self._tree.id2path(file_id)
734
old_trans_id = self.trans_id_tree_path(path)
735
conflicts.append(('duplicate id', old_trans_id, trans_id))
738
def _parent_type_conflicts(self, by_parent):
739
"""Children must have a directory parent"""
741
for parent_id, children in viewitems(by_parent):
742
if parent_id == ROOT_PARENT:
745
for child_id in children:
746
if self.final_kind(child_id) is not None:
751
# There is at least a child, so we need an existing directory to
753
kind = self.final_kind(parent_id)
755
# The directory will be deleted
756
conflicts.append(('missing parent', parent_id))
757
elif kind != "directory":
758
# Meh, we need a *directory* to put something in it
759
conflicts.append(('non-directory parent', parent_id))
762
def _set_executability(self, path, trans_id):
763
"""Set the executability of versioned files """
764
if self._tree._supports_executable():
765
new_executability = self._new_executability[trans_id]
766
abspath = self._tree.abspath(path)
767
current_mode = os.stat(abspath).st_mode
768
if new_executability:
771
to_mode = current_mode | (0o100 & ~umask)
772
# Enable x-bit for others only if they can read it.
773
if current_mode & 0o004:
774
to_mode |= 0o001 & ~umask
775
if current_mode & 0o040:
776
to_mode |= 0o010 & ~umask
778
to_mode = current_mode & ~0o111
779
osutils.chmod_if_possible(abspath, to_mode)
781
def _new_entry(self, name, parent_id, file_id):
782
"""Helper function to create a new filesystem entry."""
783
trans_id = self.create_path(name, parent_id)
784
if file_id is not None:
785
self.version_file(file_id, trans_id)
788
def new_file(self, name, parent_id, contents, file_id=None,
789
executable=None, sha1=None):
790
"""Convenience method to create files.
792
name is the name of the file to create.
793
parent_id is the transaction id of the parent directory of the file.
794
contents is an iterator of bytestrings, which will be used to produce
796
:param file_id: The inventory ID of the file, if it is to be versioned.
797
:param executable: Only valid when a file_id has been supplied.
799
trans_id = self._new_entry(name, parent_id, file_id)
800
# TODO: rather than scheduling a set_executable call,
801
# have create_file create the file with the right mode.
802
self.create_file(contents, trans_id, sha1=sha1)
803
if executable is not None:
804
self.set_executability(executable, trans_id)
807
def new_directory(self, name, parent_id, file_id=None):
808
"""Convenience method to create directories.
810
name is the name of the directory to create.
811
parent_id is the transaction id of the parent directory of the
813
file_id is the inventory ID of the directory, if it is to be versioned.
815
trans_id = self._new_entry(name, parent_id, file_id)
816
self.create_directory(trans_id)
819
def new_symlink(self, name, parent_id, target, file_id=None):
820
"""Convenience method to create symbolic link.
822
name is the name of the symlink to create.
823
parent_id is the transaction id of the parent directory of the symlink.
824
target is a bytestring of the target of the symlink.
825
file_id is the inventory ID of the file, if it is to be versioned.
827
trans_id = self._new_entry(name, parent_id, file_id)
828
self.create_symlink(target, trans_id)
831
def new_orphan(self, trans_id, parent_id):
832
"""Schedule an item to be orphaned.
834
When a directory is about to be removed, its children, if they are not
835
versioned are moved out of the way: they don't have a parent anymore.
837
:param trans_id: The trans_id of the existing item.
838
:param parent_id: The parent trans_id of the item.
840
raise NotImplementedError(self.new_orphan)
842
def _get_potential_orphans(self, dir_id):
843
"""Find the potential orphans in a directory.
845
A directory can't be safely deleted if there are versioned files in it.
846
If all the contained files are unversioned then they can be orphaned.
848
The 'None' return value means that the directory contains at least one
849
versioned file and should not be deleted.
851
:param dir_id: The directory trans id.
853
:return: A list of the orphan trans ids or None if at least one
854
versioned file is present.
857
# Find the potential orphans, stop if one item should be kept
858
for child_tid in self.by_parent()[dir_id]:
859
if child_tid in self._removed_contents:
860
# The child is removed as part of the transform. Since it was
861
# versioned before, it's not an orphan
863
elif self.final_file_id(child_tid) is None:
864
# The child is not versioned
865
orphans.append(child_tid)
867
# We have a versioned file here, searching for orphans is
873
def _affected_ids(self):
874
"""Return the set of transform ids affected by the transform"""
875
trans_ids = set(self._removed_id)
876
trans_ids.update(self._new_id)
877
trans_ids.update(self._removed_contents)
878
trans_ids.update(self._new_contents)
879
trans_ids.update(self._new_executability)
880
trans_ids.update(self._new_name)
881
trans_ids.update(self._new_parent)
884
def _get_file_id_maps(self):
885
"""Return mapping of file_ids to trans_ids in the to and from states"""
886
trans_ids = self._affected_ids()
889
# Build up two dicts: trans_ids associated with file ids in the
890
# FROM state, vs the TO state.
891
for trans_id in trans_ids:
892
from_file_id = self.tree_file_id(trans_id)
893
if from_file_id is not None:
894
from_trans_ids[from_file_id] = trans_id
895
to_file_id = self.final_file_id(trans_id)
896
if to_file_id is not None:
897
to_trans_ids[to_file_id] = trans_id
898
return from_trans_ids, to_trans_ids
900
def _from_file_data(self, from_trans_id, from_versioned, from_path):
901
"""Get data about a file in the from (tree) state
903
Return a (name, parent, kind, executable) tuple
905
from_path = self._tree_id_paths.get(from_trans_id)
907
# get data from working tree if versioned
908
from_entry = next(self._tree.iter_entries_by_dir(
909
specific_files=[from_path]))[1]
910
from_name = from_entry.name
911
from_parent = from_entry.parent_id
914
if from_path is None:
915
# File does not exist in FROM state
919
# File exists, but is not versioned. Have to use path-
921
from_name = os.path.basename(from_path)
922
tree_parent = self.get_tree_parent(from_trans_id)
923
from_parent = self.tree_file_id(tree_parent)
924
if from_path is not None:
925
from_kind, from_executable, from_stats = \
926
self._tree._comparison_data(from_entry, from_path)
929
from_executable = False
930
return from_name, from_parent, from_kind, from_executable
932
def _to_file_data(self, to_trans_id, from_trans_id, from_executable):
933
"""Get data about a file in the to (target) state
935
Return a (name, parent, kind, executable) tuple
937
to_name = self.final_name(to_trans_id)
938
to_kind = self.final_kind(to_trans_id)
939
to_parent = self.final_file_id(self.final_parent(to_trans_id))
940
if to_trans_id in self._new_executability:
941
to_executable = self._new_executability[to_trans_id]
942
elif to_trans_id == from_trans_id:
943
to_executable = from_executable
945
to_executable = False
946
return to_name, to_parent, to_kind, to_executable
948
def iter_changes(self):
949
"""Produce output in the same format as Tree.iter_changes.
951
Will produce nonsensical results if invoked while inventory/filesystem
952
conflicts (as reported by TreeTransform.find_conflicts()) are present.
954
This reads the Transform, but only reproduces changes involving a
955
file_id. Files that are not versioned in either of the FROM or TO
956
states are not reflected.
958
final_paths = FinalPaths(self)
959
from_trans_ids, to_trans_ids = self._get_file_id_maps()
961
# Now iterate through all active file_ids
962
for file_id in set(from_trans_ids).union(to_trans_ids):
964
from_trans_id = from_trans_ids.get(file_id)
965
# find file ids, and determine versioning state
966
if from_trans_id is None:
967
from_versioned = False
968
from_trans_id = to_trans_ids[file_id]
970
from_versioned = True
971
to_trans_id = to_trans_ids.get(file_id)
972
if to_trans_id is None:
974
to_trans_id = from_trans_id
978
if not from_versioned:
981
from_path = self._tree_id_paths.get(from_trans_id)
985
to_path = final_paths.get_path(to_trans_id)
987
from_name, from_parent, from_kind, from_executable = \
988
self._from_file_data(from_trans_id, from_versioned, from_path)
990
to_name, to_parent, to_kind, to_executable = \
991
self._to_file_data(to_trans_id, from_trans_id, from_executable)
993
if from_kind != to_kind:
995
elif to_kind in ('file', 'symlink') and (
996
to_trans_id != from_trans_id
997
or to_trans_id in self._new_contents):
999
if (not modified and from_versioned == to_versioned
1000
and from_parent == to_parent and from_name == to_name
1001
and from_executable == to_executable):
1003
results.append((file_id, (from_path, to_path), modified,
1004
(from_versioned, to_versioned),
1005
(from_parent, to_parent),
1006
(from_name, to_name),
1007
(from_kind, to_kind),
1008
(from_executable, to_executable)))
1012
return (paths[0] or '', paths[1] or '')
1013
return iter(sorted(results, key=path_key))
1015
def get_preview_tree(self):
1016
"""Return a tree representing the result of the transform.
1018
The tree is a snapshot, and altering the TreeTransform will invalidate
1021
return _PreviewTree(self)
1023
def commit(self, branch, message, merge_parents=None, strict=False,
1024
timestamp=None, timezone=None, committer=None, authors=None,
1025
revprops=None, revision_id=None):
1026
"""Commit the result of this TreeTransform to a branch.
1028
:param branch: The branch to commit to.
1029
:param message: The message to attach to the commit.
1030
:param merge_parents: Additional parent revision-ids specified by
1032
:param strict: If True, abort the commit if there are unversioned
1034
:param timestamp: if not None, seconds-since-epoch for the time and
1035
date. (May be a float.)
1036
:param timezone: Optional timezone for timestamp, as an offset in
1038
:param committer: Optional committer in email-id format.
1039
(e.g. "J Random Hacker <jrandom@example.com>")
1040
:param authors: Optional list of authors in email-id format.
1041
:param revprops: Optional dictionary of revision properties.
1042
:param revision_id: Optional revision id. (Specifying a revision-id
1043
may reduce performance for some non-native formats.)
1044
:return: The revision_id of the revision committed.
1046
self._check_malformed()
1048
unversioned = set(self._new_contents).difference(set(self._new_id))
1049
for trans_id in unversioned:
1050
if self.final_file_id(trans_id) is None:
1051
raise errors.StrictCommitFailed()
1053
revno, last_rev_id = branch.last_revision_info()
1054
if last_rev_id == _mod_revision.NULL_REVISION:
1055
if merge_parents is not None:
1056
raise ValueError('Cannot supply merge parents for first'
1060
parent_ids = [last_rev_id]
1061
if merge_parents is not None:
1062
parent_ids.extend(merge_parents)
1063
if self._tree.get_revision_id() != last_rev_id:
1064
raise ValueError('TreeTransform not based on branch basis: %s' %
1065
self._tree.get_revision_id().decode('utf-8'))
1066
revprops = commit.Commit.update_revprops(revprops, branch, authors)
1067
builder = branch.get_commit_builder(parent_ids,
1068
timestamp=timestamp,
1070
committer=committer,
1072
revision_id=revision_id)
1073
preview = self.get_preview_tree()
1074
list(builder.record_iter_changes(preview, last_rev_id,
1075
self.iter_changes()))
1076
builder.finish_inventory()
1077
revision_id = builder.commit(message)
1078
branch.set_last_revision_info(revno + 1, revision_id)
1081
def _text_parent(self, trans_id):
1082
path = self.tree_path(trans_id)
1084
if path is None or self._tree.kind(path) != 'file':
1086
except errors.NoSuchFile:
1090
def _get_parents_texts(self, trans_id):
1091
"""Get texts for compression parents of this file."""
1092
path = self._text_parent(trans_id)
1095
return (self._tree.get_file_text(path),)
1097
def _get_parents_lines(self, trans_id):
1098
"""Get lines for compression parents of this file."""
1099
path = self._text_parent(trans_id)
1102
return (self._tree.get_file_lines(path),)
1104
def serialize(self, serializer):
1105
"""Serialize this TreeTransform.
1107
:param serializer: A Serialiser like pack.ContainerSerializer.
1109
new_name = {k.encode('utf-8'): v.encode('utf-8')
1110
for k, v in viewitems(self._new_name)}
1111
new_parent = {k.encode('utf-8'): v.encode('utf-8')
1112
for k, v in viewitems(self._new_parent)}
1113
new_id = {k.encode('utf-8'): v
1114
for k, v in viewitems(self._new_id)}
1115
new_executability = {k.encode('utf-8'): int(v)
1116
for k, v in viewitems(self._new_executability)}
1117
tree_path_ids = {k.encode('utf-8'): v.encode('utf-8')
1118
for k, v in viewitems(self._tree_path_ids)}
1119
non_present_ids = {k: v.encode('utf-8')
1120
for k, v in viewitems(self._non_present_ids)}
1121
removed_contents = [trans_id.encode('utf-8')
1122
for trans_id in self._removed_contents]
1123
removed_id = [trans_id.encode('utf-8')
1124
for trans_id in self._removed_id]
1126
b'_id_number': self._id_number,
1127
b'_new_name': new_name,
1128
b'_new_parent': new_parent,
1129
b'_new_executability': new_executability,
1131
b'_tree_path_ids': tree_path_ids,
1132
b'_removed_id': removed_id,
1133
b'_removed_contents': removed_contents,
1134
b'_non_present_ids': non_present_ids,
1136
yield serializer.bytes_record(bencode.bencode(attribs),
1138
for trans_id, kind in sorted(viewitems(self._new_contents)):
1140
with open(self._limbo_name(trans_id), 'rb') as cur_file:
1141
lines = cur_file.readlines()
1142
parents = self._get_parents_lines(trans_id)
1143
mpdiff = multiparent.MultiParent.from_lines(lines, parents)
1144
content = b''.join(mpdiff.to_patch())
1145
if kind == 'directory':
1147
if kind == 'symlink':
1148
content = self._read_symlink_target(trans_id)
1149
if not isinstance(content, bytes):
1150
content = content.encode('utf-8')
1151
yield serializer.bytes_record(
1152
content, ((trans_id.encode('utf-8'), kind.encode('ascii')),))
1154
def deserialize(self, records):
1155
"""Deserialize a stored TreeTransform.
1157
:param records: An iterable of (names, content) tuples, as per
1158
pack.ContainerPushParser.
1160
names, content = next(records)
1161
attribs = bencode.bdecode(content)
1162
self._id_number = attribs[b'_id_number']
1163
self._new_name = {k.decode('utf-8'): v.decode('utf-8')
1164
for k, v in viewitems(attribs[b'_new_name'])}
1165
self._new_parent = {k.decode('utf-8'): v.decode('utf-8')
1166
for k, v in viewitems(attribs[b'_new_parent'])}
1167
self._new_executability = {
1168
k.decode('utf-8'): bool(v)
1169
for k, v in viewitems(attribs[b'_new_executability'])}
1170
self._new_id = {k.decode('utf-8'): v
1171
for k, v in viewitems(attribs[b'_new_id'])}
1172
self._r_new_id = {v: k for k, v in viewitems(self._new_id)}
1173
self._tree_path_ids = {}
1174
self._tree_id_paths = {}
1175
for bytepath, trans_id in viewitems(attribs[b'_tree_path_ids']):
1176
path = bytepath.decode('utf-8')
1177
trans_id = trans_id.decode('utf-8')
1178
self._tree_path_ids[path] = trans_id
1179
self._tree_id_paths[trans_id] = path
1180
self._removed_id = {trans_id.decode('utf-8')
1181
for trans_id in attribs[b'_removed_id']}
1182
self._removed_contents = set(
1183
trans_id.decode('utf-8')
1184
for trans_id in attribs[b'_removed_contents'])
1185
self._non_present_ids = {
1186
k: v.decode('utf-8')
1187
for k, v in viewitems(attribs[b'_non_present_ids'])}
1188
for ((trans_id, kind),), content in records:
1189
trans_id = trans_id.decode('utf-8')
1190
kind = kind.decode('ascii')
1192
mpdiff = multiparent.MultiParent.from_patch(content)
1193
lines = mpdiff.to_lines(self._get_parents_texts(trans_id))
1194
self.create_file(lines, trans_id)
1195
if kind == 'directory':
1196
self.create_directory(trans_id)
1197
if kind == 'symlink':
1198
self.create_symlink(content.decode('utf-8'), trans_id)
1201
class DiskTreeTransform(TreeTransformBase):
1202
"""Tree transform storing its contents on disk."""
1204
def __init__(self, tree, limbodir, pb=None,
1205
case_sensitive=True):
1207
:param tree: The tree that will be transformed, but not necessarily
1209
:param limbodir: A directory where new files can be stored until
1210
they are installed in their proper places
1212
:param case_sensitive: If True, the target of the transform is
1213
case sensitive, not just case preserving.
1215
TreeTransformBase.__init__(self, tree, pb, case_sensitive)
1216
self._limbodir = limbodir
1217
self._deletiondir = None
1218
# A mapping of transform ids to their limbo filename
1219
self._limbo_files = {}
1220
self._possibly_stale_limbo_files = set()
1221
# A mapping of transform ids to a set of the transform ids of children
1222
# that their limbo directory has
1223
self._limbo_children = {}
1224
# Map transform ids to maps of child filename to child transform id
1225
self._limbo_children_names = {}
1226
# List of transform ids that need to be renamed from limbo into place
1227
self._needs_rename = set()
1228
self._creation_mtime = None
1231
"""Release the working tree lock, if held, clean up limbo dir.
1233
This is required if apply has not been invoked, but can be invoked
1236
if self._tree is None:
1239
limbo_paths = list(viewvalues(self._limbo_files))
1240
limbo_paths.extend(self._possibly_stale_limbo_files)
1241
limbo_paths.sort(reverse=True)
1242
for path in limbo_paths:
1245
except OSError as e:
1246
if e.errno != errno.ENOENT:
1248
# XXX: warn? perhaps we just got interrupted at an
1249
# inconvenient moment, but perhaps files are disappearing
1252
delete_any(self._limbodir)
1254
# We don't especially care *why* the dir is immortal.
1255
raise ImmortalLimbo(self._limbodir)
1257
if self._deletiondir is not None:
1258
delete_any(self._deletiondir)
1260
raise errors.ImmortalPendingDeletion(self._deletiondir)
1262
TreeTransformBase.finalize(self)
1264
def _limbo_supports_executable(self):
1265
"""Check if the limbo path supports the executable bit."""
1266
# FIXME: Check actual file system capabilities of limbodir
1267
return osutils.supports_executable()
1269
def _limbo_name(self, trans_id):
1270
"""Generate the limbo name of a file"""
1271
limbo_name = self._limbo_files.get(trans_id)
1272
if limbo_name is None:
1273
limbo_name = self._generate_limbo_path(trans_id)
1274
self._limbo_files[trans_id] = limbo_name
1277
def _generate_limbo_path(self, trans_id):
1278
"""Generate a limbo path using the trans_id as the relative path.
1280
This is suitable as a fallback, and when the transform should not be
1281
sensitive to the path encoding of the limbo directory.
1283
self._needs_rename.add(trans_id)
1284
return pathjoin(self._limbodir, trans_id)
1286
def adjust_path(self, name, parent, trans_id):
1287
previous_parent = self._new_parent.get(trans_id)
1288
previous_name = self._new_name.get(trans_id)
1289
TreeTransformBase.adjust_path(self, name, parent, trans_id)
1290
if (trans_id in self._limbo_files
1291
and trans_id not in self._needs_rename):
1292
self._rename_in_limbo([trans_id])
1293
if previous_parent != parent:
1294
self._limbo_children[previous_parent].remove(trans_id)
1295
if previous_parent != parent or previous_name != name:
1296
del self._limbo_children_names[previous_parent][previous_name]
1298
def _rename_in_limbo(self, trans_ids):
1299
"""Fix limbo names so that the right final path is produced.
1301
This means we outsmarted ourselves-- we tried to avoid renaming
1302
these files later by creating them with their final names in their
1303
final parents. But now the previous name or parent is no longer
1304
suitable, so we have to rename them.
1306
Even for trans_ids that have no new contents, we must remove their
1307
entries from _limbo_files, because they are now stale.
1309
for trans_id in trans_ids:
1310
old_path = self._limbo_files[trans_id]
1311
self._possibly_stale_limbo_files.add(old_path)
1312
del self._limbo_files[trans_id]
1313
if trans_id not in self._new_contents:
1315
new_path = self._limbo_name(trans_id)
1316
os.rename(old_path, new_path)
1317
self._possibly_stale_limbo_files.remove(old_path)
1318
for descendant in self._limbo_descendants(trans_id):
1319
desc_path = self._limbo_files[descendant]
1320
desc_path = new_path + desc_path[len(old_path):]
1321
self._limbo_files[descendant] = desc_path
1323
def _limbo_descendants(self, trans_id):
1324
"""Return the set of trans_ids whose limbo paths descend from this."""
1325
descendants = set(self._limbo_children.get(trans_id, []))
1326
for descendant in list(descendants):
1327
descendants.update(self._limbo_descendants(descendant))
1330
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1331
"""Schedule creation of a new file.
1335
:param contents: an iterator of strings, all of which will be written
1336
to the target destination.
1337
:param trans_id: TreeTransform handle
1338
:param mode_id: If not None, force the mode of the target file to match
1339
the mode of the object referenced by mode_id.
1340
Otherwise, we will try to preserve mode bits of an existing file.
1341
:param sha1: If the sha1 of this content is already known, pass it in.
1342
We can use it to prevent future sha1 computations.
1344
name = self._limbo_name(trans_id)
1345
with open(name, 'wb') as f:
1346
unique_add(self._new_contents, trans_id, 'file')
1347
f.writelines(contents)
1348
self._set_mtime(name)
1349
self._set_mode(trans_id, mode_id, S_ISREG)
1350
# It is unfortunate we have to use lstat instead of fstat, but we just
1351
# used utime and chmod on the file, so we need the accurate final
1353
if sha1 is not None:
1354
self._observed_sha1s[trans_id] = (sha1, osutils.lstat(name))
1356
def _read_symlink_target(self, trans_id):
1357
return os.readlink(self._limbo_name(trans_id))
1359
def _set_mtime(self, path):
1360
"""All files that are created get the same mtime.
1362
This time is set by the first object to be created.
1364
if self._creation_mtime is None:
1365
self._creation_mtime = time.time()
1366
os.utime(path, (self._creation_mtime, self._creation_mtime))
1368
def create_hardlink(self, path, trans_id):
1369
"""Schedule creation of a hard link"""
1370
name = self._limbo_name(trans_id)
1373
except OSError as e:
1374
if e.errno != errno.EPERM:
1376
raise errors.HardLinkNotSupported(path)
1378
unique_add(self._new_contents, trans_id, 'file')
1379
except BaseException:
1380
# Clean up the file, it never got registered so
1381
# TreeTransform.finalize() won't clean it up.
1385
def create_directory(self, trans_id):
1386
"""Schedule creation of a new directory.
1388
See also new_directory.
1390
os.mkdir(self._limbo_name(trans_id))
1391
unique_add(self._new_contents, trans_id, 'directory')
1393
def create_symlink(self, target, trans_id):
1394
"""Schedule creation of a new symbolic link.
1396
target is a bytestring.
1397
See also new_symlink.
1400
os.symlink(target, self._limbo_name(trans_id))
1401
unique_add(self._new_contents, trans_id, 'symlink')
1404
path = FinalPaths(self).get_path(trans_id)
1407
raise UnableCreateSymlink(path=path)
1409
def cancel_creation(self, trans_id):
1410
"""Cancel the creation of new file contents."""
1411
del self._new_contents[trans_id]
1412
if trans_id in self._observed_sha1s:
1413
del self._observed_sha1s[trans_id]
1414
children = self._limbo_children.get(trans_id)
1415
# if this is a limbo directory with children, move them before removing
1417
if children is not None:
1418
self._rename_in_limbo(children)
1419
del self._limbo_children[trans_id]
1420
del self._limbo_children_names[trans_id]
1421
delete_any(self._limbo_name(trans_id))
1423
def new_orphan(self, trans_id, parent_id):
1424
conf = self._tree.get_config_stack()
1425
handle_orphan = conf.get('transform.orphan_policy')
1426
handle_orphan(self, trans_id, parent_id)
1429
class OrphaningError(errors.BzrError):
1431
# Only bugs could lead to such exception being seen by the user
1432
internal_error = True
1433
_fmt = "Error while orphaning %s in %s directory"
1435
def __init__(self, orphan, parent):
1436
errors.BzrError.__init__(self)
1437
self.orphan = orphan
1438
self.parent = parent
1441
class OrphaningForbidden(OrphaningError):
1443
_fmt = "Policy: %s doesn't allow creating orphans."
1445
def __init__(self, policy):
1446
errors.BzrError.__init__(self)
1447
self.policy = policy
1450
def move_orphan(tt, orphan_id, parent_id):
1451
"""See TreeTransformBase.new_orphan.
1453
This creates a new orphan in the `brz-orphans` dir at the root of the
1456
:param tt: The TreeTransform orphaning `trans_id`.
1458
:param orphan_id: The trans id that should be orphaned.
1460
:param parent_id: The orphan parent trans id.
1462
# Add the orphan dir if it doesn't exist
1463
orphan_dir_basename = 'brz-orphans'
1464
od_id = tt.trans_id_tree_path(orphan_dir_basename)
1465
if tt.final_kind(od_id) is None:
1466
tt.create_directory(od_id)
1467
parent_path = tt._tree_id_paths[parent_id]
1468
# Find a name that doesn't exist yet in the orphan dir
1469
actual_name = tt.final_name(orphan_id)
1470
new_name = tt._available_backup_name(actual_name, od_id)
1471
tt.adjust_path(new_name, od_id, orphan_id)
1472
trace.warning('%s has been orphaned in %s'
1473
% (joinpath(parent_path, actual_name), orphan_dir_basename))
1476
def refuse_orphan(tt, orphan_id, parent_id):
1477
"""See TreeTransformBase.new_orphan.
1479
This refuses to create orphan, letting the caller handle the conflict.
1481
raise OrphaningForbidden('never')
1484
orphaning_registry = registry.Registry()
1485
orphaning_registry.register(
1486
u'conflict', refuse_orphan,
1487
'Leave orphans in place and create a conflict on the directory.')
1488
orphaning_registry.register(
1489
u'move', move_orphan,
1490
'Move orphans into the brz-orphans directory.')
1491
orphaning_registry._set_default_key(u'conflict')
1494
opt_transform_orphan = _mod_config.RegistryOption(
1495
'transform.orphan_policy', orphaning_registry,
1496
help='Policy for orphaned files during transform operations.',
1500
class TreeTransform(DiskTreeTransform):
1501
"""Represent a tree transformation.
1503
This object is designed to support incremental generation of the transform,
1506
However, it gives optimum performance when parent directories are created
1507
before their contents. The transform is then able to put child files
1508
directly in their parent directory, avoiding later renames.
1510
It is easy to produce malformed transforms, but they are generally
1511
harmless. Attempting to apply a malformed transform will cause an
1512
exception to be raised before any modifications are made to the tree.
1514
Many kinds of malformed transforms can be corrected with the
1515
resolve_conflicts function. The remaining ones indicate programming error,
1516
such as trying to create a file with no path.
1518
Two sets of file creation methods are supplied. Convenience methods are:
1523
These are composed of the low-level methods:
1525
* create_file or create_directory or create_symlink
1529
Transform/Transaction ids
1530
-------------------------
1531
trans_ids are temporary ids assigned to all files involved in a transform.
1532
It's possible, even common, that not all files in the Tree have trans_ids.
1534
trans_ids are used because filenames and file_ids are not good enough
1535
identifiers; filenames change, and not all files have file_ids. File-ids
1536
are also associated with trans-ids, so that moving a file moves its
1539
trans_ids are only valid for the TreeTransform that generated them.
1543
Limbo is a temporary directory use to hold new versions of files.
1544
Files are added to limbo by create_file, create_directory, create_symlink,
1545
and their convenience variants (new_*). Files may be removed from limbo
1546
using cancel_creation. Files are renamed from limbo into their final
1547
location as part of TreeTransform.apply
1549
Limbo must be cleaned up, by either calling TreeTransform.apply or
1550
calling TreeTransform.finalize.
1552
Files are placed into limbo inside their parent directories, where
1553
possible. This reduces subsequent renames, and makes operations involving
1554
lots of files faster. This optimization is only possible if the parent
1555
directory is created *before* creating any of its children, so avoid
1556
creating children before parents, where possible.
1560
This temporary directory is used by _FileMover for storing files that are
1561
about to be deleted. In case of rollback, the files will be restored.
1562
FileMover does not delete files until it is sure that a rollback will not
1566
def __init__(self, tree, pb=None):
1567
"""Note: a tree_write lock is taken on the tree.
1569
Use TreeTransform.finalize() to release the lock (can be omitted if
1570
TreeTransform.apply() called).
1572
tree.lock_tree_write()
1574
limbodir = urlutils.local_path_from_url(
1575
tree._transport.abspath('limbo'))
1576
osutils.ensure_empty_directory_exists(
1578
errors.ExistingLimbo)
1579
deletiondir = urlutils.local_path_from_url(
1580
tree._transport.abspath('pending-deletion'))
1581
osutils.ensure_empty_directory_exists(
1583
errors.ExistingPendingDeletion)
1584
except BaseException:
1588
# Cache of realpath results, to speed up canonical_path
1589
self._realpaths = {}
1590
# Cache of relpath results, to speed up canonical_path
1592
DiskTreeTransform.__init__(self, tree, limbodir, pb,
1593
tree.case_sensitive)
1594
self._deletiondir = deletiondir
1596
def canonical_path(self, path):
1597
"""Get the canonical tree-relative path"""
1598
# don't follow final symlinks
1599
abs = self._tree.abspath(path)
1600
if abs in self._relpaths:
1601
return self._relpaths[abs]
1602
dirname, basename = os.path.split(abs)
1603
if dirname not in self._realpaths:
1604
self._realpaths[dirname] = os.path.realpath(dirname)
1605
dirname = self._realpaths[dirname]
1606
abs = pathjoin(dirname, basename)
1607
if dirname in self._relpaths:
1608
relpath = pathjoin(self._relpaths[dirname], basename)
1609
relpath = relpath.rstrip('/\\')
1611
relpath = self._tree.relpath(abs)
1612
self._relpaths[abs] = relpath
1615
def tree_kind(self, trans_id):
1616
"""Determine the file kind in the working tree.
1618
:returns: The file kind or None if the file does not exist
1620
path = self._tree_id_paths.get(trans_id)
1624
return file_kind(self._tree.abspath(path))
1625
except errors.NoSuchFile:
1628
def _set_mode(self, trans_id, mode_id, typefunc):
1629
"""Set the mode of new file contents.
1630
The mode_id is the existing file to get the mode from (often the same
1631
as trans_id). The operation is only performed if there's a mode match
1632
according to typefunc.
1637
old_path = self._tree_id_paths[mode_id]
1641
mode = os.stat(self._tree.abspath(old_path)).st_mode
1642
except OSError as e:
1643
if e.errno in (errno.ENOENT, errno.ENOTDIR):
1644
# Either old_path doesn't exist, or the parent of the
1645
# target is not a directory (but will be one eventually)
1646
# Either way, we know it doesn't exist *right now*
1647
# See also bug #248448
1652
osutils.chmod_if_possible(self._limbo_name(trans_id), mode)
1654
def iter_tree_children(self, parent_id):
1655
"""Iterate through the entry's tree children, if any"""
1657
path = self._tree_id_paths[parent_id]
1661
children = os.listdir(self._tree.abspath(path))
1662
except OSError as e:
1663
if not (osutils._is_error_enotdir(e) or
1664
e.errno in (errno.ENOENT, errno.ESRCH)):
1668
for child in children:
1669
childpath = joinpath(path, child)
1670
if self._tree.is_control_filename(childpath):
1672
yield self.trans_id_tree_path(childpath)
1674
def _generate_limbo_path(self, trans_id):
1675
"""Generate a limbo path using the final path if possible.
1677
This optimizes the performance of applying the tree transform by
1678
avoiding renames. These renames can be avoided only when the parent
1679
directory is already scheduled for creation.
1681
If the final path cannot be used, falls back to using the trans_id as
1684
parent = self._new_parent.get(trans_id)
1685
# if the parent directory is already in limbo (e.g. when building a
1686
# tree), choose a limbo name inside the parent, to reduce further
1688
use_direct_path = False
1689
if self._new_contents.get(parent) == 'directory':
1690
filename = self._new_name.get(trans_id)
1691
if filename is not None:
1692
if parent not in self._limbo_children:
1693
self._limbo_children[parent] = set()
1694
self._limbo_children_names[parent] = {}
1695
use_direct_path = True
1696
# the direct path can only be used if no other file has
1697
# already taken this pathname, i.e. if the name is unused, or
1698
# if it is already associated with this trans_id.
1699
elif self._case_sensitive_target:
1700
if (self._limbo_children_names[parent].get(filename)
1701
in (trans_id, None)):
1702
use_direct_path = True
1704
for l_filename, l_trans_id in viewitems(
1705
self._limbo_children_names[parent]):
1706
if l_trans_id == trans_id:
1708
if l_filename.lower() == filename.lower():
1711
use_direct_path = True
1713
if not use_direct_path:
1714
return DiskTreeTransform._generate_limbo_path(self, trans_id)
1716
limbo_name = pathjoin(self._limbo_files[parent], filename)
1717
self._limbo_children[parent].add(trans_id)
1718
self._limbo_children_names[parent][filename] = trans_id
1721
def apply(self, no_conflicts=False, precomputed_delta=None, _mover=None):
1722
"""Apply all changes to the inventory and filesystem.
1724
If filesystem or inventory conflicts are present, MalformedTransform
1727
If apply succeeds, finalize is not necessary.
1729
:param no_conflicts: if True, the caller guarantees there are no
1730
conflicts, so no check is made.
1731
:param precomputed_delta: An inventory delta to use instead of
1733
:param _mover: Supply an alternate FileMover, for testing
1735
for hook in MutableTree.hooks['pre_transform']:
1736
hook(self._tree, self)
1737
if not no_conflicts:
1738
self._check_malformed()
1739
with ui.ui_factory.nested_progress_bar() as child_pb:
1740
if precomputed_delta is None:
1741
child_pb.update(gettext('Apply phase'), 0, 2)
1742
inventory_delta = self._generate_inventory_delta()
1745
inventory_delta = precomputed_delta
1748
mover = _FileMover()
1752
child_pb.update(gettext('Apply phase'), 0 + offset, 2 + offset)
1753
self._apply_removals(mover)
1754
child_pb.update(gettext('Apply phase'), 1 + offset, 2 + offset)
1755
modified_paths = self._apply_insertions(mover)
1756
except BaseException:
1760
mover.apply_deletions()
1761
if self.final_file_id(self.root) is None:
1762
inventory_delta = [e for e in inventory_delta if e[0] != '']
1763
self._tree.apply_inventory_delta(inventory_delta)
1764
self._apply_observed_sha1s()
1767
return _TransformResults(modified_paths, self.rename_count)
1769
def _generate_inventory_delta(self):
1770
"""Generate an inventory delta for the current transform."""
1771
inventory_delta = []
1772
new_paths = self._inventory_altered()
1773
total_entries = len(new_paths) + len(self._removed_id)
1774
with ui.ui_factory.nested_progress_bar() as child_pb:
1775
for num, trans_id in enumerate(self._removed_id):
1777
child_pb.update(gettext('removing file'),
1779
if trans_id == self._new_root:
1780
file_id = self._tree.get_root_id()
1782
file_id = self.tree_file_id(trans_id)
1783
# File-id isn't really being deleted, just moved
1784
if file_id in self._r_new_id:
1786
path = self._tree_id_paths[trans_id]
1787
inventory_delta.append((path, None, file_id, None))
1788
new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1790
for num, (path, trans_id) in enumerate(new_paths):
1792
child_pb.update(gettext('adding file'),
1793
num + len(self._removed_id), total_entries)
1794
file_id = new_path_file_ids[trans_id]
1797
kind = self.final_kind(trans_id)
1799
kind = self._tree.stored_kind(self._tree.id2path(file_id))
1800
parent_trans_id = self.final_parent(trans_id)
1801
parent_file_id = new_path_file_ids.get(parent_trans_id)
1802
if parent_file_id is None:
1803
parent_file_id = self.final_file_id(parent_trans_id)
1804
if trans_id in self._new_reference_revision:
1805
new_entry = inventory.TreeReference(
1807
self._new_name[trans_id],
1808
self.final_file_id(self._new_parent[trans_id]),
1809
None, self._new_reference_revision[trans_id])
1811
new_entry = inventory.make_entry(kind,
1812
self.final_name(trans_id),
1813
parent_file_id, file_id)
1815
old_path = self._tree.id2path(new_entry.file_id)
1816
except errors.NoSuchId:
1818
new_executability = self._new_executability.get(trans_id)
1819
if new_executability is not None:
1820
new_entry.executable = new_executability
1821
inventory_delta.append(
1822
(old_path, path, new_entry.file_id, new_entry))
1823
return inventory_delta
1825
def _apply_removals(self, mover):
1826
"""Perform tree operations that remove directory/inventory names.
1828
That is, delete files that are to be deleted, and put any files that
1829
need renaming into limbo. This must be done in strict child-to-parent
1832
If inventory_delta is None, no inventory delta generation is performed.
1834
tree_paths = sorted(viewitems(self._tree_path_ids), reverse=True)
1835
with ui.ui_factory.nested_progress_bar() as child_pb:
1836
for num, (path, trans_id) in enumerate(tree_paths):
1837
# do not attempt to move root into a subdirectory of itself.
1840
child_pb.update(gettext('removing file'), num, len(tree_paths))
1841
full_path = self._tree.abspath(path)
1842
if trans_id in self._removed_contents:
1843
delete_path = os.path.join(self._deletiondir, trans_id)
1844
mover.pre_delete(full_path, delete_path)
1845
elif (trans_id in self._new_name or
1846
trans_id in self._new_parent):
1848
mover.rename(full_path, self._limbo_name(trans_id))
1849
except errors.TransformRenameFailed as e:
1850
if e.errno != errno.ENOENT:
1853
self.rename_count += 1
1855
def _apply_insertions(self, mover):
1856
"""Perform tree operations that insert directory/inventory names.
1858
That is, create any files that need to be created, and restore from
1859
limbo any files that needed renaming. This must be done in strict
1860
parent-to-child order.
1862
If inventory_delta is None, no inventory delta is calculated, and
1863
no list of modified paths is returned.
1865
new_paths = self.new_paths(filesystem_only=True)
1867
with ui.ui_factory.nested_progress_bar() as child_pb:
1868
for num, (path, trans_id) in enumerate(new_paths):
1870
child_pb.update(gettext('adding file'),
1871
num, len(new_paths))
1872
full_path = self._tree.abspath(path)
1873
if trans_id in self._needs_rename:
1875
mover.rename(self._limbo_name(trans_id), full_path)
1876
except errors.TransformRenameFailed as e:
1877
# We may be renaming a dangling inventory id
1878
if e.errno != errno.ENOENT:
1881
self.rename_count += 1
1882
# TODO: if trans_id in self._observed_sha1s, we should
1883
# re-stat the final target, since ctime will be
1884
# updated by the change.
1885
if (trans_id in self._new_contents
1886
or self.path_changed(trans_id)):
1887
if trans_id in self._new_contents:
1888
modified_paths.append(full_path)
1889
if trans_id in self._new_executability:
1890
self._set_executability(path, trans_id)
1891
if trans_id in self._observed_sha1s:
1892
o_sha1, o_st_val = self._observed_sha1s[trans_id]
1893
st = osutils.lstat(full_path)
1894
self._observed_sha1s[trans_id] = (o_sha1, st)
1895
for path, trans_id in new_paths:
1896
# new_paths includes stuff like workingtree conflicts. Only the
1897
# stuff in new_contents actually comes from limbo.
1898
if trans_id in self._limbo_files:
1899
del self._limbo_files[trans_id]
1900
self._new_contents.clear()
1901
return modified_paths
1903
def _apply_observed_sha1s(self):
1904
"""After we have finished renaming everything, update observed sha1s
1906
This has to be done after self._tree.apply_inventory_delta, otherwise
1907
it doesn't know anything about the files we are updating. Also, we want
1908
to do this as late as possible, so that most entries end up cached.
1910
# TODO: this doesn't update the stat information for directories. So
1911
# the first 'bzr status' will still need to rewrite
1912
# .bzr/checkout/dirstate. However, we at least don't need to
1913
# re-read all of the files.
1914
# TODO: If the operation took a while, we could do a time.sleep(3) here
1915
# to allow the clock to tick over and ensure we won't have any
1916
# problems. (we could observe start time, and finish time, and if
1917
# it is less than eg 10% overhead, add a sleep call.)
1918
paths = FinalPaths(self)
1919
for trans_id, observed in viewitems(self._observed_sha1s):
1920
path = paths.get_path(trans_id)
1921
self._tree._observed_sha1(path, observed)
1924
class TransformPreview(DiskTreeTransform):
1925
"""A TreeTransform for generating preview trees.
1927
Unlike TreeTransform, this version works when the input tree is a
1928
RevisionTree, rather than a WorkingTree. As a result, it tends to ignore
1929
unversioned files in the input tree.
1932
def __init__(self, tree, pb=None, case_sensitive=True):
1934
limbodir = osutils.mkdtemp(prefix='bzr-limbo-')
1935
DiskTreeTransform.__init__(self, tree, limbodir, pb, case_sensitive)
1937
def canonical_path(self, path):
1940
def tree_kind(self, trans_id):
1941
path = self._tree_id_paths.get(trans_id)
1944
kind = self._tree.path_content_summary(path)[0]
1945
if kind == 'missing':
1949
def _set_mode(self, trans_id, mode_id, typefunc):
1950
"""Set the mode of new file contents.
1951
The mode_id is the existing file to get the mode from (often the same
1952
as trans_id). The operation is only performed if there's a mode match
1953
according to typefunc.
1955
# is it ok to ignore this? probably
1958
def iter_tree_children(self, parent_id):
1959
"""Iterate through the entry's tree children, if any"""
1961
path = self._tree_id_paths[parent_id]
1965
entry = next(self._tree.iter_entries_by_dir(
1966
specific_files=[path]))[1]
1967
except StopIteration:
1969
children = getattr(entry, 'children', {})
1970
for child in children:
1971
childpath = joinpath(path, child)
1972
yield self.trans_id_tree_path(childpath)
1974
def new_orphan(self, trans_id, parent_id):
1975
raise NotImplementedError(self.new_orphan)
1978
class _PreviewTree(inventorytree.InventoryTree):
1979
"""Partial implementation of Tree to support show_diff_trees"""
1981
def __init__(self, transform):
1982
self._transform = transform
1983
self._final_paths = FinalPaths(transform)
1984
self.__by_parent = None
1985
self._parent_ids = []
1986
self._all_children_cache = {}
1987
self._path2trans_id_cache = {}
1988
self._final_name_cache = {}
1989
self._iter_changes_cache = dict((c[0], c) for c in
1990
self._transform.iter_changes())
1992
def _content_change(self, file_id):
1993
"""Return True if the content of this file changed"""
1994
changes = self._iter_changes_cache.get(file_id)
1995
# changes[2] is true if the file content changed. See
1996
# InterTree.iter_changes.
1997
return (changes is not None and changes[2])
1999
def _get_repository(self):
2000
repo = getattr(self._transform._tree, '_repository', None)
2002
repo = self._transform._tree.branch.repository
2005
def _iter_parent_trees(self):
2006
for revision_id in self.get_parent_ids():
2008
yield self.revision_tree(revision_id)
2009
except errors.NoSuchRevisionInTree:
2010
yield self._get_repository().revision_tree(revision_id)
2012
def _get_file_revision(self, path, file_id, vf, tree_revision):
2014
(file_id, t.get_file_revision(t.id2path(file_id)))
2015
for t in self._iter_parent_trees()]
2016
vf.add_lines((file_id, tree_revision), parent_keys,
2017
self.get_file_lines(path))
2018
repo = self._get_repository()
2019
base_vf = repo.texts
2020
if base_vf not in vf.fallback_versionedfiles:
2021
vf.fallback_versionedfiles.append(base_vf)
2022
return tree_revision
2024
def _stat_limbo_file(self, trans_id):
2025
name = self._transform._limbo_name(trans_id)
2026
return os.lstat(name)
2029
def _by_parent(self):
2030
if self.__by_parent is None:
2031
self.__by_parent = self._transform.by_parent()
2032
return self.__by_parent
2034
def _comparison_data(self, entry, path):
2035
kind, size, executable, link_or_sha1 = self.path_content_summary(path)
2036
if kind == 'missing':
2040
file_id = self._transform.final_file_id(self._path2trans_id(path))
2041
executable = self.is_executable(path)
2042
return kind, executable, None
2044
def is_locked(self):
2047
def lock_read(self):
2048
# Perhaps in theory, this should lock the TreeTransform?
2049
return lock.LogicalLockResult(self.unlock)
2055
def root_inventory(self):
2056
"""This Tree does not use inventory as its backing data."""
2057
raise NotImplementedError(_PreviewTree.root_inventory)
2059
def get_root_id(self):
2060
return self._transform.final_file_id(self._transform.root)
2062
def all_file_ids(self):
2063
tree_ids = set(self._transform._tree.all_file_ids())
2064
tree_ids.difference_update(self._transform.tree_file_id(t)
2065
for t in self._transform._removed_id)
2066
tree_ids.update(viewvalues(self._transform._new_id))
2069
def all_versioned_paths(self):
2070
tree_paths = set(self._transform._tree.all_versioned_paths())
2072
tree_paths.difference_update(
2073
self._transform.trans_id_tree_path(t)
2074
for t in self._transform._removed_id)
2077
self._final_paths._determine_path(t)
2078
for t in self._transform._new_id)
2082
def _has_id(self, file_id, fallback_check):
2083
if file_id in self._transform._r_new_id:
2085
elif file_id in {self._transform.tree_file_id(trans_id) for
2086
trans_id in self._transform._removed_id}:
2089
return fallback_check(file_id)
2091
def has_id(self, file_id):
2092
return self._has_id(file_id, self._transform._tree.has_id)
2094
def has_or_had_id(self, file_id):
2095
return self._has_id(file_id, self._transform._tree.has_or_had_id)
2097
def _path2trans_id(self, path):
2098
# We must not use None here, because that is a valid value to store.
2099
trans_id = self._path2trans_id_cache.get(path, object)
2100
if trans_id is not object:
2102
segments = splitpath(path)
2103
cur_parent = self._transform.root
2104
for cur_segment in segments:
2105
for child in self._all_children(cur_parent):
2106
final_name = self._final_name_cache.get(child)
2107
if final_name is None:
2108
final_name = self._transform.final_name(child)
2109
self._final_name_cache[child] = final_name
2110
if final_name == cur_segment:
2114
self._path2trans_id_cache[path] = None
2116
self._path2trans_id_cache[path] = cur_parent
2119
def path2id(self, path):
2120
if isinstance(path, list):
2123
path = osutils.pathjoin(*path)
2124
return self._transform.final_file_id(self._path2trans_id(path))
2126
def id2path(self, file_id):
2127
trans_id = self._transform.trans_id_file_id(file_id)
2129
return self._final_paths._determine_path(trans_id)
2131
raise errors.NoSuchId(self, file_id)
2133
def _all_children(self, trans_id):
2134
children = self._all_children_cache.get(trans_id)
2135
if children is not None:
2137
children = set(self._transform.iter_tree_children(trans_id))
2138
# children in the _new_parent set are provided by _by_parent.
2139
children.difference_update(self._transform._new_parent)
2140
children.update(self._by_parent.get(trans_id, []))
2141
self._all_children_cache[trans_id] = children
2144
def _iter_children(self, file_id):
2145
trans_id = self._transform.trans_id_file_id(file_id)
2146
for child_trans_id in self._all_children(trans_id):
2147
yield self._transform.final_file_id(child_trans_id)
2150
possible_extras = set(self._transform.trans_id_tree_path(p) for p
2151
in self._transform._tree.extras())
2152
possible_extras.update(self._transform._new_contents)
2153
possible_extras.update(self._transform._removed_id)
2154
for trans_id in possible_extras:
2155
if self._transform.final_file_id(trans_id) is None:
2156
yield self._final_paths._determine_path(trans_id)
2158
def _make_inv_entries(self, ordered_entries, specific_files=None):
2159
for trans_id, parent_file_id in ordered_entries:
2160
file_id = self._transform.final_file_id(trans_id)
2163
if (specific_files is not None
2164
and self._final_paths.get_path(trans_id) not in specific_files):
2166
kind = self._transform.final_kind(trans_id)
2168
kind = self._transform._tree.stored_kind(
2169
self._transform._tree.id2path(file_id))
2170
new_entry = inventory.make_entry(
2172
self._transform.final_name(trans_id),
2173
parent_file_id, file_id)
2174
yield new_entry, trans_id
2176
def _list_files_by_dir(self):
2177
todo = [ROOT_PARENT]
2179
while len(todo) > 0:
2181
parent_file_id = self._transform.final_file_id(parent)
2182
children = list(self._all_children(parent))
2183
paths = dict(zip(children, self._final_paths.get_paths(children)))
2184
children.sort(key=paths.get)
2185
todo.extend(reversed(children))
2186
for trans_id in children:
2187
ordered_ids.append((trans_id, parent_file_id))
2190
def iter_child_entries(self, path):
2191
trans_id = self._path2trans_id(path)
2192
if trans_id is None:
2193
raise errors.NoSuchFile(path)
2194
todo = [(child_trans_id, trans_id) for child_trans_id in
2195
self._all_children(trans_id)]
2196
for entry, trans_id in self._make_inv_entries(todo):
2199
def iter_entries_by_dir(self, specific_files=None):
2200
# This may not be a maximally efficient implementation, but it is
2201
# reasonably straightforward. An implementation that grafts the
2202
# TreeTransform changes onto the tree's iter_entries_by_dir results
2203
# might be more efficient, but requires tricky inferences about stack
2205
ordered_ids = self._list_files_by_dir()
2206
for entry, trans_id in self._make_inv_entries(ordered_ids,
2208
yield self._final_paths.get_path(trans_id), entry
2210
def _iter_entries_for_dir(self, dir_path):
2211
"""Return path, entry for items in a directory without recursing down."""
2213
dir_trans_id = self._path2trans_id(dir_path)
2214
dir_id = self._transform.final_file_id(dir_trans_id)
2215
for child_trans_id in self._all_children(dir_trans_id):
2216
ordered_ids.append((child_trans_id, dir_id))
2218
for entry, trans_id in self._make_inv_entries(ordered_ids):
2219
path_entries.append((self._final_paths.get_path(trans_id), entry))
2223
def list_files(self, include_root=False, from_dir=None, recursive=True):
2224
"""See WorkingTree.list_files."""
2225
# XXX This should behave like WorkingTree.list_files, but is really
2226
# more like RevisionTree.list_files.
2232
prefix = from_dir + '/'
2233
entries = self.iter_entries_by_dir()
2234
for path, entry in entries:
2235
if entry.name == '' and not include_root:
2238
if not path.startswith(prefix):
2240
path = path[len(prefix):]
2241
yield path, 'V', entry.kind, entry
2243
if from_dir is None and include_root is True:
2244
root_entry = inventory.make_entry(
2245
'directory', '', ROOT_PARENT, self.get_root_id())
2246
yield '', 'V', 'directory', root_entry
2247
entries = self._iter_entries_for_dir(from_dir or '')
2248
for path, entry in entries:
2249
yield path, 'V', entry.kind, entry
2251
def kind(self, path):
2252
trans_id = self._path2trans_id(path)
2253
if trans_id is None:
2254
raise errors.NoSuchFile(path)
2255
return self._transform.final_kind(trans_id)
2257
def stored_kind(self, path):
2258
trans_id = self._path2trans_id(path)
2259
if trans_id is None:
2260
raise errors.NoSuchFile(path)
2262
return self._transform._new_contents[trans_id]
2264
return self._transform._tree.stored_kind(path)
2266
def get_file_mtime(self, path):
2267
"""See Tree.get_file_mtime"""
2268
file_id = self.path2id(path)
2270
raise errors.NoSuchFile(path)
2271
if not self._content_change(file_id):
2272
return self._transform._tree.get_file_mtime(
2273
self._transform._tree.id2path(file_id))
2274
trans_id = self._path2trans_id(path)
2275
return self._stat_limbo_file(trans_id).st_mtime
2277
def get_file_size(self, path):
2278
"""See Tree.get_file_size"""
2279
trans_id = self._path2trans_id(path)
2280
if trans_id is None:
2281
raise errors.NoSuchFile(path)
2282
kind = self._transform.final_kind(trans_id)
2285
if trans_id in self._transform._new_contents:
2286
return self._stat_limbo_file(trans_id).st_size
2287
if self.kind(path) == 'file':
2288
return self._transform._tree.get_file_size(path)
2292
def get_file_verifier(self, path, stat_value=None):
2293
trans_id = self._path2trans_id(path)
2294
if trans_id is None:
2295
raise errors.NoSuchFile(path)
2296
kind = self._transform._new_contents.get(trans_id)
2298
return self._transform._tree.get_file_verifier(path)
2300
with self.get_file(path) as fileobj:
2301
return ("SHA1", sha_file(fileobj))
2303
def get_file_sha1(self, path, stat_value=None):
2304
trans_id = self._path2trans_id(path)
2305
if trans_id is None:
2306
raise errors.NoSuchFile(path)
2307
kind = self._transform._new_contents.get(trans_id)
2309
return self._transform._tree.get_file_sha1(path)
2311
with self.get_file(path) as fileobj:
2312
return sha_file(fileobj)
2314
def is_executable(self, path):
2315
trans_id = self._path2trans_id(path)
2316
if trans_id is None:
2319
return self._transform._new_executability[trans_id]
2322
return self._transform._tree.is_executable(path)
2323
except OSError as e:
2324
if e.errno == errno.ENOENT:
2327
except errors.NoSuchFile:
2330
def has_filename(self, path):
2331
trans_id = self._path2trans_id(path)
2332
if trans_id in self._transform._new_contents:
2334
elif trans_id in self._transform._removed_contents:
2337
return self._transform._tree.has_filename(path)
2339
def path_content_summary(self, path):
2340
trans_id = self._path2trans_id(path)
2341
tt = self._transform
2342
tree_path = tt._tree_id_paths.get(trans_id)
2343
kind = tt._new_contents.get(trans_id)
2345
if tree_path is None or trans_id in tt._removed_contents:
2346
return 'missing', None, None, None
2347
summary = tt._tree.path_content_summary(tree_path)
2348
kind, size, executable, link_or_sha1 = summary
2351
limbo_name = tt._limbo_name(trans_id)
2352
if trans_id in tt._new_reference_revision:
2353
kind = 'tree-reference'
2355
statval = os.lstat(limbo_name)
2356
size = statval.st_size
2357
if not tt._limbo_supports_executable():
2360
executable = statval.st_mode & S_IEXEC
2364
if kind == 'symlink':
2365
link_or_sha1 = os.readlink(limbo_name)
2366
if not isinstance(link_or_sha1, text_type):
2367
link_or_sha1 = link_or_sha1.decode(osutils._fs_enc)
2368
executable = tt._new_executability.get(trans_id, executable)
2369
return kind, size, executable, link_or_sha1
2371
def iter_changes(self, from_tree, include_unchanged=False,
2372
specific_files=None, pb=None, extra_trees=None,
2373
require_versioned=True, want_unversioned=False):
2374
"""See InterTree.iter_changes.
2376
This has a fast path that is only used when the from_tree matches
2377
the transform tree, and no fancy options are supplied.
2379
if (from_tree is not self._transform._tree or include_unchanged
2380
or specific_files or want_unversioned):
2381
return tree.InterTree(from_tree, self).iter_changes(
2382
include_unchanged=include_unchanged,
2383
specific_files=specific_files,
2385
extra_trees=extra_trees,
2386
require_versioned=require_versioned,
2387
want_unversioned=want_unversioned)
2388
if want_unversioned:
2389
raise ValueError('want_unversioned is not supported')
2390
return self._transform.iter_changes()
2392
def get_file(self, path):
2393
"""See Tree.get_file"""
2394
file_id = self.path2id(path)
2395
if not self._content_change(file_id):
2396
return self._transform._tree.get_file(path)
2397
trans_id = self._path2trans_id(path)
2398
name = self._transform._limbo_name(trans_id)
2399
return open(name, 'rb')
2401
def get_file_with_stat(self, path):
2402
return self.get_file(path), None
2404
def annotate_iter(self, path,
2405
default_revision=_mod_revision.CURRENT_REVISION):
2406
file_id = self.path2id(path)
2407
changes = self._iter_changes_cache.get(file_id)
2411
changed_content, versioned, kind = (changes[2], changes[3],
2415
get_old = (kind[0] == 'file' and versioned[0])
2417
old_annotation = self._transform._tree.annotate_iter(
2418
path, default_revision=default_revision)
2422
return old_annotation
2423
if not changed_content:
2424
return old_annotation
2425
# TODO: This is doing something similar to what WT.annotate_iter is
2426
# doing, however it fails slightly because it doesn't know what
2427
# the *other* revision_id is, so it doesn't know how to give the
2428
# other as the origin for some lines, they all get
2429
# 'default_revision'
2430
# It would be nice to be able to use the new Annotator based
2431
# approach, as well.
2432
return annotate.reannotate([old_annotation],
2433
self.get_file(path).readlines(),
2436
def get_symlink_target(self, path):
2437
"""See Tree.get_symlink_target"""
2438
file_id = self.path2id(path)
2439
if not self._content_change(file_id):
2440
return self._transform._tree.get_symlink_target(path)
2441
trans_id = self._path2trans_id(path)
2442
name = self._transform._limbo_name(trans_id)
2443
return osutils.readlink(name)
2445
def walkdirs(self, prefix=''):
2446
pending = [self._transform.root]
2447
while len(pending) > 0:
2448
parent_id = pending.pop()
2451
prefix = prefix.rstrip('/')
2452
parent_path = self._final_paths.get_path(parent_id)
2453
parent_file_id = self._transform.final_file_id(parent_id)
2454
for child_id in self._all_children(parent_id):
2455
path_from_root = self._final_paths.get_path(child_id)
2456
basename = self._transform.final_name(child_id)
2457
file_id = self._transform.final_file_id(child_id)
2458
kind = self._transform.final_kind(child_id)
2459
if kind is not None:
2460
versioned_kind = kind
2463
versioned_kind = self._transform._tree.stored_kind(
2464
self._transform._tree.id2path(file_id))
2465
if versioned_kind == 'directory':
2466
subdirs.append(child_id)
2467
children.append((path_from_root, basename, kind, None,
2468
file_id, versioned_kind))
2470
if parent_path.startswith(prefix):
2471
yield (parent_path, parent_file_id), children
2472
pending.extend(sorted(subdirs, key=self._final_paths.get_path,
2475
def get_parent_ids(self):
2476
return self._parent_ids
2478
def set_parent_ids(self, parent_ids):
2479
self._parent_ids = parent_ids
2481
def get_revision_tree(self, revision_id):
2482
return self._transform._tree.get_revision_tree(revision_id)
2485
def joinpath(parent, child):
2486
"""Join tree-relative paths, handling the tree root specially"""
2487
if parent is None or parent == "":
2490
return pathjoin(parent, child)
2493
class FinalPaths(object):
2494
"""Make path calculation cheap by memoizing paths.
2496
The underlying tree must not be manipulated between calls, or else
2497
the results will likely be incorrect.
2500
def __init__(self, transform):
2501
object.__init__(self)
2502
self._known_paths = {}
2503
self.transform = transform
2505
def _determine_path(self, trans_id):
2506
if (trans_id == self.transform.root or trans_id == ROOT_PARENT):
2508
name = self.transform.final_name(trans_id)
2509
parent_id = self.transform.final_parent(trans_id)
2510
if parent_id == self.transform.root:
2513
return pathjoin(self.get_path(parent_id), name)
2515
def get_path(self, trans_id):
2516
"""Find the final path associated with a trans_id"""
2517
if trans_id not in self._known_paths:
2518
self._known_paths[trans_id] = self._determine_path(trans_id)
2519
return self._known_paths[trans_id]
2521
def get_paths(self, trans_ids):
2522
return [(self.get_path(t), t) for t in trans_ids]
2525
def topology_sorted_ids(tree):
2526
"""Determine the topological order of the ids in a tree"""
2527
file_ids = list(tree)
2528
file_ids.sort(key=tree.id2path)
2532
def build_tree(tree, wt, accelerator_tree=None, hardlink=False,
2533
delta_from_tree=False):
2534
"""Create working tree for a branch, using a TreeTransform.
2536
This function should be used on empty trees, having a tree root at most.
2537
(see merge and revert functionality for working with existing trees)
2539
Existing files are handled like so:
2541
- Existing bzrdirs take precedence over creating new items. They are
2542
created as '%s.diverted' % name.
2543
- Otherwise, if the content on disk matches the content we are building,
2544
it is silently replaced.
2545
- Otherwise, conflict resolution will move the old file to 'oldname.moved'.
2547
:param tree: The tree to convert wt into a copy of
2548
:param wt: The working tree that files will be placed into
2549
:param accelerator_tree: A tree which can be used for retrieving file
2550
contents more quickly than tree itself, i.e. a workingtree. tree
2551
will be used for cases where accelerator_tree's content is different.
2552
:param hardlink: If true, hard-link files to accelerator_tree, where
2553
possible. accelerator_tree must implement abspath, i.e. be a
2555
:param delta_from_tree: If true, build_tree may use the input Tree to
2556
generate the inventory delta.
2558
with wt.lock_tree_write(), tree.lock_read():
2559
if accelerator_tree is not None:
2560
accelerator_tree.lock_read()
2562
return _build_tree(tree, wt, accelerator_tree, hardlink,
2565
if accelerator_tree is not None:
2566
accelerator_tree.unlock()
2569
def _build_tree(tree, wt, accelerator_tree, hardlink, delta_from_tree):
2570
"""See build_tree."""
2571
for num, _unused in enumerate(wt.all_versioned_paths()):
2572
if num > 0: # more than just a root
2573
raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir)
2575
top_pb = ui.ui_factory.nested_progress_bar()
2576
pp = ProgressPhase("Build phase", 2, top_pb)
2577
if tree.get_root_id() is not None:
2578
# This is kind of a hack: we should be altering the root
2579
# as part of the regular tree shape diff logic.
2580
# The conditional test here is to avoid doing an
2581
# expensive operation (flush) every time the root id
2582
# is set within the tree, nor setting the root and thus
2583
# marking the tree as dirty, because we use two different
2584
# idioms here: tree interfaces and inventory interfaces.
2585
if wt.get_root_id() != tree.get_root_id():
2586
wt.set_root_id(tree.get_root_id())
2588
tt = TreeTransform(wt)
2592
file_trans_id[wt.get_root_id()] = tt.trans_id_tree_path('')
2593
with ui.ui_factory.nested_progress_bar() as pb:
2594
deferred_contents = []
2596
total = len(tree.all_versioned_paths())
2598
precomputed_delta = []
2600
precomputed_delta = None
2601
# Check if tree inventory has content. If so, we populate
2602
# existing_files with the directory content. If there are no
2603
# entries we skip populating existing_files as its not used.
2604
# This improves performance and unncessary work on large
2605
# directory trees. (#501307)
2607
existing_files = set()
2608
for dir, files in wt.walkdirs():
2609
existing_files.update(f[0] for f in files)
2610
for num, (tree_path, entry) in \
2611
enumerate(tree.iter_entries_by_dir()):
2612
pb.update(gettext("Building tree"), num
2613
- len(deferred_contents), total)
2614
if entry.parent_id is None:
2617
file_id = entry.file_id
2619
precomputed_delta.append((None, tree_path, file_id, entry))
2620
if tree_path in existing_files:
2621
target_path = wt.abspath(tree_path)
2622
kind = file_kind(target_path)
2623
if kind == "directory":
2625
controldir.ControlDir.open(target_path)
2626
except errors.NotBranchError:
2630
if (file_id not in divert
2632
tree, entry, tree_path, file_id, kind,
2634
tt.delete_contents(tt.trans_id_tree_path(tree_path))
2635
if kind == 'directory':
2637
parent_id = file_trans_id[entry.parent_id]
2638
if entry.kind == 'file':
2639
# We *almost* replicate new_by_entry, so that we can defer
2640
# getting the file text, and get them all at once.
2641
trans_id = tt.create_path(entry.name, parent_id)
2642
file_trans_id[file_id] = trans_id
2643
tt.version_file(file_id, trans_id)
2644
executable = tree.is_executable(tree_path)
2646
tt.set_executability(executable, trans_id)
2647
trans_data = (trans_id, file_id,
2648
tree_path, entry.text_sha1)
2649
deferred_contents.append((tree_path, trans_data))
2651
file_trans_id[file_id] = new_by_entry(
2652
tree_path, tt, entry, parent_id, tree)
2654
new_trans_id = file_trans_id[file_id]
2655
old_parent = tt.trans_id_tree_path(tree_path)
2656
_reparent_children(tt, old_parent, new_trans_id)
2657
offset = num + 1 - len(deferred_contents)
2658
_create_files(tt, tree, deferred_contents, pb, offset,
2659
accelerator_tree, hardlink)
2661
divert_trans = set(file_trans_id[f] for f in divert)
2664
return resolve_checkout(t, c, divert_trans)
2665
raw_conflicts = resolve_conflicts(tt, pass_func=resolver)
2666
if len(raw_conflicts) > 0:
2667
precomputed_delta = None
2668
conflicts = cook_conflicts(raw_conflicts, tt)
2669
for conflict in conflicts:
2670
trace.warning(text_type(conflict))
2672
wt.add_conflicts(conflicts)
2673
except errors.UnsupportedOperation:
2675
result = tt.apply(no_conflicts=True,
2676
precomputed_delta=precomputed_delta)
2683
def _create_files(tt, tree, desired_files, pb, offset, accelerator_tree,
2685
total = len(desired_files) + offset
2687
if accelerator_tree is None:
2688
new_desired_files = desired_files
2690
iter = accelerator_tree.iter_changes(tree, include_unchanged=True)
2691
unchanged = [(p[0], p[1]) for (f, p, c, v, d, n, k, e)
2692
in iter if not (c or e[0] != e[1])]
2693
if accelerator_tree.supports_content_filtering():
2694
unchanged = [(tp, ap) for (tp, ap) in unchanged
2695
if not next(accelerator_tree.iter_search_rules([ap]))]
2696
unchanged = dict(unchanged)
2697
new_desired_files = []
2699
for unused_tree_path, (trans_id, file_id, tree_path, text_sha1) in desired_files:
2700
accelerator_path = unchanged.get(tree_path)
2701
if accelerator_path is None:
2702
new_desired_files.append((tree_path,
2703
(trans_id, file_id, tree_path, text_sha1)))
2705
pb.update(gettext('Adding file contents'), count + offset, total)
2707
tt.create_hardlink(accelerator_tree.abspath(accelerator_path),
2710
with accelerator_tree.get_file(accelerator_path) as f:
2711
chunks = osutils.file_iterator(f)
2712
if wt.supports_content_filtering():
2713
filters = wt._content_filter_stack(tree_path)
2714
chunks = filtered_output_bytes(chunks, filters,
2715
ContentFilterContext(tree_path, tree))
2716
tt.create_file(chunks, trans_id, sha1=text_sha1)
2719
for count, ((trans_id, file_id, tree_path, text_sha1), contents) in enumerate(
2720
tree.iter_files_bytes(new_desired_files)):
2721
if wt.supports_content_filtering():
2722
filters = wt._content_filter_stack(tree_path)
2723
contents = filtered_output_bytes(contents, filters,
2724
ContentFilterContext(tree_path, tree))
2725
tt.create_file(contents, trans_id, sha1=text_sha1)
2726
pb.update(gettext('Adding file contents'), count + offset, total)
2729
def _reparent_children(tt, old_parent, new_parent):
2730
for child in tt.iter_tree_children(old_parent):
2731
tt.adjust_path(tt.final_name(child), new_parent, child)
2734
def _reparent_transform_children(tt, old_parent, new_parent):
2735
by_parent = tt.by_parent()
2736
for child in by_parent[old_parent]:
2737
tt.adjust_path(tt.final_name(child), new_parent, child)
2738
return by_parent[old_parent]
2741
def _content_match(tree, entry, tree_path, file_id, kind, target_path):
2742
if entry.kind != kind:
2744
if entry.kind == "directory":
2746
if entry.kind == "file":
2747
with open(target_path, 'rb') as f1, \
2748
tree.get_file(tree_path) as f2:
2749
if osutils.compare_files(f1, f2):
2751
elif entry.kind == "symlink":
2752
if tree.get_symlink_target(tree_path) == os.readlink(target_path):
2757
def resolve_checkout(tt, conflicts, divert):
2758
new_conflicts = set()
2759
for c_type, conflict in ((c[0], c) for c in conflicts):
2760
# Anything but a 'duplicate' would indicate programmer error
2761
if c_type != 'duplicate':
2762
raise AssertionError(c_type)
2763
# Now figure out which is new and which is old
2764
if tt.new_contents(conflict[1]):
2765
new_file = conflict[1]
2766
old_file = conflict[2]
2768
new_file = conflict[2]
2769
old_file = conflict[1]
2771
# We should only get here if the conflict wasn't completely
2773
final_parent = tt.final_parent(old_file)
2774
if new_file in divert:
2775
new_name = tt.final_name(old_file) + '.diverted'
2776
tt.adjust_path(new_name, final_parent, new_file)
2777
new_conflicts.add((c_type, 'Diverted to',
2778
new_file, old_file))
2780
new_name = tt.final_name(old_file) + '.moved'
2781
tt.adjust_path(new_name, final_parent, old_file)
2782
new_conflicts.add((c_type, 'Moved existing file to',
2783
old_file, new_file))
2784
return new_conflicts
2787
def new_by_entry(path, tt, entry, parent_id, tree):
2788
"""Create a new file according to its inventory entry"""
2792
with tree.get_file(path) as f:
2793
executable = tree.is_executable(path)
2795
name, parent_id, osutils.file_iterator(f), entry.file_id,
2797
elif kind in ('directory', 'tree-reference'):
2798
trans_id = tt.new_directory(name, parent_id, entry.file_id)
2799
if kind == 'tree-reference':
2800
tt.set_tree_reference(entry.reference_revision, trans_id)
2802
elif kind == 'symlink':
2803
target = tree.get_symlink_target(path)
2804
return tt.new_symlink(name, parent_id, target, entry.file_id)
2806
raise errors.BadFileKindError(name, kind)
2809
def create_from_tree(tt, trans_id, tree, path, file_id=None, chunks=None,
2810
filter_tree_path=None):
2811
"""Create new file contents according to tree contents.
2813
:param filter_tree_path: the tree path to use to lookup
2814
content filters to apply to the bytes output in the working tree.
2815
This only applies if the working tree supports content filtering.
2817
kind = tree.kind(path)
2818
if kind == 'directory':
2819
tt.create_directory(trans_id)
2820
elif kind == "file":
2822
f = tree.get_file(path)
2823
chunks = osutils.file_iterator(f)
2828
if wt.supports_content_filtering() and filter_tree_path is not None:
2829
filters = wt._content_filter_stack(filter_tree_path)
2830
chunks = filtered_output_bytes(
2832
ContentFilterContext(filter_tree_path, tree))
2833
tt.create_file(chunks, trans_id)
2837
elif kind == "symlink":
2838
tt.create_symlink(tree.get_symlink_target(path), trans_id)
2840
raise AssertionError('Unknown kind %r' % kind)
2843
def create_entry_executability(tt, entry, trans_id):
2844
"""Set the executability of a trans_id according to an inventory entry"""
2845
if entry.kind == "file":
2846
tt.set_executability(entry.executable, trans_id)
2849
def revert(working_tree, target_tree, filenames, backups=False,
2850
pb=None, change_reporter=None):
2851
"""Revert a working tree's contents to those of a target tree."""
2852
pb = ui.ui_factory.nested_progress_bar()
2854
with target_tree.lock_read(), TreeTransform(working_tree, pb) as tt:
2855
pp = ProgressPhase("Revert phase", 3, pb)
2856
conflicts, merge_modified = _prepare_revert_transform(
2857
working_tree, target_tree, tt, filenames, backups, pp)
2859
change_reporter = delta._ChangeReporter(
2860
unversioned_filter=working_tree.is_ignored)
2861
delta.report_changes(tt.iter_changes(), change_reporter)
2862
for conflict in conflicts:
2863
trace.warning(text_type(conflict))
2866
if working_tree.supports_merge_modified():
2867
working_tree.set_merge_modified(merge_modified)
2873
def _prepare_revert_transform(working_tree, target_tree, tt, filenames,
2874
backups, pp, basis_tree=None,
2875
merge_modified=None):
2876
with ui.ui_factory.nested_progress_bar() as child_pb:
2877
if merge_modified is None:
2878
merge_modified = working_tree.merge_modified()
2879
merge_modified = _alter_files(working_tree, target_tree, tt,
2880
child_pb, filenames, backups,
2881
merge_modified, basis_tree)
2882
with ui.ui_factory.nested_progress_bar() as child_pb:
2883
raw_conflicts = resolve_conflicts(
2884
tt, child_pb, lambda t, c: conflict_pass(t, c, target_tree))
2885
conflicts = cook_conflicts(raw_conflicts, tt)
2886
return conflicts, merge_modified
2889
def _alter_files(working_tree, target_tree, tt, pb, specific_files,
2890
backups, merge_modified, basis_tree=None):
2891
if basis_tree is not None:
2892
basis_tree.lock_read()
2893
# We ask the working_tree for its changes relative to the target, rather
2894
# than the target changes relative to the working tree. Because WT4 has an
2895
# optimizer to compare itself to a target, but no optimizer for the
2897
change_list = working_tree.iter_changes(
2898
target_tree, specific_files=specific_files, pb=pb)
2899
if not target_tree.is_versioned(u''):
2905
for id_num, (file_id, path, changed_content, versioned, parent, name,
2906
kind, executable) in enumerate(change_list):
2907
target_path, wt_path = path
2908
target_versioned, wt_versioned = versioned
2909
target_parent, wt_parent = parent
2910
target_name, wt_name = name
2911
target_kind, wt_kind = kind
2912
target_executable, wt_executable = executable
2913
if skip_root and wt_parent is None:
2915
trans_id = tt.trans_id_file_id(file_id)
2918
keep_content = False
2919
if wt_kind == 'file' and (backups or target_kind is None):
2920
wt_sha1 = working_tree.get_file_sha1(wt_path)
2921
if merge_modified.get(file_id) != wt_sha1:
2922
# acquire the basis tree lazily to prevent the
2923
# expense of accessing it when it's not needed ?
2924
# (Guessing, RBC, 200702)
2925
if basis_tree is None:
2926
basis_tree = working_tree.basis_tree()
2927
basis_tree.lock_read()
2928
basis_path = find_previous_path(
2929
working_tree, basis_tree, wt_path)
2930
if basis_path is None:
2931
if target_kind is None and not target_versioned:
2934
if wt_sha1 != basis_tree.get_file_sha1(basis_path):
2936
if wt_kind is not None:
2937
if not keep_content:
2938
tt.delete_contents(trans_id)
2939
elif target_kind is not None:
2940
parent_trans_id = tt.trans_id_file_id(wt_parent)
2941
backup_name = tt._available_backup_name(
2942
wt_name, parent_trans_id)
2943
tt.adjust_path(backup_name, parent_trans_id, trans_id)
2944
new_trans_id = tt.create_path(wt_name, parent_trans_id)
2945
if wt_versioned and target_versioned:
2946
tt.unversion_file(trans_id)
2947
tt.version_file(file_id, new_trans_id)
2948
# New contents should have the same unix perms as old
2951
trans_id = new_trans_id
2952
if target_kind in ('directory', 'tree-reference'):
2953
tt.create_directory(trans_id)
2954
if target_kind == 'tree-reference':
2955
revision = target_tree.get_reference_revision(
2957
tt.set_tree_reference(revision, trans_id)
2958
elif target_kind == 'symlink':
2959
tt.create_symlink(target_tree.get_symlink_target(
2960
target_path), trans_id)
2961
elif target_kind == 'file':
2962
deferred_files.append(
2963
(target_path, (trans_id, mode_id, file_id)))
2964
if basis_tree is None:
2965
basis_tree = working_tree.basis_tree()
2966
basis_tree.lock_read()
2967
new_sha1 = target_tree.get_file_sha1(target_path)
2968
basis_path = find_previous_path(target_tree, basis_tree, target_path)
2969
if (basis_path is not None and
2970
new_sha1 == basis_tree.get_file_sha1(basis_path)):
2971
if file_id in merge_modified:
2972
del merge_modified[file_id]
2974
merge_modified[file_id] = new_sha1
2976
# preserve the execute bit when backing up
2977
if keep_content and wt_executable == target_executable:
2978
tt.set_executability(target_executable, trans_id)
2979
elif target_kind is not None:
2980
raise AssertionError(target_kind)
2981
if not wt_versioned and target_versioned:
2982
tt.version_file(file_id, trans_id)
2983
if wt_versioned and not target_versioned:
2984
tt.unversion_file(trans_id)
2985
if (target_name is not None
2986
and (wt_name != target_name or wt_parent != target_parent)):
2987
if target_name == '' and target_parent is None:
2988
parent_trans = ROOT_PARENT
2990
parent_trans = tt.trans_id_file_id(target_parent)
2991
if wt_parent is None and wt_versioned:
2992
tt.adjust_root_path(target_name, parent_trans)
2994
tt.adjust_path(target_name, parent_trans, trans_id)
2995
if wt_executable != target_executable and target_kind == "file":
2996
tt.set_executability(target_executable, trans_id)
2997
if working_tree.supports_content_filtering():
2998
for (trans_id, mode_id, file_id), bytes in (
2999
target_tree.iter_files_bytes(deferred_files)):
3000
# We're reverting a tree to the target tree so using the
3001
# target tree to find the file path seems the best choice
3002
# here IMO - Ian C 27/Oct/2009
3003
filter_tree_path = target_tree.id2path(file_id)
3004
filters = working_tree._content_filter_stack(filter_tree_path)
3005
bytes = filtered_output_bytes(
3007
ContentFilterContext(filter_tree_path, working_tree))
3008
tt.create_file(bytes, trans_id, mode_id)
3010
for (trans_id, mode_id, file_id), bytes in target_tree.iter_files_bytes(
3012
tt.create_file(bytes, trans_id, mode_id)
3013
tt.fixup_new_roots()
3015
if basis_tree is not None:
3017
return merge_modified
3020
def resolve_conflicts(tt, pb=None, pass_func=None):
3021
"""Make many conflict-resolution attempts, but die if they fail"""
3022
if pass_func is None:
3023
pass_func = conflict_pass
3024
new_conflicts = set()
3025
with ui.ui_factory.nested_progress_bar() as pb:
3027
pb.update(gettext('Resolution pass'), n + 1, 10)
3028
conflicts = tt.find_conflicts()
3029
if len(conflicts) == 0:
3030
return new_conflicts
3031
new_conflicts.update(pass_func(tt, conflicts))
3032
raise MalformedTransform(conflicts=conflicts)
3035
def conflict_pass(tt, conflicts, path_tree=None):
3036
"""Resolve some classes of conflicts.
3038
:param tt: The transform to resolve conflicts in
3039
:param conflicts: The conflicts to resolve
3040
:param path_tree: A Tree to get supplemental paths from
3042
new_conflicts = set()
3043
for c_type, conflict in ((c[0], c) for c in conflicts):
3044
if c_type == 'duplicate id':
3045
tt.unversion_file(conflict[1])
3046
new_conflicts.add((c_type, 'Unversioned existing file',
3047
conflict[1], conflict[2], ))
3048
elif c_type == 'duplicate':
3049
# files that were renamed take precedence
3050
final_parent = tt.final_parent(conflict[1])
3051
if tt.path_changed(conflict[1]):
3052
existing_file, new_file = conflict[2], conflict[1]
3054
existing_file, new_file = conflict[1], conflict[2]
3055
new_name = tt.final_name(existing_file) + '.moved'
3056
tt.adjust_path(new_name, final_parent, existing_file)
3057
new_conflicts.add((c_type, 'Moved existing file to',
3058
existing_file, new_file))
3059
elif c_type == 'parent loop':
3060
# break the loop by undoing one of the ops that caused the loop
3062
while not tt.path_changed(cur):
3063
cur = tt.final_parent(cur)
3064
new_conflicts.add((c_type, 'Cancelled move', cur,
3065
tt.final_parent(cur),))
3066
tt.adjust_path(tt.final_name(cur), tt.get_tree_parent(cur), cur)
3068
elif c_type == 'missing parent':
3069
trans_id = conflict[1]
3070
if trans_id in tt._removed_contents:
3071
cancel_deletion = True
3072
orphans = tt._get_potential_orphans(trans_id)
3074
cancel_deletion = False
3075
# All children are orphans
3078
tt.new_orphan(o, trans_id)
3079
except OrphaningError:
3080
# Something bad happened so we cancel the directory
3081
# deletion which will leave it in place with a
3082
# conflict. The user can deal with it from there.
3083
# Note that this also catch the case where we don't
3084
# want to create orphans and leave the directory in
3086
cancel_deletion = True
3089
# Cancel the directory deletion
3090
tt.cancel_deletion(trans_id)
3091
new_conflicts.add(('deleting parent', 'Not deleting',
3096
tt.final_name(trans_id)
3098
if path_tree is not None:
3099
file_id = tt.final_file_id(trans_id)
3101
file_id = tt.inactive_file_id(trans_id)
3102
_, entry = next(path_tree.iter_entries_by_dir(
3103
specific_files=[path_tree.id2path(file_id)]))
3104
# special-case the other tree root (move its
3105
# children to current root)
3106
if entry.parent_id is None:
3108
moved = _reparent_transform_children(
3109
tt, trans_id, tt.root)
3111
new_conflicts.add((c_type, 'Moved to root',
3114
parent_trans_id = tt.trans_id_file_id(
3116
tt.adjust_path(entry.name, parent_trans_id,
3119
tt.create_directory(trans_id)
3120
new_conflicts.add((c_type, 'Created directory', trans_id))
3121
elif c_type == 'unversioned parent':
3122
file_id = tt.inactive_file_id(conflict[1])
3123
# special-case the other tree root (move its children instead)
3124
if path_tree and path_tree.path2id('') == file_id:
3125
# This is the root entry, skip it
3127
tt.version_file(file_id, conflict[1])
3128
new_conflicts.add((c_type, 'Versioned directory', conflict[1]))
3129
elif c_type == 'non-directory parent':
3130
parent_id = conflict[1]
3131
parent_parent = tt.final_parent(parent_id)
3132
parent_name = tt.final_name(parent_id)
3133
parent_file_id = tt.final_file_id(parent_id)
3134
new_parent_id = tt.new_directory(parent_name + '.new',
3135
parent_parent, parent_file_id)
3136
_reparent_transform_children(tt, parent_id, new_parent_id)
3137
if parent_file_id is not None:
3138
tt.unversion_file(parent_id)
3139
new_conflicts.add((c_type, 'Created directory', new_parent_id))
3140
elif c_type == 'versioning no contents':
3141
tt.cancel_versioning(conflict[1])
3142
return new_conflicts
3145
def cook_conflicts(raw_conflicts, tt):
3146
"""Generate a list of cooked conflicts, sorted by file path"""
3147
conflict_iter = iter_cook_conflicts(raw_conflicts, tt)
3148
return sorted(conflict_iter, key=conflicts.Conflict.sort_key)
3151
def iter_cook_conflicts(raw_conflicts, tt):
3153
for conflict in raw_conflicts:
3154
c_type = conflict[0]
3155
action = conflict[1]
3156
modified_path = fp.get_path(conflict[2])
3157
modified_id = tt.final_file_id(conflict[2])
3158
if len(conflict) == 3:
3159
yield conflicts.Conflict.factory(
3160
c_type, action=action, path=modified_path, file_id=modified_id)
3163
conflicting_path = fp.get_path(conflict[3])
3164
conflicting_id = tt.final_file_id(conflict[3])
3165
yield conflicts.Conflict.factory(
3166
c_type, action=action, path=modified_path,
3167
file_id=modified_id,
3168
conflict_path=conflicting_path,
3169
conflict_file_id=conflicting_id)
3172
class _FileMover(object):
3173
"""Moves and deletes files for TreeTransform, tracking operations"""
3176
self.past_renames = []
3177
self.pending_deletions = []
3179
def rename(self, from_, to):
3180
"""Rename a file from one path to another."""
3182
os.rename(from_, to)
3183
except OSError as e:
3184
if e.errno in (errno.EEXIST, errno.ENOTEMPTY):
3185
raise errors.FileExists(to, str(e))
3186
# normal OSError doesn't include filenames so it's hard to see where
3187
# the problem is, see https://bugs.launchpad.net/bzr/+bug/491763
3188
raise errors.TransformRenameFailed(from_, to, str(e), e.errno)
3189
self.past_renames.append((from_, to))
3191
def pre_delete(self, from_, to):
3192
"""Rename a file out of the way and mark it for deletion.
3194
Unlike os.unlink, this works equally well for files and directories.
3195
:param from_: The current file path
3196
:param to: A temporary path for the file
3198
self.rename(from_, to)
3199
self.pending_deletions.append(to)
3202
"""Reverse all renames that have been performed"""
3203
for from_, to in reversed(self.past_renames):
3205
os.rename(to, from_)
3206
except OSError as e:
3207
raise errors.TransformRenameFailed(to, from_, str(e), e.errno)
3208
# after rollback, don't reuse _FileMover
3209
self.past_renames = None
3210
self.pending_deletions = None
3212
def apply_deletions(self):
3213
"""Apply all marked deletions"""
3214
for path in self.pending_deletions:
3216
# after apply_deletions, don't reuse _FileMover
3217
self.past_renames = None
3218
self.pending_deletions = None
3221
def link_tree(target_tree, source_tree):
3222
"""Where possible, hard-link files in a tree to those in another tree.
3224
:param target_tree: Tree to change
3225
:param source_tree: Tree to hard-link from
3227
tt = TreeTransform(target_tree)
3229
for (file_id, paths, changed_content, versioned, parent, name, kind,
3230
executable) in target_tree.iter_changes(source_tree,
3231
include_unchanged=True):
3234
if kind != ('file', 'file'):
3236
if executable[0] != executable[1]:
3238
trans_id = tt.trans_id_tree_path(paths[1])
3239
tt.delete_contents(trans_id)
3240
tt.create_hardlink(source_tree.abspath(paths[0]), trans_id)
added
removed
breezy/transform.py
