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

[Jelmer Vernooij]

Provide the 'bzr merge-package' functionality as a hook to 'bzr merge'.

[lp:~jelmer/bzr-builddeb/merge-package-as-hook]

681. By Jelmer Vernooij on 2012-01-02

Document deprecation of 'bzr merge-package.

682. By Jelmer Vernooij on 2012-01-02

Mention merge rather than merge-package.

[James Westby (james-w)]

Hi,

This is great, thanks for doing it. My only question is whether

120 - 're-run the "merge-package" command to finish. '
121 + 're-run the "merge" command to finish. '

should be conditional on the bzrlib feature too?

Thanks,

James

review: Approve

[Jelmer Vernooij (jelmer)]

Am 02/01/12 18:43, schrieb James Westby:
> Review: Approve
>
> Hi,
>
> This is great, thanks for doing it. My only question is whether
>
> 120 - 're-run the "merge-package" command to finish. '
> 121 + 're-run the "merge" command to finish. '
>
> should be conditional on the bzrlib feature too?
That's a good point - I'll merge while fixing that.

Cheers,

Jelmer

=== modified file '__init__.py'
--- __init__.py	2011-12-18 01:11:10 +0000
+++ __init__.py	2012-01-02 16:42:32 +0000
@@ -191,6 +191,25 @@
     return db.tag_name(changelog.version)
 
 
+def pre_merge_fix_ancestry(merger):
+    from bzrlib.plugins.builddeb.config import BUILD_TYPE_NATIVE
+    from bzrlib.plugins.builddeb.util import debuild_config
+    from bzrlib.plugins.builddeb.merge_package import fix_ancestry_as_needed
+    from bzrlib.workingtree import WorkingTree
+    if not isinstance(merger.this_tree, WorkingTree):
+        return
+    if merger.other_branch is None:
+        return
+    if (not merger.this_tree.path2id("debian/changelog") or
+        not merger.other_tree.path2id("debian/changelog")):
+        return
+    this_config = debuild_config(merger.this_tree, merger.this_tree)
+    other_config = debuild_config(merger.other_tree, merger.other_tree)
+    if not (this_config.build_type == BUILD_TYPE_NATIVE or
+            other_config.build_type == BUILD_TYPE_NATIVE):
+        fix_ancestry_as_needed(merger.this_tree, merger.other_branch,
+            source_revid=merger.other_tree.get_revision_id())
+
 try:
     from bzrlib.hooks import install_lazy_named_hook
 except ImportError: # Compatibility with bzr < 2.4
@@ -237,6 +256,10 @@
         "bzrlib.branch", "Branch.hooks",
         "automatic_tag_name", debian_tag_name,
          "Automatically determine tag names from Debian version")
+    install_lazy_named_hook(
+        "bzrlib.merge", "Merger.hooks",
+        "pre_merge", pre_merge_fix_ancestry,
+        "Fix the branch ancestry prior to a merge")
 
 try:
     from bzrlib.revisionspec import revspec_registry

=== modified file 'cmds.py'
--- cmds.py	2011-12-16 14:55:04 +0000
+++ cmds.py	2012-01-02 16:42:32 +0000
@@ -36,6 +36,7 @@
 
 from bzrlib import (
     urlutils,
+    version_info as bzrlib_version,
     )
 from bzrlib.branch import Branch
 from bzrlib.bzrdir import BzrDir
@@ -1247,13 +1248,25 @@
     so that the user only needs to deal with packaging branch merge issues.
 
     In the opposite case a normal merge will be performed.
+
+    As of bzr 2.5 and bzr-builddeb 2.8.1, this functionality is automatically
+    provided as part of bzr merge.
     """
     takes_options = ['revision']
     takes_args = ['source']
 
+    if bzrlib_version >= (2, 5):
+        hidden = True
+
     def run(self, source, revision=None):
+        from bzrlib import ui
+        from bzrlib.merge import Merger
         from bzrlib.tag import _merge_tags_if_possible
         from bzrlib.plugins.builddeb.merge_package import fix_ancestry_as_needed
+        if 'pre_merge' in Merger.hooks:
+            ui.ui_factory.show_warning(
+                "The merge-package command is deprecated. Use 'bzr merge' "
+                "instead.")
         source_branch = None
         # Get the target branch.
         try:

=== modified file 'debian/NEWS'
--- debian/NEWS	2011-11-30 16:24:04 +0000
+++ debian/NEWS	2012-01-02 16:42:32 +0000
@@ -1,4 +1,11 @@
-bzr-builddeb (2.7.10) precise; urgency=low
+bzr-builddeb (2.8.1) precise; urgency=low
+
+  The 'bzr merge-package' command is now deprecated, and its
+  functionality is available as part of 'bzr merge'.
+
+ -- Jelmer Vernooij <[e-mail]>  Mon, 02 Jan 2012 17:32:03 +0100
+
+bzr-builddeb (2.8.0) precise; urgency=low
 
   bzr-builddeb now warns when using the get-orig-source target in debian/rules
   to fetch the currently package upstream tarball. get-packaged-orig-source

=== modified file 'debian/changelog'
--- debian/changelog	2011-12-17 16:43:38 +0000
+++ debian/changelog	2012-01-02 16:42:32 +0000
@@ -1,8 +1,10 @@
 bzr-builddeb (2.8.1) UNRELEASED; urgency=low
 
   * New revision specifier 'upstream:'. LP: #905728
+  * Provide merge-package functionality as a hook for 'bzr merge'. LP:
+    #486075, LP: #910900
 
- -- Jelmer Vernooij <[e-mail]>  Sat, 17 Dec 2011 17:41:19 +0100
+ -- Jelmer Vernooij <[e-mail]>  Mon, 02 Jan 2012 17:27:32 +0100
 
 bzr-builddeb (2.8.0) unstable; urgency=low
 

=== modified file 'errors.py'
--- errors.py	2011-06-14 14:04:53 +0000
+++ errors.py	2012-01-02 16:42:32 +0000
@@ -168,7 +168,7 @@
     _fmt = ('The upstream branches for the merge source and target have '
             'diverged. Unfortunately, the attempt to fix this problem '
             'resulted in conflicts. Please resolve these, commit and '
-            're-run the "merge-package" command to finish. '
+            're-run the "merge" command to finish. '
             'Alternatively, until you commit you can use "bzr revert" to '
             'restore the state of the unmerged branch.')
 

=== modified file 'merge_package.py'
--- merge_package.py	2011-11-10 15:29:40 +0000
+++ merge_package.py	2012-01-02 16:42:32 +0000
@@ -38,17 +38,6 @@
 from bzrlib.plugins.builddeb.util import find_changelog
 
 
-def _latest_version(branch, revid):
-    """Version of the most recent source package upload in the given `branch`.
-    
-    :param branch: A Branch object containing the source upload of interest.
-    :param revid: Revision id in the branch
-    """
-    changelog, _ignore = find_changelog(branch.repository.revision_tree(revid), False)
-
-    return changelog.version
-
-
 def _upstream_version_data(branch, revid):
     """Most recent upstream versions/revision IDs of the merge source/target.
 
