Merge lp:~jelmer/bzr-builddeb/auto-tag into lp:bzr-builddeb

[Jelmer Vernooij]

Implement a 'automatic_tag_name' hook that provides tag names based on the debian version.

[James Westby (james-w)]

On Mon, 22 Mar 2010 14:03:21 -0000, Jelmer Vernooij <email address hidden> wrote:
> Jelmer Vernooij has proposed merging lp:~jelmer/bzr-builddeb/auto-tag into lp:bzr-builddeb.
>
> Requested reviews:
> Bzr-builddeb-hackers (bzr-builddeb-hackers)
>
>
> Implement a 'automatic_tag_name' hook that provides tag names based on the debian version.

Great.

Can we have the existing cmd_mark_uploaded command use this same code?

Thanks,

James

[Jelmer Vernooij (jelmer)]

I looked at that, but it seems like we'd end up with a more complex common function. The mark-uploaded code handles --force itself, allows more parameters and does the tag setting itself.

=== modified file '__init__.py'
--- __init__.py	2010-02-12 19:45:37 +0000
+++ __init__.py	2010-03-22 14:03:20 +0000
@@ -27,6 +27,8 @@
 
 import bzrlib
 from bzrlib import (
+    branch as _mod_branch,
+    errors,
     merge,
     msgeditor,
     )
@@ -129,6 +131,36 @@
         "the commit message")
 
 
+def debian_tag_name(branch, revid):
+    from bzrlib.plugins.builddeb.errors import MissingChangelogError
+    from bzrlib.plugins.builddeb.import_dsc import (DistributionBranch,
+        DistributionBranchSet)
+    from bzrlib.plugins.builddeb.util import (debuild_config, find_changelog)
+    t = branch.repository.revision_tree(revid)
+    config = debuild_config(t, False, False)
+    try:
+        (changelog, larstiq) = find_changelog(t, config.merge)
+    except MissingChangelogError:
+        # Not a debian package
+        return None
+    if changelog.distributions == 'UNRELEASED':
+        # The changelog still targets 'UNRELEASED', so apparently hasn't been 
+        # uploaded. XXX: Give a warning of some sort here?
+        return None
+    db = DistributionBranch(branch, None)
+    dbs = DistributionBranchSet()
+    dbs.add_branch(db)
+    return db.tag_name(changelog.version)
+
+
+try:
+    _mod_branch.Branch.hooks.install_named_hook("automatic_tag_name",
+         debian_tag_name,
+         "Automatically determine tag names from Debian version")
+except errors.UnknownHook:
+    pass # bzr < 2.2 doesn't have this hook.
+
+
 try:
     from bzrlib.revisionspec import revspec_registry
     revspec_registry.register_lazy("package:",