Rev 2266: merge trunk in file:///home/mbp/bzr/Work/tags/
Martin Pool
mbp at sourcefrog.net
Thu Mar 1 04:26:56 GMT 2007
------------------------------------------------------------
revno: 2266
revision-id: mbp at sourcefrog.net-20070301042655-ib2mllvaozai23c6
parent: mbp at sourcefrog.net-20070226055708-llf8iqw3ny1f3al6
parent: pqm at pqm.ubuntu.com-20070228211048-30e18ddd8dd9c205
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Thu 2007-03-01 15:26:55 +1100
message:
merge trunk
added:
bzrlib/tests/test_https_ca_bundle.py test_https_ca_bundle-20070226095439-x5899kvqg7xsbk8e-1
bzrlib/transport/http/ca_bundle.py ca_bundle.py-20070226091335-84kb1xg1r2jjf858-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bundle/serializer/v08.py v06.py-20051119041339-ee43f97270b01823
bzrlib/generate_ids.py generate_ids.py-20061102205935-z3do15ipw6m7v26u-1
bzrlib/identitymap.py identitymap.py-20051007040721-83e837d831a6636a
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/store/__init__.py store.py-20050309040759-164dc5173d6406c2
bzrlib/store/versioned/__init__.py weavestore.py-20050907094258-88262e0434babab9
bzrlib/testament.py testament.py-20051011100429-6d319a18183b13c8
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
bzrlib/tests/repository_implementations/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
bzrlib/tests/test_generate_ids.py test_generate_ids.py-20061102205935-z3do15ipw6m7v26u-2
bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_xml.py test_xml.py-20050905091053-80b45588931a9b35
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_test_trees.py test_tree_trees.py-20060720091921-3nwi5h21lf06vf5p-1
bzrlib/tests/workingtree_implementations/test_set_root_id.py test_set_root_id.py-20061004073850-0r1c7qikmnkb8m9k-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/smart.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/xml5.py xml5.py-20050907032657-aac8f960815b66b1
bzrlib/xml6.py xml6.py-20060823042456-dbaaq4atrche7xy5-1
------------------------------------------------------------
revno: 2220.1.77.1.8
merged: pqm at pqm.ubuntu.com-20070228211048-30e18ddd8dd9c205
parent: pqm at pqm.ubuntu.com-20070228065654-50cafaf8459ede53
parent: john at arbash-meinel.com-20070228151923-1s7oa2i2kk9u9ufo
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-02-28 21:10:48 +0000
message:
(James Westby) Allow passing a template message to commit.
------------------------------------------------------------
revno: 2220.1.77.1.7.1.1
merged: john at arbash-meinel.com-20070228151923-1s7oa2i2kk9u9ufo
parent: pqm at pqm.ubuntu.com-20070228065654-50cafaf8459ede53
parent: jw+debian at jameswestby.net-20070226214805-umfrbzkqnvvrna64
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2007-02-28 09:19:23 -0600
message:
[merge] James Westby allow passing a default message to commit
Also clean up NEWS a bit to reduce conflicts and conform to rST.
------------------------------------------------------------
revno: 2220.1.38.3.4
merged: jw+debian at jameswestby.net-20070226214805-umfrbzkqnvvrna64
parent: jw+debian at jameswestby.net-20070205235821-09fbu7wbof8xc9k8
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev.editmsg
timestamp: Mon 2007-02-26 21:48:05 +0000
message:
Make the handling of the msgfile more sane.
* Close it in a finally block for more safety.
* Open it at the start and just write to it instead of building up the
message.
* Don't close the fileno from mkstemp, just convert it to a filehandle
straight away.
------------------------------------------------------------
revno: 2220.1.38.3.3
merged: jw+debian at jameswestby.net-20070205235821-09fbu7wbof8xc9k8
parent: jw+debian at jameswestby.net-20070204215850-64v3uwm4lc906nyy
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev.editmsg
timestamp: Mon 2007-02-05 23:58:21 +0000
message:
Refactor again from John and Alexander's comments.
------------------------------------------------------------
revno: 2220.1.38.3.2
merged: jw+debian at jameswestby.net-20070204215850-64v3uwm4lc906nyy
parent: jw+debian at jameswestby.net-20070203135827-15twzpv89r1uygks
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev.editmsg
timestamp: Sun 2007-02-04 21:58:50 +0000
message:
Allow an empty start message.
Following comments from Robert the start_message is now allowed to be empty.
The tests are also split out more.
------------------------------------------------------------
revno: 2220.1.38.3.1
merged: jw+debian at jameswestby.net-20070203135827-15twzpv89r1uygks
parent: pqm at pqm.ubuntu.com-20070202204950-910381483d737306
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev.editmsg
timestamp: Sat 2007-02-03 13:58:27 +0000
message:
Add a way to specify a template commit message.
Add start_message to the edit_commit_message function. This adds the text
above the separator so that it will not be removed after the user has edited.
Allows a template commit message to be specified. It however does nothing to
make it easy to actually hook in and set that.
------------------------------------------------------------
revno: 2220.1.77.1.7
merged: pqm at pqm.ubuntu.com-20070228065654-50cafaf8459ede53
parent: pqm at pqm.ubuntu.com-20070227220846-8cce3b2986915092
parent: bialix at ukr.net-20070227221207-icy06420x3b0ceyf
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-02-28 06:56:54 +0000
message:
(biaklix) bzr init works with non-ascii location (#85599)
------------------------------------------------------------
revno: 2220.1.74.2.2
merged: bialix at ukr.net-20070227221207-icy06420x3b0ceyf
parent: bialix at ukr.net-20070217071147-pc4zm6d4rc8zqv77
parent: pqm at pqm.ubuntu.com-20070227210131-478bc8c5f83bd5dc
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: init.non.ascii
timestamp: Wed 2007-02-28 00:12:07 +0200
message:
merge bzr.dev
------------------------------------------------------------
revno: 2220.1.74.2.1
merged: bialix at ukr.net-20070217071147-pc4zm6d4rc8zqv77
parent: pqm at pqm.ubuntu.com-20070217025822-306d98c244b53b08
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: init.non.ascii
timestamp: Sat 2007-02-17 09:11:47 +0200
message:
Bugfix #85599: ``bzr init`` works with unicode argument LOCATION
------------------------------------------------------------
revno: 2220.1.77.1.6
merged: pqm at pqm.ubuntu.com-20070227220846-8cce3b2986915092
parent: pqm at pqm.ubuntu.com-20070227210131-478bc8c5f83bd5dc
parent: v.ladeuil+lp at free.fr-20070110023240-m844hew538cwg618
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-02-27 22:08:46 +0000
message:
Capitalize rocks output
------------------------------------------------------------
revno: 2220.1.7.4.1
merged: v.ladeuil+lp at free.fr-20070110023240-m844hew538cwg618
parent: pqm at pqm.ubuntu.com-20070109142832-337c25188ea46f2d
committer: v.ladeuil+lp at free.fr
branch nick: bzr.78026
timestamp: Wed 2007-01-10 03:32:40 +0100
message:
Fix #78026.
------------------------------------------------------------
revno: 2220.1.77.1.5
merged: pqm at pqm.ubuntu.com-20070227210131-478bc8c5f83bd5dc
parent: pqm at pqm.ubuntu.com-20070227040724-41ae309eb90f4744
parent: bialix at ukr.net-20070227065737-yoon57v79cgycto6
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-02-27 21:01:31 +0000
message:
(bialix) Searching CA bundle for PyCurl in env variable, and on win32
along the path
------------------------------------------------------------
revno: 2220.1.77.1.1.5.3
merged: bialix at ukr.net-20070227065737-yoon57v79cgycto6
parent: bialix at ukr.net-20070226202808-9t3wvwmh172lw6br
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: ca-bundle
timestamp: Tue 2007-02-27 08:57:37 +0200
message:
added comment about excluding cwd from PATH
------------------------------------------------------------
revno: 2220.1.77.1.1.5.2
merged: bialix at ukr.net-20070226202808-9t3wvwmh172lw6br
parent: bialix at ukr.net-20070226100258-weo9uj2qnf35icxp
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: ca-bundle
timestamp: Mon 2007-02-26 22:28:08 +0200
message:
Don't look in cwd for CA bundle (note from John)
------------------------------------------------------------
revno: 2220.1.77.1.1.5.1
merged: bialix at ukr.net-20070226100258-weo9uj2qnf35icxp
parent: pqm at pqm.ubuntu.com-20070222144505-5f7551602cad9332
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: ca-bundle
timestamp: Mon 2007-02-26 12:02:58 +0200
message:
Bugfix #82086: Searching location of CA bundle for PyCurl in env variable (CURL_CA_BUNDLE), and on win32 along the PATH
------------------------------------------------------------
revno: 2220.1.77.1.4
merged: pqm at pqm.ubuntu.com-20070227040724-41ae309eb90f4744
parent: pqm at pqm.ubuntu.com-20070226201622-2f1d97a573b34d44
parent: andrew.bennetts at canonical.com-20070227022050-mop4cp2f5gf3bx9t
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-02-27 04:07:24 +0000
message:
(andrew,r=mbp,r=john) bzr:// defaults to port 4155
------------------------------------------------------------
revno: 2220.1.77.1.1.4.3
merged: andrew.bennetts at canonical.com-20070227022050-mop4cp2f5gf3bx9t
parent: andrew.bennetts at canonical.com-20070227004247-ow9tmwdw9lufkhi6
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: default-port
timestamp: Tue 2007-02-27 13:20:50 +1100
message:
Use a BZR_DEFAULT_PORT constant instead of bare 4155.
------------------------------------------------------------
revno: 2220.1.77.1.1.4.2
merged: andrew.bennetts at canonical.com-20070227004247-ow9tmwdw9lufkhi6
parent: andrew.bennetts at canonical.com-20070226092026-d56e1sqtimfkd5zt
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: default-port
timestamp: Tue 2007-02-27 11:42:47 +1100
message:
Add NEWS entry.
------------------------------------------------------------
revno: 2220.1.77.1.1.4.1
merged: andrew.bennetts at canonical.com-20070226092026-d56e1sqtimfkd5zt
parent: pqm at pqm.ubuntu.com-20070222144505-5f7551602cad9332
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: default-port
timestamp: Mon 2007-02-26 20:20:26 +1100
message:
Give bzr:// a default port of 4155.
------------------------------------------------------------
revno: 2220.1.77.1.3
merged: pqm at pqm.ubuntu.com-20070226201622-2f1d97a573b34d44
parent: pqm at pqm.ubuntu.com-20070226085224-84d4ff0445f116f8
parent: john at arbash-meinel.com-20070226183328-v83bgfqwxlwp6kem
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-02-26 20:16:22 +0000
message:
(Jonathan Lange) Change the import order for plugins, to prefer user dirs.
------------------------------------------------------------
revno: 2220.1.77.1.1.2.1
merged: john at arbash-meinel.com-20070226183328-v83bgfqwxlwp6kem
parent: pqm at pqm.ubuntu.com-20070222144505-5f7551602cad9332
parent: jml at canonical.com-20070223060654-hna3q6wwljswnkh3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-02-26 12:33:28 -0600
message:
(Jonathan Lange) Change the import order for plugins, to prefer user dirs.
------------------------------------------------------------
revno: 2220.1.77.1.1.3.1
merged: jml at canonical.com-20070223060654-hna3q6wwljswnkh3
parent: pqm at pqm.ubuntu.com-20070222144505-5f7551602cad9332
committer: jml at canonical.com
branch nick: bzr.plugin-path
timestamp: Fri 2007-02-23 17:06:54 +1100
message:
Make set_plugins_path search user-specified directories (BZR_PLUGIN_PATH
or get_default_plugin_path()) before searching in site-wide directories
(dirname(bzrlib.plugins.__file__)).
------------------------------------------------------------
revno: 2220.1.77.1.2
merged: pqm at pqm.ubuntu.com-20070226085224-84d4ff0445f116f8
parent: pqm at pqm.ubuntu.com-20070222144505-5f7551602cad9332
parent: mbp at sourcefrog.net-20070226044016-hp3hp0yitdt7krph
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-02-26 08:52:24 +0000
message:
(mbp,r=aaron) tests for merge_modified
------------------------------------------------------------
revno: 2220.1.77.1.1.1.1
merged: mbp at sourcefrog.net-20070226044016-hp3hp0yitdt7krph
parent: pqm at pqm.ubuntu.com-20070222144505-5f7551602cad9332
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Mon 2007-02-26 15:40:16 +1100
message:
Add test for merge_modified
------------------------------------------------------------
revno: 2220.1.77.1.1
merged: pqm at pqm.ubuntu.com-20070222144505-5f7551602cad9332
parent: pqm at pqm.ubuntu.com-20070221200818-3edf47a2bd3f472b
parent: john at arbash-meinel.com-20070222142819-7f57k9v54ni12i18
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-02-22 14:45:05 +0000
message:
(John Arbash Meinel, r=robert) Update apis to expect UTF-8 file ids instead of Unicode
------------------------------------------------------------
revno: 2220.1.74.1.11
merged: john at arbash-meinel.com-20070222142819-7f57k9v54ni12i18
parent: john at arbash-meinel.com-20070218002224-nfsw9ubivr178ahn
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: utf8_file_ids
timestamp: Thu 2007-02-22 08:28:19 -0600
message:
Update NEWS to indicate file-ids are also utf-8 strings
------------------------------------------------------------
revno: 2220.1.74.1.10
merged: john at arbash-meinel.com-20070218002224-nfsw9ubivr178ahn
parent: john at arbash-meinel.com-20070217222537-p0hxseinc3x84e96
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: utf8_file_ids
timestamp: Sat 2007-02-17 18:22:24 -0600
message:
Switch all apis over to utf8 file ids. All tests pass
------------------------------------------------------------
revno: 2220.1.74.1.9
merged: john at arbash-meinel.com-20070217222537-p0hxseinc3x84e96
parent: john at arbash-meinel.com-20070217221226-op8ol98ngy4219fd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: utf8_file_ids
timestamp: Sat 2007-02-17 16:25:37 -0600
message:
Minor performance improvement, use None as signal rather than ROOT_ID
for xml5 inventories. Discover small bug in serialized text because of this.
------------------------------------------------------------
revno: 2220.1.74.1.8
merged: john at arbash-meinel.com-20070217221226-op8ol98ngy4219fd
parent: john at arbash-meinel.com-20070217220308-1zol1ee5a0stse1u
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: utf8_file_ids
timestamp: Sat 2007-02-17 16:12:26 -0600
message:
Fix one doc test in Inventory which expected a plain str
------------------------------------------------------------
revno: 2220.1.74.1.7
merged: john at arbash-meinel.com-20070217220308-1zol1ee5a0stse1u
parent: john at arbash-meinel.com-20070217215417-fpufrf0o749ce85d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: utf8_file_ids
timestamp: Sat 2007-02-17 16:03:08 -0600
message:
Add tests for parent ids in test_test_trees
------------------------------------------------------------
revno: 2220.1.74.1.6
merged: john at arbash-meinel.com-20070217215417-fpufrf0o749ce85d
parent: john at arbash-meinel.com-20070217214837-fcv01ahawwq8u687
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: utf8_file_ids
timestamp: Sat 2007-02-17 15:54:17 -0600
message:
Include parent_id checks in the xml serializer tests.
------------------------------------------------------------
revno: 2220.1.74.1.5
merged: john at arbash-meinel.com-20070217214837-fcv01ahawwq8u687
parent: john at arbash-meinel.com-20070217211722-yxx3xjxtxeijc8d7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: utf8_file_ids
timestamp: Sat 2007-02-17 15:48:37 -0600
message:
Fix Inventory.iter_entries_by_dir to return Unicode paths,
update xml5 serializer tests to ensure that we get unicode paths and file ids
and utf8 revision ids.
------------------------------------------------------------
revno: 2220.1.74.1.4
merged: john at arbash-meinel.com-20070217211722-yxx3xjxtxeijc8d7
parent: john at arbash-meinel.com-20070217211255-kzskwwv9rukq6r7r
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: utf8_file_ids
timestamp: Sat 2007-02-17 15:17:22 -0600
message:
Add safe_file_id as a helper in osutils.
------------------------------------------------------------
revno: 2220.1.74.1.3
merged: john at arbash-meinel.com-20070217211255-kzskwwv9rukq6r7r
parent: john at arbash-meinel.com-20070217185558-mhsvsed3azztcuez
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: utf8_file_ids
timestamp: Sat 2007-02-17 15:12:55 -0600
message:
Make sure the inventory enrtries returned are properly formed.
------------------------------------------------------------
revno: 2220.1.74.1.2
merged: john at arbash-meinel.com-20070217185558-mhsvsed3azztcuez
parent: john at arbash-meinel.com-20070217172506-ps0riemt041fkz0q
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: utf8_file_ids
timestamp: Sat 2007-02-17 12:55:58 -0600
message:
Track down and add tests that all tree.commit() can handle
non-ascii revision ids, as well as that file_ids_affected_by can handle
non-ascii revision ids. Also track down pending-merges needing to
write byte streams rather than unicode.
------------------------------------------------------------
revno: 2220.1.74.1.1
merged: john at arbash-meinel.com-20070217172506-ps0riemt041fkz0q
parent: pqm at pqm.ubuntu.com-20070217025822-306d98c244b53b08
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: utf8_file_ids
timestamp: Sat 2007-02-17 11:25:06 -0600
message:
Track down some non-ascii deficiencies in commit logic.
Diff too large for email (1956, the limit is 1000).
More information about the bazaar-commits
mailing list