Rev 4513: (mbp) move hpss vfs tracebacks to -Dhpssvfs in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4513 [merge]
revision-id: pqm at pqm.ubuntu.com-20090707053221-1qcpid9iya2ema6p
parent: pqm at pqm.ubuntu.com-20090706163157-6hqiw8ehs0u4uojv
parent: mbp at sourcefrog.net-20090707043147-aeyoq8vgof2kz7f2
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2009-07-07 06:32:21 +0100
message:
  (mbp) move hpss vfs tracebacks to -Dhpssvfs
modified:
  bzrlib/help_topics/en/debug-flags.txt debugflags.txt-20090312050229-rdspqbqq4fzbjtpe-1
  bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
  bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
  bzrlib/smart/message.py        message.py-20080222013625-ncqmh3nrxjkxab87-1
  bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
=== modified file 'bzrlib/help_topics/en/debug-flags.txt'
--- a/bzrlib/help_topics/en/debug-flags.txt	2009-03-18 23:43:51 +0000
+++ b/bzrlib/help_topics/en/debug-flags.txt	2009-07-06 09:47:35 +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'
--- a/bzrlib/remote.py	2009-06-26 09:24:34 +0000
+++ b/bzrlib/remote.py	2009-07-06 09:47:35 +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'
--- a/bzrlib/smart/medium.py	2009-06-10 03:56:49 +0000
+++ b/bzrlib/smart/medium.py	2009-07-07 04:31:47 +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'
--- a/bzrlib/smart/message.py	2009-04-24 00:45:11 +0000
+++ b/bzrlib/smart/message.py	2009-07-06 09:45:49 +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'
--- a/bzrlib/tests/test_smart_transport.py	2009-07-04 08:37:34 +0000
+++ b/bzrlib/tests/test_smart_transport.py	2009-07-07 04:31:47 +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):