48
40
ExistingLimbo, ImmortalLimbo, NoFinalPath,
49
41
UnableCreateSymlink)
50
42
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
43
from bzrlib.inventory import InventoryEntry
51
44
from bzrlib.osutils import (
58
52
supports_executable,
60
54
from bzrlib.progress import ProgressPhase
61
55
from bzrlib.symbol_versioning import (
59
from bzrlib.trace import mutter, warning
60
from bzrlib import tree
62
import bzrlib.urlutils as urlutils
68
65
ROOT_PARENT = "root-parent"
70
68
def unique_add(map, key, value):
72
70
raise DuplicateKey(key=key)
77
74
class _TransformResults(object):
78
75
def __init__(self, modified_paths, rename_count):
79
76
object.__init__(self)
398
381
return sorted(FinalPaths(self).get_paths(new_ids))
400
383
def _inventory_altered(self):
401
"""Determine which trans_ids need new Inventory entries.
403
An new entry is needed when anything that would be reflected by an
404
inventory entry changes, including file name, file_id, parent file_id,
405
file kind, and the execute bit.
407
Some care is taken to return entries with real changes, not cases
408
where the value is deleted and then restored to its original value,
409
but some actually unchanged values may be returned.
411
:returns: A list of (path, trans_id) for all items requiring an
412
inventory change. Ordered by path.
415
# Find entries whose file_ids are new (or changed).
416
new_file_id = set(t for t in self._new_id
417
if self._new_id[t] != self.tree_file_id(t))
418
for id_set in [self._new_name, self._new_parent, new_file_id,
384
"""Get the trans_ids and paths of files needing new inv entries."""
386
for id_set in [self._new_name, self._new_parent, self._new_id,
419
387
self._new_executability]:
420
changed_ids.update(id_set)
421
# removing implies a kind change
388
new_ids.update(id_set)
422
389
changed_kind = set(self._removed_contents)
424
390
changed_kind.intersection_update(self._new_contents)
425
# Ignore entries that are already known to have changed.
426
changed_kind.difference_update(changed_ids)
427
# to keep only the truly changed ones
428
changed_kind = (t for t in changed_kind
429
if self.tree_kind(t) != self.final_kind(t))
430
# all kind changes will alter the inventory
431
changed_ids.update(changed_kind)
432
# To find entries with changed parent_ids, find parents which existed,
433
# but changed file_id.
434
changed_file_id = set(t for t in new_file_id if t in self._removed_id)
435
# Now add all their children to the set.
436
for parent_trans_id in new_file_id:
437
changed_ids.update(self.iter_tree_children(parent_trans_id))
438
return sorted(FinalPaths(self).get_paths(changed_ids))
391
changed_kind.difference_update(new_ids)
392
changed_kind = (t for t in changed_kind if self.tree_kind(t) !=
394
new_ids.update(changed_kind)
395
return sorted(FinalPaths(self).get_paths(new_ids))
440
397
def final_kind(self, trans_id):
441
398
"""Determine the final file kind, after any changes applied.
443
:return: None if the file does not exist/has no contents. (It is
444
conceivable that a path would be created without the corresponding
445
contents insertion command)
400
Raises NoSuchFile if the file does not exist/has no contents.
401
(It is conceivable that a path would be created without the
402
corresponding contents insertion command)
447
404
if trans_id in self._new_contents:
448
405
return self._new_contents[trans_id]
449
406
elif trans_id in self._removed_contents:
407
raise NoSuchFile(None)
452
409
return self.tree_kind(trans_id)
577
532
# ensure that all children are registered with the transaction
578
533
list(self.iter_tree_children(parent_id))
580
@deprecated_method(deprecated_in((2, 3, 0)))
581
535
def has_named_child(self, by_parent, parent_id, name):
582
return self._has_named_child(
583
name, parent_id, known_children=by_parent.get(parent_id, []))
585
def _has_named_child(self, name, parent_id, known_children):
586
"""Does a parent already have a name child.
588
:param name: The searched for name.
590
:param parent_id: The parent for which the check is made.
592
:param known_children: The already known children. This should have
593
been recently obtained from `self.by_parent.get(parent_id)`
594
(or will be if None is passed).
596
if known_children is None:
597
known_children = self.by_parent().get(parent_id, [])
598
for child in known_children:
537
children = by_parent[parent_id]
540
for child in children:
599
541
if self.final_name(child) == name:
601
parent_path = self._tree_id_paths.get(parent_id, None)
602
if parent_path is None:
603
# No parent... no children
544
path = self._tree_id_paths[parent_id]
605
child_path = joinpath(parent_path, name)
606
child_id = self._tree_path_ids.get(child_path, None)
547
childpath = joinpath(path, name)
548
child_id = self._tree_path_ids.get(childpath)
607
549
if child_id is None:
608
# Not known by the tree transform yet, check the filesystem
609
return osutils.lexists(self._tree.abspath(child_path))
550
return lexists(self._tree.abspath(childpath))
611
raise AssertionError('child_id is missing: %s, %s, %s'
612
% (name, parent_id, child_id))
614
def _available_backup_name(self, name, target_id):
615
"""Find an available backup name.
617
:param name: The basename of the file.
619
:param target_id: The directory trans_id where the backup should
622
known_children = self.by_parent().get(target_id, [])
623
return osutils.available_backup_name(
625
lambda base: self._has_named_child(
626
base, target_id, known_children))
552
if self.final_parent(child_id) != parent_id:
554
if child_id in self._removed_contents:
555
# XXX What about dangling file-ids?
628
560
def _parent_loops(self):
629
561
"""No entry should be its own ancestor"""
706
645
if (self._new_name, self._new_parent) == ({}, {}):
708
647
for children in by_parent.itervalues():
710
for child_tid in children:
711
name = self.final_name(child_tid)
713
# Keep children only if they still exist in the end
714
if not self._case_sensitive_target:
716
name_ids.append((name, child_tid))
648
name_ids = [(self.final_name(t), t) for t in children]
649
if not self._case_sensitive_target:
650
name_ids = [(n.lower(), t) for n, t in name_ids]
719
653
last_trans_id = None
720
654
for name, trans_id in name_ids:
721
kind = self.final_kind(trans_id)
656
kind = self.final_kind(trans_id)
722
659
file_id = self.final_file_id(trans_id)
723
660
if kind is None and file_id is None:
745
682
def _parent_type_conflicts(self, by_parent):
746
"""Children must have a directory parent"""
683
"""parents must have directory 'contents'."""
748
685
for parent_id, children in by_parent.iteritems():
749
686
if parent_id is ROOT_PARENT:
752
for child_id in children:
753
if self.final_kind(child_id) is not None:
688
if not self._any_contents(children):
758
# There is at least a child, so we need an existing directory to
760
kind = self.final_kind(parent_id)
690
for child in children:
692
self.final_kind(child)
696
kind = self.final_kind(parent_id)
762
# The directory will be deleted
763
700
conflicts.append(('missing parent', parent_id))
764
701
elif kind != "directory":
765
# Meh, we need a *directory* to put something in it
766
702
conflicts.append(('non-directory parent', parent_id))
705
def _any_contents(self, trans_ids):
706
"""Return true if any of the trans_ids, will have contents."""
707
for trans_id in trans_ids:
709
kind = self.final_kind(trans_id)
769
715
def _set_executability(self, path, trans_id):
770
716
"""Set the executability of versioned files """
771
717
if supports_executable():
835
781
self.create_symlink(target, trans_id)
838
def new_orphan(self, trans_id, parent_id):
839
"""Schedule an item to be orphaned.
841
When a directory is about to be removed, its children, if they are not
842
versioned are moved out of the way: they don't have a parent anymore.
844
:param trans_id: The trans_id of the existing item.
845
:param parent_id: The parent trans_id of the item.
847
raise NotImplementedError(self.new_orphan)
849
def _get_potential_orphans(self, dir_id):
850
"""Find the potential orphans in a directory.
852
A directory can't be safely deleted if there are versioned files in it.
853
If all the contained files are unversioned then they can be orphaned.
855
The 'None' return value means that the directory contains at least one
856
versioned file and should not be deleted.
858
:param dir_id: The directory trans id.
860
:return: A list of the orphan trans ids or None if at least one
861
versioned file is present.
864
# Find the potential orphans, stop if one item should be kept
865
for child_tid in self.by_parent()[dir_id]:
866
if child_tid in self._removed_contents:
867
# The child is removed as part of the transform. Since it was
868
# versioned before, it's not an orphan
870
elif self.final_file_id(child_tid) is None:
871
# The child is not versioned
872
orphans.append(child_tid)
874
# We have a versioned file here, searching for orphans is
880
784
def _affected_ids(self):
881
785
"""Return the set of transform ids affected by the transform"""
882
786
trans_ids = set(self._removed_id)
1299
1195
descendants.update(self._limbo_descendants(descendant))
1300
1196
return descendants
1302
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1198
def create_file(self, contents, trans_id, mode_id=None):
1303
1199
"""Schedule creation of a new file.
1307
:param contents: an iterator of strings, all of which will be written
1308
to the target destination.
1309
:param trans_id: TreeTransform handle
1310
:param mode_id: If not None, force the mode of the target file to match
1311
the mode of the object referenced by mode_id.
1312
Otherwise, we will try to preserve mode bits of an existing file.
1313
:param sha1: If the sha1 of this content is already known, pass it in.
1314
We can use it to prevent future sha1 computations.
1203
Contents is an iterator of strings, all of which will be written
1204
to the target destination.
1206
New file takes the permissions of any existing file with that id,
1207
unless mode_id is specified.
1316
1209
name = self._limbo_name(trans_id)
1317
1210
f = open(name, 'wb')
1319
unique_add(self._new_contents, trans_id, 'file')
1213
unique_add(self._new_contents, trans_id, 'file')
1215
# Clean up the file, it never got registered so
1216
# TreeTransform.finalize() won't clean it up.
1320
1221
f.writelines(contents)
1323
1224
self._set_mtime(name)
1324
1225
self._set_mode(trans_id, mode_id, S_ISREG)
1325
# It is unfortunate we have to use lstat instead of fstat, but we just
1326
# used utime and chmod on the file, so we need the accurate final
1328
if sha1 is not None:
1329
self._observed_sha1s[trans_id] = (sha1, osutils.lstat(name))
1331
1227
def _read_file_chunks(self, trans_id):
1332
1228
cur_file = open(self._limbo_name(trans_id), 'rb')
1402
1296
del self._limbo_children_names[trans_id]
1403
1297
delete_any(self._limbo_name(trans_id))
1405
def new_orphan(self, trans_id, parent_id):
1406
# FIXME: There is no tree config, so we use the branch one (it's weird
1407
# to define it this way as orphaning can only occur in a working tree,
1408
# but that's all we have (for now). It will find the option in
1409
# locations.conf or bazaar.conf though) -- vila 20100916
1410
conf = self._tree.branch.get_config()
1411
conf_var_name = 'bzr.transform.orphan_policy'
1412
orphan_policy = conf.get_user_option(conf_var_name)
1413
default_policy = orphaning_registry.default_key
1414
if orphan_policy is None:
1415
orphan_policy = default_policy
1416
if orphan_policy not in orphaning_registry:
1417
trace.warning('%s (from %s) is not a known policy, defaulting '
1418
'to %s' % (orphan_policy, conf_var_name, default_policy))
1419
orphan_policy = default_policy
1420
handle_orphan = orphaning_registry.get(orphan_policy)
1421
handle_orphan(self, trans_id, parent_id)
1424
class OrphaningError(errors.BzrError):
1426
# Only bugs could lead to such exception being seen by the user
1427
internal_error = True
1428
_fmt = "Error while orphaning %s in %s directory"
1430
def __init__(self, orphan, parent):
1431
errors.BzrError.__init__(self)
1432
self.orphan = orphan
1433
self.parent = parent
1436
class OrphaningForbidden(OrphaningError):
1438
_fmt = "Policy: %s doesn't allow creating orphans."
1440
def __init__(self, policy):
1441
errors.BzrError.__init__(self)
1442
self.policy = policy
1445
def move_orphan(tt, orphan_id, parent_id):
1446
"""See TreeTransformBase.new_orphan.
1448
This creates a new orphan in the `bzr-orphans` dir at the root of the
1451
:param tt: The TreeTransform orphaning `trans_id`.
1453
:param orphan_id: The trans id that should be orphaned.
1455
:param parent_id: The orphan parent trans id.
1457
# Add the orphan dir if it doesn't exist
1458
orphan_dir_basename = 'bzr-orphans'
1459
od_id = tt.trans_id_tree_path(orphan_dir_basename)
1460
if tt.final_kind(od_id) is None:
1461
tt.create_directory(od_id)
1462
parent_path = tt._tree_id_paths[parent_id]
1463
# Find a name that doesn't exist yet in the orphan dir
1464
actual_name = tt.final_name(orphan_id)
1465
new_name = tt._available_backup_name(actual_name, od_id)
1466
tt.adjust_path(new_name, od_id, orphan_id)
1467
trace.warning('%s has been orphaned in %s'
1468
% (joinpath(parent_path, actual_name), orphan_dir_basename))
1471
def refuse_orphan(tt, orphan_id, parent_id):
1472
"""See TreeTransformBase.new_orphan.
1474
This refuses to create orphan, letting the caller handle the conflict.
1476
raise OrphaningForbidden('never')
1479
orphaning_registry = registry.Registry()
1480
orphaning_registry.register(
1481
'conflict', refuse_orphan,
1482
'Leave orphans in place and create a conflict on the directory.')
1483
orphaning_registry.register(
1484
'move', move_orphan,
1485
'Move orphans into the bzr-orphans directory.')
1486
orphaning_registry._set_default_key('conflict')
1489
1300
class TreeTransform(DiskTreeTransform):
1490
1301
"""Represent a tree transformation.
1884
1696
self.rename_count += 1
1885
# TODO: if trans_id in self._observed_sha1s, we should
1886
# re-stat the final target, since ctime will be
1887
# updated by the change.
1888
1697
if (trans_id in self._new_contents or
1889
1698
self.path_changed(trans_id)):
1890
1699
if trans_id in self._new_contents:
1891
1700
modified_paths.append(full_path)
1892
1701
if trans_id in self._new_executability:
1893
1702
self._set_executability(path, trans_id)
1894
if trans_id in self._observed_sha1s:
1895
o_sha1, o_st_val = self._observed_sha1s[trans_id]
1896
st = osutils.lstat(full_path)
1897
self._observed_sha1s[trans_id] = (o_sha1, st)
1899
1704
child_pb.finished()
1900
for path, trans_id in new_paths:
1901
# new_paths includes stuff like workingtree conflicts. Only the
1902
# stuff in new_contents actually comes from limbo.
1903
if trans_id in self._limbo_files:
1904
del self._limbo_files[trans_id]
1905
1705
self._new_contents.clear()
1906
1706
return modified_paths
1908
def _apply_observed_sha1s(self):
1909
"""After we have finished renaming everything, update observed sha1s
1911
This has to be done after self._tree.apply_inventory_delta, otherwise
1912
it doesn't know anything about the files we are updating. Also, we want
1913
to do this as late as possible, so that most entries end up cached.
1915
# TODO: this doesn't update the stat information for directories. So
1916
# the first 'bzr status' will still need to rewrite
1917
# .bzr/checkout/dirstate. However, we at least don't need to
1918
# re-read all of the files.
1919
# TODO: If the operation took a while, we could do a time.sleep(3) here
1920
# to allow the clock to tick over and ensure we won't have any
1921
# problems. (we could observe start time, and finish time, and if
1922
# it is less than eg 10% overhead, add a sleep call.)
1923
paths = FinalPaths(self)
1924
for trans_id, observed in self._observed_sha1s.iteritems():
1925
path = paths.get_path(trans_id)
1926
# We could get the file_id, but dirstate prefers to use the path
1927
# anyway, and it is 'cheaper' to determine.
1928
# file_id = self._new_id[trans_id]
1929
self._tree._observed_sha1(None, path, observed)
1932
1709
class TransformPreview(DiskTreeTransform):
1933
1710
"""A TreeTransform for generating preview trees.
2686
2436
offset += count
2687
for count, ((trans_id, tree_path, text_sha1), contents) in enumerate(
2437
for count, ((trans_id, tree_path), contents) in enumerate(
2688
2438
tree.iter_files_bytes(new_desired_files)):
2689
2439
if wt.supports_content_filtering():
2690
2440
filters = wt._content_filter_stack(tree_path)
2691
2441
contents = filtered_output_bytes(contents, filters,
2692
2442
ContentFilterContext(tree_path, tree))
2693
tt.create_file(contents, trans_id, sha1=text_sha1)
2443
tt.create_file(contents, trans_id)
2694
2444
pb.update('Adding file contents', count + offset, total)
2775
2523
raise errors.BadFileKindError(name, kind)
2526
@deprecated_function(deprecated_in((1, 9, 0)))
2527
def create_by_entry(tt, entry, tree, trans_id, lines=None, mode_id=None):
2528
"""Create new file contents according to an inventory entry.
2530
DEPRECATED. Use create_from_tree instead.
2532
if entry.kind == "file":
2534
lines = tree.get_file(entry.file_id).readlines()
2535
tt.create_file(lines, trans_id, mode_id=mode_id)
2536
elif entry.kind == "symlink":
2537
tt.create_symlink(tree.get_symlink_target(entry.file_id), trans_id)
2538
elif entry.kind == "directory":
2539
tt.create_directory(trans_id)
2778
2542
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2779
2543
filter_tree_path=None):
2780
2544
"""Create new file contents according to tree contents.
2922
2680
deferred_files = []
2923
2681
for id_num, (file_id, path, changed_content, versioned, parent, name,
2924
2682
kind, executable) in enumerate(change_list):
2925
target_path, wt_path = path
2926
target_versioned, wt_versioned = versioned
2927
target_parent, wt_parent = parent
2928
target_name, wt_name = name
2929
target_kind, wt_kind = kind
2930
target_executable, wt_executable = executable
2931
if skip_root and wt_parent is None:
2683
if skip_root and file_id[0] is not None and parent[0] is None:
2933
2685
trans_id = tt.trans_id_file_id(file_id)
2935
2687
if changed_content:
2936
2688
keep_content = False
2937
if wt_kind == 'file' and (backups or target_kind is None):
2689
if kind[0] == 'file' and (backups or kind[1] is None):
2938
2690
wt_sha1 = working_tree.get_file_sha1(file_id)
2939
2691
if merge_modified.get(file_id) != wt_sha1:
2940
2692
# acquire the basis tree lazily to prevent the
2943
2695
if basis_tree is None:
2944
2696
basis_tree = working_tree.basis_tree()
2945
2697
basis_tree.lock_read()
2946
if basis_tree.has_id(file_id):
2698
if file_id in basis_tree:
2947
2699
if wt_sha1 != basis_tree.get_file_sha1(file_id):
2948
2700
keep_content = True
2949
elif target_kind is None and not target_versioned:
2701
elif kind[1] is None and not versioned[1]:
2950
2702
keep_content = True
2951
if wt_kind is not None:
2703
if kind[0] is not None:
2952
2704
if not keep_content:
2953
2705
tt.delete_contents(trans_id)
2954
elif target_kind is not None:
2955
parent_trans_id = tt.trans_id_file_id(wt_parent)
2956
backup_name = tt._available_backup_name(
2957
wt_name, parent_trans_id)
2706
elif kind[1] is not None:
2707
parent_trans_id = tt.trans_id_file_id(parent[0])
2708
by_parent = tt.by_parent()
2709
backup_name = _get_backup_name(name[0], by_parent,
2710
parent_trans_id, tt)
2958
2711
tt.adjust_path(backup_name, parent_trans_id, trans_id)
2959
new_trans_id = tt.create_path(wt_name, parent_trans_id)
2960
if wt_versioned and target_versioned:
2712
new_trans_id = tt.create_path(name[0], parent_trans_id)
2713
if versioned == (True, True):
2961
2714
tt.unversion_file(trans_id)
2962
2715
tt.version_file(file_id, new_trans_id)
2963
2716
# New contents should have the same unix perms as old
2965
2718
mode_id = trans_id
2966
2719
trans_id = new_trans_id
2967
if target_kind in ('directory', 'tree-reference'):
2720
if kind[1] in ('directory', 'tree-reference'):
2968
2721
tt.create_directory(trans_id)
2969
if target_kind == 'tree-reference':
2722
if kind[1] == 'tree-reference':
2970
2723
revision = target_tree.get_reference_revision(file_id,
2972
2725
tt.set_tree_reference(revision, trans_id)
2973
elif target_kind == 'symlink':
2726
elif kind[1] == 'symlink':
2974
2727
tt.create_symlink(target_tree.get_symlink_target(file_id),
2976
elif target_kind == 'file':
2729
elif kind[1] == 'file':
2977
2730
deferred_files.append((file_id, (trans_id, mode_id)))
2978
2731
if basis_tree is None:
2979
2732
basis_tree = working_tree.basis_tree()
2980
2733
basis_tree.lock_read()
2981
2734
new_sha1 = target_tree.get_file_sha1(file_id)
2982
if (basis_tree.has_id(file_id) and
2983
new_sha1 == basis_tree.get_file_sha1(file_id)):
2735
if (file_id in basis_tree and new_sha1 ==
2736
basis_tree.get_file_sha1(file_id)):
2984
2737
if file_id in merge_modified:
2985
2738
del merge_modified[file_id]
2987
2740
merge_modified[file_id] = new_sha1
2989
2742
# preserve the execute bit when backing up
2990
if keep_content and wt_executable == target_executable:
2991
tt.set_executability(target_executable, trans_id)
2992
elif target_kind is not None:
2993
raise AssertionError(target_kind)
2994
if not wt_versioned and target_versioned:
2743
if keep_content and executable[0] == executable[1]:
2744
tt.set_executability(executable[1], trans_id)
2745
elif kind[1] is not None:
2746
raise AssertionError(kind[1])
2747
if versioned == (False, True):
2995
2748
tt.version_file(file_id, trans_id)
2996
if wt_versioned and not target_versioned:
2749
if versioned == (True, False):
2997
2750
tt.unversion_file(trans_id)
2998
if (target_name is not None and
2999
(wt_name != target_name or wt_parent != target_parent)):
3000
if target_name == '' and target_parent is None:
2751
if (name[1] is not None and
2752
(name[0] != name[1] or parent[0] != parent[1])):
2753
if name[1] == '' and parent[1] is None:
3001
2754
parent_trans = ROOT_PARENT
3003
parent_trans = tt.trans_id_file_id(target_parent)
3004
if wt_parent is None and wt_versioned:
3005
tt.adjust_root_path(target_name, parent_trans)
2756
parent_trans = tt.trans_id_file_id(parent[1])
2757
if parent[0] is None and versioned[0]:
2758
tt.adjust_root_path(name[1], parent_trans)
3007
tt.adjust_path(target_name, parent_trans, trans_id)
3008
if wt_executable != target_executable and target_kind == "file":
3009
tt.set_executability(target_executable, trans_id)
2760
tt.adjust_path(name[1], parent_trans, trans_id)
2761
if executable[0] != executable[1] and kind[1] == "file":
2762
tt.set_executability(executable[1], trans_id)
3010
2763
if working_tree.supports_content_filtering():
3011
2764
for index, ((trans_id, mode_id), bytes) in enumerate(
3012
2765
target_tree.iter_files_bytes(deferred_files)):
3084
2837
elif c_type == 'missing parent':
3085
2838
trans_id = conflict[1]
3086
if trans_id in tt._removed_contents:
3087
cancel_deletion = True
3088
orphans = tt._get_potential_orphans(trans_id)
3090
cancel_deletion = False
3091
# All children are orphans
3094
tt.new_orphan(o, trans_id)
3095
except OrphaningError:
3096
# Something bad happened so we cancel the directory
3097
# deletion which will leave it in place with a
3098
# conflict. The user can deal with it from there.
3099
# Note that this also catch the case where we don't
3100
# want to create orphans and leave the directory in
3102
cancel_deletion = True
3105
# Cancel the directory deletion
3106
tt.cancel_deletion(trans_id)
3107
new_conflicts.add(('deleting parent', 'Not deleting',
2840
tt.cancel_deletion(trans_id)
2841
new_conflicts.add(('deleting parent', 'Not deleting',
3112
2846
tt.final_name(trans_id)
3173
2907
modified_path = fp.get_path(conflict[2])
3174
2908
modified_id = tt.final_file_id(conflict[2])
3175
2909
if len(conflict) == 3:
3176
yield conflicts.Conflict.factory(
3177
c_type, action=action, path=modified_path, file_id=modified_id)
2910
yield Conflict.factory(c_type, action=action, path=modified_path,
2911
file_id=modified_id)
3180
2914
conflicting_path = fp.get_path(conflict[3])
3181
2915
conflicting_id = tt.final_file_id(conflict[3])
3182
yield conflicts.Conflict.factory(
3183
c_type, action=action, path=modified_path,
3184
file_id=modified_id,
3185
conflict_path=conflicting_path,
3186
conflict_file_id=conflicting_id)
2916
yield Conflict.factory(c_type, action=action, path=modified_path,
2917
file_id=modified_id,
2918
conflict_path=conflicting_path,
2919
conflict_file_id=conflicting_id)
3189
2922
class _FileMover(object):
added
removed
bzrlib/transform.py
