Merge lp:~umang/quickly/593404-share-ver into lp:quickly

[Umang Varma]

Fixed lp:593404.

I've changed the updateversion so that the version while sharing is `<old_version>+r<bzr_revno>`.

I've not touched anything else, and I'm not sure whether I was supposed to or not. Like before, the version is saved to setup.py after sharing - I've not changed that. Let me know if fixing lp:593404 involved that also.

[Didier Roche-Tolomelli (didrocks)]

Thanks for your merge request there.

I think we don't need "-public" if we include +r<rev> there. Let's discuss the naming on IRC, shall we?
Thanks again for your work ;)

review: Needs Fixing

[Umang Varma (umang)]

On 08/03/2010 01:30 PM, Didier Roche wrote:
> Let's discuss the naming on IRC, shall we?
Sure. I can't say for sure when I'll have time this week, but I'll try
anyway.

[Didier Roche-Tolomelli (didrocks)]

I think this MR doesn't apply anymore, cleaning the list :)

Unmerged revisions

525. By Umang Varma on 2010-07-23

Fixed lp:593404. `quickly share` now shares with the following version number
format: "<oldversion>+r<bzr_revno>".

=== modified file 'data/templates/ubuntu-application/internal/packaging.py'
--- data/templates/ubuntu-application/internal/packaging.py	2010-06-25 11:16:49 +0000
+++ data/templates/ubuntu-application/internal/packaging.py	2010-07-23 09:11:26 +0000
@@ -21,6 +21,7 @@
 import sys
 
 from bzrlib.workingtree import WorkingTree
+from bzrlib.branch import Branch
 
 from quickly import configurationhandler
 from quickly import launchpadaccess
@@ -339,19 +340,15 @@
 
         # sharing only add -publicX to last release, no other update, no bumping
         if sharing:
-            splitted_release_version = old_version.split("-public")
-            if len(splitted_release_version) > 1:
-                try:
-                    share_version = float(splitted_release_version[1])
-                except ValueError:
-                    msg = _("Share version specified after -public in "\
-                            "setup.py is not a valid number: %s") \
-                            % splitted_release_version[1]
-                    raise invalid_versionning_scheme(msg)
-                new_version = splitted_release_version[0] + '-public' + \
-                              str(int(share_version + 1))
-            else:
-                new_version = old_version + "-public1"
+            # remove -public (applies if last share was with old YY.MM-publicX
+            # version)
+            new_version = old_version.split("-public")[0]
+            # remove +r[0-9]+ if last version was with new
+            # <previous-version>+r<bzr_revno>
+            new_version = new_version.split("+")[0]
+            cur_branch = Branch.open(".")
+            bzr_revno = cur_branch.revno()
+            new_version = "%s+r%d"%(new_version, bzr_revno)
 
         # automatically version to year.month(.subversion)
         else: