Rev 2144: (Andrew Bennetts) Fix some bzr smart server tests, support sending/receiving byte strings for the smart server in /home/pqm/archives/thelove/bzr/+trunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Mon Nov 20 22:44:11 GMT 2006


------------------------------------------------------------
revno: 2144
revision-id: pqm at pqm.ubuntu.com-20061120224410-8a8116b29a11c1ff
parent: pqm at pqm.ubuntu.com-20061120223208-fc69d003f4c4a7ac
parent: andrew.bennetts at canonical.com-20061110165308-c4194a4c961a3590
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-11-20 22:44:10 +0000
message:
  (Andrew Bennetts) Fix some bzr smart server tests, support sending/receiving byte strings for the smart server
modified:
  bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
  bzrlib/transport/smart.py      ssh.py-20060608202016-c25gvf1ob7ypbus6-1
    ------------------------------------------------------------
    merged: andrew.bennetts at canonical.com-20061110165308-c4194a4c961a3590
    parent: andrew.bennetts at canonical.com-20061017130359-8e216acd1a757fbf
    parent: andrew.bennetts at canonical.com-20061110164431-fdc166350477cfc0
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: smart server unicode
    timestamp: Sat 2006-11-11 03:53:08 +1100
    message:
      Merge from bzr.dev.
        ------------------------------------------------------------
        merged: andrew.bennetts at canonical.com-20061110164431-fdc166350477cfc0
        parent: andrew.bennetts at canonical.com-20061013090052-57c1ea41ea67fd55
        parent: andrew.bennetts at canonical.com-20061110163300-407c8f248e493e00
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss HTTP support
        timestamp: Sat 2006-11-11 03:44:31 +1100
        message:
          Merge from bzr.dev.
    ------------------------------------------------------------
    merged: andrew.bennetts at canonical.com-20061017130359-8e216acd1a757fbf
    parent: andrew.bennetts at canonical.com-20061013090107-2ba0614ab9774376
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: smart server unicode
    timestamp: Tue 2006-10-17 23:03:59 +1000
    message:
      Don't UTF-8 decode paths in requests.  They should be url-quoted (and thus
      ASCII) already.
      
      Instead, change _encode_tuple and _decode_tuple to work with tuples of
      bytestrings rather than unicode objects.
    ------------------------------------------------------------
    merged: andrew.bennetts at canonical.com-20061013090107-2ba0614ab9774376
    parent: andrew.bennetts at canonical.com-20061013062134-446cdabcf228b78c
    parent: andrew.bennetts at canonical.com-20061013090052-57c1ea41ea67fd55
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: smart server unicode
    timestamp: Fri 2006-10-13 19:01:07 +1000
    message:
      Merge from bzr.dev
        ------------------------------------------------------------
        merged: andrew.bennetts at canonical.com-20061013090052-57c1ea41ea67fd55
        parent: andrew.bennetts at canonical.com-20061013060717-ccf711d3149c0a17
        parent: andrew.bennetts at canonical.com-20061013085657-7e2e97b73277150a
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss HTTP support
        timestamp: Fri 2006-10-13 19:00:52 +1000
        message:
          Merge from bzr.dev
    ------------------------------------------------------------
    merged: andrew.bennetts at canonical.com-20061013062134-446cdabcf228b78c
    parent: andrew.bennetts at canonical.com-20061013054511-40737c52be0aa712
    parent: andrew.bennetts at canonical.com-20061013060717-ccf711d3149c0a17
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: smart server unicode
    timestamp: Fri 2006-10-13 16:21:34 +1000
    message:
      Merge hpss HTTP support
        ------------------------------------------------------------
        merged: andrew.bennetts at canonical.com-20061013060717-ccf711d3149c0a17
        parent: andrew.bennetts at canonical.com-20061013054445-bdee3e274d05e45c
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss HTTP support
        timestamp: Fri 2006-10-13 16:07:17 +1000
        message:
          Ensure that a request's next_read_size() is 0 once an error response is sent.
          
          This is done by setting the finished flag in _send_response, and removing
          sync_with_request entirely.
          
          Also s/_finished_reading/_finished/ in SmartServerRequestProtocolOne.
    ------------------------------------------------------------
    merged: andrew.bennetts at canonical.com-20061013054511-40737c52be0aa712
    parent: andrew.bennetts at canonical.com-20061012085943-220c54b5ae219365
    parent: andrew.bennetts at canonical.com-20061013054445-bdee3e274d05e45c
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: smart server unicode
    timestamp: Fri 2006-10-13 15:45:11 +1000
    message:
      Merge from 'memory transport abspath'.
        ------------------------------------------------------------
        merged: andrew.bennetts at canonical.com-20061013054445-bdee3e274d05e45c
        parent: andrew.bennetts at canonical.com-20061012063051-5efaeb5409f0dbad
        parent: andrew.bennetts at canonical.com-20061013054424-f5728f4a9d1dd739
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss HTTP support
        timestamp: Fri 2006-10-13 15:44:45 +1000
        message:
          Merge from 'memory transport abspath'.
    ------------------------------------------------------------
    merged: andrew.bennetts at canonical.com-20061012085943-220c54b5ae219365
    parent: andrew.bennetts at canonical.com-20061012085801-36b60463388ea0e7
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: smart server unicode
    timestamp: Thu 2006-10-12 18:59:43 +1000
    message:
      Add a NEWS entry for this fix.
    ------------------------------------------------------------
    merged: andrew.bennetts at canonical.com-20061012085801-36b60463388ea0e7
    parent: andrew.bennetts at canonical.com-20061012063051-5efaeb5409f0dbad
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: smart server unicode
    timestamp: Thu 2006-10-12 18:58:01 +1000
    message:
      Fix dispatching of smart server requests involving unicode paths.
    ------------------------------------------------------------
    merged: andrew.bennetts at canonical.com-20061012063051-5efaeb5409f0dbad
    parent: andrew.bennetts at canonical.com-20061011071615-32d2dc808a3d0a82
    parent: andrew.bennetts at canonical.com-20061012060928-e387650ef98b70f5
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: hpss HTTP support
    timestamp: Thu 2006-10-12 16:30:51 +1000
    message:
      Merge chroot decorator



More information about the bazaar-commits mailing list