Rev 1699: (jam) use medusa as an ftp-server provider, fix FtpTransport in /home/pqm/archives/thelove/bzr/+trunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Mon May 22 15:53:13 BST 2006


------------------------------------------------------------
revno: 1699
revision-id: pqm at pqm.ubuntu.com-20060522145312-94c3c934d7cbd9ff
parent: pqm at pqm.ubuntu.com-20060522121336-5acff1b97052717d
parent: john at arbash-meinel.com-20060522053251-ede9c47dad9a678e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-05-22 15:53:12 +0100
message:
  (jam) use medusa as an ftp-server provider, fix FtpTransport
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
  bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
  bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
  bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060522053251-ede9c47dad9a678e
    parent: john at arbash-meinel.com-20060519004331-1b2deceda25895c3
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: ftp-server
    timestamp: Mon 2006-05-22 00:32:51 -0500
    message:
      Only load medusa if you are running the test suite.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060519004331-1b2deceda25895c3
    parent: john at arbash-meinel.com-20060519003514-e67fbb17be0c0f82
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: ftp-server
    timestamp: Thu 2006-05-18 19:43:31 -0500
    message:
      reverting 1734
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060519003514-e67fbb17be0c0f82
    parent: john at arbash-meinel.com-20060519002919-60a90e73c26bf86c
    parent: pqm at pqm.ubuntu.com-20060518085327-89822346d9321aba
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: ftp-server
    timestamp: Thu 2006-05-18 19:35:14 -0500
    message:
      [merge] bzr.dev 1714
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060519002919-60a90e73c26bf86c
    parent: john at arbash-meinel.com-20060517014913-136aacf62f36a54d
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: ftp-server
    timestamp: Thu 2006-05-18 19:29:19 -0500
    message:
      removing 'revision-store' again.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060517014913-136aacf62f36a54d
    parent: john at arbash-meinel.com-20060517014424-411883c68cfe8dda
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: ftp-server
    timestamp: Tue 2006-05-16 20:49:13 -0500
    message:
      Added a default exception for append
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060517014424-411883c68cfe8dda
    parent: john at arbash-meinel.com-20060517012400-b4d6d15e211d3b11
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: ftp-server
    timestamp: Tue 2006-05-16 20:44:24 -0500
    message:
      Setting some default exception classes, which can help a lot.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060517012400-b4d6d15e211d3b11
    parent: john at arbash-meinel.com-20060516213423-8e34dc5901a621da
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: ftp-server
    timestamp: Tue 2006-05-16 20:24:00 -0500
    message:
      Add prompt for password for ftp.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060516213423-8e34dc5901a621da
    parent: john at arbash-meinel.com-20060516213114-d9fb1b3ec43aed5f
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: ftp-server
    timestamp: Tue 2006-05-16 16:34:23 -0500
    message:
      Fix NEWS entry.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060516213114-d9fb1b3ec43aed5f
    parent: john at arbash-meinel.com-20060516212542-5659651d4c049ac6
    parent: pqm at pqm.ubuntu.com-20060516144152-05cdf3bd9a34b467
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: ftp-server
    timestamp: Tue 2006-05-16 16:31:14 -0500
    message:
      [merge] bzr.dev 1708
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060516212542-5659651d4c049ac6
    parent: john at arbash-meinel.com-20060516212410-1d03dc2e66a76ead
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: ftp-server
    timestamp: Tue 2006-05-16 16:25:42 -0500
    message:
      rmdir can raise PathError when it cannot delete a directory.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060516212410-1d03dc2e66a76ead
    parent: john at arbash-meinel.com-20060516212117-8185e321cc0c62b6
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: ftp-server
    timestamp: Tue 2006-05-16 16:24:10 -0500
    message:
      Found the problem, was sending 2 responses
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060516212117-8185e321cc0c62b6
    parent: john at arbash-meinel.com-20060516205716-f37dd60989fd7782
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: ftp-server
    timestamp: Tue 2006-05-16 16:21:17 -0500
    message:
      For some reason after RNTO we get a failure for has()
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060516205716-f37dd60989fd7782
    parent: john at arbash-meinel.com-20060516204732-becba9454755b46d
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: ftp-server
    timestamp: Tue 2006-05-16 15:57:16 -0500
    message:
      Fix error handling for ftp.put()
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060516204732-becba9454755b46d
    parent: john at arbash-meinel.com-20060516204638-aef44fe9d7ac8697
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: ftp-server
    timestamp: Tue 2006-05-16 15:47:32 -0500
    message:
      Fix errors in cmd_size
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060516204638-aef44fe9d7ac8697
    parent: john at arbash-meinel.com-20060516202836-8440fb710786f4d8
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: ftp-server
    timestamp: Tue 2006-05-16 15:46:38 -0500
    message:
      Overloading cmd_size and cmd_mkd so that the test suite can handle directories.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060516202836-8440fb710786f4d8
    parent: john at arbash-meinel.com-20060516202358-c9ce6d97e8bc03cd
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: ftp-server
    timestamp: Tue 2006-05-16 15:28:36 -0500
    message:
      Handle trying to list a file instead of a dir
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060516202358-c9ce6d97e8bc03cd
    parent: john at arbash-meinel.com-20060516202135-210834f3646e9f74
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: ftp-server
    timestamp: Tue 2006-05-16 15:23:58 -0500
    message:
      Cleanup mkdir and rmdir error handling.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060516202135-210834f3646e9f74
    parent: john at arbash-meinel.com-20060516201530-1628ba4d4dbb7512
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: ftp-server
    timestamp: Tue 2006-05-16 15:21:35 -0500
    message:
      Changing raise Error to raise errors.Error
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060516201530-1628ba4d4dbb7512
    parent: john at arbash-meinel.com-20060516201427-b709d09c3ce07f80
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: ftp-server
    timestamp: Tue 2006-05-16 15:15:30 -0500
    message:
      Fixing list_dir when there is nothing in the directory.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060516201427-b709d09c3ce07f80
    parent: john at arbash-meinel.com-20060516200627-a973cf0288383619
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: ftp-server
    timestamp: Tue 2006-05-16 15:14:27 -0500
    message:
      fixing more tests.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060516200627-a973cf0288383619
    parent: john at arbash-meinel.com-20060516192906-f9a30ca62dbb6ecf
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: ftp-server
    timestamp: Tue 2006-05-16 15:06:27 -0500
    message:
      Getting the append() tests to pass, and adding better error translation. These are probably dependent on the ftp test server, but for now it works.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060516192906-f9a30ca62dbb6ecf
    parent: john at arbash-meinel.com-20060516192402-1bf360a4ad4ac0ac
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: ftp-server
    timestamp: Tue 2006-05-16 14:29:06 -0500
    message:
      You need to raise exceptions for them to do anything :)
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060516192402-1bf360a4ad4ac0ac
    parent: john at arbash-meinel.com-20060516192004-a8cd2b94df64711f
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: ftp-server
    timestamp: Tue 2006-05-16 14:24:02 -0500
    message:
      [patch] Alexandre Saint: enable append support for ftp
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060516192004-a8cd2b94df64711f
    parent: john at arbash-meinel.com-20060516183719-112fa8f7d4503aaa
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: ftp-server
    timestamp: Tue 2006-05-16 14:20:04 -0500
    message:
      Creating child of ftp_channel to support renaming, need to add appending.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060516183719-112fa8f7d4503aaa
    parent: john at arbash-meinel.com-20060516182823-358f8716e08b6910
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: ftp-server
    timestamp: Tue 2006-05-16 13:37:19 -0500
    message:
      Help clean up properly after a failed test.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060516182823-358f8716e08b6910
    parent: john at arbash-meinel.com-20060516180733-f86f157a411c2193
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: ftp-server
    timestamp: Tue 2006-05-16 13:28:23 -0500
    message:
      Adding port to ftp connections, and not logging the ftp password
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060516180733-f86f157a411c2193
    parent: john at arbash-meinel.com-20060516173937-fcfdaec45baa5992
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: ftp-server
    timestamp: Tue 2006-05-16 13:07:33 -0500
    message:
      Moved most of sftp.split_url into a Transport function.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060516173937-fcfdaec45baa5992
    parent: john at arbash-meinel.com-20060516173230-0919a3a599c202d5
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: ftp-server
    timestamp: Tue 2006-05-16 12:39:37 -0500
    message:
      FtpTransport.abspath() returns '/' for an empty path
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060516173230-0919a3a599c202d5
    parent: john at arbash-meinel.com-20060516150405-b09f1eefcd91d21e
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: ftp-server
    timestamp: Tue 2006-05-16 12:32:30 -0500
    message:
      Removing stipple from ftp tests.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060516150405-b09f1eefcd91d21e
    parent: pqm at pqm.ubuntu.com-20060512234849-259ff209fff58489
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: ftp-server
    timestamp: Tue 2006-05-16 10:04:05 -0500
    message:
      Have a FtpServer, but the tests fail



More information about the bazaar-commits mailing list