Merge lp:~jelmer/bzr-builddeb/merge-upstream-hook into lp:bzr-builddeb

[Jelmer Vernooij]

This adds a hook that will be invoked after "bzr merge-upstream" has merged in a new upstream version. This can be used to e.g. update debian/ based on the new upstream sources.

E.g. in bzr-svn I plan to set this to "./debian/update-deps.py", which updates the python-subvertpy and bzr version dependencies based on upstream's info.py

[James Westby (james-w)]

review: Approve

=== modified file 'cmds.py'
--- cmds.py	2011-02-21 16:49:06 +0000
+++ cmds.py	2011-02-27 16:21:16 +0000
@@ -732,6 +732,7 @@
                     "Upstream version %s has already been merged." % version)
             self._add_changelog_entry(tree, package, version,
                 distribution_name, changelog)
+            run_hook(tree, 'merge-upstream', config)
         finally:
             tree.unlock()
         if not need_upstream_tarball:

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-27 02:08:17 +0000
+++ debian/changelog	2011-02-27 16:21:16 +0000
@@ -36,8 +36,9 @@
     confusion.
   * When building with distribution set to UNRELEASED, it is now assumed
     the build is targetted at the same distribution as the build before.
+  * A hook for 'bzr merge-upstream' has been added. LP: #657501
 
- -- Jelmer Vernooij <[e-mail]>  Sun, 27 Feb 2011 03:08:09 +0100
+ -- Jelmer Vernooij <[e-mail]>  Sun, 27 Feb 2011 17:14:07 +0100
 
 bzr-builddeb (2.6) unstable; urgency=low
 

=== modified file 'doc/user_manual/hooks.rst'
--- doc/user_manual/hooks.rst	2008-05-29 23:01:55 +0000
+++ doc/user_manual/hooks.rst	2011-02-27 16:21:16 +0000
@@ -17,6 +17,11 @@
 package. More hook points could be added if you have a specific need, contact
 me to discuss it if that is the case.
 
+  * ``merge-upstream`` - This is run after a new upstream version has
+     been merged into the current tree using ``bzr merge-upstream``.
+     This allows you to update the debian/ metadata based on the new upstream
+     release that has been merged in.
+
   * ``pre-export`` - This is run before the branch is exported to create
      the build directory. This allows you to modify the branch or the working
      tree. Note however that the tree to export is grabbed before the hook is

=== modified file 'tests/blackbox/test_merge_upstream.py'
--- tests/blackbox/test_merge_upstream.py	2010-07-29 18:46:35 +0000
+++ tests/blackbox/test_merge_upstream.py	2011-02-27 16:21:16 +0000
@@ -164,4 +164,22 @@
             os.path.abspath(rel2.tarball), changed_upstream.tree.basedir],
             working_dir=package.tree.basedir)
 
+    def test_hooks(self):
+        upstream = self.make_upstream()
+        rel1 = self.release_upstream(upstream)
+        package = self.import_upstream(rel1, upstream)
+        package_path = package.tree.basedir
+        os.mkdir(os.path.join(package_path, '.bzr-builddeb/'))
+        f = open(os.path.join(package_path, '.bzr-builddeb/local.conf'), 'wb')
+        try:
+          f.write('[HOOKS]\nmerge-upstream = touch muhook\n')
+        finally:
+          f.close()
+        changed_upstream = self.file_moved_replaced_upstream(upstream)
+        rel2 = self.release_upstream(changed_upstream)
+        self.run_bzr(['merge-upstream', '--version', str(rel2.version),
+            os.path.abspath(rel2.tarball), changed_upstream.tree.basedir],
+            working_dir=package.tree.basedir)
+        self.failUnlessExists(os.path.join(package.tree.basedir, 'muhook'))
+
 # vim: ts=4 sts=4 sw=4