Merge lp:~jelmer/testtools/setup.py-nobzr into lp:~testtools-committers/testtools/trunk

[Jelmer Vernooij]

Support installing a snapshot from a directory that is not a Bazaar working tree.

This is required for the daily builds.

[lp:~jelmer/testtools/setup.py-nobzr]

177. By Jelmer Vernooij on 2011-02-28

Catch NoWorkingTree rather than NotBranchError.

178. By Jelmer Vernooij on 2011-02-28

Catch both NotBranchError /and/ NoworkingTree as different versions of bzr seem to raise a different error.

[Jonathan Lange (jml)]

Looks good. Thanks!

review: Approve

=== modified file 'setup.py'
--- setup.py	2011-02-13 16:20:45 +0000
+++ setup.py	2011-02-28 12:16:32 +0000
@@ -7,10 +7,16 @@
 
 import testtools
 
+
 def get_revno():
+    import bzrlib.errors
     import bzrlib.workingtree
-    t = bzrlib.workingtree.WorkingTree.open_containing(__file__)[0]
-    return t.branch.revno()
+    try:
+        t = bzrlib.workingtree.WorkingTree.open_containing(__file__)[0]
+    except (bzrlib.errors.NotBranchError, bzrlib.errors.NoWorkingTree):
+        return None
+    else:
+        return t.branch.revno()
 
 
 def get_version_from_pkg_info():
@@ -38,6 +44,8 @@
     if pkg_info_version:
         return pkg_info_version
     revno = get_revno()
+    if revno is None:
+        return "snapshot"
     if phase == 'alpha':
         # No idea what the next version will be
         return 'next-r%s' % revno