Merge lp:~mbp/bzr/trivial-old into lp:~bzr/bzr/trunk-old

[Martin Pool]

[Martin Pool (mbp)]

At the moment -Dhpss prints tracebacks to stderr whenever it does vfs operations. I agree with the intention, but it's too much for people who're doing other work and want to just be aware of hpss operations. spiv agreed verbally. This moves it to -Dhpssvfs and also improves a message when a connection is dropped.

[Vincent Ladeuil (vila)]

>>>>> "martin" == Martin Pool <email address hidden> writes:

    martin> Martin Pool has proposed merging lp:~mbp/bzr/trivial into lp:bzr.
    martin> Requested reviews:
    martin> bzr-core (bzr-core)

    martin> At the moment -Dhpss prints tracebacks to stderr whenever it does
    martin> vfs operations. I agree with the intention, but it's too much
    martin> for people who're doing other work and want to just be aware of
    martin> hpss operations.

+1 !1!!!1!

    martin> spiv agreed verbally. This moves it to -Dhpssvfs and
    martin> also improves a message when a connection is dropped.

Review approve

[Martin Pool (mbp)]

tweaked and sent to pqm

=== modified file 'bzrlib/help_topics/en/debug-flags.txt'
--- bzrlib/help_topics/en/debug-flags.txt	2009-03-18 23:43:51 +0000
+++ bzrlib/help_topics/en/debug-flags.txt	2009-07-07 04:35:14 +0000
@@ -15,6 +15,8 @@
 -Dhashcache       Log every time a working file is read to determine its hash.
 -Dhooks           Trace hook execution.
 -Dhpss            Trace smart protocol requests and responses.
+-Dhpssdetail      More hpss details.
+-Dhpssvfs         Traceback on vfs access to Remote objects.
 -Dhttp            Trace http connections, requests and responses
 -Dindex           Trace major index operations.
 -Dknit            Trace knit operations.

=== modified file 'bzrlib/remote.py'
--- bzrlib/remote.py	2009-06-26 09:24:34 +0000
+++ bzrlib/remote.py	2009-07-07 04:35:13 +0000
@@ -723,7 +723,7 @@
         invocation. If in doubt chat to the bzr network team.
         """
         if self._real_repository is None:
-            if 'hpss' in debug.debug_flags:
+            if 'hpssvfs' in debug.debug_flags:
                 import traceback
                 warning('VFS Repository access triggered\n%s',
                     ''.join(traceback.format_stack()))

=== modified file 'bzrlib/smart/medium.py'
--- bzrlib/smart/medium.py	2009-06-10 03:56:49 +0000
+++ bzrlib/smart/medium.py	2009-07-07 04:35:14 +0000
@@ -472,7 +472,8 @@
         if not line.endswith('\n'):
             # end of file encountered reading from server
             raise errors.ConnectionReset(
-                "please check connectivity and permissions")
+                "Unexpected end of message. Please check connectivity "
+                "and permissions, and report a bug if problems persist.")
         return line
 
     def _read_line(self):

=== modified file 'bzrlib/smart/message.py'
--- bzrlib/smart/message.py	2009-04-24 00:45:11 +0000
+++ bzrlib/smart/message.py	2009-07-07 04:35:14 +0000
@@ -283,7 +283,9 @@
                     self._protocol_decoder._get_in_buffer()[:10],
                     self._protocol_decoder.state_accept.__name__)
             raise errors.ConnectionReset(
-                "please check connectivity and permissions")
+                "Unexpected end of message. "
+                "Please check connectivity and permissions, and report a bug "
+                "if problems persist.")
         self._protocol_decoder.accept_bytes(bytes)
 
     def protocol_error(self, exception):

=== modified file 'bzrlib/tests/test_smart_transport.py'
--- bzrlib/tests/test_smart_transport.py	2009-07-04 08:37:34 +0000
+++ bzrlib/tests/test_smart_transport.py	2009-07-07 04:35:14 +0000
@@ -1507,7 +1507,8 @@
         ex = self.assertRaises(errors.ConnectionReset,
             response_handler.read_response_tuple)
         self.assertEqual("Connection closed: "
-            "please check connectivity and permissions ",
+            "Unexpected end of message. Please check connectivity "
+            "and permissions, and report a bug if problems persist. ",
             str(ex))
 
     def test_server_offset_serialisation(self):