Rev 2295: [merge] bzr.dev 2304 in http://bzr.arbash-meinel.com/branches/bzr/0.15-dev/revision_tree_errors
John Arbash Meinel
john at arbash-meinel.com
Wed Feb 28 15:14:01 GMT 2007
At http://bzr.arbash-meinel.com/branches/bzr/0.15-dev/revision_tree_errors
------------------------------------------------------------
revno: 2295
revision-id: john at arbash-meinel.com-20070228151346-g93da21s9cj9g1gz
parent: john at arbash-meinel.com-20070217030255-3c28dk4caoq3phm0
parent: pqm at pqm.ubuntu.com-20070228065654-50cafaf8459ede53
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: revision_tree_errors
timestamp: Wed 2007-02-28 09:13:46 -0600
message:
[merge] bzr.dev 2304
added:
bzrlib/tests/repository_implementations/test_iter_reverse_revision_history.py test_iter_reverse_re-20070217015036-spu7j5ggch7pbpyd-1
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
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/add.py add.py-20050323030017-3a77d63feda58e33
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
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/cache_utf8.py cache_utf8.py-20060810004311-x4cph46la06h9azm-1
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/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
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/revision/__init__.py __init__.py-20060303014707-305238f06ae20dae
bzrlib/store/revision/knit.py knit.py-20060303020652-de5fa299e941a3c7
bzrlib/store/revision/text.py text.py-20060303020652-e49155f0da4d14ab
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_add.py test_add.py-20060518072250-857e4f86f54a30b2
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/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/repository_implementations/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
bzrlib/tests/test_cache_utf8.py test_cache_utf8.py-20060810004311-x4cph46la06h9azm-2
bzrlib/tests/test_generate_ids.py test_generate_ids.py-20061102205935-z3do15ipw6m7v26u-2
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_lockable_files.py test_lockable_files.py-20051225183927-365c7fd99591caf1
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
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_get_parent_ids.py test_get_parent_ids.py-20060616123734-jq0zc755ud2u644s-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/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/xml5.py xml5.py-20050907032657-aac8f960815b66b1
bzrlib/xml6.py xml6.py-20060823042456-dbaaq4atrche7xy5-1
------------------------------------------------------------
revno: 2293.1.11
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: 2293.1.1.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: 2293.1.1.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: 2293.1.10
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: 2227.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: 2293.1.9
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: 2293.1.5.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: 2293.1.5.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: 2293.1.5.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: 2293.1.8
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: 2293.1.5.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: 2293.1.5.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: 2293.1.5.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: 2293.1.7
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: 2293.1.5.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: 2293.1.5.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: 2293.1.6
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: 2293.1.5.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: 2293.1.5
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: 2293.1.1.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: 2293.1.1.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: 2293.1.1.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: 2293.1.1.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: 2293.1.1.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: 2293.1.1.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: 2293.1.1.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: 2293.1.1.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: 2293.1.1.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: 2293.1.1.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: 2293.1.1.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.
------------------------------------------------------------
revno: 2293.1.4
merged: pqm at pqm.ubuntu.com-20070221200818-3edf47a2bd3f472b
parent: pqm at pqm.ubuntu.com-20070220091037-861977f648914cc0
parent: mbp at sourcefrog.net-20070221075917-aum4hz1p7nirak7l
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-02-21 20:08:18 +0000
message:
(mbp,r=robert,trivial) make status blackbox tests pass on wide terminals
------------------------------------------------------------
revno: 2293.1.3.1.1
merged: mbp at sourcefrog.net-20070221075917-aum4hz1p7nirak7l
parent: pqm at pqm.ubuntu.com-20070220091037-861977f648914cc0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Wed 2007-02-21 18:59:17 +1100
message:
Make tests for truncation of status output more robust on wide terminals.
(Relates to bug #56011)
------------------------------------------------------------
revno: 2293.1.3
merged: pqm at pqm.ubuntu.com-20070220091037-861977f648914cc0
parent: pqm at pqm.ubuntu.com-20070218185039-b5d56cdea8765e63
parent: mbp at sourcefrog.net-20070220071627-b21ex5e2rm6dvp7b
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-02-20 09:10:37 +0000
message:
(mbp,r=alexander) flush log before exiting
------------------------------------------------------------
revno: 2293.1.2.1.1
merged: mbp at sourcefrog.net-20070220071627-b21ex5e2rm6dvp7b
parent: pqm at pqm.ubuntu.com-20070218185039-b5d56cdea8765e63
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: osexit
timestamp: Tue 2007-02-20 18:16:27 +1100
message:
Flush trace file before doing os._exit.
------------------------------------------------------------
revno: 2293.1.2
merged: pqm at pqm.ubuntu.com-20070218185039-b5d56cdea8765e63
parent: pqm at pqm.ubuntu.com-20070217025822-306d98c244b53b08
parent: bialix at ukr.net-20070215222448-g4viotfpx1b8h98a
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2007-02-18 18:50:39 +0000
message:
(Matthias Rahlf, Alexander Belchenko) human readable error message
for 'bzr add .bzr/'
------------------------------------------------------------
revno: 2279.5.1
merged: bialix at ukr.net-20070215222448-g4viotfpx1b8h98a
parent: pqm at pqm.ubuntu.com-20070209195330-312ec52588462782
parent: rahlf at fs.tum.de-20070213031637-23eekp1wawcskcdx
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: add.dot.bzr
timestamp: Fri 2007-02-16 00:24:48 +0200
message:
Instead of __str__ method for FastPath object we use .raw_path attribute (note from Aaron).
Also slightly reworked test.
------------------------------------------------------------
revno: 2279.6.1
merged: rahlf at fs.tum.de-20070213031637-23eekp1wawcskcdx
parent: pqm at pqm.ubuntu.com-20070209195330-312ec52588462782
committer: Matthias Rahlf <rahlf at fs.tum.de>
branch nick: bzr.dev.fastpath
timestamp: Tue 2007-02-13 04:16:37 +0100
message:
FastPath objects can now be printed nicely
------------------------------------------------------------
revno: 2293.1.1
merged: pqm at pqm.ubuntu.com-20070217025822-306d98c244b53b08
parent: pqm at pqm.ubuntu.com-20070216064835-76166d68f1750e11
parent: john at arbash-meinel.com-20070217023632-ad2nt50u1oal2ji0
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-02-17 02:58:22 +0000
message:
(John Arbash Meinel) Clean up most internals to use utf-8 revision ids instead of Unicode.
------------------------------------------------------------
revno: 2249.5.20
merged: john at arbash-meinel.com-20070217023632-ad2nt50u1oal2ji0
parent: john at arbash-meinel.com-20070217023345-vhrz7igv9q7kd762
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Fri 2007-02-16 20:36:32 -0600
message:
Add NEWS entry about utf8 revision ids.
------------------------------------------------------------
revno: 2249.5.19
merged: john at arbash-meinel.com-20070217023345-vhrz7igv9q7kd762
parent: john at arbash-meinel.com-20070217020241-cy6wl3oa17mvnvax
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Fri 2007-02-16 20:33:45 -0600
message:
Track through the new Branch6 code, and make sure revision ids are utf8
------------------------------------------------------------
revno: 2249.5.18
merged: john at arbash-meinel.com-20070217020241-cy6wl3oa17mvnvax
parent: john at arbash-meinel.com-20070217014257-3chgn02femptf4co
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Fri 2007-02-16 20:02:41 -0600
message:
Add tests for iter_reverse_revision_history
------------------------------------------------------------
revno: 2249.5.17
merged: john at arbash-meinel.com-20070217014257-3chgn02femptf4co
parent: john at arbash-meinel.com-20070213203357-b7yg41mi9sk6cqd0
parent: pqm at pqm.ubuntu.com-20070216064835-76166d68f1750e11
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Fri 2007-02-16 19:42:57 -0600
message:
[merge] bzr.dev 2293 and resolve conflicts, but still broken
------------------------------------------------------------
revno: 2249.5.16
merged: john at arbash-meinel.com-20070213203357-b7yg41mi9sk6cqd0
parent: john at arbash-meinel.com-20070213133816-r6swt6ibvtms473f
parent: pqm at pqm.ubuntu.com-20070213114814-9606106906ac312f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Tue 2007-02-13 14:33:57 -0600
message:
[merge] bzr.dev 2283
resolve conflicts in moved repository formats
small issue with osutils.contains_whitespace()
------------------------------------------------------------
revno: 2249.5.15
merged: john at arbash-meinel.com-20070213133816-r6swt6ibvtms473f
parent: john at arbash-meinel.com-20070210170218-6qxxiywltp0uawzw
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Tue 2007-02-13 07:38:16 -0600
message:
remove get_cached_utf8 checks which were slowing things down.
------------------------------------------------------------
revno: 2249.5.14
merged: john at arbash-meinel.com-20070210170218-6qxxiywltp0uawzw
parent: john at arbash-meinel.com-20070210165429-xbz7zv9ehhi6fspj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Sat 2007-02-10 11:02:18 -0600
message:
Add some tests that generate_ids.get_revision_id() generates ascii revision ids
------------------------------------------------------------
revno: 2249.5.13
merged: john at arbash-meinel.com-20070210165429-xbz7zv9ehhi6fspj
parent: john at arbash-meinel.com-20070210024843-oz2ed16luwjca48h
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Sat 2007-02-10 10:54:29 -0600
message:
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
------------------------------------------------------------
revno: 2249.5.12
merged: john at arbash-meinel.com-20070210024843-oz2ed16luwjca48h
parent: john at arbash-meinel.com-20070209233924-k7qbjpta67k3ry2h
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Fri 2007-02-09 20:48:43 -0600
message:
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
Get tests to pass again.
------------------------------------------------------------
revno: 2249.5.11
merged: john at arbash-meinel.com-20070209233924-k7qbjpta67k3ry2h
parent: john at arbash-meinel.com-20070209231553-9ywoxs2t3dsx667s
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Fri 2007-02-09 17:39:24 -0600
message:
Audit Branch to ensure utf8 revision ids.
Requires a small update to lockable_files to allow us to directly
write byte strings, without needing to wrap in a StringIO
------------------------------------------------------------
revno: 2249.5.10
merged: john at arbash-meinel.com-20070209231553-9ywoxs2t3dsx667s
parent: john at arbash-meinel.com-20070209181144-3cxnt3e4jre3e317
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Fri 2007-02-09 17:15:53 -0600
message:
Make sure xml5 can handle unicode or utf8 strings
------------------------------------------------------------
revno: 2249.5.9
merged: john at arbash-meinel.com-20070209181144-3cxnt3e4jre3e317
parent: john at arbash-meinel.com-20070209175018-pv9ok1ocbchn4wly
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Fri 2007-02-09 12:11:44 -0600
message:
Update WorkingTree to use safe_revision_id when appropriate
------------------------------------------------------------
revno: 2249.5.8
merged: john at arbash-meinel.com-20070209175018-pv9ok1ocbchn4wly
parent: john at arbash-meinel.com-20070209172423-xu5e0b12sf71m0pj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Fri 2007-02-09 11:50:18 -0600
message:
Add osutils.safe_utf8 and safe_revision_id for the new revision_id work.
------------------------------------------------------------
revno: 2249.5.7
merged: john at arbash-meinel.com-20070209172423-xu5e0b12sf71m0pj
parent: john at arbash-meinel.com-20070209171626-x3gg6hgainzs91sj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Fri 2007-02-09 11:24:23 -0600
message:
Make sure WorkingTree revision_ids are also returned as utf8 strings
------------------------------------------------------------
revno: 2249.5.6
merged: john at arbash-meinel.com-20070209171626-x3gg6hgainzs91sj
parent: john at arbash-meinel.com-20070209171556-sxv0wiwdubivwmnn
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Fri 2007-02-09 11:16:26 -0600
message:
Make sure Branch.revision_history() also works in utf-8 revision ids.
------------------------------------------------------------
revno: 2249.5.5
merged: john at arbash-meinel.com-20070209171556-sxv0wiwdubivwmnn
parent: john at arbash-meinel.com-20070209164831-w5kk2hhyoprze3fb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Fri 2007-02-09 11:15:56 -0600
message:
better comment for why we are decoding
------------------------------------------------------------
revno: 2249.5.4
merged: john at arbash-meinel.com-20070209164831-w5kk2hhyoprze3fb
parent: john at arbash-meinel.com-20070209164100-t9t1760kq6y5qgwn
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Fri 2007-02-09 10:48:31 -0600
message:
When reading XML, always return utf-8 revision ids.
------------------------------------------------------------
revno: 2249.5.3
merged: john at arbash-meinel.com-20070209164100-t9t1760kq6y5qgwn
parent: john at arbash-meinel.com-20070208231037-xzuzlh339rmgfhk6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Fri 2007-02-09 10:41:00 -0600
message:
Add get_cached_ascii for dealing with how cElementTree handles ascii strings
------------------------------------------------------------
revno: 2249.5.2
merged: john at arbash-meinel.com-20070208231037-xzuzlh339rmgfhk6
parent: john at arbash-meinel.com-20070208215253-4x90cx3ybnyixo5y
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Thu 2007-02-08 17:10:37 -0600
message:
Add a get_cached_utf8, which will ensure it is really utf8, and cache the strings
------------------------------------------------------------
revno: 2249.5.1
merged: john at arbash-meinel.com-20070208215253-4x90cx3ybnyixo5y
parent: pqm at pqm.ubuntu.com-20070131184047-424584b0fabcee96
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Thu 2007-02-08 15:52:53 -0600
message:
Leave revision-ids in utf-8 when reading.
-------------- next part --------------
Diff too large for email (4565 lines, the limit is 1000).
More information about the bazaar-commits
mailing list