← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Jelmer Vernooij
  • Date: 2011-04-05 01:12:15 UTC
  • mto: This revision was merged to the branch mainline in revision 5757.
  • Revision ID: jelmer@samba.org-20110405011215-8g6izwf3uz8v4174
Remove some unnecessary imports, clean up lazy imports.

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,
38
37
    multiparent,
39
38
    osutils,
40
39
    revision as _mod_revision,
41
 
    trace,
42
40
    ui,
43
41
    urlutils,
44
42
    )
48
46
                           ExistingLimbo, ImmortalLimbo, NoFinalPath,
49
47
                           UnableCreateSymlink)
50
48
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
51
 
from bzrlib.inventory import InventoryEntry
52
49
from bzrlib.osutils import (
53
50
    delete_any,
54
51
    file_kind,
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'
 
1362
            warning('%s (from %s) is not a known policy, defaulting to %s'
1366
1363
                          % (orphan_policy, conf_var_name, default_policy))
1367
1364
            orphan_policy = default_policy
1368
1365
        handle_orphan = orphaning_registry.get(orphan_policy)
1412
1409
    actual_name = tt.final_name(orphan_id)
1413
1410
    new_name = tt._available_backup_name(actual_name, od_id)
1414
1411
    tt.adjust_path(new_name, od_id, orphan_id)
1415
 
    trace.warning('%s has been orphaned in %s'
 
1412
    warning('%s has been orphaned in %s'
1416
1413
                  % (joinpath(parent_path, actual_name), orphan_dir_basename))
1417
1414
 
1418
1415