← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/controldir.py

  • Committer: Jelmer Vernooij
  • Date: 2011-10-13 16:35:57 UTC
  • mto: This revision was merged to the branch mainline in revision 6214.
  • Revision ID: jelmer@samba.org-20111013163557-0np20f1uh5maubob
Fix import of trace.note and gettext.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/controldir.py
31
31
    hooks,
32
32
    revision as _mod_revision,
33
33
    transport as _mod_transport,
 
34
    trace,
34
35
    ui,
35
36
    urlutils,
36
37
    )
39
40
    PushResult,
40
41
    )
41
42
 
 
43
from bzrlib.i18n import gettext
42
44
""")
43
45
 
44
46
from bzrlib import registry
678
680
            redirected_transport = transport._redirected_to(e.source, e.target)
679
681
            if redirected_transport is None:
680
682
                raise errors.NotBranchError(base)
681
 
            note(gettext('{0} is{1} redirected to {2}').format(
 
683
            trace.note(gettext('{0} is{1} redirected to {2}').format(
682
684
                 transport.base, e.permanently, redirected_transport.base))
683
685
            return redirected_transport
684
686