Merge lp:~launchpad/difftacular/breezy into lp:difftacular

[Colin Watson]

Port to Breezy.

[Jelmer Vernooij (jelmer)]

This looks reasonable to me.

I'm not sure if this matters, but you could make it compatible with both bazaar and breezy by using relative imports (from ... import commands) and replacing 'bzrlib.plugins.difftacular' in the register_lazy calls with __name__).

review: Approve

[lp:~launchpad/difftacular/breezy]

11. By Colin Watson on 2019-06-14

Make compatible with both Bazaar and Breezy.

[Colin Watson (cjwatson)]

It's probably not a big deal, but it doesn't seem like it would hurt. Thanks, done.

=== modified file '__init__.py'
--- __init__.py	2011-02-23 21:41:53 +0000
+++ __init__.py	2019-06-14 09:29:35 +0000
@@ -17,16 +17,16 @@
 __doc__ = "Provides diff-ignore-branches and diff-mainline commands."
 
 
-from bzrlib import commands
-
-
-commands.plugin_cmds.register_lazy(
-    'cmd_diff_mainline', [], 'bzrlib.plugins.difftacular.command')
-commands.plugin_cmds.register_lazy(
-    'cmd_diff_ignore_branches', [], 'bzrlib.plugins.difftacular.command')
-commands.plugin_cmds.register_lazy(
-    'cmd_preview_diff', [], 'bzrlib.plugins.difftacular.command')
+from ... import commands
+
+
+commands.plugin_cmds.register_lazy(
+    'cmd_diff_mainline', [], __name__ + '.command')
+commands.plugin_cmds.register_lazy(
+    'cmd_diff_ignore_branches', [], __name__ + '.command')
+commands.plugin_cmds.register_lazy(
+    'cmd_preview_diff', [], __name__ + '.command')
 
 def test_suite():
-    from bzrlib.plugins.difftacular import tests
+    from . import tests
     return tests.test_suite()

=== modified file 'command.py'
--- command.py	2011-02-23 21:41:53 +0000
+++ command.py	2019-06-14 09:29:35 +0000
@@ -14,8 +14,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-from bzrlib import branch, commands, errors, option, trace, urlutils
-from bzrlib.plugins.difftacular import generate_diff
+from ... import branch, commands, errors, option, trace, urlutils
+from . import generate_diff
 
 class DiffCommand(commands.Command):
 

=== modified file 'generate_diff.py'
--- generate_diff.py	2012-02-10 22:43:12 +0000
+++ generate_diff.py	2019-06-14 09:29:35 +0000
@@ -15,8 +15,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 
-from bzrlib import cleanup, diff, revision as _mod_revision
-from bzrlib.merge import Merge3Merger
+from ... import cleanup, diff, revision as _mod_revision
+from ...merge import Merge3Merger
 
 
 def apply_merges(tree, branch, merges):

=== modified file 'tests/__init__.py'
--- tests/__init__.py	2010-07-13 16:19:05 +0000
+++ tests/__init__.py	2019-06-14 09:29:35 +0000
@@ -16,6 +16,6 @@
 
 
 def test_suite():
-    from bzrlib.tests.TestUtil import TestLoader
-    from bzrlib.plugins.difftacular.tests import test_generate_diff
+    from ....tests.TestUtil import TestLoader
+    from . import test_generate_diff
     return TestLoader().loadTestsFromModule(test_generate_diff)

=== modified file 'tests/test_generate_diff.py'
--- tests/test_generate_diff.py	2010-07-15 11:48:55 +0000
+++ tests/test_generate_diff.py	2019-06-14 09:29:35 +0000
@@ -17,8 +17,17 @@
 
 from StringIO import StringIO
 
-from bzrlib.plugins.difftacular import generate_diff
-from bzrlib import tests
+from .. import generate_diff
+from .... import tests
+
+
+def get_controldir(tree):
+    try:
+        # Breezy
+        return tree.controldir
+    except AttributeError:
+        # Bazaar
+        return tree.bzrdir
 
 
 class TestMainlineDiff(tests.TestCaseWithTransport):
@@ -30,7 +39,7 @@
         self.build_tree_contents([('foo/baz', 'a\nz\n')])
         foo.add('baz')
         rev1 = foo.commit('initial commit')
-        bar = foo.bzrdir.sprout('bar').open_workingtree()
+        bar = get_controldir(foo).sprout('bar').open_workingtree()
         self.build_tree_contents([('bar/baz', 'c\na\nz\n')])
         rev2_bar = bar.commit('add c')
         foo.merge_from_branch(bar.branch)
@@ -54,7 +63,7 @@
 
     def create_unignored_merge_scenario(self):
         foo, bar, rev1, rev2, rev2_bar, rev3 = self.create_diff_scenario()
-        unignored = foo.bzrdir.sprout('unignored').open_workingtree()
+        unignored = get_controldir(foo).sprout('unignored').open_workingtree()
         self.build_tree_contents([('unignored/baz', 'c\na\nb\nz\nd\n')])
         unignored.commit('add d')
         foo.merge_from_branch(unignored.branch)
@@ -95,7 +104,7 @@
         foo.lock_write()
         self.addCleanup(foo.unlock)
         rev1 = foo.commit('done')
-        bar = foo.bzrdir.sprout('bar').open_workingtree()
+        bar = get_controldir(foo).sprout('bar').open_workingtree()
         rev2b = bar.commit('done')
         foo.merge_from_branch(bar.branch)
         rev2 = foo.commit('done')