← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Andrew Bennetts
  • Date: 2010-06-04 01:49:28 UTC
  • mto: (5050.3.16 2.2)
  • mto: This revision was merged to the branch mainline in revision 5365.
  • Revision ID: andrew.bennetts@canonical.com-20100604014928-q4i0zk7vqq4ab89k
Lazy import most things in merge.py, to minimise the impact of plugins that need to import bzrlib.merge to install a hook.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
16
16
 
17
17
import warnings
18
18
 
 
19
from bzrlib.lazy_import import lazy_import
 
20
lazy_import(globals(), """
19
21
from bzrlib import (
20
22
    branch as _mod_branch,
21
23
    conflicts as _mod_conflicts,
22
24
    debug,
23
 
    decorators,
24
25
    errors,
25
26
    generate_ids,
26
27
    graph as _mod_graph,
27
 
    hooks,
28
28
    merge3,
29
29
    osutils,
30
30
    patiencediff,
35
35
    tree as _mod_tree,
36
36
    tsort,
37
37
    ui,
38
 
    versionedfile
 
38
    versionedfile,
39
39
    )
40
40
from bzrlib.cleanup import OperationWithCleanups
 
41
""")
 
42
from bzrlib import (
 
43
    decorators,
 
44
    hooks,
 
45
    )
41
46
from bzrlib.symbol_versioning import (
42
47
    deprecated_in,
43
48
    deprecated_method,