1
# Copyright (C) 2006, 2007, 2008, 2009 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
19
from stat import S_ISREG, S_IEXEC
21
from bzrlib.lazy_import import lazy_import
22
lazy_import(globals(), """
32
revision as _mod_revision,
35
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
36
ReusingTransform, NotVersionedError, CantMoveRoot,
37
ExistingLimbo, ImmortalLimbo, NoFinalPath,
39
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
40
from bzrlib.inventory import InventoryEntry
41
from bzrlib.osutils import (
51
from bzrlib.progress import DummyProgress, ProgressPhase
52
from bzrlib.symbol_versioning import (
56
from bzrlib.trace import mutter, warning
57
from bzrlib import tree
59
import bzrlib.urlutils as urlutils
62
ROOT_PARENT = "root-parent"
65
def unique_add(map, key, value):
67
raise DuplicateKey(key=key)
71
class _TransformResults(object):
72
def __init__(self, modified_paths, rename_count):
74
self.modified_paths = modified_paths
75
self.rename_count = rename_count
78
class TreeTransformBase(object):
79
"""The base class for TreeTransform and its kin."""
81
def __init__(self, tree, pb=DummyProgress(),
85
:param tree: The tree that will be transformed, but not necessarily
87
:param pb: A ProgressBar indicating how much progress is being made
88
:param case_sensitive: If True, the target of the transform is
89
case sensitive, not just case preserving.
94
# mapping of trans_id -> new basename
96
# mapping of trans_id -> new parent trans_id
98
# mapping of trans_id with new contents -> new file_kind
99
self._new_contents = {}
100
# Set of trans_ids whose contents will be removed
101
self._removed_contents = set()
102
# Mapping of trans_id -> new execute-bit value
103
self._new_executability = {}
104
# Mapping of trans_id -> new tree-reference value
105
self._new_reference_revision = {}
106
# Mapping of trans_id -> new file_id
108
# Mapping of old file-id -> trans_id
109
self._non_present_ids = {}
110
# Mapping of new file_id -> trans_id
112
# Set of trans_ids that will be removed
113
self._removed_id = set()
114
# Mapping of path in old tree -> trans_id
115
self._tree_path_ids = {}
116
# Mapping trans_id -> path in old tree
117
self._tree_id_paths = {}
118
# The trans_id that will be used as the tree root
119
root_id = tree.get_root_id()
120
if root_id is not None:
121
self._new_root = self.trans_id_tree_file_id(root_id)
123
self._new_root = None
124
# Indictor of whether the transform has been applied
128
# Whether the target is case sensitive
129
self._case_sensitive_target = case_sensitive
130
# A counter of how many files have been renamed
131
self.rename_count = 0
134
"""Release the working tree lock, if held.
136
This is required if apply has not been invoked, but can be invoked
139
if self._tree is None:
144
def __get_root(self):
145
return self._new_root
147
root = property(__get_root)
149
def _assign_id(self):
150
"""Produce a new tranform id"""
151
new_id = "new-%s" % self._id_number
155
def create_path(self, name, parent):
156
"""Assign a transaction id to a new path"""
157
trans_id = self._assign_id()
158
unique_add(self._new_name, trans_id, name)
159
unique_add(self._new_parent, trans_id, parent)
162
def adjust_path(self, name, parent, trans_id):
163
"""Change the path that is assigned to a transaction id."""
164
if trans_id == self._new_root:
166
self._new_name[trans_id] = name
167
self._new_parent[trans_id] = parent
168
if parent == ROOT_PARENT:
169
if self._new_root is not None:
170
raise ValueError("Cannot have multiple roots.")
171
self._new_root = trans_id
173
def adjust_root_path(self, name, parent):
174
"""Emulate moving the root by moving all children, instead.
176
We do this by undoing the association of root's transaction id with the
177
current tree. This allows us to create a new directory with that
178
transaction id. We unversion the root directory and version the
179
physically new directory, and hope someone versions the tree root
182
old_root = self._new_root
183
old_root_file_id = self.final_file_id(old_root)
184
# force moving all children of root
185
for child_id in self.iter_tree_children(old_root):
186
if child_id != parent:
187
self.adjust_path(self.final_name(child_id),
188
self.final_parent(child_id), child_id)
189
file_id = self.final_file_id(child_id)
190
if file_id is not None:
191
self.unversion_file(child_id)
192
self.version_file(file_id, child_id)
194
# the physical root needs a new transaction id
195
self._tree_path_ids.pop("")
196
self._tree_id_paths.pop(old_root)
197
self._new_root = self.trans_id_tree_file_id(self._tree.get_root_id())
198
if parent == old_root:
199
parent = self._new_root
200
self.adjust_path(name, parent, old_root)
201
self.create_directory(old_root)
202
self.version_file(old_root_file_id, old_root)
203
self.unversion_file(self._new_root)
205
def trans_id_tree_file_id(self, inventory_id):
206
"""Determine the transaction id of a working tree file.
208
This reflects only files that already exist, not ones that will be
209
added by transactions.
211
if inventory_id is None:
212
raise ValueError('None is not a valid file id')
213
path = self._tree.id2path(inventory_id)
214
return self.trans_id_tree_path(path)
216
def trans_id_file_id(self, file_id):
217
"""Determine or set the transaction id associated with a file ID.
218
A new id is only created for file_ids that were never present. If
219
a transaction has been unversioned, it is deliberately still returned.
220
(this will likely lead to an unversioned parent conflict.)
223
raise ValueError('None is not a valid file id')
224
if file_id in self._r_new_id and self._r_new_id[file_id] is not None:
225
return self._r_new_id[file_id]
228
self._tree.iter_entries_by_dir([file_id]).next()
229
except StopIteration:
230
if file_id in self._non_present_ids:
231
return self._non_present_ids[file_id]
233
trans_id = self._assign_id()
234
self._non_present_ids[file_id] = trans_id
237
return self.trans_id_tree_file_id(file_id)
239
def trans_id_tree_path(self, path):
240
"""Determine (and maybe set) the transaction ID for a tree path."""
241
path = self.canonical_path(path)
242
if path not in self._tree_path_ids:
243
self._tree_path_ids[path] = self._assign_id()
244
self._tree_id_paths[self._tree_path_ids[path]] = path
245
return self._tree_path_ids[path]
247
def get_tree_parent(self, trans_id):
248
"""Determine id of the parent in the tree."""
249
path = self._tree_id_paths[trans_id]
252
return self.trans_id_tree_path(os.path.dirname(path))
254
def delete_contents(self, trans_id):
255
"""Schedule the contents of a path entry for deletion"""
256
self.tree_kind(trans_id)
257
self._removed_contents.add(trans_id)
259
def cancel_deletion(self, trans_id):
260
"""Cancel a scheduled deletion"""
261
self._removed_contents.remove(trans_id)
263
def unversion_file(self, trans_id):
264
"""Schedule a path entry to become unversioned"""
265
self._removed_id.add(trans_id)
267
def delete_versioned(self, trans_id):
268
"""Delete and unversion a versioned file"""
269
self.delete_contents(trans_id)
270
self.unversion_file(trans_id)
272
def set_executability(self, executability, trans_id):
273
"""Schedule setting of the 'execute' bit
274
To unschedule, set to None
276
if executability is None:
277
del self._new_executability[trans_id]
279
unique_add(self._new_executability, trans_id, executability)
281
def set_tree_reference(self, revision_id, trans_id):
282
"""Set the reference associated with a directory"""
283
unique_add(self._new_reference_revision, trans_id, revision_id)
285
def version_file(self, file_id, trans_id):
286
"""Schedule a file to become versioned."""
289
unique_add(self._new_id, trans_id, file_id)
290
unique_add(self._r_new_id, file_id, trans_id)
292
def cancel_versioning(self, trans_id):
293
"""Undo a previous versioning of a file"""
294
file_id = self._new_id[trans_id]
295
del self._new_id[trans_id]
296
del self._r_new_id[file_id]
298
def new_paths(self, filesystem_only=False):
299
"""Determine the paths of all new and changed files.
301
:param filesystem_only: if True, only calculate values for files
302
that require renames or execute bit changes.
306
stale_ids = self._needs_rename.difference(self._new_name)
307
stale_ids.difference_update(self._new_parent)
308
stale_ids.difference_update(self._new_contents)
309
stale_ids.difference_update(self._new_id)
310
needs_rename = self._needs_rename.difference(stale_ids)
311
id_sets = (needs_rename, self._new_executability)
313
id_sets = (self._new_name, self._new_parent, self._new_contents,
314
self._new_id, self._new_executability)
315
for id_set in id_sets:
316
new_ids.update(id_set)
317
return sorted(FinalPaths(self).get_paths(new_ids))
319
def _inventory_altered(self):
320
"""Get the trans_ids and paths of files needing new inv entries."""
322
for id_set in [self._new_name, self._new_parent, self._new_id,
323
self._new_executability]:
324
new_ids.update(id_set)
325
changed_kind = set(self._removed_contents)
326
changed_kind.intersection_update(self._new_contents)
327
changed_kind.difference_update(new_ids)
328
changed_kind = (t for t in changed_kind if self.tree_kind(t) !=
330
new_ids.update(changed_kind)
331
return sorted(FinalPaths(self).get_paths(new_ids))
333
def final_kind(self, trans_id):
334
"""Determine the final file kind, after any changes applied.
336
Raises NoSuchFile if the file does not exist/has no contents.
337
(It is conceivable that a path would be created without the
338
corresponding contents insertion command)
340
if trans_id in self._new_contents:
341
return self._new_contents[trans_id]
342
elif trans_id in self._removed_contents:
343
raise NoSuchFile(None)
345
return self.tree_kind(trans_id)
347
def tree_file_id(self, trans_id):
348
"""Determine the file id associated with the trans_id in the tree"""
350
path = self._tree_id_paths[trans_id]
352
# the file is a new, unversioned file, or invalid trans_id
354
# the file is old; the old id is still valid
355
if self._new_root == trans_id:
356
return self._tree.get_root_id()
357
return self._tree.path2id(path)
359
def final_file_id(self, trans_id):
360
"""Determine the file id after any changes are applied, or None.
362
None indicates that the file will not be versioned after changes are
366
return self._new_id[trans_id]
368
if trans_id in self._removed_id:
370
return self.tree_file_id(trans_id)
372
def inactive_file_id(self, trans_id):
373
"""Return the inactive file_id associated with a transaction id.
374
That is, the one in the tree or in non_present_ids.
375
The file_id may actually be active, too.
377
file_id = self.tree_file_id(trans_id)
378
if file_id is not None:
380
for key, value in self._non_present_ids.iteritems():
381
if value == trans_id:
384
def final_parent(self, trans_id):
385
"""Determine the parent file_id, after any changes are applied.
387
ROOT_PARENT is returned for the tree root.
390
return self._new_parent[trans_id]
392
return self.get_tree_parent(trans_id)
394
def final_name(self, trans_id):
395
"""Determine the final filename, after all changes are applied."""
397
return self._new_name[trans_id]
400
return os.path.basename(self._tree_id_paths[trans_id])
402
raise NoFinalPath(trans_id, self)
405
"""Return a map of parent: children for known parents.
407
Only new paths and parents of tree files with assigned ids are used.
410
items = list(self._new_parent.iteritems())
411
items.extend((t, self.final_parent(t)) for t in
412
self._tree_id_paths.keys())
413
for trans_id, parent_id in items:
414
if parent_id not in by_parent:
415
by_parent[parent_id] = set()
416
by_parent[parent_id].add(trans_id)
419
def path_changed(self, trans_id):
420
"""Return True if a trans_id's path has changed."""
421
return (trans_id in self._new_name) or (trans_id in self._new_parent)
423
def new_contents(self, trans_id):
424
return (trans_id in self._new_contents)
426
def find_conflicts(self):
427
"""Find any violations of inventory or filesystem invariants"""
428
if self._done is True:
429
raise ReusingTransform()
431
# ensure all children of all existent parents are known
432
# all children of non-existent parents are known, by definition.
433
self._add_tree_children()
434
by_parent = self.by_parent()
435
conflicts.extend(self._unversioned_parents(by_parent))
436
conflicts.extend(self._parent_loops())
437
conflicts.extend(self._duplicate_entries(by_parent))
438
conflicts.extend(self._duplicate_ids())
439
conflicts.extend(self._parent_type_conflicts(by_parent))
440
conflicts.extend(self._improper_versioning())
441
conflicts.extend(self._executability_conflicts())
442
conflicts.extend(self._overwrite_conflicts())
445
def _check_malformed(self):
446
conflicts = self.find_conflicts()
447
if len(conflicts) != 0:
448
raise MalformedTransform(conflicts=conflicts)
450
def _add_tree_children(self):
451
"""Add all the children of all active parents to the known paths.
453
Active parents are those which gain children, and those which are
454
removed. This is a necessary first step in detecting conflicts.
456
parents = self.by_parent().keys()
457
parents.extend([t for t in self._removed_contents if
458
self.tree_kind(t) == 'directory'])
459
for trans_id in self._removed_id:
460
file_id = self.tree_file_id(trans_id)
461
if file_id is not None:
462
if self._tree.inventory[file_id].kind == 'directory':
463
parents.append(trans_id)
464
elif self.tree_kind(trans_id) == 'directory':
465
parents.append(trans_id)
467
for parent_id in parents:
468
# ensure that all children are registered with the transaction
469
list(self.iter_tree_children(parent_id))
471
def has_named_child(self, by_parent, parent_id, name):
473
children = by_parent[parent_id]
476
for child in children:
477
if self.final_name(child) == name:
480
path = self._tree_id_paths[parent_id]
483
childpath = joinpath(path, name)
484
child_id = self._tree_path_ids.get(childpath)
486
return lexists(self._tree.abspath(childpath))
488
if self.final_parent(child_id) != parent_id:
490
if child_id in self._removed_contents:
491
# XXX What about dangling file-ids?
496
def _parent_loops(self):
497
"""No entry should be its own ancestor"""
499
for trans_id in self._new_parent:
502
while parent_id is not ROOT_PARENT:
505
parent_id = self.final_parent(parent_id)
508
if parent_id == trans_id:
509
conflicts.append(('parent loop', trans_id))
510
if parent_id in seen:
514
def _unversioned_parents(self, by_parent):
515
"""If parent directories are versioned, children must be versioned."""
517
for parent_id, children in by_parent.iteritems():
518
if parent_id is ROOT_PARENT:
520
if self.final_file_id(parent_id) is not None:
522
for child_id in children:
523
if self.final_file_id(child_id) is not None:
524
conflicts.append(('unversioned parent', parent_id))
528
def _improper_versioning(self):
529
"""Cannot version a file with no contents, or a bad type.
531
However, existing entries with no contents are okay.
534
for trans_id in self._new_id.iterkeys():
536
kind = self.final_kind(trans_id)
538
conflicts.append(('versioning no contents', trans_id))
540
if not InventoryEntry.versionable_kind(kind):
541
conflicts.append(('versioning bad kind', trans_id, kind))
544
def _executability_conflicts(self):
545
"""Check for bad executability changes.
547
Only versioned files may have their executability set, because
548
1. only versioned entries can have executability under windows
549
2. only files can be executable. (The execute bit on a directory
550
does not indicate searchability)
553
for trans_id in self._new_executability:
554
if self.final_file_id(trans_id) is None:
555
conflicts.append(('unversioned executability', trans_id))
558
non_file = self.final_kind(trans_id) != "file"
562
conflicts.append(('non-file executability', trans_id))
565
def _overwrite_conflicts(self):
566
"""Check for overwrites (not permitted on Win32)"""
568
for trans_id in self._new_contents:
570
self.tree_kind(trans_id)
573
if trans_id not in self._removed_contents:
574
conflicts.append(('overwrite', trans_id,
575
self.final_name(trans_id)))
578
def _duplicate_entries(self, by_parent):
579
"""No directory may have two entries with the same name."""
581
if (self._new_name, self._new_parent) == ({}, {}):
583
for children in by_parent.itervalues():
584
name_ids = [(self.final_name(t), t) for t in children]
585
if not self._case_sensitive_target:
586
name_ids = [(n.lower(), t) for n, t in name_ids]
590
for name, trans_id in name_ids:
592
kind = self.final_kind(trans_id)
595
file_id = self.final_file_id(trans_id)
596
if kind is None and file_id is None:
598
if name == last_name:
599
conflicts.append(('duplicate', last_trans_id, trans_id,
602
last_trans_id = trans_id
605
def _duplicate_ids(self):
606
"""Each inventory id may only be used once"""
608
removed_tree_ids = set((self.tree_file_id(trans_id) for trans_id in
610
all_ids = self._tree.all_file_ids()
611
active_tree_ids = all_ids.difference(removed_tree_ids)
612
for trans_id, file_id in self._new_id.iteritems():
613
if file_id in active_tree_ids:
614
old_trans_id = self.trans_id_tree_file_id(file_id)
615
conflicts.append(('duplicate id', old_trans_id, trans_id))
618
def _parent_type_conflicts(self, by_parent):
619
"""parents must have directory 'contents'."""
621
for parent_id, children in by_parent.iteritems():
622
if parent_id is ROOT_PARENT:
624
if not self._any_contents(children):
626
for child in children:
628
self.final_kind(child)
632
kind = self.final_kind(parent_id)
636
conflicts.append(('missing parent', parent_id))
637
elif kind != "directory":
638
conflicts.append(('non-directory parent', parent_id))
641
def _any_contents(self, trans_ids):
642
"""Return true if any of the trans_ids, will have contents."""
643
for trans_id in trans_ids:
645
kind = self.final_kind(trans_id)
651
def _set_executability(self, path, trans_id):
652
"""Set the executability of versioned files """
653
if supports_executable():
654
new_executability = self._new_executability[trans_id]
655
abspath = self._tree.abspath(path)
656
current_mode = os.stat(abspath).st_mode
657
if new_executability:
660
to_mode = current_mode | (0100 & ~umask)
661
# Enable x-bit for others only if they can read it.
662
if current_mode & 0004:
663
to_mode |= 0001 & ~umask
664
if current_mode & 0040:
665
to_mode |= 0010 & ~umask
667
to_mode = current_mode & ~0111
668
os.chmod(abspath, to_mode)
670
def _new_entry(self, name, parent_id, file_id):
671
"""Helper function to create a new filesystem entry."""
672
trans_id = self.create_path(name, parent_id)
673
if file_id is not None:
674
self.version_file(file_id, trans_id)
677
def new_file(self, name, parent_id, contents, file_id=None,
679
"""Convenience method to create files.
681
name is the name of the file to create.
682
parent_id is the transaction id of the parent directory of the file.
683
contents is an iterator of bytestrings, which will be used to produce
685
:param file_id: The inventory ID of the file, if it is to be versioned.
686
:param executable: Only valid when a file_id has been supplied.
688
trans_id = self._new_entry(name, parent_id, file_id)
689
# TODO: rather than scheduling a set_executable call,
690
# have create_file create the file with the right mode.
691
self.create_file(contents, trans_id)
692
if executable is not None:
693
self.set_executability(executable, trans_id)
696
def new_directory(self, name, parent_id, file_id=None):
697
"""Convenience method to create directories.
699
name is the name of the directory to create.
700
parent_id is the transaction id of the parent directory of the
702
file_id is the inventory ID of the directory, if it is to be versioned.
704
trans_id = self._new_entry(name, parent_id, file_id)
705
self.create_directory(trans_id)
708
def new_symlink(self, name, parent_id, target, file_id=None):
709
"""Convenience method to create symbolic link.
711
name is the name of the symlink to create.
712
parent_id is the transaction id of the parent directory of the symlink.
713
target is a bytestring of the target of the symlink.
714
file_id is the inventory ID of the file, if it is to be versioned.
716
trans_id = self._new_entry(name, parent_id, file_id)
717
self.create_symlink(target, trans_id)
720
def _affected_ids(self):
721
"""Return the set of transform ids affected by the transform"""
722
trans_ids = set(self._removed_id)
723
trans_ids.update(self._new_id.keys())
724
trans_ids.update(self._removed_contents)
725
trans_ids.update(self._new_contents.keys())
726
trans_ids.update(self._new_executability.keys())
727
trans_ids.update(self._new_name.keys())
728
trans_ids.update(self._new_parent.keys())
731
def _get_file_id_maps(self):
732
"""Return mapping of file_ids to trans_ids in the to and from states"""
733
trans_ids = self._affected_ids()
736
# Build up two dicts: trans_ids associated with file ids in the
737
# FROM state, vs the TO state.
738
for trans_id in trans_ids:
739
from_file_id = self.tree_file_id(trans_id)
740
if from_file_id is not None:
741
from_trans_ids[from_file_id] = trans_id
742
to_file_id = self.final_file_id(trans_id)
743
if to_file_id is not None:
744
to_trans_ids[to_file_id] = trans_id
745
return from_trans_ids, to_trans_ids
747
def _from_file_data(self, from_trans_id, from_versioned, file_id):
748
"""Get data about a file in the from (tree) state
750
Return a (name, parent, kind, executable) tuple
752
from_path = self._tree_id_paths.get(from_trans_id)
754
# get data from working tree if versioned
755
from_entry = self._tree.iter_entries_by_dir([file_id]).next()[1]
756
from_name = from_entry.name
757
from_parent = from_entry.parent_id
760
if from_path is None:
761
# File does not exist in FROM state
765
# File exists, but is not versioned. Have to use path-
767
from_name = os.path.basename(from_path)
768
tree_parent = self.get_tree_parent(from_trans_id)
769
from_parent = self.tree_file_id(tree_parent)
770
if from_path is not None:
771
from_kind, from_executable, from_stats = \
772
self._tree._comparison_data(from_entry, from_path)
775
from_executable = False
776
return from_name, from_parent, from_kind, from_executable
778
def _to_file_data(self, to_trans_id, from_trans_id, from_executable):
779
"""Get data about a file in the to (target) state
781
Return a (name, parent, kind, executable) tuple
783
to_name = self.final_name(to_trans_id)
785
to_kind = self.final_kind(to_trans_id)
788
to_parent = self.final_file_id(self.final_parent(to_trans_id))
789
if to_trans_id in self._new_executability:
790
to_executable = self._new_executability[to_trans_id]
791
elif to_trans_id == from_trans_id:
792
to_executable = from_executable
794
to_executable = False
795
return to_name, to_parent, to_kind, to_executable
797
def iter_changes(self):
798
"""Produce output in the same format as Tree.iter_changes.
800
Will produce nonsensical results if invoked while inventory/filesystem
801
conflicts (as reported by TreeTransform.find_conflicts()) are present.
803
This reads the Transform, but only reproduces changes involving a
804
file_id. Files that are not versioned in either of the FROM or TO
805
states are not reflected.
807
final_paths = FinalPaths(self)
808
from_trans_ids, to_trans_ids = self._get_file_id_maps()
810
# Now iterate through all active file_ids
811
for file_id in set(from_trans_ids.keys() + to_trans_ids.keys()):
813
from_trans_id = from_trans_ids.get(file_id)
814
# find file ids, and determine versioning state
815
if from_trans_id is None:
816
from_versioned = False
817
from_trans_id = to_trans_ids[file_id]
819
from_versioned = True
820
to_trans_id = to_trans_ids.get(file_id)
821
if to_trans_id is None:
823
to_trans_id = from_trans_id
827
from_name, from_parent, from_kind, from_executable = \
828
self._from_file_data(from_trans_id, from_versioned, file_id)
830
to_name, to_parent, to_kind, to_executable = \
831
self._to_file_data(to_trans_id, from_trans_id, from_executable)
833
if not from_versioned:
836
from_path = self._tree_id_paths.get(from_trans_id)
840
to_path = final_paths.get_path(to_trans_id)
841
if from_kind != to_kind:
843
elif to_kind in ('file', 'symlink') and (
844
to_trans_id != from_trans_id or
845
to_trans_id in self._new_contents):
847
if (not modified and from_versioned == to_versioned and
848
from_parent==to_parent and from_name == to_name and
849
from_executable == to_executable):
851
results.append((file_id, (from_path, to_path), modified,
852
(from_versioned, to_versioned),
853
(from_parent, to_parent),
854
(from_name, to_name),
855
(from_kind, to_kind),
856
(from_executable, to_executable)))
857
return iter(sorted(results, key=lambda x:x[1]))
859
def get_preview_tree(self):
860
"""Return a tree representing the result of the transform.
862
This tree only supports the subset of Tree functionality required
863
by show_diff_trees. It must only be compared to tt._tree.
865
return _PreviewTree(self)
867
def commit(self, branch, message, merge_parents=None, strict=False):
868
"""Commit the result of this TreeTransform to a branch.
870
:param branch: The branch to commit to.
871
:param message: The message to attach to the commit.
872
:param merge_parents: Additional parents specified by pending merges.
873
:return: The revision_id of the revision committed.
875
self._check_malformed()
877
unversioned = set(self._new_contents).difference(set(self._new_id))
878
for trans_id in unversioned:
879
if self.final_file_id(trans_id) is None:
880
raise errors.StrictCommitFailed()
882
revno, last_rev_id = branch.last_revision_info()
883
if last_rev_id == _mod_revision.NULL_REVISION:
884
if merge_parents is not None:
885
raise ValueError('Cannot supply merge parents for first'
889
parent_ids = [last_rev_id]
890
if merge_parents is not None:
891
parent_ids.extend(merge_parents)
892
if self._tree.get_revision_id() != last_rev_id:
893
raise ValueError('TreeTransform not based on branch basis: %s' %
894
self._tree.get_revision_id())
895
builder = branch.get_commit_builder(parent_ids)
896
preview = self.get_preview_tree()
897
list(builder.record_iter_changes(preview, last_rev_id,
898
self.iter_changes()))
899
builder.finish_inventory()
900
revision_id = builder.commit(message)
901
branch.set_last_revision_info(revno + 1, revision_id)
904
def _text_parent(self, trans_id):
905
file_id = self.tree_file_id(trans_id)
907
if file_id is None or self._tree.kind(file_id) != 'file':
909
except errors.NoSuchFile:
913
def _get_parents_texts(self, trans_id):
914
"""Get texts for compression parents of this file."""
915
file_id = self._text_parent(trans_id)
918
return (self._tree.get_file_text(file_id),)
920
def _get_parents_lines(self, trans_id):
921
"""Get lines for compression parents of this file."""
922
file_id = self._text_parent(trans_id)
925
return (self._tree.get_file_lines(file_id),)
927
def serialize(self, serializer):
928
"""Serialize this TreeTransform.
930
:param serializer: A Serialiser like pack.ContainerSerializer.
932
new_name = dict((k, v.encode('utf-8')) for k, v in
933
self._new_name.items())
934
new_executability = dict((k, int(v)) for k, v in
935
self._new_executability.items())
936
tree_path_ids = dict((k.encode('utf-8'), v)
937
for k, v in self._tree_path_ids.items())
939
'_id_number': self._id_number,
940
'_new_name': new_name,
941
'_new_parent': self._new_parent,
942
'_new_executability': new_executability,
943
'_new_id': self._new_id,
944
'_tree_path_ids': tree_path_ids,
945
'_removed_id': list(self._removed_id),
946
'_removed_contents': list(self._removed_contents),
947
'_non_present_ids': self._non_present_ids,
949
yield serializer.bytes_record(bencode.bencode(attribs),
951
for trans_id, kind in self._new_contents.items():
953
lines = osutils.chunks_to_lines(
954
self._read_file_chunks(trans_id))
955
parents = self._get_parents_lines(trans_id)
956
mpdiff = multiparent.MultiParent.from_lines(lines, parents)
957
content = ''.join(mpdiff.to_patch())
958
if kind == 'directory':
960
if kind == 'symlink':
961
content = self._read_symlink_target(trans_id)
962
yield serializer.bytes_record(content, ((trans_id, kind),))
964
def deserialize(self, records):
965
"""Deserialize a stored TreeTransform.
967
:param records: An iterable of (names, content) tuples, as per
968
pack.ContainerPushParser.
970
names, content = records.next()
971
attribs = bencode.bdecode(content)
972
self._id_number = attribs['_id_number']
973
self._new_name = dict((k, v.decode('utf-8'))
974
for k, v in attribs['_new_name'].items())
975
self._new_parent = attribs['_new_parent']
976
self._new_executability = dict((k, bool(v)) for k, v in
977
attribs['_new_executability'].items())
978
self._new_id = attribs['_new_id']
979
self._r_new_id = dict((v, k) for k, v in self._new_id.items())
980
self._tree_path_ids = {}
981
self._tree_id_paths = {}
982
for bytepath, trans_id in attribs['_tree_path_ids'].items():
983
path = bytepath.decode('utf-8')
984
self._tree_path_ids[path] = trans_id
985
self._tree_id_paths[trans_id] = path
986
self._removed_id = set(attribs['_removed_id'])
987
self._removed_contents = set(attribs['_removed_contents'])
988
self._non_present_ids = attribs['_non_present_ids']
989
for ((trans_id, kind),), content in records:
991
mpdiff = multiparent.MultiParent.from_patch(content)
992
lines = mpdiff.to_lines(self._get_parents_texts(trans_id))
993
self.create_file(lines, trans_id)
994
if kind == 'directory':
995
self.create_directory(trans_id)
996
if kind == 'symlink':
997
self.create_symlink(content.decode('utf-8'), trans_id)
1000
class DiskTreeTransform(TreeTransformBase):
1001
"""Tree transform storing its contents on disk."""
1003
def __init__(self, tree, limbodir, pb=DummyProgress(),
1004
case_sensitive=True):
1006
:param tree: The tree that will be transformed, but not necessarily
1008
:param limbodir: A directory where new files can be stored until
1009
they are installed in their proper places
1010
:param pb: A ProgressBar indicating how much progress is being made
1011
:param case_sensitive: If True, the target of the transform is
1012
case sensitive, not just case preserving.
1014
TreeTransformBase.__init__(self, tree, pb, case_sensitive)
1015
self._limbodir = limbodir
1016
self._deletiondir = None
1017
# A mapping of transform ids to their limbo filename
1018
self._limbo_files = {}
1019
# A mapping of transform ids to a set of the transform ids of children
1020
# that their limbo directory has
1021
self._limbo_children = {}
1022
# Map transform ids to maps of child filename to child transform id
1023
self._limbo_children_names = {}
1024
# List of transform ids that need to be renamed from limbo into place
1025
self._needs_rename = set()
1028
"""Release the working tree lock, if held, clean up limbo dir.
1030
This is required if apply has not been invoked, but can be invoked
1033
if self._tree is None:
1036
entries = [(self._limbo_name(t), t, k) for t, k in
1037
self._new_contents.iteritems()]
1038
entries.sort(reverse=True)
1039
for path, trans_id, kind in entries:
1042
delete_any(self._limbodir)
1044
# We don't especially care *why* the dir is immortal.
1045
raise ImmortalLimbo(self._limbodir)
1047
if self._deletiondir is not None:
1048
delete_any(self._deletiondir)
1050
raise errors.ImmortalPendingDeletion(self._deletiondir)
1052
TreeTransformBase.finalize(self)
1054
def _limbo_name(self, trans_id):
1055
"""Generate the limbo name of a file"""
1056
limbo_name = self._limbo_files.get(trans_id)
1057
if limbo_name is not None:
1059
parent = self._new_parent.get(trans_id)
1060
# if the parent directory is already in limbo (e.g. when building a
1061
# tree), choose a limbo name inside the parent, to reduce further
1063
use_direct_path = False
1064
if self._new_contents.get(parent) == 'directory':
1065
filename = self._new_name.get(trans_id)
1066
if filename is not None:
1067
if parent not in self._limbo_children:
1068
self._limbo_children[parent] = set()
1069
self._limbo_children_names[parent] = {}
1070
use_direct_path = True
1071
# the direct path can only be used if no other file has
1072
# already taken this pathname, i.e. if the name is unused, or
1073
# if it is already associated with this trans_id.
1074
elif self._case_sensitive_target:
1075
if (self._limbo_children_names[parent].get(filename)
1076
in (trans_id, None)):
1077
use_direct_path = True
1079
for l_filename, l_trans_id in\
1080
self._limbo_children_names[parent].iteritems():
1081
if l_trans_id == trans_id:
1083
if l_filename.lower() == filename.lower():
1086
use_direct_path = True
1089
limbo_name = pathjoin(self._limbo_files[parent], filename)
1090
self._limbo_children[parent].add(trans_id)
1091
self._limbo_children_names[parent][filename] = trans_id
1093
limbo_name = pathjoin(self._limbodir, trans_id)
1094
self._needs_rename.add(trans_id)
1095
self._limbo_files[trans_id] = limbo_name
1098
def adjust_path(self, name, parent, trans_id):
1099
previous_parent = self._new_parent.get(trans_id)
1100
previous_name = self._new_name.get(trans_id)
1101
TreeTransformBase.adjust_path(self, name, parent, trans_id)
1102
if (trans_id in self._limbo_files and
1103
trans_id not in self._needs_rename):
1104
self._rename_in_limbo([trans_id])
1105
self._limbo_children[previous_parent].remove(trans_id)
1106
del self._limbo_children_names[previous_parent][previous_name]
1108
def _rename_in_limbo(self, trans_ids):
1109
"""Fix limbo names so that the right final path is produced.
1111
This means we outsmarted ourselves-- we tried to avoid renaming
1112
these files later by creating them with their final names in their
1113
final parents. But now the previous name or parent is no longer
1114
suitable, so we have to rename them.
1116
Even for trans_ids that have no new contents, we must remove their
1117
entries from _limbo_files, because they are now stale.
1119
for trans_id in trans_ids:
1120
old_path = self._limbo_files.pop(trans_id)
1121
if trans_id not in self._new_contents:
1123
new_path = self._limbo_name(trans_id)
1124
os.rename(old_path, new_path)
1126
def create_file(self, contents, trans_id, mode_id=None):
1127
"""Schedule creation of a new file.
1131
Contents is an iterator of strings, all of which will be written
1132
to the target destination.
1134
New file takes the permissions of any existing file with that id,
1135
unless mode_id is specified.
1137
name = self._limbo_name(trans_id)
1138
f = open(name, 'wb')
1141
unique_add(self._new_contents, trans_id, 'file')
1143
# Clean up the file, it never got registered so
1144
# TreeTransform.finalize() won't clean it up.
1149
f.writelines(contents)
1152
self._set_mode(trans_id, mode_id, S_ISREG)
1154
def _read_file_chunks(self, trans_id):
1155
cur_file = open(self._limbo_name(trans_id), 'rb')
1157
return cur_file.readlines()
1161
def _read_symlink_target(self, trans_id):
1162
return os.readlink(self._limbo_name(trans_id))
1164
def create_hardlink(self, path, trans_id):
1165
"""Schedule creation of a hard link"""
1166
name = self._limbo_name(trans_id)
1170
if e.errno != errno.EPERM:
1172
raise errors.HardLinkNotSupported(path)
1174
unique_add(self._new_contents, trans_id, 'file')
1176
# Clean up the file, it never got registered so
1177
# TreeTransform.finalize() won't clean it up.
1181
def create_directory(self, trans_id):
1182
"""Schedule creation of a new directory.
1184
See also new_directory.
1186
os.mkdir(self._limbo_name(trans_id))
1187
unique_add(self._new_contents, trans_id, 'directory')
1189
def create_symlink(self, target, trans_id):
1190
"""Schedule creation of a new symbolic link.
1192
target is a bytestring.
1193
See also new_symlink.
1196
os.symlink(target, self._limbo_name(trans_id))
1197
unique_add(self._new_contents, trans_id, 'symlink')
1200
path = FinalPaths(self).get_path(trans_id)
1203
raise UnableCreateSymlink(path=path)
1205
def cancel_creation(self, trans_id):
1206
"""Cancel the creation of new file contents."""
1207
del self._new_contents[trans_id]
1208
children = self._limbo_children.get(trans_id)
1209
# if this is a limbo directory with children, move them before removing
1211
if children is not None:
1212
self._rename_in_limbo(children)
1213
del self._limbo_children[trans_id]
1214
del self._limbo_children_names[trans_id]
1215
delete_any(self._limbo_name(trans_id))
1218
class TreeTransform(DiskTreeTransform):
1219
"""Represent a tree transformation.
1221
This object is designed to support incremental generation of the transform,
1224
However, it gives optimum performance when parent directories are created
1225
before their contents. The transform is then able to put child files
1226
directly in their parent directory, avoiding later renames.
1228
It is easy to produce malformed transforms, but they are generally
1229
harmless. Attempting to apply a malformed transform will cause an
1230
exception to be raised before any modifications are made to the tree.
1232
Many kinds of malformed transforms can be corrected with the
1233
resolve_conflicts function. The remaining ones indicate programming error,
1234
such as trying to create a file with no path.
1236
Two sets of file creation methods are supplied. Convenience methods are:
1241
These are composed of the low-level methods:
1243
* create_file or create_directory or create_symlink
1247
Transform/Transaction ids
1248
-------------------------
1249
trans_ids are temporary ids assigned to all files involved in a transform.
1250
It's possible, even common, that not all files in the Tree have trans_ids.
1252
trans_ids are used because filenames and file_ids are not good enough
1253
identifiers; filenames change, and not all files have file_ids. File-ids
1254
are also associated with trans-ids, so that moving a file moves its
1257
trans_ids are only valid for the TreeTransform that generated them.
1261
Limbo is a temporary directory use to hold new versions of files.
1262
Files are added to limbo by create_file, create_directory, create_symlink,
1263
and their convenience variants (new_*). Files may be removed from limbo
1264
using cancel_creation. Files are renamed from limbo into their final
1265
location as part of TreeTransform.apply
1267
Limbo must be cleaned up, by either calling TreeTransform.apply or
1268
calling TreeTransform.finalize.
1270
Files are placed into limbo inside their parent directories, where
1271
possible. This reduces subsequent renames, and makes operations involving
1272
lots of files faster. This optimization is only possible if the parent
1273
directory is created *before* creating any of its children, so avoid
1274
creating children before parents, where possible.
1278
This temporary directory is used by _FileMover for storing files that are
1279
about to be deleted. In case of rollback, the files will be restored.
1280
FileMover does not delete files until it is sure that a rollback will not
1283
def __init__(self, tree, pb=DummyProgress()):
1284
"""Note: a tree_write lock is taken on the tree.
1286
Use TreeTransform.finalize() to release the lock (can be omitted if
1287
TreeTransform.apply() called).
1289
tree.lock_tree_write()
1292
limbodir = urlutils.local_path_from_url(
1293
tree._transport.abspath('limbo'))
1297
if e.errno == errno.EEXIST:
1298
raise ExistingLimbo(limbodir)
1299
deletiondir = urlutils.local_path_from_url(
1300
tree._transport.abspath('pending-deletion'))
1302
os.mkdir(deletiondir)
1304
if e.errno == errno.EEXIST:
1305
raise errors.ExistingPendingDeletion(deletiondir)
1310
# Cache of realpath results, to speed up canonical_path
1311
self._realpaths = {}
1312
# Cache of relpath results, to speed up canonical_path
1314
DiskTreeTransform.__init__(self, tree, limbodir, pb,
1315
tree.case_sensitive)
1316
self._deletiondir = deletiondir
1318
def canonical_path(self, path):
1319
"""Get the canonical tree-relative path"""
1320
# don't follow final symlinks
1321
abs = self._tree.abspath(path)
1322
if abs in self._relpaths:
1323
return self._relpaths[abs]
1324
dirname, basename = os.path.split(abs)
1325
if dirname not in self._realpaths:
1326
self._realpaths[dirname] = os.path.realpath(dirname)
1327
dirname = self._realpaths[dirname]
1328
abs = pathjoin(dirname, basename)
1329
if dirname in self._relpaths:
1330
relpath = pathjoin(self._relpaths[dirname], basename)
1331
relpath = relpath.rstrip('/\\')
1333
relpath = self._tree.relpath(abs)
1334
self._relpaths[abs] = relpath
1337
def tree_kind(self, trans_id):
1338
"""Determine the file kind in the working tree.
1340
Raises NoSuchFile if the file does not exist
1342
path = self._tree_id_paths.get(trans_id)
1344
raise NoSuchFile(None)
1346
return file_kind(self._tree.abspath(path))
1348
if e.errno != errno.ENOENT:
1351
raise NoSuchFile(path)
1353
def _set_mode(self, trans_id, mode_id, typefunc):
1354
"""Set the mode of new file contents.
1355
The mode_id is the existing file to get the mode from (often the same
1356
as trans_id). The operation is only performed if there's a mode match
1357
according to typefunc.
1362
old_path = self._tree_id_paths[mode_id]
1366
mode = os.stat(self._tree.abspath(old_path)).st_mode
1368
if e.errno in (errno.ENOENT, errno.ENOTDIR):
1369
# Either old_path doesn't exist, or the parent of the
1370
# target is not a directory (but will be one eventually)
1371
# Either way, we know it doesn't exist *right now*
1372
# See also bug #248448
1377
os.chmod(self._limbo_name(trans_id), mode)
1379
def iter_tree_children(self, parent_id):
1380
"""Iterate through the entry's tree children, if any"""
1382
path = self._tree_id_paths[parent_id]
1386
children = os.listdir(self._tree.abspath(path))
1388
if not (osutils._is_error_enotdir(e)
1389
or e.errno in (errno.ENOENT, errno.ESRCH)):
1393
for child in children:
1394
childpath = joinpath(path, child)
1395
if self._tree.is_control_filename(childpath):
1397
yield self.trans_id_tree_path(childpath)
1399
def apply(self, no_conflicts=False, precomputed_delta=None, _mover=None):
1400
"""Apply all changes to the inventory and filesystem.
1402
If filesystem or inventory conflicts are present, MalformedTransform
1405
If apply succeeds, finalize is not necessary.
1407
:param no_conflicts: if True, the caller guarantees there are no
1408
conflicts, so no check is made.
1409
:param precomputed_delta: An inventory delta to use instead of
1411
:param _mover: Supply an alternate FileMover, for testing
1413
if not no_conflicts:
1414
self._check_malformed()
1415
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1417
if precomputed_delta is None:
1418
child_pb.update('Apply phase', 0, 2)
1419
inventory_delta = self._generate_inventory_delta()
1422
inventory_delta = precomputed_delta
1425
mover = _FileMover()
1429
child_pb.update('Apply phase', 0 + offset, 2 + offset)
1430
self._apply_removals(mover)
1431
child_pb.update('Apply phase', 1 + offset, 2 + offset)
1432
modified_paths = self._apply_insertions(mover)
1437
mover.apply_deletions()
1440
self._tree.apply_inventory_delta(inventory_delta)
1443
return _TransformResults(modified_paths, self.rename_count)
1445
def _generate_inventory_delta(self):
1446
"""Generate an inventory delta for the current transform."""
1447
inventory_delta = []
1448
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1449
new_paths = self._inventory_altered()
1450
total_entries = len(new_paths) + len(self._removed_id)
1452
for num, trans_id in enumerate(self._removed_id):
1454
child_pb.update('removing file', num, total_entries)
1455
if trans_id == self._new_root:
1456
file_id = self._tree.get_root_id()
1458
file_id = self.tree_file_id(trans_id)
1459
# File-id isn't really being deleted, just moved
1460
if file_id in self._r_new_id:
1462
path = self._tree_id_paths[trans_id]
1463
inventory_delta.append((path, None, file_id, None))
1464
new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1466
entries = self._tree.iter_entries_by_dir(
1467
new_path_file_ids.values())
1468
old_paths = dict((e.file_id, p) for p, e in entries)
1470
for num, (path, trans_id) in enumerate(new_paths):
1472
child_pb.update('adding file',
1473
num + len(self._removed_id), total_entries)
1474
file_id = new_path_file_ids[trans_id]
1479
kind = self.final_kind(trans_id)
1481
kind = self._tree.stored_kind(file_id)
1482
parent_trans_id = self.final_parent(trans_id)
1483
parent_file_id = new_path_file_ids.get(parent_trans_id)
1484
if parent_file_id is None:
1485
parent_file_id = self.final_file_id(parent_trans_id)
1486
if trans_id in self._new_reference_revision:
1487
new_entry = inventory.TreeReference(
1489
self._new_name[trans_id],
1490
self.final_file_id(self._new_parent[trans_id]),
1491
None, self._new_reference_revision[trans_id])
1493
new_entry = inventory.make_entry(kind,
1494
self.final_name(trans_id),
1495
parent_file_id, file_id)
1496
old_path = old_paths.get(new_entry.file_id)
1497
new_executability = self._new_executability.get(trans_id)
1498
if new_executability is not None:
1499
new_entry.executable = new_executability
1500
inventory_delta.append(
1501
(old_path, path, new_entry.file_id, new_entry))
1504
return inventory_delta
1506
def _apply_removals(self, mover):
1507
"""Perform tree operations that remove directory/inventory names.
1509
That is, delete files that are to be deleted, and put any files that
1510
need renaming into limbo. This must be done in strict child-to-parent
1513
If inventory_delta is None, no inventory delta generation is performed.
1515
tree_paths = list(self._tree_path_ids.iteritems())
1516
tree_paths.sort(reverse=True)
1517
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1519
for num, data in enumerate(tree_paths):
1520
path, trans_id = data
1521
child_pb.update('removing file', num, len(tree_paths))
1522
full_path = self._tree.abspath(path)
1523
if trans_id in self._removed_contents:
1524
mover.pre_delete(full_path, os.path.join(self._deletiondir,
1526
elif trans_id in self._new_name or trans_id in \
1529
mover.rename(full_path, self._limbo_name(trans_id))
1531
if e.errno != errno.ENOENT:
1534
self.rename_count += 1
1538
def _apply_insertions(self, mover):
1539
"""Perform tree operations that insert directory/inventory names.
1541
That is, create any files that need to be created, and restore from
1542
limbo any files that needed renaming. This must be done in strict
1543
parent-to-child order.
1545
If inventory_delta is None, no inventory delta is calculated, and
1546
no list of modified paths is returned.
1548
new_paths = self.new_paths(filesystem_only=True)
1550
new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1552
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1554
for num, (path, trans_id) in enumerate(new_paths):
1556
child_pb.update('adding file', num, len(new_paths))
1557
full_path = self._tree.abspath(path)
1558
if trans_id in self._needs_rename:
1560
mover.rename(self._limbo_name(trans_id), full_path)
1562
# We may be renaming a dangling inventory id
1563
if e.errno != errno.ENOENT:
1566
self.rename_count += 1
1567
if (trans_id in self._new_contents or
1568
self.path_changed(trans_id)):
1569
if trans_id in self._new_contents:
1570
modified_paths.append(full_path)
1571
if trans_id in self._new_executability:
1572
self._set_executability(path, trans_id)
1575
self._new_contents.clear()
1576
return modified_paths
1579
class TransformPreview(DiskTreeTransform):
1580
"""A TreeTransform for generating preview trees.
1582
Unlike TreeTransform, this version works when the input tree is a
1583
RevisionTree, rather than a WorkingTree. As a result, it tends to ignore
1584
unversioned files in the input tree.
1587
def __init__(self, tree, pb=DummyProgress(), case_sensitive=True):
1589
limbodir = osutils.mkdtemp(prefix='bzr-limbo-')
1590
DiskTreeTransform.__init__(self, tree, limbodir, pb, case_sensitive)
1592
def canonical_path(self, path):
1595
def tree_kind(self, trans_id):
1596
path = self._tree_id_paths.get(trans_id)
1598
raise NoSuchFile(None)
1599
file_id = self._tree.path2id(path)
1600
return self._tree.kind(file_id)
1602
def _set_mode(self, trans_id, mode_id, typefunc):
1603
"""Set the mode of new file contents.
1604
The mode_id is the existing file to get the mode from (often the same
1605
as trans_id). The operation is only performed if there's a mode match
1606
according to typefunc.
1608
# is it ok to ignore this? probably
1611
def iter_tree_children(self, parent_id):
1612
"""Iterate through the entry's tree children, if any"""
1614
path = self._tree_id_paths[parent_id]
1617
file_id = self.tree_file_id(parent_id)
1620
entry = self._tree.iter_entries_by_dir([file_id]).next()[1]
1621
children = getattr(entry, 'children', {})
1622
for child in children:
1623
childpath = joinpath(path, child)
1624
yield self.trans_id_tree_path(childpath)
1627
class _PreviewTree(tree.Tree):
1628
"""Partial implementation of Tree to support show_diff_trees"""
1630
def __init__(self, transform):
1631
self._transform = transform
1632
self._final_paths = FinalPaths(transform)
1633
self.__by_parent = None
1634
self._parent_ids = []
1635
self._all_children_cache = {}
1636
self._path2trans_id_cache = {}
1637
self._final_name_cache = {}
1639
def _changes(self, file_id):
1640
for changes in self._transform.iter_changes():
1641
if changes[0] == file_id:
1644
def _content_change(self, file_id):
1645
"""Return True if the content of this file changed"""
1646
changes = self._changes(file_id)
1647
# changes[2] is true if the file content changed. See
1648
# InterTree.iter_changes.
1649
return (changes is not None and changes[2])
1651
def _get_repository(self):
1652
repo = getattr(self._transform._tree, '_repository', None)
1654
repo = self._transform._tree.branch.repository
1657
def _iter_parent_trees(self):
1658
for revision_id in self.get_parent_ids():
1660
yield self.revision_tree(revision_id)
1661
except errors.NoSuchRevisionInTree:
1662
yield self._get_repository().revision_tree(revision_id)
1664
def _get_file_revision(self, file_id, vf, tree_revision):
1665
parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
1666
self._iter_parent_trees()]
1667
vf.add_lines((file_id, tree_revision), parent_keys,
1668
self.get_file(file_id).readlines())
1669
repo = self._get_repository()
1670
base_vf = repo.texts
1671
if base_vf not in vf.fallback_versionedfiles:
1672
vf.fallback_versionedfiles.append(base_vf)
1673
return tree_revision
1675
def _stat_limbo_file(self, file_id):
1676
trans_id = self._transform.trans_id_file_id(file_id)
1677
name = self._transform._limbo_name(trans_id)
1678
return os.lstat(name)
1681
def _by_parent(self):
1682
if self.__by_parent is None:
1683
self.__by_parent = self._transform.by_parent()
1684
return self.__by_parent
1686
def _comparison_data(self, entry, path):
1687
kind, size, executable, link_or_sha1 = self.path_content_summary(path)
1688
if kind == 'missing':
1692
file_id = self._transform.final_file_id(self._path2trans_id(path))
1693
executable = self.is_executable(file_id, path)
1694
return kind, executable, None
1696
def lock_read(self):
1697
# Perhaps in theory, this should lock the TreeTransform?
1704
def inventory(self):
1705
"""This Tree does not use inventory as its backing data."""
1706
raise NotImplementedError(_PreviewTree.inventory)
1708
def get_root_id(self):
1709
return self._transform.final_file_id(self._transform.root)
1711
def all_file_ids(self):
1712
tree_ids = set(self._transform._tree.all_file_ids())
1713
tree_ids.difference_update(self._transform.tree_file_id(t)
1714
for t in self._transform._removed_id)
1715
tree_ids.update(self._transform._new_id.values())
1719
return iter(self.all_file_ids())
1721
def has_id(self, file_id):
1722
if file_id in self._transform._r_new_id:
1724
elif file_id in set([self._transform.tree_file_id(trans_id) for
1725
trans_id in self._transform._removed_id]):
1728
return self._transform._tree.has_id(file_id)
1730
def _path2trans_id(self, path):
1731
# We must not use None here, because that is a valid value to store.
1732
trans_id = self._path2trans_id_cache.get(path, object)
1733
if trans_id is not object:
1735
segments = splitpath(path)
1736
cur_parent = self._transform.root
1737
for cur_segment in segments:
1738
for child in self._all_children(cur_parent):
1739
final_name = self._final_name_cache.get(child)
1740
if final_name is None:
1741
final_name = self._transform.final_name(child)
1742
self._final_name_cache[child] = final_name
1743
if final_name == cur_segment:
1747
self._path2trans_id_cache[path] = None
1749
self._path2trans_id_cache[path] = cur_parent
1752
def path2id(self, path):
1753
return self._transform.final_file_id(self._path2trans_id(path))
1755
def id2path(self, file_id):
1756
trans_id = self._transform.trans_id_file_id(file_id)
1758
return self._final_paths._determine_path(trans_id)
1760
raise errors.NoSuchId(self, file_id)
1762
def _all_children(self, trans_id):
1763
children = self._all_children_cache.get(trans_id)
1764
if children is not None:
1766
children = set(self._transform.iter_tree_children(trans_id))
1767
# children in the _new_parent set are provided by _by_parent.
1768
children.difference_update(self._transform._new_parent.keys())
1769
children.update(self._by_parent.get(trans_id, []))
1770
self._all_children_cache[trans_id] = children
1773
def iter_children(self, file_id):
1774
trans_id = self._transform.trans_id_file_id(file_id)
1775
for child_trans_id in self._all_children(trans_id):
1776
yield self._transform.final_file_id(child_trans_id)
1779
possible_extras = set(self._transform.trans_id_tree_path(p) for p
1780
in self._transform._tree.extras())
1781
possible_extras.update(self._transform._new_contents)
1782
possible_extras.update(self._transform._removed_id)
1783
for trans_id in possible_extras:
1784
if self._transform.final_file_id(trans_id) is None:
1785
yield self._final_paths._determine_path(trans_id)
1787
def _make_inv_entries(self, ordered_entries, specific_file_ids=None):
1788
for trans_id, parent_file_id in ordered_entries:
1789
file_id = self._transform.final_file_id(trans_id)
1792
if (specific_file_ids is not None
1793
and file_id not in specific_file_ids):
1796
kind = self._transform.final_kind(trans_id)
1798
kind = self._transform._tree.stored_kind(file_id)
1799
new_entry = inventory.make_entry(
1801
self._transform.final_name(trans_id),
1802
parent_file_id, file_id)
1803
yield new_entry, trans_id
1805
def _list_files_by_dir(self):
1806
todo = [ROOT_PARENT]
1808
while len(todo) > 0:
1810
parent_file_id = self._transform.final_file_id(parent)
1811
children = list(self._all_children(parent))
1812
paths = dict(zip(children, self._final_paths.get_paths(children)))
1813
children.sort(key=paths.get)
1814
todo.extend(reversed(children))
1815
for trans_id in children:
1816
ordered_ids.append((trans_id, parent_file_id))
1819
def iter_entries_by_dir(self, specific_file_ids=None):
1820
# This may not be a maximally efficient implementation, but it is
1821
# reasonably straightforward. An implementation that grafts the
1822
# TreeTransform changes onto the tree's iter_entries_by_dir results
1823
# might be more efficient, but requires tricky inferences about stack
1825
ordered_ids = self._list_files_by_dir()
1826
for entry, trans_id in self._make_inv_entries(ordered_ids,
1828
yield unicode(self._final_paths.get_path(trans_id)), entry
1830
def _iter_entries_for_dir(self, dir_path):
1831
"""Return path, entry for items in a directory without recursing down."""
1832
dir_file_id = self.path2id(dir_path)
1834
for file_id in self.iter_children(dir_file_id):
1835
trans_id = self._transform.trans_id_file_id(file_id)
1836
ordered_ids.append((trans_id, file_id))
1837
for entry, trans_id in self._make_inv_entries(ordered_ids):
1838
yield unicode(self._final_paths.get_path(trans_id)), entry
1840
def list_files(self, include_root=False, from_dir=None, recursive=True):
1841
"""See WorkingTree.list_files."""
1842
# XXX This should behave like WorkingTree.list_files, but is really
1843
# more like RevisionTree.list_files.
1847
prefix = from_dir + '/'
1848
entries = self.iter_entries_by_dir()
1849
for path, entry in entries:
1850
if entry.name == '' and not include_root:
1853
if not path.startswith(prefix):
1855
path = path[len(prefix):]
1856
yield path, 'V', entry.kind, entry.file_id, entry
1858
if from_dir is None and include_root is True:
1859
root_entry = inventory.make_entry('directory', '',
1860
ROOT_PARENT, self.get_root_id())
1861
yield '', 'V', 'directory', root_entry.file_id, root_entry
1862
entries = self._iter_entries_for_dir(from_dir or '')
1863
for path, entry in entries:
1864
yield path, 'V', entry.kind, entry.file_id, entry
1866
def kind(self, file_id):
1867
trans_id = self._transform.trans_id_file_id(file_id)
1868
return self._transform.final_kind(trans_id)
1870
def stored_kind(self, file_id):
1871
trans_id = self._transform.trans_id_file_id(file_id)
1873
return self._transform._new_contents[trans_id]
1875
return self._transform._tree.stored_kind(file_id)
1877
def get_file_mtime(self, file_id, path=None):
1878
"""See Tree.get_file_mtime"""
1879
if not self._content_change(file_id):
1880
return self._transform._tree.get_file_mtime(file_id, path)
1881
return self._stat_limbo_file(file_id).st_mtime
1883
def _file_size(self, entry, stat_value):
1884
return self.get_file_size(entry.file_id)
1886
def get_file_size(self, file_id):
1887
"""See Tree.get_file_size"""
1888
if self.kind(file_id) == 'file':
1889
return self._transform._tree.get_file_size(file_id)
1893
def get_file_sha1(self, file_id, path=None, stat_value=None):
1894
trans_id = self._transform.trans_id_file_id(file_id)
1895
kind = self._transform._new_contents.get(trans_id)
1897
return self._transform._tree.get_file_sha1(file_id)
1899
fileobj = self.get_file(file_id)
1901
return sha_file(fileobj)
1905
def is_executable(self, file_id, path=None):
1908
trans_id = self._transform.trans_id_file_id(file_id)
1910
return self._transform._new_executability[trans_id]
1913
return self._transform._tree.is_executable(file_id, path)
1915
if e.errno == errno.ENOENT:
1918
except errors.NoSuchId:
1921
def path_content_summary(self, path):
1922
trans_id = self._path2trans_id(path)
1923
tt = self._transform
1924
tree_path = tt._tree_id_paths.get(trans_id)
1925
kind = tt._new_contents.get(trans_id)
1927
if tree_path is None or trans_id in tt._removed_contents:
1928
return 'missing', None, None, None
1929
summary = tt._tree.path_content_summary(tree_path)
1930
kind, size, executable, link_or_sha1 = summary
1933
limbo_name = tt._limbo_name(trans_id)
1934
if trans_id in tt._new_reference_revision:
1935
kind = 'tree-reference'
1937
statval = os.lstat(limbo_name)
1938
size = statval.st_size
1939
if not supports_executable():
1942
executable = statval.st_mode & S_IEXEC
1946
if kind == 'symlink':
1947
link_or_sha1 = os.readlink(limbo_name).decode(osutils._fs_enc)
1948
if supports_executable():
1949
executable = tt._new_executability.get(trans_id, executable)
1950
return kind, size, executable, link_or_sha1
1952
def iter_changes(self, from_tree, include_unchanged=False,
1953
specific_files=None, pb=None, extra_trees=None,
1954
require_versioned=True, want_unversioned=False):
1955
"""See InterTree.iter_changes.
1957
This has a fast path that is only used when the from_tree matches
1958
the transform tree, and no fancy options are supplied.
1960
if (from_tree is not self._transform._tree or include_unchanged or
1961
specific_files or want_unversioned):
1962
return tree.InterTree(from_tree, self).iter_changes(
1963
include_unchanged=include_unchanged,
1964
specific_files=specific_files,
1966
extra_trees=extra_trees,
1967
require_versioned=require_versioned,
1968
want_unversioned=want_unversioned)
1969
if want_unversioned:
1970
raise ValueError('want_unversioned is not supported')
1971
return self._transform.iter_changes()
1973
def get_file(self, file_id, path=None):
1974
"""See Tree.get_file"""
1975
if not self._content_change(file_id):
1976
return self._transform._tree.get_file(file_id, path)
1977
trans_id = self._transform.trans_id_file_id(file_id)
1978
name = self._transform._limbo_name(trans_id)
1979
return open(name, 'rb')
1981
def get_file_with_stat(self, file_id, path=None):
1982
return self.get_file(file_id, path), None
1984
def annotate_iter(self, file_id,
1985
default_revision=_mod_revision.CURRENT_REVISION):
1986
changes = self._changes(file_id)
1990
changed_content, versioned, kind = (changes[2], changes[3],
1994
get_old = (kind[0] == 'file' and versioned[0])
1996
old_annotation = self._transform._tree.annotate_iter(file_id,
1997
default_revision=default_revision)
2001
return old_annotation
2002
if not changed_content:
2003
return old_annotation
2004
# TODO: This is doing something similar to what WT.annotate_iter is
2005
# doing, however it fails slightly because it doesn't know what
2006
# the *other* revision_id is, so it doesn't know how to give the
2007
# other as the origin for some lines, they all get
2008
# 'default_revision'
2009
# It would be nice to be able to use the new Annotator based
2010
# approach, as well.
2011
return annotate.reannotate([old_annotation],
2012
self.get_file(file_id).readlines(),
2015
def get_symlink_target(self, file_id):
2016
"""See Tree.get_symlink_target"""
2017
if not self._content_change(file_id):
2018
return self._transform._tree.get_symlink_target(file_id)
2019
trans_id = self._transform.trans_id_file_id(file_id)
2020
name = self._transform._limbo_name(trans_id)
2021
return osutils.readlink(name)
2023
def walkdirs(self, prefix=''):
2024
pending = [self._transform.root]
2025
while len(pending) > 0:
2026
parent_id = pending.pop()
2029
prefix = prefix.rstrip('/')
2030
parent_path = self._final_paths.get_path(parent_id)
2031
parent_file_id = self._transform.final_file_id(parent_id)
2032
for child_id in self._all_children(parent_id):
2033
path_from_root = self._final_paths.get_path(child_id)
2034
basename = self._transform.final_name(child_id)
2035
file_id = self._transform.final_file_id(child_id)
2037
kind = self._transform.final_kind(child_id)
2038
versioned_kind = kind
2041
versioned_kind = self._transform._tree.stored_kind(file_id)
2042
if versioned_kind == 'directory':
2043
subdirs.append(child_id)
2044
children.append((path_from_root, basename, kind, None,
2045
file_id, versioned_kind))
2047
if parent_path.startswith(prefix):
2048
yield (parent_path, parent_file_id), children
2049
pending.extend(sorted(subdirs, key=self._final_paths.get_path,
2052
def get_parent_ids(self):
2053
return self._parent_ids
2055
def set_parent_ids(self, parent_ids):
2056
self._parent_ids = parent_ids
2058
def get_revision_tree(self, revision_id):
2059
return self._transform._tree.get_revision_tree(revision_id)
2062
def joinpath(parent, child):
2063
"""Join tree-relative paths, handling the tree root specially"""
2064
if parent is None or parent == "":
2067
return pathjoin(parent, child)
2070
class FinalPaths(object):
2071
"""Make path calculation cheap by memoizing paths.
2073
The underlying tree must not be manipulated between calls, or else
2074
the results will likely be incorrect.
2076
def __init__(self, transform):
2077
object.__init__(self)
2078
self._known_paths = {}
2079
self.transform = transform
2081
def _determine_path(self, trans_id):
2082
if trans_id == self.transform.root:
2084
name = self.transform.final_name(trans_id)
2085
parent_id = self.transform.final_parent(trans_id)
2086
if parent_id == self.transform.root:
2089
return pathjoin(self.get_path(parent_id), name)
2091
def get_path(self, trans_id):
2092
"""Find the final path associated with a trans_id"""
2093
if trans_id not in self._known_paths:
2094
self._known_paths[trans_id] = self._determine_path(trans_id)
2095
return self._known_paths[trans_id]
2097
def get_paths(self, trans_ids):
2098
return [(self.get_path(t), t) for t in trans_ids]
2102
def topology_sorted_ids(tree):
2103
"""Determine the topological order of the ids in a tree"""
2104
file_ids = list(tree)
2105
file_ids.sort(key=tree.id2path)
2109
def build_tree(tree, wt, accelerator_tree=None, hardlink=False,
2110
delta_from_tree=False):
2111
"""Create working tree for a branch, using a TreeTransform.
2113
This function should be used on empty trees, having a tree root at most.
2114
(see merge and revert functionality for working with existing trees)
2116
Existing files are handled like so:
2118
- Existing bzrdirs take precedence over creating new items. They are
2119
created as '%s.diverted' % name.
2120
- Otherwise, if the content on disk matches the content we are building,
2121
it is silently replaced.
2122
- Otherwise, conflict resolution will move the old file to 'oldname.moved'.
2124
:param tree: The tree to convert wt into a copy of
2125
:param wt: The working tree that files will be placed into
2126
:param accelerator_tree: A tree which can be used for retrieving file
2127
contents more quickly than tree itself, i.e. a workingtree. tree
2128
will be used for cases where accelerator_tree's content is different.
2129
:param hardlink: If true, hard-link files to accelerator_tree, where
2130
possible. accelerator_tree must implement abspath, i.e. be a
2132
:param delta_from_tree: If true, build_tree may use the input Tree to
2133
generate the inventory delta.
2135
wt.lock_tree_write()
2139
if accelerator_tree is not None:
2140
accelerator_tree.lock_read()
2142
return _build_tree(tree, wt, accelerator_tree, hardlink,
2145
if accelerator_tree is not None:
2146
accelerator_tree.unlock()
2153
def _build_tree(tree, wt, accelerator_tree, hardlink, delta_from_tree):
2154
"""See build_tree."""
2155
for num, _unused in enumerate(wt.all_file_ids()):
2156
if num > 0: # more than just a root
2157
raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir)
2158
existing_files = set()
2159
for dir, files in wt.walkdirs():
2160
existing_files.update(f[0] for f in files)
2162
top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2163
pp = ProgressPhase("Build phase", 2, top_pb)
2164
if tree.inventory.root is not None:
2165
# This is kind of a hack: we should be altering the root
2166
# as part of the regular tree shape diff logic.
2167
# The conditional test here is to avoid doing an
2168
# expensive operation (flush) every time the root id
2169
# is set within the tree, nor setting the root and thus
2170
# marking the tree as dirty, because we use two different
2171
# idioms here: tree interfaces and inventory interfaces.
2172
if wt.get_root_id() != tree.get_root_id():
2173
wt.set_root_id(tree.get_root_id())
2175
tt = TreeTransform(wt)
2179
file_trans_id[wt.get_root_id()] = \
2180
tt.trans_id_tree_file_id(wt.get_root_id())
2181
pb = bzrlib.ui.ui_factory.nested_progress_bar()
2183
deferred_contents = []
2185
total = len(tree.inventory)
2187
precomputed_delta = []
2189
precomputed_delta = None
2190
for num, (tree_path, entry) in \
2191
enumerate(tree.inventory.iter_entries_by_dir()):
2192
pb.update("Building tree", num - len(deferred_contents), total)
2193
if entry.parent_id is None:
2196
file_id = entry.file_id
2198
precomputed_delta.append((None, tree_path, file_id, entry))
2199
if tree_path in existing_files:
2200
target_path = wt.abspath(tree_path)
2201
kind = file_kind(target_path)
2202
if kind == "directory":
2204
bzrdir.BzrDir.open(target_path)
2205
except errors.NotBranchError:
2209
if (file_id not in divert and
2210
_content_match(tree, entry, file_id, kind,
2212
tt.delete_contents(tt.trans_id_tree_path(tree_path))
2213
if kind == 'directory':
2215
parent_id = file_trans_id[entry.parent_id]
2216
if entry.kind == 'file':
2217
# We *almost* replicate new_by_entry, so that we can defer
2218
# getting the file text, and get them all at once.
2219
trans_id = tt.create_path(entry.name, parent_id)
2220
file_trans_id[file_id] = trans_id
2221
tt.version_file(file_id, trans_id)
2222
executable = tree.is_executable(file_id, tree_path)
2224
tt.set_executability(executable, trans_id)
2225
trans_data = (trans_id, tree_path)
2226
deferred_contents.append((file_id, trans_data))
2228
file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
2231
new_trans_id = file_trans_id[file_id]
2232
old_parent = tt.trans_id_tree_path(tree_path)
2233
_reparent_children(tt, old_parent, new_trans_id)
2234
offset = num + 1 - len(deferred_contents)
2235
_create_files(tt, tree, deferred_contents, pb, offset,
2236
accelerator_tree, hardlink)
2240
divert_trans = set(file_trans_id[f] for f in divert)
2241
resolver = lambda t, c: resolve_checkout(t, c, divert_trans)
2242
raw_conflicts = resolve_conflicts(tt, pass_func=resolver)
2243
if len(raw_conflicts) > 0:
2244
precomputed_delta = None
2245
conflicts = cook_conflicts(raw_conflicts, tt)
2246
for conflict in conflicts:
2249
wt.add_conflicts(conflicts)
2250
except errors.UnsupportedOperation:
2252
result = tt.apply(no_conflicts=True,
2253
precomputed_delta=precomputed_delta)
2260
def _create_files(tt, tree, desired_files, pb, offset, accelerator_tree,
2262
total = len(desired_files) + offset
2264
if accelerator_tree is None:
2265
new_desired_files = desired_files
2267
iter = accelerator_tree.iter_changes(tree, include_unchanged=True)
2268
unchanged = dict((f, p[1]) for (f, p, c, v, d, n, k, e)
2269
in iter if not (c or e[0] != e[1]))
2270
new_desired_files = []
2272
for file_id, (trans_id, tree_path) in desired_files:
2273
accelerator_path = unchanged.get(file_id)
2274
if accelerator_path is None:
2275
new_desired_files.append((file_id, (trans_id, tree_path)))
2277
pb.update('Adding file contents', count + offset, total)
2279
tt.create_hardlink(accelerator_tree.abspath(accelerator_path),
2282
contents = accelerator_tree.get_file(file_id, accelerator_path)
2283
if wt.supports_content_filtering():
2284
filters = wt._content_filter_stack(tree_path)
2285
contents = filtered_output_bytes(contents, filters,
2286
ContentFilterContext(tree_path, tree))
2288
tt.create_file(contents, trans_id)
2292
except AttributeError:
2293
# after filtering, contents may no longer be file-like
2297
for count, ((trans_id, tree_path), contents) in enumerate(
2298
tree.iter_files_bytes(new_desired_files)):
2299
if wt.supports_content_filtering():
2300
filters = wt._content_filter_stack(tree_path)
2301
contents = filtered_output_bytes(contents, filters,
2302
ContentFilterContext(tree_path, tree))
2303
tt.create_file(contents, trans_id)
2304
pb.update('Adding file contents', count + offset, total)
2307
def _reparent_children(tt, old_parent, new_parent):
2308
for child in tt.iter_tree_children(old_parent):
2309
tt.adjust_path(tt.final_name(child), new_parent, child)
2311
def _reparent_transform_children(tt, old_parent, new_parent):
2312
by_parent = tt.by_parent()
2313
for child in by_parent[old_parent]:
2314
tt.adjust_path(tt.final_name(child), new_parent, child)
2315
return by_parent[old_parent]
2317
def _content_match(tree, entry, file_id, kind, target_path):
2318
if entry.kind != kind:
2320
if entry.kind == "directory":
2322
if entry.kind == "file":
2323
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2325
elif entry.kind == "symlink":
2326
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2331
def resolve_checkout(tt, conflicts, divert):
2332
new_conflicts = set()
2333
for c_type, conflict in ((c[0], c) for c in conflicts):
2334
# Anything but a 'duplicate' would indicate programmer error
2335
if c_type != 'duplicate':
2336
raise AssertionError(c_type)
2337
# Now figure out which is new and which is old
2338
if tt.new_contents(conflict[1]):
2339
new_file = conflict[1]
2340
old_file = conflict[2]
2342
new_file = conflict[2]
2343
old_file = conflict[1]
2345
# We should only get here if the conflict wasn't completely
2347
final_parent = tt.final_parent(old_file)
2348
if new_file in divert:
2349
new_name = tt.final_name(old_file)+'.diverted'
2350
tt.adjust_path(new_name, final_parent, new_file)
2351
new_conflicts.add((c_type, 'Diverted to',
2352
new_file, old_file))
2354
new_name = tt.final_name(old_file)+'.moved'
2355
tt.adjust_path(new_name, final_parent, old_file)
2356
new_conflicts.add((c_type, 'Moved existing file to',
2357
old_file, new_file))
2358
return new_conflicts
2361
def new_by_entry(tt, entry, parent_id, tree):
2362
"""Create a new file according to its inventory entry"""
2366
contents = tree.get_file(entry.file_id).readlines()
2367
executable = tree.is_executable(entry.file_id)
2368
return tt.new_file(name, parent_id, contents, entry.file_id,
2370
elif kind in ('directory', 'tree-reference'):
2371
trans_id = tt.new_directory(name, parent_id, entry.file_id)
2372
if kind == 'tree-reference':
2373
tt.set_tree_reference(entry.reference_revision, trans_id)
2375
elif kind == 'symlink':
2376
target = tree.get_symlink_target(entry.file_id)
2377
return tt.new_symlink(name, parent_id, target, entry.file_id)
2379
raise errors.BadFileKindError(name, kind)
2382
@deprecated_function(deprecated_in((1, 9, 0)))
2383
def create_by_entry(tt, entry, tree, trans_id, lines=None, mode_id=None):
2384
"""Create new file contents according to an inventory entry.
2386
DEPRECATED. Use create_from_tree instead.
2388
if entry.kind == "file":
2390
lines = tree.get_file(entry.file_id).readlines()
2391
tt.create_file(lines, trans_id, mode_id=mode_id)
2392
elif entry.kind == "symlink":
2393
tt.create_symlink(tree.get_symlink_target(entry.file_id), trans_id)
2394
elif entry.kind == "directory":
2395
tt.create_directory(trans_id)
2398
def create_from_tree(tt, trans_id, tree, file_id, bytes=None):
2399
"""Create new file contents according to tree contents."""
2400
kind = tree.kind(file_id)
2401
if kind == 'directory':
2402
tt.create_directory(trans_id)
2403
elif kind == "file":
2405
tree_file = tree.get_file(file_id)
2407
bytes = tree_file.readlines()
2410
tt.create_file(bytes, trans_id)
2411
elif kind == "symlink":
2412
tt.create_symlink(tree.get_symlink_target(file_id), trans_id)
2414
raise AssertionError('Unknown kind %r' % kind)
2417
def create_entry_executability(tt, entry, trans_id):
2418
"""Set the executability of a trans_id according to an inventory entry"""
2419
if entry.kind == "file":
2420
tt.set_executability(entry.executable, trans_id)
2423
def get_backup_name(entry, by_parent, parent_trans_id, tt):
2424
return _get_backup_name(entry.name, by_parent, parent_trans_id, tt)
2427
def _get_backup_name(name, by_parent, parent_trans_id, tt):
2428
"""Produce a backup-style name that appears to be available"""
2432
yield "%s.~%d~" % (name, counter)
2434
for new_name in name_gen():
2435
if not tt.has_named_child(by_parent, parent_trans_id, new_name):
2439
def _entry_changes(file_id, entry, working_tree):
2440
"""Determine in which ways the inventory entry has changed.
2442
Returns booleans: has_contents, content_mod, meta_mod
2443
has_contents means there are currently contents, but they differ
2444
contents_mod means contents need to be modified
2445
meta_mod means the metadata needs to be modified
2447
cur_entry = working_tree.inventory[file_id]
2449
working_kind = working_tree.kind(file_id)
2452
has_contents = False
2455
if has_contents is True:
2456
if entry.kind != working_kind:
2457
contents_mod, meta_mod = True, False
2459
cur_entry._read_tree_state(working_tree.id2path(file_id),
2461
contents_mod, meta_mod = entry.detect_changes(cur_entry)
2462
cur_entry._forget_tree_state()
2463
return has_contents, contents_mod, meta_mod
2466
def revert(working_tree, target_tree, filenames, backups=False,
2467
pb=DummyProgress(), change_reporter=None):
2468
"""Revert a working tree's contents to those of a target tree."""
2469
target_tree.lock_read()
2470
tt = TreeTransform(working_tree, pb)
2472
pp = ProgressPhase("Revert phase", 3, pb)
2473
conflicts, merge_modified = _prepare_revert_transform(
2474
working_tree, target_tree, tt, filenames, backups, pp)
2476
change_reporter = delta._ChangeReporter(
2477
unversioned_filter=working_tree.is_ignored)
2478
delta.report_changes(tt.iter_changes(), change_reporter)
2479
for conflict in conflicts:
2483
working_tree.set_merge_modified(merge_modified)
2485
target_tree.unlock()
2491
def _prepare_revert_transform(working_tree, target_tree, tt, filenames,
2492
backups, pp, basis_tree=None,
2493
merge_modified=None):
2495
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2497
if merge_modified is None:
2498
merge_modified = working_tree.merge_modified()
2499
merge_modified = _alter_files(working_tree, target_tree, tt,
2500
child_pb, filenames, backups,
2501
merge_modified, basis_tree)
2505
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2507
raw_conflicts = resolve_conflicts(tt, child_pb,
2508
lambda t, c: conflict_pass(t, c, target_tree))
2511
conflicts = cook_conflicts(raw_conflicts, tt)
2512
return conflicts, merge_modified
2515
def _alter_files(working_tree, target_tree, tt, pb, specific_files,
2516
backups, merge_modified, basis_tree=None):
2517
if basis_tree is not None:
2518
basis_tree.lock_read()
2519
change_list = target_tree.iter_changes(working_tree,
2520
specific_files=specific_files, pb=pb)
2521
if target_tree.get_root_id() is None:
2527
for id_num, (file_id, path, changed_content, versioned, parent, name,
2528
kind, executable) in enumerate(change_list):
2529
if skip_root and file_id[0] is not None and parent[0] is None:
2531
trans_id = tt.trans_id_file_id(file_id)
2534
keep_content = False
2535
if kind[0] == 'file' and (backups or kind[1] is None):
2536
wt_sha1 = working_tree.get_file_sha1(file_id)
2537
if merge_modified.get(file_id) != wt_sha1:
2538
# acquire the basis tree lazily to prevent the
2539
# expense of accessing it when it's not needed ?
2540
# (Guessing, RBC, 200702)
2541
if basis_tree is None:
2542
basis_tree = working_tree.basis_tree()
2543
basis_tree.lock_read()
2544
if file_id in basis_tree:
2545
if wt_sha1 != basis_tree.get_file_sha1(file_id):
2547
elif kind[1] is None and not versioned[1]:
2549
if kind[0] is not None:
2550
if not keep_content:
2551
tt.delete_contents(trans_id)
2552
elif kind[1] is not None:
2553
parent_trans_id = tt.trans_id_file_id(parent[0])
2554
by_parent = tt.by_parent()
2555
backup_name = _get_backup_name(name[0], by_parent,
2556
parent_trans_id, tt)
2557
tt.adjust_path(backup_name, parent_trans_id, trans_id)
2558
new_trans_id = tt.create_path(name[0], parent_trans_id)
2559
if versioned == (True, True):
2560
tt.unversion_file(trans_id)
2561
tt.version_file(file_id, new_trans_id)
2562
# New contents should have the same unix perms as old
2565
trans_id = new_trans_id
2566
if kind[1] in ('directory', 'tree-reference'):
2567
tt.create_directory(trans_id)
2568
if kind[1] == 'tree-reference':
2569
revision = target_tree.get_reference_revision(file_id,
2571
tt.set_tree_reference(revision, trans_id)
2572
elif kind[1] == 'symlink':
2573
tt.create_symlink(target_tree.get_symlink_target(file_id),
2575
elif kind[1] == 'file':
2576
deferred_files.append((file_id, (trans_id, mode_id)))
2577
if basis_tree is None:
2578
basis_tree = working_tree.basis_tree()
2579
basis_tree.lock_read()
2580
new_sha1 = target_tree.get_file_sha1(file_id)
2581
if (file_id in basis_tree and new_sha1 ==
2582
basis_tree.get_file_sha1(file_id)):
2583
if file_id in merge_modified:
2584
del merge_modified[file_id]
2586
merge_modified[file_id] = new_sha1
2588
# preserve the execute bit when backing up
2589
if keep_content and executable[0] == executable[1]:
2590
tt.set_executability(executable[1], trans_id)
2591
elif kind[1] is not None:
2592
raise AssertionError(kind[1])
2593
if versioned == (False, True):
2594
tt.version_file(file_id, trans_id)
2595
if versioned == (True, False):
2596
tt.unversion_file(trans_id)
2597
if (name[1] is not None and
2598
(name[0] != name[1] or parent[0] != parent[1])):
2599
if name[1] == '' and parent[1] is None:
2600
parent_trans = ROOT_PARENT
2602
parent_trans = tt.trans_id_file_id(parent[1])
2603
tt.adjust_path(name[1], parent_trans, trans_id)
2604
if executable[0] != executable[1] and kind[1] == "file":
2605
tt.set_executability(executable[1], trans_id)
2606
for (trans_id, mode_id), bytes in target_tree.iter_files_bytes(
2608
tt.create_file(bytes, trans_id, mode_id)
2610
if basis_tree is not None:
2612
return merge_modified
2615
def resolve_conflicts(tt, pb=DummyProgress(), pass_func=None):
2616
"""Make many conflict-resolution attempts, but die if they fail"""
2617
if pass_func is None:
2618
pass_func = conflict_pass
2619
new_conflicts = set()
2622
pb.update('Resolution pass', n+1, 10)
2623
conflicts = tt.find_conflicts()
2624
if len(conflicts) == 0:
2625
return new_conflicts
2626
new_conflicts.update(pass_func(tt, conflicts))
2627
raise MalformedTransform(conflicts=conflicts)
2632
def conflict_pass(tt, conflicts, path_tree=None):
2633
"""Resolve some classes of conflicts.
2635
:param tt: The transform to resolve conflicts in
2636
:param conflicts: The conflicts to resolve
2637
:param path_tree: A Tree to get supplemental paths from
2639
new_conflicts = set()
2640
for c_type, conflict in ((c[0], c) for c in conflicts):
2641
if c_type == 'duplicate id':
2642
tt.unversion_file(conflict[1])
2643
new_conflicts.add((c_type, 'Unversioned existing file',
2644
conflict[1], conflict[2], ))
2645
elif c_type == 'duplicate':
2646
# files that were renamed take precedence
2647
final_parent = tt.final_parent(conflict[1])
2648
if tt.path_changed(conflict[1]):
2649
existing_file, new_file = conflict[2], conflict[1]
2651
existing_file, new_file = conflict[1], conflict[2]
2652
new_name = tt.final_name(existing_file)+'.moved'
2653
tt.adjust_path(new_name, final_parent, existing_file)
2654
new_conflicts.add((c_type, 'Moved existing file to',
2655
existing_file, new_file))
2656
elif c_type == 'parent loop':
2657
# break the loop by undoing one of the ops that caused the loop
2659
while not tt.path_changed(cur):
2660
cur = tt.final_parent(cur)
2661
new_conflicts.add((c_type, 'Cancelled move', cur,
2662
tt.final_parent(cur),))
2663
tt.adjust_path(tt.final_name(cur), tt.get_tree_parent(cur), cur)
2665
elif c_type == 'missing parent':
2666
trans_id = conflict[1]
2668
tt.cancel_deletion(trans_id)
2669
new_conflicts.add(('deleting parent', 'Not deleting',
2674
tt.final_name(trans_id)
2676
if path_tree is not None:
2677
file_id = tt.final_file_id(trans_id)
2679
file_id = tt.inactive_file_id(trans_id)
2680
entry = path_tree.inventory[file_id]
2681
# special-case the other tree root (move its
2682
# children to current root)
2683
if entry.parent_id is None:
2685
moved = _reparent_transform_children(
2686
tt, trans_id, tt.root)
2688
new_conflicts.add((c_type, 'Moved to root',
2691
parent_trans_id = tt.trans_id_file_id(
2693
tt.adjust_path(entry.name, parent_trans_id,
2696
tt.create_directory(trans_id)
2697
new_conflicts.add((c_type, 'Created directory', trans_id))
2698
elif c_type == 'unversioned parent':
2699
file_id = tt.inactive_file_id(conflict[1])
2700
# special-case the other tree root (move its children instead)
2701
if path_tree and file_id in path_tree:
2702
if path_tree.inventory[file_id].parent_id is None:
2704
tt.version_file(file_id, conflict[1])
2705
new_conflicts.add((c_type, 'Versioned directory', conflict[1]))
2706
elif c_type == 'non-directory parent':
2707
parent_id = conflict[1]
2708
parent_parent = tt.final_parent(parent_id)
2709
parent_name = tt.final_name(parent_id)
2710
parent_file_id = tt.final_file_id(parent_id)
2711
new_parent_id = tt.new_directory(parent_name + '.new',
2712
parent_parent, parent_file_id)
2713
_reparent_transform_children(tt, parent_id, new_parent_id)
2714
if parent_file_id is not None:
2715
tt.unversion_file(parent_id)
2716
new_conflicts.add((c_type, 'Created directory', new_parent_id))
2717
elif c_type == 'versioning no contents':
2718
tt.cancel_versioning(conflict[1])
2719
return new_conflicts
2722
def cook_conflicts(raw_conflicts, tt):
2723
"""Generate a list of cooked conflicts, sorted by file path"""
2724
from bzrlib.conflicts import Conflict
2725
conflict_iter = iter_cook_conflicts(raw_conflicts, tt)
2726
return sorted(conflict_iter, key=Conflict.sort_key)
2729
def iter_cook_conflicts(raw_conflicts, tt):
2730
from bzrlib.conflicts import Conflict
2732
for conflict in raw_conflicts:
2733
c_type = conflict[0]
2734
action = conflict[1]
2735
modified_path = fp.get_path(conflict[2])
2736
modified_id = tt.final_file_id(conflict[2])
2737
if len(conflict) == 3:
2738
yield Conflict.factory(c_type, action=action, path=modified_path,
2739
file_id=modified_id)
2742
conflicting_path = fp.get_path(conflict[3])
2743
conflicting_id = tt.final_file_id(conflict[3])
2744
yield Conflict.factory(c_type, action=action, path=modified_path,
2745
file_id=modified_id,
2746
conflict_path=conflicting_path,
2747
conflict_file_id=conflicting_id)
2750
class _FileMover(object):
2751
"""Moves and deletes files for TreeTransform, tracking operations"""
2754
self.past_renames = []
2755
self.pending_deletions = []
2757
def rename(self, from_, to):
2758
"""Rename a file from one path to another. Functions like os.rename"""
2760
os.rename(from_, to)
2762
if e.errno in (errno.EEXIST, errno.ENOTEMPTY):
2763
raise errors.FileExists(to, str(e))
2765
self.past_renames.append((from_, to))
2767
def pre_delete(self, from_, to):
2768
"""Rename a file out of the way and mark it for deletion.
2770
Unlike os.unlink, this works equally well for files and directories.
2771
:param from_: The current file path
2772
:param to: A temporary path for the file
2774
self.rename(from_, to)
2775
self.pending_deletions.append(to)
2778
"""Reverse all renames that have been performed"""
2779
for from_, to in reversed(self.past_renames):
2780
os.rename(to, from_)
2781
# after rollback, don't reuse _FileMover
2783
pending_deletions = None
2785
def apply_deletions(self):
2786
"""Apply all marked deletions"""
2787
for path in self.pending_deletions:
2789
# after apply_deletions, don't reuse _FileMover
2791
pending_deletions = None
added
removed
bzrlib/transform.py
