[Pkg-bazaar-commits] ./bzr/unstable r413: - more indicators at top of test output

[Martin Pool]

------------------------------------------------------------
revno: 413
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-05-09 16:09:42 +1000
message:
  - more indicators at top of test output
  - tidy up remotebranch stuff
modified:
  bzrlib/remotebranch.py
  testbzr
-------------- next part --------------
=== modified file 'bzrlib/remotebranch.py'
--- a/bzrlib/remotebranch.py	2005-05-09 05:59:53 +0000
+++ b/bzrlib/remotebranch.py	2005-05-09 06:09:42 +0000
@@ -25,33 +25,18 @@
 """
 
 
-## XXX: This is pretty slow on high-latency connections because it
-## doesn't keep the HTTP connection alive.  If you have a smart local
-## proxy it may be much better.  Eventually I want to switch to
-## urlgrabber which should use HTTP much more efficiently.
-
-
 import gzip
 from sets import Set
 from cStringIO import StringIO
 
 from errors import BzrError, BzrCheckError
-from revision import Revision
 from branch import Branch
-from inventory import Inventory
-
-# h = HTTPConnection('localhost:8000')
-# h = HTTPConnection('bazaar-ng.org')
 
 # velocitynet.com.au transparently proxies connections and thereby
 # breaks keep-alive -- sucks!
 
 
 
-
-# prefix = 'http://localhost:8000'
-BASE_URL = 'http://bazaar-ng.org/bzr/bzr.dev/'
-
 ENABLE_URLGRABBER = False
 
 def get_url(url, compressed=False):
@@ -112,6 +97,10 @@
     
 
 def simple_walk():
+    from revision import Revision
+    from branch import Branch
+    from inventory import Inventory
+
     got_invs = Set()
     got_texts = Set()
 
@@ -155,6 +144,7 @@
 
 
 def try_me():
+    BASE_URL = 'http://bazaar-ng.org/bzr/bzr.dev/'
     b = RemoteBranch(BASE_URL)
     ## print '\n'.join(b.revision_history())
     from log import show_log

=== modified file 'testbzr'
--- a/testbzr	2005-05-09 04:59:00 +0000
+++ b/testbzr	2005-05-09 06:09:42 +0000
@@ -124,7 +124,7 @@
 
 try:
     mypath = os.path.abspath(sys.argv[0])
-    print 'running tests from', mypath
+    print '%-30s %s' % ('running tests from', mypath)
 
     global BZRPATH
 
@@ -133,7 +133,8 @@
     else:
         BZRPATH = os.path.join(os.path.split(mypath)[0], 'bzr')
 
-    print 'against bzr', BZRPATH
+    print '%-30s %s' % ('against bzr', BZRPATH)
+    print '%-30s %s' % ('in directory', os.getcwd())
     print
     print backtick([BZRPATH, 'version'])