Rev 2361: [merge] bzr.dev 2298 (broken) in http://bazaar.launchpad.net/%7Ebzr/bzr/dirstate
John Arbash Meinel
john at arbash-meinel.com
Thu Feb 22 15:06:29 GMT 2007
At http://bazaar.launchpad.net/%7Ebzr/bzr/dirstate
------------------------------------------------------------
revno: 2361
revision-id: john at arbash-meinel.com-20070222150435-vtrqx5i64319z8pz
parent: robertc at robertcollins.net-20070222060839-tv56d0biir2ipav1
parent: pqm at pqm.ubuntu.com-20070222144505-5f7551602cad9332
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-02-22 09:04:35 -0600
message:
[merge] bzr.dev 2298 (broken)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/add.py add.py-20050323030017-3a77d63feda58e33
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/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
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/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
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_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/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: 2255.1.43
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: 2255.1.39.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: 2255.1.39.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: 2255.1.39.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: 2255.1.39.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: 2255.1.39.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: 2255.1.39.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: 2255.1.39.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: 2255.1.39.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: 2255.1.39.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: 2255.1.39.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: 2255.1.39.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: 2255.1.42
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: 2255.1.41.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: 2255.1.41
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: 2255.1.40.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: 2255.1.40
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: 2255.1.24.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: 2255.1.24.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
-------------- next part --------------
Diff too large for email (1405 lines, the limit is 1000).
More information about the bazaar-commits
mailing list