Rev 1742: Merge bzr.dev. in file:///home/robertc/source/baz/readdir/
Robert Collins
robertc at robertcollins.net
Fri Jun 9 15:19:34 BST 2006
------------------------------------------------------------
revno: 1742
revision-id: robertc at robertcollins.net-20060609141932-4cbad17f5a476ae3
parent: robertc at robertcollins.net-20060609141337-4ea84d88e8d4dc0f
parent: robertc at robertcollins.net-20060609120104-369c7d3266413526
committer: Robert Collins <robertc at robertcollins.net>
branch nick: readdir
timestamp: Sat 2006-06-10 00:19:32 +1000
message:
Merge bzr.dev.
removed:
bzrlib/util/configobj/validate.py validate.py-20051018184548-e700c5f98afa9389
patience-test.py patiencetest.py-20060522202704-p82o0dg5f1qf99ry-1
added:
bzrlib/benchmarks/bench_bench.py bench_bench.py-20060609084943-2lv2wsi61vhkmj7b-1
bzrlib/benchmarks/bench_osutils.py bench_osutils.py-20060608153714-apso8cyz1bu2z1ig-1
bzrlib/benchmarks/bench_rocks.py bench_rocks.py-20060608120339-3ydxl3v2cori44zb-1
bzrlib/tests/EncodingAdapter.py EncodingAdapter.py-20060113032051-4d7e1d8c1e38b4a1
bzrlib/tests/blackbox/test_command_encoding.py test_command_encoding.py-20060106032110-45431fd2ce9ff21f
bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
foo bar foobar-20060607154839-33126929dffd5072
modified:
HACKING HACKING-20050805200004-2a5dc975d870f78c
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/add.py add.py-20050323030017-3a77d63feda58e33
bzrlib/benchmarks/__init__.py __init__.py-20060516064526-eb0d37c78e86065d
bzrlib/benchmarks/bench_add.py bench_add.py-20060516064526-6342399b2967266c
bzrlib/benchmarks/bench_checkout.py bench_checkout.py-20060521233052-b52eba18ee46046b
bzrlib/benchmarks/bench_commit.py bench_commit.py-20060522031508-4ea2551904e4becb
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/apply_bundle.py apply_changeset.py-20050620044656-dba4eb8021a36f95
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/bundle/read_bundle.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/doc/api/transport.txt transport.txt-20051224020744-66b4fb564d98a5a5
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/sign_my_commits.py sign_my_commits.py-20060215152201-5a6363365180e671
bzrlib/store/__init__.py store.py-20050309040759-164dc5173d6406c2
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_diff.py test_diff.py-20060110203741-aa99ac93e633d971
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_parent.py test_parent.py-20050830052751-5e62766623c32222
bzrlib/tests/branch_implementations/test_permissions.py test_permissions.py-20060210110243-245c01403bf0fde6
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/stub_sftp.py stub_sftp.py-20051027032739-0e7ef4f7bab0e174
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_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_escaped_store.py test_escaped_store.py-20060216023929-6bcb9a067344959f
bzrlib/tests/test_inv.py testinv.py-20050722220913-1dc326138d1a5892
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_missing.py test_missing.py-20051212000028-694fa4f658a81f48
bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
bzrlib/tests/test_nonascii.py testnonascii.py-20051018022645-ea1d8b6477b058a6
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
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_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
bzrlib/tests/test_trace.py testtrace.py-20051110225523-a21117fc7a07eeff
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/workingtree_implementations/test_basis_inventory.py test_basis_inventory.py-20051218151655-3650468941091309
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/textui.py textui.py-20050309040759-5d0cebe09c528e7d
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/xml5.py xml5.py-20050907032657-aac8f960815b66b1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
merged: robertc at robertcollins.net-20060609120104-369c7d3266413526
parent: robertc at robertcollins.net-20060609113327-f7cde64eb866d9bc
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2006-06-09 22:01:04 +1000
message:
Bugfix CommitBuilders recording of the inventory revision id.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060609113327-f7cde64eb866d9bc
parent: pqm at pqm.ubuntu.com-20060609100404-a45cd70353a09a67
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr-test-fixes
timestamp: Fri 2006-06-09 21:33:27 +1000
message:
Trivial fix to check to not barf on a missing inventory sha1 value.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060609100404-a45cd70353a09a67
parent: pqm at pqm.ubuntu.com-20060609075734-40a4d9653d67f2b9
parent: robertc at robertcollins.net-20060609095744-784f9e971ed88ffc
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-06-09 11:04:04 +0100
message:
(robertc, ab)Merge some commit and fetch tuning steps.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060609095744-784f9e971ed88ffc
parent: robertc at robertcollins.net-20060609091856-2f9fc48998d655a9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2006-06-09 19:57:44 +1000
message:
Fix regression in LocalTransport to allow merging.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060609091856-2f9fc48998d655a9
parent: robertc at robertcollins.net-20060609074924-82f9c095a195cbcc
parent: robertc at robertcollins.net-20060609090453-10e94172dc5f670b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2006-06-09 19:18:56 +1000
message:
(robertc, ab)Merge some commit and fetch tuning steps.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060609090453-10e94172dc5f670b
parent: robertc at robertcollins.net-20060524130146-bb7d9d3b45f5c061
parent: robertc at robertcollins.net-20060609085143-203219c2cd8d6258
committer: Robert Collins <robertc at robertcollins.net>
branch nick: commit
timestamp: Fri 2006-06-09 19:04:53 +1000
message:
Merge current head.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060609085143-203219c2cd8d6258
parent: robertc at robertcollins.net-20060609074924-82f9c095a195cbcc
committer: Robert Collins <robertc at robertcollins.net>
branch nick: add
timestamp: Fri 2006-06-09 18:51:43 +1000
message:
Add a benchmark for make_kernel_like_tree.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060524130146-bb7d9d3b45f5c061
parent: robertc at robertcollins.net-20060524083428-9ea3d1ad20593608
parent: robertc at robertcollins.net-20060524125508-c98a4e3aa70a8bb3
committer: Robert Collins <robertc at robertcollins.net>
branch nick: commit
timestamp: Wed 2006-05-24 23:01:46 +1000
message:
More bzr.dev
------------------------------------------------------------
merged: robertc at robertcollins.net-20060524083428-9ea3d1ad20593608
parent: robertc at robertcollins.net-20060524082620-9390eb51922199bd
committer: Robert Collins <robertc at robertcollins.net>
branch nick: commit
timestamp: Wed 2006-05-24 18:34:28 +1000
message:
really make commit benchmark able to run on memory transports.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060524082620-9390eb51922199bd
parent: robertc at robertcollins.net-20060524030014-0af2706006ed9f98
parent: robertc at robertcollins.net-20060524081445-c046b4406ffc8dfa
committer: Robert Collins <robertc at robertcollins.net>
branch nick: commit
timestamp: Wed 2006-05-24 18:26:20 +1000
message:
Merge bzr.dev
------------------------------------------------------------
merged: robertc at robertcollins.net-20060524030014-0af2706006ed9f98
parent: robertc at robertcollins.net-20060523122101-c9a7db6671267a47
committer: Robert Collins <robertc at robertcollins.net>
branch nick: commit
timestamp: Wed 2006-05-24 13:00:14 +1000
message:
Bugfix create_branch_convenience at the root of a file system to not loop
infinitely. Teach Benchmark.make_kernel_like_Tree to support making a tree
in a ramdisk to remove external IO costs for the repository when desired.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060523122101-c9a7db6671267a47
parent: robertc at robertcollins.net-20060523051401-53daeb1639206f8f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: commit
timestamp: Tue 2006-05-23 22:21:01 +1000
message:
Tune commit a little by improving performance of inventory.iter_entries.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060523051401-53daeb1639206f8f
parent: robertc at robertcollins.net-20060523042935-14b437511f8f1b67
committer: Robert Collins <robertc at robertcollins.net>
branch nick: commit
timestamp: Tue 2006-05-23 15:14:01 +1000
message:
Remove import of pumpfile from inner loop of commit.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060523042935-14b437511f8f1b67
parent: robertc at robertcollins.net-20060523021220-7aae296d0f330275
committer: Robert Collins <robertc at robertcollins.net>
branch nick: commit
timestamp: Tue 2006-05-23 14:29:35 +1000
message:
reduce file path escaping calls during commit.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060523021220-7aae296d0f330275
parent: pqm at pqm.ubuntu.com-20060523001826-458fe69c27fc17a7
committer: Robert Collins <robertc at robertcollins.net>
branch nick: commit
timestamp: Tue 2006-05-23 12:12:20 +1000
message:
Make LocalTransport faster by not normpathing every internal path translation.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060609075734-40a4d9653d67f2b9
parent: pqm at pqm.ubuntu.com-20060609011657-d676366b38b5689b
parent: robertc at robertcollins.net-20060609074924-82f9c095a195cbcc
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-06-09 08:57:34 +0100
message:
(jam, robertc, ab)Merge new iter_entries_by_dirs routine which matches the order walkdirs provides.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060609074924-82f9c095a195cbcc
parent: pqm at pqm.ubuntu.com-20060609011657-d676366b38b5689b
parent: robertc at robertcollins.net-20060609074535-3002a0209179b35c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2006-06-09 17:49:24 +1000
message:
(jam, robertc, ab)Merge new iter_entries_by_dirs routine which matches the order walkdirs provides.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060609074535-3002a0209179b35c
parent: robertc at robertcollins.net-20060609073513-46d6bf27cf29251e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: add
timestamp: Fri 2006-06-09 17:45:35 +1000
message:
Fixup '== None' usage in inventory.py.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060609073513-46d6bf27cf29251e
parent: robertc at robertcollins.net-20060608183327-472c686cae676df1
parent: john at arbash-meinel.com-20060608144938-8b365524563666b4
committer: Robert Collins <robertc at robertcollins.net>
branch nick: add
timestamp: Fri 2006-06-09 17:35:13 +1000
message:
Merge in iter_entries_by_dir().
------------------------------------------------------------
merged: john at arbash-meinel.com-20060608144938-8b365524563666b4
parent: john at arbash-meinel.com-20060607213622-c0742e8ba1598847
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2006-06-08 15:49:38 +0100
message:
Add an iter_entries_by_dir which returns directory children before their children.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060609011657-d676366b38b5689b
parent: pqm at pqm.ubuntu.com-20060608200135-842f7645e1e456b6
parent: aaron.bentley at utoronto.ca-20060608232606-ae51cb0e2c685728
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-06-09 02:16:57 +0100
message:
merge from bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060608232606-ae51cb0e2c685728
parent: aaron.bentley at utoronto.ca-20060608152109-6b05db298e9b6704
parent: pqm at pqm.ubuntu.com-20060608200135-842f7645e1e456b6
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: configobj
timestamp: Fri 2006-06-09 00:26:06 +0100
message:
merge from bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060608152109-6b05db298e9b6704
parent: aaron.bentley at utoronto.ca-20060608150412-23c66c9112bb055f
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: configobj
timestamp: Thu 2006-06-08 16:21:09 +0100
message:
Removed validate.py to stop configobj importing it uselessly
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060608150412-23c66c9112bb055f
parent: aaron.bentley at utoronto.ca-20060608145953-74c0864048bf3df9
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: configobj
timestamp: Thu 2006-06-08 16:04:12 +0100
message:
Benchmark the rocks command
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060608145953-74c0864048bf3df9
parent: pqm at pqm.ubuntu.com-20060608063832-74b46cf8fdd4567a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: configobj
timestamp: Thu 2006-06-08 15:59:53 +0100
message:
Add run_bzr_external
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060608200135-842f7645e1e456b6
parent: pqm at pqm.ubuntu.com-20060608150804-a186fa90bfede9a6
parent: robertc at robertcollins.net-20060608183327-472c686cae676df1
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-06-08 21:01:35 +0100
message:
(robertc, j-a-meinel)Replacement xml format 5 serializer which is much more efficient - saves 0.6 seconds on add on 10K trees. (robertc, ab, jam)Fix memory usage on bzr branch.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060608183327-472c686cae676df1
parent: robertc at robertcollins.net-20060608161213-b0cbafde5ba51708
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch
timestamp: Fri 2006-06-09 04:33:27 +1000
message:
Shrink memory usage in branch.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060608161213-b0cbafde5ba51708
parent: pqm at pqm.ubuntu.com-20060608150804-a186fa90bfede9a6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2006-06-09 02:12:13 +1000
message:
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060608150804-a186fa90bfede9a6
parent: pqm at pqm.ubuntu.com-20060608063832-74b46cf8fdd4567a
parent: jelmer at samba.org-20060608141729-9c1e343ea30820ce
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-06-08 16:08:04 +0100
message:
(jrv,rbc,jam) Refactor commit.Commit to use a Repository specific CommitBuilder, enables foreign branch commits
------------------------------------------------------------
merged: jelmer at samba.org-20060608141729-9c1e343ea30820ce
parent: jelmer at samba.org-20060608113841-ca51ebd824e5ab78
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: commit_builder
timestamp: Thu 2006-06-08 15:17:29 +0100
message:
Fix some minor issues pointed out by j-a-m.
------------------------------------------------------------
merged: jelmer at samba.org-20060608113841-ca51ebd824e5ab78
parent: jelmer at samba.org-20060607181252-3bd3b1113e4cbad6
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: commit_builder
timestamp: Thu 2006-06-08 12:38:41 +0100
message:
Make the commit message the first argument of CommitBuilder.commit().
------------------------------------------------------------
merged: jelmer at samba.org-20060607181252-3bd3b1113e4cbad6
parent: jelmer at samba.org-20060607164920-caf81a5d3dfc3427
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: commit_builder
timestamp: Wed 2006-06-07 19:12:52 +0100
message:
Move make_revision() to commit builder.
------------------------------------------------------------
merged: jelmer at samba.org-20060607164920-caf81a5d3dfc3427
parent: jelmer at samba.org-20060607145637-eeb5f28b78722502
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: commit_builder
timestamp: Wed 2006-06-07 17:49:20 +0100
message:
Move committer, log, revprops, timestamp and timezone to CommitBuilder.
------------------------------------------------------------
merged: jelmer at samba.org-20060607145637-eeb5f28b78722502
parent: jelmer at samba.org-20060607133933-701a37b2fd2e875f
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: commit_builder
timestamp: Wed 2006-06-07 15:56:37 +0100
message:
Move inventory writing to the commit builder.
Write ghost parents to knit repositories.
------------------------------------------------------------
merged: jelmer at samba.org-20060607133933-701a37b2fd2e875f
parent: jelmer at samba.org-20060607121904-25ea202d89f1d17e
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: commit_builder
timestamp: Wed 2006-06-07 14:39:33 +0100
message:
Simplify inventory population code by using is_inside_or_parent_of_any()
------------------------------------------------------------
merged: jelmer at samba.org-20060607121904-25ea202d89f1d17e
parent: jelmer at samba.org-20060607104559-0c9dd70e2200473d
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: commit_builder
timestamp: Wed 2006-06-07 13:19:04 +0100
message:
Move inventory to commit builder.
Add is_inside_or_parent_of_any()
------------------------------------------------------------
merged: jelmer at samba.org-20060607104559-0c9dd70e2200473d
parent: jelmer at samba.org-20060606145835-24e65e3e8b4917e0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: commit_builder
timestamp: Wed 2006-06-07 11:45:59 +0100
message:
Move storing directories and links to commit builder.
------------------------------------------------------------
merged: jelmer at samba.org-20060606145835-24e65e3e8b4917e0
parent: jelmer at samba.org-20060606133604-0e59c01dabfdd0aa
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Tue 2006-06-06 15:58:35 +0100
message:
Move storing file texts to commit builder.
------------------------------------------------------------
merged: jelmer at samba.org-20060606133604-0e59c01dabfdd0aa
parent: pqm at pqm.ubuntu.com-20060604105531-0071ce43b2156b7a
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Tue 2006-06-06 14:36:04 +0100
message:
Introduce and use CommitBuilder objects.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060608063832-74b46cf8fdd4567a
parent: pqm at pqm.ubuntu.com-20060608063015-aea61566ebe87ed3
parent: john at arbash-meinel.com-20060607210412-1e37f8a3b0ed8dc1
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-06-08 07:38:32 +0100
message:
(jam,mbp,wvh) Lots of updates to unicode,url,and encoding support
------------------------------------------------------------
merged: john at arbash-meinel.com-20060607210412-1e37f8a3b0ed8dc1
parent: larstiq at larstiq.dyndns.org-20060607172359-6023dec74344453d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: encoding
timestamp: Wed 2006-06-07 22:04:12 +0100
message:
Update NEWS with all of the bugs that this fixes.
------------------------------------------------------------
merged: larstiq at larstiq.dyndns.org-20060607172359-6023dec74344453d
parent: larstiq at larstiq.dyndns.org-20060607161545-e3f87ba37d1d7eb9
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: encoding
timestamp: Wed 2006-06-07 19:23:59 +0200
message:
more code cleanup
------------------------------------------------------------
merged: larstiq at larstiq.dyndns.org-20060607161545-e3f87ba37d1d7eb9
parent: larstiq at larstiq.dyndns.org-20060607160527-2b3649154d0e2e84
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: encoding
timestamp: Wed 2006-06-07 18:15:45 +0200
message:
cleanup urlutils
------------------------------------------------------------
merged: larstiq at larstiq.dyndns.org-20060607160527-2b3649154d0e2e84
parent: larstiq at larstiq.dyndns.org-20060607151815-78c1f021917b0e26
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: encoding
timestamp: Wed 2006-06-07 18:05:27 +0200
message:
more code cleanup
------------------------------------------------------------
merged: larstiq at larstiq.dyndns.org-20060607151815-78c1f021917b0e26
parent: larstiq at larstiq.dyndns.org-20060607151021-e08258d7bb0bbaec
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: encoding
timestamp: Wed 2006-06-07 17:18:15 +0200
message:
WorkingTree.remove takes an optional output file
bzr remove doesn't fail if it can't print the exact filename
------------------------------------------------------------
merged: larstiq at larstiq.dyndns.org-20060607151021-e08258d7bb0bbaec
parent: larstiq at larstiq.dyndns.org-20060607122254-c617eeabfd5e05e7
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: encoding
timestamp: Wed 2006-06-07 17:10:21 +0200
message:
codecleanup
------------------------------------------------------------
merged: larstiq at larstiq.dyndns.org-20060607122254-c617eeabfd5e05e7
parent: larstiq at larstiq.dyndns.org-20060607112548-40c7a6caf6022e16
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: encoding
timestamp: Wed 2006-06-07 14:22:54 +0200
message:
more tests handle LANG=C
------------------------------------------------------------
merged: larstiq at larstiq.dyndns.org-20060607112548-40c7a6caf6022e16
parent: larstiq at larstiq.dyndns.org-20060607111302-bce5a90c86f0d764
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: encoding
timestamp: Wed 2006-06-07 13:25:48 +0200
message:
fix nonascii tests to run properly under LANG=C
------------------------------------------------------------
merged: larstiq at larstiq.dyndns.org-20060607111302-bce5a90c86f0d764
parent: larstiq at larstiq.dyndns.org-20060607110623-ababc7dc508f613f
parent: pqm at pqm.ubuntu.com-20060607101245-3e242a04b9bd23e9
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: encoding
timestamp: Wed 2006-06-07 13:13:02 +0200
message:
[merge] bzr.dev 1747
------------------------------------------------------------
merged: larstiq at larstiq.dyndns.org-20060607110623-ababc7dc508f613f
parent: larstiq at larstiq.dyndns.org-20060606223730-a308c5429fc6c617
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: encoding
timestamp: Wed 2006-06-07 13:06:23 +0200
message:
StubSFTPServer should use bytestreams rather than unicode
------------------------------------------------------------
merged: larstiq at larstiq.dyndns.org-20060606223730-a308c5429fc6c617
parent: larstiq at larstiq.dyndns.org-20060606161609-6c14b8aaef2fe0be
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: encoding
timestamp: Wed 2006-06-07 00:37:30 +0200
message:
change branch.{get,set}_parent to store a relative path but return full urls
------------------------------------------------------------
merged: larstiq at larstiq.dyndns.org-20060606161609-6c14b8aaef2fe0be
parent: larstiq at larstiq.dyndns.org-20060606120620-50066b0951e4ef7c
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: encoding
timestamp: Tue 2006-06-06 18:16:09 +0200
message:
working on get_parent, set_parent and relative urls, broken
------------------------------------------------------------
merged: larstiq at larstiq.dyndns.org-20060606120620-50066b0951e4ef7c
parent: mbp at sourcefrog.net-20060605180036-04f5d0cea94ed999
parent: pqm at pqm.ubuntu.com-20060604105531-0071ce43b2156b7a
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: encoding
timestamp: Tue 2006-06-06 14:06:20 +0200
message:
merge bzr.dev 1740
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060605180036-04f5d0cea94ed999
parent: mbp at sourcefrog.net-20060605175045-70f44e16f6259c81
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.encoding
timestamp: Mon 2006-06-05 19:00:36 +0100
message:
clean up test kipple
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060605175045-70f44e16f6259c81
parent: mbp at sourcefrog.net-20060605175018-fa6bb3f9689d1c80
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.encoding
timestamp: Mon 2006-06-05 18:50:45 +0100
message:
Suppress warning from test of deprecated method
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060605175018-fa6bb3f9689d1c80
parent: mbp at sourcefrog.net-20060605172336-d22ffd288f4f6c28
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.encoding
timestamp: Mon 2006-06-05 18:50:18 +0100
message:
Update test that hooks run_bzr_captured
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060605172336-d22ffd288f4f6c28
parent: mbp at sourcefrog.net-20060605172303-8949c952c6fd0204
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.encoding
timestamp: Mon 2006-06-05 18:23:36 +0100
message:
[broken] Use deprecated_function not deprecated_method
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060605172303-8949c952c6fd0204
parent: mbp at sourcefrog.net-20060605171903-f3a801c35a7db12d
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.encoding
timestamp: Mon 2006-06-05 18:23:03 +0100
message:
[broken] test_cwd_log should expect a path, not a url
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060605171903-f3a801c35a7db12d
parent: mbp at sourcefrog.net-20060605165541-b83fe60311368198
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.encoding
timestamp: Mon 2006-06-05 18:19:03 +0100
message:
Small Transport fixups
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060605165541-b83fe60311368198
parent: mbp at sourcefrog.net-20060605164329-74079ff7df9a3c33
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.encoding
timestamp: Mon 2006-06-05 17:55:41 +0100
message:
[broken] Change BzrDir.create to use urlutils.split
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060605164329-74079ff7df9a3c33
parent: mbp at sourcefrog.net-20060605162359-2405198cadc86895
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.encoding
timestamp: Mon 2006-06-05 17:43:29 +0100
message:
[broken] Change BzrDir._make_tail to use urlutils.split
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060605162359-2405198cadc86895
parent: mbp at sourcefrog.net-20060605154328-8b1a42e5af8163ab
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.encoding
timestamp: Mon 2006-06-05 17:23:59 +0100
message:
[broken] NotBranchError should unescape the url if possible
(Fixes some info blackbox tests)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060605154328-8b1a42e5af8163ab
parent: mbp at sourcefrog.net-20060605150951-b2de88c27e46a8d2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.encoding
timestamp: Mon 2006-06-05 16:43:28 +0100
message:
[broken] Fix up & refactor display of remembered urls to unescape properly
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060605150951-b2de88c27e46a8d2
parent: mbp at sourcefrog.net-20060605143237-7abeb8c24d34f9de
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.encoding
timestamp: Mon 2006-06-05 16:09:51 +0100
message:
urlutils.unescape_for_display should return Unicode
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060605143237-7abeb8c24d34f9de
parent: john at arbash-meinel.com-20060512014501-9870b308e88c6574
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.encoding
timestamp: Mon 2006-06-05 15:32:37 +0100
message:
[broken] Skip unicode blackbox tests if not supported by filesystem
------------------------------------------------------------
merged: john at arbash-meinel.com-20060512014501-9870b308e88c6574
parent: john at arbash-meinel.com-20060512014408-204a193b59d5ee61
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: encoding
timestamp: Thu 2006-05-11 18:45:01 -0700
message:
Fixing _find_scheme_and_separator
------------------------------------------------------------
merged: john at arbash-meinel.com-20060512014408-204a193b59d5ee61
parent: john at arbash-meinel.com-20060512011713-0baa9c327bf5870c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: encoding
timestamp: Thu 2006-05-11 18:44:08 -0700
message:
Adding bzrlib.urlutils.join() to handle joining URLs
------------------------------------------------------------
merged: john at arbash-meinel.com-20060512011713-0baa9c327bf5870c
parent: john at arbash-meinel.com-20060511181500-4d9e153e05cf2d1e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: encoding
timestamp: Thu 2006-05-11 18:17:13 -0700
message:
url_for_display now makes sure output can be properly encoded.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060511181500-4d9e153e05cf2d1e
parent: john at arbash-meinel.com-20060510195955-df080afb1daa3a96
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: encoding
timestamp: Thu 2006-05-11 11:15:00 -0700
message:
Updated normalize_url
------------------------------------------------------------
merged: john at arbash-meinel.com-20060510195955-df080afb1daa3a96
parent: john at arbash-meinel.com-20060510194334-0c20aad23237d047
parent: pqm at pqm.ubuntu.com-20060508035625-57977d108d877af8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: encoding
timestamp: Wed 2006-05-10 12:59:55 -0700
message:
[merge] bzr.dev 1704
------------------------------------------------------------
merged: john at arbash-meinel.com-20060510194334-0c20aad23237d047
parent: john at arbash-meinel.com-20060510183930-1dbe0bc58695ee47
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: encoding
timestamp: Wed 2006-05-10 12:43:34 -0700
message:
Working on getting normalize_url working.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060510183930-1dbe0bc58695ee47
parent: john at arbash-meinel.com-20060502224351-2aab4b966d21acb5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: encoding
timestamp: Wed 2006-05-10 11:39:30 -0700
message:
Added an re for handling scheme paths.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060502224351-2aab4b966d21acb5
parent: john at arbash-meinel.com-20060502211738-be512e6ec1e6e6cf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Tue 2006-05-02 17:43:51 -0500
message:
Added bzrlib.urlutils.split and basename + dirname
------------------------------------------------------------
merged: john at arbash-meinel.com-20060502211738-be512e6ec1e6e6cf
parent: john at arbash-meinel.com-20060502205240-dff94572278b6aba
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Tue 2006-05-02 16:17:38 -0500
message:
Updated strip_trailing_slash to support lots more url stuff, added tests
------------------------------------------------------------
merged: john at arbash-meinel.com-20060502205240-dff94572278b6aba
parent: john at arbash-meinel.com-20060502205114-bb7f6bcb2734d5d1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Tue 2006-05-02 15:52:40 -0500
message:
s comes before u
------------------------------------------------------------
merged: john at arbash-meinel.com-20060502205114-bb7f6bcb2734d5d1
parent: john at arbash-meinel.com-20060502204611-02caa5c20fb84ef8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Tue 2006-05-02 15:51:14 -0500
message:
Sorting functions by name.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060502204611-02caa5c20fb84ef8
parent: john at arbash-meinel.com-20060428180026-b66f2d738fb90d32
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Tue 2006-05-02 15:46:11 -0500
message:
Moved url functions into bzrlib.urlutils
------------------------------------------------------------
merged: john at arbash-meinel.com-20060428180026-b66f2d738fb90d32
parent: john at arbash-meinel.com-20060428175437-b0db7dd0505352b2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Fri 2006-04-28 13:00:26 -0500
message:
Now all MemoryTransports start with a valid root.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060428175437-b0db7dd0505352b2
parent: john at arbash-meinel.com-20060428171842-04f65c89de82599e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Fri 2006-04-28 12:54:37 -0500
message:
Bug in lockable files when _find_mode throws
------------------------------------------------------------
merged: john at arbash-meinel.com-20060428171842-04f65c89de82599e
parent: john at arbash-meinel.com-20060428055520-aaa9d2ebb21db2b3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Fri 2006-04-28 12:18:42 -0500
message:
A couple more fixes to make sure memory:/// works correctly.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060428055520-aaa9d2ebb21db2b3
parent: john at arbash-meinel.com-20060428053959-1babbf72593aa15a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Fri 2006-04-28 00:55:20 -0500
message:
memory is now memory://, need to fix the test cases.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060428053959-1babbf72593aa15a
parent: john at arbash-meinel.com-20060427205212-8f96d8bb870522f2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Fri 2006-04-28 00:39:59 -0500
message:
Allow file:// urls to be file:///C:/foo
------------------------------------------------------------
merged: john at arbash-meinel.com-20060427205212-8f96d8bb870522f2
parent: john at arbash-meinel.com-20060427205154-dce92c5cf03ace34
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-04-27 15:52:12 -0500
message:
Updating test_knit to not instantiate a LocalTransport directly.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060427205154-dce92c5cf03ace34
parent: john at arbash-meinel.com-20060427204028-3da252d058d4a9d2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-04-27 15:51:54 -0500
message:
Fix merge_remember to use a complete path.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060427204028-3da252d058d4a9d2
parent: john at arbash-meinel.com-20060427203530-24dcddd1399a5ba7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-04-27 15:40:28 -0500
message:
builtins now use urlfordisplay to display nicer paths to the user.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060427203530-24dcddd1399a5ba7
parent: john at arbash-meinel.com-20060427195007-364e40d8797c545e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-04-27 15:35:30 -0500
message:
Handle the case when one section of the path cannot be properly utf-8 decoded.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060427195007-364e40d8797c545e
parent: john at arbash-meinel.com-20060427174510-0a19047c4f230f81
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-04-27 14:50:07 -0500
message:
Adding a osutils.urlfordisplay command which will pretty-up urls for display
------------------------------------------------------------
merged: john at arbash-meinel.com-20060427174510-0a19047c4f230f81
parent: john at arbash-meinel.com-20060427174425-473cb918dc87acc3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-04-27 12:45:10 -0500
message:
Another test which assumed the output was a local path not a url
------------------------------------------------------------
merged: john at arbash-meinel.com-20060427174425-473cb918dc87acc3
parent: john at arbash-meinel.com-20060427172646-a5fa384ad5932f4a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-04-27 12:44:25 -0500
message:
Be more of a Nazi about URLs not being unicode
------------------------------------------------------------
merged: john at arbash-meinel.com-20060427172646-a5fa384ad5932f4a
parent: john at arbash-meinel.com-20060427171319-2ca1ae1bbba4465a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-04-27 12:26:46 -0500
message:
When unable to find an appropriate protocol, we now raise InvalidURL rather than always returning LocalTransport
------------------------------------------------------------
merged: john at arbash-meinel.com-20060427171319-2ca1ae1bbba4465a
parent: john at arbash-meinel.com-20060427162535-99bc7654d09ccd89
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-04-27 12:13:19 -0500
message:
Adding tests for the rest of the _win32 functions.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060427162535-99bc7654d09ccd89
parent: john at arbash-meinel.com-20060427162115-16e910e5d5758957
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-04-27 11:25:35 -0500
message:
PEP8 for workingtree.py
------------------------------------------------------------
merged: john at arbash-meinel.com-20060427162115-16e910e5d5758957
parent: john at arbash-meinel.com-20060427161339-033367f8d4fe837f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-04-27 11:21:15 -0500
message:
Fixed some of the osutils tests.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060427161339-033367f8d4fe837f
parent: john at arbash-meinel.com-20060427151502-70d67d3725ca02e5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-04-27 11:13:39 -0500
message:
Changing open_containing to always return a unicode path.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060427151502-70d67d3725ca02e5
parent: john at arbash-meinel.com-20060427151436-eb8c2328f7ea15f3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-04-27 10:15:02 -0500
message:
BzrDir works in URLs, but WorkingTree works in unicode paths
------------------------------------------------------------
merged: john at arbash-meinel.com-20060427151436-eb8c2328f7ea15f3
parent: john at arbash-meinel.com-20060427150605-fc9469b8e62aa4c1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-04-27 10:14:36 -0500
message:
Repository had a bug with what exception was raised when a file was missing
------------------------------------------------------------
merged: john at arbash-meinel.com-20060427150605-fc9469b8e62aa4c1
parent: john at arbash-meinel.com-20060427143233-f06f529f5421a6eb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-04-27 10:06:05 -0500
message:
Casting to str() was preventing raise of InvalidURL, fixed
------------------------------------------------------------
merged: john at arbash-meinel.com-20060427143233-f06f529f5421a6eb
parent: john at arbash-meinel.com-20060427140618-a4bbad683bf4c22c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-04-27 09:32:33 -0500
message:
cmd_push should use URLs throughout.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060427140618-a4bbad683bf4c22c
parent: john at arbash-meinel.com-20060427140547-3e50e32bf9933a52
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-04-27 09:06:18 -0500
message:
mkdir was adding an extra space before the path.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060427140547-3e50e32bf9933a52
parent: john at arbash-meinel.com-20060427135738-b33248560a9419e0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-04-27 09:05:47 -0500
message:
cmd_push was passing the location directly to relpath, rather than a URL
------------------------------------------------------------
merged: john at arbash-meinel.com-20060427135738-b33248560a9419e0
parent: john at arbash-meinel.com-20060427135644-a14d2899c0b147fa
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-04-27 08:57:38 -0500
message:
Re-enable test_nonascii.test_access
------------------------------------------------------------
merged: john at arbash-meinel.com-20060427135644-a14d2899c0b147fa
parent: john at arbash-meinel.com-20060427022156-451a71965591e6f0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-04-27 08:56:44 -0500
message:
More changes to get 'bzr branch' and 'bzr pull' to work
------------------------------------------------------------
merged: john at arbash-meinel.com-20060427022156-451a71965591e6f0
parent: john at arbash-meinel.com-20060427022134-1a52d619e6b9ebac
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Wed 2006-04-26 21:21:56 -0500
message:
pull/merge/branch/missing should all save the absolute path to the other branch, not the relative one
------------------------------------------------------------
merged: john at arbash-meinel.com-20060427022134-1a52d619e6b9ebac
parent: john at arbash-meinel.com-20060427020810-84d7d70f9749d350
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Wed 2006-04-26 21:21:34 -0500
message:
NotABranch contains a URL
------------------------------------------------------------
merged: john at arbash-meinel.com-20060427020810-84d7d70f9749d350
parent: john at arbash-meinel.com-20060427014739-07fac5ec153f15a2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Wed 2006-04-26 21:08:10 -0500
message:
test_permissions.check_mode_r needs to pass a path that the '.' transport can handle
------------------------------------------------------------
merged: john at arbash-meinel.com-20060427014739-07fac5ec153f15a2
parent: john at arbash-meinel.com-20060427014659-ac3d54d564d3a7bf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Wed 2006-04-26 20:47:39 -0500
message:
A few places that were comparing a working trees base to a branch's base, where Branch.base is now a URL
------------------------------------------------------------
merged: john at arbash-meinel.com-20060427014659-ac3d54d564d3a7bf
parent: john at arbash-meinel.com-20060426223922-a1e777768d68bc68
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Wed 2006-04-26 20:46:59 -0500
message:
We don't need to add the rest of the URL again
------------------------------------------------------------
merged: john at arbash-meinel.com-20060426223922-a1e777768d68bc68
parent: john at arbash-meinel.com-20060426223852-329458892b465ff0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Wed 2006-04-26 17:39:22 -0500
message:
TestCaseWithTransport.get_url() should actually return a URL encoded path
------------------------------------------------------------
merged: john at arbash-meinel.com-20060426223852-329458892b465ff0
parent: john at arbash-meinel.com-20060426205237-36d969d421bcb429
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Wed 2006-04-26 17:38:52 -0500
message:
WorkingTree needs to pass URLs to transport
------------------------------------------------------------
merged: john at arbash-meinel.com-20060426205237-36d969d421bcb429
parent: john at arbash-meinel.com-20060426205202-3af07a6ffbe53e45
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Wed 2006-04-26 15:52:37 -0500
message:
Some more work to get LocalTransport to only support URLs
------------------------------------------------------------
merged: john at arbash-meinel.com-20060426205202-3af07a6ffbe53e45
parent: john at arbash-meinel.com-20060426204914-e2ef4788343254b5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Wed 2006-04-26 15:52:02 -0500
message:
Not all of the registered transports use :// as part of their path, specifically memory:/
------------------------------------------------------------
merged: john at arbash-meinel.com-20060426204914-e2ef4788343254b5
parent: john at arbash-meinel.com-20060426195432-5de612237c46f96d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Wed 2006-04-26 15:49:14 -0500
message:
Assuming paths are utf-8 encoded allows TransportImplementation.test_unicode_paths(SFTPHomeDirServer) to succeed.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060426195432-5de612237c46f96d
parent: john at arbash-meinel.com-20060425201804-38a8c80db981324d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Wed 2006-04-26 14:54:32 -0500
message:
Updated LocalTransport so that it's base is now a URL rather than a local path. This helps consistency with all other functions. To do so, I added local_abspath() which returns the local path, and local_path_to/from_url
------------------------------------------------------------
merged: john at arbash-meinel.com-20060425201804-38a8c80db981324d
parent: john at arbash-meinel.com-20060425182239-82145c2f109b62f1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Tue 2006-04-25 15:18:04 -0500
message:
Re-allow a couple more tests, fix a bug in http, non_ascii tests still fail.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060425182239-82145c2f109b62f1
parent: john at arbash-meinel.com-20060425182030-2da5fe8caecc2ea4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Tue 2006-04-25 13:22:39 -0500
message:
Reducing the final diff output.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060425182030-2da5fe8caecc2ea4
parent: john at arbash-meinel.com-20060425181624-f43dcd595941a76b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Tue 2006-04-25 13:20:30 -0500
message:
Merged test_status.py.moved into test_status.py
------------------------------------------------------------
merged: john at arbash-meinel.com-20060425181624-f43dcd595941a76b
parent: john at arbash-meinel.com-20060425180944-3613e1ecea197067
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Tue 2006-04-25 13:16:24 -0500
message:
Merged test_log.py.moved into test_log.py
------------------------------------------------------------
merged: john at arbash-meinel.com-20060425180944-3613e1ecea197067
parent: john at arbash-meinel.com-20060425180829-43a8d6c25d903d17
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Tue 2006-04-25 13:09:44 -0500
message:
Changing LocalTransport to use urlunescape instead of urllib.unquote allows build_tree to work again.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060425180829-43a8d6c25d903d17
parent: john at arbash-meinel.com-20060425155415-9c0b1c8d28aec502
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Tue 2006-04-25 13:08:29 -0500
message:
Minor cleanups
------------------------------------------------------------
merged: john at arbash-meinel.com-20060425155415-9c0b1c8d28aec502
parent: john at arbash-meinel.com-20060425150542-c7b518dca9928691
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Tue 2006-04-25 10:54:15 -0500
message:
Re-enabling the non_ascii tests after fixing trace.py, bzr ignore also does the right thing now
------------------------------------------------------------
merged: john at arbash-meinel.com-20060425150542-c7b518dca9928691
parent: pqm at pqm.ubuntu.com-20060424103128-a637f56a7c529bad
parent: john at arbash-meinel.com-20060308143824-d84504389354bfc1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Tue 2006-04-25 10:05:42 -0500
message:
[merge] the old bzr-encoding changes, reparenting them on bzr.dev
------------------------------------------------------------
merged: john at arbash-meinel.com-20060308143824-d84504389354bfc1
parent: john at arbash-meinel.com-20060308143123-448308b0db4de410
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Wed 2006-03-08 08:38:24 -0600
message:
Removing glob_matcher for the future ignore pattern upgrade.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060308143123-448308b0db4de410
parent: john at arbash-meinel.com-20060214160624-756d8441e0c1e453
parent: pqm at pqm.ubuntu.com-20060308051838-876e9f9ac39ee578
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Wed 2006-03-08 08:31:23 -0600
message:
[merge] bzr.dev 1573, lots of updates
------------------------------------------------------------
merged: john at arbash-meinel.com-20060214160624-756d8441e0c1e453
parent: john at arbash-meinel.com-20060205124837-06b784b5ff8187eb
parent: john at arbash-meinel.com-20060213214027-f87283ba0fa50538
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Tue 2006-02-14 10:06:24 -0600
message:
[merge] jam-integration 1531
------------------------------------------------------------
merged: john at arbash-meinel.com-20060205124837-06b784b5ff8187eb
parent: john at arbash-meinel.com-20060205064803-1a6f111c7c622409
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Sun 2006-02-05 06:48:37 -0600
message:
Fixing translation of Hebrew word.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060205064803-1a6f111c7c622409
parent: john at arbash-meinel.com-20060205052510-bd93d0597df11cbd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Sun 2006-02-05 00:48:03 -0600
message:
Use the correct Test Case base, so at least 'bzr selftest' starts.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060205052510-bd93d0597df11cbd
parent: john at arbash-meinel.com-20060205045655-3ece0272025f471f
parent: john at arbash-meinel.com-20060204235841-23632e02a5097602
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Sat 2006-02-04 23:25:10 -0600
message:
[merge] jam-integration 1527, including branch-formats, help text, misc bug fixes.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060205045655-3ece0272025f471f
parent: john at arbash-meinel.com-20060126155428-284dcecb71b39f83
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Sat 2006-02-04 22:56:55 -0600
message:
Adding Hebrew characters.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060126155428-284dcecb71b39f83
parent: john at arbash-meinel.com-20060116221400-7914cb284616546f
parent: john at arbash-meinel.com-20060126151809-9fd33fa77d4a31c5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-01-26 09:54:28 -0600
message:
[merge] jam-integration 1512, includes Storage changes.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060116221400-7914cb284616546f
parent: john at arbash-meinel.com-20060116213637-2f4cc1c55769f464
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Mon 2006-01-16 16:14:00 -0600
message:
Trying to keep SFTPHomeDirServer from locking up.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060116213637-2f4cc1c55769f464
parent: john at arbash-meinel.com-20060116205504-a50588b5612d2912
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Mon 2006-01-16 15:36:37 -0600
message:
Adding an InvalidURL so transports can report they expect utf-8 quoted paths. Updated tests
------------------------------------------------------------
merged: john at arbash-meinel.com-20060116205504-a50588b5612d2912
parent: john at arbash-meinel.com-20060116205121-842659334ca410a4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Mon 2006-01-16 14:55:04 -0600
message:
Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060116205121-842659334ca410a4
parent: john at arbash-meinel.com-20060113151552-762691b30ad241bb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Mon 2006-01-16 14:51:21 -0600
message:
build_tree uses Transport, so Transport needs to take utf-8 encoded urls
------------------------------------------------------------
merged: john at arbash-meinel.com-20060113151552-762691b30ad241bb
parent: john at arbash-meinel.com-20060113070533-0342c358fb4e8416
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Fri 2006-01-13 09:15:52 -0600
message:
Fix WorkingTree to realize .bzrignore is utf-8 encoded.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060113070533-0342c358fb4e8416
parent: john at arbash-meinel.com-20060113060658-43a9f01cadf1c0bc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Fri 2006-01-13 01:05:33 -0600
message:
Fix some of the tests.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060113060658-43a9f01cadf1c0bc
parent: john at arbash-meinel.com-20060113060400-e24615f222244238
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Fri 2006-01-13 00:06:58 -0600
message:
list of encodings allows repeats
------------------------------------------------------------
merged: john at arbash-meinel.com-20060113060400-e24615f222244238
parent: john at arbash-meinel.com-20060113042206-e76c0678a46eacf0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Fri 2006-01-13 00:04:00 -0600
message:
Hooked up EncodingAdapter, and updated test_non_ascii.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060113042206-e76c0678a46eacf0
parent: john at arbash-meinel.com-20060113031249-905ed92f6b9aedf4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-01-12 22:22:06 -0600
message:
New encoder with multiple strings.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060113031249-905ed92f6b9aedf4
parent: john at arbash-meinel.com-20060113030533-a23442ca6cbe9cba
parent: john at arbash-meinel.com-20060112060603-635de5933db78304
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-01-12 21:12:49 -0600
message:
[merge] jam-integration 1503
------------------------------------------------------------
merged: john at arbash-meinel.com-20060113030533-a23442ca6cbe9cba
parent: john at arbash-meinel.com-20060107200945-3ec3cacaadb59ec6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-01-12 21:05:33 -0600
message:
Starting work on a test adapter for multiple encodings.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060107200945-3ec3cacaadb59ec6
parent: john at arbash-meinel.com-20060107200905-e9023136cfe659c1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Sat 2006-01-07 14:09:45 -0600
message:
Adding test for swedish
------------------------------------------------------------
merged: john at arbash-meinel.com-20060107200905-e9023136cfe659c1
parent: john at arbash-meinel.com-20060107194134-6107e13b0241d2af
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Sat 2006-01-07 14:09:05 -0600
message:
Adding tests for kanji (from Wouter van Heyst), and Russian (from Alexander Belchenko)
------------------------------------------------------------
merged: john at arbash-meinel.com-20060107194134-6107e13b0241d2af
parent: john at arbash-meinel.com-20060107192003-8ae3442371154d8d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Sat 2006-01-07 13:41:34 -0600
message:
A couple more tests for glob_matcher.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060107192003-8ae3442371154d8d
parent: john at arbash-meinel.com-20060107183652-995bebd8dd7dc446
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Sat 2006-01-07 13:20:03 -0600
message:
Adding tests for multiple pattern matcher.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060107183652-995bebd8dd7dc446
parent: john at arbash-meinel.com-20060107182435-d691991f144332cb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Sat 2006-01-07 12:36:52 -0600
message:
Adding more tests for the new glob matcher.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060107182435-d691991f144332cb
parent: john at arbash-meinel.com-20060107181133-73a19bd60bcb559b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Sat 2006-01-07 12:24:35 -0600
message:
glob [!abc] should not match directory seperators
------------------------------------------------------------
merged: john at arbash-meinel.com-20060107181133-73a19bd60bcb559b
parent: john at arbash-meinel.com-20060107164859-83f0f51fa3fe8a90
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Sat 2006-01-07 12:11:33 -0600
message:
Working on an alternate pattern matcher instead of fnmatch.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060107164859-83f0f51fa3fe8a90
parent: john at arbash-meinel.com-20060107164000-ea9d2fe19aac9a94
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Sat 2006-01-07 10:48:59 -0600
message:
Adding extra tests for future corrections to WorkingTree.is_ignored()
------------------------------------------------------------
merged: john at arbash-meinel.com-20060107164000-ea9d2fe19aac9a94
parent: john at arbash-meinel.com-20060107163221-8e5aee35f0df9402
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Sat 2006-01-07 10:40:00 -0600
message:
Working on bzr ignore, found that WorkingTree.is_ignored doesn't handle unicode names.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060107163221-8e5aee35f0df9402
parent: john at arbash-meinel.com-20060107162955-a52029acf74d7278
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Sat 2006-01-07 10:32:21 -0600
message:
Updated cmd_unknowns
------------------------------------------------------------
merged: john at arbash-meinel.com-20060107162955-a52029acf74d7278
parent: john at arbash-meinel.com-20060107162918-86c66aaa53c80f44
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Sat 2006-01-07 10:29:55 -0600
message:
Keeping test_non_ascii in the same order as builtins.py
------------------------------------------------------------
merged: john at arbash-meinel.com-20060107162918-86c66aaa53c80f44
parent: john at arbash-meinel.com-20060107161945-eda2c23d47f9b06b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Sat 2006-01-07 10:29:18 -0600
message:
Updated cmd_touching_revisions
------------------------------------------------------------
merged: john at arbash-meinel.com-20060107161945-eda2c23d47f9b06b
parent: john at arbash-meinel.com-20060107161901-ddd6c4fe80918f9e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Sat 2006-01-07 10:19:45 -0600
message:
Keeping test_non_ascii in the same order as builtins.py
------------------------------------------------------------
merged: john at arbash-meinel.com-20060107161901-ddd6c4fe80918f9e
parent: john at arbash-meinel.com-20060107161544-d3c83f9c6ea27eb6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Sat 2006-01-07 10:19:01 -0600
message:
Updated cmd_root
------------------------------------------------------------
merged: john at arbash-meinel.com-20060107161544-d3c83f9c6ea27eb6
parent: john at arbash-meinel.com-20060107161303-3110d011dc7ece07
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Sat 2006-01-07 10:15:44 -0600
message:
Updated cmd_added, which obviously had no tests, because it had a bug in it.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060107161303-3110d011dc7ece07
parent: john at arbash-meinel.com-20060107161133-f58d6efa00f10bf0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Sat 2006-01-07 10:13:03 -0600
message:
Adding tests to make sure deleted and modified fail if cannot encode names.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060107161133-f58d6efa00f10bf0
parent: john at arbash-meinel.com-20060107160947-937f169b3468e306
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Sat 2006-01-07 10:11:33 -0600
message:
Updated cmd_modified
------------------------------------------------------------
merged: john at arbash-meinel.com-20060107160947-937f169b3468e306
parent: john at arbash-meinel.com-20060107155647-23bb960281ab6790
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Sat 2006-01-07 10:09:47 -0600
message:
Updated cmd_deleted, including adding --show-ids option.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060107155647-23bb960281ab6790
parent: john at arbash-meinel.com-20060107153104-c41dd648bf6caceb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Sat 2006-01-07 09:56:47 -0600
message:
Adding a russian string into the test suite.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060107153104-c41dd648bf6caceb
parent: john at arbash-meinel.com-20060107151616-9c850f6c2ff66f72
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Sat 2006-01-07 09:31:04 -0600
message:
Rework cp1251/cp866 encoding test.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060107151616-9c850f6c2ff66f72
parent: john at arbash-meinel.com-20060107151404-015db3b25eb67e26
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Sat 2006-01-07 09:16:16 -0600
message:
[patch] Alexander Belchenko: Test encoding in different code pages.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060107151404-015db3b25eb67e26
parent: john at arbash-meinel.com-20060107151107-f89d74db65e6e61c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Sat 2006-01-07 09:14:04 -0600
message:
[patch] Alexander Belchenko: win32 'Permission denied' is errno.EACCES
------------------------------------------------------------
merged: john at arbash-meinel.com-20060107151107-f89d74db65e6e61c
parent: john at arbash-meinel.com-20060107150649-91794e24ef51e58e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Sat 2006-01-07 09:11:07 -0600
message:
cp1251 can encode mu
------------------------------------------------------------
merged: john at arbash-meinel.com-20060107150649-91794e24ef51e58e
parent: john at arbash-meinel.com-20060107150541-ea950bf412d19132
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Sat 2006-01-07 09:06:49 -0600
message:
Found a bug in 'bzr file-path'
------------------------------------------------------------
merged: john at arbash-meinel.com-20060107150541-ea950bf412d19132
parent: john at arbash-meinel.com-20060107150510-4dbfa8d8d229bd71
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Sat 2006-01-07 09:05:41 -0600
message:
I haven't been running the full test enough. Found some bugs in bzr ancestry.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060107150510-4dbfa8d8d229bd71
parent: john at arbash-meinel.com-20060107150415-adc64e3ff118245b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Sat 2006-01-07 09:05:10 -0600
message:
Changing test_non_ascii.py so that it will keep trying even if it can't encode one piece.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060107150415-adc64e3ff118245b
parent: john at arbash-meinel.com-20060107150349-7ae8ca5801cba1c9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Sat 2006-01-07 09:04:15 -0600
message:
Adding Alexander's console encoding to test_log
------------------------------------------------------------
merged: john at arbash-meinel.com-20060107150349-7ae8ca5801cba1c9
parent: john at arbash-meinel.com-20060107150319-3b0da235cc6da3eb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Sat 2006-01-07 09:03:49 -0600
message:
cleanup of Alexander's patch
------------------------------------------------------------
merged: john at arbash-meinel.com-20060107150319-3b0da235cc6da3eb
parent: john at arbash-meinel.com-20060107143527-37484c67cc54a2ed
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Sat 2006-01-07 09:03:19 -0600
message:
forgot to add test_status.py
------------------------------------------------------------
merged: john at arbash-meinel.com-20060107143527-37484c67cc54a2ed
parent: john at arbash-meinel.com-20060106064812-99a2fc2e98a0664f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Sat 2006-01-07 08:35:27 -0600
message:
[patch] Alexander Belchenko: test status with bad encodings.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060106064812-99a2fc2e98a0664f
parent: john at arbash-meinel.com-20060106064110-c75d21555d571c8b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Fri 2006-01-06 00:48:12 -0600
message:
Working on tests for revision-history, ancestry, and diff
------------------------------------------------------------
merged: john at arbash-meinel.com-20060106064110-c75d21555d571c8b
parent: john at arbash-meinel.com-20060106063352-351ac0ed8f39c4e7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Fri 2006-01-06 00:41:10 -0600
message:
Updated file-path
------------------------------------------------------------
merged: john at arbash-meinel.com-20060106063352-351ac0ed8f39c4e7
parent: john at arbash-meinel.com-20060106062027-45ee44bc467d23a3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Fri 2006-01-06 00:33:52 -0600
message:
Updating 'bzr file-id' exposed that we weren't allowing unicode file ids. Enabling them reveals a lot more bugs.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060106062027-45ee44bc467d23a3
parent: john at arbash-meinel.com-20060106061552-63d0ce2cb3f2f77f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Fri 2006-01-06 00:20:27 -0600
message:
Updated bzr remove, still remove --verbose still broken.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060106061552-63d0ce2cb3f2f77f
parent: john at arbash-meinel.com-20060106061216-3100764a1ff80807
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Fri 2006-01-06 00:15:52 -0600
message:
Updated bzr renames
------------------------------------------------------------
merged: john at arbash-meinel.com-20060106061216-3100764a1ff80807
parent: john at arbash-meinel.com-20060106060418-5517afd10aa8f697
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Fri 2006-01-06 00:12:16 -0600
message:
Updated bzr push, including bringing in the unused --verbose flag.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060106060418-5517afd10aa8f697
parent: john at arbash-meinel.com-20060106060002-5610acaf49e0f4fb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Fri 2006-01-06 00:04:18 -0600
message:
Fixing 'bzr push' exposed that IniBasedConfig didn't handle unicode.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060106060002-5610acaf49e0f4fb
parent: john at arbash-meinel.com-20060106053931-57a93a761a10c0f1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Fri 2006-01-06 00:00:02 -0600
message:
Reverting changes to configobj.py
------------------------------------------------------------
merged: john at arbash-meinel.com-20060106053931-57a93a761a10c0f1
parent: john at arbash-meinel.com-20060106042623-3e4b3a31753297fd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-01-05 23:39:31 -0600
message:
A form of ConfigObj which can write out utf-8
------------------------------------------------------------
merged: john at arbash-meinel.com-20060106042623-3e4b3a31753297fd
parent: john at arbash-meinel.com-20060106035209-577e3ef1d090ef83
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-01-05 22:26:23 -0600
message:
Updated bzr branch and bzr pull
------------------------------------------------------------
merged: john at arbash-meinel.com-20060106035209-577e3ef1d090ef83
parent: john at arbash-meinel.com-20060106034347-8ab48145385b4345
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-01-05 21:52:09 -0600
message:
bzr mv should succeed even if it can't display the paths.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060106034347-8ab48145385b4345
parent: john at arbash-meinel.com-20060106034032-6ad5e572d9249519
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-01-05 21:43:47 -0600
message:
updated 'bzr mv'
------------------------------------------------------------
merged: john at arbash-meinel.com-20060106034032-6ad5e572d9249519
parent: john at arbash-meinel.com-20060106030637-57fb409492340ca4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-01-05 21:40:32 -0600
message:
Moved run_bzr_decode into TestCase
Added a new test for Command.encoding_type
added tests for bzr revno and bzr revision-info
------------------------------------------------------------
merged: john at arbash-meinel.com-20060106030637-57fb409492340ca4
parent: john at arbash-meinel.com-20060106030246-f6939f2747212579
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-01-05 21:06:37 -0600
message:
Adding more inventory tests.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060106030246-f6939f2747212579
parent: john at arbash-meinel.com-20060106024522-b8d5476a5dadab67
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-01-05 21:02:46 -0600
message:
Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run()
------------------------------------------------------------
merged: john at arbash-meinel.com-20060106024522-b8d5476a5dadab67
parent: john at arbash-meinel.com-20060106024025-3341b925d780a92b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-01-05 20:45:22 -0600
message:
Change ls so that it won't give incorrect paths.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060106024025-3341b925d780a92b
parent: john at arbash-meinel.com-20060106023928-42d20c71972e9592
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-01-05 20:40:25 -0600
message:
relpath fails if it can't write correctly.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060106023928-42d20c71972e9592
parent: john at arbash-meinel.com-20060106023813-8296d0c0bf579a1f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-01-05 20:39:28 -0600
message:
Updated bzr relpath
------------------------------------------------------------
merged: john at arbash-meinel.com-20060106023813-8296d0c0bf579a1f
parent: john at arbash-meinel.com-20060106021144-3fef7ac3b8d2a1dc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-01-05 20:38:13 -0600
message:
Updated mkdir, added to test_log
------------------------------------------------------------
merged: john at arbash-meinel.com-20060106021144-3fef7ac3b8d2a1dc
parent: john at arbash-meinel.com-20060106021104-6386aedb60a05def
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-01-05 20:11:44 -0600
message:
switching to using the default encoding instead of utf-8
------------------------------------------------------------
merged: john at arbash-meinel.com-20060106021104-6386aedb60a05def
parent: john at arbash-meinel.com-20060106020333-627d05482c04ee9b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-01-05 20:11:04 -0600
message:
Fixed the msgeditor test to actually catch the exception
------------------------------------------------------------
merged: john at arbash-meinel.com-20060106020333-627d05482c04ee9b
parent: john at arbash-meinel.com-20060106014815-17f3d45afff60080
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-01-05 20:03:33 -0600
message:
Updated bzr status, adding test_cat
------------------------------------------------------------
merged: john at arbash-meinel.com-20060106014815-17f3d45afff60080
parent: john at arbash-meinel.com-20060106013409-b0a456793cd15718
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-01-05 19:48:15 -0600
message:
Change exception handling for msgeditor.py to only catch specific exceptions.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060106013409-b0a456793cd15718
parent: john at arbash-meinel.com-20060106002318-4176733fedf61161
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-01-05 19:34:09 -0600
message:
Moving bzr ls to encoded output.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060106002318-4176733fedf61161
parent: john at arbash-meinel.com-20060105230725-81e05504d07aba1d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-01-05 18:23:18 -0600
message:
Refactoring AddAction to allow redirecting to an encoding file.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060105230725-81e05504d07aba1d
parent: john at arbash-meinel.com-20060105225914-174b175b9feca89b
parent: robertc at robertcollins.net-20060105224859-b3a1f2be759672fc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-01-05 17:07:25 -0600
message:
[merge] robertc/integration 1441
------------------------------------------------------------
merged: john at arbash-meinel.com-20060105225914-174b175b9feca89b
parent: john at arbash-meinel.com-20060105213637-f6f19f470e1396bd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-01-05 16:59:14 -0600
message:
Adding a test case which uses non-ascii characters for email, filename, and commit message
------------------------------------------------------------
merged: john at arbash-meinel.com-20060105213637-f6f19f470e1396bd
parent: john at arbash-meinel.com-20060105212923-5ac32c133789cadb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-01-05 15:36:37 -0600
message:
[patch] Alexander Belchenko: test spawning a msg editor
------------------------------------------------------------
merged: john at arbash-meinel.com-20060105212923-5ac32c133789cadb
parent: john at arbash-meinel.com-20060105182207-6bcbd3f47036cfb3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-01-05 15:29:23 -0600
message:
Adding wrapper for sys.stdout so we can set the output encoding. Adding tests that 'bzr log' handles multiple encodings properly
------------------------------------------------------------
merged: john at arbash-meinel.com-20060105182207-6bcbd3f47036cfb3
parent: john at arbash-meinel.com-20060105180645-b0da2d9a5850c35c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-01-05 12:22:07 -0600
message:
Added Copyright, changed test_missing to use run_bzr instead of capture.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060105180645-b0da2d9a5850c35c
parent: john at arbash-meinel.com-20051227225650-1560126e87a674bf
parent: john at arbash-meinel.com-20060104234532-14bf2cb2a1e65ba8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Thu 2006-01-05 12:06:45 -0600
message:
[merge] jam-integration 1496
------------------------------------------------------------
merged: john at arbash-meinel.com-20051227225650-1560126e87a674bf
parent: john at arbash-meinel.com-20051224210320-c9ce63441ca80288
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Tue 2005-12-27 16:56:50 -0600
message:
mutter() should not fail because of unicode errors
------------------------------------------------------------
merged: john at arbash-meinel.com-20051224210320-c9ce63441ca80288
parent: john at arbash-meinel.com-20051224195753-782c5d85a7f6f556
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Sat 2005-12-24 15:03:20 -0600
message:
currently broken, trying to fix things up.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051224195753-782c5d85a7f6f556
parent: john at arbash-meinel.com-20051224195519-760ffd6985aff587
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Sat 2005-12-24 13:57:53 -0600
message:
Use getattr instead of hasattr by Robert Collins suggestion.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051224195519-760ffd6985aff587
parent: john at arbash-meinel.com-20051224195414-c9ceb24c877fb0d5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Sat 2005-12-24 13:55:19 -0600
message:
[patch] from Ivan Vilata i Balaguer: infotext should be encoded from unicode to flat strings
------------------------------------------------------------
merged: john at arbash-meinel.com-20051224195414-c9ceb24c877fb0d5
parent: mbp at sourcefrog.net-20051216014735-906c2145b95924eb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-encoding
timestamp: Sat 2005-12-24 13:54:14 -0600
message:
[patch] from Alexander Belchenko, proper encoding log based on encoding of sys.stdout
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060608063015-aea61566ebe87ed3
parent: pqm at pqm.ubuntu.com-20060607170142-7d3d91a14bbccd3f
parent: john at arbash-meinel.com-20060607213622-c0742e8ba1598847
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-06-08 07:30:15 +0100
message:
(jam) sign-my-commits should take out a write lock.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060607213622-c0742e8ba1598847
parent: john at arbash-meinel.com-20060606225947-a42304c4de8693f6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2006-06-07 16:36:22 -0500
message:
sign-my-commits should take out a write lock.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060607170142-7d3d91a14bbccd3f
parent: pqm at pqm.ubuntu.com-20060607165244-0ac889108154ba53
parent: aaron.bentley at utoronto.ca-20060607165526-ddde1b66c1985353
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-06-07 18:01:42 +0100
message:
Remove patience-test.py, since John Meinel has an alternative plugin.
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060607165526-ddde1b66c1985353
parent: aaron.bentley at utoronto.ca-20060607080210-e16c11ab1802b8bd
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-06-07 17:55:26 +0100
message:
Remove patience-test.py, since John Meinel has an alternative plugin.
Its current position is in the way.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060607165244-0ac889108154ba53
parent: pqm at pqm.ubuntu.com-20060607164754-f5a93b47d5650c8c
parent: aaron.bentley at utoronto.ca-20060607164622-adee4e386f9aa1e1
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-06-07 17:52:44 +0100
message:
Add bundle --output, help text updates
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060607164622-adee4e386f9aa1e1
parent: aaron.bentley at utoronto.ca-20060607001439-17a13a04f8c3e69e
parent: bialix at ukr.net-20060606192858-9f0721421ae29ce0
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bundles
timestamp: Wed 2006-06-07 17:46:22 +0100
message:
Merge Belchenko's --output option
------------------------------------------------------------
merged: bialix at ukr.net-20060606192858-9f0721421ae29ce0
parent: pqm at pqm.ubuntu.com-20060606161247-44efd292c9de0005
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: bzr.dev.bialix.bundle.LF-only
timestamp: Tue 2006-06-06 22:28:58 +0300
message:
Added --output option for bundle-revisions command
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060607001439-17a13a04f8c3e69e
parent: aaron.bentley at utoronto.ca-20060606181546-a5cc7d87cea71454
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Wed 2006-06-07 01:14:39 +0100
message:
Use full command name in bundle-revisions help
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060607164754-f5a93b47d5650c8c
parent: pqm at pqm.ubuntu.com-20060607101245-3e242a04b9bd23e9
parent: aaron.bentley at utoronto.ca-20060607162938-0bec699ddde0764a
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-06-07 17:47:54 +0100
message:
Produce better errors for malformed bundles
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060607162938-0bec699ddde0764a
parent: aaron.bentley at utoronto.ca-20060606181546-a5cc7d87cea71454
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Wed 2006-06-07 17:29:38 +0100
message:
Update for review comments
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060606181546-a5cc7d87cea71454
parent: aaron.bentley at utoronto.ca-20060606180345-57139c8826ab3ec1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Tue 2006-06-06 19:15:46 +0100
message:
Ensure bzr works when you merge an already-merged bundle
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060606180345-57139c8826ab3ec1
parent: aaron.bentley at utoronto.ca-20060606175639-92a20ee0a7f8b3b7
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Tue 2006-06-06 19:03:45 +0100
message:
Check for NotABundle, not BadBundle, so we get errors for malformed bundles
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060606175639-92a20ee0a7f8b3b7
parent: aaron.bentley at utoronto.ca-20060606171005-e2b50e39cd5056be
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Tue 2006-06-06 18:56:39 +0100
message:
Raise NotABundle when a non-bundle is supplied
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060606171005-e2b50e39cd5056be
parent: aaron.bentley at utoronto.ca-20060603201131-518d5e8364931300
parent: pqm at pqm.ubuntu.com-20060606161247-44efd292c9de0005
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Tue 2006-06-06 18:10:05 +0100
message:
Merge from bzr.dev
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060607101245-3e242a04b9bd23e9
parent: pqm at pqm.ubuntu.com-20060606231709-6d3f204cbe17b4c6
parent: aaron.bentley at utoronto.ca-20060607080210-e16c11ab1802b8bd
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-06-07 11:12:45 +0100
message:
Ignore .python-eggs
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060607080210-e16c11ab1802b8bd
parent: aaron.bentley at utoronto.ca-20060603220949-248c5efa03d23633
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-06-07 09:02:10 +0100
message:
Ignore .python-eggs
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060606231709-6d3f204cbe17b4c6
parent: pqm at pqm.ubuntu.com-20060606225958-17ab4431da6b44f6
parent: john at arbash-meinel.com-20060606225947-a42304c4de8693f6
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-06-07 00:17:09 +0100
message:
bug 41183, Olaf Conradi: on some platforms getfilesystemencoding() returns None, we should default to something more sane.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060606225947-a42304c4de8693f6
parent: john at arbash-meinel.com-20060606101921-7d49169756dad2e1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2006-06-06 17:59:47 -0500
message:
bug 41183, Olaf Conradi: on some platforms getfilesystemencoding() returns None, we should default to something more sane.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060606225958-17ab4431da6b44f6
parent: pqm at pqm.ubuntu.com-20060606161247-44efd292c9de0005
parent: aaron.bentley at utoronto.ca-20060606224743-fae7fc6407ed27f8
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-06-06 23:59:58 +0100
message:
Speed up checkout by using existing revision text when possible
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060606224743-fae7fc6407ed27f8
parent: aaron.bentley at utoronto.ca-20060606170450-8a09b15bf3f195b0
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.checkout
timestamp: Tue 2006-06-06 23:47:43 +0100
message:
Update test for new interface
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060606170450-8a09b15bf3f195b0
parent: aaron.bentley at utoronto.ca-20060605175245-4e3dd578bd49687d
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.checkout
timestamp: Tue 2006-06-06 18:04:50 +0100
message:
Merge from bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060605175245-4e3dd578bd49687d
parent: aaron.bentley at utoronto.ca-20060605175153-3a1af9d399f2ef5e
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.checkout
timestamp: Mon 2006-06-05 18:52:45 +0100
message:
Update transform tests and docs
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060605175153-3a1af9d399f2ef5e
parent: aaron.bentley at utoronto.ca-20060605152227-f40d3710d2fa9103
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.checkout
timestamp: Mon 2006-06-05 18:51:53 +0100
message:
Only reserialize the working tree basis inventory when needed.
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060605152227-f40d3710d2fa9103
parent: aaron.bentley at utoronto.ca-20060605142319-984ceff8c18e815b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.checkout
timestamp: Mon 2006-06-05 16:22:27 +0100
message:
Add test for the basis inventory automatically adding the revision id.
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060605142319-984ceff8c18e815b
parent: pqm at pqm.ubuntu.com-20060604105531-0071ce43b2156b7a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.checkout
timestamp: Mon 2006-06-05 15:23:19 +0100
message:
trivial fix to CheckoutBenchmark.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060606161247-44efd292c9de0005
parent: pqm at pqm.ubuntu.com-20060606110445-79d71fb5b8e9fa8e
parent: aaron.bentley at utoronto.ca-20060603220949-248c5efa03d23633
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-06-06 17:12:47 +0100
message:
Fix benchmark test
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060603220949-248c5efa03d23633
parent: aaron.bentley at utoronto.ca-20060603211043-cb05de4d3a3dfe1c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sat 2006-06-03 23:09:49 +0100
message:
Fix benchmark test
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060606110445-79d71fb5b8e9fa8e
parent: pqm at pqm.ubuntu.com-20060606102520-64c05752f159a669
parent: mbp at sourcefrog.net-20060606103838-6a402aba15478322
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-06-06 12:04:45 +0100
message:
(mbp,jamesh) show file times; doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060606103838-6a402aba15478322
parent: mbp at sourcefrog.net-20060604153943-999dfdbb6b85719d
parent: james.henstridge at canonical.com-20060606052939-6d66ea66329554da
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Tue 2006-06-06 11:38:38 +0100
message:
[merge] Show file mod times in diff; use this for add/delete (jamesh)
------------------------------------------------------------
merged: james.henstridge at canonical.com-20060606052939-6d66ea66329554da
parent: james.henstridge at canonical.com-20060601081248-4699a58ed1efe60f
parent: pqm at pqm.ubuntu.com-20060604105531-0071ce43b2156b7a
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.diff-output
timestamp: Tue 2006-06-06 13:29:39 +0800
message:
merge from bzr.dev and fix conflicts
------------------------------------------------------------
merged: james.henstridge at canonical.com-20060601081248-4699a58ed1efe60f
parent: james.henstridge at canonical.com-20060601075724-40b5698d12b775f2
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.diff-output
timestamp: Thu 2006-06-01 16:12:48 +0800
message:
support passing a path in to get_file_mtime
------------------------------------------------------------
merged: james.henstridge at canonical.com-20060601075724-40b5698d12b775f2
parent: james.henstridge at canonical.com-20060525040852-51f8dfa66baa4e61
parent: pqm at pqm.ubuntu.com-20060531063654-ad54f9b8f90f2dda
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.diff-output
timestamp: Thu 2006-06-01 15:57:24 +0800
message:
merge from bzr.dev, fix conflicts
------------------------------------------------------------
merged: james.henstridge at canonical.com-20060525040852-51f8dfa66baa4e61
parent: james.henstridge at canonical.com-20060523140822-b545377b143d8220
parent: pqm at pqm.ubuntu.com-20060525000013-db043ecdc78b88f4
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.diff-output
timestamp: Thu 2006-05-25 12:08:52 +0800
message:
merge from bzr.dev, fixing conflicts
------------------------------------------------------------
merged: james.henstridge at canonical.com-20060523140822-b545377b143d8220
parent: james.henstridge at canonical.com-20060517041531-364f9e2e0f56c0d4
parent: pqm at pqm.ubuntu.com-20060523110622-5ad5c2bf9dee4fc5
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.diff-output
timestamp: Tue 2006-05-23 22:08:22 +0800
message:
merge from bzr.dev
------------------------------------------------------------
merged: james.henstridge at canonical.com-20060517041531-364f9e2e0f56c0d4
parent: james.henstridge at canonical.com-20060515033027-ea8dc6b9ca6b1773
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.diff-output
timestamp: Wed 2006-05-17 12:15:31 +0800
message:
Add some more tests that make sure the diff output contains the appropriate
dates.
------------------------------------------------------------
merged: james.henstridge at canonical.com-20060515033027-ea8dc6b9ca6b1773
parent: james.henstridge at canonical.com-20060515015255-daba5f27621b2105
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.diff-output
timestamp: Mon 2006-05-15 11:30:27 +0800
message:
Fix RevisionTree.get_file_mtime() to return the date of the revision that
last modified the file in question, using method suggested by Robert.
------------------------------------------------------------
merged: james.henstridge at canonical.com-20060515015255-daba5f27621b2105
parent: james.henstridge at canonical.com-20060513070036-6e4ff775c8955252
parent: pqm at pqm.ubuntu.com-20060512234849-259ff209fff58489
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.diff-output
timestamp: Mon 2006-05-15 09:52:55 +0800
message:
merge from bzr.dev
------------------------------------------------------------
merged: james.henstridge at canonical.com-20060513070036-6e4ff775c8955252
parent: james.henstridge at canonical.com-20060512144253-432dacad7d891d7f
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.diff-output
timestamp: Sat 2006-05-13 15:00:36 +0800
message:
fix up existing tests
------------------------------------------------------------
merged: james.henstridge at canonical.com-20060512144253-432dacad7d891d7f
parent: james.henstridge at canonical.com-20060512143717-8b5596b2e5dd04c4
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.diff-output
timestamp: Fri 2006-05-12 22:42:53 +0800
message:
Simplify logic a little
------------------------------------------------------------
merged: james.henstridge at canonical.com-20060512143717-8b5596b2e5dd04c4
parent: pqm at pqm.ubuntu.com-20060511175037-f66b84c6a9fc4c12
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.diff-output
timestamp: Fri 2006-05-12 22:37:17 +0800
message:
add dates to diff output and get rid of /dev/null
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060604153943-999dfdbb6b85719d
parent: pqm at pqm.ubuntu.com-20060604105531-0071ce43b2156b7a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Sun 2006-06-04 16:39:43 +0100
message:
Notes on naming of factories
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060606102520-64c05752f159a669
parent: pqm at pqm.ubuntu.com-20060606101226-e51bd1a4f4eb493a
parent: john at arbash-meinel.com-20060606101921-7d49169756dad2e1
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-06-06 11:25:20 +0100
message:
[patch] Matthieu Moy, make 'bzr log --line' only use the first line as a summary.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060606101921-7d49169756dad2e1
parent: john at arbash-meinel.com-20060606101703-37af8171564fb732
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2006-06-06 05:19:21 -0500
message:
[patch] Matthieu Moy, make 'bzr log --line' only use the first line as a summary.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060606101703-37af8171564fb732
parent: john at arbash-meinel.com-20060603212722-dfeaf59e1605346a
parent: pqm at pqm.ubuntu.com-20060606101226-e51bd1a4f4eb493a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2006-06-06 05:17:03 -0500
message:
[merge] bzr.dev 1741
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060606101226-e51bd1a4f4eb493a
parent: pqm at pqm.ubuntu.com-20060604105531-0071ce43b2156b7a
parent: john at arbash-meinel.com-20060603212722-dfeaf59e1605346a
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-06-06 11:12:26 +0100
message:
(jam) Fix timing tests to allow larger range of time.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060603212722-dfeaf59e1605346a
parent: john at arbash-meinel.com-20060603172956-e2b8a69a7bdc6c61
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Sat 2006-06-03 22:27:22 +0100
message:
Allow timing tests that take longer than 9ms
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060604105531-0071ce43b2156b7a
parent: pqm at pqm.ubuntu.com-20060603212040-9ec7af97aa11d4d7
parent: mbp at sourcefrog.net-20060601093915-753e3641a5902150
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2006-06-04 11:55:31 +0100
message:
(mbp) several small fixes
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060601093915-753e3641a5902150
parent: mbp at sourcefrog.net-20060601093645-6134d3a4f30a4161
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-06-01 10:39:15 +0100
message:
Change author to Canonical in setup.py
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060601093645-6134d3a4f30a4161
parent: mbp at sourcefrog.net-20060601093609-fa55793e1d8d8edc
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-06-01 10:36:45 +0100
message:
Fix up version in setup.py (matthieu)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060601093609-fa55793e1d8d8edc
parent: mbp at sourcefrog.net-20060524000633-02937e5715bac1c7
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-06-01 10:36:09 +0100
message:
Fix up LockableFiles._lock_count initializer
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060524000633-02937e5715bac1c7
parent: pqm at pqm.ubuntu.com-20060523145752-f8d1c6549d83061f
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Wed 2006-05-24 10:06:33 +1000
message:
Remove duplicated RevisionSpec_revs (guillaume)
More information about the bazaar-commits
mailing list