Merge lp:~jelmer/bzr-builddeb/post-build-tree-quilt into lp:bzr-builddeb

[Jelmer Vernooij]

Apply quilt patches (if requested) after building trees (e.g. "bzr co").

[James Westby (james-w)]

review: Approve

=== modified file '__init__.py'
--- __init__.py	2012-01-06 17:55:50 +0000
+++ __init__.py	2012-01-06 20:31:25 +0000
@@ -204,14 +204,14 @@
         merger.working_tree.path2id("debian/patches") is None):
         return
 
+    from bzrlib import trace
     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")
+        trace.mutter("skipping smart quilt merge, not enabled.")
         return
 
     import shutil
-    from bzrlib import trace
     from bzrlib.plugins.builddeb.errors import QuiltUnapplyError
     from bzrlib.plugins.builddeb.quilt import quilt_pop_all, QuiltError
     from bzrlib.plugins.builddeb.merge_quilt import tree_unapply_patches
@@ -265,7 +265,20 @@
         return
     from bzrlib.plugins.builddeb.merge_quilt import post_process_quilt_patches
     post_process_quilt_patches(
-            merger.working_tree, getattr(merger, "_old_quilt_series", []), policy)
+        merger.working_tree,
+        getattr(merger, "_old_quilt_series", []), policy)
+
+
+def post_build_tree_quilt(tree):
+    from bzrlib.plugins.builddeb.util import debuild_config
+    config = debuild_config(tree, tree)
+    policy = config.quilt_tree_policy
+    if policy is None:
+        return
+    from bzrlib.plugins.builddeb.merge_quilt import post_process_quilt_patches
+    from bzrlib import trace
+    trace.note("Applying quilt patches.");
+    post_process_quilt_patches(tree, [], policy)
 
 
 def pre_merge_fix_ancestry(merger):
@@ -342,6 +355,11 @@
         "bzrlib.merge", "Merger.hooks",
         'post_merge', post_merge_quilt_cleanup,
         'Cleaning up quilt temporary directories')
+    install_lazy_named_hook(
+        "bzrlib.mutabletree", "MutableTree.hooks",
+        'post_build_tree', post_build_tree_quilt,
+        'Applying quilt patches.')
+
 
 try:
     from bzrlib.revisionspec import revspec_registry

=== modified file 'tests/test_merge_quilt.py'
--- tests/test_merge_quilt.py	2012-01-06 17:55:50 +0000
+++ tests/test_merge_quilt.py	2012-01-06 20:31:25 +0000
@@ -24,7 +24,11 @@
 
 from bzrlib.hooks import install_lazy_named_hook
 
-from bzrlib.plugins.builddeb import pre_merge_quilt, post_merge_quilt_cleanup
+from bzrlib.plugins.builddeb import (
+    pre_merge_quilt,
+    post_build_tree_quilt,
+    post_merge_quilt_cleanup,
+    )
 from bzrlib.plugins.builddeb.quilt import quilt_push_all
 from bzrlib.plugins.builddeb.merge_quilt import tree_unapply_patches
 
@@ -88,6 +92,10 @@
             "bzrlib.merge", "Merger.hooks",
             'post_merge', post_merge_quilt_cleanup,
             'Cleaning up quilt temporary directories')
+        install_lazy_named_hook(
+            "bzrlib.mutabletree", "MutableTree.hooks",
+            "post_build_tree", post_build_tree_quilt,
+            "Apply quilt trees.")
 
     def test_diverged_patches(self):
         self.enable_hooks()
@@ -144,8 +152,7 @@
                 "[BUILDDEB]\nquilt-tree-policy = applied\n")])
 
         tree_b = tree_a.branch.create_checkout("b")
-        self.expectFailure("patches not yet applied after checkout",
-            self.assertFileEqual, "a\n", "b/a")
+        self.assertFileEqual("a\n", "b/a")
 
     def test_auto_apply_patches_after_update(self):
         self.enable_hooks()