← Back to branch summary

~zindar/bzr-extmerge/trunk

« back to all changes in this revision

Viewing changes to __init__.py

  • Committer: Rob Connolly
  • Date: 2009-01-27 20:50:32 UTC
  • Revision ID: rob@webworxshop.com-20090127205032-9cjkqiydun11q596
Caught attribute error on lazy registration in older versions of bazaar.

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
5
5
#
6
6
"""external merge plugin for bzr"""
7
7
 
8
 
from bzrlib.commands import plugin_cmds
9
 
plugin_cmds.register_lazy('cmd_extmerge', ['emerge'],
 
8
try:
 
9
    from bzrlib.commands import plugin_cmds
 
10
    plugin_cmds.register_lazy('cmd_extmerge', ['emerge'],
10
11
                          'bzrlib.plugins.extmerge.extmerge')
 
12
except AttributeError:
 
13
    from bzrlib.commands import register_command
 
14
    from extmerge import cmd_extmerge
 
15
    register_command(cmd_extmerge)