← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/_annotator_py.py

  • Committer: Martin Pool
  • Date: 2010-07-16 13:53:26 UTC
  • mto: (5346.4.3 cleanup)
  • mto: This revision was merged to the branch mainline in revision 5350.
  • Revision ID: mbp@canonical.com-20100716135326-a3d5bh29w64ylh5p
* `PathNotChild` should not give a traceback.
  (Martin Pool, bug 98735)

* `FileInWrongBranch` is deprecated in favour of `PathNotChild` and no
  longer raised.
  (Martin Pool)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/_annotator_py.py
1
 
# Copyright (C) 2009 Canonical Ltd
 
1
# Copyright (C) 2009, 2010 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 annotate # Must be lazy to avoid circular importing
 
21
from bzrlib import (
 
22
    annotate, # Must be lazy to avoid circular importing
 
23
    graph as _mod_graph,
 
24
    patiencediff,
 
25
    )
22
26
""")
23
27
from bzrlib import (
24
28
    errors,
25
 
    graph as _mod_graph,
26
29
    osutils,
27
 
    patiencediff,
28
30
    ui,
29
31
    )
30
32