Rev 2441: Merge spiv modifications in http://bazaar.launchpad.net/~bzr/bzr/bzr.http.auth
Vincent Ladeuil
v.ladeuil+lp at free.fr
Thu Apr 26 10:01:51 BST 2007
At http://bazaar.launchpad.net/~bzr/bzr/bzr.http.auth
------------------------------------------------------------
revno: 2441
revision-id: v.ladeuil+lp at free.fr-20070426090146-jbwl0muvk76wlw6c
parent: v.ladeuil+lp at free.fr-20070426072124-bty9pn2i122u1zpx
parent: andrew.bennetts at canonical.com-20070426081540-36glj2kouoldc866
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.http.auth
timestamp: Thu 2007-04-26 11:01:46 +0200
message:
Merge spiv modifications
removed:
bzrlib/tests/test_doc_generate.py test_doc_generate.py-20051224124638-88da58fc872b93ba
added:
bzrlib/tests/branch_implementations/test_get_revision_id_to_revno_map.py test_get_revision_id-20070417211641-6kcoj1c704gqqopn-1
bzrlib/tests/branch_implementations/test_revision_id_to_revno.py test_revision_id_to_-20070417200738-lo776wkqikhe5goo-1
bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
modified:
HACKING HACKING-20050805200004-2a5dc975d870f78c
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/breakin.py breakin.py-20070417043829-so46nevf978u713k-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/smart/__init__.py __init__.py-20061101100249-8jwwl0d3jr080zim-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/smart/bzrdir.py bzrdir.py-20061122024551-ol0l0o0oofsu9b3t-1
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/smart/vfs.py vfs.py-20061108095550-gunadhxmzkdjfeek-2
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
bzrlib/tests/blackbox/test_remove.py test_remove.py-20060530011439-fika5rm84lon0goe-1
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
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.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/tests/test_wsgi.py test_wsgi.py-20061005091552-rz8pva0olkxv0sd8-1
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/transport/http/wsgi.py wsgi.py-20061005091552-rz8pva0olkxv0sd8-2
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 2440.1.2
merged: andrew.bennetts at canonical.com-20070426081540-36glj2kouoldc866
parent: andrew.bennetts at canonical.com-20070426075456-5edsg5a2zo7iiimv
parent: mbp at sourcefrog.net-20070426074805-va53nylsxqt7ur7u
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr.http.auth
timestamp: Thu 2007-04-26 18:15:40 +1000
message:
Merge tarball branch that's already with PQM, resolving conflicts.
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.25
merged: mbp at sourcefrog.net-20070426074805-va53nylsxqt7ur7u
parent: mbp at sourcefrog.net-20070423120654-7k0q70jyjrvb5g38
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Thu 2007-04-26 17:48:05 +1000
message:
Repository.tarball fixes for python2.4
Use 'r|bz2' to extract since r:bz2 is not supported
Replace extractall, which is not in python2.4
RemoteRepository._get_tarball returns a TemporaryFile
-------------- This line and the following will be ignored --------------
modified:
bzrlib/remote.py
bzrlib/tests/test_remote.py
bzrlib/tests/test_smart.py
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.24
merged: mbp at sourcefrog.net-20070423120654-7k0q70jyjrvb5g38
parent: mbp at sourcefrog.net-20070423071826-0vcm0vzp4jp3ajax
parent: mbp at sourcefrog.net-20070423095250-xzaleukzs05x9lp0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Mon 2007-04-23 22:06:54 +1000
message:
Merge Repository.sprout refactoring, and make that use Repository.tarball
------------------------------------------------------------
revno: 2420.1.20.1.1
merged: mbp at sourcefrog.net-20070423095250-xzaleukzs05x9lp0
parent: pqm at pqm.ubuntu.com-20070421151139-5wau2ukbpx5z1hv2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: sprout-cleanup
timestamp: Mon 2007-04-23 19:52:50 +1000
message:
Add new Repository.sprout,
Cleaner in intention and purpose than copy_content_into. It doesn't copy the
extra settings of the repository (like working-trees and shared), which is
normally what you'll want.
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.23
merged: mbp at sourcefrog.net-20070423071826-0vcm0vzp4jp3ajax
parent: mbp at sourcefrog.net-20070423050344-7r4w0fvmjbevcn0r
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Mon 2007-04-23 17:18:26 +1000
message:
review cleanups
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.22
merged: mbp at sourcefrog.net-20070423050344-7r4w0fvmjbevcn0r
parent: mbp at sourcefrog.net-20070416153631-425bo8mmp7kkitox
parent: pqm at pqm.ubuntu.com-20070421151139-5wau2ukbpx5z1hv2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Mon 2007-04-23 15:03:44 +1000
message:
merge bzr.dev
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.21
merged: mbp at sourcefrog.net-20070416153631-425bo8mmp7kkitox
parent: mbp at sourcefrog.net-20070416153233-bbvwu8649jdl8d4c
parent: pqm at pqm.ubuntu.com-20070416080254-bf3rfk77k5bgfdl7
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Tue 2007-04-17 01:36:31 +1000
message:
merge bzr.dev
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.20
merged: mbp at sourcefrog.net-20070416153233-bbvwu8649jdl8d4c
parent: mbp at sourcefrog.net-20070416153202-l0tgct3ib1vk77fl
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Tue 2007-04-17 01:32:33 +1000
message:
Route branch operations through remote copy_content_into
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.19
merged: mbp at sourcefrog.net-20070416153202-l0tgct3ib1vk77fl
parent: mbp at sourcefrog.net-20070416143438-gev59fyob49myi74
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Tue 2007-04-17 01:32:02 +1000
message:
fix up test data format
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.18
merged: mbp at sourcefrog.net-20070416143438-gev59fyob49myi74
parent: mbp at sourcefrog.net-20070416134530-a9p6c12yp8l1wnr1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Tue 2007-04-17 00:34:38 +1000
message:
reformat
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.17
merged: mbp at sourcefrog.net-20070416134530-a9p6c12yp8l1wnr1
parent: mbp at sourcefrog.net-20070416100344-xuvua8ydn5ma6syg
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Mon 2007-04-16 23:45:30 +1000
message:
Update and reenable rpc-level tests for Repository.tarball
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.16
merged: mbp at sourcefrog.net-20070416100344-xuvua8ydn5ma6syg
parent: mbp at sourcefrog.net-20070416100133-whdocdv9cnlre1ye
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Mon 2007-04-16 20:03:44 +1000
message:
doc
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.15
merged: mbp at sourcefrog.net-20070416100133-whdocdv9cnlre1ye
parent: mbp at sourcefrog.net-20070416095757-t5eud8iy6l1kw70b
parent: andrew.bennetts at canonical.com-20070416065300-8te6vwujl287yh5p
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Mon 2007-04-16 20:01:33 +1000
message:
Merge more from hpss
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.14
merged: mbp at sourcefrog.net-20070416095757-t5eud8iy6l1kw70b
parent: mbp at sourcefrog.net-20070416042255-rs6sxqr68n374fbi
parent: andrew.bennetts at canonical.com-20070416025619-v6rjozkjjnrg970w
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Mon 2007-04-16 19:57:57 +1000
message:
merge hpss again; restore incorrectly removed RemoteRepository.break_lock
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.13
merged: mbp at sourcefrog.net-20070416042255-rs6sxqr68n374fbi
parent: mbp at sourcefrog.net-20070416033524-7w3l94gisf1p9w3a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Mon 2007-04-16 14:22:55 +1000
message:
Remove obsolete test
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.12
merged: mbp at sourcefrog.net-20070416033524-7w3l94gisf1p9w3a
parent: mbp at sourcefrog.net-20070416032143-6pmuezr2i7umkj9q
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Mon 2007-04-16 13:35:24 +1000
message:
small test cleanups
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.11
merged: mbp at sourcefrog.net-20070416032143-6pmuezr2i7umkj9q
parent: mbp at sourcefrog.net-20070411100702-r12ixsycxcohqu4s
parent: andrew.bennetts at canonical.com-20070414142229-633813p69cryl6gm
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Mon 2007-04-16 13:21:43 +1000
message:
merge hpss changes
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.10
merged: mbp at sourcefrog.net-20070411100702-r12ixsycxcohqu4s
parent: mbp at sourcefrog.net-20070411091045-yhvop9nb1ngwvi00
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Wed 2007-04-11 20:07:02 +1000
message:
copy_content_into from Remote repositories by using temporary directories on both ends.
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.9
merged: mbp at sourcefrog.net-20070411091045-yhvop9nb1ngwvi00
parent: ian.clatworthy at internode.on.net-20070330063856-c41baqaxj78otvri
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Wed 2007-04-11 19:10:45 +1000
message:
remote Repository.tarball builds a temporary directory and tars that
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.8
merged: ian.clatworthy at internode.on.net-20070330063856-c41baqaxj78otvri
parent: mbp at sourcefrog.net-20070330035956-lmp3z220xq1kdusx
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: hpss-faster-copy
timestamp: Fri 2007-03-30 16:38:56 +1000
message:
Tarball proxy code & tests
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.7
merged: mbp at sourcefrog.net-20070330035956-lmp3z220xq1kdusx
parent: mbp at sourcefrog.net-20070330022302-h7yo29evei09rpj1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Fri 2007-03-30 13:59:56 +1000
message:
(broken) Start addng client proxy test for Repository.tarball
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.6
merged: mbp at sourcefrog.net-20070330022302-h7yo29evei09rpj1
parent: mbp at sourcefrog.net-20070330022108-5dxt1f34qla13yl9
parent: andrew.bennetts at canonical.com-20070330014631-a3xragco77jx67pv
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Fri 2007-03-30 12:23:02 +1000
message:
merge hpss
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.5
merged: mbp at sourcefrog.net-20070330022108-5dxt1f34qla13yl9
parent: mbp at sourcefrog.net-20070330020514-7601dsj0nt3nievp
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Fri 2007-03-30 12:21:08 +1000
message:
Repository.tarball locks repository while running for consistency
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.4
merged: mbp at sourcefrog.net-20070330020514-7601dsj0nt3nievp
parent: mbp at sourcefrog.net-20070330020456-yck6eki5w4txsr19
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Fri 2007-03-30 12:05:14 +1000
message:
Change Transport.local_abspath to raise NotLocalUrl, and test.
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.3
merged: mbp at sourcefrog.net-20070330020456-yck6eki5w4txsr19
parent: mbp at sourcefrog.net-20070329072503-ir70ask331e138ux
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Fri 2007-03-30 12:04:56 +1000
message:
Cherrypick assertRaises enhancement
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.2
merged: mbp at sourcefrog.net-20070329072503-ir70ask331e138ux
parent: mbp at sourcefrog.net-20070329060803-dywopr2sg30oj23e
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Thu 2007-03-29 17:25:03 +1000
message:
smart method Repository.tarball actually returns the tarball
------------------------------------------------------------
revno: 2018.1.11.1.25.1.13.1.123.1.1
merged: mbp at sourcefrog.net-20070329060803-dywopr2sg30oj23e
parent: robertc at robertcollins.net-20070329042156-28vdpsyvcbrw7wy9
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Thu 2007-03-29 16:08:03 +1000
message:
Add stub Repository.tarball smart method
------------------------------------------------------------
revno: 2440.1.1
merged: andrew.bennetts at canonical.com-20070426075456-5edsg5a2zo7iiimv
parent: v.ladeuil+lp at free.fr-20070426072124-bty9pn2i122u1zpx
parent: andrew.bennetts at canonical.com-20070426064512-kcdvlg2u3dzi2l4s
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr.http.auth
timestamp: Thu 2007-04-26 17:54:56 +1000
message:
Merge smart server changes that are already with PQM, and fix conflict and formatting nit in NEWS.
------------------------------------------------------------
revno: 2420.1.12.2.13
merged: andrew.bennetts at canonical.com-20070426064512-kcdvlg2u3dzi2l4s
parent: andrew.bennetts at canonical.com-20070426061436-blwwa9pez8gkkgh5
parent: andrew.bennetts at canonical.com-20070426064415-69n3ie22q8l2t44f
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-vfs-fallback
timestamp: Thu 2007-04-26 16:45:12 +1000
message:
Merge in smart-transport-subpaths.
------------------------------------------------------------
revno: 2208.4.5
merged: andrew.bennetts at canonical.com-20070426064415-69n3ie22q8l2t44f
parent: andrew.bennetts at canonical.com-20070426061907-ipn74twdz1gmz52i
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: smart-transport-subpaths
timestamp: Thu 2007-04-26 16:44:15 +1000
message:
Add NEWS entry about bzr+http change.
------------------------------------------------------------
revno: 2208.4.4
merged: andrew.bennetts at canonical.com-20070426061907-ipn74twdz1gmz52i
parent: andrew.bennetts at canonical.com-20070104052612-uflmazssfnud41y8
parent: pqm at pqm.ubuntu.com-20070426054238-v6k5ge3z766vaafk
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: smart-transport-subpaths
timestamp: Thu 2007-04-26 16:19:07 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 2208.4.3
merged: andrew.bennetts at canonical.com-20070104052612-uflmazssfnud41y8
parent: andrew.bennetts at canonical.com-20061222060424-psweqla98ig12mra
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: smart-transport-subpaths
timestamp: Thu 2007-01-04 16:26:12 +1100
message:
Let SmartHTTPTransport.clone('..') continue to POST to the cloned URL (unlike clone('child')).
------------------------------------------------------------
revno: 2208.4.2
merged: andrew.bennetts at canonical.com-20061222060424-psweqla98ig12mra
parent: andrew.bennetts at canonical.com-20061222055608-t1cfil9ws1l95k0f
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr
timestamp: Fri 2006-12-22 17:04:24 +1100
message:
Always POST to the same .bzr/smart URL for a given branch, even when accessing files in subdirectories.
------------------------------------------------------------
revno: 2208.4.1
merged: andrew.bennetts at canonical.com-20061222055608-t1cfil9ws1l95k0f
parent: pqm at pqm.ubuntu.com-20061221043820-0b56b176269f173a
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr
timestamp: Fri 2006-12-22 16:56:08 +1100
message:
normalize_url should normalise escaping of unreserved characters, like '~'.
------------------------------------------------------------
revno: 2420.1.12.2.12
merged: andrew.bennetts at canonical.com-20070426061436-blwwa9pez8gkkgh5
parent: andrew.bennetts at canonical.com-20070426060131-zaumabdzwl8nrlux
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-vfs-fallback
timestamp: Thu 2007-04-26 16:14:36 +1000
message:
Fix a couple of test failures introduced by the previous merge.
------------------------------------------------------------
revno: 2420.1.12.2.11
merged: andrew.bennetts at canonical.com-20070426060131-zaumabdzwl8nrlux
parent: andrew.bennetts at canonical.com-20070426054956-eipakzwjs76a14wq
parent: robertc at lifelesswks.robertcollins.net-20070424130122-0a33444e2abe6a8f
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-vfs-fallback
timestamp: Thu 2007-04-26 16:01:31 +1000
message:
Merge Robert's status prefix changes to protocol 2.
------------------------------------------------------------
revno: 2420.1.12.2.2.1.7
merged: robertc at lifelesswks.robertcollins.net-20070424130122-0a33444e2abe6a8f
parent: robertc at lifelesswks.robertcollins.net-20070424125050-8b4f1cf3f5b017bb
committer: Robert Collins <robertc at lifelesswks.robertcollins.net>
branch nick: hpss-protocol2-wire-prefix
timestamp: Tue 2007-04-24 23:01:22 +1000
message:
NEWS.
------------------------------------------------------------
revno: 2420.1.12.2.2.1.6
merged: robertc at lifelesswks.robertcollins.net-20070424125050-8b4f1cf3f5b017bb
parent: robertc at lifelesswks.robertcollins.net-20070424122009-8bb4dede6a298d93
committer: Robert Collins <robertc at lifelesswks.robertcollins.net>
branch nick: hpss-protocol2-wire-prefix
timestamp: Tue 2007-04-24 22:50:50 +1000
message:
Include success/failure feedback in SmartProtocolTwo responses to allow robust handling in the future.
------------------------------------------------------------
revno: 2420.1.12.2.2.1.5
merged: robertc at lifelesswks.robertcollins.net-20070424122009-8bb4dede6a298d93
parent: robertc at lifelesswks.robertcollins.net-20070424120730-ff71254d94206e30
committer: Robert Collins <robertc at lifelesswks.robertcollins.net>
branch nick: hpss-protocol2-wire-prefix
timestamp: Tue 2007-04-24 22:20:09 +1000
message:
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
------------------------------------------------------------
revno: 2420.1.12.2.2.1.4
merged: robertc at lifelesswks.robertcollins.net-20070424120730-ff71254d94206e30
parent: robertc at lifelesswks.robertcollins.net-20070424113214-5660f78098933edb
parent: andrew.bennetts at canonical.com-20070424090150-9buzrpi8lt6qv0tg
committer: Robert Collins <robertc at lifelesswks.robertcollins.net>
branch nick: hpss-protocol2-wire-prefix
timestamp: Tue 2007-04-24 22:07:30 +1000
message:
Merge hpss-protocol2.
------------------------------------------------------------
revno: 2420.1.12.2.2.1.3
merged: robertc at lifelesswks.robertcollins.net-20070424113214-5660f78098933edb
parent: robertc at lifelesswks.robertcollins.net-20070424105216-8a68b2533da78717
committer: Robert Collins <robertc at lifelesswks.robertcollins.net>
branch nick: hpss-protocol2-wire-prefix
timestamp: Tue 2007-04-24 21:32:14 +1000
message:
Refactor the HPSS Response code to take SmartServerResponse rather than args and body.
------------------------------------------------------------
revno: 2420.1.12.2.2.1.2
merged: robertc at lifelesswks.robertcollins.net-20070424105216-8a68b2533da78717
parent: robertc at lifelesswks.robertcollins.net-20070424104022-308ab78a663c23f7
committer: Robert Collins <robertc at lifelesswks.robertcollins.net>
branch nick: hpss-protocol2-wire-prefix
timestamp: Tue 2007-04-24 20:52:16 +1000
message:
Add FailedSmartServerResponse.
------------------------------------------------------------
revno: 2420.1.12.2.2.1.1
merged: robertc at lifelesswks.robertcollins.net-20070424104022-308ab78a663c23f7
parent: andrew.bennetts at canonical.com-20070424072048-tgbochqfr1n33bcy
committer: Robert Collins <robertc at lifelesswks.robertcollins.net>
branch nick: hpss-protocol2-wire-prefix
timestamp: Tue 2007-04-24 20:40:22 +1000
message:
Add SuccessfulSmartServerResponse.
------------------------------------------------------------
revno: 2420.1.12.2.10
merged: andrew.bennetts at canonical.com-20070426054956-eipakzwjs76a14wq
parent: andrew.bennetts at canonical.com-20070425055650-8mlo7rmtj65za5ql
parent: pqm at pqm.ubuntu.com-20070426054238-v6k5ge3z766vaafk
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-vfs-fallback
timestamp: Thu 2007-04-26 15:49:56 +1000
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 2420.1.39
merged: pqm at pqm.ubuntu.com-20070426054238-v6k5ge3z766vaafk
parent: pqm at pqm.ubuntu.com-20070426050629-c5i80a0iav553pix
parent: andrew.bennetts at canonical.com-20070426043244-l1gtjevl8f98jbnk
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-26 06:42:38 +0100
message:
(Andrew Bennetts, Robert Collins) Smart server protocol versioning.
------------------------------------------------------------
revno: 2420.1.12.2.6.1.3
merged: andrew.bennetts at canonical.com-20070426043244-l1gtjevl8f98jbnk
parent: andrew.bennetts at canonical.com-20070425054002-08sj7lxphtpb6ewm
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-protocol2
timestamp: Thu 2007-04-26 14:32:44 +1000
message:
Update protocol versioning docs to explain how unknown request versions should be handled.
------------------------------------------------------------
revno: 2420.1.12.2.6.1.2
merged: andrew.bennetts at canonical.com-20070425054002-08sj7lxphtpb6ewm
parent: andrew.bennetts at canonical.com-20070425045619-gfsty2ebwx3c5rka
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-protocol2
timestamp: Wed 2007-04-25 15:40:02 +1000
message:
NEWS entry, greatly improved docstring in bzrlib.smart.
------------------------------------------------------------
revno: 2420.1.12.2.6.1.1
merged: andrew.bennetts at canonical.com-20070425045619-gfsty2ebwx3c5rka
parent: andrew.bennetts at canonical.com-20070424090150-9buzrpi8lt6qv0tg
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-protocol2
timestamp: Wed 2007-04-25 14:56:19 +1000
message:
Use less confusing version strings, and define REQUEST_VERSION_TWO/RESPONSE_VERSION_TWO constants for them.
------------------------------------------------------------
revno: 2420.1.38
merged: pqm at pqm.ubuntu.com-20070426050629-c5i80a0iav553pix
parent: pqm at pqm.ubuntu.com-20070426021942-eutaiob3qgh6kln8
parent: mbp at sourcefrog.net-20070425055110-i0fmvoc3t4jejlbd
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-26 06:06:29 +0100
message:
Don't set the bugs property unless bugs are actually set
------------------------------------------------------------
revno: 2420.1.33.2.1
merged: mbp at sourcefrog.net-20070425055110-i0fmvoc3t4jejlbd
parent: pqm at pqm.ubuntu.com-20070425025045-rs79ekrx5xtf9eq9
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bugfix-property
timestamp: Wed 2007-04-25 15:51:10 +1000
message:
Don't set the bugs property unless bugs are actually set
------------------------------------------------------------
revno: 2420.1.37
merged: pqm at pqm.ubuntu.com-20070426021942-eutaiob3qgh6kln8
parent: pqm at pqm.ubuntu.com-20070425143732-c4aa489eylhhfnzg
parent: robertc at robertcollins.net-20070426014829-znbzqzsk1gq68xqh
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-26 03:19:42 +0100
message:
(robertc) Use repr rather than str when reporting an unprintable exception to aid debugging. (Robert Collins)
------------------------------------------------------------
revno: 2420.1.36.1.1
merged: robertc at robertcollins.net-20070426014829-znbzqzsk1gq68xqh
parent: pqm at pqm.ubuntu.com-20070425143732-c4aa489eylhhfnzg
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2007-04-26 11:48:29 +1000
message:
Fix the 'Unprintable error' message display to use the repr of the
exception that prevented printing the error because the str value for it
is often not useful in debugging (e.g. KeyError('foo') has a str() of
'foo' but a repr of 'KeyError('foo')' which is much more useful.
(Robert Collins)
------------------------------------------------------------
revno: 2420.1.36
merged: pqm at pqm.ubuntu.com-20070425143732-c4aa489eylhhfnzg
parent: pqm at pqm.ubuntu.com-20070425065022-rsmpi4x2q1gn8536
parent: john at arbash-meinel.com-20070423192314-y2x7sr7yupacqglk
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-04-25 15:37:32 +0100
message:
(Kent Gibson, John Arbash Meinel) Improve 'bzr log file' to both be significantly faster, and more correct.
------------------------------------------------------------
revno: 2359.1.11
merged: john at arbash-meinel.com-20070423192314-y2x7sr7yupacqglk
parent: john at arbash-meinel.com-20070423180919-22nnm0baju1kab6x
parent: pqm at pqm.ubuntu.com-20070423075015-340ajk1vo3pzxheu
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: log_ancestry
timestamp: Mon 2007-04-23 14:23:14 -0500
message:
[merge] bzr.dev 2446
------------------------------------------------------------
revno: 2359.1.10
merged: john at arbash-meinel.com-20070423180919-22nnm0baju1kab6x
parent: john at arbash-meinel.com-20070423175330-cwzggk38xbsf4wyy
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: log_ancestry
timestamp: Mon 2007-04-23 13:09:19 -0500
message:
Add my name to the NEWS entry
------------------------------------------------------------
revno: 2359.1.9
merged: john at arbash-meinel.com-20070423175330-cwzggk38xbsf4wyy
parent: john at arbash-meinel.com-20070418223921-0h2g7salf1scfd2a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: log_ancestry
timestamp: Mon 2007-04-23 12:53:30 -0500
message:
Only generate a new set when we need to. Drops 'bzr log NEWS' time from 22s => 8s
------------------------------------------------------------
revno: 2359.1.8
merged: john at arbash-meinel.com-20070418223921-0h2g7salf1scfd2a
parent: john at arbash-meinel.com-20070418223759-kek0qqqdv3wddcae
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: log_ancestry
timestamp: Wed 2007-04-18 17:39:21 -0500
message:
doc
------------------------------------------------------------
revno: 2359.1.7
merged: john at arbash-meinel.com-20070418223759-kek0qqqdv3wddcae
parent: john at arbash-meinel.com-20070418221454-zkozu1yyny4zx3rv
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: log_ancestry
timestamp: Wed 2007-04-18 17:37:59 -0500
message:
Create a direct test for _get_revisions_touching_file_id
------------------------------------------------------------
revno: 2359.1.6
merged: john at arbash-meinel.com-20070418221454-zkozu1yyny4zx3rv
parent: john at arbash-meinel.com-20070418215032-38i9ynsx6fkqaiyf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: log_ancestry
timestamp: Wed 2007-04-18 17:14:54 -0500
message:
Create a helper tree which has a semi-interesting history.
This allows us to test which files are actually modified.
------------------------------------------------------------
revno: 2359.1.5
merged: john at arbash-meinel.com-20070418215032-38i9ynsx6fkqaiyf
parent: john at arbash-meinel.com-20070418214759-xmfpvwok0v6ci38l
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: log_ancestry
timestamp: Wed 2007-04-18 16:50:32 -0500
message:
change some variable names to make the function a bit clearer.
------------------------------------------------------------
revno: 2359.1.4
merged: john at arbash-meinel.com-20070418214759-xmfpvwok0v6ci38l
parent: warthog618 at gmail.com-20070410160523-wuwa272pl243buhf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: log_ancestry
timestamp: Wed 2007-04-18 16:47:59 -0500
message:
Refactor the specific revisions for file id into a helper function.
------------------------------------------------------------
revno: 2359.1.3
merged: warthog618 at gmail.com-20070410160523-wuwa272pl243buhf
parent: warthog618 at gmail.com-20070410151824-9qnth9n0uiypca71
parent: pqm at pqm.ubuntu.com-20070410074302-cf6b95587a1058cd
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: bzr.kg
timestamp: Wed 2007-04-11 00:05:23 +0800
message:
merge bzr.dev
------------------------------------------------------------
revno: 2359.1.2
merged: warthog618 at gmail.com-20070410151824-9qnth9n0uiypca71
parent: warthog618 at gmail.com-20070315161504-lrltutbkgs7ksago
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: bzr.kg
timestamp: Tue 2007-04-10 23:18:24 +0800
message:
add logging of merge revisions
------------------------------------------------------------
revno: 2359.1.1
merged: warthog618 at gmail.com-20070315161504-lrltutbkgs7ksago
parent: pqm at pqm.ubuntu.com-20070314155044-47c0c6257a6c6717
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: bzr.kg
timestamp: Fri 2007-03-16 01:15:04 +0900
message:
Fix ``bzr log <file>`` so it only logs the revisions that changed the file, and does it faster.
------------------------------------------------------------
revno: 2420.1.35
merged: pqm at pqm.ubuntu.com-20070425065022-rsmpi4x2q1gn8536
parent: pqm at pqm.ubuntu.com-20070425054241-urh0t3nequwc2j6q
parent: amanic at gmail.com-20070420071526-8e395b3gqvp1by61
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-04-25 07:50:22 +0100
message:
bzr rm removes the working file
------------------------------------------------------------
revno: 2292.1.34
merged: amanic at gmail.com-20070420071526-8e395b3gqvp1by61
parent: amanic at gmail.com-20070420070001-lbknio8gvry1au0w
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Fri 2007-04-20 09:15:26 +0200
message:
Move "magically convert commands like 'remove abc' to ['remove', 'abc']"
from tests/__init__.run_bzr_captured to tests/blackbox/test_remove
------------------------------------------------------------
revno: 2292.1.33
merged: amanic at gmail.com-20070420070001-lbknio8gvry1au0w
parent: amanic at gmail.com-20070419055947-x776pmmp7uj7utva
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Fri 2007-04-20 09:00:01 +0200
message:
* Remove workingtree.canonicalpath
------------------------------------------------------------
revno: 2292.1.32
merged: amanic at gmail.com-20070419055947-x776pmmp7uj7utva
parent: amanic at gmail.com-20070418202208-8081vgmmyr6k87op
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Thu 2007-04-19 07:59:47 +0200
message:
* tests/__init__.run_bzr
Now gives better assert message for 'Unexpected return code'
* blackbox/test_remove
- Add changed file tests
- When checking changed/unknown rm fails, always wheck if we can forec it.
- Move one file tests to top
- Fixed copy-paste pattern induced mishaps where more-than-one-file-tests
were actually just testing one-file
- Add test to remove while in a child dir
- Add remove deleted file test
------------------------------------------------------------
revno: 2292.1.31
merged: amanic at gmail.com-20070418202208-8081vgmmyr6k87op
parent: amanic at gmail.com-20070418201215-upzz7pof6a4433n7
parent: pqm at pqm.ubuntu.com-20070417080415-5vn25svmf95ki88z
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Wed 2007-04-18 22:22:08 +0200
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2292.1.30
merged: amanic at gmail.com-20070418201215-upzz7pof6a4433n7
parent: amanic at gmail.com-20070416183544-tdtramoul71svkhh
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Wed 2007-04-18 22:12:15 +0200
message:
* Minor text fixes.
* Remove trailing whitespace added by this branch.
* Add tests for removing empty directories.
* workingtree.remove
- Don't recurse into empty directories.
- Use absolute path when deleting from the file system.
------------------------------------------------------------
revno: 2292.1.29
merged: amanic at gmail.com-20070416183544-tdtramoul71svkhh
parent: amanic at gmail.com-20070416182641-8ewx7hfmkehjq5li
parent: pqm at pqm.ubuntu.com-20070416080254-bf3rfk77k5bgfdl7
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Mon 2007-04-16 20:35:44 +0200
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2292.1.28
merged: amanic at gmail.com-20070416182641-8ewx7hfmkehjq5li
parent: amanic at gmail.com-20070416062659-z2yrpp5118a1yeyr
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Mon 2007-04-16 20:26:41 +0200
message:
* NEWS
- move my news to NOTES WHEN UPGRADING section.
* bzrlib/builtins.py
- Use RegistryOption for bzr rm --force and --keep
* bzrlib/tests/__init__.py
- remove a white space
* bzrlib/tests/blackbox/test_selftest.py
- make blackbox/test_selftest.py pass again:
Its run_bzr_captured method did not return anything, although bzr_run
expects it now.
------------------------------------------------------------
revno: 2292.1.27
merged: amanic at gmail.com-20070416062659-z2yrpp5118a1yeyr
parent: amanic at gmail.com-20070416025505-spmkhtjsrbiv21m3
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Mon 2007-04-16 08:26:59 +0200
message:
* tests/__init__.TestCase.run_bzr_captured
- Support single text commands with quoted sub-strings eg.:
"bzr commit 'some message'"
- Move support for error_regexes from run_bzr_error() to run_bzr()
as it is quite usefull to assert output from notes.
* blackbox/test_remove
- convert the rest of the tests to use the new improved self.run_bzr
------------------------------------------------------------
revno: 2292.1.26
merged: amanic at gmail.com-20070416025505-spmkhtjsrbiv21m3
parent: amanic at gmail.com-20070416010020-3jan8hje4qmbwdsh
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Mon 2007-04-16 04:55:05 +0200
message:
* tests/__init__
- make run_bzr_captured abit more clever, so that it will
split up argunents if they are passed as a single string.
* blackbox/test_remove
- start converting to run_bzr and run_bzr_error
------------------------------------------------------------
revno: 2292.1.25
merged: amanic at gmail.com-20070416010020-3jan8hje4qmbwdsh
parent: amanic at gmail.com-20070414124037-ewx6hp70tw4vdtdb
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Mon 2007-04-16 03:00:20 +0200
message:
* Add utility method delta.get_changes_as_text to get the output of .show()
as a string.
* Add new errors.BzrRemoveChangedFilesError to raise when 'bzr remove'
should refuse to delete stuff.
* Add workingtree.canicalpath(filename) to normalize file names.
* Changed the working of workingtree.remove(...) to check if any files
are changed before it starts deleting anything. Will raise exception
now if changed files are passed to be removed.
* workingtree_implementations/test_remove.py
- Checked all tests and add more cases.
------------------------------------------------------------
revno: 2292.1.24
merged: amanic at gmail.com-20070414124037-ewx6hp70tw4vdtdb
parent: amanic at gmail.com-20070414115726-kykcsm9pztykst1w
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Sat 2007-04-14 14:40:37 +0200
message:
minor text cleanups
------------------------------------------------------------
revno: 2292.1.23
merged: amanic at gmail.com-20070414115726-kykcsm9pztykst1w
parent: amanic at gmail.com-20070414005827-zf4n2y9scrjs2d2x
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Sat 2007-04-14 13:57:26 +0200
message:
Revert test_too_much.py and just do the minimum te get the tests to pass.
Add some test to test_remove.py.
Let test_remove.py make safe id's.
------------------------------------------------------------
revno: 2292.1.22
merged: amanic at gmail.com-20070414005827-zf4n2y9scrjs2d2x
parent: amanic at gmail.com-20070413194540-jaf9n9wzhx4pd66c
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Sat 2007-04-14 02:58:27 +0200
message:
Implement TODO: Normalize names.
Assume paths relative to the basedir.
(not to the current dir, which I did previously)
------------------------------------------------------------
revno: 2292.1.21
merged: amanic at gmail.com-20070413194540-jaf9n9wzhx4pd66c
parent: amanic at gmail.com-20070413184526-6xhpgyvqz2u18l2q
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Fri 2007-04-13 21:45:40 +0200
message:
undo tree.has_id fake-bugfix, which seems to not be needed anymore..
------------------------------------------------------------
revno: 2292.1.20
merged: amanic at gmail.com-20070413184526-6xhpgyvqz2u18l2q
parent: amanic at gmail.com-20070413182326-qt44rjuzo249l7x8
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Fri 2007-04-13 20:45:26 +0200
message:
move test_workingtree.TestRemove to workingtree_implementations/test_remove
------------------------------------------------------------
revno: 2292.1.19
merged: amanic at gmail.com-20070413182326-qt44rjuzo249l7x8
parent: amanic at gmail.com-20070413181313-btt9e9cx16987yrq
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Fri 2007-04-13 20:23:26 +0200
message:
convert from using self.runbzr to self.run_bzr_captured
------------------------------------------------------------
revno: 2292.1.18
merged: amanic at gmail.com-20070413181313-btt9e9cx16987yrq
parent: amanic at gmail.com-20070412014719-3oo573tt381rpigu
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Fri 2007-04-13 20:13:13 +0200
message:
revert wrapping change
------------------------------------------------------------
revno: 2292.1.17
merged: amanic at gmail.com-20070412014719-3oo573tt381rpigu
parent: amanic at gmail.com-20070412013832-1avmdh8pba8yp4b1
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Thu 2007-04-12 03:47:19 +0200
message:
Remove redundant __init__ and object variable.
------------------------------------------------------------
revno: 2292.1.16
merged: amanic at gmail.com-20070412013832-1avmdh8pba8yp4b1
parent: amanic at gmail.com-20070412011853-z30g2o1ypj7rqcyr
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Thu 2007-04-12 03:38:32 +0200
message:
Update NEWS
------------------------------------------------------------
revno: 2292.1.15
merged: amanic at gmail.com-20070412011853-z30g2o1ypj7rqcyr
parent: amanic at gmail.com-20070412011017-ofzhcgj7o7bnh6dd
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Thu 2007-04-12 03:18:53 +0200
message:
Fix test too much again.
------------------------------------------------------------
revno: 2292.1.14
merged: amanic at gmail.com-20070412011017-ofzhcgj7o7bnh6dd
parent: amanic at gmail.com-20070412004748-0nsa6sughf0xu744
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Thu 2007-04-12 03:10:17 +0200
message:
* blackbox/test_remove
- uninvert my logic
- add a little more testing
------------------------------------------------------------
revno: 2292.1.13
merged: amanic at gmail.com-20070412004748-0nsa6sughf0xu744
parent: amanic at gmail.com-20070411225348-7145vlsq3f390osg
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Thu 2007-04-12 02:47:48 +0200
message:
* merge the unversion command back into the remove command,
merging the commands and tests.
* make all tests pass again.
------------------------------------------------------------
revno: 2292.1.12
merged: amanic at gmail.com-20070411225348-7145vlsq3f390osg
parent: amanic at gmail.com-20070411220954-azjn3zpjystqowcv
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Thu 2007-04-12 00:53:48 +0200
message:
* test_workingtree/TestRemove
- Change global and local constants to class variables.
------------------------------------------------------------
revno: 2292.1.11
merged: amanic at gmail.com-20070411220954-azjn3zpjystqowcv
parent: amanic at gmail.com-20070411220247-plcjs3dvidvjx2vj
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Thu 2007-04-12 00:09:54 +0200
message:
* workingtree.remove
- Don't figure out what changed if we don't care.
------------------------------------------------------------
revno: 2292.1.10
merged: amanic at gmail.com-20070411220247-plcjs3dvidvjx2vj
parent: amanic at gmail.com-20070411212706-7jzaph3pv0856qks
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Thu 2007-04-12 00:02:47 +0200
message:
* workingtree.remove
- Add and test a new force option in order to force the deletion of changed files
and non-empty directories.
- Some doc fixups.
- Remove some implemented todo's
- Remove ## TODO: Remove nested loops; better scalability
as I can't see any nested loop.s
- small whitespace cleanups in tests.
------------------------------------------------------------
revno: 2292.1.9
merged: amanic at gmail.com-20070411212706-7jzaph3pv0856qks
parent: amanic at gmail.com-20070411204847-quynsdasuvjhju64
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Wed 2007-04-11 23:27:06 +0200
message:
Handle the removing of nonempty directories.
------------------------------------------------------------
revno: 2292.1.8
merged: amanic at gmail.com-20070411204847-quynsdasuvjhju64
parent: amanic at gmail.com-20070409215050-9k4jxh76grq7jxz8
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Wed 2007-04-11 22:48:47 +0200
message:
When removing and deleting files,
only check for changes on specific files.
------------------------------------------------------------
revno: 2292.1.7
merged: amanic at gmail.com-20070409215050-9k4jxh76grq7jxz8
parent: amanic at gmail.com-20070331204906-iai2v10wk3l3lt12
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Mon 2007-04-09 23:50:50 +0200
message:
First pass at only deleting files on 'bzr remove' when
they haven't changed.
Needed to modify _find_children_across_trees (tree.py) because
tree.has_id did not work as excpeted.
------------------------------------------------------------
revno: 2292.1.6
merged: amanic at gmail.com-20070331204906-iai2v10wk3l3lt12
parent: amanic at gmail.com-20070323182956-5vestftm6gx3o9mz
parent: pqm at pqm.ubuntu.com-20070329064515-7bfc20fbcf9cf1a7
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Sat 2007-03-31 22:49:06 +0200
message:
merge bzr.dev
------------------------------------------------------------
revno: 2292.1.5
merged: amanic at gmail.com-20070323182956-5vestftm6gx3o9mz
parent: amanic at gmail.com-20070219054605-o69te1fuwcirv01a
parent: pqm at pqm.ubuntu.com-20070322230820-f8735ba918f51539
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Fri 2007-03-23 20:29:56 +0200
message:
merge with bzr.dev
------------------------------------------------------------
revno: 2292.1.4
merged: amanic at gmail.com-20070219054605-o69te1fuwcirv01a
parent: amanic at gmail.com-20070216072443-g38i13amiri6j2ir
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Mon 2007-02-19 07:46:05 +0200
message:
Make output for bzr remove more verbose.
------------------------------------------------------------
revno: 2292.1.3
merged: amanic at gmail.com-20070216072443-g38i13amiri6j2ir
parent: amanic at gmail.com-20070216071540-wq20se0crnnki9c9
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Fri 2007-02-16 09:24:43 +0200
message:
Factored out common code from test_remove.py into test_unversion.py
------------------------------------------------------------
revno: 2292.1.2
merged: amanic at gmail.com-20070216071540-wq20se0crnnki9c9
parent: amanic at gmail.com-20070216061611-sjscmgi4v5rozq6h
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Fri 2007-02-16 09:15:40 +0200
message:
Minor test cleanups, making test_remove.py and test_unversion.py more similar.
------------------------------------------------------------
revno: 2292.1.1
merged: amanic at gmail.com-20070216061611-sjscmgi4v5rozq6h
parent: pqm at pqm.ubuntu.com-20070215181416-864dbe690a0f3da8
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Fri 2007-02-16 08:16:11 +0200
message:
"bzr remove" and "bzr rm" will now remove the working file.
This has been done for consistency with svn and the unix rm command.
The old remove behaviour has been retained in the new command
"bzr unversion", which will just stop versioning the file,
but not delete it.
(Addressing Bug #82602)
Exisitng tests have been reworked and new tests were added to test these
changes properly.
------------------------------------------------------------
revno: 2420.1.34
merged: pqm at pqm.ubuntu.com-20070425054241-urh0t3nequwc2j6q
parent: pqm at pqm.ubuntu.com-20070425025045-rs79ekrx5xtf9eq9
parent: bialix at ukr.net-20070425044607-qbl5oce7jygaxat2
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-04-25 06:42:41 +0100
message:
(bialix, mbp) explicitly check for SIGQUIT in 'signal' stdlib module
------------------------------------------------------------
revno: 2420.1.33.1.1
merged: bialix at ukr.net-20070425044607-qbl5oce7jygaxat2
parent: pqm at pqm.ubuntu.com-20070425025045-rs79ekrx5xtf9eq9
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win32.fixes
timestamp: Wed 2007-04-25 07:46:07 +0300
message:
explicitly check for SIGQUIT in 'signal' stdlib module (it's absent on win32)
------------------------------------------------------------
revno: 2420.1.33
merged: pqm at pqm.ubuntu.com-20070425025045-rs79ekrx5xtf9eq9
parent: pqm at pqm.ubuntu.com-20070424224426-po331pf12jpzmrvk
parent: mbp at sourcefrog.net-20070425022456-9fh3xckrqi8dmne3
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-04-25 03:50:45 +0100
message:
Remove redundant test_doc_generate (alexander)
------------------------------------------------------------
revno: 2420.1.32.1.1
merged: mbp at sourcefrog.net-20070425022456-9fh3xckrqi8dmne3
parent: pqm at pqm.ubuntu.com-20070424224426-po331pf12jpzmrvk
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Wed 2007-04-25 12:24:56 +1000
message:
Remove redundant test_doc_generate (alexander)
------------------------------------------------------------
revno: 2420.1.32
merged: pqm at pqm.ubuntu.com-20070424224426-po331pf12jpzmrvk
parent: pqm at pqm.ubuntu.com-20070424141924-i4w482pi1pb95pob
parent: john at arbash-meinel.com-20070424220920-1pamgmk2mo44wlm3
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-04-24 23:44:26 +0100
message:
(John Arbash Meinel) Add Branch.get_revision_id_to_revno_map
------------------------------------------------------------
revno: 2418.5.15
merged: john at arbash-meinel.com-20070424220920-1pamgmk2mo44wlm3
parent: john at arbash-meinel.com-20070424194505-mv5dwjw0mx4tfpfs
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Tue 2007-04-24 17:09:20 -0500
message:
NEWS
------------------------------------------------------------
revno: 2418.5.14
merged: john at arbash-meinel.com-20070424194505-mv5dwjw0mx4tfpfs
parent: john at arbash-meinel.com-20070424194309-nt3sxw7x4sqwnykh
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Tue 2007-04-24 14:45:05 -0500
message:
clean up ASCII revision graph art.
------------------------------------------------------------
revno: 2418.5.13
merged: john at arbash-meinel.com-20070424194309-nt3sxw7x4sqwnykh
parent: john at arbash-meinel.com-20070424194013-zjckbpsbq7vff1wh
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Tue 2007-04-24 14:43:09 -0500
message:
Remove revision_id_to_dotted_revno, because it isn't used.
------------------------------------------------------------
revno: 2418.5.12
merged: john at arbash-meinel.com-20070424194013-zjckbpsbq7vff1wh
parent: john at arbash-meinel.com-20070424032327-w2tz2smz41eco4u1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Tue 2007-04-24 14:40:13 -0500
message:
Move functions from BzrBranch to base Branch object.
Fix RemoteBranch to properly clear its cache at the right time.
------------------------------------------------------------
revno: 2418.5.11
merged: john at arbash-meinel.com-20070424032327-w2tz2smz41eco4u1
parent: john at arbash-meinel.com-20070417213150-yf8r9e1ufueedb3q
parent: pqm at pqm.ubuntu.com-20070423170758-qd512ltqglzfo6w9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Mon 2007-04-23 22:23:27 -0500
message:
[merge] bzr.dev 2447
------------------------------------------------------------
revno: 2418.5.10
merged: john at arbash-meinel.com-20070417213150-yf8r9e1ufueedb3q
parent: john at arbash-meinel.com-20070417212608-84w0sw1e7tiuhgr4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Tue 2007-04-17 16:31:50 -0500
message:
fix typo
------------------------------------------------------------
revno: 2418.5.9
merged: john at arbash-meinel.com-20070417212608-84w0sw1e7tiuhgr4
parent: john at arbash-meinel.com-20070417211929-rchob1jeahy30cj0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Tue 2007-04-17 16:26:08 -0500
message:
Have RevisionSpec_revno() also use the new helper
------------------------------------------------------------
revno: 2418.5.8
merged: john at arbash-meinel.com-20070417211929-rchob1jeahy30cj0
parent: john at arbash-meinel.com-20070417211809-f225hrm1juxoityu
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Tue 2007-04-17 16:19:29 -0500
message:
Update annotate.py to use the new helper function.
------------------------------------------------------------
revno: 2418.5.7
merged: john at arbash-meinel.com-20070417211809-f225hrm1juxoityu
parent: john at arbash-meinel.com-20070417210124-rfr3w1llh869058q
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Tue 2007-04-17 16:18:09 -0500
message:
Move the revision_id=>map generation to be a public function.
------------------------------------------------------------
revno: 2418.5.6
merged: john at arbash-meinel.com-20070417210124-rfr3w1llh869058q
parent: john at arbash-meinel.com-20070417203323-xbmbi9cyjr6cocuf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Tue 2007-04-17 16:01:24 -0500
message:
Cache the revision_id => revno map as appropriate.
------------------------------------------------------------
revno: 2418.5.5
merged: john at arbash-meinel.com-20070417203323-xbmbi9cyjr6cocuf
parent: john at arbash-meinel.com-20070417202335-0cc0thlj5sy28m9m
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Tue 2007-04-17 15:33:23 -0500
message:
Add some tests and an api for revision_id_to_dotted_revno
This should use caching to be fast for multiple calls
but for now it just implements what is needed.
------------------------------------------------------------
revno: 2418.5.4
merged: john at arbash-meinel.com-20070417202335-0cc0thlj5sy28m9m
parent: john at arbash-meinel.com-20070417201836-2bso1f1clhhx7k1a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Tue 2007-04-17 15:23:35 -0500
message:
Included a test for revision_id=None
------------------------------------------------------------
revno: 2418.5.3
merged: john at arbash-meinel.com-20070417201836-2bso1f1clhhx7k1a
parent: john at arbash-meinel.com-20070417201724-5seu77st1h843nie
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Tue 2007-04-17 15:18:36 -0500
message:
Use a more straightforward implementation of generating 'tree_with_merge'
------------------------------------------------------------
revno: 2418.5.2
merged: john at arbash-meinel.com-20070417201724-5seu77st1h843nie
parent: john at arbash-meinel.com-20070417201004-1v7sim0tlt19l8o4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Tue 2007-04-17 15:17:24 -0500
message:
Move TestCaseWithBranch into branch_implementations from test_branch.py
------------------------------------------------------------
revno: 2418.5.1
merged: john at arbash-meinel.com-20070417201004-1v7sim0tlt19l8o4
parent: pqm at pqm.ubuntu.com-20070413174100-zpfqleaf5ph9ycx4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_revision_id_to_revno
timestamp: Tue 2007-04-17 15:10:04 -0500
message:
Make a Branch helper which can create a very basic MemoryTree with history.
This updates MutableTree to include 'set_parent_ids' which is helpful
when setting up simple tests.
It also creates a helper function in branch_implementations..TestCaseWithBranch
so that we can create a Branch which has a simple merge in it.
It also adds a test for revision_id_to_revno which previously did not have any
direct tests.
------------------------------------------------------------
revno: 2420.1.31
merged: pqm at pqm.ubuntu.com-20070424141924-i4w482pi1pb95pob
parent: pqm at pqm.ubuntu.com-20070424054249-bpkw4wwywqjt2nel
parent: bialix at ukr.net-20070424131506-8roiv9b2bu7gv3cf
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-04-24 15:19:24 +0100
message:
(bialix) fix RSTX wrong formatting in HACKING (trivial)
------------------------------------------------------------
revno: 2420.1.29.1.1
merged: bialix at ukr.net-20070424131506-8roiv9b2bu7gv3cf
parent: pqm at pqm.ubuntu.com-20070424033735-s0igieajv2czb2tt
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: trivial
timestamp: Tue 2007-04-24 16:15:06 +0300
message:
fix RSTX wrong formatting in HACKING
------------------------------------------------------------
revno: 2420.1.12.2.9
merged: andrew.bennetts at canonical.com-20070425055650-8mlo7rmtj65za5ql
parent: andrew.bennetts at canonical.com-20070424181238-ujjudjjjn2jbqrj6
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-vfs-fallback
timestamp: Wed 2007-04-25 15:56:50 +1000
message:
Update comment according to Martin's suggestion.
------------------------------------------------------------
revno: 2420.1.12.2.8
merged: andrew.bennetts at canonical.com-20070424181238-ujjudjjjn2jbqrj6
parent: andrew.bennetts at canonical.com-20070424102546-am5s92urrlfk9zjb
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-vfs-fallback
timestamp: Wed 2007-04-25 04:12:38 +1000
message:
Add test, and tidy implementation.
------------------------------------------------------------
revno: 2420.1.12.2.7
merged: andrew.bennetts at canonical.com-20070424102546-am5s92urrlfk9zjb
parent: andrew.bennetts at canonical.com-20070424090150-9buzrpi8lt6qv0tg
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-vfs-fallback
timestamp: Tue 2007-04-24 20:25:46 +1000
message:
Try a version 1 hello probe to determine if we can use RemoteBzrDir on a particular transport, allowing smooth interoperation with older servers.
------------------------------------------------------------
revno: 2420.1.12.2.6
merged: andrew.bennetts at canonical.com-20070424090150-9buzrpi8lt6qv0tg
parent: andrew.bennetts at canonical.com-20070424085029-0o6h7jj68i7sd8ea
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-protocol2
timestamp: Tue 2007-04-24 19:01:50 +1000
message:
Improve HelloRequest's docstring.
------------------------------------------------------------
revno: 2420.1.12.2.5
merged: andrew.bennetts at canonical.com-20070424085029-0o6h7jj68i7sd8ea
parent: andrew.bennetts at canonical.com-20070424083632-f7kadff1wbp3eszn
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-protocol2
timestamp: Tue 2007-04-24 18:50:29 +1000
message:
Reduce duplication in test_smart_transport.
------------------------------------------------------------
revno: 2420.1.12.2.4
merged: andrew.bennetts at canonical.com-20070424083632-f7kadff1wbp3eszn
parent: andrew.bennetts at canonical.com-20070424075513-ibtrd164miun08a8
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-protocol2
timestamp: Tue 2007-04-24 18:36:32 +1000
message:
Change smart protocol version two prefix to '2\n'.
------------------------------------------------------------
revno: 2420.1.12.2.3
merged: andrew.bennetts at canonical.com-20070424075513-ibtrd164miun08a8
parent: andrew.bennetts at canonical.com-20070424072048-tgbochqfr1n33bcy
parent: pqm at pqm.ubuntu.com-20070423170758-qd512ltqglzfo6w9
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-protocol2
timestamp: Tue 2007-04-24 17:55:13 +1000
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 2420.1.12.2.2
merged: andrew.bennetts at canonical.com-20070424072048-tgbochqfr1n33bcy
parent: andrew.bennetts at canonical.com-20070424051106-wwlidpflp1rwi3a7
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-protocol2
timestamp: Tue 2007-04-24 17:20:48 +1000
message:
Smart server mediums now detect which protocol version a request is and dispatch accordingly.
------------------------------------------------------------
revno: 2420.1.12.2.1
merged: andrew.bennetts at canonical.com-20070424051106-wwlidpflp1rwi3a7
parent: pqm at pqm.ubuntu.com-20070419224637-jvlshh6kibtj43a5
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-protocol2
timestamp: Tue 2007-04-24 15:11:06 +1000
message:
Add Smart{Client,Server}RequestProtocolTwo, that prefix args tuples with a version marker.
-------------- next part --------------
Diff too large for email (4817 lines, the limit is 1000).
More information about the bazaar-commits
mailing list