# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: vila@scythe-20081111055226-jhf76tq8sven4ntm # target_branch: http://bazaar.launchpad.net/%7Eabentley/bzrtools\ # /bzrtools.dev/ # testament_sha1: 8f704b1407a2cf36f75354a04db27e0c960913f1 # timestamp: 2008-11-11 15:54:18 +1000 # base_revision_id: aaron@aaronbentley.com-20081105140252-\ # aem9ee88p7m33ceg # # Begin patch === modified file '__init__.py' --- __init__.py 2008-11-05 00:21:17 +0000 +++ __init__.py 2008-11-11 05:52:26 +0000 @@ -54,6 +54,16 @@ plugin_cmds.register_lazy('cmd_heads', [], 'bzrlib.plugins.bzrtools.heads') + +# We can provide colorization to shelf 2 +try: + from bzrlib import shelf_ui + from bzrlib.plugins.bzrtools import colordiff + shelf_ui.diff_writer_factory = colordiff.DiffWriter +except ImportError, AttributeError: + pass + + def test_suite(): from bzrlib.tests.TestUtil import TestLoader import tests # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWddGEKYAAYrfgEAQWff//3ck AYC////wUAPM8oFABRoZKajTGoeU0GjQ0DQAAA0AHNMTAAmACYAATAAEwSghTSeFMninqGnqHqaA A0BiNAHNMTAAmACYAATAAEwSSEGhpPQTU9JM00aTGhTyNI0yMm0jAXFAIZmsihujq/0Edzim+kFv l4IVJBXjU2eTM61UkkFWQUqBEPzVTcec6irrrNkJOrUWJts437hMX4SzZjSS69TmTkb5sqhq1woy NK/aGexSRGpwkldXdxXT3PZBtu0TnZvQdHTzNNu2GN1ZItCIoKYu3/LCF1F+nPaHT8PuGJs9Ubqs NCkWy+97O5oAn0Hotg4OQuVAKkkR+DcYTwoQXQz3ChnUR3BhFEYhjgVGCs+VzuGVx9B5TWT6vMao pNsMS+Ka1NRgCvMqWKROrHqflSKbUYtyrCBmXyL8yy74JolN443klWPSjMxOuJIgqhx0ChrIlEzz HrJWiY8U8VxeYGVxwIjG52xsbhY3Zvp0HVFsrnsUJjaSLhVvYvFUVKBv/CufIvBMxgqoRJlJkvyK JoZYE8SRExHlpI3LTLRsqKU7CasT4Ego4ncuxhejHPuuyKjY7cQa9y/0K6XkxJWdwwRKIUqimnO1 UMkjGsePpDEEb2pwjJVA4HX+E7C1TIBzpaH77djH1DcbrP1P8clgZh45mXeQzuQwDcViu+JxNTYc DkamuuAOj0Bw4cF5dpoSNp4HgWHUHI6qFP+WnFq0TBn3Db0tMLyRYnprA8SI4iPN5dvKJe3/GZ3d 6TfSZcOy2mazOzPiVFHefEugEv4NbU7meoI1XuJ+IOVCH2ZTcY6hqYqdUQOetQCjFyyd6HxMRWEK RvNi4Xzu6dzLidz71qLs+2pzBtSrcj3SpuTUc2IxdiHOqDM/LKuCW1UGS9/qEq7A9Oz87qY5Wpkp APmGBv/TlTn7Cp1KCYdNS+bhFsg6UVHTu8Ut+zjOJQMmBtVYrFYf1zXm2NHAge7QgMERMIwGCEGB zEmFQj5CZOZDL1OufUxPciwcORUk4GBg8KByTBtRWrQcJopoSvLbbanREmDQyT8E0wuNLMQUiNdl nc6mYYPJjqpRbxtuZPrtq+X7sUgZUaFwFWAaDL7FStIjnG8crG4+/w+PoOrqGak+6XtvUzQN/AB9 azsVSOAn57NpTHznUUQDtMG63yaZXyS0iQLFIQ5PLQSzjyBW5gQOoaP5QtZWRCtepyoCswn3jHYo 8AKogarYMmMbudQCGxn0OkRA0iiuPqMH/i7kinChIa6MIUw=