@@ -57,9 +46,12 @@
 
     :param branch: The merge branch.
     :param revid: The revision in the branch to consider
+    :param tree: Optional tree for the revision
     """
     db = DistributionBranch(branch, branch)
-    uver = _latest_version(branch, revid).upstream_version
+    tree = branch.repository.revision_tree(revid)
+    changelog, _ignore = find_changelog(tree, False)
+    uver = changelog.version.upstream_version
     upstream_revids = db.pristine_upstream_source.version_as_revisions(None, uver)
     if upstream_revids.keys() != [None]:
         raise MultipleUpstreamTarballsNotSupported()

=== modified file 'tests/blackbox/test_merge_package.py'
--- tests/blackbox/test_merge_package.py	2009-08-28 16:48:42 +0000
+++ tests/blackbox/test_merge_package.py	2012-01-02 16:42:32 +0000
@@ -18,9 +18,13 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 
+from bzrlib.merge import Merger
 import os
 import string
 
+from bzrlib import version_info as bzrlib_version
+from bzrlib.tests import TestNotApplicable
+from bzrlib.plugins.builddeb import pre_merge_fix_ancestry
 from bzrlib.plugins.builddeb.tests import BuilddebTestCase
 
 
@@ -71,6 +75,27 @@
             ['branches for the merge source and target have diverged'],
             'merge-package %s' % merge_source)
 
+    def test_pre_merge_hook_shared_rev_conflict(self):
+        """Source upstream conflicts with target packaging -> Error.
+
+        The debian upstream and the ubuntu packaging branches will differ
+        with respect to the content of the file 'c'.
+
+        The conflict cannot be resolved by fix_ancestry_as_needed().
+        The `SharedUpstreamConflictsWithTargetPackaging` exception is
+        thrown instead.
+        """
+        if bzrlib_version < (2, 5):
+            raise TestNotApplicable("pre_merge hook requires bzr 2.5")
+        target, _source = self.make_conflicting_branches_setup()
+        os.chdir('ubup-o')
+        merge_source = '../debp-n'
+        Merger.hooks.install_named_hook(
+            "pre_merge", pre_merge_fix_ancestry, "fix ancestry")
+        self.run_bzr_error(
+            ['branches for the merge source and target have diverged'],
+            'merge %s' % merge_source)
+
     def make_conflicting_branches_setup(self):
         """
         Set up the following test configuration (debian upstream newer).

=== modified file 'tests/test_merge_package.py'
--- tests/test_merge_package.py	2011-11-10 15:29:40 +0000
+++ tests/test_merge_package.py	2012-01-02 16:42:32 +0000
@@ -65,28 +65,6 @@
 
 class MergePackageTests(TestCaseWithTransport):
 
-    def test_latest_upstream_versions(self):
-        """Check correctness of upstream version computation."""
-        ubup_o, debp_n, _ubuu, _debu = self._setup_debian_upstream_newer()
-        # Ubuntu upstream.
-        self.assertEquals(
-            MP._latest_version(ubup_o.branch, ubup_o.last_revision()).upstream_version,
-            '1.2')
-        # Debian upstream.
-        self.assertEquals(
-            MP._latest_version(debp_n.branch, debp_n.last_revision()).upstream_version,
-            '1.10')
-
-        ubuntup, debianp = self._setup_upstreams_not_diverged()
-        # Ubuntu upstream.
-        self.assertEquals(
-            MP._latest_version(ubuntup.branch, ubuntup.last_revision()).upstream_version,
-            '1.4')
-        # Debian upstream.
-        self.assertEquals(
-            MP._latest_version(debianp.branch, debianp.last_revision()).upstream_version,
-            '2.2')
-
     def test__upstream_version_data(self):
         ubup_o, debp_n, _ubuu, _debu = self._setup_debian_upstream_newer()
         vdata = MP._upstream_version_data(debp_n.branch, debp_n.last_revision())