← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-04-05 13:49:36 UTC
  • mfrom: (5753.2.4 lazyimport-scope)
  • Revision ID: pqm@pqm.ubuntu.com-20110405134936-0ys2p9oyxpsjqvh2
(jelmer) Remove unused lazy imports, fix two scope bugs. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
19
19
from stat import S_ISREG, S_IEXEC
20
20
import time
21
21
 
22
 
import bzrlib
23
22
from bzrlib import (
24
23
    errors,
25
24
    lazy_import,
26
25
    registry,
 
26
    trace,
27
27
    tree,
28
28
    )
29
29
lazy_import.lazy_import(globals(), """
38
38
    multiparent,
39
39
    osutils,
40
40
    revision as _mod_revision,
41
 
    trace,
42
41
    ui,
43
42
    urlutils,
44
43
    )
48
47
                           ExistingLimbo, ImmortalLimbo, NoFinalPath,
49
48
                           UnableCreateSymlink)
50
49
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
51
 
from bzrlib.inventory import InventoryEntry
52
50
from bzrlib.osutils import (
53
51
    delete_any,
54
52
    file_kind,
64
62
    deprecated_in,
65
63
    deprecated_method,
66
64
    )
67
 
from bzrlib.trace import warning
68
65
 
69
66
 
70
67
ROOT_PARENT = "root-parent"
629
626
            if kind is None:
630
627
                conflicts.append(('versioning no contents', trans_id))
631
628
                continue
632
 
            if not InventoryEntry.versionable_kind(kind):
 
629
            if not inventory.InventoryEntry.versionable_kind(kind):
633
630
                conflicts.append(('versioning bad kind', trans_id, kind))
634
631
        return conflicts
635
632
 
1362
1359
        if orphan_policy is None:
1363
1360
            orphan_policy = default_policy
1364
1361
        if orphan_policy not in orphaning_registry:
1365
 
            trace.warning('%s (from %s) is not a known policy, defaulting to %s'
1366
 
                          % (orphan_policy, conf_var_name, default_policy))
 
1362
            trace.warning('%s (from %s) is not a known policy, defaulting '
 
1363
                'to %s' % (orphan_policy, conf_var_name, default_policy))
1367
1364
            orphan_policy = default_policy
1368
1365
        handle_orphan = orphaning_registry.get(orphan_policy)
1369
1366
        handle_orphan(self, trans_id, parent_id)
2524
2521
            precomputed_delta = None
2525
2522
        conflicts = cook_conflicts(raw_conflicts, tt)
2526
2523
        for conflict in conflicts:
2527
 
            warning(conflict)
 
2524
            trace.warning(conflict)
2528
2525
        try:
2529
2526
            wt.add_conflicts(conflicts)
2530
2527
        except errors.UnsupportedOperation:
2765
2762
                unversioned_filter=working_tree.is_ignored)
2766
2763
            delta.report_changes(tt.iter_changes(), change_reporter)
2767
2764
        for conflict in conflicts:
2768
 
            warning(conflict)
 
2765
            trace.warning(conflict)
2769
2766
        pp.next_phase()
2770
2767
        tt.apply()
2771
2768
        working_tree.set_merge_modified(merge_modified)