← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: John Arbash Meinel
  • Date: 2011-04-08 12:28:05 UTC
  • mfrom: (5771 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5775.
  • Revision ID: john@arbash-meinel.com-20110408122805-qdo9uc2dtc9mzoic
Merge bzr 5771, make sure to have the latest create-file changes, etc.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
23
23
    errors,
24
24
    lazy_import,
25
25
    registry,
 
26
    trace,
26
27
    tree,
27
28
    )
28
29
lazy_import.lazy_import(globals(), """
37
38
    multiparent,
38
39
    osutils,
39
40
    revision as _mod_revision,
40
 
    trace,
41
41
    ui,
42
42
    urlutils,
43
43
    )
47
47
                           ExistingLimbo, ImmortalLimbo, NoFinalPath,
48
48
                           UnableCreateSymlink)
49
49
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
50
 
from bzrlib.inventory import InventoryEntry
51
50
from bzrlib.osutils import (
52
51
    delete_any,
53
52
    file_kind,
63
62
    deprecated_in,
64
63
    deprecated_method,
65
64
    )
66
 
from bzrlib.trace import warning
67
65
 
68
66
 
69
67
ROOT_PARENT = "root-parent"
630
628
            if kind is None:
631
629
                conflicts.append(('versioning no contents', trans_id))
632
630
                continue
633
 
            if not InventoryEntry.versionable_kind(kind):
 
631
            if not inventory.InventoryEntry.versionable_kind(kind):
634
632
                conflicts.append(('versioning bad kind', trans_id, kind))
635
633
        return conflicts
636
634
 
1372
1370
        if orphan_policy is None:
1373
1371
            orphan_policy = default_policy
1374
1372
        if orphan_policy not in orphaning_registry:
1375
 
            trace.warning('%s (from %s) is not a known policy, defaulting to %s'
1376
 
                          % (orphan_policy, conf_var_name, default_policy))
 
1373
            trace.warning('%s (from %s) is not a known policy, defaulting '
 
1374
                'to %s' % (orphan_policy, conf_var_name, default_policy))
1377
1375
            orphan_policy = default_policy
1378
1376
        handle_orphan = orphaning_registry.get(orphan_policy)
1379
1377
        handle_orphan(self, trans_id, parent_id)
2565
2563
            precomputed_delta = None
2566
2564
        conflicts = cook_conflicts(raw_conflicts, tt)
2567
2565
        for conflict in conflicts:
2568
 
            warning(conflict)
 
2566
            trace.warning(conflict)
2569
2567
        try:
2570
2568
            wt.add_conflicts(conflicts)
2571
2569
        except errors.UnsupportedOperation:
2807
2805
                unversioned_filter=working_tree.is_ignored)
2808
2806
            delta.report_changes(tt.iter_changes(), change_reporter)
2809
2807
        for conflict in conflicts:
2810
 
            warning(conflict)
 
2808
            trace.warning(conflict)
2811
2809
        pp.next_phase()
2812
2810
        tt.apply()
2813
2811
        working_tree.set_merge_modified(merge_modified)