Merge lp:~jelmer/bzr-builder/git-bp-compat into lp:bzr-builder

[Jelmer Vernooij]

Support the git-buildpackage syntax for upstream version tags: "upstream/FOO" rather than "upstream-FOO".

This makes daily builds of packages imported from git a bit easier.

[James Westby (james-w)]

review: Approve

=== modified file 'deb_util.py'
--- deb_util.py	2011-12-15 17:08:16 +0000
+++ deb_util.py	2012-03-25 11:00:24 +0000
@@ -112,8 +112,16 @@
     :param version: Package version
     :param dest_dir: Destination directory
     """
-    tag_name = "upstream-%s" % version
-    revid = branch.tags.lookup_tag(tag_name)
+    tag_names = ["upstream-%s" % version, "upstream/%s" % version]
+    for tag_name in tag_names:
+        try:
+            revid = branch.tags.lookup_tag(tag_name)
+        except errors.NoSuchTag:
+            pass
+        else:
+            break
+    else:
+        raise errors.NoSuchTag(tag_names[0])
     tree = branch.repository.revision_tree(revid)
     rev = branch.repository.get_revision(revid)
     if 'deb-pristine-delta' in rev.properties: