Merge lp:~jelmer/bzr-builddeb/suggest-snapshot into lp:bzr-builddeb

[Jelmer Vernooij]

If merge-upstream doesn't know what to merge it currently suggests the user to specify --version. Changes this to also suggest --snapshot if the upstream branch is known.

[James Westby (james-w)]

Breaking the long line would be good, but otherwise this is a good idea.

Thanks,

James

review: Approve

=== modified file 'cmds.py'
--- cmds.py	2011-03-04 18:29:16 +0000
+++ cmds.py	2011-03-11 13:03:29 +0000
@@ -702,7 +702,10 @@
                 version = primary_upstream_source.get_latest_version(
                     package, current_version)
             if version is None:
-                raise BzrCommandError("You must specify the version number using --version.")
+                if upstream_branch_source is not None:
+                    raise BzrCommandError("You must specify the version number using --version or specify --snapshot to merge a snapshot from the upstream branch.")
+                else:
+                    raise BzrCommandError("You must specify the version number using --version.")
             assert isinstance(version, str)
             note("Using version string %s." % (version))
             # Look up the revision id from the version string

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-11 01:12:42 +0000
+++ debian/changelog	2011-03-11 13:03:29 +0000
@@ -1,3 +1,10 @@
+bzr-builddeb (2.7.1) unstable; urgency=low
+
+  * Add Ubuntu oneiric and Debian wheezy to the list of supported
+    distributions.
+
+ -- Jelmer Vernooij <[e-mail]>  Fri, 11 Mar 2011 11:18:52 +0100
+
 bzr-builddeb (2.7) unstable; urgency=low
 
   [ James Westby ]

=== modified file 'util.py'
--- util.py	2011-02-28 13:11:48 +0000
+++ util.py	2011-03-11 13:03:29 +0000
@@ -76,12 +76,12 @@
     )
 
 
-DEBIAN_RELEASES = ('woody', 'sarge', 'etch', 'lenny', 'squeeze', 'stable',
-        'testing', 'unstable', 'experimental', 'frozen', 'sid')
+DEBIAN_RELEASES = ('woody', 'sarge', 'etch', 'lenny', 'squeeze', 'wheezy',
+        'stable', 'testing', 'unstable', 'experimental', 'frozen', 'sid')
 DEBIAN_POCKETS = ('', '-security', '-proposed-updates', '-backports')
 UBUNTU_RELEASES = ('warty', 'hoary', 'breezy', 'dapper', 'edgy',
         'feisty', 'gutsy', 'hardy', 'intrepid', 'jaunty', 'karmic',
-        'lucid', 'maverick', 'natty')
+        'lucid', 'maverick', 'natty', "oneiric")
 UBUNTU_POCKETS = ('', '-proposed', '-updates', '-security', '-backports')