Rev 2406: [merge] bzr.dev 2402 in http://bzr.arbash-meinel.com/branches/bzr/0.16-dev/shortcut-common-ancestor

John Arbash Meinel john at arbash-meinel.com
Wed Apr 11 02:29:40 BST 2007


At http://bzr.arbash-meinel.com/branches/bzr/0.16-dev/shortcut-common-ancestor

------------------------------------------------------------
revno: 2406
revision-id: john at arbash-meinel.com-20070411012920-wnp7rnqdwe13xmhx
parent: john at arbash-meinel.com-20070410191541-rj635kcwkp305bo7
parent: pqm at pqm.ubuntu.com-20070410074302-cf6b95587a1058cd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: shortcut-common-ancestor
timestamp: Tue 2007-04-10 20:29:20 -0500
message:
  [merge] bzr.dev 2402
added:
  bzrlib/smart/                  smart-20061101100241-u0wzhkl4sjwmuzhd-1
  bzrlib/smart/__init__.py       __init__.py-20061101100249-8jwwl0d3jr080zim-1
  bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
  bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
  bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
  bzrlib/smart/server.py         server.py-20061110062051-chzu10y32vx8gvur-1
renamed:
  bzrlib/transport/smart.py => bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/tests/HTTPTestUtil.py   HTTPTestUtil.py-20050914180604-247d3aafb7a43343
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
  bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
  bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
  bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
  bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
  bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
  bzrlib/transport/http/wsgi.py  wsgi.py-20061005091552-rz8pva0olkxv0sd8-2
  bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
    ------------------------------------------------------------
    revno: 2401.1.1
    merged: pqm at pqm.ubuntu.com-20070410074302-cf6b95587a1058cd
    parent: pqm at pqm.ubuntu.com-20070405073143-8fa894c829ab5e50
    parent: andrew.bennetts at canonical.com-20070410072043-5vqutcw42bsml4tl
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2007-04-10 08:43:02 +0100
    message:
      (Andrew Bennetts) Split bzrlib/transport/smart.py into several smaller modules.
    ------------------------------------------------------------
    revno: 2400.1.9
    merged: andrew.bennetts at canonical.com-20070410072043-5vqutcw42bsml4tl
    parent: andrew.bennetts at canonical.com-20070410055415-58qifwhu6xfrb5sr
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: split-smart-part-1-rename
    timestamp: Tue 2007-04-10 17:20:43 +1000
    message:
      Fix blackbox/test_serve, there were some trivial changes that needed to be brought across from the hpss branch.
    ------------------------------------------------------------
    revno: 2400.1.8
    merged: andrew.bennetts at canonical.com-20070410055415-58qifwhu6xfrb5sr
    parent: andrew.bennetts at canonical.com-20070410054902-iphhiovkapcnzl9k
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: split-smart-part-1-rename
    timestamp: Tue 2007-04-10 15:54:15 +1000
    message:
      Add a NEWS entry.
    ------------------------------------------------------------
    revno: 2400.1.7
    merged: andrew.bennetts at canonical.com-20070410054902-iphhiovkapcnzl9k
    parent: andrew.bennetts at canonical.com-20070410023142-7xgeph6572ikrnu8
    parent: pqm at pqm.ubuntu.com-20070405073143-8fa894c829ab5e50
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: split-smart-part-1-rename
    timestamp: Tue 2007-04-10 15:49:02 +1000
    message:
      Merge from bzr.dev.
    ------------------------------------------------------------
    revno: 2400.1.6
    merged: andrew.bennetts at canonical.com-20070410023142-7xgeph6572ikrnu8
    parent: andrew.bennetts at canonical.com-20070410022255-e1dhysj2zhukca5c
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: split-smart-part-1-rename
    timestamp: Tue 2007-04-10 12:31:42 +1000
    message:
      Cosmetic changes to minimise the difference between this branch and the hpss branch.
    ------------------------------------------------------------
    revno: 2400.1.5
    merged: andrew.bennetts at canonical.com-20070410022255-e1dhysj2zhukca5c
    parent: andrew.bennetts at canonical.com-20070410020914-rjhtq6bfcbrj2vjs
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: split-smart-part-1-rename
    timestamp: Tue 2007-04-10 12:22:55 +1000
    message:
      Add some missing docstrings and copyright boilerplate.
    ------------------------------------------------------------
    revno: 2400.1.4
    merged: andrew.bennetts at canonical.com-20070410020914-rjhtq6bfcbrj2vjs
    parent: andrew.bennetts at canonical.com-20070409044955-h3ijql5cvqxia4d4
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: split-smart-part-1-rename
    timestamp: Tue 2007-04-10 12:09:14 +1000
    message:
      Tidy up accidental changes.
    ------------------------------------------------------------
    revno: 2400.1.3
    merged: andrew.bennetts at canonical.com-20070409044955-h3ijql5cvqxia4d4
    parent: andrew.bennetts at canonical.com-20070406011930-wy4emdgu3yu527pm
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: split-smart-part-1-rename
    timestamp: Mon 2007-04-09 14:49:55 +1000
    message:
      Split smart transport code into several separate modules.
    ------------------------------------------------------------
    revno: 2400.1.2
    merged: andrew.bennetts at canonical.com-20070406011930-wy4emdgu3yu527pm
    parent: andrew.bennetts at canonical.com-20070405152057-gokz8syll1lk2nrm
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: split-smart-part-1-rename
    timestamp: Fri 2007-04-06 11:19:30 +1000
    message:
      Move SmartTCPServer classes into bzrlib/smart/server.py
    ------------------------------------------------------------
    revno: 2400.1.1
    merged: andrew.bennetts at canonical.com-20070405152057-gokz8syll1lk2nrm
    parent: pqm at pqm.ubuntu.com-20070404213903-fe78a7a55c37ee95
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: split-smart-part-1-rename
    timestamp: Fri 2007-04-06 01:20:57 +1000
    message:
      Rename bzrlib/transport/smart.py to bzrlib/transport/remote.py.
      
      First part of the code reorganisation from the hpss branch.
-------------- next part --------------

Diff too large for email (4467 lines, the limit is 1000).


More information about the bazaar-commits mailing list