Merge lp:~jelmer/bzr-builddeb/merge-7 into lp:~bzr-builddeb-hackers/bzr-builddeb/trunk-old

[Jelmer Vernooij]

[Jelmer Vernooij (jelmer)]

This lets bzr-builddeb automatically detect merge mode by checking if
there's only a debian/ directory in the packaging branch and if
the package is not native.

--

=== modified file 'cmds.py'
--- cmds.py	2009-04-15 11:50:06 +0000
+++ cmds.py	2009-06-04 23:00:17 +0000
@@ -352,6 +352,10 @@
                 dont_purge = True
                 use_existing = True
             merge, native, split = self._build_type(config, merge, native, split)
+            if (not merge and not native and 
+                tree.inventory.root.children.keys() == ["debian"]):
+                # Default to merge mode if there's only a debian/ directory
+                merge = True
             build_cmd = self._get_build_command(config, builder, quick,
                     build_options)
             (changelog, larstiq) = find_changelog(tree, merge)

=== modified file 'debian/changelog'
--- debian/changelog	2009-03-23 23:50:11 +0000
+++ debian/changelog	2009-06-04 23:00:17 +0000
@@ -5,8 +5,10 @@
 
   [ Jelmer Vernooij ]
   * Support Vcs-Hg in the deb: directory service if bzr-hg is installed.
+  * Automatically use merge mode if there's only a debian/ directory in
+    the packaging branch. Closes: #529816.
 
- -- Jelmer Vernooij <[e-mail]>  Tue, 24 Mar 2009 00:49:44 +0100
+ -- Jelmer Vernooij <[e-mail]>  Fri, 05 Jun 2009 01:00:03 +0200
 
 bzr-builddeb (2.1.1) experimental; urgency=low
 

=== modified file 'doc/user_manual/license.rst'
--- doc/user_manual/license.rst	2007-07-10 20:52:45 +0000
+++ doc/user_manual/license.rst	2009-05-03 15:46:26 +0000
@@ -5,7 +5,7 @@
 
      (C) 2007 James Westby <[e-mail]> and
 
-is distributed under the followind terms::
+is distributed under the following terms::
 
    This file is part of bzr-builddeb.
 

=== modified file 'import_dsc.py'
--- import_dsc.py	2009-03-11 07:23:20 +0000
+++ import_dsc.py	2009-04-15 22:04:11 +0000
@@ -548,7 +548,7 @@
             return True
         return False
 
-    def has_upstream_version(self, version, md5=None):
+    def has_upstream_version(self, version, package=None, md5=None):
         """Whether this branch contains the upstream version specified.
 
         The version must be judged present by having the appropriate tag
@@ -563,27 +563,28 @@
         :return: True if the upstream branch contains the specified upstream
             version of the package. False otherwise.
         """
-        tag_name = self.upstream_tag_name(version)
-        if self._has_version(self.upstream_branch, tag_name, md5=md5):
-            return True
-        tag_name = self.upstream_tag_name(version, distro="debian")
-        if self._has_version(self.upstream_branch, tag_name, md5=md5):
-            return True
-        tag_name = self.upstream_tag_name(version, distro="ubuntu")
-        if self._has_version(self.upstream_branch, tag_name, md5=md5):
-            return True
+        for tag_name in self.possible_upstream_tag_names(version, package):
+            if self._has_version(self.upstream_branch, tag_name, md5=md5):
+                return True
         return False
 
-    def has_upstream_version_in_packaging_branch(self, version, md5=None):
-        tag_name = self.upstream_tag_name(version)
-        if self._has_version(self.branch, tag_name, md5=md5):
-            return True
-        tag_name = self.upstream_tag_name(version, distro="debian")
-        if self._has_version(self.branch, tag_name, md5=md5):
-            return True
-        tag_name = self.upstream_tag_name(version, distro="ubuntu")
-        if self._has_version(self.branch, tag_name, md5=md5):
-            return True
+    def possible_upstream_tag_names(self, version, package=None):
+        tags = [self.upstream_tag_name(version),
+                self.upstream_tag_name(version, distro="debian"),
+                self.upstream_tag_name(version, distro="ubuntu")]
+        if package is not None:
+            tags.extend(["%s-%s" % (package, version),
+                         "%s-%s" % (package, version)])
+        tags.extend(["v%s" % version,
+                     "release-%s" % version, 
+                     version])
+        return tags
+
+    def has_upstream_version_in_packaging_branch(self, version, package=None, 
+                                                 md5=None):
+        for tag_name in self.possible_upstream_tag_names(version, package):
+            if self._has_version(self.branch, tag_name, md5=md5):
+                return True
         return False
 
     def contained_versions(self, versions):
@@ -673,7 +674,7 @@
             return self.branch.tags.lookup_tag(ubuntu_tag_name)
         return self.branch.tags.lookup_tag(tag_name)
 
-    def revid_of_upstream_version(self, version):
+    def revid_of_upstream_version(self, version, package=None):
         """Returns the revision id corresponding to the upstream version.
 
         :param version: the Version object to extract the upstream version
@@ -682,15 +683,9 @@
         :return: the revision id corresponding to the upstream portion
             of the version
         """
-        tag_name = self.upstream_tag_name(version)
-        if self._has_version(self.upstream_branch, tag_name):
-            return self.upstream_branch.tags.lookup_tag(tag_name)
-        tag_name = self.upstream_tag_name(version, distro="debian")
-        if self._has_version(self.upstream_branch, tag_name):
-            return self.upstream_branch.tags.lookup_tag(tag_name)
-        tag_name = self.upstream_tag_name(version, distro="ubuntu")
-        if self._has_version(self.upstream_branch, tag_name):
-            return self.upstream_branch.tags.lookup_tag(tag_name)
+        for tag_name in self.possible_upstream_tag_names(version, package):
+            if self._has_version(self.upstream_branch, tag_name):
+                return self.upstream_branch.tags.lookup_tag(tag_name)
         tag_name = self.upstream_tag_name(version)
         return self.upstream_branch.tags.lookup_tag(tag_name)
 
@@ -1515,16 +1510,10 @@
             shutil.rmtree(tempdir)
             raise
 
-    def _revid_of_upstream_version_from_branch(self, version):
-        tag_name = self.upstream_tag_name(version)
-        if self._has_version(self.branch, tag_name):
-            return self.branch.tags.lookup_tag(tag_name)
-        tag_name = self.upstream_tag_name(version, distro="debian")
-        if self._has_version(self.branch, tag_name):
-            return self.branch.tags.lookup_tag(tag_name)
-        tag_name = self.upstream_tag_name(version, distro="ubuntu")
-        if self._has_version(self.branch, tag_name):
-            return self.branch.tags.lookup_tag(tag_name)
+    def _revid_of_upstream_version_from_branch(self, version, package=None):
+        for tag_name in self.possible_upstream_tag_names(version, package):
+            if self._has_version(self.branch, tag_name):
+                return self.branch.tags.lookup_tag(tag_name)
         tag_name = self.upstream_tag_name(version)
         return self.branch.tags.lookup_tag(tag_name)