Rev 2208: Merge hpss. in file:///home/robertc/source/baz/hpss-remotegraph/
Robert Collins
robertc at robertcollins.net
Sat Apr 14 02:32:09 BST 2007
At file:///home/robertc/source/baz/hpss-remotegraph/
------------------------------------------------------------
revno: 2208
revision-id: robertc at robertcollins.net-20070414013203-w8fcspf6xtsja67h
parent: robertc at robertcollins.net-20070413073942-qvb37falcu2b5dr9
parent: andrew.bennetts at canonical.com-20070413065307-qg7gt1yx57cauni5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss-remotegraph
timestamp: Sat 2007-04-14 11:32:03 +1000
message:
Merge hpss.
added:
bzrlib/hooks.py hooks.py-20070325015548-ix4np2q0kd8452au-1
bzrlib/tests/blackbox/test_cat_revision.py test_cat_revision.py-20070410204634-fq8mnld5l5aza9e2-1
bzrlib/tests/workingtree_implementations/test_get_file_mtime.py test_get_file_mtime.-20070411212918-dhentj8gk0hsu54z-1
modified:
HACKING HACKING-20050805200004-2a5dc975d870f78c
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/lockdir.py lockdir.py-20060220222025-98258adf27fbdda3
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
bzrlib/smart/vfs.py vfs.py-20061108095550-gunadhxmzkdjfeek-2
bzrlib/tests/HTTPTestUtil.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_cat.py test_cat.py-20051201162916-f0937e4e19ea24b3
bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
bzrlib/tests/branch_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-4
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/repository_implementations/test_revision_graph.py test_revision_graph.-20070331011036-7x4dtgs5sopm7kcq-1
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_lockable_files.py test_lockable_files.py-20051225183927-365c7fd99591caf1
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
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/tests/tree_implementations/test_get_file_mtime.py test_get_file_mtime.-20070301003805-kjkpwfp4whbm39o1-1
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
doc/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
------------------------------------------------------------
revno: 2205.1.12
merged: andrew.bennetts at canonical.com-20070413065307-qg7gt1yx57cauni5
parent: andrew.bennetts at canonical.com-20070413062359-kiqjbhb06b3j2fj1
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Fri 2007-04-13 16:53:07 +1000
message:
Tidy imports in HTTPTestUtil.py
------------------------------------------------------------
revno: 2205.1.11
merged: andrew.bennetts at canonical.com-20070413062359-kiqjbhb06b3j2fj1
parent: andrew.bennetts at canonical.com-20070413061840-gb25wprbcivfeyuo
parent: pqm at pqm.ubuntu.com-20070413050623-10v4wozs1tu04kcu
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Fri 2007-04-13 16:23:59 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1
merged: pqm at pqm.ubuntu.com-20070413050623-10v4wozs1tu04kcu
parent: pqm at pqm.ubuntu.com-20070412150356-jeie6iap22sae8xf
parent: andrew.bennetts at canonical.com-20070413010947-wdy5e6gexv20k98b
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-04-13 06:06:23 +0100
message:
(Andrew Bennetts, Robert Collins) Add a 'token' argument to lock_write.
------------------------------------------------------------
revno: 2205.1.10
merged: andrew.bennetts at canonical.com-20070413061840-gb25wprbcivfeyuo
parent: andrew.bennetts at canonical.com-20070413054830-3kb1ryz3yiwo7vpv
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Fri 2007-04-13 16:18:40 +1000
message:
Fix all the DeprecationWarnings in test_smart caused by unicode revision IDs.
------------------------------------------------------------
revno: 2205.1.9
merged: andrew.bennetts at canonical.com-20070413054830-3kb1ryz3yiwo7vpv
parent: andrew.bennetts at canonical.com-20070413015712-lvj50btwcb4k6w3i
parent: andrew.bennetts at canonical.com-20070413051536-omtgid0zygdfbvra
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Fri 2007-04-13 15:48:30 +1000
message:
Merge rename-SmartTransport branch.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.33
merged: andrew.bennetts at canonical.com-20070413051536-omtgid0zygdfbvra
parent: pqm at pqm.ubuntu.com-20070412150356-jeie6iap22sae8xf
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: rename-SmartTransport
timestamp: Fri 2007-04-13 15:15:36 +1000
message:
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32
merged: pqm at pqm.ubuntu.com-20070412150356-jeie6iap22sae8xf
parent: pqm at pqm.ubuntu.com-20070412141938-72ysaak1x6brlfmm
parent: john at arbash-meinel.com-20070412143944-w1tdz5wvpaf6791p
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-12 16:03:56 +0100
message:
(Ian Clatworthy) Help text fixes for add, commit, and export
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.66.1.2
merged: john at arbash-meinel.com-20070412143944-w1tdz5wvpaf6791p
parent: john at arbash-meinel.com-20070322190703-qx2xft42j64hfp88
parent: ian.clatworthy at internode.on.net-20070412060957-m8l5xx0cte108s3d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-04-12 09:39:44 -0500
message:
(Ian Clatworthy) Help text fixes for add, commit, and export
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.69.1.6
merged: ian.clatworthy at internode.on.net-20070412060957-m8l5xx0cte108s3d
parent: ian.clatworthy at internode.on.net-20070412060105-p8xvixkc0or94nxp
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.help-fixes
timestamp: Thu 2007-04-12 16:09:57 +1000
message:
explained selected fail commit failure by design
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.69.1.5
merged: ian.clatworthy at internode.on.net-20070412060105-p8xvixkc0or94nxp
parent: ian.clatworthy at internode.on.net-20070402011840-ad1dombhee1vr88x
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.help-fixes
timestamp: Thu 2007-04-12 16:01:05 +1000
message:
explained selected fail commit failure by design
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.69.1.4
merged: ian.clatworthy at internode.on.net-20070402011840-ad1dombhee1vr88x
parent: ian.clatworthy at internode.on.net-20070329091803-1774b7u9isk2z0p4
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.quick
timestamp: Mon 2007-04-02 11:18:40 +1000
message:
Include feedback from mailing list.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.69.1.3
merged: ian.clatworthy at internode.on.net-20070329091803-1774b7u9isk2z0p4
parent: ian.clatworthy at internode.on.net-20070327003529-dwroi8lgq0nxouov
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.quick
timestamp: Thu 2007-03-29 19:18:03 +1000
message:
Minor man page fixes for add, commit, export
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.31
merged: pqm at pqm.ubuntu.com-20070412141938-72ysaak1x6brlfmm
parent: pqm at pqm.ubuntu.com-20070412095902-nen3rbeeppe9yrz0
parent: john at arbash-meinel.com-20070412135716-tqs9n87s9gjefkdx
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-12 15:19:38 +0100
message:
(John Arbash Meinel) Add more get_file_mtime tests.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.24.3.2
merged: john at arbash-meinel.com-20070412135716-tqs9n87s9gjefkdx
parent: john at arbash-meinel.com-20070411221459-h6l619a85w7nimfc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: get_file_mtime_tests
timestamp: Thu 2007-04-12 08:57:16 -0500
message:
Fix one test.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.24.3.1
merged: john at arbash-meinel.com-20070411221459-h6l619a85w7nimfc
parent: pqm at pqm.ubuntu.com-20070411044855-b83c4dc6fd093648
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: get_file_mtime_tests
timestamp: Wed 2007-04-11 17:14:59 -0500
message:
Add some tests for get_file_mtime, and clean up others.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.30
merged: pqm at pqm.ubuntu.com-20070412095902-nen3rbeeppe9yrz0
parent: pqm at pqm.ubuntu.com-20070412093242-8r2pilxsjtxs46dj
parent: andrew.bennetts at canonical.com-20070412092148-bg68kyofc8k702yf
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-12 10:59:02 +0100
message:
Link to HACKING.htm from doc/index.txt.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.24.2.3
merged: andrew.bennetts at canonical.com-20070412092148-bg68kyofc8k702yf
parent: andrew.bennetts at canonical.com-20070411104619-f9hdzo9s4p63je91
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: HACKING-portability
timestamp: Thu 2007-04-12 19:21:48 +1000
message:
Link to HACKING.htm from doc/index.txt.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.29
merged: pqm at pqm.ubuntu.com-20070412093242-8r2pilxsjtxs46dj
parent: pqm at pqm.ubuntu.com-20070412063453-ogf089v98ktaopbk
parent: andrew.bennetts at canonical.com-20070411104619-f9hdzo9s4p63je91
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-12 10:32:42 +0100
message:
(Andrew Bennetts) Add a brief Portability section to HACKING, build HACKING.htm from 'make docs'.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.24.2.2
merged: andrew.bennetts at canonical.com-20070411104619-f9hdzo9s4p63je91
parent: andrew.bennetts at canonical.com-20070411080906-4mgvcy6focqyhl0a
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: HACKING-portability
timestamp: Wed 2007-04-11 20:46:19 +1000
message:
Add a brief section on portability to HACKING.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.24.2.1
merged: andrew.bennetts at canonical.com-20070411080906-4mgvcy6focqyhl0a
parent: pqm at pqm.ubuntu.com-20070411044855-b83c4dc6fd093648
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: HACKING-portability
timestamp: Wed 2007-04-11 18:09:06 +1000
message:
Build HACKING.htm from 'make docs'.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.28
merged: pqm at pqm.ubuntu.com-20070412063453-ogf089v98ktaopbk
parent: pqm at pqm.ubuntu.com-20070412032019-axeg1wmcju0odfdr
parent: mbp at sourcefrog.net-20070412050145-e139sv6el1h8j243
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-12 07:34:53 +0100
message:
Better tag upgrade message
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.1.2.4.1.1
merged: mbp at sourcefrog.net-20070412050145-e139sv6el1h8j243
parent: mbp at sourcefrog.net-20070404012211-sq269me6bai9m6xk
parent: ian.clatworthy at internode.on.net-20070329022831-5pql3da3g87rueu2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Thu 2007-04-12 15:01:45 +1000
message:
Better tag upgrade message
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.1.3.1
merged: ian.clatworthy at internode.on.net-20070329022831-5pql3da3g87rueu2
parent: pqm at pqm.ubuntu.com-20070329014424-0947dae124353e1f
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.better-tag-msgs
timestamp: Thu 2007-03-29 12:28:31 +1000
message:
Better tag/tags error message (#97674)
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.27
merged: pqm at pqm.ubuntu.com-20070412032019-axeg1wmcju0odfdr
parent: pqm at pqm.ubuntu.com-20070412005953-vow66znisuxhrauk
parent: john at arbash-meinel.com-20070411220839-0eyz5nrq4vv1chcb
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-12 04:20:19 +0100
message:
(John Arbash Meinel) Fix bug #103870 by teaching show_diff_trees about modified files in renamed directories
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.24.1.4
merged: john at arbash-meinel.com-20070411220839-0eyz5nrq4vv1chcb
parent: john at arbash-meinel.com-20070411220516-bz4941rayeilvjac
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: diff_renamed_103870
timestamp: Wed 2007-04-11 17:08:39 -0500
message:
NEWS for fixing bug #103870
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.24.1.3
merged: john at arbash-meinel.com-20070411220516-bz4941rayeilvjac
parent: john at arbash-meinel.com-20070411220215-o07i1rcajpghkpom
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: diff_renamed_103870
timestamp: Wed 2007-04-11 17:05:16 -0500
message:
Do a better fix, which recognizes that we should pass the correct old path.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.24.1.2
merged: john at arbash-meinel.com-20070411220215-o07i1rcajpghkpom
parent: john at arbash-meinel.com-20070411215736-rii53nkqb42hezup
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: diff_renamed_103870
timestamp: Wed 2007-04-11 17:02:15 -0500
message:
Fix bug #103870 by passing None instead of a (sometimes wrong) path
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.24.1.1
merged: john at arbash-meinel.com-20070411215736-rii53nkqb42hezup
parent: pqm at pqm.ubuntu.com-20070411044855-b83c4dc6fd093648
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: diff_renamed_103870
timestamp: Wed 2007-04-11 16:57:36 -0500
message:
Add a bunch of direct tests for 'show_diff_trees'
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.26
merged: pqm at pqm.ubuntu.com-20070412005953-vow66znisuxhrauk
parent: pqm at pqm.ubuntu.com-20070412003351-vvhci6f1lvpelk24
parent: bialix at ukr.net-20070410124409-9ma7vrslw37ildiz
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-12 01:59:53 +0100
message:
(bialix,r=john) win32-related selftest improvements
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.6.4
merged: bialix at ukr.net-20070410124409-9ma7vrslw37ildiz
parent: bialix at ukr.net-20070405223343-7v14l68sicl8u8qi
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Tue 2007-04-10 15:44:09 +0300
message:
Teach `bzr selftest --clean-output` to remove read-only files (win32-specific)
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.6.3
merged: bialix at ukr.net-20070405223343-7v14l68sicl8u8qi
parent: bialix at ukr.net-20070405213029-wz2erv57mbq5hm2j
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Fri 2007-04-06 01:33:43 +0300
message:
Rework NUMBERED_DIRS usage to keep test_selftest.py passing the tests on win32
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.6.2
merged: bialix at ukr.net-20070405213029-wz2erv57mbq5hm2j
parent: bialix at ukr.net-20070328144807-dhektxjnz7axuq8j
parent: pqm at pqm.ubuntu.com-20070405073143-8fa894c829ab5e50
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Fri 2007-04-06 00:30:29 +0300
message:
merge bzr.dev
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.6.1
merged: bialix at ukr.net-20070328144807-dhektxjnz7axuq8j
parent: pqm at pqm.ubuntu.com-20070327081802-271be0d343108f4f
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Wed 2007-03-28 17:48:07 +0300
message:
blackbox: test_cat_different_id: calling bzr as another process require free lock on win32
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.25
merged: pqm at pqm.ubuntu.com-20070412003351-vvhci6f1lvpelk24
parent: pqm at pqm.ubuntu.com-20070411044855-b83c4dc6fd093648
parent: andrew.bennetts at canonical.com-20070411054339-b01z0zc1bj21x16o
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-12 01:33:51 +0100
message:
(Andrew Bennetts) Use repo.supports_rich_root() rather than repo._format.rich_root_data
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.24
merged: pqm at pqm.ubuntu.com-20070411044855-b83c4dc6fd093648
parent: pqm at pqm.ubuntu.com-20070411022359-403a2155afb207cf
parent: aaron.bentley at utoronto.ca-20070411041259-pfl82a4kg9q5j3n2
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-04-11 05:48:55 +0100
message:
Fix bzr cat-revision REVISION_ID
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.18
merged: aaron.bentley at utoronto.ca-20070411041259-pfl82a4kg9q5j3n2
parent: abentley at panoramicfeedback.com-20070410210517-0m7mhl5d2fhs66u5
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-04-11 00:12:59 -0400
message:
Add copyright notice
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17
merged: abentley at panoramicfeedback.com-20070410210517-0m7mhl5d2fhs66u5
parent: abentley at panoramicfeedback.com-20070410204657-nqvx7b7t2zou61gu
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-04-10 17:05:17 -0400
message:
Move cat-revision tests out of test_revision_info
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.16
merged: abentley at panoramicfeedback.com-20070410204657-nqvx7b7t2zou61gu
parent: abentley at panoramicfeedback.com-20070405202732-f9b8pvfd1h699cd4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-04-10 16:46:57 -0400
message:
Fix cat-revision REVISION
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.15
merged: abentley at panoramicfeedback.com-20070405202732-f9b8pvfd1h699cd4
parent: aaron.bentley at utoronto.ca-20070404024116-8lm1319fn59e2eww
parent: pqm at pqm.ubuntu.com-20070405073143-8fa894c829ab5e50
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2007-04-05 16:27:32 -0400
message:
merge bzr.dev
------------------------------------------------------------
revno: 2205.1.8
merged: andrew.bennetts at canonical.com-20070413015712-lvj50btwcb4k6w3i
parent: andrew.bennetts at canonical.com-20070413005608-jkzcnpbnftissj97
parent: andrew.bennetts at canonical.com-20070413010947-wdy5e6gexv20k98b
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Fri 2007-04-13 11:57:12 +1000
message:
Merge in the branch with the extracted lock_write token changes, resolving conflicts.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.34
merged: andrew.bennetts at canonical.com-20070413010947-wdy5e6gexv20k98b
parent: andrew.bennetts at canonical.com-20070412082651-cwzuhh5xqwdtchsw
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr.dev.hpss.api.changes
timestamp: Fri 2007-04-13 11:09:47 +1000
message:
Add a brief explanation of what tokens are used for to lock_write docstrings.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.33
merged: andrew.bennetts at canonical.com-20070412082651-cwzuhh5xqwdtchsw
parent: andrew.bennetts at canonical.com-20070412080310-syj0orzfluo3ywb6
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr.dev.hpss.api.changes
timestamp: Thu 2007-04-12 18:26:51 +1000
message:
Update NEWS.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.32
merged: andrew.bennetts at canonical.com-20070412080310-syj0orzfluo3ywb6
parent: andrew.bennetts at canonical.com-20070412074331-otphanb3q0tx6rfz
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr.dev.hpss.api.changes
timestamp: Thu 2007-04-12 18:03:10 +1000
message:
Remove some XXXs.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.31
merged: andrew.bennetts at canonical.com-20070412074331-otphanb3q0tx6rfz
parent: andrew.bennetts at canonical.com-20070412073725-pzd8641vf9oh6v5g
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr.dev.hpss.api.changes
timestamp: Thu 2007-04-12 17:43:31 +1000
message:
Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens). (copied from hpss branch)
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.30
merged: andrew.bennetts at canonical.com-20070412073725-pzd8641vf9oh6v5g
parent: andrew.bennetts at canonical.com-20070412033450-zbjs6vgxmsw6s7ts
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr.dev.hpss.api.changes
timestamp: Thu 2007-04-12 17:37:25 +1000
message:
Remove some redundant code pointed out by Robert's review, and remove some unused imports while I'm there.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.29
merged: andrew.bennetts at canonical.com-20070412033450-zbjs6vgxmsw6s7ts
parent: andrew.bennetts at canonical.com-20070411133532-u6x6edf3dmzamnaq
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr.dev.hpss.api.changes
timestamp: Thu 2007-04-12 13:34:50 +1000
message:
Update NEWS
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.28
merged: andrew.bennetts at canonical.com-20070411133532-u6x6edf3dmzamnaq
parent: andrew.bennetts at canonical.com-20070411064005-zylli6el5cz7kwnb
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr.dev.hpss.api.changes
timestamp: Wed 2007-04-11 23:35:32 +1000
message:
LockDir, Repository and Branch lock token changes from the hpss branch.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.27
merged: andrew.bennetts at canonical.com-20070411064005-zylli6el5cz7kwnb
parent: andrew.bennetts at canonical.com-20070329051401-kqbu8ootnk9dlbgn
parent: pqm at pqm.ubuntu.com-20070411022359-403a2155afb207cf
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr.dev.hpss.api.changes
timestamp: Wed 2007-04-11 16:40:05 +1000
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.26
merged: andrew.bennetts at canonical.com-20070329051401-kqbu8ootnk9dlbgn
parent: andrew.bennetts at canonical.com-20070328075403-ibqxtr196emuc4ut
parent: pqm at pqm.ubuntu.com-20070329043540-952aff23533c1c26
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr.dev.hpss.api.changes
timestamp: Thu 2007-03-29 15:14:01 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.25
merged: andrew.bennetts at canonical.com-20070328075403-ibqxtr196emuc4ut
parent: andrew.bennetts at canonical.com-20070328073853-yje2ikoflt6a4jos
parent: pqm at pqm.ubuntu.com-20070328065822-999550a858a3ced3
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr.dev.hpss.api.changes
timestamp: Wed 2007-03-28 17:54:03 +1000
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.24
merged: andrew.bennetts at canonical.com-20070328073853-yje2ikoflt6a4jos
parent: andrew.bennetts at canonical.com-20070328070842-r843houy668oxb9o
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr.dev.hpss.api.changes
timestamp: Wed 2007-03-28 17:38:53 +1000
message:
Some tweaks in response to review.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.23
merged: andrew.bennetts at canonical.com-20070328070842-r843houy668oxb9o
parent: andrew.bennetts at canonical.com-20070212044932-k9keo85c0s9gg5wv
parent: pqm at pqm.ubuntu.com-20070328022809-40aa40f8edf4e502
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr.dev.hpss.api.changes
timestamp: Wed 2007-03-28 17:08:42 +1000
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 2205.1.7
merged: andrew.bennetts at canonical.com-20070413005608-jkzcnpbnftissj97
parent: andrew.bennetts at canonical.com-20070412162221-6imfutzivlmg4rg5
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Fri 2007-04-13 10:56:08 +1000
message:
Add a brief explanation of what tokens are used for to lock_write docstrings.
------------------------------------------------------------
revno: 2205.1.6
merged: andrew.bennetts at canonical.com-20070412162221-6imfutzivlmg4rg5
parent: andrew.bennetts at canonical.com-20070412080451-xyxdwlwrxgca1mzy
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Fri 2007-04-13 02:22:21 +1000
message:
Fix four tests I broke with the Branch.lock_write changes.
------------------------------------------------------------
revno: 2205.1.5
merged: andrew.bennetts at canonical.com-20070412080451-xyxdwlwrxgca1mzy
parent: andrew.bennetts at canonical.com-20070412070833-5fio6r0fkgnf10u1
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Thu 2007-04-12 18:04:51 +1000
message:
Remove some XXXs
------------------------------------------------------------
revno: 2205.1.4
merged: andrew.bennetts at canonical.com-20070412070833-5fio6r0fkgnf10u1
parent: andrew.bennetts at canonical.com-20070411055816-oy64yjhzvtnrmfb9
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Thu 2007-04-12 17:08:33 +1000
message:
Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens).
------------------------------------------------------------
revno: 2205.1.3
merged: andrew.bennetts at canonical.com-20070411055816-oy64yjhzvtnrmfb9
parent: andrew.bennetts at canonical.com-20070411042623-4qav34z64fftnbyx
parent: andrew.bennetts at canonical.com-20070411054339-b01z0zc1bj21x16o
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Wed 2007-04-11 15:58:16 +1000
message:
Merge supports-rich-root branch.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.30
merged: andrew.bennetts at canonical.com-20070411054339-b01z0zc1bj21x16o
parent: andrew.bennetts at canonical.com-20070411054121-t3qnk4z25j27l7zc
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: supports-rich-root
timestamp: Wed 2007-04-11 15:43:39 +1000
message:
Reinstate checking of source & targer _serializer that I accidentally clobbered.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.29
merged: andrew.bennetts at canonical.com-20070411054121-t3qnk4z25j27l7zc
parent: andrew.bennetts at canonical.com-20070411053753-99pjtm3yfpj9amzz
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: supports-rich-root
timestamp: Wed 2007-04-11 15:41:21 +1000
message:
Bring across test_repository improvements from the hpss branch to fix the last test failures.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.28
merged: andrew.bennetts at canonical.com-20070411053753-99pjtm3yfpj9amzz
parent: andrew.bennetts at canonical.com-20070301035839-mgsenxqgx4oveeob
parent: pqm at pqm.ubuntu.com-20070411022359-403a2155afb207cf
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: supports-rich-root
timestamp: Wed 2007-04-11 15:37:53 +1000
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 2205.1.2
merged: andrew.bennetts at canonical.com-20070411042623-4qav34z64fftnbyx
parent: andrew.bennetts at canonical.com-20070410155415-hyzlzwevu3ud0dny
parent: pqm at pqm.ubuntu.com-20070411022359-403a2155afb207cf
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Wed 2007-04-11 14:26:23 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.23
merged: pqm at pqm.ubuntu.com-20070411022359-403a2155afb207cf
parent: pqm at pqm.ubuntu.com-20070411015343-51539420298ee77c
parent: andrew.bennetts at canonical.com-20070411020118-yie55yxj8v9ke3b8
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-04-11 03:23:59 +0100
message:
Use the Command pattern for smart server request handling
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.21.1.2
merged: andrew.bennetts at canonical.com-20070411020118-yie55yxj8v9ke3b8
parent: andrew.bennetts at canonical.com-20070410141235-wtmjydzktegq64cz
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-part-two-server-commands
timestamp: Wed 2007-04-11 12:01:18 +1000
message:
Deal with review comments.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.21.1.1
merged: andrew.bennetts at canonical.com-20070410141235-wtmjydzktegq64cz
parent: pqm at pqm.ubuntu.com-20070410074302-cf6b95587a1058cd
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-part-two-server-commands
timestamp: Wed 2007-04-11 00:12:35 +1000
message:
Use the Command pattern for handling smart server commands.
This improves readability and testability.
This change has been extracted from the hpss branch.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.22
merged: pqm at pqm.ubuntu.com-20070411015343-51539420298ee77c
parent: pqm at pqm.ubuntu.com-20070410074302-cf6b95587a1058cd
parent: john at arbash-meinel.com-20070411012920-wnp7rnqdwe13xmhx
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-04-11 02:53:43 +0100
message:
(John Arbash Meinel) Fix bug #103757 by teaching common_ancestor to shortcut when a tip is in the other ancestry.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.20.1.5
merged: 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
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.20.1.4
merged: john at arbash-meinel.com-20070410191541-rj635kcwkp305bo7
parent: john at arbash-meinel.com-20070410183032-rw4d3kpb8f9cesfw
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: shortcut-common-ancestor
timestamp: Tue 2007-04-10 14:15:41 -0500
message:
NEWS about fixing bug #103757
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.20.1.3
merged: john at arbash-meinel.com-20070410183032-rw4d3kpb8f9cesfw
parent: john at arbash-meinel.com-20070410181305-9y6qbm51we9k37kz
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: shortcut-common-ancestor
timestamp: Tue 2007-04-10 13:30:32 -0500
message:
We don't need to extract ancestry_b until we after we've checked for existence.
It seems to make sense to check 'b in ancestry_a' first, though we might consider checking
a in ancestry_b first.
b in a is merging something which has already been merged.
a in b is merging something which has merged you.
And 'a in b' may actually be more common.
The timing difference is fairly small, though.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.20.1.2
merged: john at arbash-meinel.com-20070410181305-9y6qbm51we9k37kz
parent: john at arbash-meinel.com-20070410175723-9a3rljph39ot4e35
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: shortcut-common-ancestor
timestamp: Tue 2007-04-10 13:13:05 -0500
message:
Ancestry checks can be done using the dictionaries
And we don't need to create 2 sets, one will do just fine.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.20.1.1
merged: john at arbash-meinel.com-20070410175723-9a3rljph39ot4e35
parent: pqm at pqm.ubuntu.com-20070405073143-8fa894c829ab5e50
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: shortcut-common-ancestor
timestamp: Tue 2007-04-10 12:57:23 -0500
message:
Shortcut the common_ancestor code when one tip is in the ancestry of the other.
------------------------------------------------------------
revno: 2205.1.1
merged: andrew.bennetts at canonical.com-20070410155415-hyzlzwevu3ud0dny
parent: robertc at robertcollins.net-20070405093526-bfbpg82tlc7kldni
parent: pqm at pqm.ubuntu.com-20070410074302-cf6b95587a1058cd
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Wed 2007-04-11 01:54:15 +1000
message:
Merge from bzr.dev, resolving conflicts.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.21
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: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.19.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: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.19.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: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.19.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: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.19.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: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.19.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: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.19.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: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.19.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: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.19.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: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.19.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.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.20
merged: pqm at pqm.ubuntu.com-20070405073143-8fa894c829ab5e50
parent: pqm at pqm.ubuntu.com-20070404213903-fe78a7a55c37ee95
parent: robertc at robertcollins.net-20070405065917-mu99paqftpq55f5m
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-05 08:31:43 +0100
message:
(robertc) SmartServer startup and shutdown hooks, and smart server shutdown logic implementation. (Robert Collins)
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.71.3.9
merged: robertc at robertcollins.net-20070405065917-mu99paqftpq55f5m
parent: robertc at robertcollins.net-20070405003903-u1ys8t2lo5gs6b35
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss-hooks
timestamp: Thu 2007-04-05 16:59:17 +1000
message:
Review comments.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.71.3.8
merged: robertc at robertcollins.net-20070405003903-u1ys8t2lo5gs6b35
parent: robertc at robertcollins.net-20070404085028-abgpe4zylhsdoaqd
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss-hooks
timestamp: Thu 2007-04-05 10:39:03 +1000
message:
Overhaul the SmartTCPServer connect-thread logic to synchronise on startup and shutdown and notify the server if it is in accept.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.71.3.7
merged: robertc at robertcollins.net-20070404085028-abgpe4zylhsdoaqd
parent: robertc at robertcollins.net-20070404051938-2lnvpsm2tbo5a6g2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2007-04-04 18:50:28 +1000
message:
Avoid logging smart server errors when ctrl-C'd.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.71.3.6
merged: robertc at robertcollins.net-20070404051938-2lnvpsm2tbo5a6g2
parent: robertc at robertcollins.net-20070327214048-286uc943sgxma2xe
parent: pqm at pqm.ubuntu.com-20070404022946-b93fc2e49b3bb195
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss-hooks
timestamp: Wed 2007-04-04 15:19:38 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.71.3.5
merged: robertc at robertcollins.net-20070327214048-286uc943sgxma2xe
parent: robertc at robertcollins.net-20070327045759-hb7j634wpm1ris7l
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2007-03-28 07:40:48 +1000
message:
Fix Branch hook tests for the new eans of preserving hooks by the test suite.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.71.3.4
merged: robertc at robertcollins.net-20070327045759-hb7j634wpm1ris7l
parent: robertc at robertcollins.net-20070327043224-9ql8frcekqjbb64g
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2007-03-27 14:57:59 +1000
message:
Add more debugging code to the smart server to debug pqm failures.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.71.3.3
merged: robertc at robertcollins.net-20070327043224-9ql8frcekqjbb64g
parent: robertc at robertcollins.net-20070327042126-32pgs6ityvdt72tg
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2007-03-27 14:32:24 +1000
message:
Fix all smart_transport tests.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.71.3.2
merged: robertc at robertcollins.net-20070327042126-32pgs6ityvdt72tg
parent: robertc at robertcollins.net-20070327024546-c7t95nl7j9t4x3jq
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2007-03-27 14:21:26 +1000
message:
Convert unconvered SmartServer subclass to use the cached sockname.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.71.3.1
merged: robertc at robertcollins.net-20070327024546-c7t95nl7j9t4x3jq
parent: pqm at pqm.ubuntu.com-20070326073003-37941d0fa5a5a6c4
parent: robertc at robertcollins.net-20070327024201-ntm3ek1rrkkmg2yd
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2007-03-27 12:45:46 +1000
message:
New SmartServer hooks facility. There are two initial hooks documented in
bzrlib.transport.smart.SmartServerHooks. The two initial hooks allow
plugins to execute code upon server startup and shutdown.
(Robert Collins).
SmartServer in standalone mode will now close its listening socket when it
stops, rather than waiting for garbage collection. This primarily fixes
test suite hangs when a test tries to connect to a shutdown server. It
may also help improve behaviour when dealing with a server running on a
specific port (rather than dynamically assigned ports). (Robert Collins)
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.65.4.2
merged: robertc at robertcollins.net-20070327024201-ntm3ek1rrkkmg2yd
parent: robertc at robertcollins.net-20070325085956-my8jv7cifqzyltyz
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss-hooks
timestamp: Tue 2007-03-27 12:42:01 +1000
message:
Review feedback.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.65.4.1
merged: robertc at robertcollins.net-20070325085956-my8jv7cifqzyltyz
parent: pqm at pqm.ubuntu.com-20070321071219-55447700ec71371f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss-hooks
timestamp: Sun 2007-03-25 18:59:56 +1000
message:
New SmartServer hooks facility. There are two initial hooks documented
in bzrlib.transport.smart.SmartServerHooks. The two initial hooks allow
plugins to execute code upon server startup and shutdown.
(Robert Collins).
SmartServer in standalone mode will now close its listening socket
when it stops, rather than waiting for garbage collection. This primarily
fixes test suite hangs when a test tries to connect to a shutdown server.
It may also help improve behaviour when dealing with a server running
on a specific port (rather than dynamically assigned ports).
(Robert Collins)
Diff too large for email (2704 lines, the limit is 1000).
More information about the bazaar-commits
mailing list