Merge lp:~jelmer/bzr-builddeb/svn-upstream-import into lp:bzr-builddeb

[Jelmer Vernooij]

This updates bzr-builddeb to prefer updating the upstream version string using a format that's already being used (if ~svn is used, update that rather than adding ~bzr, etc).

It also adds support for updating the ~svn / +bzr suffixes when upstream is not a foreign branch but an import of a foreign branch.

[James Westby (james-w)]

review: Approve

=== modified file 'merge_upstream.py'
--- merge_upstream.py	2010-08-19 21:11:02 +0000
+++ merge_upstream.py	2010-08-24 21:41:08 +0000
@@ -35,6 +35,7 @@
     # Prior to 0.1.15 the debian module was called debian_bundle
     from debian_bundle.changelog import Version
 
+from bzrlib.errors import InvalidRevisionId
 from bzrlib.revisionspec import RevisionSpec
 
 from bzrlib.plugins.builddeb.util import get_snapshot_revision
@@ -43,6 +44,27 @@
 TAG_PREFIX = "upstream-"
 
 
+def extract_svn_revno(rev):
+    """Extract the Subversion number of a revision from a revision.
+
+    :param rev: Revision object
+    :return: Revision number, None if this was not a Subversion revision or
+         if the revision number could not be determined (bzr-svn not available).
+    """
+    try:
+        from bzrlib.plugins.svn import extract_svn_foreign_revid
+    except ImportError:
+        # No svn support
+        return None
+    else:
+        try:
+            (svn_uuid, branch_path, svn_revno) = extract_svn_foreign_revid(rev)
+        except InvalidRevisionId:
+            return None
+        else:
+            return svn_revno
+
+
 def upstream_version_add_revision(upstream_branch, version_string, revid):
     """Update the revision in a upstream version string.
 
@@ -51,7 +73,7 @@
     :param revid: Revision id of the revision
     """
     revno = upstream_branch.revision_id_to_revno(revid)
-  
+
     if "+bzr" in version_string:
         return "%s+bzr%d" % (version_string[:version_string.rfind("+bzr")], revno)
 
@@ -59,17 +81,18 @@
         return "%s~bzr%d" % (version_string[:version_string.rfind("~bzr")], revno)
 
     rev = upstream_branch.repository.get_revision(revid)
-    svn_revmeta = getattr(rev, "svn_meta", None)
-    if svn_revmeta is not None:
-        svn_revno = svn_revmeta.revnum
-
-        if "+svn" in version_string:
-            return "%s+svn%d" % (version_string[:version_string.rfind("+svn")], svn_revno)
-        if "~svn" in version_string:
-            return "%s~svn%d" % (version_string[:version_string.rfind("~svn")], svn_revno)
+    svn_revno = extract_svn_revno(rev)
+
+    # FIXME: Raise error if +svn/~svn is present and svn_revno is not set?
+    if "+svn" in version_string and svn_revno:
+        return "%s+svn%d" % (version_string[:version_string.rfind("+svn")], svn_revno)
+    if "~svn" in version_string and svn_revno:
+        return "%s~svn%d" % (version_string[:version_string.rfind("~svn")], svn_revno)
+
+    if svn_revno:
         return "%s+svn%d" % (version_string, svn_revno)
-
-    return "%s+bzr%d" % (version_string, revno)
+    else:
+        return "%s+bzr%d" % (version_string, revno)
 
 
 def _upstream_branch_version(revhistory, reverse_tag_dict, package, 
@@ -122,7 +145,7 @@
     if previous_revision is not None:
         previous_revspec = RevisionSpec.from_string(previous_revision)
         previous_revno, _ = previous_revspec.in_history(upstream_branch)
-        # Trim revision history - we don't care about any revisions 
+        # Trim revision history - we don't care about any revisions
         # before the revision of the previous version
     else:
         previous_revno = 0

=== modified file 'tests/test_merge_upstream.py'
--- tests/test_merge_upstream.py	2010-08-19 21:11:02 +0000
+++ tests/test_merge_upstream.py	2010-08-24 21:41:08 +0000
@@ -49,14 +49,9 @@
     return self.revnos[revid]
 
   def get_revision(self, revid):
-    class MockSvnMeta(object):
-      
-      def __init__(self, svn_revno):
-        self.revnum = svn_revno
-
     rev = Revision(revid)
     if revid in self.svn_revnos:
-      rev.svn_meta = MockSvnMeta(self.svn_revnos[revid])
+      rev.foreign_revid = ("uuid", "bp", self.svn_revnos[revid])
     return rev
 
   def test_update_plus_rev(self):