Merge lp:~jelmer/bzr-builddeb/merge-quilt-option into lp:bzr-builddeb

[Jelmer Vernooij]

Add option to enable/disable the smart merging hooks, so people can
disable them in case we get anything wrong.

[James Westby (james-w)]

12 + from bzrlib import trace; trace.mutter("FOO")

Might be nice to have the mutter there actually so that there is the trace in the log file.

Thanks,

James

review: Approve

[Jelmer Vernooij (jelmer)]

On 01/06/2012 04:32 PM, James Westby wrote:
> Review: Approve
>
> 12 + from bzrlib import trace; trace.mutter("FOO")
>
> Might be nice to have the mutter there actually so that there is the trace in the log file.
>
:-) Thanks for catching that. I've improved the message.

Cheers,

Jelmer

=== modified file '__init__.py'
--- __init__.py	2012-01-05 18:53:13 +0000
+++ __init__.py	2012-01-06 01:35:25 +0000
@@ -203,6 +203,13 @@
         merger.this_tree.path2id("debian/patches") is None and
         merger.working_tree.path2id("debian/patches") is None):
         return
+
+    from bzrlib.plugins.builddeb.util import debuild_config
+    config = debuild_config(merger.working_tree, merger.working_tree)
+    if not config.quilt_smart_merge:
+        from bzrlib import trace; trace.mutter("FOO")
+        return
+
     import shutil
     from bzrlib import trace
     from bzrlib.plugins.builddeb.errors import QuiltUnapplyError
@@ -213,7 +220,8 @@
     if merger.working_tree.path2id("debian/patches") is not None:
         quilt_pop_all(working_dir=merger.working_tree.basedir)
     try:
-        merger.this_tree, this_dir = tree_unapply_patches(merger.this_tree, merger.this_branch)
+        merger.this_tree, this_dir = tree_unapply_patches(merger.this_tree,
+            merger.this_branch)
     except QuiltError, e:
         shutil.rmtree(this_dir)
         raise QuiltUnapplyError("this", e.msg)
@@ -221,7 +229,8 @@
         if this_dir is not None:
             merger._quilt_tempdirs.append(this_dir)
     try:
-        merger.base_tree, base_dir = tree_unapply_patches(merger.base_tree, merger.this_branch)
+        merger.base_tree, base_dir = tree_unapply_patches(merger.base_tree,
+            merger.this_branch)
     except QuiltError, e:
         shutil.rmtree(base_dir)
         raise QuiltUnapplyError("base", e.msg)
@@ -232,7 +241,8 @@
     if other_branch is None:
         other_branch = merger.this_branch
     try:
-        merger.other_tree, other_dir = tree_unapply_patches(merger.other_tree, other_branch)
+        merger.other_tree, other_dir = tree_unapply_patches(merger.other_tree,
+            other_branch)
     except QuiltError, e:
         shutil.rmtree(other_dir)
         raise QuiltUnapplyError("other", e.msg)

=== modified file 'config.py'
--- config.py	2011-11-22 14:05:25 +0000
+++ config.py	2012-01-06 01:35:25 +0000
@@ -295,6 +295,9 @@
   commit_message_from_changelog = _bool_property('commit-message-from-changelog',
        "Whether the commit message should come from debian/changelog", default=False)
 
+  quilt_smart_merge = _bool_property('quilt-smart-merge',
+    "Automatically unapply quilt patches during merge", default=True)
+
 
 def _test():
   import doctest

=== modified file 'tests/test_merge_quilt.py'
--- tests/test_merge_quilt.py	2012-01-05 11:38:00 +0000
+++ tests/test_merge_quilt.py	2012-01-06 01:35:25 +0000
@@ -125,3 +125,51 @@
         # "a" should be unapplied again
         self.assertPathDoesNotExist("a/a")
         self.assertEquals(1, conflicts)
+
+    def test_disabled_hook(self):
+        self.enable_hooks()
+
+        tree_a = self.make_branch_and_tree('a')
+        self.build_tree(['a/debian/', 'a/debian/patches/'])
+        self.build_tree_contents([
+            ('a/debian/patches/series', 'patch1\n'),
+            ('a/debian/patches/patch1', TRIVIAL_PATCH),
+            ("a/debian/bzr-builddeb.conf", "[BUILDDEB]\n"
+                "quilt-smart-merge = False\n"),
+            ("a/a", "")])
+        tree_a.smart_add([tree_a.basedir])
+        tree_a.commit('initial')
+
+        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
+        self.build_tree_contents([
+            ('a/debian/patches/patch1', 
+                "\n".join(TRIVIAL_PATCH.splitlines()[:-1] + ["+d\n"]))])
+        quilt_push_all(tree_a.basedir)
+        tree_a.smart_add([tree_a.basedir])
+        tree_a.commit('apply patches')
+        self.assertFileEqual("d\n", "a/a")
+        self.build_tree_contents([
+            ('b/debian/patches/patch1', 
+                "\n".join(TRIVIAL_PATCH.splitlines()[:-1] + ["+c\n"]))])
+        quilt_push_all(tree_b.basedir)
+        tree_b.commit('apply patches')
+        self.assertFileEqual("c\n", "b/a")
+        conflicts = tree_a.merge_from_branch(tree_b.branch)
+        self.assertFileEqual("""\
+--- /dev/null\t2012-01-02 01:09:10.986490031 +0100
++++ base/a\t2012-01-02 20:03:59.710666215 +0100
+@@ -0,0 +1 @@
+<<<<<<< TREE
++d
+=======
++c
+>>>>>>> MERGE-SOURCE
+""", "a/debian/patches/patch1")
+        self.assertFileEqual("""\
+<<<<<<< TREE
+d
+=======
+c
+>>>>>>> MERGE-SOURCE
+""", "a/a")
+        self.assertEquals(2, conflicts)