Rev 2726: Merge bzr.dev. in http://people.ubuntu.com/~robertc/baz2.0/repository
Robert Collins
robertc at robertcollins.net
Thu Aug 23 03:18:41 BST 2007
At http://people.ubuntu.com/~robertc/baz2.0/repository
------------------------------------------------------------
revno: 2726
revision-id: robertc at robertcollins.net-20070823021837-jvcdzncyij0typu7
parent: robertc at robertcollins.net-20070822080905-w1cvp6e5cubk0rai
parent: pqm at pqm.ubuntu.com-20070823005013-ada9x55rc31yiwou
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Thu 2007-08-23 12:18:37 +1000
message:
Merge bzr.dev.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/store/revision/text.py text.py-20060303020652-e49155f0da4d14ab
bzrlib/tests/revisionstore_implementations/test_all.py test_all.py-20060303020702-9b2d4c1d75407f31
doc/en/user-guide/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
doc/en/user-guide/server.txt server.txt-20060913044801-h939fvbwzz39gf7g-1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74
revision-id: pqm at pqm.ubuntu.com-20070823005013-ada9x55rc31yiwou
parent: pqm at pqm.ubuntu.com-20070823001812-eermtd2vfr5o6b7o
parent: aaron.bentley at utoronto.ca-20070822235917-m0im4dpa8wni7q3k
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-08-23 01:50:13 +0100
message:
Style tweakage and NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
doc/en/user-guide/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
doc/en/user-guide/server.txt server.txt-20060913044801-h939fvbwzz39gf7g-1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.35.1.3
revision-id: aaron.bentley at utoronto.ca-20070822235917-m0im4dpa8wni7q3k
parent: aaron.bentley at utoronto.ca-20070822234623-nsms2wm36knntp7x
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab.integration
timestamp: Wed 2007-08-22 19:59:17 -0400
message:
Style tweakage and NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
doc/en/user-guide/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
doc/en/user-guide/server.txt server.txt-20060913044801-h939fvbwzz39gf7g-1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.35.1.2
revision-id: aaron.bentley at utoronto.ca-20070822234623-nsms2wm36knntp7x
parent: martin at pentacorp.net-20070815211426-thbyeb5ecbxhocsd
parent: pqm at pqm.ubuntu.com-20070822052832-nxby1d1plok4syek
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab.integration
timestamp: Wed 2007-08-22 19:46:23 -0400
message:
Merge bzr.dev
removed:
doc/README.1st README.1st-20060314161707-b943d5d4cce669b6
doc/developers/scratch.txt scratch.txt-20070618020404-cdhv0ecgrukomemg-3
added:
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
bzrlib/tests/blackbox/test_bundle_info.py test_bundle_info.py-20070816181255-eiuodwxuqu7w7gxf-1
bzrlib/tests/repository_implementations/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
bzrlib/util/simplemapi.py simplemapi.py-20070810174811-ievl23nziuiq2k3m-1
doc/developers/directory-fingerprints.txt directoryfingerprint-20070731033348-okmllh4b5srdtlk2-1
doc/developers/last-modified.txt lastmodified.txt-20070806222243-df50y5fi7n85vnob-1
doc/developers/revision-properties.txt revisionproperties.t-20070807133526-w57m8zv5o7t5kugm-1
doc/en/ en-20070810050627-g7r46azs5mlwj61j-1
doc/en/developer-guide/ developerguide-20070810050627-g7r46azs5mlwj61j-2
doc/en/mini-tutorial/ minitutorial-20070813141352-2u64ooqzo0or4hss-1
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/en/quick-reference/ quickreference-20070813143223-5i7bgw7w8s7l3ae2-1
doc/en/quick-reference/Makefile makefile-20070813143223-5i7bgw7w8s7l3ae2-2
doc/en/quick-reference/quick-start-summary.svg quickstartsummary.sv-20070813143223-5i7bgw7w8s7l3ae2-3
doc/en/release-notes/ releasenotes-20070810050627-g7r46azs5mlwj61j-3
doc/en/user-guide/ userguide-20070810050627-g7r46azs5mlwj61j-4
doc/en/user-reference/ userreference-20070810050627-g7r46azs5mlwj61j-5
doc/index.txt index.txt-20070813101924-07gd9i9d2jt124bf-1
renamed:
doc/bug_trackers.txt => doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
doc/centralized_workflow.txt => doc/en/user-guide/centralized_workflow.txt centralized_workflow-20060830194948-kspf52565xvgrlil-1
doc/configuration.txt => doc/en/user-guide/configuration.txt configuration.txt-20060314161707-868350809502af01
doc/conflicts.txt => doc/en/user-guide/conflicts.txt conflicts.txt-20070723221841-ns3jvwxdb4okn6fk-1
doc/http_smart_server.txt => doc/en/user-guide/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
doc/index.txt => doc/en/user-guide/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
doc/plugins.txt => doc/en/user-guide/plugins.txt plugins.txt-20060314145616-525099a747f3ffdd
doc/server.txt => doc/en/user-guide/server.txt server.txt-20060913044801-h939fvbwzz39gf7g-1
doc/setting_up_email.txt => doc/en/user-guide/setting_up_email.txt setting_up_email.txt-20060314161707-fd242c8944346173
doc/shared_repository_layouts.txt => doc/en/user-guide/shared_repository_layouts.txt shared_repository_la-20070502152030-bagewuqs18ns24o7-1
doc/specifying_revisions.txt => doc/en/user-guide/specifying_revisions.txt specifying_revisions.txt-20060314161707-19deb139101bea33
doc/tutorial.txt => doc/en/user-guide/tutorial.txt tutorial.txt-20050804190939-9dcbba2ef053bc84
doc/using_aliases.txt => doc/en/user-guide/using_aliases.txt using_aliases.txt-20060314161707-c21d27fa2939e039
doc/version_info.txt => doc/en/user-guide/version_info.txt version_info.txt-20060921215543-gju6o5xdic8w25np-1
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
INSTALL INSTALL-20051019070340-4b27f2fb240c7943
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/pack.py container.py-20070607160755-tr8zc26q18rn0jnb-1
bzrlib/patches.py patches.py-20050727183609-378c1cc5972ce908
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/store/__init__.py store.py-20050309040759-164dc5173d6406c2
bzrlib/store/revision/knit.py knit.py-20060303020652-de5fa299e941a3c7
bzrlib/store/versioned/__init__.py weavestore.py-20050907094258-88262e0434babab9
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_bound_branches.py test_bound_branches.py-20051109215527-2373188ad566c205
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/branch_implementations/test_revision_history.py test_revision_histor-20070326062311-v7co92liyuchb80w-1
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_escaped_store.py test_escaped_store.py-20060216023929-6bcb9a067344959f
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_index.py test_index.py-20070712131115-lolkarso50vjr64s-2
bzrlib/tests/test_lockdir.py test_lockdir.py-20060220222025-33d4221569a3d600
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_pack.py test_container.py-20070607160755-tr8zc26q18rn0jnb-2
bzrlib/tests/test_patches.py test_patches.py-20051231203844-f4974d20f6aea09c
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_revisionnamespaces.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_source.py test_source.py-20051207061333-a58dea6abecc030d
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
bzrlib/tests/test_trace.py testtrace.py-20051110225523-a21117fc7a07eeff
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
bzrlib/tests/test_win32utils.py test_win32utils.py-20070713181630-8xsrjymd3e8mgw23-108
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_is_ignored.py test_is_ignored.py-20060518083307-a5b383dd4d070083
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/chroot.py chroot.py-20061011104729-0us9mgm97z378vnt-1
bzrlib/transport/decorator.py decorator.py-20060402223305-e913a0f25319ab42
bzrlib/transport/fakevfat.py fakevfat.py-20060407072414-d59939fa1d6c79d9
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/http/wsgi.py wsgi.py-20061005091552-rz8pva0olkxv0sd8-2
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/transport/ssh.py ssh.py-20060824042150-0s9787kng6zv1nwq-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/bazaar-vcs.org.kid bazaarvcs.org.kid-20060929181918-huv7bgmdey0ktqci-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/performance-contributing.txt performancecontribut-20070621063612-ac4zhhagjzkr21qp-1
doc/developers/performance-roadmap.txt performanceroadmap.t-20070507174912-mwv3xv517cs4sisd-2
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/rst2prettyhtml.py rst2prettyhtml.py-20060929181914-t7dh62f2wxi0i5aj-1
tools/win32/ostools.py ostools.py-20060731163025-npjffm46rgnkl50d-1
doc/en/user-guide/configuration.txt configuration.txt-20060314161707-868350809502af01
doc/en/user-guide/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.35.1.1
revision-id: martin at pentacorp.net-20070815211426-thbyeb5ecbxhocsd
parent: pqm at pqm.ubuntu.com-20070815200214-d3uyn1kkhzekttes
committer: Martin Albisetti <martin at pentacorp.net>
branch nick: bzr_doc
timestamp: Wed 2007-08-15 18:14:26 -0300
message:
updated smart server documentation
modified:
doc/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
doc/server.txt server.txt-20060913044801-h939fvbwzz39gf7g-1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.73
revision-id: pqm at pqm.ubuntu.com-20070823001812-eermtd2vfr5o6b7o
parent: pqm at pqm.ubuntu.com-20070822052832-nxby1d1plok4syek
parent: robertc at robertcollins.net-20070822234336-pl9dspu4z6kbt8lg
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-08-23 01:18:12 +0100
message:
(robertc) Several minor miscellaneous code cleanup fixes. (Robert Collins)
modified:
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/store/revision/text.py text.py-20060303020652-e49155f0da4d14ab
bzrlib/tests/revisionstore_implementations/test_all.py test_all.py-20060303020702-9b2d4c1d75407f31
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.72.1.5
revision-id: robertc at robertcollins.net-20070822234336-pl9dspu4z6kbt8lg
parent: robertc at robertcollins.net-20070822223223-0heetwybcuonp00g
committer: Robert Collins <robertc at robertcollins.net>
branch nick: misc-fixen
timestamp: Thu 2007-08-23 09:43:36 +1000
message:
Tighten the revision store implementation tests surrounding the
None/null: difference. (Robert Collins)
modified:
bzrlib/store/revision/text.py text.py-20060303020652-e49155f0da4d14ab
bzrlib/tests/revisionstore_implementations/test_all.py test_all.py-20060303020702-9b2d4c1d75407f31
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.72.1.4
revision-id: robertc at robertcollins.net-20070822223223-0heetwybcuonp00g
parent: robertc at robertcollins.net-20070822223112-e2qgp43wu1ut5u8l
committer: Robert Collins <robertc at robertcollins.net>
branch nick: misc-fixen
timestamp: Thu 2007-08-23 08:32:23 +1000
message:
Fix an off-by-one in check.py that leads to the progress bar showing
complete for a phase but not actually being complete; if the last file id
checked is big this is confusing. (Robert Collins)
modified:
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.72.1.3
revision-id: robertc at robertcollins.net-20070822223112-e2qgp43wu1ut5u8l
parent: robertc at robertcollins.net-20070822223011-7ir7fquiyjqpgzko
committer: Robert Collins <robertc at robertcollins.net>
branch nick: misc-fixen
timestamp: Thu 2007-08-23 08:31:12 +1000
message:
Fix vertical whitespace in errors.py. (Robert Collins)
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.72.1.2
revision-id: robertc at robertcollins.net-20070822223011-7ir7fquiyjqpgzko
parent: robertc at robertcollins.net-20070822222807-nvjwqzrof5gg3s0b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: misc-fixen
timestamp: Thu 2007-08-23 08:30:11 +1000
message:
This cleans up a few things in fetch.py that are bit-rotten:
- the overly general control_files interface is removed in place of
using get_inventory_weave.
- unused variables are removed
- a empty 4-space indent is turned into a empty line.
(Robert Collins)
modified:
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.72.1.1
revision-id: robertc at robertcollins.net-20070822222807-nvjwqzrof5gg3s0b
parent: pqm at pqm.ubuntu.com-20070822052832-nxby1d1plok4syek
committer: Robert Collins <robertc at robertcollins.net>
branch nick: misc-fixen
timestamp: Thu 2007-08-23 08:28:07 +1000
message:
In bzrlib.tests.revisionstore_implementations.test_all,
test_get_revision_none was confusing because the comment and the test did
not match. So I made a new test that matched the comment, and altered the
test name and comment to match the test. (Robert Collins)
modified:
bzrlib/tests/revisionstore_implementations/test_all.py test_all.py-20060303020702-9b2d4c1d75407f31
=== modified file 'NEWS'
--- a/NEWS 2007-08-22 06:30:25 +0000
+++ b/NEWS 2007-08-23 02:18:37 +0000
@@ -44,6 +44,8 @@
* ``send`` now sends the directive as an attachment by default.
(Aaron Bentley, Lukáš Lalinský, Alexander Belchenko)
+ * Documentation updates (Martin Albisetti)
+
API BREAKS:
* ``Branch.append_revision`` is removed altogether; please use
=== modified file 'bzrlib/store/revision/text.py'
--- a/bzrlib/store/revision/text.py 2007-07-10 21:18:54 +0000
+++ b/bzrlib/store/revision/text.py 2007-08-22 23:43:36 +0000
@@ -108,6 +108,7 @@
return revisions
def _get_revision_xml_file(self, revision_id):
+ _mod_revision.check_not_reserved_id(revision_id)
try:
return self.text_store.get(revision_id)
except (IndexError, KeyError):
=== modified file 'bzrlib/tests/revisionstore_implementations/test_all.py'
--- a/bzrlib/tests/revisionstore_implementations/test_all.py 2007-08-22 06:23:52 +0000
+++ b/bzrlib/tests/revisionstore_implementations/test_all.py 2007-08-23 02:18:37 +0000
@@ -58,8 +58,8 @@
# has of a non present id -> False
self.assertFalse(self.store.has_revision_id('missing', self.transaction))
- def test_has_None(self):
- # has of None -> True
+ def test_has_null(self):
+ # has of null -> True
self.assertTrue(self.store.has_revision_id('null:', self.transaction))
def test_get_revision_missing(self):
@@ -69,11 +69,11 @@
'B',
self.transaction)
- def test_get_revision_none(self):
- # get_revision(None) -> raises NoSuchRevision
- self.assertRaises(errors.NoSuchRevision,
+ def test_get_revision_null(self):
+ # get_revision(null) -> raises ReservedId
+ self.assertRaises(errors.ReservedId,
self.store.get_revision,
- None,
+ 'null:',
self.transaction)
def test_add_signature_text_missing(self):
=== modified file 'doc/en/user-guide/http_smart_server.txt'
--- a/doc/en/user-guide/http_smart_server.txt 2007-08-10 05:17:09 +0000
+++ b/doc/en/user-guide/http_smart_server.txt 2007-08-22 23:59:17 +0000
@@ -50,7 +50,7 @@
Alias /code /srv/example.com/www/code
<Directory /srv/example.com/www/code>
- Options Indexes, FollowSymLinks
+ Options Indexes FollowSymLinks
RewriteEngine On
RewriteBase /code
RewriteRule ^(.*/|)\.bzr/smart$ /srv/example.com/scripts/bzr-smart.fcgi
@@ -106,6 +106,16 @@
This instructs Apache to hand requests for any URL ending with `/.bzr/smart`
inside `/code` to a Bazaar smart server via mod_python.
+NOTE: If you don't have bzrlib in your PATH, you will be need to change the
+following line::
+
+ PythonPath "sys.path+['/srv/example.com/scripts']"
+
+To::
+
+ PythonPath "['/path/to/bzr']+sys.path+['/srv/example.com/scripts']"
+
+
Refer to the mod_python_ documentation for further information.
.. _mod_python: http://www.modpython.org/
@@ -162,6 +172,8 @@
The `modpywsgi` module can be found at http://trac.pocoo.org/wiki/ModPyWsgi. It
is part of pocoo_.
+You sould make sure you place modpywsgi.py in the same directory as
+bzr-smart.py (ie. /srv/example.com/scripts/).
.. _pocoo: http://trac.pocoo.org/wiki/
=== modified file 'doc/en/user-guide/server.txt'
--- a/doc/en/user-guide/server.txt 2007-08-10 05:17:09 +0000
+++ b/doc/en/user-guide/server.txt 2007-08-22 23:59:17 +0000
@@ -60,7 +60,7 @@
Running a Bazaar server from inetd requires an inetd.conf entry::
- 4155 stream tcp nowait bzruser /usr/bin/bzr serve --inet --directory=/srv/bzr/repo
+ 4155 stream tcp nowait bzruser /usr/bin/bzr /usr/bin/bzr serve --inet --directory=/srv/bzr/repo
When running client commands, the URL you supply is a `bzr://` URL relative to
the ``--directory`` option given in inetd.conf::
@@ -87,4 +87,5 @@
your machine on port `4155`.
server::
+
bzr serve --directory=/srv/bzr/repo
More information about the bazaar-commits
mailing list