~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/_annotator_py.py

  • Committer: John Arbash Meinel
  • Date: 2010-01-05 04:30:07 UTC
  • mfrom: (4932 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4934.
  • Revision ID: john@arbash-meinel.com-20100105043007-ehgbldqd3q0gtyws
Merge bzr.dev, resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
18
18
 
19
19
from bzrlib.lazy_import import lazy_import
20
20
lazy_import(globals(), """
21
 
from bzrlib import (
22
 
    annotate, # Must be lazy to avoid circular importing
23
 
    graph as _mod_graph,
24
 
    patiencediff,
25
 
    )
 
21
from bzrlib import annotate # Must be lazy to avoid circular importing
26
22
""")
27
23
from bzrlib import (
28
24
    errors,
 
25
    graph as _mod_graph,
29
26
    osutils,
 
27
    patiencediff,
30
28
    ui,
31
29
    )
32
30