Rev 1461: Merge from mainline. in /home/robertc/source/baz/test-pb/
Robert Collins
robertc at robertcollins.net
Fri Apr 28 12:01:57 BST 2006
------------------------------------------------------------
revno: 1461
revision-id: robertc at robertcollins.net-20060428110138-0e69ecb765434f9d
parent: robertc at robertcollins.net-20060215224845-d73789640734602b
parent: pqm at pqm.ubuntu.com-20060427011433-95634ee1da8a2049
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-pb
timestamp: Fri 2006-04-28 21:01:38 +1000
message:
Merge from mainline.
removed:
bzrlib/_changeset.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/_merge_core.py merge_core.py-20050513021216-eda88728698d4401
bzrlib/tests/test_reweave.py testreweave.py-20051025042437-a2a02abae3551489
doc/Makefile Makefile-20050309064830-17b60435388a9520
doc/adoption.txt adoption.txt-20050309044946-816486d97a97c5c5
doc/bitkeeper.txt bitkeeper.txt-20050309044946-9e207c5bfce2670f
doc/changelogs.txt changelogs.txt-20050309044946-cdc40a9f9ddece03
doc/cherry-picking.txt cherry-picking.txt-20050309044946-d14f736fdb588e8f
doc/cmdref.txt cmdref.txt-20050309044946-d9a444af4c8e2d8b
doc/common-format.txt common-format.txt-20050309044946-48fc9f627ac98c0a
doc/compared-aegis.txt compared-aegis.txt-20050309044946-2c8b94a645654397
doc/compared-codeville.txt compared-codeville.txt-20050309044946-1cb208cab910fa50
doc/compared-cvsnt.txt compared-cvsnt.txt-20050309044946-5396218e1b8351fb
doc/compared-opencm.txt compared-opencm.txt-20050309044946-e7ddc908a19c87f5
doc/compared-prcs.txt compared-prcs.txt-20050309044946-f7c399f458e1fb59
doc/compared-teamware.txt compared-teamware.txt-20050309044946-8d9e164d94ba5a7c
doc/compression.txt compression.txt-20050309044946-a73f1e60c40ee57d
doc/config-specs.txt config-specs.txt-20050309044946-d9820c58b7f23437
doc/conflicts.txt conflicts.txt-20050309044946-b9f2aded67790400
doc/costs.txt costs.txt-20050309044946-57b65806cab34815
doc/darcs.txt darcs.txt-20050309044946-5dbd16bd2da081a4
doc/deadly-sins.txt deadly-sins.txt-20050309044946-b0453a1c48093054
doc/default.css default.css-20050309064830-2b764767f5f259c8
doc/design.txt design.txt-20050309044946-54973dca2e7aa16b
doc/extra-commands.txt extra-commands.txt-20050309044946-74af949c5805df22
doc/formats.txt formats.txt-20050309044946-7ea328cdb5cae6c5
doc/hashes.txt hashes.txt-20050309044946-7a7382d0d715151f
doc/ignore.txt ignore.txt-20050328001329-d89006518f61dd00
doc/index.txt index.txt-20050309044946-be91bf1c15711e5f
doc/interrupted.txt interrupted.txt-20050309044946-b6074892ab231e63
doc/intro.txt intro.txt-20050309044946-5bb22ffbfa8bfc14
doc/inventory.txt inventory.txt-20050309044946-07534ab6d8b3c324
doc/join-branches.txt join-branches.txt-20050309044946-f635037a889c0388
doc/kill-version.txt kill-version.txt-20050309044946-1b9d175ca38c872c
doc/layers.txt layers.txt-20050309044946-a48f19d7e271ec87
doc/library-interface.txt library-interface.txt-20050309044946-97a60acc594383cc
doc/merge.txt merge.txt-20050309044946-5d1ff42572fb3086
doc/mirroring.txt mirroring.txt-20050309044946-eb411f73887829b1
doc/monotone.txt monotone.txt-20050309044946-dd2abf24d99d201f
doc/news.txt news.txt-20050309044946-02b97194f31e86e0
doc/optional-edit.txt optional-edit.txt-20050309044946-eddc8e1d07ae10a8
doc/partial-commit.txt partial-commit.txt-20050309044946-76fa39222d4fcc58
doc/pool.txt pool.txt-20050309044946-4a2400814cb5087a
doc/purpose.txt purpose.txt-20050309044946-a4132525edac8d4c
doc/python.txt python.txt-20050309044946-9eeeab2c3546abe6
doc/quilt.txt quilt.txt-20050309044946-00df099b997fed5e
doc/quotes.txt quotes.txt-20050405082015-452551230e0449de
doc/random.txt random.txt-20050309044946-269c29512b381f5b
doc/requirements.txt requirements.txt-20050309044946-f01e5318ade63900
doc/revfile-annotation.txt revfile-annotation.txt-20050506031945-df4979abfd97e9e5
doc/revfile.txt revfile.txt-20050502050837-bc61156895d29c06
doc/revision-syntax.txt revision-syntax.txt-20050309044946-86b3a8e902a15fa4
doc/rollup.txt rollup.txt-20050309044946-e551f4f85db5a5a0
doc/scalability.txt scalability.txt-20050309044946-646ac26c7fd65298
doc/security.txt security.txt-20050309044946-41f7c6000b1124d0
doc/shared-branches.txt shared-branches.txt-20050309044946-20521acf9bda9528
doc/short-demo.txt short-demo.txt-20050309044946-2145761a6909b03e
doc/split-join-files.txt splitjoinfiles.txt-20050729195020-922f30aa94b48fb2
doc/supportability.txt supportability.txt-20050309044946-92aeba826c90201b
doc/svk.txt svk.txt-20050309044946-c62acd7cee590d22
doc/switch-in-branch.txt switch-in-branch.txt-20050503074831-5840fa742765c32c
doc/tagging.txt tagging.txt-20050309044946-66adf967ad987472
doc/taxonomy.txt taxonomy.txt-20050309044946-922fe1158868767f
doc/thanks.txt thanks.txt-20050309044946-58141ea3091846d8
doc/todo-from-arch.txt todo-from-arch.txt-20050309044946-4cb8ccdf8b3fcd07
doc/unchanged.txt unchanged.txt-20050309044946-fe7d1ec585585702
doc/unrelated-merge.txt unrelated-merge.txt-20050309044946-ec165531264f1c99
doc/usability.txt usability.txt-20050309044946-57e59739a429628b
doc/use-cases.txt use-cases.txt-20050309044946-19871d18448c91fc
doc/web-interface.txt web-interface.txt-20050309044946-65ca85c7f551bf88
doc/workflow.txt workflow.txt-20050309044946-d214d0e0429e719e
doc/yaml.txt yaml.txt-20050309044946-8d597bdf670d9095
notes/inventory-v2-sample.xml inventoryv2sample.xml-20050819213418-0c7e0d05c8cc22c9
notes/inventory-v2.rnc inventoryv2.rnc-20050819213418-0df79b018e8a74b0
notes/new-inventory-sample.xml new-inventory-sample.xml-20050330222648-c3f84521f797017e
notes/performance.txt performance.txt-20050309064844-d9647fd301942365
notes/revfile.txt revfile.txt-20050409124932-50aa1e07060dce594946a6da
notes/schemas.xml schemas.xml-20050819213418-a9335f384d9b6367
patches/ patches-20050517065551-d76e971b4c04e6e3
added:
bzrlib/inter.py inter.py-20060302012326-a57300cb382c618f
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lockdir.py lockdir.py-20060220222025-98258adf27fbdda3
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/sign_my_commits.py sign_my_commits.py-20060215152201-5a6363365180e671
bzrlib/store/revision/ revision-20060303014707-dc3bdc497f81c395
bzrlib/store/revision/__init__.py __init__.py-20060303014707-305238f06ae20dae
bzrlib/store/revision/knit.py knit.py-20060303020652-de5fa299e941a3c7
bzrlib/store/revision/text.py text.py-20060303020652-e49155f0da4d14ab
bzrlib/store/versioned/ versioned-20060301031435-98ec210ea3dfd86d
bzrlib/tests/blackbox/test_aliases.py test_aliases.py-20060210230318-f0c08c9294dbfae1
bzrlib/tests/blackbox/test_bound_branches.py test_bound_branches.py-20051109215527-2373188ad566c205
bzrlib/tests/blackbox/test_break_lock.py test_break_lock.py-20060303014503-a90e07d38d042d1d
bzrlib/tests/blackbox/test_conflicts.py test_conflicts.py-20060228151432-9723ebb925b999cf
bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/blackbox/test_logformats.py test_logformats.py-20060216104208-ba5a16c83480b7e4
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_re_sign.py test_re_sign.py-20060214165921-4d04eba231454693
bzrlib/tests/blackbox/test_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
bzrlib/tests/blackbox/test_shared_repository.py test_shared_repository.py-20060317053531-ed30c0d79325e483
bzrlib/tests/blackbox/test_sign_my_commits.py test_sign_my_commits.py-20060215152957-270238a1ffacc841
bzrlib/tests/branch_implementations/test_bound_sftp.py test_bound_sftp.py-20051231055311-2f96048c4f0940ef
bzrlib/tests/branch_implementations/test_pull.py test_pull.py-20060410103942-83c35b26657414fc
bzrlib/tests/branch_implementations/test_update.py test_update.py-20060305010612-e68efbcbb1baa69f
bzrlib/tests/interrepository_implementations/ interrepository_implementations-20060220054716-8b62476625d70af3
bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/interversionedfile_implementations/ interversionedfile_implementations-20060301230427-f1f3ca8ddd5ff482
bzrlib/tests/interversionedfile_implementations/__init__.py __init__.py-20060302012326-981af525594d02ed
bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
bzrlib/tests/repository_implementations/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
bzrlib/tests/revisionstore_implementations/ revisionstore_implementations-20060303020702-1d2e36b63cef2706
bzrlib/tests/revisionstore_implementations/__init__.py __init__.py-20060303020702-976c4186a0f99edb
bzrlib/tests/revisionstore_implementations/test_all.py test_all.py-20060303020702-9b2d4c1d75407f31
bzrlib/tests/test_escaped_store.py test_escaped_store.py-20060216023929-6bcb9a067344959f
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_lockdir.py test_lockdir.py-20060220222025-33d4221569a3d600
bzrlib/tests/test_patch.py test_patch.py-20060416172603-65c8e3b6c4783426
bzrlib/tests/test_progress.py test_progress.py-20060308160359-978c397bc79b7fda
bzrlib/tests/test_reconcile.py test_reconcile.py-20060225054842-50aa618584a86f26
bzrlib/tests/test_textfile.py test_textfile.py-20060415001558-256482b2206362aa
bzrlib/tests/test_textmerge.py test_textmerge.py-20060408165803-fab93ab605a78e56
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_tuned_gzip.py test_tuned_gzip.py-20060418042056-c576dfc708984968
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/workingtree_implementations/test_is_control_filename.py test_is_control_filename.py-20060216024958-f5afdebb2fa36418
bzrlib/tests/workingtree_implementations/test_pull.py test_pull.py-20060222044334-43594dd8e143b708
bzrlib/textfile.py textfile.py-20060415001558-9cc2f3652ca99f97
bzrlib/textmerge.py textmerge.py-20060408064938-a5d5c009e64a3a25
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/decorator.py decorator.py-20060402223305-e913a0f25319ab42
bzrlib/transport/fakenfs.py fakenfs.py-20060402223312-0e29c7275aa384dd
bzrlib/transport/fakevfat.py fakevfat.py-20060407072414-d59939fa1d6c79d9
bzrlib/transport/http/ http-20060113083522-fa806bfc2aca663c
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/tuned_gzip.py tuned_gzip.py-20060407014720-5aadc518e928e8d2
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave_commands.py weave_commands.py-20060320231507-8e9f300bffc1aa19
tools/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
renamed:
bzrlib/store/weave.py => bzrlib/store/versioned/__init__.py weavestore.py-20050907094258-88262e0434babab9
bzrlib/tests/test_basis_inventory.py => bzrlib/tests/workingtree_implementations/test_basis_inventory.py test_basis_inventory.py-20051218151655-3650468941091309
bzrlib/tests/test_uncommit.py => bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
bzrlib/transport/http.py => bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
modified:
BRANCH.TODO BRANCH.TODO-20060103052123-79ac4969351c03a9
HACKING HACKING-20050805200004-2a5dc975d870f78c
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/add.py add.py-20050323030017-3a77d63feda58e33
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
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/conflicts.py conflicts.py-20051001061850-78ef952ba63d2b42
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/doc/api/transport.txt transport.txt-20051224020744-66b4fb564d98a5a5
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/externalcommand.py externalcommand.py-20050901092254-b4fc642a55bb815b
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/graph.py graph.py-20050905070950-b47dce53236c5e48
bzrlib/hashcache.py hashcache.py-20050706091756-fe3a8cc1143ff24f
bzrlib/help.py help.py-20050505025907-4dd7a6d63912f894
bzrlib/identitymap.py identitymap.py-20051007040721-83e837d831a6636a
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/lock.py lock.py-20050527050856-ec090bb51bc03349
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge3.py merge3.py-20050704130834-bf0597094828a2e1
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/patch.py patch.py-20050513021216-ad183543f56ee2e5
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/rio.py rio.py-20051128032247-770b120b34dfff60
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/store/__init__.py store.py-20050309040759-164dc5173d6406c2
bzrlib/store/text.py text.py-20050928201105-c26468dcb5d9b18b
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/testament.py testament.py-20051011100429-6d319a18183b13c8
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
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_revert.py test_revert.py-20060124160917-485ce9de629c182c
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/blackbox/test_update.py test_update.py-20060212125639-c4dad1a5c56d5919
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
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/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/stub_sftp.py stub_sftp.py-20051027032739-0e7ef4f7bab0e174
bzrlib/tests/test_bad_files.py test_bad_files.py-20050918155938-c76a2295c8ab9503
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_commit_merge.py test_commit_merge.py-20050920084723-819eeeff77907bc5
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_doc_generate.py test_doc_generate.py-20051224124638-88da58fc872b93ba
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_graph.py testgraph.py-20050905070950-42e6c958106610fd
bzrlib/tests/test_hashcache.py testhashcache.py-20050706091800-0288ab2659338981
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_inv.py testinv.py-20050722220913-1dc326138d1a5892
bzrlib/tests/test_lockable_files.py test_lockable_files.py-20051225183927-365c7fd99591caf1
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge3.py merge3.py-20050704130834-556689114c89e6f2
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_missing.py test_missing.py-20051212000028-694fa4f658a81f48
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_rio.py test_rio.py-20051128032247-dcd1082dfc86d3d3
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_setup.py test_setup.py-20051208073730-4a59a6368c4efa04
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
bzrlib/tests/test_source.py test_source.py-20051207061333-a58dea6abecc030d
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
bzrlib/tests/test_symbol_versioning.py test_symbol_versioning.py-20060105104851-51d7722c2018d42b
bzrlib/tests/test_testament.py testtestament.py-20051011100429-5df1657310caa929
bzrlib/tests/test_transactions.py testtransaction.py-20051006222840-1f55858f890d4b0a
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_tsort.py testtsort.py-20051025073946-27da871c394d5be4
bzrlib/tests/test_ui.py test_ui.py-20051130162854-458e667a7414af09
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/tests/test_xml.py test_xml.py-20050905091053-80b45588931a9b35
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transactions.py transactions.py-20051007010900-f1313d53cf58e223
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/readonly.py readonly.py-20060120032407-66d3166c39ffdc79
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/tsort.py tsort.py-20051025073946-7808f6aaf7d07208
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
bzrlib/uncommit.py uncommit.py-20050626215513-5ec509fa425b305c
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
bzrlib/util/configobj/docs/configobj.txt configobj.txt-20051018184548-4949b5f17e6a19c7
bzrlib/util/configobj/docs/validate.txt validate.txt-20051018184548-9e0e5ad913e258f5
bzrlib/util/configobj/validate.py validate.py-20051018184548-e700c5f98afa9389
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/weavefile.py weavefile.py-20050629135233-2ffe0200f103f6c2
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/xml5.py xml5.py-20050907032657-aac8f960815b66b1
contrib/pwk pwk-20050620015048-974d9719ed8a5c16
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
tutorial.txt tutorial.txt-20050804190939-9dcbba2ef053bc84
bzrlib/store/versioned/__init__.py weavestore.py-20050907094258-88262e0434babab9
bzrlib/tests/workingtree_implementations/test_basis_inventory.py test_basis_inventory.py-20051218151655-3650468941091309
bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060427011433-95634ee1da8a2049
parent: pqm at pqm.ubuntu.com-20060426064544-35faa2d143c893a7
parent: robertc at robertcollins.net-20060427005942-9db2e52fe1170ebc
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-04-27 02:14:33 +0100
message:
Merge in faster joins from weave to knit.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060427005942-9db2e52fe1170ebc
parent: pqm at pqm.ubuntu.com-20060426064544-35faa2d143c893a7
parent: robertc at robertcollins.net-20060426082109-4dcd5b716ac322a1
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-04-27 10:59:42 +1000
message:
Merge in faster joins from weave to knit.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060426082109-4dcd5b716ac322a1
parent: robertc at robertcollins.net-20060426052638-e95d815562fc6caa
committer: Robert Collins <robertc at robertcollins.net>
branch nick: faster-joins
timestamp: Wed 2006-04-26 18:21:09 +1000
message:
Add a special cased weaves to knit converter.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060426052638-e95d815562fc6caa
parent: robertc at robertcollins.net-20060424091132-5252fbb8a99e4c91
committer: Robert Collins <robertc at robertcollins.net>
branch nick: faster-joins
timestamp: Wed 2006-04-26 15:26:38 +1000
message:
Factor out version_ids-to-join selection in InterVersionedfile.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060424091132-5252fbb8a99e4c91
parent: pqm at pqm.ubuntu.com-20060424012027-0017c749480ad462
committer: Robert Collins <robertc at robertcollins.net>
branch nick: faster-joins
timestamp: Mon 2006-04-24 19:11:32 +1000
message:
Fix versioned file joins with empty targets.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060426064544-35faa2d143c893a7
parent: pqm at pqm.ubuntu.com-20060424103128-a637f56a7c529bad
parent: mbp at sourcefrog.net-20060426063605-c66a7bf3f99f001c
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-04-26 07:45:44 +0100
message:
(mbp) #40508 ignore interrupts in ssh child
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060426063605-c66a7bf3f99f001c
parent: mbp at sourcefrog.net-20060426045253-0728376fb99879af
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.40508
timestamp: Wed 2006-04-26 16:36:05 +1000
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060426045253-0728376fb99879af
parent: pqm at pqm.ubuntu.com-20060424012027-0017c749480ad462
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.40508
timestamp: Wed 2006-04-26 14:52:53 +1000
message:
Run ssh subprocess with SIGINT ignored, but in the same process group. (Malone #40508, #5987)
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060424103128-a637f56a7c529bad
parent: pqm at pqm.ubuntu.com-20060424012027-0017c749480ad462
parent: mbp at sourcefrog.net-20060424092150-e7b43850d6418c79
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-04-24 11:31:28 +0100
message:
(mbp) tutorial improvements
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060424092150-e7b43850d6418c79
parent: mbp at sourcefrog.net-20060424092017-fe9976f7e3dba30e
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Mon 2006-04-24 19:21:50 +1000
message:
Remove references to old versions from the tutorial
Not so important now it's carried in the source tree.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060424092017-fe9976f7e3dba30e
parent: pqm at pqm.ubuntu.com-20060424012027-0017c749480ad462
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Mon 2006-04-24 19:20:17 +1000
message:
[patch] Help on setting editor (Malone #41060)
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060424012027-0017c749480ad462
parent: pqm at pqm.ubuntu.com-20060422072809-b06e742274a4e9f4
parent: robertc at robertcollins.net-20060424010829-08cd845c13243a7e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-04-24 02:20:27 +0100
message:
Make TextUIFactory allow selection of the progress bar type.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060424010829-08cd845c13243a7e
parent: robertc at robertcollins.net-20060421014102-045eda1c1824bd4d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2006-04-24 11:08:29 +1000
message:
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
can be None or a factory that will create a progress bar. This is
useful for testing or for overriding the bzrlib.progress heuristic.
(Robert Collins)
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060422072809-b06e742274a4e9f4
parent: pqm at pqm.ubuntu.com-20060421060606-908ed0c9062b6573
parent: aaron.bentley at utoronto.ca-20060421235055-cfddf190f5135d73
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2006-04-22 08:28:09 +0100
message:
Misc fixes for win32
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060421235055-cfddf190f5135d73
parent: abentley at lappy-20060421055244-2ba416dcc7539d96
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: win32fixes
timestamp: Fri 2006-04-21 19:50:55 -0400
message:
Better illegal pathname check for Windows
------------------------------------------------------------
merged: abentley at lappy-20060421055244-2ba416dcc7539d96
parent: abentley at lappy-20060421034332-932cf6ebb261da25
committer: abentley <abentley at lappy>
branch nick: win32fixes
timestamp: Fri 2006-04-21 01:52:44 -0400
message:
Fix fileid involed tests on win32 (by skipping them for unescaped weave formats)
------------------------------------------------------------
merged: abentley at lappy-20060421034332-932cf6ebb261da25
parent: abentley at lappy-20060421033429-79932e50ab316980
committer: abentley <abentley at lappy>
branch nick: win32fixes
timestamp: Thu 2006-04-20 23:43:32 -0400
message:
Fixed executability test
------------------------------------------------------------
merged: abentley at lappy-20060421033429-79932e50ab316980
parent: abentley at lappy-20060420234753-6a6874b76f09f86d
committer: abentley <abentley at lappy>
branch nick: win32fixes
timestamp: Thu 2006-04-20 23:34:29 -0400
message:
Strip trailing slashes in a platform-sensible way
------------------------------------------------------------
merged: abentley at lappy-20060420234753-6a6874b76f09f86d
parent: abentley at lappy-20060330051123-891ff5afa0395578
parent: pqm at pqm.ubuntu.com-20060420082224-da4345a35c42e545
committer: abentley <abentley at lappy>
branch nick: win32fixes
timestamp: Thu 2006-04-20 19:47:53 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060421060606-908ed0c9062b6573
parent: pqm at pqm.ubuntu.com-20060420082224-da4345a35c42e545
parent: robertc at robertcollins.net-20060421014102-045eda1c1824bd4d
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-04-21 07:06:06 +0100
message:
Make WorkingTree.branch a read only property. (Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20060421014102-045eda1c1824bd4d
parent: pqm at pqm.ubuntu.com-20060420082224-da4345a35c42e545
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2006-04-21 11:41:02 +1000
message:
Make WorkingTree.branch a read only property. (Robert Collins)
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060420082224-da4345a35c42e545
parent: pqm at pqm.ubuntu.com-20060420080929-dff63a32df0b3e0b
parent: robertc at robertcollins.net-20060420081542-f9730f8018b34f3d
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-04-20 09:22:24 +0100
message:
Fix occasional test failuresin bzrdir_implementations.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060420081542-f9730f8018b34f3d
parent: robertc at robertcollins.net-20060420075750-a4560ba1687f4b19
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-04-20 18:15:42 +1000
message:
Fix occasional test failuresin bzrdir_implementations.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060420080929-dff63a32df0b3e0b
parent: pqm at pqm.ubuntu.com-20060420080324-8acbffaeefd8f243
parent: robertc at robertcollins.net-20060420075750-a4560ba1687f4b19
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-04-20 09:09:29 +0100
message:
Mention Johan Rydberg!
------------------------------------------------------------
merged: robertc at robertcollins.net-20060420075750-a4560ba1687f4b19
parent: robertc at robertcollins.net-20060420063758-3cacd9a9925a1a20
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-04-20 17:57:50 +1000
message:
Mention Johan Rydberg!
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060420080324-8acbffaeefd8f243
parent: pqm at pqm.ubuntu.com-20060420074648-a9cefa72a3a9a5e8
parent: mbp at sourcefrog.net-20060420075415-44c236b796c1931b
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-04-20 09:03:24 +0100
message:
(mbp) better error messages from bzr init
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060420075415-44c236b796c1931b
parent: mbp at sourcefrog.net-20060420025259-faf3a2c086015d36
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-04-20 17:54:15 +1000
message:
Better error message when initting existing tree
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060420074648-a9cefa72a3a9a5e8
parent: pqm at pqm.ubuntu.com-20060420052645-766474fe9eefd59a
parent: robertc at robertcollins.net-20060420063758-3cacd9a9925a1a20
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-04-20 08:46:48 +0100
message:
Change SFTP subprocess handling so that Ctrl-C does not cause stale locks in SFTP accessed repositories.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060420063758-3cacd9a9925a1a20
parent: robertc at robertcollins.net-20060420061105-4fd8c6ef3317fdb9
parent: pqm at pqm.ubuntu.com-20060420052645-766474fe9eefd59a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-04-20 16:37:58 +1000
message:
Merge from bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060420061105-4fd8c6ef3317fdb9
parent: robertc at robertcollins.net-20060420054839-917633551ced7ede
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-04-20 16:11:05 +1000
message:
Update NEWS with SFTP-Ctrl-C fix.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060420054839-917633551ced7ede
parent: robertc at robertcollins.net-20060420045219-440c2336c88c5d0e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-04-20 15:48:39 +1000
message:
Change SFTP subprocess handling so that Ctrl-C does not cause stale locks in SFTP accessed repositories.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060420052645-766474fe9eefd59a
parent: pqm at pqm.ubuntu.com-20060420041224-c125c2ba385d680f
parent: robertc at robertcollins.net-20060420045219-440c2336c88c5d0e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-04-20 06:26:45 +0100
message:
Really fix short-read support in tuned_gzip. The python zlib module behaved differently than thought.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060420045219-440c2336c88c5d0e
parent: robertc at robertcollins.net-20060420022044-da53862a0b55aa7b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-04-20 14:52:19 +1000
message:
Really fix short-read support in tuned_gzip. The python zlib module behaved differently than thought.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060420041224-c125c2ba385d680f
parent: pqm at pqm.ubuntu.com-20060420025129-8e219a634d2d4dbc
parent: mbp at sourcefrog.net-20060420025259-faf3a2c086015d36
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-04-20 05:12:24 +0100
message:
(mbp) html manual generation
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060420025259-faf3a2c086015d36
parent: mbp at sourcefrog.net-20060420025131-c042b29593764349
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-04-20 12:52:59 +1000
message:
Fix up urls and warnings in auto-generated documentation
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060420025131-c042b29593764349
parent: mbp at sourcefrog.net-20060420024217-e7530e10e384d5dd
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-04-20 12:51:31 +1000
message:
[patch] html manual generator (Alexander Belchenko)
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060420025129-8e219a634d2d4dbc
parent: pqm at pqm.ubuntu.com-20060420022821-4337b8fa4942d8fe
parent: mbp at sourcefrog.net-20060420024217-e7530e10e384d5dd
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-04-20 03:51:29 +0100
message:
(mbp) #36963, #3619, #39657, other cleanups
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060420024217-e7530e10e384d5dd
parent: mbp at sourcefrog.net-20060420023721-04d8a3b015987240
parent: pqm at pqm.ubuntu.com-20060420022821-4337b8fa4942d8fe
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-04-20 12:42:17 +1000
message:
[merge] bzr.dev
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060420023721-04d8a3b015987240
parent: mbp at sourcefrog.net-20060420023332-6da5e1c018e334b7
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-04-20 12:37:21 +1000
message:
Add .hg to default ignore list
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060420023332-6da5e1c018e334b7
parent: mbp at sourcefrog.net-20060420022422-aaa19eff8795bfd6
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-04-20 12:33:32 +1000
message:
(PathsDoNotExist) review style comments
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060420022422-aaa19eff8795bfd6
parent: mbp at sourcefrog.net-20060420012904-b3166df65e728801
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-04-20 12:24:22 +1000
message:
Fix up blackbox test for error on status of nonexistent files
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060420012904-b3166df65e728801
parent: mbp at sourcefrog.net-20060419072552-b7ec734f02ecd596
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-04-20 11:29:04 +1000
message:
Translate unknown sftp errors to PathError, no NoSuchFile
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060419072552-b7ec734f02ecd596
parent: mbp at sourcefrog.net-20060419072040-98ded2cd48084027
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Wed 2006-04-19 17:25:52 +1000
message:
Better help for init-repo (Erik)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060419072040-98ded2cd48084027
parent: mbp at sourcefrog.net-20060419071605-51207e739c997442
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Wed 2006-04-19 17:20:40 +1000
message:
Less alarming warning in bzr help output - just 'remember to keep backups'
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060419071605-51207e739c997442
parent: mbp at sourcefrog.net-20060419062053-d09353cfdede1116
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Wed 2006-04-19 17:16:05 +1000
message:
Give a clear error for bzr status of an unversioned, nonexistent file. (Malone #3619)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060419062053-d09353cfdede1116
parent: mbp at sourcefrog.net-20060419061931-8bf1bc8344c02a09
parent: mbp at sourcefrog.net-20060419051159-856e022c4b11fcd4
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Wed 2006-04-19 16:20:53 +1000
message:
[merge] (Malone #36963) verbose commit output
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060419051159-856e022c4b11fcd4
parent: pqm at pqm.ubuntu.com-20060418055925-0f7129a54583f4d8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.36963
timestamp: Wed 2006-04-19 15:11:59 +1000
message:
verbose commit now specifically identifies modified/renamed/reparented files
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060419061931-8bf1bc8344c02a09
parent: mbp at sourcefrog.net-20060419034716-2beab68d4c46415c
parent: mbp at sourcefrog.net-20060419052851-87d41b5b92793719
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Wed 2006-04-19 16:19:31 +1000
message:
[merge] reflow tutorial.txt (Malone #39657)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060419052851-87d41b5b92793719
parent: pqm at pqm.ubuntu.com-20060418055925-0f7129a54583f4d8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.39657
timestamp: Wed 2006-04-19 15:28:51 +1000
message:
Reflow tutorial.txt to fit on 80-col screen (Malone #39657)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060419034716-2beab68d4c46415c
parent: mbp at sourcefrog.net-20060418064941-d6a8c9a334e9e7e1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Wed 2006-04-19 13:47:16 +1000
message:
Fix formatting of NoWorkingTree and NotLocalUrl exceptions
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060420022821-4337b8fa4942d8fe
parent: pqm at pqm.ubuntu.com-20060419084239-730ca2dccc3bea14
parent: robertc at robertcollins.net-20060420022044-da53862a0b55aa7b
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-04-20 03:28:21 +0100
message:
Make knits the default format.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060420022044-da53862a0b55aa7b
parent: robertc at robertcollins.net-20060420020422-350591ba235ee5ac
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-04-20 12:20:44 +1000
message:
Oops, formating error.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060420020422-350591ba235ee5ac
parent: robertc at robertcollins.net-20060420012745-5c1d423d144b7d08
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-04-20 12:04:22 +1000
message:
Mark knits as no longer experimental.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060420012745-5c1d423d144b7d08
parent: robertc at robertcollins.net-20060420012106-f816988c93733a1e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-04-20 11:27:45 +1000
message:
Remove unneeded optimisation in fetch_texts - the interversioned file optimisers now do this.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060420012106-f816988c93733a1e
parent: robertc at robertcollins.net-20060419233208-2ed6906796994316
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-04-20 11:21:06 +1000
message:
Update repository format check to read knit correct header
------------------------------------------------------------
merged: robertc at robertcollins.net-20060419233208-2ed6906796994316
parent: robertc at robertcollins.net-20060419052238-b6a0d9d979cb4208
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-04-20 09:32:08 +1000
message:
Make knit the default format.
Adjust affect tests to either have knit specific values or to be more generic,
as appropriate.
Disable all SFTP prefetching for known paramikos - direct readv support is now
a TODO.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060419084239-730ca2dccc3bea14
parent: pqm at pqm.ubuntu.com-20060419083650-f26d296f90d75d88
parent: aaron.bentley at utoronto.ca-20060419021605-7f28e84382ceef4d
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-04-19 09:42:39 +0100
message:
diff and merge handle binaries safely
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060419021605-7f28e84382ceef4d
parent: aaron.bentley at utoronto.ca-20060419012336-a74d3d2ea435d15f
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.binaries
timestamp: Tue 2006-04-18 22:16:05 -0400
message:
Apply merge review suggestions
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060419012336-a74d3d2ea435d15f
parent: aaron.bentley at utoronto.ca-20060416182903-32f8909367097b06
parent: pqm at pqm.ubuntu.com-20060418055925-0f7129a54583f4d8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.binaries
timestamp: Tue 2006-04-18 21:23:36 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060416182903-32f8909367097b06
parent: aaron.bentley at utoronto.ca-20060416174914-99d5dec4eafbb923
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.binaries
timestamp: Sun 2006-04-16 14:29:03 -0400
message:
Added NEWS entry
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060416174914-99d5dec4eafbb923
parent: aaron.bentley at utoronto.ca-20060416173705-32db73e58b94c4ab
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.binaries
timestamp: Sun 2006-04-16 13:49:14 -0400
message:
Whitespace fixes
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060416173705-32db73e58b94c4ab
parent: aaron.bentley at utoronto.ca-20060416172633-4841d41fc9724d63
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.binaries
timestamp: Sun 2006-04-16 13:37:05 -0400
message:
Add copyright statements
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060416172633-4841d41fc9724d63
parent: aaron.bentley at utoronto.ca-20060416163755-83754fc853ac57cb
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.binaries
timestamp: Sun 2006-04-16 13:26:33 -0400
message:
Added more tests
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060416163755-83754fc853ac57cb
parent: aaron.bentley at utoronto.ca-20060416162628-bbf5035308f34811
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.binaries
timestamp: Sun 2006-04-16 12:37:55 -0400
message:
Fixed binary handling in weave merge
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060416162628-bbf5035308f34811
parent: aaron.bentley at utoronto.ca-20060416162046-a50698189b032755
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.binaries
timestamp: Sun 2006-04-16 12:26:28 -0400
message:
Fixed binary handling in Merge3
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060416162046-a50698189b032755
parent: aaron.bentley at utoronto.ca-20060416155229-dd8b35cdc5d134ce
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.binaries
timestamp: Sun 2006-04-16 12:20:46 -0400
message:
Handle binary files for diff3 merges
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060416155229-dd8b35cdc5d134ce
parent: aaron.bentley at utoronto.ca-20060415001738-09feeab6b5ee61d1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.binaries
timestamp: Sun 2006-04-16 11:52:29 -0400
message:
Implemented binary file handling for diff
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060415001738-09feeab6b5ee61d1
parent: aaron.bentley at utoronto.ca-20060412045516-a3534bcfb08241f6
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.binaries
timestamp: Fri 2006-04-14 20:17:38 -0400
message:
Add text_file function
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060419083650-f26d296f90d75d88
parent: pqm at pqm.ubuntu.com-20060419083108-fab2970f4575b010
parent: aaron.bentley at utoronto.ca-20060419025517-3d096c3d15d86c5b
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-04-19 09:36:50 +0100
message:
Implement plan_merge for knits
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060419025517-3d096c3d15d86c5b
parent: aaron.bentley at utoronto.ca-20060419025056-3847eb042f075760
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.knitplanmerge
timestamp: Tue 2006-04-18 22:55:17 -0400
message:
spacing fix
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060419025056-3847eb042f075760
parent: aaron.bentley at utoronto.ca-20060419022851-f6748c7087f60284
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.knitplanmerge
timestamp: Tue 2006-04-18 22:50:56 -0400
message:
Knit plan_merge uses slices instead of xenumerate
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060419022851-f6748c7087f60284
parent: aaron.bentley at utoronto.ca-20060419020851-830a65e114637604
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.knitplanmerge
timestamp: Tue 2006-04-18 22:28:51 -0400
message:
Remove unused final-section processing
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060419020851-830a65e114637604
parent: aaron.bentley at utoronto.ca-20060419001335-0a0be1ca65406fd6
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.knitplanmerge
timestamp: Tue 2006-04-18 22:08:51 -0400
message:
Clarifications from merge review
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060419001335-0a0be1ca65406fd6
parent: aaron.bentley at utoronto.ca-20060418234234-d3d230b99ba70b9f
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.knitplanmerge
timestamp: Tue 2006-04-18 20:13:35 -0400
message:
Move xenumerate to osutils
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060418234234-d3d230b99ba70b9f
parent: abentley at panoramicfeedback.com-20060418134348-a1ff927ea2817900
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.knitplanmerge
timestamp: Tue 2006-04-18 19:42:34 -0400
message:
Ported weave merge test to versionedfile
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060418134348-a1ff927ea2817900
parent: aaron.bentley at utoronto.ca-20060418064459-eb09de30e77bb019
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.knitplanmerge
timestamp: Tue 2006-04-18 09:43:48 -0400
message:
Fix WeaveMerge when plan doesn't end with unchanged lines
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060418064459-eb09de30e77bb019
parent: aaron.bentley at utoronto.ca-20060418001954-c50f6819b61db0b3
parent: pqm at pqm.ubuntu.com-20060418055925-0f7129a54583f4d8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.knitplanmerge
timestamp: Tue 2006-04-18 02:44:59 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060418001954-c50f6819b61db0b3
parent: aaron.bentley at utoronto.ca-20060418001818-baae282494c418b7
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.knitplanmerge
timestamp: Mon 2006-04-17 20:19:54 -0400
message:
Got plan-merge passing tests
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060418001818-baae282494c418b7
parent: aaron.bentley at utoronto.ca-20060417235815-a697cfaf11a2ed1a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.knitplanmerge
timestamp: Mon 2006-04-17 20:18:18 -0400
message:
Update plan-merge legend
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060417235815-a697cfaf11a2ed1a
parent: aaron.bentley at utoronto.ca-20060417225954-79d47d850ef690b1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.knitplanmerge
timestamp: Mon 2006-04-17 19:58:15 -0400
message:
Identify unchanged lines correctly
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060417225954-79d47d850ef690b1
parent: aaron.bentley at utoronto.ca-20060417225911-2465ef6f4183b4fb
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.knitplanmerge
timestamp: Mon 2006-04-17 18:59:54 -0400
message:
Add failing test case
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060417225911-2465ef6f4183b4fb
parent: aaron.bentley at utoronto.ca-20060417121022-ed00460ca5e81ac0
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.knitplanmerge
timestamp: Mon 2006-04-17 18:59:11 -0400
message:
Added legend for plan-merge output
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060417121022-ed00460ca5e81ac0
parent: pqm at pqm.ubuntu.com-20060414013800-bd0ac9b0d1f8ba7b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.knitplanmerge
timestamp: Mon 2006-04-17 08:10:22 -0400
message:
Start work on plan_merge test
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060419083108-fab2970f4575b010
parent: pqm at pqm.ubuntu.com-20060419055038-883365ee042f9946
parent: robertc at robertcollins.net-20060419052238-b6a0d9d979cb4208
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-04-19 09:31:08 +0100
message:
Change the default branch format to be metadir. (Robert Collins, Aaron Bentley).
------------------------------------------------------------
merged: robertc at robertcollins.net-20060419052238-b6a0d9d979cb4208
parent: robertc at robertcollins.net-20060418224116-9b723440fa56e404
parent: robertc at robertcollins.net-20060327071137-89fd4a8f43f07793
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-04-19 15:22:38 +1000
message:
Merge bound branch test performance improvements.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060327071137-89fd4a8f43f07793
parent: robertc at robertcollins.net-20060325094057-7061f3085942f35f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bound-test-speed
timestamp: Mon 2006-03-27 18:11:37 +1100
message:
Review feedback on sftp.clear_connection_cache
------------------------------------------------------------
merged: robertc at robertcollins.net-20060325094057-7061f3085942f35f
parent: robertc at robertcollins.net-20060325023814-2e444ad46b0b25bf
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bound-test-speed
timestamp: Sat 2006-03-25 20:40:57 +1100
message:
Change missing to not require a write lock unless it is setting the parent.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060325023814-2e444ad46b0b25bf
parent: robertc at robertcollins.net-20060325005440-e03f471fa8a2a0aa
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bound-test-speed
timestamp: Sat 2006-03-25 13:38:14 +1100
message:
Reduce lock thrashing somewhat - drops bound branch tests lock count from 6554 to 4456 locks.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060325005440-e03f471fa8a2a0aa
parent: robertc at robertcollins.net-20060322162609-fd4ba4a57afd33ed
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bound-test-speed
timestamp: Sat 2006-03-25 11:54:40 +1100
message:
Add a clear_connection_cache to the SFTP transport and use it in fixing the bound branch test speed performance problem which was cause by the server thread timing out - it was blocked on a read and closing the client side causes the server to unblock and exit.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060418224116-9b723440fa56e404
parent: robertc at robertcollins.net-20060418050830-ec8a43605cbc2b32
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-04-19 08:41:16 +1000
message:
* 'Metadir' is now the default disk format. This improves behaviour in
SFTP using circumstances and allows binding and rebinding and easier
use of repositories. (Robert Collins, Aaron Bentley).
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060419055038-883365ee042f9946
parent: pqm at pqm.ubuntu.com-20060418055925-0f7129a54583f4d8
parent: mbp at sourcefrog.net-20060418064941-d6a8c9a334e9e7e1
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-04-19 06:50:38 +0100
message:
(mbp) two small cleanups
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060418064941-d6a8c9a334e9e7e1
parent: mbp at sourcefrog.net-20060418043844-dbaac5bdecaed3d1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Tue 2006-04-18 16:49:41 +1000
message:
(test_escaped_store) Avoid calling deprecated WeaveStore.get_lines method
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060418043844-dbaac5bdecaed3d1
parent: mbp at sourcefrog.net-20060418004802-80796653fdb4220f
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Tue 2006-04-18 14:38:44 +1000
message:
Clear out BRANCH.TODO - most of them are done now
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060418004802-80796653fdb4220f
parent: mbp at sourcefrog.net-20060414012652-79ef6d9d753bfe00
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Tue 2006-04-18 10:48:02 +1000
message:
Remove duplicate definition of option --short
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060418055925-0f7129a54583f4d8
parent: pqm at pqm.ubuntu.com-20060418052303-2170dd38c5ed278b
parent: aaron.bentley at utoronto.ca-20060418022414-28c7228e9c99bd4d
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-04-18 06:59:25 +0100
message:
implementation of --reprocess for weave merge
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060418022414-28c7228e9c99bd4d
parent: aaron.bentley at utoronto.ca-20060411052153-68f838bc991e957a
parent: pqm at pqm.ubuntu.com-20060417143529-5d0dd66032fb3b23
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2006-04-17 22:24:14 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060411052153-68f838bc991e957a
parent: aaron.bentley at utoronto.ca-20060410054228-c52ef0916514c7b8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2006-04-11 01:21:53 -0400
message:
Moved plan_merge into Weave
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060410054228-c52ef0916514c7b8
parent: aaron.bentley at utoronto.ca-20060409003406-13704529293d6476
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2006-04-10 01:42:28 -0400
message:
Tweaks from merge review
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060409003406-13704529293d6476
parent: aaron.bentley at utoronto.ca-20060408235733-555b6583f267b843
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sat 2006-04-08 20:34:06 -0400
message:
Cleanup
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060408235733-555b6583f267b843
parent: aaron.bentley at utoronto.ca-20060408231927-22523ebc54811274
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sat 2006-04-08 19:57:33 -0400
message:
Indicate conflicts from merge_lines, insead of guessing
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060408231927-22523ebc54811274
parent: aaron.bentley at utoronto.ca-20060408212236-0dde8f96083e4cc7
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sat 2006-04-08 19:19:27 -0400
message:
Switched TextMerge_lines to work on a list
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060408212236-0dde8f96083e4cc7
parent: aaron.bentley at utoronto.ca-20060408210604-f9cc3c2fcb3c8621
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sat 2006-04-08 17:22:36 -0400
message:
Renamed WeaveMerge to PlanMerge, added plan method, created planless WeaveMerge
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060408210604-f9cc3c2fcb3c8621
parent: aaron.bentley at utoronto.ca-20060408190033-945cb4450db553d1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sat 2006-04-08 17:06:04 -0400
message:
Moved merge tests into blackbox/test_merge
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060408190033-945cb4450db553d1
parent: aaron.bentley at utoronto.ca-20060408165812-069fc028a0cf75e5
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sat 2006-04-08 15:00:33 -0400
message:
Implemented reprocess for weave
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060408165812-069fc028a0cf75e5
parent: aaron.bentley at utoronto.ca-20060407233211-0bbeea55e04ad125
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sat 2006-04-08 12:58:12 -0400
message:
Implemented two-way merge, refactored weave merge
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060407233211-0bbeea55e04ad125
parent: aaron.bentley at utoronto.ca-20060407232912-0f675a6b2e549f42
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2006-04-07 19:32:11 -0400
message:
Cleanup
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060407232912-0f675a6b2e549f42
parent: aaron.bentley at utoronto.ca-20060407223947-730e8436858d086e
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2006-04-07 19:29:12 -0400
message:
Got weave merge producing structural output
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060407223947-730e8436858d086e
parent: aaron.bentley at utoronto.ca-20060405005914-590c2fd9ca967bf4
parent: aaron.bentley at utoronto.ca-20060407120040-1c73629500df0d87
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2006-04-07 18:39:47 -0400
message:
Merge from bzr.ab.integration
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060418052303-2170dd38c5ed278b
parent: pqm at pqm.ubuntu.com-20060418043515-cdbba05ac7d4b594
parent: robertc at robertcollins.net-20060418050830-ec8a43605cbc2b32
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-04-18 06:23:03 +0100
message:
Fix and test upgrades from bzrdir 6 over SFTP.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060418050830-ec8a43605cbc2b32
parent: robertc at robertcollins.net-20060418042252-d0cad40d7c5dcb6a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2006-04-18 15:08:30 +1000
message:
Fix and test upgrades from bzrdir 6 over SFTP.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060418043515-cdbba05ac7d4b594
parent: pqm at pqm.ubuntu.com-20060417143529-5d0dd66032fb3b23
parent: robertc at robertcollins.net-20060418042252-d0cad40d7c5dcb6a
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-04-18 05:35:15 +0100
message:
Fix race condition between end of stream and end of file with tuned_gzip.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060418042252-d0cad40d7c5dcb6a
parent: robertc at robertcollins.net-20060418025025-0b00ecca60b5d0db
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2006-04-18 14:22:52 +1000
message:
Fix race condition between end of stream and end of file with tuned_gzip.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060418025025-0b00ecca60b5d0db
parent: pqm at pqm.ubuntu.com-20060417143529-5d0dd66032fb3b23
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2006-04-18 12:50:25 +1000
message:
Add trivial http-using test for versioned files.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060417143529-5d0dd66032fb3b23
parent: pqm at pqm.ubuntu.com-20060417102313-037bf52ef6ada13b
parent: abentley at panoramicfeedback.com-20060417132055-3498a8631cb2fb31
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-04-17 15:35:29 +0100
message:
Removed deprecation warning when bzr invoked with no arguments
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060417132055-3498a8631cb2fb31
parent: abentley at panoramicfeedback.com-20060413182057-3ae84fef8ca8c67f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Mon 2006-04-17 09:20:55 -0400
message:
Removed deprecation warning when bzr invoked with no arguments
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060413182057-3ae84fef8ca8c67f
parent: abentley at panoramicfeedback.com-20060410134102-08b1929145cda317
parent: pqm at pqm.ubuntu.com-20060413095251-762ef0074ed6104a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Thu 2006-04-13 14:20:57 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060417102313-037bf52ef6ada13b
parent: pqm at pqm.ubuntu.com-20060414013800-bd0ac9b0d1f8ba7b
parent: robertc at robertcollins.net-20060417100827-fa4f595a7cd64dc7
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-04-17 11:23:13 +0100
message:
Bugfix: deprecated put_weave method was broken.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060417100827-fa4f595a7cd64dc7
parent: pqm at pqm.ubuntu.com-20060414013800-bd0ac9b0d1f8ba7b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2006-04-17 20:08:27 +1000
message:
Bugfix: deprecated put_weave method was broken.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060414013800-bd0ac9b0d1f8ba7b
parent: pqm at pqm.ubuntu.com-20060413231657-bce3d67d3e7a4f2b
parent: mbp at sourcefrog.net-20060414012652-79ef6d9d753bfe00
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-04-14 02:38:00 +0100
message:
(mbp) prepare for 0.8rc1
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060414012652-79ef6d9d753bfe00
parent: mbp at sourcefrog.net-20060413230317-a1543afe041b1266
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Fri 2006-04-14 11:26:52 +1000
message:
prepare for 0.8rc1 release
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060413231657-bce3d67d3e7a4f2b
parent: pqm at pqm.ubuntu.com-20060413223715-b826d3cb591fed82
parent: mbp at sourcefrog.net-20060413230317-a1543afe041b1266
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-04-14 00:16:57 +0100
message:
(mbp/olaf) push/pull/merge --remember improvements
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060413230317-a1543afe041b1266
parent: pqm at pqm.ubuntu.com-20060413223715-b826d3cb591fed82
parent: mbp at sourcefrog.net-20060413225424-de4f151d9ea1216d
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Fri 2006-04-14 09:03:17 +1000
message:
[merge] push/pull/merge --remember
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060413225424-de4f151d9ea1216d
parent: pqm at pqm.ubuntu.com-20060413095251-762ef0074ed6104a
parent: olaf at conradi.org-20060409144557-99402eb1485732f8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.remember
timestamp: Fri 2006-04-14 08:54:24 +1000
message:
[merge] olaf's --remember changes
------------------------------------------------------------
merged: olaf at conradi.org-20060409144557-99402eb1485732f8
parent: olaf at conradi.org-20060409142856-940e51e1df9176b3
parent: pqm at pqm.ubuntu.com-20060407211144-0d74356b1cc77c00
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.remember
timestamp: Sun 2006-04-09 16:45:57 +0200
message:
Merge bzr.dev
------------------------------------------------------------
merged: olaf at conradi.org-20060409142856-940e51e1df9176b3
parent: olaf at conradi.org-20060402023813-78338fad14850cba
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.remember
timestamp: Sun 2006-04-09 16:28:56 +0200
message:
Modified blackbox test cases to use bzrlib API.
------------------------------------------------------------
merged: olaf at conradi.org-20060402023813-78338fad14850cba
parent: olaf at conradi.org-20060402023512-18754201284048f0
parent: pqm at pqm.ubuntu.com-20060331004321-2171d32febcbfe4d
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.remember
timestamp: Sun 2006-04-02 04:38:13 +0200
message:
Merge bzr.dev
------------------------------------------------------------
merged: olaf at conradi.org-20060402023512-18754201284048f0
parent: olaf at conradi.org-20060329210720-8e43fffa2a24d1a4
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.remember
timestamp: Sun 2006-04-02 04:35:12 +0200
message:
Add test case for resetting parent in branch_implementations.
------------------------------------------------------------
merged: olaf at conradi.org-20060329210720-8e43fffa2a24d1a4
parent: olaf at conradi.org-20060329014430-7c2af77c08efc1e3
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.remember
timestamp: Wed 2006-03-29 23:07:20 +0200
message:
Re-added AmbiguousBase with a deprecated warning.
------------------------------------------------------------
merged: olaf at conradi.org-20060329014430-7c2af77c08efc1e3
parent: olaf at conradi.org-20060329010056-71604a1f901d8c8d
parent: pqm at pqm.ubuntu.com-20060328190455-9eab3a4045b61c4a
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.remember
timestamp: Wed 2006-03-29 03:44:30 +0200
message:
Merge bzr.dev
------------------------------------------------------------
merged: olaf at conradi.org-20060329010056-71604a1f901d8c8d
parent: olaf at conradi.org-20060329004804-83f9d686c6b77490
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.remember
timestamp: Wed 2006-03-29 03:00:56 +0200
message:
Add NEWS entries.
------------------------------------------------------------
merged: olaf at conradi.org-20060329004804-83f9d686c6b77490
parent: olaf at conradi.org-20060329004354-bfa27afb37ff0c1f
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.remember
timestamp: Wed 2006-03-29 02:48:04 +0200
message:
Move test_uncommit to blackbox tests.
------------------------------------------------------------
merged: olaf at conradi.org-20060329004354-bfa27afb37ff0c1f
parent: olaf at conradi.org-20060328233002-f6262df0e19c1963
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.remember
timestamp: Wed 2006-03-29 02:43:54 +0200
message:
Added testcases for using push with --remember. Moved remember code to
beginning of cmd_push. This remembers the location in case of a failure
during push.
------------------------------------------------------------
merged: olaf at conradi.org-20060328233002-f6262df0e19c1963
parent: olaf at conradi.org-20060327221957-20e59274772fbfc2
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.remember
timestamp: Wed 2006-03-29 01:30:02 +0200
message:
Added testcases for using pull with --remember. Moved remember code to
beginning of cmd_pull. This remembers the location in case of a failure
during pull.
------------------------------------------------------------
merged: olaf at conradi.org-20060327221957-20e59274772fbfc2
parent: olaf at conradi.org-20060327210819-c12de75f9f81dfb8
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.remember
timestamp: Tue 2006-03-28 00:19:57 +0200
message:
Remove exception AmbiguousBase from cmd_merge. New base selection code
does not raise it and and no test-case existed to test it.
------------------------------------------------------------
merged: olaf at conradi.org-20060327210819-c12de75f9f81dfb8
parent: olaf at conradi.org-20060323230008-8553da6ea86bf149
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.remember
timestamp: Mon 2006-03-27 23:08:19 +0200
message:
Add testcase for --remember when merge fails. It should still remember
the location. Testcase exposed a bug. When merge raised an exception,
the location was not remembered. Fixed by moving remember code before
actual merging.
------------------------------------------------------------
merged: olaf at conradi.org-20060323230008-8553da6ea86bf149
parent: olaf at conradi.org-20060323193649-06b5956b1d238711
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf
timestamp: Fri 2006-03-24 00:00:08 +0100
message:
Added testcase for bzr merge --remember.
Changed branch.set_parent() to accepts None to remove parent.
------------------------------------------------------------
merged: olaf at conradi.org-20060323193649-06b5956b1d238711
parent: olaf at conradi.org-20060321105123-c3778431c6f3f6a2
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf
timestamp: Thu 2006-03-23 20:36:49 +0100
message:
Renamed argument location in command merge back to branch.
------------------------------------------------------------
merged: olaf at conradi.org-20060321105123-c3778431c6f3f6a2
parent: olaf at conradi.org-20060321101728-09fe24e3e9cd93d9
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf
timestamp: Tue 2006-03-21 11:51:23 +0100
message:
In commands push and pull, moved help text for --remember down. It's not
the first thing a user should know about.
------------------------------------------------------------
merged: olaf at conradi.org-20060321101728-09fe24e3e9cd93d9
parent: olaf at conradi.org-20060318001257-bdb0088faae84e76
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf
timestamp: Tue 2006-03-21 11:17:28 +0100
message:
Merge command:
* Remember location if merge failed.
* Rename some variables to clarify their use.
* Moved help text for --remember down to examples.
------------------------------------------------------------
merged: olaf at conradi.org-20060318001257-bdb0088faae84e76
parent: pqm at pqm.ubuntu.com-20060316205342-c9d4ed939a36dda4
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf
timestamp: Sat 2006-03-18 01:12:57 +0100
message:
Merge now accepts option --remember to set parent location (closes #35350).
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060413223715-b826d3cb591fed82
parent: pqm at pqm.ubuntu.com-20060413095251-762ef0074ed6104a
parent: mbp at sourcefrog.net-20060413055135-1a40ec5436f0dbd0
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-04-13 23:37:15 +0100
message:
(mbp) fix #38331, #3619
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060413055135-1a40ec5436f0dbd0
parent: mbp at sourcefrog.net-20060413053724-8c0053ac31492637
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-04-13 15:51:35 +1000
message:
diff on unversiond files should give an error (Malone #3619)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060413053724-8c0053ac31492637
parent: mbp at sourcefrog.net-20060413044224-14a48bb5724bec3d
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-04-13 15:37:24 +1000
message:
Give an error for bzr diff on an nonexistent file (Malone #3619)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060413044224-14a48bb5724bec3d
parent: mbp at sourcefrog.net-20060413042559-4db8365c299e624e
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-04-13 14:42:24 +1000
message:
(internal_tree_files) Better docstring
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060413042559-4db8365c299e624e
parent: mbp at sourcefrog.net-20060413034805-5da73e30153f2ccf
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-04-13 14:25:59 +1000
message:
(RepositoryFormatKnit1.initialize) remove dead code that constructs weaves
in a knit repository, and also the unused control/ subdirectory.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060413034805-5da73e30153f2ccf
parent: mbp at sourcefrog.net-20060413031221-c5247090c275a7a3
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-04-13 13:48:05 +1000
message:
init-repo shouldn't insist on creating a new directory (Malone #38331)
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060413095251-762ef0074ed6104a
parent: pqm at pqm.ubuntu.com-20060413091214-74f373e08c6e8818
parent: robertc at robertcollins.net-20060413093927-f967a16167958c5b
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-04-13 10:52:51 +0100
message:
Make knit indexs safe if the sftp link gets corrupted at a bad time.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060413093927-f967a16167958c5b
parent: robertc at robertcollins.net-20060413085724-c7a3bdbaed2f8bc8
parent: robertc at robertcollins.net-20060407083226-2e8f48b8a7a16cf4
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-04-13 19:39:27 +1000
message:
Merge partial index write support for knits, adding a test case per review comments.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060407083226-2e8f48b8a7a16cf4
parent: robertc at robertcollins.net-20060407020102-503cbe431fe7fbf0
committer: Robert Collins <robertc at robertcollins.net>
branch nick: knit-partial-index-writes
timestamp: Fri 2006-04-07 18:32:26 +1000
message:
Change knit index files to be robust in the presence of partial writes.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060413091214-74f373e08c6e8818
parent: pqm at pqm.ubuntu.com-20060413034259-6466a758a88b4a94
parent: robertc at robertcollins.net-20060413085724-c7a3bdbaed2f8bc8
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-04-13 10:12:14 +0100
message:
Teach `bzr init` how to init at the root of a repository.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060413085724-c7a3bdbaed2f8bc8
parent: robertc at robertcollins.net-20060413011107-3a08797be7e54cc0
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-04-13 18:57:24 +1000
message:
Teach `bzr init` how to init at the root of a repository.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060413011107-3a08797be7e54cc0
parent: robertc at robertcollins.net-20060413010611-d38d9610c4263e6b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-04-13 11:11:07 +1000
message:
Refactor repository knit tests slightly to remove duplication - add a assertHasKnit method.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060413010611-d38d9610c4263e6b
parent: robertc at robertcollins.net-20060412065907-fcc10809db6b4c04
parent: pqm at pqm.ubuntu.com-20060412084015-e6472a0717edbca6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-04-13 11:06:11 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060413034259-6466a758a88b4a94
parent: pqm at pqm.ubuntu.com-20060412235011-e395c05df01335a9
parent: mbp at sourcefrog.net-20060413031221-c5247090c275a7a3
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-04-13 04:42:59 +0100
message:
(mbp) ftp push fix; Working_tree.set_inventory; test suite warnings
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060413031221-c5247090c275a7a3
parent: mbp at sourcefrog.net-20060413031008-89709c21c76b16cf
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-04-13 13:12:21 +1000
message:
Release more locks taken during test suite
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060413031008-89709c21c76b16cf
parent: mbp at sourcefrog.net-20060413030656-d341283822ba9043
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-04-13 13:10:08 +1000
message:
Quieten warning from TestFormat7.test_creates_lockdir about failing to unlock
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060413030656-d341283822ba9043
parent: mbp at sourcefrog.net-20060413030614-3a65b585233b029f
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-04-13 13:06:56 +1000
message:
Doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060413030614-3a65b585233b029f
parent: mbp at sourcefrog.net-20060413023336-ed862740f63ef8f5
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-04-13 13:06:14 +1000
message:
Revert changes to WorkingTree.set_inventory to unbreak bzrtools
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060413023336-ed862740f63ef8f5
parent: pqm at pqm.ubuntu.com-20060412235011-e395c05df01335a9
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-04-13 12:33:36 +1000
message:
Fix FTP push with metadir format (Alexandre Saint)
It adds a rmdir() method and makes rename() an alias of move(). Makes delete()
raise a NoSuchFile exception when appropriate (instead of a TransportError
which made the logic always fail).
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060412235011-e395c05df01335a9
parent: pqm at pqm.ubuntu.com-20060412084015-e6472a0717edbca6
parent: robertc at robertcollins.net-20060412065907-fcc10809db6b4c04
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-04-13 00:50:11 +0100
message:
Merge Olafs logging in test suite fix.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060412065907-fcc10809db6b4c04
parent: pqm at pqm.ubuntu.com-20060412061132-beffbe6feb9bc734
parent: olaf at conradi.org-20060407115030-62841fc4321f5cb8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-04-12 16:59:07 +1000
message:
Merge Olafs logging in test suite fix.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060412084015-e6472a0717edbca6
parent: pqm at pqm.ubuntu.com-20060412082925-f1988a4619180117
parent: mbp at sourcefrog.net-20060412070200-b12b348eff529d60
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-04-12 09:40:15 +0100
message:
(mbp) storage escaping, cleanups
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060412070200-b12b348eff529d60
parent: mbp at sourcefrog.net-20060412065222-66347b5909aefb25
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.escape-stores
timestamp: Wed 2006-04-12 17:02:00 +1000
message:
Move small ImmutableMemoryStore class into test module,
which is the only place it's used
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060412065222-66347b5909aefb25
parent: mbp at sourcefrog.net-20060412063753-65db5f7d28bbfd11
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.escape-stores
timestamp: Wed 2006-04-12 16:52:22 +1000
message:
Clean up clone-bzrdir code
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060412063753-65db5f7d28bbfd11
parent: mbp at sourcefrog.net-20060412062257-f5a64d2ecff23f41
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.escape-stores
timestamp: Wed 2006-04-12 16:37:53 +1000
message:
Review cleanup of TransportStore.has_id
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060412062257-f5a64d2ecff23f41
parent: mbp at sourcefrog.net-20060412061310-ab5e04ba4fd24368
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.escape-stores
timestamp: Wed 2006-04-12 16:22:57 +1000
message:
Remove dead and useless Repository.copy() method
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060412061310-ab5e04ba4fd24368
parent: mbp at sourcefrog.net-20060412045220-5c60952c072a085a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.escape-stores
timestamp: Wed 2006-04-12 16:13:10 +1000
message:
Use transport._can_roundtrip_unix_modebits to decide whether to check transport results
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060412045220-5c60952c072a085a
parent: mbp at sourcefrog.net-20060412044532-fc8c5c9408aae88b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.escape-stores
timestamp: Wed 2006-04-12 14:52:20 +1000
message:
Review style cleanups
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060412044532-fc8c5c9408aae88b
parent: pqm at pqm.ubuntu.com-20060411070422-9167eccbd3e561a2
parent: mbp at sourcefrog.net-20060411050425-618978fd42460c19
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.merge.escaped-stores
timestamp: Wed 2006-04-12 14:45:32 +1000
message:
[merge][wip] Storage escaping
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060411050425-618978fd42460c19
parent: mbp at sourcefrog.net-20060410083833-62a7d2e827fac66d
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.escape-stores
timestamp: Tue 2006-04-11 15:04:25 +1000
message:
(test_escaped_store) fix typo
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060410083833-62a7d2e827fac66d
parent: mbp at sourcefrog.net-20060410074447-51bd678ad1bc3c5e
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.escape-stores
timestamp: Mon 2006-04-10 18:38:33 +1000
message:
Store-escaping must quote uppercase characters too, so that they're safely
stored on Windows. We can't use urllib.quote anymore but must have our own
version that can do this. Test.
Make KnitRepository use escaped stores.
Update existing storage-escaping tests.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060410074447-51bd678ad1bc3c5e
parent: mbp at sourcefrog.net-20060410074413-7417ac0149c5643e
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.escape-stores
timestamp: Mon 2006-04-10 17:44:47 +1000
message:
(FakeVFAT) add test for detection of invalid characters
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060410074413-7417ac0149c5643e
parent: mbp at sourcefrog.net-20060410074309-cee0d108e7b952a1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.escape-stores
timestamp: Mon 2006-04-10 17:44:13 +1000
message:
(TransportDecorator) better assertions
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060410074309-cee0d108e7b952a1
parent: mbp at sourcefrog.net-20060410061801-677145ba01f5445f
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.escape-stores
timestamp: Mon 2006-04-10 17:43:09 +1000
message:
(FakeVFAT) implement more transport methods; disallow bad characters
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060410061801-677145ba01f5445f
parent: mbp at sourcefrog.net-20060410061725-be42a126901fcaab
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.escape-stores
timestamp: Mon 2006-04-10 16:18:01 +1000
message:
Separate out BzrDir.initialize_on_transport so it
can be run on any transport without requiring their url to be registered
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060410061725-be42a126901fcaab
parent: mbp at sourcefrog.net-20060410061639-63bac88fca3560ab
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.escape-stores
timestamp: Mon 2006-04-10 16:17:25 +1000
message:
Rename supports_unix_modebits to _can_roundtrip_unix_modebits for clarity
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060410061639-63bac88fca3560ab
parent: mbp at sourcefrog.net-20060409081242-eb44bff7db445694
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.escape-stores
timestamp: Mon 2006-04-10 16:16:39 +1000
message:
Cleanup escaped stores
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060409081242-eb44bff7db445694
parent: mbp at sourcefrog.net-20060409022050-14d311b4d9ef853a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.escape-stores
timestamp: Sun 2006-04-09 18:12:42 +1000
message:
Add Transport.supports_unix_modebits, so tests can
avoid testing them where they won't work.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060409022050-14d311b4d9ef853a
parent: mbp at sourcefrog.net-20060409022012-e5b6adc7d28aa1af
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.escape-stores
timestamp: Sun 2006-04-09 12:20:50 +1000
message:
[broken] Add FakeFVATTransport
currently failing some tests
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060409022012-e5b6adc7d28aa1af
parent: mbp at sourcefrog.net-20060404104308-631ccdb35714bd29
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.escape-stores
timestamp: Sun 2006-04-09 12:20:12 +1000
message:
Add default Transport.rename() to TransportDecorator
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060404104308-631ccdb35714bd29
parent: mbp at sourcefrog.net-20060404102054-77707fa58447e26a
parent: pqm at pqm.ubuntu.com-20060404014851-ae9a2babfd810da1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.escape-stores
timestamp: Tue 2006-04-04 20:43:08 +1000
message:
[merge] sync from bzr.dev
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060404102054-77707fa58447e26a
parent: pqm at pqm.ubuntu.com-20060310021935-2da34b3a9b5d5e25
parent: john at arbash-meinel.com-20060216064126-bc29375f7e01c08d
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.escape-stores
timestamp: Tue 2006-04-04 20:20:54 +1000
message:
[merge] Storage filename escaping
------------------------------------------------------------
merged: john at arbash-meinel.com-20060216064126-bc29375f7e01c08d
parent: john at arbash-meinel.com-20060216044554-14ba44a054046009
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-escape-stores
timestamp: Thu 2006-02-16 00:41:26 -0600
message:
Adding progress indicators and improved get order for 'bzr branch'
------------------------------------------------------------
merged: john at arbash-meinel.com-20060216044554-14ba44a054046009
parent: john at arbash-meinel.com-20060216044048-9a7c53e15a08632a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-escape-stores
timestamp: Wed 2006-02-15 22:45:54 -0600
message:
Removing unneeded note statements.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060216044048-9a7c53e15a08632a
parent: john at arbash-meinel.com-20060216042844-9e3db7cd84db5be7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-escape-stores
timestamp: Wed 2006-02-15 22:40:48 -0600
message:
Removing unneeded print statement
------------------------------------------------------------
merged: john at arbash-meinel.com-20060216042844-9e3db7cd84db5be7
parent: john at arbash-meinel.com-20060216030605-c212d710550a1fb3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-escape-stores
timestamp: Wed 2006-02-15 22:28:44 -0600
message:
Changing the escapes so that we leave @ as unescaped.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060216030605-c212d710550a1fb3
parent: john at arbash-meinel.com-20060216024100-aa9cc2e6c895d5d2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-escape-stores
timestamp: Wed 2006-02-15 21:06:05 -0600
message:
Adding tests to make sure weave stores can retrieve the files they add.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060216024100-aa9cc2e6c895d5d2
parent: john at arbash-meinel.com-20060210211648-4d8be6daa956ca87
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-escape-stores
timestamp: Wed 2006-02-15 20:41:00 -0600
message:
Changing the escaping just a little bit. Now we can handle unicode characters.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060210211648-4d8be6daa956ca87
parent: john at arbash-meinel.com-20060210200203-d39765285963fae4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-escape-stores
timestamp: Fri 2006-02-10 15:16:48 -0600
message:
We need to reference the basis_tree to get the proper executable bits.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060210200203-d39765285963fae4
parent: john at arbash-meinel.com-20060210194417-f21bea235aeb9ebc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-escape-stores
timestamp: Fri 2006-02-10 14:02:03 -0600
message:
Fix merge so that it forces the old executable bit.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060210194417-f21bea235aeb9ebc
parent: john at arbash-meinel.com-20060209183047-cbd6666d18efafd0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-escape-stores
timestamp: Fri 2006-02-10 13:44:17 -0600
message:
Traced double locking code to WorkingTree creating its own control files.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060209183047-cbd6666d18efafd0
parent: john at arbash-meinel.com-20060206135424-e20c6607c047b096
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-escape-stores
timestamp: Thu 2006-02-09 12:30:47 -0600
message:
Text store and weave store both allow escaping fileid paths.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060412082925-f1988a4619180117
parent: pqm at pqm.ubuntu.com-20060412062244-b1ea5860b8463060
parent: mbp at sourcefrog.net-20060412060637-11b65bc78d065a45
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-04-12 09:29:25 +0100
message:
(olaf) fix resolve command in subdir; python logging shutdown
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060412060637-11b65bc78d065a45
parent: mbp at sourcefrog.net-20060412052713-25cda948d8e13f60
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Wed 2006-04-12 16:06:37 +1000
message:
Improved bzr resolve command line handling
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060412052713-25cda948d8e13f60
parent: mbp at sourcefrog.net-20060412045202-5920585dfd719c7b
parent: olaf at conradi.org-20060407115030-62841fc4321f5cb8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Wed 2006-04-12 15:27:13 +1000
message:
Fix warning from Python logging after test suite finishes (olaf)
------------------------------------------------------------
merged: olaf at conradi.org-20060407115030-62841fc4321f5cb8
parent: olaf at conradi.org-20060406211721-64fb1d3832b1532c
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.logging
timestamp: Fri 2006-04-07 13:50:30 +0200
message:
Remove extra flush before closing log handler.
------------------------------------------------------------
merged: olaf at conradi.org-20060406211721-64fb1d3832b1532c
parent: pqm at pqm.ubuntu.com-20060406115819-479ae52584747faa
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.dev
timestamp: Thu 2006-04-06 23:17:21 +0200
message:
Close logging handler on disabling the test log. This will remove the
handler from the internal list inside python's logging module,
preventing shutdown from closing it twice.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060412045202-5920585dfd719c7b
parent: pqm at pqm.ubuntu.com-20060411084133-90aab62d72535e57
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Wed 2006-04-12 14:52:02 +1000
message:
Fix 'bzr resolve' run from subdirectory
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060412062244-b1ea5860b8463060
parent: pqm at pqm.ubuntu.com-20060412061132-beffbe6feb9bc734
parent: aaron.bentley at utoronto.ca-20060412055057-a0679e57841da975
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-04-12 07:22:44 +0100
message:
Minor bugfixes
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060412055057-a0679e57841da975
parent: aaron.bentley at utoronto.ca-20060412054322-ba4676fe659f2707
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: fix-mergesums
timestamp: Wed 2006-04-12 01:50:57 -0400
message:
Be robust when merge_hash file_id not in inventory
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060412054322-ba4676fe659f2707
parent: aaron.bentley at utoronto.ca-20060412045516-a3534bcfb08241f6
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: fix-mergesums
timestamp: Wed 2006-04-12 01:43:22 -0400
message:
Handle resolving conflicts with directories properly
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060412045516-a3534bcfb08241f6
parent: aaron.bentley at utoronto.ca-20060412030132-a1cf79509acb12a9
parent: pqm at pqm.ubuntu.com-20060412032139-5508773d6a1cd4ae
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: revert-missing
timestamp: Wed 2006-04-12 00:55:16 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060412061132-beffbe6feb9bc734
parent: pqm at pqm.ubuntu.com-20060412032139-5508773d6a1cd4ae
parent: robertc at robertcollins.net-20060412053532-74cf4362ebd83f29
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-04-12 07:11:32 +0100
message:
Make push and pull converge.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060412053532-74cf4362ebd83f29
parent: robertc at robertcollins.net-20060412045734-3e03b7af0860a5a9
parent: pqm at pqm.ubuntu.com-20060412032139-5508773d6a1cd4ae
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-04-12 15:35:32 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060412045734-3e03b7af0860a5a9
parent: pqm at pqm.ubuntu.com-20060410052637-9c6229889bc13061
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-04-12 14:57:34 +1000
message:
* 'pull' and 'push' now normalise the revision history, so that any two
branches with the same tip revision will have the same output from 'log'.
(Robert Collins)
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060412032139-5508773d6a1cd4ae
parent: pqm at pqm.ubuntu.com-20060411084133-90aab62d72535e57
parent: aaron.bentley at utoronto.ca-20060412030132-a1cf79509acb12a9
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-04-12 04:21:39 +0100
message:
Remove debug path printing
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060412030132-a1cf79509acb12a9
parent: abentley at panoramicfeedback.com-20060410134102-08b1929145cda317
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: revert-missing
timestamp: Tue 2006-04-11 23:01:32 -0400
message:
Fixed revert with missing files
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060411084133-90aab62d72535e57
parent: pqm at pqm.ubuntu.com-20060411070422-9167eccbd3e561a2
parent: mbp at sourcefrog.net-20060411081134-5a78a9fea699c274
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-04-11 09:41:33 +0100
message:
(olaf) much improved bzr info output
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060411081134-5a78a9fea699c274
parent: pqm at pqm.ubuntu.com-20060410135440-f18f47545bf15172
parent: olaf at conradi.org-20060411013408-b42419dc665020f2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.info
timestamp: Tue 2006-04-11 18:11:34 +1000
message:
[merge] improved bzr info output, showing formats and bindings (olaf)
------------------------------------------------------------
merged: olaf at conradi.org-20060411013408-b42419dc665020f2
parent: olaf at conradi.org-20060411012820-461358428338485e
parent: pqm at pqm.ubuntu.com-20060410135440-f18f47545bf15172
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Tue 2006-04-11 03:34:08 +0200
message:
Merge bzr.dev
------------------------------------------------------------
merged: olaf at conradi.org-20060411012820-461358428338485e
parent: olaf at conradi.org-20060406131811-a3d8f57b90e38dc7
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Tue 2006-04-11 03:28:20 +0200
message:
Make bzr info command work on both local and remote locations. Support
branches and repositories, next to working trees.
------------------------------------------------------------
merged: olaf at conradi.org-20060406131811-a3d8f57b90e38dc7
parent: olaf at conradi.org-20060406130740-9b753774d590c5a4
parent: pqm at pqm.ubuntu.com-20060406115819-479ae52584747faa
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Thu 2006-04-06 15:18:11 +0200
message:
Merge bzr.dev
------------------------------------------------------------
merged: olaf at conradi.org-20060406130740-9b753774d590c5a4
parent: olaf at conradi.org-20060406011556-047190542aada4bc
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Thu 2006-04-06 15:07:40 +0200
message:
New call get_format_description to give a user-friendly description of a
format.
------------------------------------------------------------
merged: olaf at conradi.org-20060406011556-047190542aada4bc
parent: olaf at conradi.org-20060403112157-8ff209d3a3d67285
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Thu 2006-04-06 03:15:56 +0200
message:
Move to using bzrlib API for blackbox test cases.
------------------------------------------------------------
merged: olaf at conradi.org-20060403112157-8ff209d3a3d67285
parent: olaf at conradi.org-20060402015042-0dad313bcc337a41
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Mon 2006-04-03 13:21:57 +0200
message:
Remove indirection in branch.repository as it is available as repository
variable already.
------------------------------------------------------------
merged: olaf at conradi.org-20060402015042-0dad313bcc337a41
parent: olaf at conradi.org-20060402014232-96a3295ba29af142
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Sun 2006-04-02 03:50:42 +0200
message:
Add NEWS entry.
------------------------------------------------------------
merged: olaf at conradi.org-20060402014232-96a3295ba29af142
parent: olaf at conradi.org-20060402012957-4b35c41c185956af
parent: pqm at pqm.ubuntu.com-20060331004321-2171d32febcbfe4d
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Sun 2006-04-02 03:42:32 +0200
message:
Merge bzr.dev
------------------------------------------------------------
merged: olaf at conradi.org-20060402012957-4b35c41c185956af
parent: olaf at conradi.org-20060402011712-80946e4af8b00745
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Sun 2006-04-02 03:29:57 +0200
message:
Move to using kibi for binary prefix as per standard IEEE 1541.
KiB is 2^10, kB is 10^3. Sizes should be in KiB, rates in kB/s.
------------------------------------------------------------
merged: olaf at conradi.org-20060402011712-80946e4af8b00745
parent: olaf at conradi.org-20060402011514-74bf98c5cd8a068a
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Sun 2006-04-02 03:17:12 +0200
message:
Remove debug information.
------------------------------------------------------------
merged: olaf at conradi.org-20060402011514-74bf98c5cd8a068a
parent: olaf at conradi.org-20060402005003-17121db0dc14aea9
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Sun 2006-04-02 03:15:14 +0200
message:
Fixed bug in test case where datestring_last returned the first.
------------------------------------------------------------
merged: olaf at conradi.org-20060402005003-17121db0dc14aea9
parent: olaf at conradi.org-20060402001835-5f88729b8b9eec35
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Sun 2006-04-02 02:50:03 +0200
message:
Test cases exposed a bug in missing revisions count of working tree. It
had an off-by-one error when comparing length of a list with its index
(which starts from 0). Fix is to use branch for the lookup of the revno
of working tree's last revision and substract that. This keeps revno
calculation behind branch API and makes the exception check redundant.
------------------------------------------------------------
merged: olaf at conradi.org-20060402001835-5f88729b8b9eec35
parent: olaf at conradi.org-20060402001642-5924672bed717065
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Sun 2006-04-02 02:18:35 +0200
message:
Add blackbox test case for command bzr info.
------------------------------------------------------------
merged: olaf at conradi.org-20060402001642-5924672bed717065
parent: olaf at conradi.org-20060402001220-145d2693284f8e32
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Sun 2006-04-02 02:16:42 +0200
message:
Remove unused variable count_version_dirs from info.py.
------------------------------------------------------------
merged: olaf at conradi.org-20060402001220-145d2693284f8e32
parent: olaf at conradi.org-20060402000757-1491b92e9083fb3a
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Sun 2006-04-02 02:12:20 +0200
message:
Adjust formatting. Start sections with a capital letter.
------------------------------------------------------------
merged: olaf at conradi.org-20060402000757-1491b92e9083fb3a
parent: olaf at conradi.org-20060331134440-18db1428f8bcf0d9
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Sun 2006-04-02 02:07:57 +0200
message:
PEP8ify
------------------------------------------------------------
merged: olaf at conradi.org-20060331134440-18db1428f8bcf0d9
parent: olaf at conradi.org-20060331121838-5e4aa9a666d6c9e7
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Fri 2006-03-31 15:44:40 +0200
message:
Tweak output.
------------------------------------------------------------
merged: olaf at conradi.org-20060331121838-5e4aa9a666d6c9e7
parent: olaf at conradi.org-20060331013553-2a7f9c58932dda95
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Fri 2006-03-31 14:18:38 +0200
message:
Only lightweight checkouts are referred to as checkout.
------------------------------------------------------------
merged: olaf at conradi.org-20060331013553-2a7f9c58932dda95
parent: olaf at conradi.org-20060327020559-18b30f9afcc0d55e
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Fri 2006-03-31 03:35:53 +0200
message:
Simplify construct detection. Make terms in user interface consistent.
Checkout now uses terms of bound branches.
------------------------------------------------------------
merged: olaf at conradi.org-20060327020559-18b30f9afcc0d55e
parent: olaf at conradi.org-20060327005459-3a894a56f25ed35d
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Mon 2006-03-27 04:05:59 +0200
message:
Add missing locations and formats to one construct.
------------------------------------------------------------
merged: olaf at conradi.org-20060327005459-3a894a56f25ed35d
parent: olaf at conradi.org-20060326234109-19892fb98876e2f4
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Mon 2006-03-27 02:54:59 +0200
message:
Implemented table of constructs from BzrInfo specification.
------------------------------------------------------------
merged: olaf at conradi.org-20060326234109-19892fb98876e2f4
parent: pqm at pqm.ubuntu.com-20060323202841-c460fdfe30972b21
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Mon 2006-03-27 01:41:09 +0200
message:
Add temporary --debug option to command info to test on various
constructs of bzr branches.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060411070422-9167eccbd3e561a2
parent: pqm at pqm.ubuntu.com-20060410135440-f18f47545bf15172
parent: mbp at sourcefrog.net-20060407042600-4b21f86b7f57fe34
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-04-11 08:04:22 +0100
message:
(mbp) better help message for bzr format
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060407042600-4b21f86b7f57fe34
parent: mbp at sourcefrog.net-20060407032213-ece971e214895f41
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Fri 2006-04-07 14:26:00 +1000
message:
Better help for --format options (Jos Backus)
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060410135440-f18f47545bf15172
parent: pqm at pqm.ubuntu.com-20060410052637-9c6229889bc13061
parent: abentley at panoramicfeedback.com-20060410134102-08b1929145cda317
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-04-10 14:54:40 +0100
message:
Remove debug path printing
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060410134102-08b1929145cda317
parent: abentley at panoramicfeedback.com-20060410133955-c73b8e2aa3ddc84c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Mon 2006-04-10 09:41:02 -0400
message:
Remove debug path printing
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060410133955-c73b8e2aa3ddc84c
parent: aaron.bentley at utoronto.ca-20060409170533-f5f4d5209111f095
parent: pqm at pqm.ubuntu.com-20060410052637-9c6229889bc13061
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Mon 2006-04-10 09:39:55 -0400
message:
Merge dev
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060410052637-9c6229889bc13061
parent: pqm at pqm.ubuntu.com-20060410051538-e33ae09cf879c95b
parent: aaron.bentley at utoronto.ca-20060409061954-d0f04c8e0164a935
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-04-10 06:26:37 +0100
message:
Implement single-file merge
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060409061954-d0f04c8e0164a935
parent: pqm at pqm.ubuntu.com-20060407062030-1277bbf3d808f04f
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergeui
timestamp: Sun 2006-04-09 02:19:54 -0400
message:
Implement single-file merge
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060410051538-e33ae09cf879c95b
parent: pqm at pqm.ubuntu.com-20060409164922-071803e906c8b96d
parent: aaron.bentley at utoronto.ca-20060410042538-0d2090fda7db9e05
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-04-10 06:15:38 +0100
message:
Use numbered backups when reverting
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060410042538-0d2090fda7db9e05
parent: aaron.bentley at utoronto.ca-20060409191503-9669cce6fdf69546
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Mon 2006-04-10 00:25:38 -0400
message:
Fixed backup numbering to match GNU standard better
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060409191503-9669cce6fdf69546
parent: aaron.bentley at utoronto.ca-20060409163250-95b35cee9c2837ce
parent: aaron.bentley at utoronto.ca-20060409170533-f5f4d5209111f095
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Sun 2006-04-09 15:15:03 -0400
message:
Use numbered backup files
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060409170533-f5f4d5209111f095
parent: aaron.bentley at utoronto.ca-20060409163211-e534392ec2c0b274
parent: pqm at pqm.ubuntu.com-20060409164922-071803e906c8b96d
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab.integration
timestamp: Sun 2006-04-09 13:05:33 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060409163211-e534392ec2c0b274
parent: aaron.bentley at utoronto.ca-20060407120040-1c73629500df0d87
parent: abentley at panoramicfeedback.com-20060406152109-6320ad789f08fa68
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab.integration
timestamp: Sun 2006-04-09 12:32:11 -0400
message:
Merge with other bzr.ab
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060406152109-6320ad789f08fa68
parent: aaron.bentley at utoronto.ca-20060404064141-9b186bd6f384b7bc
parent: pqm at pqm.ubuntu.com-20060406115819-479ae52584747faa
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Thu 2006-04-06 11:21:09 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060407120040-1c73629500df0d87
parent: aaron.bentley at utoronto.ca-20060404064141-9b186bd6f384b7bc
parent: pqm at pqm.ubuntu.com-20060407062030-1277bbf3d808f04f
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab.integration
timestamp: Fri 2006-04-07 08:00:40 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060409164922-071803e906c8b96d
parent: pqm at pqm.ubuntu.com-20060407211144-0d74356b1cc77c00
parent: aaron.bentley at utoronto.ca-20060409163250-95b35cee9c2837ce
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2006-04-09 17:49:22 +0100
message:
New conflict-handling system
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060409163250-95b35cee9c2837ce
parent: aaron.bentley at utoronto.ca-20060406043505-72112dc45d5b42fa
parent: pqm at pqm.ubuntu.com-20060407211144-0d74356b1cc77c00
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Sun 2006-04-09 12:32:50 -0400
message:
Merge from mainline
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060406043505-72112dc45d5b42fa
parent: abentley at panoramicfeedback.com-20060405205841-44fc6af28076b671
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Thu 2006-04-06 00:35:05 -0400
message:
Remove unused variable
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060405205841-44fc6af28076b671
parent: abentley at panoramicfeedback.com-20060405203737-d50848ef2df7344a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ttransform
timestamp: Wed 2006-04-05 16:58:41 -0400
message:
Move select_conflicts into ConflictList
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060405203737-d50848ef2df7344a
parent: abentley at panoramicfeedback.com-20060405184831-75d8f15c293393e7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ttransform
timestamp: Wed 2006-04-05 16:37:37 -0400
message:
Eliminated conflicts_to_strings, made remove_files a ConflictList member
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060405184831-75d8f15c293393e7
parent: abentley at panoramicfeedback.com-20060405180515-4be2a622206de1f7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ttransform
timestamp: Wed 2006-04-05 14:48:31 -0400
message:
Removed conflicts_to_stanzas and stanzas_to_conflicts
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060405180515-4be2a622206de1f7
parent: aaron.bentley at utoronto.ca-20060405045400-7b57a53ee7fdaab6
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ttransform
timestamp: Wed 2006-04-05 14:05:15 -0400
message:
Got ConflictList implemented
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060405045400-7b57a53ee7fdaab6
parent: aaron.bentley at utoronto.ca-20060405042935-7a86762d00a3ae2e
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Wed 2006-04-05 00:54:00 -0400
message:
Moved and renamed conflict functions
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060405042935-7a86762d00a3ae2e
parent: aaron.bentley at utoronto.ca-20060405023303-2e361c95d1fca567
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Wed 2006-04-05 00:29:35 -0400
message:
Got all tests passing
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060405023303-2e361c95d1fca567
parent: aaron.bentley at utoronto.ca-20060405014615-660100e563d684ec
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Tue 2006-04-04 22:33:03 -0400
message:
Stanza conversion, cooking
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060405014615-660100e563d684ec
parent: aaron.bentley at utoronto.ca-20060405010206-6e9c04f514c1c5e1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Tue 2006-04-04 21:46:15 -0400
message:
Defined all new Conflict types
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060405010206-6e9c04f514c1c5e1
parent: abentley at panoramicfeedback.com-20060310190131-7092bff9317ca8f5
parent: aaron.bentley at utoronto.ca-20060404064141-9b186bd6f384b7bc
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Tue 2006-04-04 21:02:06 -0400
message:
Merge bzr.ab.integration
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060404064141-9b186bd6f384b7bc
parent: aaron.bentley at utoronto.ca-20060331020235-369b764c5e0478f7
parent: pqm at pqm.ubuntu.com-20060404014851-ae9a2babfd810da1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab.integration
timestamp: Tue 2006-04-04 02:41:41 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060310190131-7092bff9317ca8f5
parent: abentley at panoramicfeedback.com-20060310183258-16ab2b131a6fa4d0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-03-10 14:01:31 -0500
message:
Small tweaks
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060310183258-16ab2b131a6fa4d0
parent: abentley at panoramicfeedback.com-20060310181313-1865330914401573
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-03-10 13:32:58 -0500
message:
Revert does resolve
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060310181313-1865330914401573
parent: abentley at panoramicfeedback.com-20060310181255-7fa303d9c5004ebb
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-03-10 13:13:13 -0500
message:
Made revert clear conflicts
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060310181255-7fa303d9c5004ebb
parent: abentley at panoramicfeedback.com-20060310175856-0176fbda98269e87
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-03-10 13:12:55 -0500
message:
Fixed relpaths
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060310175856-0176fbda98269e87
parent: abentley at panoramicfeedback.com-20060310173202-c6c73a8f6e75e954
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-03-10 12:58:56 -0500
message:
Merge produces new conflicts
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060310173202-c6c73a8f6e75e954
parent: abentley at panoramicfeedback.com-20060310170547-dee4d0542ffe7281
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-03-10 12:32:02 -0500
message:
Handle path conflicts properly
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060310170547-dee4d0542ffe7281
parent: abentley at panoramicfeedback.com-20060310161004-8e7c784a0ba225de
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-03-10 12:05:47 -0500
message:
Resolve uses the new stuff.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060310161004-8e7c784a0ba225de
parent: abentley at panoramicfeedback.com-20060310152559-1a02f3c368f5b792
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-03-10 11:10:04 -0500
message:
Switched display functions to conflict_lines
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060310152559-1a02f3c368f5b792
parent: aaron.bentley at utoronto.ca-20060310064653-8fb4a519ce6da639
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-03-10 10:25:59 -0500
message:
Implemented conflict_lines in terms of old system on WorkingTree
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060310064653-8fb4a519ce6da639
parent: aaron.bentley at utoronto.ca-20060310062013-73726f82ca89344c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-03-10 01:46:53 -0500
message:
Added tests for bad conflict lists
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060310062013-73726f82ca89344c
parent: aaron.bentley at utoronto.ca-20060310054959-f8910ff580a5a466
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-03-10 01:20:13 -0500
message:
Conflict serialization working for WorkingTree3
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060310054959-f8910ff580a5a466
parent: abentley at panoramicfeedback.com-20060309225429-9b81ae72b0f23221
parent: aaron.bentley at utoronto.ca-20060310012247-c1047250bef6c49a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-03-10 00:49:59 -0500
message:
Merged latest from bzr.dev
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060309225429-9b81ae72b0f23221
parent: abentley at panoramicfeedback.com-20060309194148-4243caddfe4ed053
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-03-09 17:54:29 -0500
message:
Implemented conflict serialization
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060309194148-4243caddfe4ed053
parent: abentley at panoramicfeedback.com-20060309184740-1bbba4a768e7628c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-03-09 14:41:48 -0500
message:
Simplify set_merge_modified with rio_file
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060309184740-1bbba4a768e7628c
parent: abentley at panoramicfeedback.com-20060309175721-8ecf058bc095ab87
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-03-09 13:47:40 -0500
message:
Implemented rio_file to produce a light file object from stanzas
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060309175721-8ecf058bc095ab87
parent: abentley at panoramicfeedback.com-20060306152723-1352864764612eb9
parent: abentley at panoramicfeedback.com-20060309170600-f47c647f127ea53a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-03-09 12:57:21 -0500
message:
Merge from bzr.ab.integration
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060407211144-0d74356b1cc77c00
parent: pqm at pqm.ubuntu.com-20060407062030-1277bbf3d808f04f
parent: abentley at panoramicfeedback.com-20060407195245-ef4ed2a5b022450d
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-04-07 22:11:44 +0100
message:
Reduced spurious conflicts
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060407195245-ef4ed2a5b022450d
parent: abentley at panoramicfeedback.com-20060407194155-0740c494052ed879
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.spurious-conflict
timestamp: Fri 2006-04-07 15:52:45 -0400
message:
WorkingTree.revert returns conflicts
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060407194155-0740c494052ed879
parent: aaron.bentley at utoronto.ca-20060331061315-ebcb7d46bedccf0b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.spurious-conflict
timestamp: Fri 2006-04-07 15:41:55 -0400
message:
Additional spurious conflict test
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060331061315-ebcb7d46bedccf0b
parent: aaron.bentley at utoronto.ca-20060331020235-369b764c5e0478f7
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.spurious-conflict
timestamp: Fri 2006-03-31 01:13:15 -0500
message:
Avoid spurious conflict on add/delete
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060407062030-1277bbf3d808f04f
parent: pqm at pqm.ubuntu.com-20060407044214-621917477a0fa5cf
parent: aaron.bentley at utoronto.ca-20060407044631-f81fdd5f9fb420a6
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-04-07 07:20:30 +0100
message:
Fix note implementation
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060407044631-f81fdd5f9fb420a6
parent: abentley at panoramicfeedback.com-20060403150516-f41d720befa96522
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.progress
timestamp: Fri 2006-04-07 00:46:31 -0400
message:
Fix note implementation
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060407044214-621917477a0fa5cf
parent: pqm at pqm.ubuntu.com-20060407043115-653eafe5cfa29760
parent: aaron.bentley at utoronto.ca-20060319184910-44558c38ac2077cf
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-04-07 05:42:14 +0100
message:
progress indicator for build_tree
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060319184910-44558c38ac2077cf
parent: abentley at panoramicfeedback.com-20060310205155-7dd585e1996519c5
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.progress2
timestamp: Sun 2006-03-19 13:49:10 -0500
message:
Progress indicator for tree builts
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060407043115-653eafe5cfa29760
parent: pqm at pqm.ubuntu.com-20060407021615-d84ad7bd595139f1
parent: mbp at sourcefrog.net-20060407032213-ece971e214895f41
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-04-07 05:31:15 +0100
message:
(mbp) better log help message
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060407032213-ece971e214895f41
parent: mbp at sourcefrog.net-20060328181846-1cbeeb403a49d5b8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Fri 2006-04-07 13:22:13 +1000
message:
Better help message for log command.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060407021615-d84ad7bd595139f1
parent: pqm at pqm.ubuntu.com-20060406115819-479ae52584747faa
parent: robertc at robertcollins.net-20060407020102-503cbe431fe7fbf0
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-04-07 03:16:15 +0100
message:
Merge knit performance improvements.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060407020102-503cbe431fe7fbf0
parent: pqm at pqm.ubuntu.com-20060406115819-479ae52584747faa
parent: robertc at robertcollins.net-20060403022538-b10dd26e1c549ad2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2006-04-07 12:01:02 +1000
message:
* Various microoptimisations to knit and gzip - reducing function call
counts in inner loops, reducing double-handling of data, increasing
knit header parsing performance, removing 'list.index' calls
completely etc.
* changes the data format of knits to remove an extraneous \n in the
compressed content data, which lets it be trivially pulled into
memory in a single 'readlines()' call.
* changes the knit repository to use unannotated knits for inventory,
revisions, and signatures. Also turns off delta-compression for
revisions and signatures.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060403022538-b10dd26e1c549ad2
parent: robertc at robertcollins.net-20060403000308-092742f884118032
committer: Robert Collins <robertc at robertcollins.net>
branch nick: performance
timestamp: Mon 2006-04-03 12:25:38 +1000
message:
Tune get_revision_graph_with_ghosts for Knit repositories.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060403000308-092742f884118032
parent: robertc at robertcollins.net-20060402234557-2d1995cd541949e6
parent: pqm at pqm.ubuntu.com-20060331004321-2171d32febcbfe4d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: performance
timestamp: Mon 2006-04-03 10:03:08 +1000
message:
Merge from integration.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060402234557-2d1995cd541949e6
parent: robertc at robertcollins.net-20060331082541-bee4cb5c4d1a933d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: performance
timestamp: Mon 2006-04-03 09:45:57 +1000
message:
Make inventory knits not annotated, only delta compressed.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060331082541-bee4cb5c4d1a933d
parent: robertc at robertcollins.net-20060331005056-087a709a4786928b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: performance
timestamp: Fri 2006-03-31 19:25:41 +1100
message:
Change knit format to use non-delta, non-annotated revisions and signatures.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060331005056-087a709a4786928b
parent: robertc at robertcollins.net-20060331004711-8f55b5209a7b4dbe
committer: Robert Collins <robertc at robertcollins.net>
branch nick: performance
timestamp: Fri 2006-03-31 11:50:56 +1100
message:
Syntax being correct helps.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060331004711-8f55b5209a7b4dbe
parent: robertc at robertcollins.net-20060329182243-c6896e1a73b19e8d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: performance
timestamp: Fri 2006-03-31 11:47:11 +1100
message:
More knit micro-optimisations.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060329182243-c6896e1a73b19e8d
parent: pqm at pqm.ubuntu.com-20060329075955-de865fe54faae442
committer: Robert Collins <robertc at robertcollins.net>
branch nick: performance
timestamp: Thu 2006-03-30 05:22:43 +1100
message:
Cache the index number of versions in the knit index's self._cache so that
we do not need to call list.index at all with knits.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060406115819-479ae52584747faa
parent: pqm at pqm.ubuntu.com-20060406104103-849a925941c89106
parent: abentley at panoramicfeedback.com-20060403150516-f41d720befa96522
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-04-06 12:58:19 +0100
message:
Pass note up the stack instead of using bzrlib.ui_factory
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060403150516-f41d720befa96522
parent: abentley at panoramicfeedback.com-20060403142927-3702d2c4aa57fe1d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.progress
timestamp: Mon 2006-04-03 11:05:16 -0400
message:
Pass note up the stack instead of using bzrlib.ui_factory
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060406104103-849a925941c89106
parent: pqm at pqm.ubuntu.com-20060406102903-12beeeb5bc2cacaf
parent: robertc at robertcollins.net-20060406102112-d4268ed62901e6aa
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-04-06 11:41:03 +0100
message:
Change the basis-inventory file to not have the revision-id in the file name.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060406102112-d4268ed62901e6aa
parent: robertc at robertcollins.net-20060406101327-f1c3234827877306
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-04-06 20:21:12 +1000
message:
Change the basis-inventory file to not have the revision-id in the file name.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060406102903-12beeeb5bc2cacaf
parent: pqm at pqm.ubuntu.com-20060406060515-5af2d71d458046b7
parent: robertc at robertcollins.net-20060406101327-f1c3234827877306
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-04-06 11:29:03 +0100
message:
Update HACKING to reflect current test writing policy.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060406101327-f1c3234827877306
parent: pqm at pqm.ubuntu.com-20060406060515-5af2d71d458046b7
parent: pqm at pqm.ubuntu.com-20060405035211-6dd048f3ddc0f844
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-04-06 20:13:27 +1000
message:
Update HACKING to reflect current test writing policy.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060406060515-5af2d71d458046b7
parent: pqm at pqm.ubuntu.com-20060405035211-6dd048f3ddc0f844
parent: robertc at robertcollins.net-20060406052800-60051a1fcbbb0e1b
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-04-06 07:05:15 +0100
message:
Fix calling relpath() and abspath() on transports at their root.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060406052800-60051a1fcbbb0e1b
parent: robertc at robertcollins.net-20060405054306-bfe845e73979aadd
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-04-06 15:28:00 +1000
message:
More review fixen to the relpath at '/' fixes.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060405054306-bfe845e73979aadd
parent: pqm at pqm.ubuntu.com-20060404014851-ae9a2babfd810da1
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-04-05 15:43:06 +1000
message:
Fix calling relpath() and abspath() on transports at their root.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060405035211-6dd048f3ddc0f844
parent: pqm at pqm.ubuntu.com-20060404014851-ae9a2babfd810da1
parent: aaron.bentley at utoronto.ca-20060405005914-590c2fd9ca967bf4
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-04-05 04:52:11 +0100
message:
Shorten test dir names, to avoid path-length problems
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060405005914-590c2fd9ca967bf4
parent: aaron.bentley at utoronto.ca-20060405001928-36ebd7e7a7ce2cc0
parent: pqm at pqm.ubuntu.com-20060404014851-ae9a2babfd810da1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2006-04-04 20:59:14 -0400
message:
Updated from dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060405001928-36ebd7e7a7ce2cc0
parent: abentley at lappy-20060319061226-2312811be500591e
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2006-04-04 20:19:28 -0400
message:
Added explanatory comment
------------------------------------------------------------
merged: abentley at lappy-20060319061226-2312811be500591e
parent: abentley at lappy-20060312210537-990ab170fa45ed1b
committer: abentley <abentley at lappy>
branch nick: Aaron's mergeable stuff
timestamp: Sun 2006-03-19 01:12:26 -0500
message:
Shortened temp dir filenames
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060404014851-ae9a2babfd810da1
parent: pqm at pqm.ubuntu.com-20060404011055-cc6bc217328f4055
parent: robertc at robertcollins.net-20060404002828-7ae872815166a0e2
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-04-04 02:48:51 +0100
message:
Merge Erik Bagfors --trees option for init-repository.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060404002828-7ae872815166a0e2
parent: robertc at robertcollins.net-20060403234436-466c7aadf509e8ca
parent: erik at bagfors.nu-20060329094049-ddc3e517db0d25a1
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2006-04-04 10:28:28 +1000
message:
Merge Erik BÃ¥gfors --trees option for init-repository.
------------------------------------------------------------
merged: erik at bagfors.nu-20060329094049-ddc3e517db0d25a1
parent: erik at bagfors.nu-20060327190247-5f779fafbe699542
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.init-repo-tree
timestamp: Wed 2006-03-29 11:40:49 +0200
message:
rename --tree to --trees
------------------------------------------------------------
merged: erik at bagfors.nu-20060327190247-5f779fafbe699542
parent: erik at bagfors.nu-20060327150517-528234a7fad43092
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.init-repo-tree
timestamp: Mon 2006-03-27 21:02:47 +0200
message:
better test for --tree option
------------------------------------------------------------
merged: erik at bagfors.nu-20060327150517-528234a7fad43092
parent: erik at bagfors.nu-20060324103333-a78aa3c9464f40c6
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.init-repo-tree
timestamp: Mon 2006-03-27 17:05:17 +0200
message:
tests for --tree
------------------------------------------------------------
merged: erik at bagfors.nu-20060324103333-a78aa3c9464f40c6
parent: pqm at pqm.ubuntu.com-20060323202841-c460fdfe30972b21
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.init-repo-tree
timestamp: Fri 2006-03-24 11:33:33 +0100
message:
support for --tree in bzr init-repo
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060404011055-cc6bc217328f4055
parent: pqm at pqm.ubuntu.com-20060403225420-b86ea31effcd8e72
parent: robertc at robertcollins.net-20060403234436-466c7aadf509e8ca
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-04-04 02:10:55 +0100
message:
Merge NFS LockDir support (Aaron Bentley, Robert Collins).
------------------------------------------------------------
merged: robertc at robertcollins.net-20060403234436-466c7aadf509e8ca
parent: pqm at pqm.ubuntu.com-20060403225420-b86ea31effcd8e72
parent: robertc at robertcollins.net-20060402224219-d5a818dc987491fe
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2006-04-04 09:44:36 +1000
message:
Merge NFS LockDir support (Aaron Bentley, Robert Collins).
This also introduces a general Transport Decorator in
bzrlib.transport.decorator which can be used to modify the external
behaviour of transports with a small amount of code. (Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20060402224219-d5a818dc987491fe
parent: abentley at panoramicfeedback.com-20060328205312-914ba2c0e85bda7c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: nfslocks
timestamp: Mon 2006-04-03 08:42:19 +1000
message:
Refactor the FakeNFS support into a TransportDecorator.
* Move the existing boilerplate ReadOnly decorator logic in to a base class
'bzrlib.transport.decorator.TransportDecorator.'
* Do the same to the ReadOnlyServer to create
'bzrlib.transport.decorator.DecoratorServer'.
* Use the new decorator support to create a trivial FakeNFSTransportDecorator
class in bzrlib.transport.fakenfs.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060328205312-914ba2c0e85bda7c
parent: abentley at panoramicfeedback.com-20060323182255-a536a0f797cbf7c6
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: nfslocks
timestamp: Tue 2006-03-28 15:53:12 -0500
message:
Handle lockdirs over NFS properly
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060403225420-b86ea31effcd8e72
parent: pqm at pqm.ubuntu.com-20060403073057-a38ba31abe6849e5
parent: abentley at panoramicfeedback.com-20060403142927-3702d2c4aa57fe1d
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-04-03 23:54:20 +0100
message:
Fixed pb.note interaction with nested progress bars
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060403142927-3702d2c4aa57fe1d
parent: aaron.bentley at utoronto.ca-20060331063745-14027470af52bd3a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.progress
timestamp: Mon 2006-04-03 10:29:27 -0400
message:
Fixed test case for pb.note
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060331063745-14027470af52bd3a
parent: aaron.bentley at utoronto.ca-20060331023909-957277c1233c6aff
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.progress
timestamp: Fri 2006-03-31 01:37:45 -0500
message:
Use ui_factory.clear_term in pb.note
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060331023909-957277c1233c6aff
parent: aaron.bentley at utoronto.ca-20060318210222-8a49d67ada6f8638
parent: aaron.bentley at utoronto.ca-20060331020235-369b764c5e0478f7
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.progress
timestamp: Thu 2006-03-30 21:39:09 -0500
message:
Merge from bzr.ab.integration
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060331020235-369b764c5e0478f7
parent: aaron.bentley at utoronto.ca-20060330055417-130d43d9978feff2
parent: pqm at pqm.ubuntu.com-20060331004321-2171d32febcbfe4d
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab.integration
timestamp: Thu 2006-03-30 21:02:35 -0500
message:
Merge from bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060330055417-130d43d9978feff2
parent: aaron.bentley at utoronto.ca-20060330040520-b85604fce5e59326
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab.integration
timestamp: Thu 2006-03-30 00:54:17 -0500
message:
Bad change. (broke tests). Reverted.
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060330040520-b85604fce5e59326
parent: abentley at panoramicfeedback.com-20060329182708-32f2728cd6a2a4ca
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab.integration
timestamp: Wed 2006-03-29 23:05:20 -0500
message:
Fixed ProgressBar.note by just calling note
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060329182708-32f2728cd6a2a4ca
parent: abentley at panoramicfeedback.com-20060329150734-13b14a84e6962cf1
parent: pqm at pqm.ubuntu.com-20060329154814-a5e1b3e2b9685db3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Wed 2006-03-29 13:27:08 -0500
message:
Merge bzr.dev
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060403073057-a38ba31abe6849e5
parent: pqm at pqm.ubuntu.com-20060331004321-2171d32febcbfe4d
parent: robertc at robertcollins.net-20060403042011-46f27c2a2c8e294b
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-04-03 08:30:57 +0100
message:
Test using bzr checkout to reconstitute working trees.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060403042011-46f27c2a2c8e294b
parent: robertc at robertcollins.net-20060403030154-b74876cb608a6693
committer: Robert Collins <robertc at robertcollins.net>
branch nick: checkout
timestamp: Mon 2006-04-03 14:20:11 +1000
message:
Test using bzr checkout to reconstitute working trees.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060403030154-b74876cb608a6693
parent: robertc at robertcollins.net-20060213220923-96b1df85739f0d8c
parent: pqm at pqm.ubuntu.com-20060331004321-2171d32febcbfe4d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: checkout
timestamp: Mon 2006-04-03 13:01:54 +1000
message:
Merge in integration.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060331004321-2171d32febcbfe4d
parent: pqm at pqm.ubuntu.com-20060330053557-a81c03289ce7560d
parent: abentley at lappy-20060330051123-891ff5afa0395578
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-03-31 01:43:21 +0100
message:
Various fixes for win32
------------------------------------------------------------
merged: abentley at lappy-20060330051123-891ff5afa0395578
parent: abentley at panoramicfeedback.com-20060327171147-c62a94b1fae62e3e
committer: abentley <abentley at lappy>
branch nick: win32fixes
timestamp: Thu 2006-03-30 00:11:23 -0500
message:
Fixed transport doctest
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060327171147-c62a94b1fae62e3e
parent: abentley at lappy-20060312210537-990ab170fa45ed1b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: win32fixes
timestamp: Mon 2006-03-27 12:11:47 -0500
message:
Used osutils getcwd instead of replacing "\" with "/"
------------------------------------------------------------
merged: abentley at lappy-20060312210537-990ab170fa45ed1b
parent: abentley at lappy-20060312204258-ef087f3dbb76e33b
committer: abentley <abentley at lappy>
branch nick: Aaron's mergeable stuff
timestamp: Sun 2006-03-12 16:05:37 -0500
message:
Made ConfigObj output binary-identical files on win32 and *nix
------------------------------------------------------------
merged: abentley at lappy-20060312204258-ef087f3dbb76e33b
parent: abentley at lappy-20060312202013-2320381e7249fe9f
committer: abentley <abentley at lappy>
branch nick: Aaron's mergeable stuff
timestamp: Sun 2006-03-12 15:42:58 -0500
message:
Used ensure_config_dir exists instead of makedirs
------------------------------------------------------------
merged: abentley at lappy-20060312202013-2320381e7249fe9f
parent: abentley at lappy-20060312200719-df49c5fe6a321e00
committer: abentley <abentley at lappy>
branch nick: Aaron's mergeable stuff
timestamp: Sun 2006-03-12 15:20:13 -0500
message:
Fixed test_selftest's use of sftp
------------------------------------------------------------
merged: abentley at lappy-20060312200719-df49c5fe6a321e00
parent: abentley at lappy-20060312195725-688c6fbb14e906c6
committer: abentley <abentley at lappy>
branch nick: Aaron's mergeable stuff
timestamp: Sun 2006-03-12 15:07:19 -0500
message:
Made bzr missing . work on win32
------------------------------------------------------------
merged: abentley at lappy-20060312195725-688c6fbb14e906c6
parent: abentley at lappy-20060312195159-1fd3f3567036a91f
committer: abentley <abentley at lappy>
branch nick: Aaron's mergeable stuff
timestamp: Sun 2006-03-12 14:57:25 -0500
message:
Fixed outside working tree tests
------------------------------------------------------------
merged: abentley at lappy-20060312195159-1fd3f3567036a91f
parent: abentley at lappy-20060312194247-6081996f852da0f3
committer: abentley <abentley at lappy>
branch nick: Aaron's mergeable stuff
timestamp: Sun 2006-03-12 14:51:59 -0500
message:
Fixed config_dir thing again
------------------------------------------------------------
merged: abentley at lappy-20060312194247-6081996f852da0f3
parent: abentley at lappy-20060312193352-73526a5026fb6364
committer: abentley <abentley at lappy>
branch nick: Aaron's mergeable stuff
timestamp: Sun 2006-03-12 14:42:47 -0500
message:
Fix bound branch tests
------------------------------------------------------------
merged: abentley at lappy-20060312193352-73526a5026fb6364
parent: abentley at lappy-20060312193257-442a425992bf1e1e
committer: abentley <abentley at lappy>
branch nick: Aaron's mergeable stuff
timestamp: Sun 2006-03-12 14:33:52 -0500
message:
Fixed config directory creation in test_aliases
------------------------------------------------------------
merged: abentley at lappy-20060312193257-442a425992bf1e1e
parent: abentley at lappy-20060312190734-202e953bd969664f
committer: abentley <abentley at lappy>
branch nick: Aaron's mergeable stuff
timestamp: Sun 2006-03-12 14:32:57 -0500
message:
'fixed
------------------------------------------------------------
merged: abentley at lappy-20060312190734-202e953bd969664f
parent: abentley at lappy-20060312185411-82489676adf6deb2
committer: abentley <abentley at lappy>
branch nick: Aaron's mergeable stuff
timestamp: Sun 2006-03-12 14:07:34 -0500
message:
Fix hashcache test
------------------------------------------------------------
merged: abentley at lappy-20060312185411-82489676adf6deb2
parent: abentley at lappy-20060312184306-2581819ae1ddc21f
committer: abentley <abentley at lappy>
branch nick: Aaron's mergeable stuff
timestamp: Sun 2006-03-12 13:54:11 -0500
message:
Fix line endings in tests
------------------------------------------------------------
merged: abentley at lappy-20060312184306-2581819ae1ddc21f
parent: aaron.bentley at utoronto.ca-20060311194950-afb18014ff7c0491
committer: abentley <abentley at lappy>
branch nick: Aaron's mergeable stuff
timestamp: Sun 2006-03-12 13:43:06 -0500
message:
Fixed win32 bug with tell
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060330053557-a81c03289ce7560d
parent: pqm at pqm.ubuntu.com-20060329154814-a5e1b3e2b9685db3
parent: aaron.bentley at utoronto.ca-20060323051403-90fb2a3645c05dd1
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-03-30 06:35:57 +0100
message:
Fix uncommit to handle bound branches, and to do locking
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060323051403-90fb2a3645c05dd1
parent: abentley at panoramicfeedback.com-20060321221018-69f25fb1f6436eab
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.bound-uncommit
timestamp: Thu 2006-03-23 00:14:03 -0500
message:
Fix uncommit to handle bound branches, and to do locking
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060329154814-a5e1b3e2b9685db3
parent: pqm at pqm.ubuntu.com-20060329144218-416dff04f3fab4f7
parent: abentley at panoramicfeedback.com-20060329150734-13b14a84e6962cf1
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-03-29 16:48:14 +0100
message:
Fixed typo (Olaf Conradi)
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060329150734-13b14a84e6962cf1
parent: abentley at panoramicfeedback.com-20060329140729-e024152e4b1301d9
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Wed 2006-03-29 10:07:34 -0500
message:
Fixed typo (Olaf Conradi)
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060329144218-416dff04f3fab4f7
parent: pqm at pqm.ubuntu.com-20060329075955-de865fe54faae442
parent: abentley at panoramicfeedback.com-20060329140729-e024152e4b1301d9
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-03-29 15:42:18 +0100
message:
Fixed garbage in progress/warning interactions
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060329140729-e024152e4b1301d9
parent: abentley at panoramicfeedback.com-20060323182255-a536a0f797cbf7c6
parent: aaron.bentley at utoronto.ca-20060318210222-8a49d67ada6f8638
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Wed 2006-03-29 09:07:29 -0500
message:
Fixed garbage in progress/warning interactions
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060318210222-8a49d67ada6f8638
parent: abentley at panoramicfeedback.com-20060310205155-7dd585e1996519c5
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's integration
timestamp: Sat 2006-03-18 16:02:22 -0500
message:
Fix overall progress bar's interaction with 'note' and 'warning'
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060329075955-de865fe54faae442
parent: pqm at pqm.ubuntu.com-20060328190455-9eab3a4045b61c4a
parent: robertc at robertcollins.net-20060328152252-c828fe03375b12e4
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-03-29 08:59:55 +0100
message:
Merge in merge_sort facility.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060328152252-c828fe03375b12e4
parent: pqm at pqm.ubuntu.com-20060328113546-b4c98b0015b7f681
parent: robertc at robertcollins.net-20060328142913-ac5afb37075719c6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-03-29 02:22:52 +1100
message:
Merge in merge_sort facility.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060328142913-ac5afb37075719c6
parent: robertc at robertcollins.net-20060328111628-47766b0fdfa443ab
committer: Robert Collins <robertc at robertcollins.net>
branch nick: logsort
timestamp: Wed 2006-03-29 01:29:13 +1100
message:
Convert log to use the new tsort.merge_sort routine.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060328111628-47766b0fdfa443ab
parent: robertc at robertcollins.net-20060327070904-df062ddc4cf415ad
committer: Robert Collins <robertc at robertcollins.net>
branch nick: logsort
timestamp: Tue 2006-03-28 22:16:28 +1100
message:
Add MergeSort facility to bzrlib.tsort.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060328190455-9eab3a4045b61c4a
parent: pqm at pqm.ubuntu.com-20060328113546-b4c98b0015b7f681
parent: mbp at sourcefrog.net-20060328181846-1cbeeb403a49d5b8
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-03-28 20:04:55 +0100
message:
(mbp) disable break-lock until fixed properly
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060328181846-1cbeeb403a49d5b8
parent: pqm at pqm.ubuntu.com-20060328113546-b4c98b0015b7f681
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Tue 2006-03-28 19:18:46 +0100
message:
Disable break-lock command until it works properly
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060328113546-b4c98b0015b7f681
parent: pqm at pqm.ubuntu.com-20060327172456-dd0573475e606596
parent: mbp at sourcefrog.net-20060324191133-4f45292db5c5d487
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-03-28 12:35:46 +0100
message:
(mbp) pycurl fixes, weave commands, weave merge fixes
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060324191133-4f45292db5c5d487
parent: mbp at sourcefrog.net-20060324111204-447e9b834705153f
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Fri 2006-03-24 19:11:33 +0000
message:
(weave-merge) don't treat killed-both lines as points of agreement;
makes sure that killed-[ab] lines next to change reasons aren't
omitted from conflict descriptions.
Add more weave merge tests about line deletion.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060324111204-447e9b834705153f
parent: mbp at sourcefrog.net-20060324101822-35e1d0f4200875ac
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Fri 2006-03-24 11:12:04 +0000
message:
New 'weave-plan-merge' and 'weave-merge-text' commands lifted from weave.py
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060324101822-35e1d0f4200875ac
parent: mbp at sourcefrog.net-20060323190053-ac6b735ff74f56d7
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Fri 2006-03-24 10:18:22 +0000
message:
typo
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060323190053-ac6b735ff74f56d7
parent: mbp at sourcefrog.net-20060322180325-eff9250dcb85c390
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-03-23 19:00:53 +0000
message:
Handle 'bzr ?', etc.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060322180325-eff9250dcb85c390
parent: mbp at sourcefrog.net-20060322174849-c91b958b284cfde3
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Wed 2006-03-22 18:03:25 +0000
message:
Add missing selftest modules to setup.py
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060322174849-c91b958b284cfde3
parent: mbp at sourcefrog.net-20060322125909-7d2812715ba587b6
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Wed 2006-03-22 17:48:49 +0000
message:
Fix 'bzr -h' to show help (#35940)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060322125909-7d2812715ba587b6
parent: mbp at sourcefrog.net-20060322124432-399b346f5d4328ff
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Wed 2006-03-22 12:59:09 +0000
message:
Improved news message for checkouts
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060322124432-399b346f5d4328ff
parent: mbp at sourcefrog.net-20060322120537-8ec4c8b33db81378
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Wed 2006-03-22 12:44:32 +0000
message:
Add Pragma and Cache-control headers to urllib requests
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060327172456-dd0573475e606596
parent: pqm at pqm.ubuntu.com-20060323202841-c460fdfe30972b21
parent: robertc at robertcollins.net-20060327070904-df062ddc4cf415ad
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-03-27 18:24:56 +0100
message:
Trivial ui change to make knits clearly experimental.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060327070904-df062ddc4cf415ad
parent: pqm at pqm.ubuntu.com-20060323202841-c460fdfe30972b21
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2006-03-27 18:09:04 +1100
message:
Trivial ui change to make knits clearly experimental.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060323202841-c460fdfe30972b21
parent: pqm at pqm.ubuntu.com-20060323181104-5f493e4935693338
parent: abentley at panoramicfeedback.com-20060323182255-a536a0f797cbf7c6
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-03-23 20:28:41 +0000
message:
Adjust push warning [Matthew Fuller]
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060323182255-a536a0f797cbf7c6
parent: abentley at panoramicfeedback.com-20060323151308-ce1d9f3ad45b0454
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab.integration
timestamp: Thu 2006-03-23 13:22:55 -0500
message:
Adjust push warning [Matthew Fuller]
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060323181104-5f493e4935693338
parent: pqm at pqm.ubuntu.com-20060322194741-02adb9a088203f30
parent: abentley at panoramicfeedback.com-20060323151308-ce1d9f3ad45b0454
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-03-23 18:11:04 +0000
message:
Upgrade works in repositories
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060323151308-ce1d9f3ad45b0454
parent: abentley at panoramicfeedback.com-20060323145152-283b0bacfb77123d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab.integration
timestamp: Thu 2006-03-23 10:13:08 -0500
message:
Future-proofed the test_upgrade_repo test
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060323145152-283b0bacfb77123d
parent: aaron.bentley at utoronto.ca-20060323034108-4ff0bfd362bc55bf
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab.integration
timestamp: Thu 2006-03-23 09:51:52 -0500
message:
Upgrade works in repositories
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060323034108-4ff0bfd362bc55bf
parent: abentley at panoramicfeedback.com-20060321221018-69f25fb1f6436eab
parent: pqm at pqm.ubuntu.com-20060322194741-02adb9a088203f30
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab.integration
timestamp: Wed 2006-03-22 22:41:08 -0500
message:
Merge bzr.dev
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060322194741-02adb9a088203f30
parent: pqm at pqm.ubuntu.com-20060322121700-79ce0be81013aba1
parent: robertc at robertcollins.net-20060322162609-fd4ba4a57afd33ed
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-03-22 19:47:41 +0000
message:
Fix common_ancestor to still calculate a common ancestor when ghosts are present along all paths of ancestry - there are no 'import' revisions available.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060322162609-fd4ba4a57afd33ed
parent: robertc at robertcollins.net-20060322132114-cc057ded01411a94
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-03-23 03:26:09 +1100
message:
Fix common_ancestor to still calculate a common ancestor when ghosts are
present along all paths of ancestry - there are no 'import' revisions
available.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060322132114-cc057ded01411a94
parent: robertc at robertcollins.net-20060321124137-b9028b082c63d99d
parent: pqm at pqm.ubuntu.com-20060322121700-79ce0be81013aba1
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-03-23 00:21:14 +1100
message:
Merge from bzr.dev
------------------------------------------------------------
merged: robertc at robertcollins.net-20060321124137-b9028b082c63d99d
parent: robertc at robertcollins.net-20060320073835-61854f8dc05101b0
parent: pqm at pqm.ubuntu.com-20060320103311-a87ccd7ffe9ce14f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2006-03-21 23:41:37 +1100
message:
Merge bzr.dev.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060322121700-79ce0be81013aba1
parent: pqm at pqm.ubuntu.com-20060322082009-3520c8aac5775bea
parent: mbp at sourcefrog.net-20060322120537-8ec4c8b33db81378
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-03-22 12:17:00 +0000
message:
(mbp) pycurl fixes, other fixes, weave commands, verbose commit changes from robert
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060322120537-8ec4c8b33db81378
parent: mbp at sourcefrog.net-20060322114528-5b3d4ba72c80dead
parent: pqm at pqm.ubuntu.com-20060322082009-3520c8aac5775bea
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Wed 2006-03-22 12:05:37 +0000
message:
[merge] trunk
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060322114528-5b3d4ba72c80dead
parent: mbp at sourcefrog.net-20060321142754-f0124cd7888ced54
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Wed 2006-03-22 11:45:28 +0000
message:
Set Cache-control: max-age=0 and Pragma: no-cache
for pycurl
(Thanks jamesh)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060321142754-f0124cd7888ced54
parent: mbp at sourcefrog.net-20060321122654-514047ed65795a17
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Tue 2006-03-21 14:27:54 +0000
message:
Unify 'mv', 'move', 'rename'. (#5379, Matthew Fuller)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060321122654-514047ed65795a17
parent: mbp at sourcefrog.net-20060320230942-152767f76202f543
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Tue 2006-03-21 12:26:54 +0000
message:
New developer commands 'weave-list' and 'weave-join'.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060320230942-152767f76202f543
parent: mbp at sourcefrog.net-20060320223241-95ba66352fd77026
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Mon 2006-03-20 23:09:42 +0000
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060320223241-95ba66352fd77026
parent: mbp at sourcefrog.net-20060320200221-4341638c81ea56d3
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Mon 2006-03-20 22:32:41 +0000
message:
Cleanup and document some check code
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060320200221-4341638c81ea56d3
parent: mbp at sourcefrog.net-20060320194010-6e16a1ed5ad492f2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Mon 2006-03-20 20:02:21 +0000
message:
Verbose commit shouldn't talk about every unchanged file.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060320194010-6e16a1ed5ad492f2
parent: mbp at sourcefrog.net-20060320183433-ccd67ac1a77d40e2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Mon 2006-03-20 19:40:10 +0000
message:
Clean up cut&pasted test for verbose commit
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060320183433-ccd67ac1a77d40e2
parent: mbp at sourcefrog.net-20060320182752-44ffa76314daacb6
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Mon 2006-03-20 18:34:33 +0000
message:
Emit trace message about hash cache performance.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060320182752-44ffa76314daacb6
parent: pqm at pqm.ubuntu.com-20060320103311-a87ccd7ffe9ce14f
parent: robertc at robertcollins.net-20060320073835-61854f8dc05101b0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Mon 2006-03-20 18:27:52 +0000
message:
[merge] robertc
Fix timing dependency in hashcache test that would sometimes cause
false failure.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060320073835-61854f8dc05101b0
parent: robertc at robertcollins.net-20060320072604-c769364c9fb2ef0b
parent: pqm at pqm.ubuntu.com-20060319161404-bbeddf282f11af63
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2006-03-20 18:38:35 +1100
message:
Latest bzr.dev
------------------------------------------------------------
merged: robertc at robertcollins.net-20060320072604-c769364c9fb2ef0b
parent: robertc at robertcollins.net-20060317130304-6c5ff2ac3f6f24f7
parent: pqm at pqm.ubuntu.com-20060316205342-c9d4ed939a36dda4
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2006-03-20 18:26:04 +1100
message:
Integrate latest bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060317130304-6c5ff2ac3f6f24f7
parent: robertc at robertcollins.net-20060316215951-15c76b4d8ea06ca5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Sat 2006-03-18 00:03:04 +1100
message:
Make reconcile faster on weaves [again].
------------------------------------------------------------
merged: robertc at robertcollins.net-20060316215951-15c76b4d8ea06ca5
parent: robertc at robertcollins.net-20060316205332-f4f08a6852e590f1
parent: pqm at pqm.ubuntu.com-20060315174853-9af1dfc721b7c963
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2006-03-17 08:59:51 +1100
message:
Merge bzr.dev
------------------------------------------------------------
merged: robertc at robertcollins.net-20060316205332-f4f08a6852e590f1
parent: robertc at robertcollins.net-20060315122642-05693b82bcd6c9f5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2006-03-17 07:53:32 +1100
message:
Make commit verbose mode work!.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060315122642-05693b82bcd6c9f5
parent: robertc at robertcollins.net-20060310062058-0c6fe1a592a7718b
parent: pqm at pqm.ubuntu.com-20060313111548-a43e5df3eecad141
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-03-15 23:26:42 +1100
message:
Merge bzr.dev
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060322082009-3520c8aac5775bea
parent: pqm at pqm.ubuntu.com-20060321220428-480db3eb2b5cd932
parent: aaron.bentley at utoronto.ca-20060322042217-bdc20e3a63a9c03b
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-03-22 08:20:09 +0000
message:
Fixed merge-type weave
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060322042217-bdc20e3a63a9c03b
parent: abentley at panoramicfeedback.com-20060321221018-69f25fb1f6436eab
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.weavemerge
timestamp: Tue 2006-03-21 23:22:17 -0500
message:
Fixed merge-type weave
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060321221018-69f25fb1f6436eab
parent: abentley at panoramicfeedback.com-20060321144742-81f3405d3ede7519
parent: pqm at pqm.ubuntu.com-20060321220428-480db3eb2b5cd932
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab.integration
timestamp: Tue 2006-03-21 17:10:18 -0500
message:
merge from bzr.dev
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060321144742-81f3405d3ede7519
parent: aaron.bentley at utoronto.ca-20060319174208-c580f1144110ac11
parent: pqm at pqm.ubuntu.com-20060321143713-b999444e4c2f3687
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab.integration
timestamp: Tue 2006-03-21 09:47:42 -0500
message:
Merge from bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060319174208-c580f1144110ac11
parent: aaron.bentley at utoronto.ca-20060317044300-53ac63fe3d4a3966
parent: pqm at pqm.ubuntu.com-20060319161404-bbeddf282f11af63
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab.integration
timestamp: Sun 2006-03-19 12:42:08 -0500
message:
Merge from mainline
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060321220428-480db3eb2b5cd932
parent: pqm at pqm.ubuntu.com-20060321193708-d329560812aeb569
parent: abentley at panoramicfeedback.com-20060317203944-1d9d5fee7c4e92d5
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-03-21 22:04:28 +0000
message:
Fixed master locking in commit
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060317203944-1d9d5fee7c4e92d5
parent: pqm at pqm.ubuntu.com-20060316205342-c9d4ed939a36dda4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.masterborked
timestamp: Fri 2006-03-17 15:39:44 -0500
message:
Fixed master locking in commit
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060321193708-d329560812aeb569
parent: pqm at pqm.ubuntu.com-20060321143713-b999444e4c2f3687
parent: abentley at panoramicfeedback.com-20060321142852-a62401b4cd22094c
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-03-21 19:37:08 +0000
message:
Update NEWS
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060321142852-a62401b4cd22094c
parent: aaron.bentley at utoronto.ca-20060319165929-47a28bbe23d57f29
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.repo.ui
timestamp: Tue 2006-03-21 09:28:52 -0500
message:
Update NEWS
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060321143713-b999444e4c2f3687
parent: pqm at pqm.ubuntu.com-20060320103311-a87ccd7ffe9ce14f
parent: aaron.bentley at utoronto.ca-20060319165929-47a28bbe23d57f29
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-03-21 14:37:13 +0000
message:
Add repository support on the commandline
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060319165929-47a28bbe23d57f29
parent: aaron.bentley at utoronto.ca-20060318224432-8179961a7ab9ee68
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.repo.ui
timestamp: Sun 2006-03-19 11:59:29 -0500
message:
Updated tests per Robert Collins' suggestions
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060318224432-8179961a7ab9ee68
parent: aaron.bentley at utoronto.ca-20060318192552-dd8407119401aa12
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.repo.ui
timestamp: Sat 2006-03-18 17:44:32 -0500
message:
Bugfix when result_repo is None
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060318192552-dd8407119401aa12
parent: aaron.bentley at utoronto.ca-20060318174435-bd5f5fcbac2fae92
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.repo.ui
timestamp: Sat 2006-03-18 14:25:52 -0500
message:
Don't create unwanted working trees in branch
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060318174435-bd5f5fcbac2fae92
parent: aaron.bentley at utoronto.ca-20060317130304-2c4f95e689b729b0
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's integration
timestamp: Sat 2006-03-18 12:44:35 -0500
message:
Renamed make-repo init-repo
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060317130304-2c4f95e689b729b0
parent: aaron.bentley at utoronto.ca-20060317125810-aab432467aad9ebe
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's integration
timestamp: Fri 2006-03-17 08:03:04 -0500
message:
Added tests for branch
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060317125810-aab432467aad9ebe
parent: aaron.bentley at utoronto.ca-20060317070940-df789963405ca005
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's integration
timestamp: Fri 2006-03-17 07:58:10 -0500
message:
Added bzr init test
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060317070940-df789963405ca005
parent: aaron.bentley at utoronto.ca-20060317065921-ed1f40918a909376
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's integration
timestamp: Fri 2006-03-17 02:09:40 -0500
message:
Init command can produce sharing branches
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060317065921-ed1f40918a909376
parent: aaron.bentley at utoronto.ca-20060317053543-10e90c8ccf40122c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's integration
timestamp: Fri 2006-03-17 01:59:21 -0500
message:
Created *shared* repositories...
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060317053543-10e90c8ccf40122c
parent: aaron.bentley at utoronto.ca-20060317044300-53ac63fe3d4a3966
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's integration
timestamp: Fri 2006-03-17 00:35:43 -0500
message:
Added make-repository command
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060320103311-a87ccd7ffe9ce14f
parent: pqm at pqm.ubuntu.com-20060319161404-bbeddf282f11af63
parent: mbp at sourcefrog.net-20060320095825-ed99032ef9743cc8
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-03-20 10:33:11 +0000
message:
(mbp) pycurl bugfixes, robert's knit performance stuff
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060320095825-ed99032ef9743cc8
parent: mbp at sourcefrog.net-20060320090242-b1e492be1b6bcb7e
parent: robertc at robertcollins.net-20060314102728-7e47b9b8cd6c3d73
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Mon 2006-03-20 09:58:25 +0000
message:
[merge] robert's knit-performance work
------------------------------------------------------------
merged: robertc at robertcollins.net-20060314102728-7e47b9b8cd6c3d73
parent: robertc at robertcollins.net-20060313110344-f82a10b55cba1f99
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Tue 2006-03-14 21:27:28 +1100
message:
rollback from using deltas to using fulltexts - deltas need more work to be ready.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060313110344-f82a10b55cba1f99
parent: robertc at robertcollins.net-20060313081347-2d77927bbf4385ec
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Mon 2006-03-13 22:03:44 +1100
message:
Switch to delta based content copying in the generic versioned file copier.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060313081347-2d77927bbf4385ec
parent: robertc at robertcollins.net-20060312170911-306a47e0478ec183
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Mon 2006-03-13 19:13:47 +1100
message:
add a get_delta api to versioned_file.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060312170911-306a47e0478ec183
parent: robertc at robertcollins.net-20060312161413-571daaeb22adb0bb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Mon 2006-03-13 04:09:11 +1100
message:
Subclass SequenceMatcher to get a slightly faster (in our case) find_longest_match routine.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060312161413-571daaeb22adb0bb
parent: robertc at robertcollins.net-20060312152823-ff909f6b65a8d4e3
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Mon 2006-03-13 03:14:13 +1100
message:
Optimise knit add to only diff once per parent, not once per parent + once for the delta generation.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060312152823-ff909f6b65a8d4e3
parent: robertc at robertcollins.net-20060312145732-78cb2cc26ae0f578
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Mon 2006-03-13 02:28:23 +1100
message:
Do not cause construction of temporary knits when we are fetching and the target does not exist.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060312145732-78cb2cc26ae0f578
parent: robertc at robertcollins.net-20060312112830-1061d51acba96613
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Mon 2006-03-13 01:57:32 +1100
message:
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060312112830-1061d51acba96613
parent: robertc at robertcollins.net-20060311214632-85c06c12f42a7062
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Sun 2006-03-12 22:28:30 +1100
message:
Remove a list __contains__ usage in weave operations.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060311214632-85c06c12f42a7062
parent: robertc at robertcollins.net-20060311150940-4a23f262987da902
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Sun 2006-03-12 08:46:32 +1100
message:
Unbreak backwards compatability on weave.get_lines.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060311150940-4a23f262987da902
parent: robertc at robertcollins.net-20060311145354-84be4503f55af670
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Sun 2006-03-12 02:09:40 +1100
message:
Make weave.get_lines faster.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060311145354-84be4503f55af670
parent: robertc at robertcollins.net-20060311135848-789fa616b8da4662
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Sun 2006-03-12 01:53:54 +1100
message:
more knit profile based tuning.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060311135848-789fa616b8da4662
parent: robertc at robertcollins.net-20060311133519-961e7e79773ad566
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Sun 2006-03-12 00:58:48 +1100
message:
Note potential improvements in knit adds.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060311133519-961e7e79773ad566
parent: robertc at robertcollins.net-20060311132750-96b92a1a5dc7907b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Sun 2006-03-12 00:35:19 +1100
message:
gzip.writelines was unreasonably slow.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060311132750-96b92a1a5dc7907b
parent: robertc at robertcollins.net-20060311130748-f3920b2fe72ee9f7
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Sun 2006-03-12 00:27:50 +1100
message:
Weave._extract should be faster
------------------------------------------------------------
merged: robertc at robertcollins.net-20060311130748-f3920b2fe72ee9f7
parent: robertc at robertcollins.net-20060311124859-8e1f578f392625cb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Sun 2006-03-12 00:07:48 +1100
message:
Gzipfile was slightly slower than ideal.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060311124859-8e1f578f392625cb
parent: robertc at robertcollins.net-20060311124317-0236baa207cdca3b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Sat 2006-03-11 23:48:59 +1100
message:
Doh, fetch-pb-unbreak.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060311124317-0236baa207cdca3b
parent: robertc at robertcollins.net-20060311110207-5377d0c9aa652eac
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Sat 2006-03-11 23:43:17 +1100
message:
Fetch changes to use new pb.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060311110207-5377d0c9aa652eac
parent: robertc at robertcollins.net-20060311085010-9031102e3e20cfcd
parent: robertc at robertcollins.net-20060310062058-0c6fe1a592a7718b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Sat 2006-03-11 22:02:07 +1100
message:
Merge bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060310062058-0c6fe1a592a7718b
parent: robertc at robertcollins.net-20060310020640-3cfd354a1d3dd426
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2006-03-10 17:20:58 +1100
message:
Apply David Allouches list_dir quoting fix.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060311085010-9031102e3e20cfcd
parent: robertc at robertcollins.net-20060311050453-ca5a7aaad2930c13
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Sat 2006-03-11 19:50:10 +1100
message:
optimise commit to only access weaves for merged, or altered files during commit.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060311050453-ca5a7aaad2930c13
parent: robertc at robertcollins.net-20060310221908-7c6d446b9aa88eb1
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Sat 2006-03-11 16:04:53 +1100
message:
Shave 20% off id2path.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060310221908-7c6d446b9aa88eb1
parent: robertc at robertcollins.net-20060310212204-4af1843b38ab013d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Sat 2006-03-11 09:19:08 +1100
message:
More microopimisations on index reading, now down to 16000 records/seconds.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060310212204-4af1843b38ab013d
parent: robertc at robertcollins.net-20060310205312-287d0ea17cbbf4d8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Sat 2006-03-11 08:22:04 +1100
message:
Notes on further progress tuning.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060310205312-287d0ea17cbbf4d8
parent: robertc at robertcollins.net-20060310202334-8c9f1bf1d93c4e89
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Sat 2006-03-11 07:53:12 +1100
message:
Microprofiling: progress.update was costing 0.01 ms per call in time.time.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060310202334-8c9f1bf1d93c4e89
parent: robertc at robertcollins.net-20060310052614-cadfab7752cd901b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Sat 2006-03-11 07:23:34 +1100
message:
Microprofiling of knit parsing.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060310052614-cadfab7752cd901b
parent: robertc at robertcollins.net-20060309234535-c9df2babefcd1748
parent: robertc at robertcollins.net-20060310020640-3cfd354a1d3dd426
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Fri 2006-03-10 16:26:14 +1100
message:
Make knit parsing non quadratic?
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060320090242-b1e492be1b6bcb7e
parent: pqm at pqm.ubuntu.com-20060319161404-bbeddf282f11af63
parent: mbp at sourcefrog.net-20060317124950-a2ba9b8473468c11
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Mon 2006-03-20 09:02:42 +0000
message:
[merge] my previous work, including pycurl regression
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060317124950-a2ba9b8473468c11
parent: mbp at sourcefrog.net-20060316202434-c545186fba141b8d
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Fri 2006-03-17 12:49:50 +0000
message:
Fix regression of wrong superclass for TestLocationConfig
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060316202434-c545186fba141b8d
parent: mbp at sourcefrog.net-20060316202032-d044f29e7d81b333
parent: mbp at sourcefrog.net-20060316200236-36b7bbaafd2cef9a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-03-16 20:24:34 +0000
message:
[merge] pycurl
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060316202032-d044f29e7d81b333
parent: mbp at sourcefrog.net-20060316195701-aa7057ecdc25840d
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-03-16 20:20:32 +0000
message:
Update version numbers
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060316195701-aa7057ecdc25840d
parent: mbp at sourcefrog.net-20060316191429-ef69928d5ca02403
parent: michael at ellerman.id.au-20060309002448-70cce15e3d605130
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-03-16 19:57:01 +0000
message:
[merge] mpe
------------------------------------------------------------
merged: michael at ellerman.id.au-20060309002448-70cce15e3d605130
parent: michael at ellerman.id.au-20060308055936-2fc80d3331e44e34
committer: Michael Ellerman <michael at ellerman.id.au>
branch nick: mpe
timestamp: Thu 2006-03-09 11:24:48 +1100
message:
Make the "ignore line" in the commit message editor the "right" width, so
that if you make your message that wide it won't wrap in bzr log output.
Just as a visual aid.
------------------------------------------------------------
merged: michael at ellerman.id.au-20060308055936-2fc80d3331e44e34
parent: michael at ellerman.id.au-20060307101736-05dc6e9314566d0c
committer: Michael Ellerman <michael at ellerman.id.au>
branch nick: mpe
timestamp: Wed 2006-03-08 16:59:36 +1100
message:
Define __str__ for BranchFormat, just return the format string with the
trailing newline stripped. Override __str__ for BranchFormat4 because
it doesn't have a format string. This fixes ugliness in the UI where
people print branch._format, bzr check for one. Fixes bug #33453.
------------------------------------------------------------
merged: michael at ellerman.id.au-20060307101736-05dc6e9314566d0c
parent: michael at ellerman.id.au-20060228091909-c5d7bc5a186b8a55
parent: pqm at pqm.ubuntu.com-20060307013022-b9258d2a0c135498
committer: Michael Ellerman <michael at ellerman.id.au>
branch nick: mpe
timestamp: Tue 2006-03-07 21:17:36 +1100
message:
Merge mainline.
------------------------------------------------------------
merged: michael at ellerman.id.au-20060228091909-c5d7bc5a186b8a55
parent: michael at ellerman.id.au-20060228091032-cb4a4a6e5e4d7df6
committer: Michael Ellerman <michael at ellerman.id.au>
branch nick: mpe
timestamp: Tue 2006-02-28 20:19:09 +1100
message:
Remove double class definition of TestLocationConfig. This causes another
26 tests to be run, all of which pass.
------------------------------------------------------------
merged: michael at ellerman.id.au-20060228091032-cb4a4a6e5e4d7df6
parent: michael at ellerman.id.au-20060228083521-15796152a3f1cbb4
committer: Michael Ellerman <michael at ellerman.id.au>
branch nick: mpe
timestamp: Tue 2006-02-28 20:10:32 +1100
message:
Produce an intelligible error if the user's /etc/passwd is not encoded in
UTF-8 and we're trying to decode it as UTF-8. This fixes bug 3452.
------------------------------------------------------------
merged: michael at ellerman.id.au-20060228083521-15796152a3f1cbb4
parent: michael at ellerman.id.au-20060216005059-dde4ec75b1b58ebf
parent: pqm at pqm.ubuntu.com-20060228043846-eb79299c08edb05c
committer: Michael Ellerman <michael at ellerman.id.au>
branch nick: mpe
timestamp: Tue 2006-02-28 19:35:21 +1100
message:
Merge mainline
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060319161404-bbeddf282f11af63
parent: pqm at pqm.ubuntu.com-20060316205342-c9d4ed939a36dda4
parent: aaron.bentley at utoronto.ca-20060319154400-c58a9ec8b37b3e5d
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2006-03-19 16:14:04 +0000
message:
Removed unused error
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060319154400-c58a9ec8b37b3e5d
parent: aaron.bentley at utoronto.ca-20060318234051-415e5fcb51da82e4
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mergeself
timestamp: Sun 2006-03-19 10:44:00 -0500
message:
Removed unused error
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060318234051-415e5fcb51da82e4
parent: aaron.bentley at utoronto.ca-20060317044300-53ac63fe3d4a3966
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mergeself
timestamp: Sat 2006-03-18 18:40:51 -0500
message:
Allow merge against self, make fetching self a noop
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060317044300-53ac63fe3d4a3966
parent: abentley at panoramicfeedback.com-20060315172753-31fb96afb635cec1
parent: pqm at pqm.ubuntu.com-20060316205342-c9d4ed939a36dda4
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's integration
timestamp: Thu 2006-03-16 23:43:00 -0500
message:
Merge bzr.dev
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060316205342-c9d4ed939a36dda4
parent: pqm at pqm.ubuntu.com-20060316193744-3fcf853ba6d5b713
parent: mbp at sourcefrog.net-20060316200236-36b7bbaafd2cef9a
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-03-16 20:53:42 +0000
message:
Fix pycurl error reporting
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060316200236-36b7bbaafd2cef9a
parent: pqm at pqm.ubuntu.com-20060315174853-9af1dfc721b7c963
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2006-03-16 20:02:36 +0000
message:
Raise errors correctly on pycurl connection failure
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060316193744-3fcf853ba6d5b713
parent: pqm at pqm.ubuntu.com-20060315174853-9af1dfc721b7c963
parent: mbp at sourcefrog.net-20060316191429-ef69928d5ca02403
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-03-16 19:37:44 +0000
message:
Several small fixes
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060316191429-ef69928d5ca02403
parent: mbp at sourcefrog.net-20060316145824-550a15b8ba1491df
parent: pqm at pqm.ubuntu.com-20060315174853-9af1dfc721b7c963
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-03-16 19:14:29 +0000
message:
merge bzr.dev
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060316145824-550a15b8ba1491df
parent: mbp at sourcefrog.net-20060316145545-124f96fa0c9e9461
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2006-03-16 14:58:24 +0000
message:
Show a message while deleting the test directories
It can take quite a while
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060316145545-124f96fa0c9e9461
parent: mbp at sourcefrog.net-20060316125316-f152367d62a87f6f
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2006-03-16 14:55:45 +0000
message:
Stop selftest failing when run outside of bzr source directory
It was trying to import tools.doc_generate, which is used to generate the man
page but is not installed by setup.py. Skip the test if it can't be run.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060316125316-f152367d62a87f6f
parent: mbp at sourcefrog.net-20060313164851-620b667bf518c996
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2006-03-16 12:53:16 +0000
message:
Doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060313164851-620b667bf518c996
parent: mbp at sourcefrog.net-20060313164557-8c0dfeef44fc7c0a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2006-03-13 16:48:51 +0000
message:
Better error message for Command.run() not implemented
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060313164557-8c0dfeef44fc7c0a
parent: mbp at sourcefrog.net-20060313163840-f8c21cf25dcba892
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2006-03-13 16:45:57 +0000
message:
Move rarely-used import into Command.help()
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060313163840-f8c21cf25dcba892
parent: pqm at pqm.ubuntu.com-20060312001904-3bcd7cbf830cc37c
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2006-03-13 16:38:40 +0000
message:
Remove factored-out get_weave methods that were never called
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060315174853-9af1dfc721b7c963
parent: pqm at pqm.ubuntu.com-20060313111548-a43e5df3eecad141
parent: abentley at panoramicfeedback.com-20060315172753-31fb96afb635cec1
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-03-15 17:48:53 +0000
message:
Merged showing parent in info
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060315172753-31fb96afb635cec1
parent: abentley at panoramicfeedback.com-20060314142816-2bcc49ace313648c
parent: olaf at conradi.org-20060315135919-cf48fa226c66646e
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Wed 2006-03-15 12:27:53 -0500
message:
Merged showing parent in info
------------------------------------------------------------
merged: olaf at conradi.org-20060315135919-cf48fa226c66646e
parent: pqm at pqm.ubuntu.com-20060313111548-a43e5df3eecad141
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf
timestamp: Wed 2006-03-15 14:59:19 +0100
message:
Add parent location to info command (Closes feature bug #33364).
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060314142816-2bcc49ace313648c
parent: abentley at panoramicfeedback.com-20060310205155-7dd585e1996519c5
parent: pqm at pqm.ubuntu.com-20060313111548-a43e5df3eecad141
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Tue 2006-03-14 09:28:16 -0500
message:
Merge from mainline
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060313111548-a43e5df3eecad141
parent: pqm at pqm.ubuntu.com-20060312001904-3bcd7cbf830cc37c
parent: mbp at sourcefrog.net-20060312160001-f6b3fd167b668e7e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-03-13 11:15:48 +0000
message:
PyCurl range-request integration
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060312160001-f6b3fd167b668e7e
parent: mbp at sourcefrog.net-20060312155822-94e98ec4d9c0c09a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2006-03-12 16:00:01 +0000
message:
Fix http tests that were failing to run tearDown when setup got a missing dependency
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060312155822-94e98ec4d9c0c09a
parent: mbp at sourcefrog.net-20060312152226-444c3f03d72f9c8e
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2006-03-12 15:58:22 +0000
message:
Clean up test_setup code; avoid possible pipe jam
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060312152226-444c3f03d72f9c8e
parent: mbp at sourcefrog.net-20060312151819-7e3b4d709bc6fc61
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2006-03-12 15:22:26 +0000
message:
Fix up TestSetup.tearDown - shouldn't try to remove nonexistent directory
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060312151819-7e3b4d709bc6fc61
parent: mbp at sourcefrog.net-20060312150248-328c8ca89743c29d
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2006-03-12 15:18:19 +0000
message:
Fix up bogus-url tests for broken dns servers, and error imports
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060312150248-328c8ca89743c29d
parent: mbp at sourcefrog.net-20060312145613-c315fd6e73f6c294
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2006-03-12 15:02:48 +0000
message:
Prevent selftest failure when pycurl is not installed
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060312145613-c315fd6e73f6c294
parent: mbp at sourcefrog.net-20060310073752-03c7a792c3301e0e
parent: pqm at pqm.ubuntu.com-20060312001904-3bcd7cbf830cc37c
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2006-03-12 14:56:13 +0000
message:
[merge] bzr.dev
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060310073752-03c7a792c3301e0e
parent: mbp at sourcefrog.net-20060310062953-bc1c7ade75c89a7a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2006-03-10 18:37:52 +1100
message:
Integrate http range support for pycurl
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060310062953-bc1c7ade75c89a7a
parent: mbp at sourcefrog.net-20060309091102-dd5ab6eca97d4c08
parent: pqm at pqm.ubuntu.com-20060310021935-2da34b3a9b5d5e25
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2006-03-10 17:29:53 +1100
message:
[merge] bzr.dev; pycurl not updated for readv yet
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060309091102-dd5ab6eca97d4c08
parent: mbp at sourcefrog.net-20060309080151-ad1d845b9aeae633
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2006-03-09 20:11:02 +1100
message:
New 'http+urllib' scheme
Move _real_abspath up to HttpTransportBase -- this just removes the
implementation qualifier from the scheme.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060309080151-ad1d845b9aeae633
parent: mbp at sourcefrog.net-20060308035552-a3b872720630721e
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2006-03-09 19:01:51 +1100
message:
Add new protocol 'http+pycurl' that always uses PyCurl.
A special http server is provided for testing that asks clients to connect
this way.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060308035552-a3b872720630721e
parent: mbp at sourcefrog.net-20060308011040-356245d526340960
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Wed 2006-03-08 14:55:52 +1100
message:
Allow urls like http+pycurl://host/ to use a particular impl
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060308011040-356245d526340960
parent: mbp at sourcefrog.net-20060307082313-6ed75701c8fff2b4
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Wed 2006-03-08 12:10:40 +1100
message:
[patch] Add TestCase.assertIsInstance
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060307082313-6ed75701c8fff2b4
parent: mbp at sourcefrog.net-20060307082237-3e46d850858aec37
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Tue 2006-03-07 19:23:13 +1100
message:
Trim test for TestTransportProviderAdapter to be less dependent on
builtin transports
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060307082237-3e46d850858aec37
parent: mbp at sourcefrog.net-20060307082208-2e9f964ee73d5eb3
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Tue 2006-03-07 19:22:37 +1100
message:
Construct unique test directory names even when test ids recurr
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060307082208-2e9f964ee73d5eb3
parent: mbp at sourcefrog.net-20060307071940-7cb4e06a66645fec
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Tue 2006-03-07 19:22:08 +1100
message:
Transport tests should always construct the precise transport to be tested
even if there are others that would serve the same protocol
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060307071940-7cb4e06a66645fec
parent: mbp at sourcefrog.net-20060306112949-4f5ff861d863b8b3
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Tue 2006-03-07 18:19:40 +1100
message:
Style review fixes (thanks robertc)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060306112949-4f5ff861d863b8b3
parent: mbp at sourcefrog.net-20060306112625-5f01ec1a7dd2c645
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2006-03-06 22:29:49 +1100
message:
Reenable urllib transport
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060306112625-5f01ec1a7dd2c645
parent: mbp at sourcefrog.net-20060306112010-17c0170dde5d1eea
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2006-03-06 22:26:25 +1100
message:
todo
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060306112010-17c0170dde5d1eea
parent: mbp at sourcefrog.net-20060306094922-6a0ccdd7d6637cda
parent: pqm at pqm.ubuntu.com-20060306074417-344f1d83d99b9730
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2006-03-06 22:20:10 +1100
message:
[merge] large merge to sync with bzr.dev
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060306094922-6a0ccdd7d6637cda
parent: mbp at sourcefrog.net-20060306094405-12f57849f4e01cb4
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2006-03-06 20:49:22 +1100
message:
[pycurl] Make Curl instance a local variable not a long-lived object.
There seems no value in keeping it around and in fact it was not retained for
any time.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060306094405-12f57849f4e01cb4
parent: mbp at sourcefrog.net-20060306091132-22232ddbf954a312
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2006-03-06 20:44:05 +1100
message:
Curl should follow http redirects, the same as urllib
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060306091132-22232ddbf954a312
parent: mbp at sourcefrog.net-20060306085529-95ddffee6a7afc17
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2006-03-06 20:11:32 +1100
message:
Multiple transports can be registered for any protocol, and they are
tried in order.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060306085529-95ddffee6a7afc17
parent: mbp at sourcefrog.net-20060306072148-d7a8823cc828da7f
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2006-03-06 19:55:29 +1100
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060306072148-d7a8823cc828da7f
parent: mbp at sourcefrog.net-20060220040856-e58605288737ad5c
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2006-03-06 18:21:48 +1100
message:
[broken] keep hooking pycurl into test framework
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060220040856-e58605288737ad5c
parent: mbp at sourcefrog.net-20060210090435-a53447137885cb1f
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2006-02-20 15:08:56 +1100
message:
Make sure bzrlib.transport.http gets installed
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060210090435-a53447137885cb1f
parent: mbp at sourcefrog.net-20060210062523-ab69c1d5f17253bc
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2006-02-10 20:04:35 +1100
message:
Some support for falling back between transport implementations.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060210062523-ab69c1d5f17253bc
parent: mbp at sourcefrog.net-20060210060722-89e4007ffbceba04
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2006-02-10 17:25:23 +1100
message:
Prepare to select a transport depending on what dependencies can be satisfied.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060210060722-89e4007ffbceba04
parent: mbp at sourcefrog.net-20060210043957-26d6fac8bab3f654
parent: mbp at sourcefrog.net-20060210003925-8c64dd0c0a16d177
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2006-02-10 17:07:22 +1100
message:
[merge] update from bzr.dev
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060210043957-26d6fac8bab3f654
parent: mbp at sourcefrog.net-20060210043835-158a13008b991b1c
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2006-02-10 15:39:57 +1100
message:
Raise exception if unicode is passed to transport; formatting fixes
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060210043835-158a13008b991b1c
parent: mbp at sourcefrog.net-20060113095713-1fa5912229a3898e
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2006-02-10 15:38:35 +1100
message:
Update BRANCH.TODO
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060113095713-1fa5912229a3898e
parent: mbp at sourcefrog.net-20060112053545-c408cfdd98427725
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2006-01-13 20:57:13 +1100
message:
Review updates of pycurl transport
Split them out into
bzrlib.transport.http common base
bzrlib.transport.http._urllib pure python
bzrlib.transport.http._pycurl calls pycurl
Update to work with robert's nice transport test multiplexer.
Add PyCurlTransport.has() which does just a HEAD request; should be faster.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060112053545-c408cfdd98427725
parent: mbp at sourcefrog.net-20060110061150-77fa0e14e45ffacf
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2006-01-12 16:35:45 +1100
message:
Remove obsolete (and no-op) `decode` parameter to `Transport.get`.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060110061150-77fa0e14e45ffacf
parent: mbp at sourcefrog.net-20060109015138-d6d6eeb91df1ff0a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Tue 2006-01-10 17:11:50 +1100
message:
First-cut implementation of pycurl. Substantially faster than using urllib.
This always overrides urllib and so will fail on machines that don't have it.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060312001904-3bcd7cbf830cc37c
parent: pqm at pqm.ubuntu.com-20060310143059-b93853acc89f3a6b
parent: aaron.bentley at utoronto.ca-20060311194950-afb18014ff7c0491
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2006-03-12 00:19:04 +0000
message:
Make pull update the progress bar more nicely
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060311194950-afb18014ff7c0491
parent: aaron.bentley at utoronto.ca-20060310045903-c8ca6fd89dfb3ac4
parent: abentley at panoramicfeedback.com-20060310205155-7dd585e1996519c5
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sat 2006-03-11 14:49:50 -0500
message:
Merge from bzr.ab.integration
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060310205155-7dd585e1996519c5
parent: aaron.bentley at utoronto.ca-20060310012247-c1047250bef6c49a
parent: pqm at pqm.ubuntu.com-20060310143059-b93853acc89f3a6b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Fri 2006-03-10 15:51:55 -0500
message:
Merge from bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060310012247-c1047250bef6c49a
parent: aaron.bentley at utoronto.ca-20060310001858-72b1a0a70172263c
parent: pqm at pqm.ubuntu.com-20060310010444-ca8e101f47014c66
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's integration
timestamp: Thu 2006-03-09 20:22:47 -0500
message:
Merge from bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060310045903-c8ca6fd89dfb3ac4
parent: abentley at panoramicfeedback.com-20060309230946-17940a3d767d17b8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2006-03-09 23:59:03 -0500
message:
Make pull update the progress bar more nicely
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060310143059-b93853acc89f3a6b
parent: pqm at pqm.ubuntu.com-20060310021935-2da34b3a9b5d5e25
parent: mbp at sourcefrog.net-20060310084726-11b359658759d929
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-03-10 14:30:59 +0000
message:
LocalTransport quoting fix from ddaa
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060310084726-11b359658759d929
parent: mbp at sourcefrog.net-20060310060925-7b26b6236c7cd6e5
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2006-03-10 19:47:26 +1100
message:
Remove pointless file bzrlib/tests/test_reweave.py.moved that was still hanging around for some reason.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060310060925-7b26b6236c7cd6e5
parent: pqm at pqm.ubuntu.com-20060310021935-2da34b3a9b5d5e25
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2006-03-10 17:09:25 +1100
message:
[patch] LocalTransport.list_dir should return url-quoted strings (ddaa)
When trying to convert a Launchpad branch into metadir format, I hit a
bug caused by incorrect url quoting in LocalTransport (one of weaves has
a '/' in its id).
The attached patch fix LocalTransport.list_dir to allow converting
Launchpad to metadir. It should probably be augmented by a number of
test cases, and probably overlaps wildly with John's local transport
quoting branch. But I'm posting it here for the record.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060310021935-2da34b3a9b5d5e25
parent: pqm at pqm.ubuntu.com-20060310010444-ca8e101f47014c66
parent: robertc at robertcollins.net-20060310020640-3cfd354a1d3dd426
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-03-10 02:19:35 +0000
message:
Merge in knit-using-revision-versioned-file-graph tuning work.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060310020640-3cfd354a1d3dd426
parent: robertc at robertcollins.net-20060310020426-794a8d514de7c951
parent: robertc at robertcollins.net-20060309234535-c9df2babefcd1748
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2006-03-10 13:06:40 +1100
message:
Merge in knit-using-revision-versioned-file-graph tuning work.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060309234535-c9df2babefcd1748
parent: robertc at robertcollins.net-20060309233134-27ce58cfade97682
parent: robertc at robertcollins.net-20060309215559-ce35a155f135ffcc
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Fri 2006-03-10 10:45:35 +1100
message:
Merge integration.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060309233134-27ce58cfade97682
parent: robertc at robertcollins.net-20060309213249-300fd49ec4594da8
parent: pqm at pqm.ubuntu.com-20060309210459-a48571e310db5c23
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Fri 2006-03-10 10:31:34 +1100
message:
Merge and make Knit Repository use the revision store for all possible queries.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060310020426-794a8d514de7c951
parent: pqm at pqm.ubuntu.com-20060310010444-ca8e101f47014c66
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2006-03-10 13:04:26 +1100
message:
Unbreak weave joins when the source weave has less parent information than the target.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060310010444-ca8e101f47014c66
parent: pqm at pqm.ubuntu.com-20060310002657-2884f3b271336e36
parent: aaron.bentley at utoronto.ca-20060310001858-72b1a0a70172263c
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-03-10 01:04:44 +0000
message:
Trivial remerge fix
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060310001858-72b1a0a70172263c
parent: abentley at panoramicfeedback.com-20060309213704-2aed92beb0d3259e
parent: aaron.bentley at utoronto.ca-20060308071612-c2a4d6025ac7eff4
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's integration
timestamp: Thu 2006-03-09 19:18:58 -0500
message:
Trivial remerge fix
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060308071612-c2a4d6025ac7eff4
parent: aaron.bentley at utoronto.ca-20060308060843-7284a9b71ec43c21
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-03-08 02:16:12 -0500
message:
Stop using deprecated api in remerge
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060310002657-2884f3b271336e36
parent: pqm at pqm.ubuntu.com-20060309223311-9b952a772944e322
parent: abentley at panoramicfeedback.com-20060309230946-17940a3d767d17b8
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-03-10 00:26:57 +0000
message:
Stop division by zero
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060309230946-17940a3d767d17b8
parent: abentley at panoramicfeedback.com-20060309165336-f459a54797d6b6a3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's small fixes
timestamp: Thu 2006-03-09 18:09:46 -0500
message:
Fix division-by-zero
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060309223311-9b952a772944e322
parent: pqm at pqm.ubuntu.com-20060309222250-8bc4180b1ba28f13
parent: robertc at robertcollins.net-20060309215559-ce35a155f135ffcc
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-03-09 22:33:11 +0000
message:
Merge knit utf8 and reannotate-less support.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060309215559-ce35a155f135ffcc
parent: pqm at pqm.ubuntu.com-20060309210459-a48571e310db5c23
parent: robertc at robertcollins.net-20060309213249-300fd49ec4594da8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2006-03-10 08:55:59 +1100
message:
Merge knit utf8 and reannotate-less support.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060309213249-300fd49ec4594da8
parent: robertc at robertcollins.net-20060309204610-042bfd97c773fe24
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Fri 2006-03-10 08:32:49 +1100
message:
Remove utf8 debugging code
------------------------------------------------------------
merged: robertc at robertcollins.net-20060309204610-042bfd97c773fe24
parent: robertc at robertcollins.net-20060309203318-c67d28910f113bed
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Fri 2006-03-10 07:46:10 +1100
message:
Reviewer feedback on knit branches.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060309203318-c67d28910f113bed
parent: robertc at robertcollins.net-20060309123455-9a14c99c11e62537
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Fri 2006-03-10 07:33:18 +1100
message:
Utf8 safety in knit indexes.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060309123455-9a14c99c11e62537
parent: robertc at robertcollins.net-20060309112848-d2206b69f357ae57
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Thu 2006-03-09 23:34:55 +1100
message:
Join knits with the original gzipped data avoiding recompression.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060309112848-d2206b69f357ae57
parent: robertc at robertcollins.net-20060309061524-74c42a273f335e85
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Thu 2006-03-09 22:28:48 +1100
message:
Remove the requirement for reannotation in knit joins.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060309222250-8bc4180b1ba28f13
parent: pqm at pqm.ubuntu.com-20060309210459-a48571e310db5c23
parent: abentley at panoramicfeedback.com-20060309213704-2aed92beb0d3259e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-03-09 22:22:50 +0000
message:
small fixes
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060309213704-2aed92beb0d3259e
parent: abentley at panoramicfeedback.com-20060309170600-f47c647f127ea53a
parent: pqm at pqm.ubuntu.com-20060309210459-a48571e310db5c23
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Thu 2006-03-09 16:37:04 -0500
message:
Merge from bzr.dev
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060309170600-f47c647f127ea53a
parent: abentley at panoramicfeedback.com-20060309144012-40b703fe0d6541ad
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Thu 2006-03-09 12:06:00 -0500
message:
Merge_modified performance/concurrency fix
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060309144012-40b703fe0d6541ad
parent: abentley at panoramicfeedback.com-20060309143308-9ef11e32a83c4fed
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Thu 2006-03-09 09:40:12 -0500
message:
Revert in checkout works properly
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060309143308-9ef11e32a83c4fed
parent: abentley at panoramicfeedback.com-20060307184118-b18cf90f2bf4e6d8
parent: pqm at pqm.ubuntu.com-20060309085048-37f21fd146dabe93
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Thu 2006-03-09 09:33:08 -0500
message:
Merge from mainline
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060309210459-a48571e310db5c23
parent: pqm at pqm.ubuntu.com-20060309085048-37f21fd146dabe93
parent: abentley at panoramicfeedback.com-20060309165336-f459a54797d6b6a3
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-03-09 21:04:59 +0000
message:
Progress bar shows overall progress
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060309165336-f459a54797d6b6a3
parent: abentley at panoramicfeedback.com-20060309164306-490b787135febb2c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's small fixes
timestamp: Thu 2006-03-09 11:53:36 -0500
message:
Refactored the revert phases
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060309164306-490b787135febb2c
parent: abentley at panoramicfeedback.com-20060309163549-f638fe6c4cd1539d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's small fixes
timestamp: Thu 2006-03-09 11:43:06 -0500
message:
Hide ETA, show spinner by default
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060309163549-f638fe6c4cd1539d
parent: abentley at panoramicfeedback.com-20060308222902-11c7991dded15b48
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's small fixes
timestamp: Thu 2006-03-09 11:35:49 -0500
message:
Handle progress phases more nicely in merge
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060308222902-11c7991dded15b48
parent: abentley at panoramicfeedback.com-20060308215300-4330cf9b81b09f58
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's small fixes
timestamp: Wed 2006-03-08 17:29:02 -0500
message:
Got merge and revert using nested pbs
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060308215300-4330cf9b81b09f58
parent: abentley at panoramicfeedback.com-20060308195144-af28fd357daa8cd0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's small fixes
timestamp: Wed 2006-03-08 16:53:00 -0500
message:
Bugfixes to progress stuff
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060308195144-af28fd357daa8cd0
parent: abentley at panoramicfeedback.com-20060308190258-79b6a64b17fb8cf3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's small fixes
timestamp: Wed 2006-03-08 14:51:44 -0500
message:
Got stack handling under test
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060308190258-79b6a64b17fb8cf3
parent: abentley at panoramicfeedback.com-20060308163450-d73ed3ce02da6513
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's small fixes
timestamp: Wed 2006-03-08 14:02:58 -0500
message:
Ensure all ProgressBar implementations can be used as parents
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060308163450-d73ed3ce02da6513
parent: abentley at panoramicfeedback.com-20060308155549-d4bba9fc7c8c824e
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's small fixes
timestamp: Wed 2006-03-08 11:34:50 -0500
message:
Got propogation under test
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060308155549-d4bba9fc7c8c824e
parent: aaron.bentley at utoronto.ca-20060308060843-7284a9b71ec43c21
parent: abentley at panoramicfeedback.com-20060307194639-68365add92c0bad3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's small fixes
timestamp: Wed 2006-03-08 10:55:49 -0500
message:
Restored somewhat looser tests
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060307194639-68365add92c0bad3
parent: abentley at panoramicfeedback.com-20060307164144-fcfe88c27f7c1384
parent: abentley at panoramicfeedback.com-20060307184118-b18cf90f2bf4e6d8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's small fixes
timestamp: Tue 2006-03-07 14:46:39 -0500
message:
Merge from bzr.ab.integration
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060307164144-fcfe88c27f7c1384
parent: abentley at panoramicfeedback.com-20060306174748-6a009f0b725d8bdd
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's small fixes
timestamp: Tue 2006-03-07 11:41:44 -0500
message:
Workaround for silly _get_log behaviour in test
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060309085048-37f21fd146dabe93
parent: pqm at pqm.ubuntu.com-20060309063913-6d8ce700706d0802
parent: mbp at sourcefrog.net-20060309075936-c13ae6445966956e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-03-09 08:50:48 +0000
message:
[merge] LockDir integration into new formats
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060309075936-c13ae6445966956e
parent: mbp at sourcefrog.net-20060309071410-4ab7d54905541c75
parent: pqm at pqm.ubuntu.com-20060309063913-6d8ce700706d0802
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Thu 2006-03-09 18:59:36 +1100
message:
[merge] from bzr.dev
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060309071410-4ab7d54905541c75
parent: mbp at sourcefrog.net-20060309051124-024649ca9d9d7326
parent: pqm at pqm.ubuntu.com-20060308164921-68f071c6df0938ab
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Thu 2006-03-09 18:14:10 +1100
message:
[merge] from bzr.dev
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060309051124-024649ca9d9d7326
parent: mbp at sourcefrog.net-20060309050755-af9d141629defbb0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Thu 2006-03-09 16:11:24 +1100
message:
Revert change to WorkingTreeFormat3 format string; too many things want it the old way
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060309050755-af9d141629defbb0
parent: mbp at sourcefrog.net-20060309050706-9da444322c067cc4
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Thu 2006-03-09 16:07:55 +1100
message:
Fix up check on workingtree format 3 format identifier
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060309050706-9da444322c067cc4
parent: mbp at sourcefrog.net-20060309035916-f9cde719a97b7487
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Thu 2006-03-09 16:07:06 +1100
message:
upgrade to metadir should create LockDirs not files
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060309035916-f9cde719a97b7487
parent: mbp at sourcefrog.net-20060309032852-1097eb1947d9bceb
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Thu 2006-03-09 14:59:16 +1100
message:
New bzr init --format option and test
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060309032852-1097eb1947d9bceb
parent: mbp at sourcefrog.net-20060309032845-7d73e11a6b11fbe8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Thu 2006-03-09 14:28:52 +1100
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060309032845-7d73e11a6b11fbe8
parent: mbp at sourcefrog.net-20060309025818-2a026acd76d470fb
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Thu 2006-03-09 14:28:45 +1100
message:
WorkingTree format identifier string should end in newline so it can be read more easily
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060309025818-2a026acd76d470fb
parent: mbp at sourcefrog.net-20060309025503-0cb67e7cf78ba889
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Thu 2006-03-09 13:58:18 +1100
message:
Additional WorkingTree LockDir test
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060309025503-0cb67e7cf78ba889
parent: mbp at sourcefrog.net-20060309020459-9909376bda89eb6f
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Thu 2006-03-09 13:55:03 +1100
message:
Convert WorkingTree format3 to use LockDirs
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060309020459-9909376bda89eb6f
parent: mbp at sourcefrog.net-20060309020151-4035fc90446822e8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Thu 2006-03-09 13:04:59 +1100
message:
Additional test that Branch5 uses lockdir properly
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060309020151-4035fc90446822e8
parent: mbp at sourcefrog.net-20060308093027-c1e17961c78b16a5
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Thu 2006-03-09 13:01:51 +1100
message:
Clean up test for Branch5 lockdirs
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060308093027-c1e17961c78b16a5
parent: mbp at sourcefrog.net-20060308080738-bc96b3fb717e72a6
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Wed 2006-03-08 20:30:27 +1100
message:
Change branch format 5 to use LockDirs, not transport locks
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060308080738-bc96b3fb717e72a6
parent: mbp at sourcefrog.net-20060308075541-c0c015c8d40cad69
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Wed 2006-03-08 19:07:38 +1100
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060308075541-c0c015c8d40cad69
parent: mbp at sourcefrog.net-20060308035330-40065f85adc9652e
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Wed 2006-03-08 18:55:41 +1100
message:
BzrDirFormat subclasses can now control what kind of overall lock is used.
meta-1 split out bzr dirs now use a LockDir as the top-level lock
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060308035330-40065f85adc9652e
parent: mbp at sourcefrog.net-20060308035210-9536221f6a5bf733
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Wed 2006-03-08 14:53:30 +1100
message:
Add new TestCaseWithTransport.assertIsDirectory() and tests
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060308035210-9536221f6a5bf733
parent: mbp at sourcefrog.net-20060308032138-a4ef499ad6843ae9
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Wed 2006-03-08 14:52:10 +1100
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060308032138-a4ef499ad6843ae9
parent: mbp at sourcefrog.net-20060308032128-a70a3caf64107a09
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Wed 2006-03-08 14:21:38 +1100
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060308032128-a70a3caf64107a09
parent: mbp at sourcefrog.net-20060306071109-6b35534e38610c43
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Wed 2006-03-08 14:21:28 +1100
message:
MemoryTransport: Set better permissions on fake directory inodes
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060309063913-6d8ce700706d0802
parent: pqm at pqm.ubuntu.com-20060308164921-68f071c6df0938ab
parent: robertc at robertcollins.net-20060309061524-74c42a273f335e85
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-03-09 06:39:13 +0000
message:
Merge knit performance stage 1.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060309061524-74c42a273f335e85
parent: robertc at robertcollins.net-20060309054328-23926605c7f00af4
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-03-09 17:15:24 +1100
message:
Missing needs a write lock sometimes.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060309054328-23926605c7f00af4
parent: robertc at robertcollins.net-20060309034628-599a577ccb72bcbd
parent: robertc at robertcollins.net-20060309054147-017c0cb94e0f5c50
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-03-09 16:43:28 +1100
message:
Merge in trivial versioned file performance improvements.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060309054147-017c0cb94e0f5c50
parent: robertc at robertcollins.net-20060309053652-a47566f34ccd1408
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Thu 2006-03-09 16:41:47 +1100
message:
Take out appropriate locks for missing.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060309053652-a47566f34ccd1408
parent: robertc at robertcollins.net-20060309053504-d1fe995266ac87d3
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Thu 2006-03-09 16:36:52 +1100
message:
Bugfix knit caching implementation.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060309053504-d1fe995266ac87d3
parent: robertc at robertcollins.net-20060309045421-b3c91fa905a6bcbb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Thu 2006-03-09 16:35:04 +1100
message:
Change urllib ranges implementation to be one coalesced range per http request.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060309045421-b3c91fa905a6bcbb
parent: robertc at robertcollins.net-20060309045303-af8dd39bb3160105
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Thu 2006-03-09 15:54:21 +1100
message:
Bugfix error message output in knit error raising.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060309045303-af8dd39bb3160105
parent: robertc at robertcollins.net-20060309041000-1c548ec87c8c67ac
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Thu 2006-03-09 15:53:03 +1100
message:
make trivial ranges work for HTTP really.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060309041000-1c548ec87c8c67ac
parent: robertc at robertcollins.net-20060308225050-5f1c946d31f34cf8
parent: robertc at robertcollins.net-20060309032752-3570fbe40bb2b7a2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Thu 2006-03-09 15:10:00 +1100
message:
Merge transaction finalisation and ensure iter_lines_added_or_present in knits does a old-to-new read in the knit.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060309034628-599a577ccb72bcbd
parent: robertc at robertcollins.net-20060309031724-e1d63dd8a0121a58
parent: robertc at robertcollins.net-20060309032752-3570fbe40bb2b7a2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-03-09 14:46:28 +1100
message:
Merge transaction-finished-callback work.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060309032752-3570fbe40bb2b7a2
parent: robertc at robertcollins.net-20060309005901-c7aa8978ce956f1a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: transaction-finished-callback
timestamp: Thu 2006-03-09 14:27:52 +1100
message:
Make use of the transaction finalisation warning support to implement in-knit caching.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060309005901-c7aa8978ce956f1a
parent: robertc at robertcollins.net-20060309001620-609b702f53900cc2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: transaction-finished-callback
timestamp: Thu 2006-03-09 11:59:01 +1100
message:
Test versioned file storage handling of clean/dirty status for accessed versioned files.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060309001620-609b702f53900cc2
parent: robertc at robertcollins.net-20060309000704-444c75bb39877694
committer: Robert Collins <robertc at robertcollins.net>
branch nick: transaction-finished-callback
timestamp: Thu 2006-03-09 11:16:20 +1100
message:
Ensure that lockable files calls finish() on transactions.:
------------------------------------------------------------
merged: robertc at robertcollins.net-20060309000704-444c75bb39877694
parent: robertc at robertcollins.net-20060308235107-132ff5c36aa082a5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: transaction-finished-callback
timestamp: Thu 2006-03-09 11:07:04 +1100
message:
Teach versioned files to prevent mutation after finishing.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060308235107-132ff5c36aa082a5
parent: robertc at robertcollins.net-20060308225050-5f1c946d31f34cf8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: transaction-finished-callback
timestamp: Thu 2006-03-09 10:51:07 +1100
message:
Add finished() notifications to transactions.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060309031724-e1d63dd8a0121a58
parent: robertc at robertcollins.net-20060309023701-bac4fa080616d3f7
parent: robertc at robertcollins.net-20060308225050-5f1c946d31f34cf8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-03-09 14:17:24 +1100
message:
Merge knit performance stage 1.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060308225050-5f1c946d31f34cf8
parent: robertc at robertcollins.net-20060308153913-c63fcfdfa0ca854c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Thu 2006-03-09 09:50:50 +1100
message:
More coalescing tweaks, and knit feedback.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060308153913-c63fcfdfa0ca854c
parent: robertc at robertcollins.net-20060308153516-7aa9172d8b28bdc3
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Thu 2006-03-09 02:39:13 +1100
message:
Really do incremental index status.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060308153516-7aa9172d8b28bdc3
parent: robertc at robertcollins.net-20060308144513-84f34693cfa296c7
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Thu 2006-03-09 02:35:16 +1100
message:
Better readv coalescing, now with test, and progress during knit index reading.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060308144513-84f34693cfa296c7
parent: robertc at robertcollins.net-20060308141600-8a7a12519e164d96
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Thu 2006-03-09 01:45:13 +1100
message:
Coalesce readv requests on file based transports.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060308141600-8a7a12519e164d96
parent: robertc at robertcollins.net-20060308125747-6e30e6743bbd9f7a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Thu 2006-03-09 01:16:00 +1100
message:
Unfuck performance.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060308125747-6e30e6743bbd9f7a
parent: robertc at robertcollins.net-20060308124446-3c5580013ecedac1
parent: robertc at robertcollins.net-20060308025107-012d51f27c62e57f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Wed 2006-03-08 23:57:47 +1100
message:
Merge from bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060308124446-3c5580013ecedac1
parent: robertc at robertcollins.net-20060308124232-c972294a8f230c67
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Wed 2006-03-08 23:44:46 +1100
message:
update setup.py.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060308124232-c972294a8f230c67
parent: robertc at robertcollins.net-20060308123422-b1f4085b4b9f0c56
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Wed 2006-03-08 23:42:32 +1100
message:
Update BRANCH.TODO
------------------------------------------------------------
merged: robertc at robertcollins.net-20060308123422-b1f4085b4b9f0c56
parent: robertc at robertcollins.net-20060308122059-c7c82607aa66a217
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Wed 2006-03-08 23:34:22 +1100
message:
Setup fast-code paths for copying into empty weaves and weave->empty knit.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060308122059-c7c82607aa66a217
parent: robertc at robertcollins.net-20060308110806-33bb492eeaf0a832
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Wed 2006-03-08 23:20:59 +1100
message:
Teach knit fetching and branching to only duplicate relevant data avoiding unnecessary reconciles.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060308110806-33bb492eeaf0a832
parent: robertc at robertcollins.net-20060308095544-eb1e0120f0c0cf33
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Wed 2006-03-08 22:08:06 +1100
message:
Teach Knit repositories how to handle ghosts without corrupting at all.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060308095544-eb1e0120f0c0cf33
parent: robertc at robertcollins.net-20060308070347-df89b46b3b5cf86a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Wed 2006-03-08 20:55:44 +1100
message:
add ghost aware apis to knits.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060308070347-df89b46b3b5cf86a
parent: robertc at robertcollins.net-20060308045920-ecdaf527c1095d76
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Wed 2006-03-08 18:03:47 +1100
message:
Add versionedfile.fix_parents api for correcting data post hoc.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060308045920-ecdaf527c1095d76
parent: robertc at robertcollins.net-20060308021222-a44f01d96ece809e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Wed 2006-03-08 15:59:20 +1100
message:
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060308021222-a44f01d96ece809e
parent: robertc at robertcollins.net-20060308002004-a9950b2fb75d14de
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Wed 2006-03-08 13:12:22 +1100
message:
Readv patch from Johan Rydberg giving knits partial download support.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060309023701-bac4fa080616d3f7
parent: robertc at robertcollins.net-20060308025107-012d51f27c62e57f
parent: pqm at pqm.ubuntu.com-20060308164921-68f071c6df0938ab
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-03-09 13:37:01 +1100
message:
Merge bzr.dev
------------------------------------------------------------
merged: robertc at robertcollins.net-20060308025107-012d51f27c62e57f
parent: pqm at pqm.ubuntu.com-20060308003741-08afccbf89005e87
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-03-08 13:51:07 +1100
message:
Fix BzrDir.open_containing of unsupported branches.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060308164921-68f071c6df0938ab
parent: pqm at pqm.ubuntu.com-20060308143442-fc633cddf3574063
parent: mbp at sourcefrog.net-20060308091106-ecdf014578caafc5
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-03-08 16:49:21 +0000
message:
Use simple xml unescaping to find involved ids, rather than importing xml.sax
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060308091106-ecdf014578caafc5
parent: pqm at pqm.ubuntu.com-20060308003741-08afccbf89005e87
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Wed 2006-03-08 20:11:06 +1100
message:
Use simple xml unescaping rather than importing xml.sax
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060308143442-fc633cddf3574063
parent: pqm at pqm.ubuntu.com-20060308051838-876e9f9ac39ee578
parent: aaron.bentley at utoronto.ca-20060308060843-7284a9b71ec43c21
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-03-08 14:34:42 +0000
message:
Stop using deprecated methods in merge and revert
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060308060843-7284a9b71ec43c21
parent: aaron.bentley at utoronto.ca-20060308052702-d6f40f6caa925eeb
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-03-08 01:08:43 -0500
message:
Stop using deprecated methods in merge and revert
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060308052702-d6f40f6caa925eeb
parent: abentley at panoramicfeedback.com-20060306174748-6a009f0b725d8bdd
parent: aaron.bentley at utoronto.ca-20060308052522-807c265697989dce
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-03-08 00:27:02 -0500
message:
Merge from bzr.ab.integration
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060308052522-807c265697989dce
parent: abentley at panoramicfeedback.com-20060307184118-b18cf90f2bf4e6d8
parent: pqm at pqm.ubuntu.com-20060308030318-87f0fbd9525bb170
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's integration
timestamp: Wed 2006-03-08 00:25:22 -0500
message:
merge from mainline
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060308051838-876e9f9ac39ee578
parent: pqm at pqm.ubuntu.com-20060308030318-87f0fbd9525bb170
parent: abentley at panoramicfeedback.com-20060307184118-b18cf90f2bf4e6d8
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-03-08 05:18:38 +0000
message:
Fix for merge_modified error handling
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060307184118-b18cf90f2bf4e6d8
parent: abentley at panoramicfeedback.com-20060307173814-27971f46eb6324bc
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Tue 2006-03-07 13:41:18 -0500
message:
Fix error handling for merge_modified
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060307173814-27971f46eb6324bc
parent: abentley at panoramicfeedback.com-20060306170942-4961a715a61df91f
parent: pqm at pqm.ubuntu.com-20060307161548-62e73f80c62f6a31
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Tue 2006-03-07 12:38:14 -0500
message:
Merge from bzr.dev
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060308030318-87f0fbd9525bb170
parent: pqm at pqm.ubuntu.com-20060308003741-08afccbf89005e87
parent: abentley at panoramicfeedback.com-20060306174748-6a009f0b725d8bdd
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-03-08 03:03:18 +0000
message:
A whack of changes.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060306174748-6a009f0b725d8bdd
parent: abentley at panoramicfeedback.com-20060306172600-61ea70d80cc0a159
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's small fixes
timestamp: Mon 2006-03-06 12:47:48 -0500
message:
Got merge_inner's ignore_zero parameter working
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060306172600-61ea70d80cc0a159
parent: abentley at panoramicfeedback.com-20060306161257-b1e3e4aac61d6d3a
parent: abentley at panoramicfeedback.com-20060306170942-4961a715a61df91f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's small fixes
timestamp: Mon 2006-03-06 12:26:00 -0500
message:
Merge from bzr.ab.integration
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060306170942-4961a715a61df91f
parent: abentley at panoramicfeedback.com-20060301224424-69c91b7987524db0
parent: pqm at pqm.ubuntu.com-20060306074417-344f1d83d99b9730
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Mon 2006-03-06 12:09:42 -0500
message:
Merge from bzr.dev
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060306161257-b1e3e4aac61d6d3a
parent: abentley at panoramicfeedback.com-20060303214119-2994d0dbbf83f7a0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's small fixes
timestamp: Mon 2006-03-06 11:12:57 -0500
message:
Formatted unicode config tests as ASCII
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060303214119-2994d0dbbf83f7a0
parent: abentley at panoramicfeedback.com-20060303205512-4c21a6989d12704e
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's small fixes
timestamp: Fri 2006-03-03 16:41:19 -0500
message:
Treated config files as utf-8
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060303205512-4c21a6989d12704e
parent: abentley at panoramicfeedback.com-20060301181631-f3b73117aa68b73f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's small fixes
timestamp: Fri 2006-03-03 15:55:12 -0500
message:
Added See Conflicts to merge help
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060301181631-f3b73117aa68b73f
parent: abentley at panoramicfeedback.com-20060228151452-f9bde3d16eb1b4ec
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's small fixes
timestamp: Wed 2006-03-01 13:16:31 -0500
message:
Updated docs to clarify conflict handling
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060308003741-08afccbf89005e87
parent: pqm at pqm.ubuntu.com-20060307161548-62e73f80c62f6a31
parent: robertc at robertcollins.net-20060308002004-a9950b2fb75d14de
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-03-08 00:37:41 +0000
message:
Merge in :
* Knit repositories use knits
* Nested progress bar support.
* Ghost aware graph api.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060308002004-a9950b2fb75d14de
parent: robertc at robertcollins.net-20060307225143-23f74e9de76891a2
parent: robertc at robertcollins.net-20060307235507-d7b3d2659d3eb548
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-03-08 11:20:04 +1100
message:
Merge in knit repository use of knits - still not a stable format, but can be experimented with.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060307235507-d7b3d2659d3eb548
parent: robertc at robertcollins.net-20060307234733-613e502c7967944a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-knit-stores
timestamp: Wed 2006-03-08 10:55:07 +1100
message:
Stop reconcile on weaves being quadratic.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060307234733-613e502c7967944a
parent: robertc at robertcollins.net-20060307233858-ee407c954a9c9c53
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-knit-stores
timestamp: Wed 2006-03-08 10:47:33 +1100
message:
Only fetch referenced inventories in fetch.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060307233858-ee407c954a9c9c53
parent: robertc at robertcollins.net-20060307222112-e89dff36c5ee5a9e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-knit-stores
timestamp: Wed 2006-03-08 10:38:58 +1100
message:
Extra test for joining of version-limited sets.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060307222112-e89dff36c5ee5a9e
parent: robertc at robertcollins.net-20060307203447-b7432f11cbd54c29
parent: robertc at robertcollins.net-20060307215925-c3ef7a33759a36b4
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-knit-stores
timestamp: Wed 2006-03-08 09:21:12 +1100
message:
Merge from integration.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060307203447-b7432f11cbd54c29
parent: robertc at robertcollins.net-20060307125615-fca7aabbc4771f7e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-knit-stores
timestamp: Wed 2006-03-08 07:34:47 +1100
message:
make push preserve tree formats.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060307125615-fca7aabbc4771f7e
parent: robertc at robertcollins.net-20060307123938-f75ff66ebcc0c4d0
parent: robertc at robertcollins.net-20060307090344-c45880fb69b4df89
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-knit-stores
timestamp: Tue 2006-03-07 23:56:15 +1100
message:
Merge in nested progress bars
------------------------------------------------------------
merged: robertc at robertcollins.net-20060307123938-f75ff66ebcc0c4d0
parent: robertc at robertcollins.net-20060307121732-1a219b872ef18ecc
parent: pqm at pqm.ubuntu.com-20060307013022-b9258d2a0c135498
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-knit-stores
timestamp: Tue 2006-03-07 23:39:38 +1100
message:
Merge in bzr.dev
------------------------------------------------------------
merged: robertc at robertcollins.net-20060307121732-1a219b872ef18ecc
parent: robertc at robertcollins.net-20060307021845-571917c17fce6b30
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-knit-stores
timestamp: Tue 2006-03-07 23:17:32 +1100
message:
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060307021845-571917c17fce6b30
parent: robertc at robertcollins.net-20060306235302-1707f4a372dc885c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-knit-stores
timestamp: Tue 2006-03-07 13:18:45 +1100
message:
Remove the commit and rollback transaction methods as misleading, and implement a WriteTransaction
------------------------------------------------------------
merged: robertc at robertcollins.net-20060306235302-1707f4a372dc885c
parent: robertc at robertcollins.net-20060306121242-833c3e347fdfbb32
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-knit-stores
timestamp: Tue 2006-03-07 10:53:02 +1100
message:
Nicer progress updates during conversion to knits.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060306121242-833c3e347fdfbb32
parent: robertc at robertcollins.net-20060306121125-4f05992d44e3bda8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-knit-stores
timestamp: Mon 2006-03-06 23:12:42 +1100
message:
note TODOs
------------------------------------------------------------
merged: robertc at robertcollins.net-20060306121125-4f05992d44e3bda8
parent: robertc at robertcollins.net-20060306101726-e92c4ad66c719387
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-knit-stores
timestamp: Mon 2006-03-06 23:11:25 +1100
message:
Convert Knit repositories to use knits.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060306101726-e92c4ad66c719387
parent: robertc at robertcollins.net-20060306093837-b151989e9572895e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-knit-stores
timestamp: Mon 2006-03-06 21:17:26 +1100
message:
Remove all but fetch references to revision_store, making the repository references that are weave specific use the RevisionTextStore.text_store attribute.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060306093837-b151989e9572895e
parent: robertc at robertcollins.net-20060306071427-359ef15c1d891e84
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-knit-stores
timestamp: Mon 2006-03-06 20:38:37 +1100
message:
Remove all but fetch references to repository.revision_store.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060306071427-359ef15c1d891e84
parent: robertc at robertcollins.net-20060306064346-4dc4390870d12c5c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-knit-stores
timestamp: Mon 2006-03-06 18:14:27 +1100
message:
Add total_size to the revision_store api.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060306064346-4dc4390870d12c5c
parent: robertc at robertcollins.net-20060306061914-a3037bc20458f332
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-knit-stores
timestamp: Mon 2006-03-06 17:43:46 +1100
message:
Add signature text addition to the revisionstore api.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060306061914-a3037bc20458f332
parent: robertc at robertcollins.net-20060306060607-07ee741185ceaee5
parent: robertc at robertcollins.net-20060306035548-453e2432ec0e8caf
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-knit-stores
timestamp: Mon 2006-03-06 17:19:14 +1100
message:
Merge from upstream.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060306060607-07ee741185ceaee5
parent: robertc at robertcollins.net-20060304023017-7f5f460efff7d2e8
parent: robertc at robertcollins.net-20060303132246-5527bd85b7a33fe7
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-knit-stores
timestamp: Mon 2006-03-06 17:06:07 +1100
message:
Merge in upstream.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060304023017-7f5f460efff7d2e8
parent: robertc at robertcollins.net-20060303070050-5219f1cd68b5e6b9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-knit-stores
timestamp: Sat 2006-03-04 13:30:17 +1100
message:
Make join cheaper for compatibly inconsistent parents.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060303070050-5219f1cd68b5e6b9
parent: robertc at robertcollins.net-20060303030907-6af33664f8791e78
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-knit-stores
timestamp: Fri 2006-03-03 18:00:50 +1100
message:
Add add_revision and get_revision methods to RevisionStore
------------------------------------------------------------
merged: robertc at robertcollins.net-20060303030907-6af33664f8791e78
parent: robertc at robertcollins.net-20060303020949-0ddc6f33d0a43943
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-knit-stores
timestamp: Fri 2006-03-03 14:09:07 +1100
message:
Move responsibility for repository.has_revision into RevisionStore
------------------------------------------------------------
merged: robertc at robertcollins.net-20060303020949-0ddc6f33d0a43943
parent: robertc at robertcollins.net-20060303014722-e890b9bf8628aebf
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-knit-stores
timestamp: Fri 2006-03-03 13:09:49 +1100
message:
Smoke test for RevisionStore factories creating revision stores.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060303014722-e890b9bf8628aebf
parent: robertc at robertcollins.net-20060302110115-c7d315c0f2165ac7
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-knit-stores
timestamp: Fri 2006-03-03 12:47:22 +1100
message:
Add a revision store test adapter.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060302110115-c7d315c0f2165ac7
parent: robertc at robertcollins.net-20060302105124-675e0bed0d749b43
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-knit-stores
timestamp: Thu 2006-03-02 22:01:15 +1100
message:
stub out a check for knits.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060302105124-675e0bed0d749b43
parent: robertc at robertcollins.net-20060302091401-2b20f052d4358e3c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-knit-stores
timestamp: Thu 2006-03-02 21:51:24 +1100
message:
get knit repositories really using knits for text storage.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060302091401-2b20f052d4358e3c
parent: robertc at robertcollins.net-20060302074346-f6ea05e3f19f6b8b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-knit-stores
timestamp: Thu 2006-03-02 20:14:01 +1100
message:
Change knits repositories to use a knit versioned file store for file texts.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060302074346-f6ea05e3f19f6b8b
parent: robertc at robertcollins.net-20060302070836-be71595e05a607b7
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-knit-stores
timestamp: Thu 2006-03-02 18:43:46 +1100
message:
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060302070836-be71595e05a607b7
parent: robertc at robertcollins.net-20060302062315-9c274fa5c8201784
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-knit-stores
timestamp: Thu 2006-03-02 18:08:36 +1100
message:
remove the weavestore assumptions about the number and nature of files it manages.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060302062315-9c274fa5c8201784
parent: robertc at robertcollins.net-20060302031234-cf6b75961f27c5df
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-knit-stores
timestamp: Thu 2006-03-02 17:23:15 +1100
message:
Prepare weave store to delegate copy details to the versioned file.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060302031234-cf6b75961f27c5df
parent: robertc at robertcollins.net-20060302012622-6d1d0b92fe94d9be
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-versioned-file-api
timestamp: Thu 2006-03-02 14:12:34 +1100
message:
InterVersionedFile implemented.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060302012622-6d1d0b92fe94d9be
parent: robertc at robertcollins.net-20060301120959-b58a073b9f7f7a00
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-versioned-file-api
timestamp: Thu 2006-03-02 12:26:22 +1100
message:
Checkpointing: created InterObject to factor out common inter object worker code, added InterVersionedFile and tests to allow making join work between any versionedfile.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060301120959-b58a073b9f7f7a00
parent: robertc at robertcollins.net-20060301084035-ce00abd11fe4da31
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-versioned-file-api
timestamp: Wed 2006-03-01 23:09:59 +1100
message:
Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060301084035-ce00abd11fe4da31
parent: robertc at robertcollins.net-20060301054315-a9edc45a6c4061eb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-versioned-file-api
timestamp: Wed 2006-03-01 19:40:35 +1100
message:
Change weave store to be a versioned store, using WeaveFiles which maintain integrity without needing explicit 'put' operations.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060301054315-a9edc45a6c4061eb
parent: robertc at robertcollins.net-20060301032623-9d3c073e102f2239
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-versioned-file-api
timestamp: Wed 2006-03-01 16:43:15 +1100
message:
Update versionedfile api tests to ensure that data is available after every operation.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060301032623-9d3c073e102f2239
parent: robertc at robertcollins.net-20060301031344-b661bf92b4985554
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-versioned-file-api
timestamp: Wed 2006-03-01 14:26:23 +1100
message:
Move WeaveStore down into bzrlib.store.versioned.weave.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060301031344-b661bf92b4985554
parent: robertc at robertcollins.net-20060301020147-62bb5465f75fbf40
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-versioned-file-api
timestamp: Wed 2006-03-01 14:13:44 +1100
message:
add versioned file clear_cache entry.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060301020147-62bb5465f75fbf40
parent: robertc at robertcollins.net-20060228083443-f6aae35b7de8f26f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-versioned-file-api
timestamp: Wed 2006-03-01 13:01:47 +1100
message:
Start check tests for knits (pending), and remove dead code.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060228083443-f6aae35b7de8f26f
parent: robertc at robertcollins.net-20060228082759-d082181cb6fa27e5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-versioned-file-api
timestamp: Tue 2006-02-28 19:34:43 +1100
message:
Remove unused transaction references from knit.py and the versionedfile interface.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060228082759-d082181cb6fa27e5
parent: robertc at robertcollins.net-20060228074257-a66f0d23e091ce7e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-versioned-file-api
timestamp: Tue 2006-02-28 19:27:59 +1100
message:
First cut at including the knit implementation of versioned_file.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060228074257-a66f0d23e091ce7e
parent: robertc at robertcollins.net-20060228045234-d1856c4499648fb7
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-versioned-file-api
timestamp: Tue 2006-02-28 18:42:57 +1100
message:
Change the return signature of transport.append and append_multi to return the length of the pre-append content.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060228045234-d1856c4499648fb7
parent: robertc at robertcollins.net-20060222103505-bddb211d353f2543
parent: pqm at pqm.ubuntu.com-20060228043846-eb79299c08edb05c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-versioned-file-api
timestamp: Tue 2006-02-28 15:52:34 +1100
message:
merge from bzr.dev
------------------------------------------------------------
merged: robertc at robertcollins.net-20060222103505-bddb211d353f2543
parent: robertc at robertcollins.net-20060221224858-2b61aaa0f1636293
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-versioned-file-api
timestamp: Wed 2006-02-22 21:35:05 +1100
message:
Merge in a variation of the versionedfile api from versioned-file.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060307225143-23f74e9de76891a2
parent: robertc at robertcollins.net-20060307215925-c3ef7a33759a36b4
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-03-08 09:51:43 +1100
message:
bugfix revision.MultipleRevisionSources.get_revision_graph to integrate ghosts between sources. [slow on weaves, fast on knits.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060307215925-c3ef7a33759a36b4
parent: robertc at robertcollins.net-20060307213519-f2c3001debcec5af
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-03-08 08:59:25 +1100
message:
Trivial change to reconcile to mutter the cause of reconciliation to bzr.log
------------------------------------------------------------
merged: robertc at robertcollins.net-20060307213519-f2c3001debcec5af
parent: pqm at pqm.ubuntu.com-20060307013022-b9258d2a0c135498
parent: robertc at robertcollins.net-20060307205724-30be85fb4a3e75f0
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-03-08 08:35:19 +1100
message:
Merge in nested progress bars.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060307205724-30be85fb4a3e75f0
parent: robertc at robertcollins.net-20060307090344-c45880fb69b4df89
committer: Robert Collins <robertc at robertcollins.net>
branch nick: nested-pb
timestamp: Wed 2006-03-08 07:57:24 +1100
message:
Fix identity test in ProgressBarStack.return_pb
------------------------------------------------------------
merged: robertc at robertcollins.net-20060307090344-c45880fb69b4df89
parent: robertc at robertcollins.net-20060307080638-67ecc1c477c726d6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: nested-pb
timestamp: Tue 2006-03-07 20:03:44 +1100
message:
Fixup pb usage to use nested_progress_bar.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060307080638-67ecc1c477c726d6
parent: robertc at robertcollins.net-20060307075733-b1193466d8785698
committer: Robert Collins <robertc at robertcollins.net>
branch nick: nested-pb
timestamp: Tue 2006-03-07 19:06:38 +1100
message:
Update news and deprecated the old progress bar api.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060307075733-b1193466d8785698
parent: pqm at pqm.ubuntu.com-20060307013022-b9258d2a0c135498
committer: Robert Collins <robertc at robertcollins.net>
branch nick: nested-pb
timestamp: Tue 2006-03-07 18:57:33 +1100
message:
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060307161548-62e73f80c62f6a31
parent: pqm at pqm.ubuntu.com-20060307013022-b9258d2a0c135498
parent: aaron.bentley at utoronto.ca-20060307055914-a88728997afceb90
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-03-07 16:15:48 +0000
message:
revert destroys merge-created content auotmatically
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060307055914-a88728997afceb90
parent: abentley at panoramicfeedback.com-20060306152723-1352864764612eb9
parent: aaron.bentley at utoronto.ca-20060307053524-a5406e3bd1da02bb
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-03-07 00:59:14 -0500
message:
Merge from mainline
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060307053524-a5406e3bd1da02bb
parent: abentley at panoramicfeedback.com-20060301224424-69c91b7987524db0
parent: pqm at pqm.ubuntu.com-20060306074417-344f1d83d99b9730
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's integration
timestamp: Tue 2006-03-07 00:35:24 -0500
message:
Merged bzr.dev
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060306152723-1352864764612eb9
parent: aaron.bentley at utoronto.ca-20060301040904-cf81eb021c253024
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Mon 2006-03-06 10:27:23 -0500
message:
Moved merge/revert tests into test_workingtree.py
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060301040904-cf81eb021c253024
parent: aaron.bentley at utoronto.ca-20060301040612-4aba0fff89bdd24f
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-02-28 23:09:04 -0500
message:
Removed spurious encode/decode
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060301040612-4aba0fff89bdd24f
parent: aaron.bentley at utoronto.ca-20060301034749-8e59bf2706d3c9c0
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-02-28 23:06:12 -0500
message:
Removed splatfile format
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060301034749-8e59bf2706d3c9c0
parent: abentley at panoramicfeedback.com-20060224215755-0147b9bf4e26322a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-02-28 22:47:49 -0500
message:
Switched to Rio format for merge-modified list
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060224215755-0147b9bf4e26322a
parent: abentley at panoramicfeedback.com-20060224214518-9c9b7a8f5c9a2ca0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-24 16:57:55 -0500
message:
Cleanups
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060224214518-9c9b7a8f5c9a2ca0
parent: abentley at panoramicfeedback.com-20060224213810-c9c4c53420d2dc2a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-24 16:45:18 -0500
message:
Added test case for file not added by merge
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060224213810-c9c4c53420d2dc2a
parent: abentley at panoramicfeedback.com-20060224190042-7131c3fb7b75cc24
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-24 16:38:10 -0500
message:
Stopped revert from preserving file contents produced by merges
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060224190042-7131c3fb7b75cc24
parent: abentley at panoramicfeedback.com-20060224170523-9ec3bd5c7a1ed4c7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-24 14:00:42 -0500
message:
Record hashes produced by merges
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060224170523-9ec3bd5c7a1ed4c7
parent: abentley at panoramicfeedback.com-20060224162838-5e3d05b42489fce5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-24 12:05:23 -0500
message:
Got transform.apply to list modified paths
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060224162838-5e3d05b42489fce5
parent: abentley at panoramicfeedback.com-20060224154418-8503726522af25d7
parent: abentley at panoramicfeedback.com-20060224161241-7875e2e8984975dd
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-24 11:28:38 -0500
message:
Merge from bzr.ab.integration
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060224154418-8503726522af25d7
parent: abentley at panoramicfeedback.com-20060224152617-66e9e6313b4b4eca
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-24 10:44:18 -0500
message:
Got splatfile handling arbitrary number of values per stanza
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060224152617-66e9e6313b4b4eca
parent: abentley at panoramicfeedback.com-20060223222421-69708e805169eb4f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-24 10:26:17 -0500
message:
Changed name to splatfile, got tests passing
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060223222421-69708e805169eb4f
parent: abentley at panoramicfeedback.com-20060223151247-9dc5e11197026907
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-02-23 17:24:21 -0500
message:
Created yet another map file format
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060307013022-b9258d2a0c135498
parent: pqm at pqm.ubuntu.com-20060306074417-344f1d83d99b9730
parent: robertc at robertcollins.net-20060306221112-3568dfec725df156
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-03-07 01:30:22 +0000
message:
Move responsibility for setting branch nickname in commits to the WorkingTree convenience function.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060306221112-3568dfec725df156
parent: pqm at pqm.ubuntu.com-20060306074417-344f1d83d99b9730
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2006-03-07 09:11:12 +1100
message:
Move responsibility for setting branch nickname in commits to the WorkingTree convenience function.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060306074417-344f1d83d99b9730
parent: pqm at pqm.ubuntu.com-20060306072155-3b9e4092ba9bb0e4
parent: mbp at sourcefrog.net-20060306071109-6b35534e38610c43
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-03-06 07:44:17 +0000
message:
Integrate LockDirs into new format, etc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060306071109-6b35534e38610c43
parent: mbp at sourcefrog.net-20060306050135-9e422a1633679d5f
parent: pqm at pqm.ubuntu.com-20060306055608-93469ab6701dbe6b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Mon 2006-03-06 18:11:09 +1100
message:
[merge] bzr.dev
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060306050135-9e422a1633679d5f
parent: mbp at sourcefrog.net-20060306044359-f977728599659b6d
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Mon 2006-03-06 16:01:35 +1100
message:
Lock type is now mandatory for LockableFiles constructor
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060306044359-f977728599659b6d
parent: mbp at sourcefrog.net-20060306043017-2e9a7d43ee9c5745
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Mon 2006-03-06 15:43:59 +1100
message:
Add tests that MetaDir repositories use LockDirs
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060306043017-2e9a7d43ee9c5745
parent: mbp at sourcefrog.net-20060306041536-a1643b5f998c23a3
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Mon 2006-03-06 15:30:17 +1100
message:
Locks protecting LockableFiles must now be explicitly created before use.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060306041536-a1643b5f998c23a3
parent: mbp at sourcefrog.net-20060306040920-2495398d281bcf7c
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Mon 2006-03-06 15:15:36 +1100
message:
New LockableFiles.create_lock() method
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060306040920-2495398d281bcf7c
parent: mbp at sourcefrog.net-20060306035718-a50bae3c32eec48a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Mon 2006-03-06 15:09:20 +1100
message:
Pass file/mode bits through to creation of lock files/dirs
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060306035718-a50bae3c32eec48a
parent: mbp at sourcefrog.net-20060303095652-a0f4f293dad83a04
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Mon 2006-03-06 14:57:18 +1100
message:
Change LockDirs to format "lock-name/held/info"
For the moment, auto-create the top-level directory when it's needed.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303095652-a0f4f293dad83a04
parent: mbp at sourcefrog.net-20060303094402-10a3f11f73a89b52
parent: pqm at pqm.ubuntu.com-20060303070344-03bb9a021c0d964c
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 20:56:52 +1100
message:
[merge] sync from bzr.dev
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303094402-10a3f11f73a89b52
parent: mbp at sourcefrog.net-20060303093828-eeaecf4e3fc4fc15
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 20:44:02 +1100
message:
Format 7 repo now uses LockDir!
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303093828-eeaecf4e3fc4fc15
parent: mbp at sourcefrog.net-20060303091109-5b0f5c943f01010f
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 20:38:28 +1100
message:
[revert] broken changes
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303091109-5b0f5c943f01010f
parent: mbp at sourcefrog.net-20060303091046-6453abf08938f714
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 20:11:09 +1100
message:
Add LockDir.read_lock fake method
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303091046-6453abf08938f714
parent: mbp at sourcefrog.net-20060303085534-d24a8118f4ce571a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 20:10:46 +1100
message:
Add LockableFiles __repr__
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303085534-d24a8118f4ce571a
parent: mbp at sourcefrog.net-20060303084631-ec3a92888fd7e1da
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 19:55:34 +1100
message:
Add some tests that format7 repo creates the right lock type
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303084631-ec3a92888fd7e1da
parent: mbp at sourcefrog.net-20060303081957-ae86308d5780543d
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 19:46:31 +1100
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303081957-ae86308d5780543d
parent: mbp at sourcefrog.net-20060303081608-cf9e7db53336fa32
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 19:19:57 +1100
message:
Fix up LockableFiles deprecation warning
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303081608-cf9e7db53336fa32
parent: mbp at sourcefrog.net-20060303073926-585e6df99328e014
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 19:16:08 +1100
message:
Use LockDirs for repo format 7
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303073926-585e6df99328e014
parent: mbp at sourcefrog.net-20060303073547-e406d0326abae2fd
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 18:39:26 +1100
message:
Fix some LockableFiles deprecation warnings
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303073547-e406d0326abae2fd
parent: mbp at sourcefrog.net-20060303073124-c0741f11f36d7236
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 18:35:47 +1100
message:
cleanup LockableFiles
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303073124-c0741f11f36d7236
parent: mbp at sourcefrog.net-20060303064348-d7f474286e006c48
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 18:31:24 +1100
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303064348-d7f474286e006c48
parent: mbp at sourcefrog.net-20060303062253-b33bb76fa2aef670
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 17:43:48 +1100
message:
Clean up Transport-based locks for old branches
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303062253-b33bb76fa2aef670
parent: mbp at sourcefrog.net-20060303060711-51b8200efda1847b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 17:22:53 +1100
message:
LockableFiles can now call LockDir directly
no need for a little translator class
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303060711-51b8200efda1847b
parent: mbp at sourcefrog.net-20060303034620-2e8a5754ce60eb31
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 17:07:11 +1100
message:
Get LockableFiles tests running against LockDir
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303034620-2e8a5754ce60eb31
parent: mbp at sourcefrog.net-20060303032719-fe7e3137a22cab49
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 14:46:20 +1100
message:
Start to parameterize LockableFiles test cases.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303032719-fe7e3137a22cab49
parent: mbp at sourcefrog.net-20060303031901-7396bd883db4d262
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 14:27:19 +1100
message:
Add new LockableFiles.LockDirStrategy; not used yet
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303031901-7396bd883db4d262
parent: mbp at sourcefrog.net-20060303025457-8db5ec00a8ecba35
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 14:19:01 +1100
message:
Factor locking strategy out of LockableFiles so that we can use LockDirs in new formats.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303025457-8db5ec00a8ecba35
parent: mbp at sourcefrog.net-20060303024703-fef1181ba3398271
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 13:54:57 +1100
message:
More lock docs
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303024703-fef1181ba3398271
parent: mbp at sourcefrog.net-20060303023253-b1a0010503c25e76
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 13:47:03 +1100
message:
More explanation for LockableFiles
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303023253-b1a0010503c25e76
parent: mbp at sourcefrog.net-20060303021815-872742b7b3357302
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 13:32:53 +1100
message:
comment out currently unimplemented tests
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303021815-872742b7b3357302
parent: mbp at sourcefrog.net-20060303021419-cefbdc88b396592a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 13:18:15 +1100
message:
Clean up duplicate BranchNotLocked error and rename to ObjectNotLocked
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303021419-cefbdc88b396592a
parent: mbp at sourcefrog.net-20060303015140-f9a0f2c223f45ca7
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 13:14:19 +1100
message:
Start break-lock --show
Add LockableFiles.is_locked()
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060303015140-f9a0f2c223f45ca7
parent: mbp at sourcefrog.net-20060222070612-c108852197fc0ca4
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Fri 2006-03-03 12:51:40 +1100
message:
Stub lock-breaking command
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060306072155-3b9e4092ba9bb0e4
parent: pqm at pqm.ubuntu.com-20060306055608-93469ab6701dbe6b
parent: robertc at robertcollins.net-20060306065020-80ac8a71fd37a2c4
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-03-06 07:21:55 +0000
message:
pull bzr.dev
------------------------------------------------------------
merged: robertc at robertcollins.net-20060306065020-80ac8a71fd37a2c4
parent: robertc at robertcollins.net-20060306035548-453e2432ec0e8caf
parent: pqm at pqm.ubuntu.com-20060306055608-93469ab6701dbe6b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2006-03-06 17:50:20 +1100
message:
pull bzr.dev
------------------------------------------------------------
merged: robertc at robertcollins.net-20060306035548-453e2432ec0e8caf
parent: pqm at pqm.ubuntu.com-20060306004926-6d7a10c990bc17d1
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2006-03-06 14:55:48 +1100
message:
Improve common_ancestor performance.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060306055608-93469ab6701dbe6b
parent: pqm at pqm.ubuntu.com-20060306004926-6d7a10c990bc17d1
parent: mbp at sourcefrog.net-20060306051156-f28463a196a4a1d0
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-03-06 05:56:08 +0000
message:
remove obsolete docs
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060306051156-f28463a196a4a1d0
parent: pqm at pqm.ubuntu.com-20060303070344-03bb9a021c0d964c
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2006-03-06 16:11:56 +1100
message:
Supress "hello from test-command" noise from test_external_command
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060306004926-6d7a10c990bc17d1
parent: pqm at pqm.ubuntu.com-20060303134251-e9c7ea87d21f3888
parent: robertc at robertcollins.net-20060305114854-d95dbe4adfee32e9
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-03-06 00:49:26 +0000
message:
Merge in bound branches core support.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060305114854-d95dbe4adfee32e9
parent: robertc at robertcollins.net-20060305083128-d23aadbfb2939761
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bound-branches
timestamp: Sun 2006-03-05 22:48:54 +1100
message:
Make bound branch creation happen via 'checkout'
------------------------------------------------------------
merged: robertc at robertcollins.net-20060305083128-d23aadbfb2939761
parent: robertc at robertcollins.net-20060305082622-1ae79047490c239a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bound-branches
timestamp: Sun 2006-03-05 19:31:28 +1100
message:
Explain why update pivots more clearly in the relevant test.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060305082622-1ae79047490c239a
parent: robertc at robertcollins.net-20060305022007-53e5907d083453e8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bound-branches
timestamp: Sun 2006-03-05 19:26:22 +1100
message:
Update help message to be more bound branch friendly.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060305022007-53e5907d083453e8
parent: robertc at robertcollins.net-20060305001931-051a5898ad439113
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bound-branches
timestamp: Sun 2006-03-05 13:20:07 +1100
message:
Local commits appear to be working properly.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060305001931-051a5898ad439113
parent: robertc at robertcollins.net-20060304230437-3c1c3098f37a39cb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bound-branches
timestamp: Sun 2006-03-05 11:19:31 +1100
message:
update updates working tree and branch together.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060304230437-3c1c3098f37a39cb
parent: robertc at robertcollins.net-20060304223519-51db134273f7a5a1
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bound-branches
timestamp: Sun 2006-03-05 10:04:37 +1100
message:
Local commits do no alter or access the master branch.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060304223519-51db134273f7a5a1
parent: robertc at robertcollins.net-20060304215237-b1ee1a8c3238a251
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bound-branches
timestamp: Sun 2006-03-05 09:35:19 +1100
message:
Local commits on unbound branches fail.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060304215237-b1ee1a8c3238a251
parent: robertc at robertcollins.net-20060304130357-95990a95920f57bb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bound-branches
timestamp: Sun 2006-03-05 08:52:37 +1100
message:
Commit revision data locally first for bound branch commits.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060304130357-95990a95920f57bb
parent: robertc at robertcollins.net-20060303132246-5527bd85b7a33fe7
parent: john at arbash-meinel.com-20060103235145-7daca9e6edf27703
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bound-branches
timestamp: Sun 2006-03-05 00:03:57 +1100
message:
Update bound branch implementation to 0.8.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060103235145-7daca9e6edf27703
parent: john at arbash-meinel.com-20051231151921-351e2877d360e537
parent: john at arbash-meinel.com-20060103154418-e6b640e95a1d0e03
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-bound-branch
timestamp: Tue 2006-01-03 17:51:45 -0600
message:
[merge] jam-integration 1495
------------------------------------------------------------
merged: john at arbash-meinel.com-20051231151921-351e2877d360e537
parent: john at arbash-meinel.com-20051231060441-1234627a5fa6e6f1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-bound-branch
timestamp: Sat 2005-12-31 09:19:21 -0600
message:
Added special exceptions when unable to contact parent branch. Added tests for failure. bind() no longer updates the remote working tree
------------------------------------------------------------
merged: john at arbash-meinel.com-20051231060441-1234627a5fa6e6f1
parent: john at arbash-meinel.com-20051231055713-351f8d30e4dc1a8f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-bound-branch
timestamp: Sat 2005-12-31 00:04:41 -0600
message:
todo
------------------------------------------------------------
merged: john at arbash-meinel.com-20051231055713-351f8d30e4dc1a8f
parent: john at arbash-meinel.com-20051231051647-48a9b9751df50bec
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-bound-branch
timestamp: Fri 2005-12-30 23:57:13 -0600
message:
Adding tests against an sftp branch.
Fixed a couple of errors it revealed.
Including that we were re-connecting to the master branch
multiple times, inside a write lock (because inside commit
we call pull, which needs the master branch)
------------------------------------------------------------
merged: john at arbash-meinel.com-20051231051647-48a9b9751df50bec
parent: john at arbash-meinel.com-20051231005134-dd54e393c7d3b612
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-bound-branch
timestamp: Fri 2005-12-30 23:16:47 -0600
message:
Created a set of tests which bind to an sftp branch. Found some bugs, need to fix commit.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051231005134-dd54e393c7d3b612
parent: john at arbash-meinel.com-20051231002303-fbc5cf80469ef0cf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-bound-branch
timestamp: Fri 2005-12-30 18:51:34 -0600
message:
Updated pull. Now all paths which call set_revision_history maintain the branch invariant. All tests pass.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051231002303-fbc5cf80469ef0cf
parent: john at arbash-meinel.com-20051230232216-8f4ca70c6af10a40
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-bound-branch
timestamp: Fri 2005-12-30 18:23:03 -0600
message:
Updated commit to handle bound branches. Included test to handle commit after merge
------------------------------------------------------------
merged: john at arbash-meinel.com-20051230232216-8f4ca70c6af10a40
parent: john at arbash-meinel.com-20051230224621-26c3a50a460989a0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-bound-branch
timestamp: Fri 2005-12-30 17:22:16 -0600
message:
Whitespace cleanup of bzrlib.errors
------------------------------------------------------------
merged: john at arbash-meinel.com-20051230224621-26c3a50a460989a0
parent: john at arbash-meinel.com-20051230213745-6b85584a7e1a9ce0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-bound-branch
timestamp: Fri 2005-12-30 16:46:21 -0600
message:
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
------------------------------------------------------------
merged: john at arbash-meinel.com-20051230213745-6b85584a7e1a9ce0
parent: john at arbash-meinel.com-20051230213210-a5f4e287d7fe7e5a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-bound-branch
timestamp: Fri 2005-12-30 15:37:45 -0600
message:
Removing changes for bound branch by invading set-revision-history.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051230213210-a5f4e287d7fe7e5a
parent: john at arbash-meinel.com-20051127220506-6daf908286c7d704
parent: mbp at sourcefrog.net-20051216014735-906c2145b95924eb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-bound-branch
timestamp: Fri 2005-12-30 15:32:10 -0600
message:
[merge] bzr.dev 1491
------------------------------------------------------------
merged: john at arbash-meinel.com-20051127220506-6daf908286c7d704
parent: john at arbash-meinel.com-20051120215122-081d3a3c352b7225
parent: mbp at sourcefrog.net-20051125062856-e4c887417108fd9e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-bound-branch
timestamp: Sun 2005-11-27 16:05:06 -0600
message:
[merge] up-to-date against bzr.dev
------------------------------------------------------------
merged: john at arbash-meinel.com-20051120215122-081d3a3c352b7225
parent: john at arbash-meinel.com-20051117224950-1c5de92567527104
parent: jelmer at samba.org-20051120204442-18bfa8e003cc92ea
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bound-branch
timestamp: Sun 2005-11-20 15:51:22 -0600
message:
[merge] Jelmer Vernooij's cleanup
------------------------------------------------------------
merged: john at arbash-meinel.com-20051117224950-1c5de92567527104
parent: john at arbash-meinel.com-20051117224653-d0b7ceb49e5c9851
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-bound-branch
timestamp: Thu 2005-11-17 16:49:50 -0600
message:
Moved test_bound_branches into blackbox package.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051117224653-d0b7ceb49e5c9851
parent: john at arbash-meinel.com-20051114230331-7446f4c41816df34
parent: john at arbash-meinel.com-20051117221217-7b51f99a1a60c578
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-bound-branch
timestamp: Thu 2005-11-17 16:46:53 -0600
message:
[merge] robertc's integration, updated tests to check for retcode=3
------------------------------------------------------------
merged: john at arbash-meinel.com-20051114230331-7446f4c41816df34
parent: john at arbash-meinel.com-20051114171932-2a4a6a845c5e638b
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Mon 2005-11-14 17:03:31 -0600
message:
Playing around with changing the default pull location for a bound branch.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051114171932-2a4a6a845c5e638b
parent: john at arbash-meinel.com-20051114171833-7c7abd6245e20e0f
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Mon 2005-11-14 11:19:32 -0600
message:
Fixed the error message to request using bzr update instead of bzr pull
------------------------------------------------------------
merged: john at arbash-meinel.com-20051114171833-7c7abd6245e20e0f
parent: john at arbash-meinel.com-20051114170235-f85afa458bae956e
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Mon 2005-11-14 11:18:33 -0600
message:
Adding the bzr update command, to update checkouts and bound branches.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051114170235-f85afa458bae956e
parent: john at arbash-meinel.com-20051113024239-baea9ea45ecd2796
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Mon 2005-11-14 11:02:35 -0600
message:
Fixing up the error message for a failed bind.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051113024239-baea9ea45ecd2796
parent: john at arbash-meinel.com-20051113023217-3c97625faca853b4
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sat 2005-11-12 20:42:39 -0600
message:
Adding a little bit more to the test suite.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051113023217-3c97625faca853b4
parent: john at arbash-meinel.com-20051113021130-fe8ac4acfd26fe6c
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sat 2005-11-12 20:32:17 -0600
message:
Brought back 'optimized' version, for better errors, cleaned up exception handling.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051113021130-fe8ac4acfd26fe6c
parent: john at arbash-meinel.com-20051113021053-343a2bf544770e94
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sat 2005-11-12 20:11:30 -0600
message:
Reverting bogus optimization attempt
------------------------------------------------------------
merged: john at arbash-meinel.com-20051113021053-343a2bf544770e94
parent: john at arbash-meinel.com-20051113015537-77804ccc93479b4f
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sat 2005-11-12 20:10:53 -0600
message:
Attempted to improve bound performance, didn't help, will revert
------------------------------------------------------------
merged: john at arbash-meinel.com-20051113015537-77804ccc93479b4f
parent: john at arbash-meinel.com-20051113015016-6ca45e7115ab63f6
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sat 2005-11-12 19:55:37 -0600
message:
Bound branches seem to work, need to improve the performance.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051113015016-6ca45e7115ab63f6
parent: john at arbash-meinel.com-20051112214210-6afc243ae098682f
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sat 2005-11-12 19:50:16 -0600
message:
Cleaned up tests and code, all bound branch tests succeed.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051112214210-6afc243ae098682f
parent: john at arbash-meinel.com-20051112213835-282bdea6a76e7230
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sat 2005-11-12 15:42:10 -0600
message:
Added a test for the unbind command.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051112213835-282bdea6a76e7230
parent: john at arbash-meinel.com-20051112213359-925abcf4ba6b452f
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sat 2005-11-12 15:38:35 -0600
message:
Wrote a simple test which actually makes a branch become bound, and made it work
------------------------------------------------------------
merged: john at arbash-meinel.com-20051112213359-925abcf4ba6b452f
parent: john at arbash-meinel.com-20051112195534-3e33d6225502834b
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sat 2005-11-12 15:33:59 -0600
message:
(broken) Adding more tests, and some functionality
------------------------------------------------------------
merged: john at arbash-meinel.com-20051112195534-3e33d6225502834b
parent: john at arbash-meinel.com-20051112041705-f53471838021b7f3
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sat 2005-11-12 13:55:34 -0600
message:
(broken) working on implementing bound branches.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051112041705-f53471838021b7f3
parent: robertc at robertcollins.net-20051108005548-417f470e4b50a467
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-11-11 22:17:05 -0600
message:
Adding test for bound behavior
------------------------------------------------------------
merged: robertc at robertcollins.net-20060303132246-5527bd85b7a33fe7
parent: robertc at robertcollins.net-20060303094100-1efead555ecdd1a5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Sat 2006-03-04 00:22:46 +1100
message:
Put bzr branch behaviour back to the 0.7 ignore-working-tree state.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060303134251-e9c7ea87d21f3888
parent: pqm at pqm.ubuntu.com-20060303070344-03bb9a021c0d964c
parent: robertc at robertcollins.net-20060303094100-1efead555ecdd1a5
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-03-03 13:42:51 +0000
message:
Quick fix for bzr merge performance.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060303094100-1efead555ecdd1a5
parent: robertc at robertcollins.net-20060303060444-72e7dfb03c87525e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2006-03-03 20:41:00 +1100
message:
Quick, urgent fix for common_ancestor performance.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060303070344-03bb9a021c0d964c
parent: pqm at pqm.ubuntu.com-20060301231454-30078363321e6050
parent: robertc at robertcollins.net-20060303060444-72e7dfb03c87525e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-03-03 07:03:44 +0000
message:
Merge in new reconcile command and revision metadata correctness checks.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060303060444-72e7dfb03c87525e
parent: robertc at robertcollins.net-20060303055551-a383679a0f579b7d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2006-03-03 17:04:44 +1100
message:
Typos for reconcile - docstring in tsort.py was out of sync with code.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060303055551-a383679a0f579b7d
parent: robertc at robertcollins.net-20060303053804-ef5cbede74123fcc
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2006-03-03 16:55:51 +1100
message:
Review comments for reconcile.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060303053804-ef5cbede74123fcc
parent: pqm at pqm.ubuntu.com-20060301231454-30078363321e6050
parent: robertc at robertcollins.net-20060228011301-df7ce3b80dfb37ba
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2006-03-03 16:38:04 +1100
message:
* New 'reconcile' command will check branch consistency and repair indexes
that can become out of sync in pre 0.8 formats. (Robert Collins,
Aaron Bentley)
------------------------------------------------------------
merged: robertc at robertcollins.net-20060228011301-df7ce3b80dfb37ba
parent: robertc at robertcollins.net-20060226075402-92fca9fdb7b0070d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: otavio-fixes
timestamp: Tue 2006-02-28 12:13:01 +1100
message:
Enforce repository consistency during 'fetch' operations.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060226075402-92fca9fdb7b0070d
parent: robertc at robertcollins.net-20060226061907-005121a286a0a419
committer: Robert Collins <robertc at robertcollins.net>
branch nick: otavio-fixes
timestamp: Sun 2006-02-26 18:54:02 +1100
message:
Check for incorrect revision parentage in the weave during revision access.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060226061907-005121a286a0a419
parent: robertc at robertcollins.net-20060225054854-2f9e99cd1469d8c2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: otavio-fixes
timestamp: Sun 2006-02-26 17:19:07 +1100
message:
Add a FIXME for weave.add and remove some extraneous whitespace.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060225054854-2f9e99cd1469d8c2
parent: robertc at robertcollins.net-20060225005416-e74996bec38de816
committer: Robert Collins <robertc at robertcollins.net>
branch nick: otavio-fixes
timestamp: Sat 2006-02-25 16:48:54 +1100
message:
Make reconcile work with shared repositories.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060225005416-e74996bec38de816
parent: robertc at robertcollins.net-20060225004918-13fe7b4b532c606c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: otavio-fixes
timestamp: Sat 2006-02-25 11:54:16 +1100
message:
UI tweaks to reconcile - show progress for inventory backup.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060225004918-13fe7b4b532c606c
parent: robertc at robertcollins.net-20060225003259-eafe402b13b8b16e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: otavio-fixes
timestamp: Sat 2006-02-25 11:49:18 +1100
message:
Do not throttle updates to progress bars that change the message.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060225003259-eafe402b13b8b16e
parent: robertc at robertcollins.net-20060224231320-dbaf879d3070bfd7
committer: Robert Collins <robertc at robertcollins.net>
branch nick: otavio-fixes
timestamp: Sat 2006-02-25 11:32:59 +1100
message:
Only reconcile if doing so will perform gc or correct ancestry.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060224231320-dbaf879d3070bfd7
parent: robertc at robertcollins.net-20060224133245-7a448981e53b91f4
committer: Robert Collins <robertc at robertcollins.net>
branch nick: otavio-fixes
timestamp: Sat 2006-02-25 10:13:20 +1100
message:
Replace the slow topo_sort routine with a much faster one for non trivial datasets.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060224133245-7a448981e53b91f4
parent: robertc at robertcollins.net-20060224124702-136abce1cffc6ead
committer: Robert Collins <robertc at robertcollins.net>
branch nick: otavio-fixes
timestamp: Sat 2006-02-25 00:32:45 +1100
message:
Update fast topological_sort to be a function and to have the topo_sort tests run against it.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060224124702-136abce1cffc6ead
parent: robertc at robertcollins.net-20060223142448-be912a128be4d590
committer: Robert Collins <robertc at robertcollins.net>
branch nick: otavio-fixes
timestamp: Fri 2006-02-24 23:47:02 +1100
message:
Remove unused import in fileid_involved tests.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060223142448-be912a128be4d590
parent: robertc at robertcollins.net-20060223065213-84cc6d8971363661
committer: Robert Collins <robertc at robertcollins.net>
branch nick: otavio-fixes
timestamp: Fri 2006-02-24 01:24:48 +1100
message:
Somewhat optimised version of reconciler.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060223065213-84cc6d8971363661
parent: robertc at robertcollins.net-20060223040856-8b476741783b6244
committer: Robert Collins <robertc at robertcollins.net>
branch nick: otavio-fixes
timestamp: Thu 2006-02-23 17:52:13 +1100
message:
Optimise reconcilation to only hit each revision once.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060223040856-8b476741783b6244
parent: robertc at robertcollins.net-20060222233130-dfffba0d31e6a77a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: otavio-fixes
timestamp: Thu 2006-02-23 15:08:56 +1100
message:
Import bzrtools' 'fix' command as 'bzr reconcile.'
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060301231454-30078363321e6050
parent: pqm at pqm.ubuntu.com-20060301205900-fdcabc798b42ebb2
parent: abentley at panoramicfeedback.com-20060301224424-69c91b7987524db0
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-03-01 23:14:54 +0000
message:
Removed spurious 'foo'. Oops.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060301224424-69c91b7987524db0
parent: abentley at panoramicfeedback.com-20060301205000-5c214be77600416a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Wed 2006-03-01 17:44:24 -0500
message:
Removed spurious 'foo'. Oops.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060301205900-fdcabc798b42ebb2
parent: pqm at pqm.ubuntu.com-20060301023659-bef0c770dffa2805
parent: abentley at panoramicfeedback.com-20060301205000-5c214be77600416a
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-03-01 20:59:00 +0000
message:
Change to -p1 format diffs (Ellerman)
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060301205000-5c214be77600416a
parent: abentley at panoramicfeedback.com-20060228151014-55b4dd7f37274be7
parent: michael at ellerman.id.au-20060228144551-3d9941ecde4a0b0a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Wed 2006-03-01 15:50:00 -0500
message:
Change to -p1 format diffs (Ellerman)
------------------------------------------------------------
merged: michael at ellerman.id.au-20060228144551-3d9941ecde4a0b0a
parent: michael at ellerman.id.au-20060228144512-41ad7c2e3056e9ee
committer: Michael Ellerman <michael at ellerman.id.au>
branch nick: Michael's branch
timestamp: Wed 2006-03-01 01:45:51 +1100
message:
Update contrib/pwk for -p1 diffs from bzr
------------------------------------------------------------
merged: michael at ellerman.id.au-20060228144512-41ad7c2e3056e9ee
parent: pqm at pqm.ubuntu.com-20060228043846-eb79299c08edb05c
committer: Michael Ellerman <michael at ellerman.id.au>
branch nick: Michael's branch
timestamp: Wed 2006-03-01 01:45:12 +1100
message:
Change to -p1 format diffs. Update existing tests to cope, and add some
extra tests for modified/removed/renamed.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060301023659-bef0c770dffa2805
parent: pqm at pqm.ubuntu.com-20060228154255-36bfbc3781202122
parent: abentley at panoramicfeedback.com-20060228151452-f9bde3d16eb1b4ec
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-03-01 02:36:59 +0000
message:
Fixed conflict commands
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060228151452-f9bde3d16eb1b4ec
parent: abentley at panoramicfeedback.com-20060228151345-007b70209852eab3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's small fixes
timestamp: Tue 2006-02-28 10:14:52 -0500
message:
Fixed conflict commands
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060228151345-007b70209852eab3
parent: abentley at panoramicfeedback.com-20060227163245-a32f152da74b2ecf
parent: abentley at panoramicfeedback.com-20060228151014-55b4dd7f37274be7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's small fixes
timestamp: Tue 2006-02-28 10:13:45 -0500
message:
Merge from ab.integration
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060228154255-36bfbc3781202122
parent: pqm at pqm.ubuntu.com-20060228043846-eb79299c08edb05c
parent: abentley at panoramicfeedback.com-20060228151014-55b4dd7f37274be7
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-02-28 15:42:55 +0000
message:
Merge fixes to the remerge command
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060228151014-55b4dd7f37274be7
parent: abentley at panoramicfeedback.com-20060228140050-c3fd9d99bc46aa32
parent: abentley at panoramicfeedback.com-20060227204840-07fd176eccf3a96c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Tue 2006-02-28 10:10:14 -0500
message:
Merge fixes to the remerge command
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060227204840-07fd176eccf3a96c
parent: abentley at panoramicfeedback.com-20060227180732-93538a5a92d51e42
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Mon 2006-02-27 15:48:40 -0500
message:
Make remerge honour interesting-ids
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060227180732-93538a5a92d51e42
parent: abentley at panoramicfeedback.com-20060227172934-62a3451d61bbe5a4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Mon 2006-02-27 13:07:32 -0500
message:
Ensure remerge errors when file-id is None
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060228140050-c3fd9d99bc46aa32
parent: abentley at panoramicfeedback.com-20060227172934-62a3451d61bbe5a4
parent: pqm at pqm.ubuntu.com-20060228043846-eb79299c08edb05c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Tue 2006-02-28 09:00:50 -0500
message:
Merge frrom mainline
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060228043846-eb79299c08edb05c
parent: pqm at pqm.ubuntu.com-20060228043506-6627101e946abb2d
parent: robertc at robertcollins.net-20060228043150-fdb9c7f7231b271b
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-02-28 04:38:46 +0000
message:
Bugfix aliases to be backwards compatible with plugins providing command.run_argv.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060228043150-fdb9c7f7231b271b
parent: pqm at pqm.ubuntu.com-20060227173450-dd501228d2297c7c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2006-02-28 15:31:50 +1100
message:
Bugfix aliases to be backwards compatible with plugins providing command.run_argv.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060228043506-6627101e946abb2d
parent: pqm at pqm.ubuntu.com-20060227173450-dd501228d2297c7c
parent: abentley at panoramicfeedback.com-20060227163245-a32f152da74b2ecf
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-02-28 04:35:06 +0000
message:
Fix diff support of checkouts
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060227163245-a32f152da74b2ecf
parent: abentley at panoramicfeedback.com-20060227162554-fcb79169d6e9ff1f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's small fixes
timestamp: Mon 2006-02-27 11:32:45 -0500
message:
Rename cmd_show_diff to diff_cmd_helper
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060227162554-fcb79169d6e9ff1f
parent: aaron.bentley at utoronto.ca-20060223050418-1b37fdcb6f016688
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's small fixes
timestamp: Mon 2006-02-27 11:25:54 -0500
message:
Updated argument names, DRY fixes.
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060223050418-1b37fdcb6f016688
parent: aaron.bentley at utoronto.ca-20060223013420-3faa7e2c505f3063
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2006-02-23 00:04:18 -0500
message:
Got diff working properly with checkouts
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060227173450-dd501228d2297c7c
parent: pqm at pqm.ubuntu.com-20060225171542-6a7c8869b0b4003a
parent: abentley at panoramicfeedback.com-20060227172934-62a3451d61bbe5a4
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-02-27 17:34:50 +0000
message:
Whitespace fix
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060227172934-62a3451d61bbe5a4
parent: abentley at panoramicfeedback.com-20060224161241-7875e2e8984975dd
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Mon 2006-02-27 12:29:34 -0500
message:
Whitespace fix
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060225171542-6a7c8869b0b4003a
parent: pqm at pqm.ubuntu.com-20060224162850-d1f8cb9cdfab3016
parent: mbp at sourcefrog.net-20060225160014-0f84c48da6119527
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2006-02-25 17:15:42 +0000
message:
remove obsolete docs
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060225160014-0f84c48da6119527
parent: pqm at pqm.ubuntu.com-20060223223550-c0c332a9bd74e247
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.remove-docs
timestamp: Sun 2006-02-26 03:00:14 +1100
message:
Remove various obsolete development notes
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060224162850-d1f8cb9cdfab3016
parent: pqm at pqm.ubuntu.com-20060224144300-16a30ef3bb38fb7f
parent: abentley at panoramicfeedback.com-20060224161241-7875e2e8984975dd
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-02-24 16:28:50 +0000
message:
Merge trivial bugfix to --no-alias handling
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060224161241-7875e2e8984975dd
parent: abentley at panoramicfeedback.com-20060224155924-76be8b8c3cb16ebf
parent: erik at bagfors.nu-20060224151736-92b72bcee550c0a3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Fri 2006-02-24 11:12:41 -0500
message:
Merge trivial bugfix to --no-alias handling
------------------------------------------------------------
merged: erik at bagfors.nu-20060224151736-92b72bcee550c0a3
parent: erik at bagfors.nu-20060224151719-82d23285c19fae0f
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.aliases
timestamp: Fri 2006-02-24 16:17:36 +0100
message:
fix for broken --no-aliases
------------------------------------------------------------
merged: erik at bagfors.nu-20060224151719-82d23285c19fae0f
parent: erik at bagfors.nu-20060224144824-c93eef97b8b57aa0
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.aliases
timestamp: Fri 2006-02-24 16:17:19 +0100
message:
better test for --no-aliases
------------------------------------------------------------
merged: erik at bagfors.nu-20060224144824-c93eef97b8b57aa0
parent: erik at bagfors.nu-20060223180842-e2ac0eaaa6225586
parent: pqm at pqm.ubuntu.com-20060224063236-f5dbbf84724f64ca
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.aliases
timestamp: Fri 2006-02-24 15:48:24 +0100
message:
[merge] bzr.dev
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060224155924-76be8b8c3cb16ebf
parent: aaron.bentley at utoronto.ca-20060224062850-2fbf1755b9d2d50e
parent: pqm at pqm.ubuntu.com-20060224144300-16a30ef3bb38fb7f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Fri 2006-02-24 10:59:24 -0500
message:
Merge from bzr.dev
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060224144300-16a30ef3bb38fb7f
parent: pqm at pqm.ubuntu.com-20060224063236-f5dbbf84724f64ca
parent: aaron.bentley at utoronto.ca-20060224062850-2fbf1755b9d2d50e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-02-24 14:43:00 +0000
message:
Actually apply alias and uncommit fixes
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060224062850-2fbf1755b9d2d50e
parent: aaron.bentley at utoronto.ca-20060223234417-386601d0a5a613ef
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's integration
timestamp: Fri 2006-02-24 01:28:50 -0500
message:
Got uncommit working properly with checkouts
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060223234417-386601d0a5a613ef
parent: abentley at panoramicfeedback.com-20060223155612-fdd05be6c2bf7647
parent: erik at bagfors.nu-20060223180842-e2ac0eaaa6225586
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's integration
timestamp: Thu 2006-02-23 18:44:17 -0500
message:
Alias update
------------------------------------------------------------
merged: erik at bagfors.nu-20060223180842-e2ac0eaaa6225586
parent: erik at bagfors.nu-20060223180659-bdf607b5e68f9671
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.aliases
timestamp: Thu 2006-02-23 19:08:42 +0100
message:
change get_alias summary to be shorter
------------------------------------------------------------
merged: erik at bagfors.nu-20060223180659-bdf607b5e68f9671
parent: erik at bagfors.nu-20060222203325-33baad9691a8ed45
parent: pqm at pqm.ubuntu.com-20060223170304-293223b3e089d67f
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.aliases
timestamp: Thu 2006-02-23 19:06:59 +0100
message:
[merge] bzr.dev
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060224063236-f5dbbf84724f64ca
parent: pqm at pqm.ubuntu.com-20060224062138-345a2355879e8d56
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-02-24 06:32:36 +0000
message:
Got uncommit working properly with checkouts
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060224062138-345a2355879e8d56
parent: pqm at pqm.ubuntu.com-20060223223550-c0c332a9bd74e247
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-02-24 06:21:38 +0000
message:
Alias update
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060223223550-c0c332a9bd74e247
parent: pqm at pqm.ubuntu.com-20060223170304-293223b3e089d67f
parent: abentley at panoramicfeedback.com-20060223151247-9dc5e11197026907
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-02-23 22:35:50 +0000
message:
Made weave conflict markers customizable, standardized defaults
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060223151247-9dc5e11197026907
parent: abentley at panoramicfeedback.com-20060222151734-971c78a549ceb342
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-02-23 10:12:47 -0500
message:
Made weave conflict markers customizable, standardized defaults
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060223170304-293223b3e089d67f
parent: pqm at pqm.ubuntu.com-20060223020544-d9efcf806507124f
parent: abentley at panoramicfeedback.com-20060223155612-fdd05be6c2bf7647
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-02-23 17:03:04 +0000
message:
Merge user command aliases
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060223155612-fdd05be6c2bf7647
parent: abentley at panoramicfeedback.com-20060223154719-f0252665a9d183f4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Thu 2006-02-23 10:56:12 -0500
message:
Cleaned up some long lines
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060223154719-f0252665a9d183f4
parent: abentley at panoramicfeedback.com-20060223152222-9fa833278b24c69d
parent: erik at bagfors.nu-20060222203325-33baad9691a8ed45
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Thu 2006-02-23 10:47:19 -0500
message:
Merged aliases
------------------------------------------------------------
merged: erik at bagfors.nu-20060222203325-33baad9691a8ed45
parent: erik at bagfors.nu-20060219213505-d8e456c1314d1803
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.aliases
timestamp: Wed 2006-02-22 21:33:25 +0100
message:
remove AliasConfig, based on input from abentley
------------------------------------------------------------
merged: erik at bagfors.nu-20060219213505-d8e456c1314d1803
parent: erik at bagfors.nu-20060219211432-997baee7a9f60fe2
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.aliases
timestamp: Sun 2006-02-19 22:35:05 +0100
message:
small bugfixes, all tests pass now
------------------------------------------------------------
merged: erik at bagfors.nu-20060219211432-997baee7a9f60fe2
parent: erik at bagfors.nu-20060213002618-6ad160456d097750
parent: john at arbash-meinel.com-20060217035556-b86991407ef095d9
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.aliases
timestamp: Sun 2006-02-19 22:14:32 +0100
message:
[merge] jam-integration
------------------------------------------------------------
merged: erik at bagfors.nu-20060213002618-6ad160456d097750
parent: erik at bagfors.nu-20060212093413-c9c190e6b3724a36
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.aliases
timestamp: Mon 2006-02-13 01:26:18 +0100
message:
PEP8-ify
------------------------------------------------------------
merged: erik at bagfors.nu-20060212093413-c9c190e6b3724a36
parent: erik at bagfors.nu-20060212093054-ed7f716f6a413545
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.aliases
timestamp: Sun 2006-02-12 10:34:13 +0100
message:
support for overrides
------------------------------------------------------------
merged: erik at bagfors.nu-20060212093054-ed7f716f6a413545
parent: erik at bagfors.nu-20060210230401-7d3e63eb62d1dca9
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.aliases
timestamp: Sun 2006-02-12 10:30:54 +0100
message:
test for option overrides
------------------------------------------------------------
merged: erik at bagfors.nu-20060210230401-7d3e63eb62d1dca9
parent: erik at bagfors.nu-20060210192747-e7864d409e0635b1
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.aliases
timestamp: Sat 2006-02-11 00:04:01 +0100
message:
blackbox tests for aliases,--no-aliases and aliases with options
------------------------------------------------------------
merged: erik at bagfors.nu-20060210192747-e7864d409e0635b1
parent: erik at bagfors.nu-20060210192701-b2a976cfe4b5d6af
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.aliases
timestamp: Fri 2006-02-10 20:27:47 +0100
message:
restructured NEWS
------------------------------------------------------------
merged: erik at bagfors.nu-20060210192701-b2a976cfe4b5d6af
parent: erik at bagfors.nu-20060206194719-19f4a9d2e55e858c
parent: john at arbash-meinel.com-20060206140209-793eeeb7f3f3d069
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.aliases
timestamp: Fri 2006-02-10 20:27:01 +0100
message:
merge from jam-integration
------------------------------------------------------------
merged: erik at bagfors.nu-20060206194719-19f4a9d2e55e858c
parent: erik at bagfors.nu-20060205195332-7e0fcfad160dc1c7
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.aliases
timestamp: Mon 2006-02-06 20:47:19 +0100
message:
tests for AliasesConfig
------------------------------------------------------------
merged: erik at bagfors.nu-20060205195332-7e0fcfad160dc1c7
parent: erik at bagfors.nu-20060205194946-ce8d8bf0361dc98f
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.aliases
timestamp: Sun 2006-02-05 20:53:32 +0100
message:
documentation and NEWS
------------------------------------------------------------
merged: erik at bagfors.nu-20060205194946-ce8d8bf0361dc98f
parent: mbp at sourcefrog.net-20060201130813-1240ac51411d1330
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.aliases
timestamp: Sun 2006-02-05 20:49:46 +0100
message:
support for aliases in bazaar.conf
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060223152222-9fa833278b24c69d
parent: aaron.bentley at utoronto.ca-20060223014622-df3b5199ff942457
parent: pqm at pqm.ubuntu.com-20060223020544-d9efcf806507124f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Thu 2006-02-23 10:22:22 -0500
message:
Merge from mainline
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060223020544-d9efcf806507124f
parent: pqm at pqm.ubuntu.com-20060223014557-ea05fae543e31ae5
parent: aaron.bentley at utoronto.ca-20060223014622-df3b5199ff942457
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-02-23 02:05:44 +0000
message:
Fix handling of non-http errors produced by http transport
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060223014622-df3b5199ff942457
parent: abentley at panoramicfeedback.com-20060222145113-495a9bf46e37e439
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab.integration
timestamp: Wed 2006-02-22 20:46:22 -0500
message:
Fix handling of non-http errors produced by http transport
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060223014557-ea05fae543e31ae5
parent: pqm at pqm.ubuntu.com-20060222234141-cfd8f6db9a98d888
parent: aaron.bentley at utoronto.ca-20060223013420-3faa7e2c505f3063
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-02-23 01:45:57 +0000
message:
Got status working properly with checkouts
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060223013420-3faa7e2c505f3063
parent: aaron.bentley at utoronto.ca-20060223012941-0b2f131851fef01e
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-02-22 20:34:20 -0500
message:
whitespace fixups
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060223012941-0b2f131851fef01e
parent: abentley at panoramicfeedback.com-20060222235928-cfa96b4cc442862f
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-02-22 20:29:41 -0500
message:
Niced up the documentation
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060222235928-cfa96b4cc442862f
parent: abentley at panoramicfeedback.com-20060222235432-307f4397ab70242e
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's small fixes
timestamp: Wed 2006-02-22 18:59:28 -0500
message:
Whitespace fix
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060222235432-307f4397ab70242e
parent: abentley at panoramicfeedback.com-20060222235009-0f07b75e2fc4d0a5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's small fixes
timestamp: Wed 2006-02-22 18:54:32 -0500
message:
Fix status to work with checkouts
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060222235009-0f07b75e2fc4d0a5
parent: abentley at panoramicfeedback.com-20060213194322-559e96ff793e0682
parent: abentley at panoramicfeedback.com-20060222145113-495a9bf46e37e439
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's small fixes
timestamp: Wed 2006-02-22 18:50:09 -0500
message:
Merge from integration
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060222234141-cfd8f6db9a98d888
parent: pqm at pqm.ubuntu.com-20060222222053-2c5bf0ca6e71f18d
parent: robertc at robertcollins.net-20060222233130-dfffba0d31e6a77a
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-02-22 23:41:41 +0000
message:
Add tests for sftp push, and NonLocalTets for BzrDir.create_branch_convenience, before fixing the failure of it to work on non-local urls.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060222233130-dfffba0d31e6a77a
parent: pqm at pqm.ubuntu.com-20060222222053-2c5bf0ca6e71f18d
parent: robertc at robertcollins.net-20060222230229-d5e0fb4ab1f46d9a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-02-23 10:31:30 +1100
message:
Add tests for sftp push, and NonLocalTets for BzrDir.create_branch_convenience, before fixing the failure of it to work on non-local urls.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060222230229-d5e0fb4ab1f46d9a
parent: robertc at robertcollins.net-20060222055846-190a2944772a7125
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-02-23 10:02:29 +1100
message:
Add tests for sftp push, and NonLocalTets for BzrDir.create_branch_convenience, before fixing the failure of it to work on non-local urls.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060222222053-2c5bf0ca6e71f18d
parent: pqm at pqm.ubuntu.com-20060222075956-fb281c427e571da6
parent: abentley at panoramicfeedback.com-20060222151734-971c78a549ceb342
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-02-22 22:20:53 +0000
message:
Fixed build_tree with symlinks
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060222151734-971c78a549ceb342
parent: abentley at panoramicfeedback.com-20060222144836-2f0d747f39d956c3
parent: abentley at panoramicfeedback.com-20060222145113-495a9bf46e37e439
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-02-22 10:17:34 -0500
message:
Merge from integration
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060222145113-495a9bf46e37e439
parent: abentley at panoramicfeedback.com-20060221212021-98bc6d0d4a1e7639
parent: pqm at pqm.ubuntu.com-20060222075956-fb281c427e571da6
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Wed 2006-02-22 09:51:13 -0500
message:
Merge from mainline
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060222144836-2f0d747f39d956c3
parent: abentley at panoramicfeedback.com-20060222143942-ae72299f2de66767
parent: abentley at panoramicfeedback.com-20060221212021-98bc6d0d4a1e7639
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-02-22 09:48:36 -0500
message:
Merge from integration
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060222143942-ae72299f2de66767
parent: aaron.bentley at utoronto.ca-20060221012744-0dfd362401335acb
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-02-22 09:39:42 -0500
message:
Fixed build_tree with symlinks
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060222075956-fb281c427e571da6
parent: pqm at pqm.ubuntu.com-20060222061939-b4b7825d1d580ccf
parent: mbp at sourcefrog.net-20060222070612-c108852197fc0ca4
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-02-22 07:59:56 +0000
message:
add LockDir and related fixes
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060222070612-c108852197fc0ca4
parent: mbp at sourcefrog.net-20060222070544-f7808ac1678c0ec8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Wed 2006-02-22 18:06:12 +1100
message:
LockDir review comment fixes
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060222070544-f7808ac1678c0ec8
parent: mbp at sourcefrog.net-20060222055200-25345f9a35e8905d
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Wed 2006-02-22 18:05:44 +1100
message:
rio files are always externalized in utf-8. test this.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060222055200-25345f9a35e8905d
parent: mbp at sourcefrog.net-20060222054252-b0d965d7cce9ccec
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Wed 2006-02-22 16:52:00 +1100
message:
LockDir doc corrections
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060222054252-b0d965d7cce9ccec
parent: mbp at sourcefrog.net-20060222043733-6fc1f11e6b19ba79
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Wed 2006-02-22 16:42:52 +1100
message:
docstring for LockDir.unlock
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060222043733-6fc1f11e6b19ba79
parent: mbp at sourcefrog.net-20060222042954-60333f08dd56a646
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Wed 2006-02-22 15:37:33 +1100
message:
Fix test_progress_note for non-80-character terminals
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060222042954-60333f08dd56a646
parent: mbp at sourcefrog.net-20060221224609-a7f433d0488c080d
parent: pqm at pqm.ubuntu.com-20060221231239-643b2cbe5aefc06a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Wed 2006-02-22 15:29:54 +1100
message:
[merge] from bzr.dev before integration
Fix undefined ordering in sign_my_revisions breaking tests
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060221224609-a7f433d0488c080d
parent: mbp at sourcefrog.net-20060221223325-0fbe4e9583b6d853
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Wed 2006-02-22 09:46:09 +1100
message:
Confirm that only the intended holder of a lock was broken.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060221223325-0fbe4e9583b6d853
parent: mbp at sourcefrog.net-20060221223022-0d73c36b63fc9bcf
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Wed 2006-02-22 09:33:25 +1100
message:
Breaking an already-released lock should just succeed
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060221223022-0d73c36b63fc9bcf
parent: mbp at sourcefrog.net-20060221223009-af22e77274dc6fda
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Wed 2006-02-22 09:30:22 +1100
message:
New LockDir.force_break and simple test case
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060221223009-af22e77274dc6fda
parent: mbp at sourcefrog.net-20060221080504-583fd88ceaa3b637
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Wed 2006-02-22 09:30:09 +1100
message:
Warning to check storage when lock was broken
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060221080504-583fd88ceaa3b637
parent: mbp at sourcefrog.net-20060221080327-b1723b722187fb63
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks-fixed
timestamp: Tue 2006-02-21 19:05:04 +1100
message:
Start LockDir.confirm method and LockBroken exception
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060221080327-b1723b722187fb63
parent: mbp at sourcefrog.net-20060221075354-3e2bbf0985b5523b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks-fixed
timestamp: Tue 2006-02-21 19:03:27 +1100
message:
Change fancy_rename to use rand_chars rather than reinvent it.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060221075354-3e2bbf0985b5523b
parent: mbp at sourcefrog.net-20060221074858-d25cba72aacf23c0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks-fixed
timestamp: Tue 2006-02-21 18:53:54 +1100
message:
Put default LockDir timeouts in variables; increase timeout to 3min
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060221074858-d25cba72aacf23c0
parent: mbp at sourcefrog.net-20060221070416-8aab7f0579cf38fb
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks-fixed
timestamp: Tue 2006-02-21 18:48:58 +1100
message:
Start adding LockDir.confirm() method
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060221070416-8aab7f0579cf38fb
parent: mbp at sourcefrog.net-20060221070359-e334fefdbbc1a45b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks-fixed
timestamp: Tue 2006-02-21 18:04:16 +1100
message:
Run lockdir doctests
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060221070359-e334fefdbbc1a45b
parent: mbp at sourcefrog.net-20060221070119-53697c8b1677ad18
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks-fixed
timestamp: Tue 2006-02-21 18:03:59 +1100
message:
LockDir should use Transport.rename when releasing locks too.
Add simple example of usage as a doctest.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060221070119-53697c8b1677ad18
parent: mbp at sourcefrog.net-20060221065951-2f56678a03b687bc
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks-fixed
timestamp: Tue 2006-02-21 18:01:19 +1100
message:
Transport.rename should be unimplemented in base class
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060221065951-2f56678a03b687bc
parent: mbp at sourcefrog.net-20060221063220-73a013b7fd48f00a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks-fixed
timestamp: Tue 2006-02-21 17:59:51 +1100
message:
MemoryTransport.rename() must raise exceptions on collision
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060221063220-73a013b7fd48f00a
parent: mbp at sourcefrog.net-20060221062726-31a9869e855950a1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks-fixed
timestamp: Tue 2006-02-21 17:32:20 +1100
message:
MemoryTransport should indicate ENOTEMPTY on rmdir of nonempty, same as unix
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060221062726-31a9869e855950a1
parent: mbp at sourcefrog.net-20060221060201-5f260bfe331bdc42
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks-fixed
timestamp: Tue 2006-02-21 17:27:26 +1100
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060221060201-5f260bfe331bdc42
parent: mbp at sourcefrog.net-20060220222036-702b0aca3e25b5f8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks-fixed
timestamp: Tue 2006-02-21 17:02:01 +1100
message:
New Transport.rename that mustn't overwrite
Change LockDir.is_held to be a property
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060220222036-702b0aca3e25b5f8
parent: mbp at sourcefrog.net-20060220221907-cd373a4714178400
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks-fixed
timestamp: Tue 2006-02-21 09:20:36 +1100
message:
New LockDir locking mechanism
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060220221907-cd373a4714178400
parent: mbp at sourcefrog.net-20060220220528-33bc3e992d169b4c
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks-fixed
timestamp: Tue 2006-02-21 09:19:07 +1100
message:
Change some lock and transaction related exceptions to BzrNewException style
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060220220528-33bc3e992d169b4c
parent: mbp at sourcefrog.net-20060217205311-9f0171d976e71e3f
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks-fixed
timestamp: Tue 2006-02-21 09:05:28 +1100
message:
New DirectoryNotEmpty exception, and raise this from local and memory
transports.
Check that some PathError is raised when trying to remove a non-empty
directory - not necessarily DirectoryNotEmpty because sftp can't detect
it.
-- This line and the following will be ignored --
modified:
bzrlib/errors.py
bzrlib/tests/test_transport_implementations.py
bzrlib/transport/__init__.py
bzrlib/transport/memory.py
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060217205311-9f0171d976e71e3f
parent: mbp at sourcefrog.net-20060217204603-7cbfc062067a1c06
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks-fixed
timestamp: Sat 2006-02-18 07:53:11 +1100
message:
Add TestCaseWithTransport.get_transport and get_readonly_transport
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060217204603-7cbfc062067a1c06
parent: mbp at sourcefrog.net-20060217204417-fb97e1eb0e03ee38
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks-fixed
timestamp: Sat 2006-02-18 07:46:03 +1100
message:
New Rio.as_dict method
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060217204417-fb97e1eb0e03ee38
parent: mbp at sourcefrog.net-20060217203719-b6f5b2a00d602a94
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks-fixed
timestamp: Sat 2006-02-18 07:44:17 +1100
message:
rio.Stanza.add should raise TypeError on invalid types.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060217203719-b6f5b2a00d602a94
parent: mbp at sourcefrog.net-20060217203430-d15f555c71a6c0cd
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks-fixed
timestamp: Sat 2006-02-18 07:37:19 +1100
message:
Clean up comments
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060217203430-d15f555c71a6c0cd
parent: mbp at sourcefrog.net-20060210003925-8c64dd0c0a16d177
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks-fixed
timestamp: Sat 2006-02-18 07:34:30 +1100
message:
New utility routine rand_chars
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060210003925-8c64dd0c0a16d177
parent: mbp at sourcefrog.net-20060206103146-8bfb9a1bba84d2c9
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2006-02-10 11:39:25 +1100
message:
[patch] better formatting for 'bzr help commands' (Matthew D Fuller)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060206103146-8bfb9a1bba84d2c9
parent: mbp at sourcefrog.net-20060206075542-12d94bc024f020e3
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2006-02-06 21:31:46 +1100
message:
[patch] Rename TestCase.AssertSubset to assertSubset for consistency (Jan Hudec)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060206075542-12d94bc024f020e3
parent: mbp at sourcefrog.net-20060201131742-6f81ba01f409cc1a
parent: robertc at robertcollins.net-20060201211329-b3faf2a411316ff7
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2006-02-06 18:55:42 +1100
message:
[merge] robertc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060201131742-6f81ba01f409cc1a
parent: mbp at sourcefrog.net-20060201130813-1240ac51411d1330
parent: john at arbash-meinel.com-20060131200102-1cc580967bd9fe7b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2006-02-02 00:17:42 +1100
message:
[merge] jam-integration
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060222061939-b4b7825d1d580ccf
parent: pqm at pqm.ubuntu.com-20060222055120-bc7ccf0ab92d1632
parent: robertc at robertcollins.net-20060222055846-190a2944772a7125
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-02-22 06:19:39 +0000
message:
Merge in ui for creating and converting to knit branch - no backend support yet.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060222055846-190a2944772a7125
parent: robertc at robertcollins.net-20060222054547-70f045f317b7993b
parent: robertc at robertcollins.net-20060222055644-1c843d87efc1c539
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-02-22 16:58:46 +1100
message:
Merge in ui for creating and converting to knit branch - no backend support yet.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060222055644-1c843d87efc1c539
parent: robertc at robertcollins.net-20060221124257-8ee8f4b0b3b45ac3
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-new-repo-format
timestamp: Wed 2006-02-22 16:56:44 +1100
message:
Review feedback.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060221124257-8ee8f4b0b3b45ac3
parent: robertc at robertcollins.net-20060221054521-b26e1fd3b723dc00
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-new-repo-format
timestamp: Tue 2006-02-21 23:42:57 +1100
message:
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060221054521-b26e1fd3b723dc00
parent: robertc at robertcollins.net-20060221015126-bde20d0239fd8c47
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-new-repo-format
timestamp: Tue 2006-02-21 16:45:21 +1100
message:
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
------------------------------------------------------------
merged: robertc at robertcollins.net-20060221015126-bde20d0239fd8c47
parent: robertc at robertcollins.net-20060221004343-ccf22f64d96aa17d
parent: robertc at robertcollins.net-20060221014955-c8bdf2cae88c5e34
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-new-repo-format
timestamp: Tue 2006-02-21 12:51:26 +1100
message:
Merge in InterRepository api to have it available.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060222055120-bc7ccf0ab92d1632
parent: pqm at pqm.ubuntu.com-20060221231239-643b2cbe5aefc06a
parent: robertc at robertcollins.net-20060222054547-70f045f317b7993b
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-02-22 05:51:20 +0000
message:
Fix 'bzr pull' on metadir trees.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060222054547-70f045f317b7993b
parent: robertc at robertcollins.net-20060221224858-2b61aaa0f1636293
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-02-22 16:45:47 +1100
message:
Fix 'bzr pull' on metadir trees.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060221231239-643b2cbe5aefc06a
parent: pqm at pqm.ubuntu.com-20060221212748-e81c0691edf46b65
parent: robertc at robertcollins.net-20060221224858-2b61aaa0f1636293
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-02-21 23:12:39 +0000
message:
Fixup internally generated deprecation warning from merge_inner and unbreak bzr push to new sftp branches.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060221224858-2b61aaa0f1636293
parent: robertc at robertcollins.net-20060221224144-83aef6ec91b8a5dc
parent: pqm at pqm.ubuntu.com-20060221212748-e81c0691edf46b65
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-02-22 09:48:58 +1100
message:
Merge mainline.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060221224144-83aef6ec91b8a5dc
parent: robertc at robertcollins.net-20060221215359-78567cab94e7b739
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-02-22 09:41:44 +1100
message:
Unbreak bzr push sftp:////
------------------------------------------------------------
merged: robertc at robertcollins.net-20060221215359-78567cab94e7b739
parent: pqm at pqm.ubuntu.com-20060221174102-aa6bd4464296c614
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-02-22 08:53:59 +1100
message:
Fixup internally generated deprecation warning from merge_inner.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060221212748-e81c0691edf46b65
parent: pqm at pqm.ubuntu.com-20060221211130-87707824495dc833
parent: abentley at panoramicfeedback.com-20060221212021-98bc6d0d4a1e7639
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-02-21 21:27:48 +0000
message:
Added progress bars to tree-changing operations
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060221212021-98bc6d0d4a1e7639
parent: abentley at panoramicfeedback.com-20060221210757-a2967f7c4589d51c
parent: pqm at pqm.ubuntu.com-20060221211130-87707824495dc833
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Tue 2006-02-21 16:20:21 -0500
message:
Merge from mainline
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060221210757-a2967f7c4589d51c
parent: abentley at panoramicfeedback.com-20060221152300-38559c3cdfe3370c
parent: abentley at panoramicfeedback.com-20060221210653-861c4a970e0d3460
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Tue 2006-02-21 16:07:57 -0500
message:
Added progress bars to tree-changing operations
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060221210653-861c4a970e0d3460
parent: abentley at panoramicfeedback.com-20060221175737-f161366f8426914a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-02-21 16:06:53 -0500
message:
Fixed use of ui_factory (which can't be imported directly)
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060221175737-f161366f8426914a
parent: abentley at panoramicfeedback.com-20060221174344-f3050cca65ef4a23
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-02-21 12:57:37 -0500
message:
Added progress bar to pull
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060221174344-f3050cca65ef4a23
parent: abentley at panoramicfeedback.com-20060221173539-9b29d7f9991d08c3
parent: pqm at pqm.ubuntu.com-20060221165139-95f219a192c54f27
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-02-21 12:43:44 -0500
message:
Merge from mainline
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060221173539-9b29d7f9991d08c3
parent: abentley at panoramicfeedback.com-20060217161230-4cd4b3b76aa83a24
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-02-21 12:35:39 -0500
message:
Show progress bars in revert
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060217161230-4cd4b3b76aa83a24
parent: abentley at panoramicfeedback.com-20060217145724-d283533cacf03e7c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-17 11:12:30 -0500
message:
Disable merge progress bars, except from the merge command
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060217145724-d283533cacf03e7c
parent: abentley at panoramicfeedback.com-20060217143929-ef39fc087bf80511
parent: abentley at panoramicfeedback.com-20060217145536-47acd73ee3dad3b4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-17 09:57:24 -0500
message:
Merged dangling inventory fix
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060217143929-ef39fc087bf80511
parent: abentley at panoramicfeedback.com-20060217140221-60aef0b3d1998dc3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-17 09:39:29 -0500
message:
Added progress bars to revert.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060217140221-60aef0b3d1998dc3
parent: abentley at panoramicfeedback.com-20060217134230-76d34bd5edfaa747
parent: abentley at panoramicfeedback.com-20060217135725-1aa269dda84d7f46
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-17 09:02:21 -0500
message:
Merged Transform [Merged Robert [Merged John]]
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060217134230-76d34bd5edfaa747
parent: abentley at panoramicfeedback.com-20060216185217-c766d147d91191d8
parent: abentley at lappy-20060217125306-89e0b981e673e3c6
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-17 08:42:30 -0500
message:
Merged changes from transform
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060216185217-c766d147d91191d8
parent: abentley at panoramicfeedback.com-20060216161825-6bad50573bfd84a2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-02-16 13:52:17 -0500
message:
Added progress bars to merge
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060221211130-87707824495dc833
parent: pqm at pqm.ubuntu.com-20060221174102-aa6bd4464296c614
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-02-21 21:11:30 +0000
message:
Added progress bars to tree-changing operations
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060221174102-aa6bd4464296c614
parent: pqm at pqm.ubuntu.com-20060221165139-95f219a192c54f27
parent: john at arbash-meinel.com-20060221173608-e169d8586d154050
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-02-21 17:41:02 +0000
message:
Mac OSX raises EPERM when you try to unlink a directory
------------------------------------------------------------
merged: john at arbash-meinel.com-20060221173608-e169d8586d154050
parent: john at arbash-meinel.com-20060221164322-b007aa882582a66e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-02-21 11:36:08 -0600
message:
Mac OSX raises EPERM when you try to unlink a directory
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060221165139-95f219a192c54f27
parent: pqm at pqm.ubuntu.com-20060221162439-50b779cbf0368203
parent: john at arbash-meinel.com-20060221164322-b007aa882582a66e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-02-21 16:51:39 +0000
message:
[merge] bzr.dev, cleanup conflicts, fixup http tests for new TestCase layout.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060221164322-b007aa882582a66e
parent: john at arbash-meinel.com-20060221050730-ee779d2e776fa5ce
parent: pqm at pqm.ubuntu.com-20060221115154-a1b580a4225d536b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-02-21 10:43:22 -0600
message:
[merge] bzr.dev, cleanup conflicts, fixup http tests for new TestCase layout.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060221050730-ee779d2e776fa5ce
parent: john at arbash-meinel.com-20060220185846-60c29849176c332a
parent: james.henstridge at canonical.com-20060210064025-eb9506a367a93ff2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Mon 2006-02-20 23:07:30 -0600
message:
[merge] James Henstridge: Set Agent string in http headers, add tests for it.
------------------------------------------------------------
merged: james.henstridge at canonical.com-20060210064025-eb9506a367a93ff2
parent: james.henstridge at canonical.com-20060207032049-5b6ce8345e102f4f
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2006-02-10 14:40:25 +0800
message:
Make HTTP transport has() method do HEAD requests, and update test to
verify that this is the case.
------------------------------------------------------------
merged: james.henstridge at canonical.com-20060207032049-5b6ce8345e102f4f
parent: james.henstridge at canonical.com-20060206073247-001a39bcae4ae3d6
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.dev (Main development branch)
timestamp: Tue 2006-02-07 11:20:49 +0800
message:
Fix up test_fetch tests to work with changes to log format
------------------------------------------------------------
merged: james.henstridge at canonical.com-20060206073247-001a39bcae4ae3d6
parent: james.henstridge at canonical.com-20060206062430-3ba9f6c17499ac94
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2006-02-06 15:32:47 +0800
message:
Make bzrlib.transport.http.HttpServer output referer and user agent as in
common log format.
Update my new test_http tests to use TestCaseWithWebserver, and check log
to make sure user-agent is written.
------------------------------------------------------------
merged: james.henstridge at canonical.com-20060206062430-3ba9f6c17499ac94
parent: james.henstridge at canonical.com-20060202091151-fb40d3f83952167e
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2006-02-06 14:24:30 +0800
message:
Add a test to make sure the user-agent header is being sent correctly.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060220185846-60c29849176c332a
parent: john at arbash-meinel.com-20060217035556-b86991407ef095d9
parent: abentley at panoramicfeedback.com-20060217155604-fb8049ff5cf2f714
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Mon 2006-02-20 12:58:46 -0600
message:
[merge] Aaron's tree-transform changes.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060221162439-50b779cbf0368203
parent: pqm at pqm.ubuntu.com-20060221115154-a1b580a4225d536b
parent: abentley at panoramicfeedback.com-20060221152300-38559c3cdfe3370c
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-02-21 16:24:39 +0000
message:
Fixed deprecated op use in test suite
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060221152300-38559c3cdfe3370c
parent: abentley at panoramicfeedback.com-20060221144227-e5bcfec48b35008b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Tue 2006-02-21 10:23:00 -0500
message:
Fixed deprecated op use in test suite
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060221144227-e5bcfec48b35008b
parent: aaron.bentley at utoronto.ca-20060221032904-781ed5b86f2c3b62
parent: pqm at pqm.ubuntu.com-20060221115154-a1b580a4225d536b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Tue 2006-02-21 09:42:27 -0500
message:
Merge from mainline
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060221115154-a1b580a4225d536b
parent: pqm at pqm.ubuntu.com-20060221033439-fcd0849f8070bc8f
parent: robertc at robertcollins.net-20060221114236-0deb1948f0c8c956
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-02-21 11:51:54 +0000
message:
Merge in InterRepository API support.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060221114236-0deb1948f0c8c956
parent: pqm at pqm.ubuntu.com-20060221033439-fcd0849f8070bc8f
parent: robertc at robertcollins.net-20060221014955-c8bdf2cae88c5e34
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2006-02-21 22:42:36 +1100
message:
Merge in InterRepository API support.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060221014955-c8bdf2cae88c5e34
parent: robertc at robertcollins.net-20060221000809-e41f2f69a365093f
parent: robertc at robertcollins.net-20060221004343-ccf22f64d96aa17d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: inter-repo-api
timestamp: Tue 2006-02-21 12:49:55 +1100
message:
Merge from bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060221000809-e41f2f69a365093f
parent: robertc at robertcollins.net-20060220230332-29bbe74a3d04c302
committer: Robert Collins <robertc at robertcollins.net>
branch nick: inter-repo-api
timestamp: Tue 2006-02-21 11:08:09 +1100
message:
Update NEWS.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060220230332-29bbe74a3d04c302
parent: robertc at robertcollins.net-20060220115204-1777ed5964b0cf8d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: inter-repo-api
timestamp: Tue 2006-02-21 10:03:32 +1100
message:
Move missing_revision_ids from Repository to InterRepository, and eliminate the now unused Repository._compatible_formats method.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060220115204-1777ed5964b0cf8d
parent: robertc at robertcollins.net-20060220102233-70839cc4cdbc2011
committer: Robert Collins <robertc at robertcollins.net>
branch nick: inter-repo-api
timestamp: Mon 2006-02-20 22:52:04 +1100
message:
Move copy_content_into into InterRepository and InterWeaveRepo, and disable the default codepath test as we have optimised paths for all current combinations.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060220102233-70839cc4cdbc2011
parent: robertc at robertcollins.net-20060220095027-c52f5024a6f5fcdb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: inter-repo-api
timestamp: Mon 2006-02-20 21:22:33 +1100
message:
Deprecate direct use of fetch.Fetcher.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060220095027-c52f5024a6f5fcdb
parent: robertc at robertcollins.net-20060220070554-b738a65e99cd2e9c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: inter-repo-api
timestamp: Mon 2006-02-20 20:50:27 +1100
message:
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060220070554-b738a65e99cd2e9c
parent: robertc at robertcollins.net-20060220070110-a49ef22c8ad18929
committer: Robert Collins <robertc at robertcollins.net>
branch nick: inter-repo-api
timestamp: Mon 2006-02-20 18:05:54 +1100
message:
Test that we get the right optimiser back in the InterRepository tests.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060220070110-a49ef22c8ad18929
parent: robertc at robertcollins.net-20060220052207-3e772753f9599e98
committer: Robert Collins <robertc at robertcollins.net>
branch nick: inter-repo-api
timestamp: Mon 2006-02-20 18:01:10 +1100
message:
Add a test environment for InterRepository objects, and remove the fetch corner case tests from test_repository.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060220052207-3e772753f9599e98
parent: robertc at robertcollins.net-20060220042908-a76ec132a7286899
committer: Robert Collins <robertc at robertcollins.net>
branch nick: inter-repo-api
timestamp: Mon 2006-02-20 16:22:07 +1100
message:
Allow for optimised InterRepository selection.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060220042908-a76ec132a7286899
parent: robertc at robertcollins.net-20060220010359-5475bce47a5ebcd4
committer: Robert Collins <robertc at robertcollins.net>
branch nick: inter-repo-api
timestamp: Mon 2006-02-20 15:29:08 +1100
message:
Start InterRepository with InterRepository.get.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060220010359-5475bce47a5ebcd4
parent: robertc at robertcollins.net-20060219234731-4f361d82e113cbb0
parent: robertc at robertcollins.net-20060220002935-c653f31ef30cadff
committer: Robert Collins <robertc at robertcollins.net>
branch nick: inter-repo-api
timestamp: Mon 2006-02-20 12:03:59 +1100
message:
Merge repository tweaks.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060221033439-fcd0849f8070bc8f
parent: pqm at pqm.ubuntu.com-20060221021734-ccbecdd31223385c
parent: aaron.bentley at utoronto.ca-20060221032904-781ed5b86f2c3b62
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-02-21 03:34:39 +0000
message:
Update ConfigObj to 4.2.0
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060221032904-781ed5b86f2c3b62
parent: pqm at pqm.ubuntu.com-20060221021734-ccbecdd31223385c
parent: aaron.bentley at utoronto.ca-20060221025734-1359d5ae722a7f81
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab.integration
timestamp: Mon 2006-02-20 22:29:04 -0500
message:
Updated ConfigObj to 4.2.0
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060221025734-1359d5ae722a7f81
parent: aaron.bentley at utoronto.ca-20060221022630-c74618c305be4ffd
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.cobj
timestamp: Mon 2006-02-20 21:57:34 -0500
message:
Fixed get_bool
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060221022630-c74618c305be4ffd
parent: pqm at pqm.ubuntu.com-20060220043919-b01f8960604b339d
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.cobj
timestamp: Mon 2006-02-20 21:26:30 -0500
message:
Switched to ConfigObj 4.2.0
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060221021734-ccbecdd31223385c
parent: pqm at pqm.ubuntu.com-20060221011119-9a0c5d37d496d0d7
parent: aaron.bentley at utoronto.ca-20060221012744-0dfd362401335acb
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-02-21 02:17:34 +0000
message:
Tree Transform-based merger
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060221012744-0dfd362401335acb
parent: aaron.bentley at utoronto.ca-20060221012709-c46aaa71a00010e8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Transactional Tree Transforms
timestamp: Mon 2006-02-20 20:27:44 -0500
message:
Removed the remains of the old merge code
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060221012709-c46aaa71a00010e8
parent: aaron.bentley at utoronto.ca-20060221010533-8682182da8fbcc39
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Transactional Tree Transforms
timestamp: Mon 2006-02-20 20:27:09 -0500
message:
Renamed a bunch of functions
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060221010533-8682182da8fbcc39
parent: abentley at panoramicfeedback.com-20060217155604-fb8049ff5cf2f714
parent: pqm at pqm.ubuntu.com-20060220043919-b01f8960604b339d
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Transactional Tree Transforms
timestamp: Mon 2006-02-20 20:05:33 -0500
message:
Merge from mainline
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060217155604-fb8049ff5cf2f714
parent: abentley at panoramicfeedback.com-20060217145536-47acd73ee3dad3b4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-17 10:56:04 -0500
message:
Added Transform docs
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060217145536-47acd73ee3dad3b4
parent: abentley at panoramicfeedback.com-20060217135725-1aa269dda84d7f46
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-17 09:55:36 -0500
message:
Fixed dangling inventory ids in revert
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060217135725-1aa269dda84d7f46
parent: abentley at lappy-20060217125306-89e0b981e673e3c6
parent: robertc at robertcollins.net-20060217044707-8c15dab107f79a40
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-17 08:57:25 -0500
message:
Merge Robert (who merged John)
------------------------------------------------------------
merged: abentley at lappy-20060217125306-89e0b981e673e3c6
parent: aaron.bentley at utoronto.ca-20060217061404-f675a79b56425055
committer: abentley <abentley at lappy>
branch nick: bzr.ttransform
timestamp: Fri 2006-02-17 07:53:06 -0500
message:
Fixed up tests for Windows
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060217061404-f675a79b56425055
parent: aaron.bentley at utoronto.ca-20060217055941-fb55c4bbd3cecbb7
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-17 01:14:04 -0500
message:
Ensured revert writes a normal inventory
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060217055941-fb55c4bbd3cecbb7
parent: aaron.bentley at utoronto.ca-20060217050904-798560096c2d93bd
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-17 00:59:41 -0500
message:
Updated NEWS re Tree Transform
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060217050904-798560096c2d93bd
parent: abentley at panoramicfeedback.com-20060216161825-6bad50573bfd84a2
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-17 00:09:04 -0500
message:
Added conflict warnings to revert
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060216161825-6bad50573bfd84a2
parent: abentley at panoramicfeedback.com-20060216160746-4dad42ceb716248a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-02-16 11:18:25 -0500
message:
Integrated fs conflicts with merge conflicts.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060216160746-4dad42ceb716248a
parent: abentley at panoramicfeedback.com-20060216153036-e293ffc1ab833fd5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-02-16 11:07:46 -0500
message:
Implemented stringifying filesystem conflicts
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060216153036-e293ffc1ab833fd5
parent: abentley at panoramicfeedback.com-20060215223801-481098c6196185c0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-02-16 10:30:36 -0500
message:
Cleaned up filesystem conflict handling
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060215223801-481098c6196185c0
parent: abentley at panoramicfeedback.com-20060215195546-a59a138c9a76a80f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-02-15 17:38:01 -0500
message:
Add filesystem/inventory conflicts to conflict output
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060215195546-a59a138c9a76a80f
parent: abentley at panoramicfeedback.com-20060215195121-1dc2ffae14bf92d2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-02-15 14:55:46 -0500
message:
Removed unused function
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060215195121-1dc2ffae14bf92d2
parent: abentley at panoramicfeedback.com-20060215193857-d82b04a2abf75b2d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-02-15 14:51:21 -0500
message:
PEP8 and comment cleanups
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060215193857-d82b04a2abf75b2d
parent: abentley at panoramicfeedback.com-20060215144326-7d51e454c3ed48a5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-02-15 14:38:57 -0500
message:
Swapped os.path.join for pathjoin everywhere
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060215144326-7d51e454c3ed48a5
parent: abentley at panoramicfeedback.com-20060214172326-ec4712d0549ff7cd
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-02-15 09:43:26 -0500
message:
Switched to build_tree instead of revert
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060214172326-ec4712d0549ff7cd
parent: abentley at panoramicfeedback.com-20060214171940-c89f22732330f201
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-02-14 12:23:26 -0500
message:
Updated test to new conflict message
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060214171940-c89f22732330f201
parent: abentley at panoramicfeedback.com-20060213180400-e45681c311dfec35
parent: robertc at robertcollins.net-20060214065221-23180801f3c7cb18
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-02-14 12:19:40 -0500
message:
Merge from Robert [Fails tests]
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060213180400-e45681c311dfec35
parent: abentley at panoramicfeedback.com-20060213173244-b709c2f7bf65cb56
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Mon 2006-02-13 13:04:00 -0500
message:
Handle failures creating/deleting the Limbo directory
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060213173244-b709c2f7bf65cb56
parent: abentley at panoramicfeedback.com-20060213155003-c63f9ddfc82869cb
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Mon 2006-02-13 12:32:44 -0500
message:
Used appropriate control_files
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060213155003-c63f9ddfc82869cb
parent: abentley at panoramicfeedback.com-20060213154744-fb223e955164940b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Mon 2006-02-13 10:50:03 -0500
message:
Changed implementation of supports_executable
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060213154744-fb223e955164940b
parent: aaron.bentley at utoronto.ca-20060213012803-0259050f8cc7be16
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Mon 2006-02-13 10:47:44 -0500
message:
Avoided chdir in transform tests
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060213012803-0259050f8cc7be16
parent: aaron.bentley at utoronto.ca-20060213010930-0dea446b10432af4
parent: john at arbash-meinel.com-20060206140209-793eeeb7f3f3d069
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Sun 2006-02-12 20:28:03 -0500
message:
Merged John Meinel's integration
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060213010930-0dea446b10432af4
parent: aaron.bentley at utoronto.ca-20060213003110-3be4e8d6150d620e
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Sun 2006-02-12 20:09:30 -0500
message:
Added more docs
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060213003110-3be4e8d6150d620e
parent: aaron.bentley at utoronto.ca-20060213002436-ca1e5b680fb005cd
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Sun 2006-02-12 19:31:10 -0500
message:
PEP8 fixes
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060213002436-ca1e5b680fb005cd
parent: aaron.bentley at utoronto.ca-20060213002115-c110c3bf01415f70
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Sun 2006-02-12 19:24:36 -0500
message:
Removed changes from bzr.ab 1526..1528
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060213002115-c110c3bf01415f70
parent: aaron.bentley at utoronto.ca-20060212005556-98054f6ac4013537
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Sun 2006-02-12 19:21:15 -0500
message:
Removed changes from bzr.ab 1529..1536
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060212005556-98054f6ac4013537
parent: aaron.bentley at utoronto.ca-20060212000651-ebe0326d5a16e10a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Sat 2006-02-11 19:55:56 -0500
message:
Handled test cases involving symlinks
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060212000651-ebe0326d5a16e10a
parent: abentley at panoramicfeedback.com-20060210202529-d946a5230b52bd40
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Sat 2006-02-11 19:06:51 -0500
message:
Fixed overwrites
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060210202529-d946a5230b52bd40
parent: abentley at panoramicfeedback.com-20060210201842-cd2cec177a6fa1ee
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-10 15:25:29 -0500
message:
Fixed all changes applied successfully
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060210201842-cd2cec177a6fa1ee
parent: abentley at panoramicfeedback.com-20060210174259-96aac214c15970d2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-10 15:18:42 -0500
message:
Handled simultaneous renames of parent and child better
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060210174259-96aac214c15970d2
parent: abentley at panoramicfeedback.com-20060210172502-29fcb8b0d722ddf9
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-10 12:42:59 -0500
message:
Removed bare except
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060210172502-29fcb8b0d722ddf9
parent: abentley at panoramicfeedback.com-20060210164048-f93c8532c2435921
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-10 12:25:02 -0500
message:
Handled the remaining file versioning case
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060210164048-f93c8532c2435921
parent: abentley at panoramicfeedback.com-20060210151724-603e0706e9db2987
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-10 11:40:48 -0500
message:
Tweak to check inventory, not tree for file ids
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060210151724-603e0706e9db2987
parent: abentley at panoramicfeedback.com-20060210144444-5627480f927e57af
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-10 10:17:24 -0500
message:
Fixed merge so tree root is auto-preserved, not by conflict resolution
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060210144444-5627480f927e57af
parent: aaron.bentley at utoronto.ca-20060210131536-a96eb7d0715c0c41
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-10 09:44:44 -0500
message:
More fixups after get_trans_id
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060210131536-a96eb7d0715c0c41
parent: abentley at panoramicfeedback.com-20060209231130-2ba22e1aa32e38c3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Fri 2006-02-10 08:15:36 -0500
message:
Worked on fixing trans_id stuff
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060209231130-2ba22e1aa32e38c3
parent: abentley at panoramicfeedback.com-20060209215658-648bb9372925757b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-02-09 18:11:30 -0500
message:
Prevented get_trans_id from automatically versioning file ids
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060209215658-648bb9372925757b
parent: abentley at panoramicfeedback.com-20060209215117-812ad6b1215c7d28
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-02-09 16:56:58 -0500
message:
Fixed executability conflicts
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060209215117-812ad6b1215c7d28
parent: abentley at panoramicfeedback.com-20060209210529-6a01be6d2cc0d13b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-02-09 16:51:17 -0500
message:
Added conflict reporting
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060209210529-6a01be6d2cc0d13b
parent: abentley at panoramicfeedback.com-20060209203923-9014e6d99e7cee61
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-02-09 16:05:29 -0500
message:
Moved the merge stuff into merge.py
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060209203923-9014e6d99e7cee61
parent: abentley at panoramicfeedback.com-20060209203148-4fc6d4683411a4a7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-02-09 15:39:23 -0500
message:
ApplyMerge3 -> Merge3Merger
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060209203148-4fc6d4683411a4a7
parent: abentley at panoramicfeedback.com-20060209201225-80e7aad19cfeebc5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-02-09 15:31:48 -0500
message:
Removed unused method
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060209201225-80e7aad19cfeebc5
parent: abentley at panoramicfeedback.com-20060209194033-ef7305a37596cd72
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-02-09 15:12:25 -0500
message:
Avoided generating a new tree for every weave merge
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060209194033-ef7305a37596cd72
parent: abentley at panoramicfeedback.com-20060209180919-08ceeb4e88443274
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-02-09 14:40:33 -0500
message:
Got WeaveMerger under test
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060209180919-08ceeb4e88443274
parent: abentley at panoramicfeedback.com-20060209175041-db781cf66858d891
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-02-09 13:09:19 -0500
message:
Fixed deletion handling
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060209175041-db781cf66858d891
parent: abentley at panoramicfeedback.com-20060209174115-37ba422950f6a97f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-02-09 12:50:41 -0500
message:
Hid raw conflicts
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060209174115-37ba422950f6a97f
parent: abentley at panoramicfeedback.com-20060209173921-59e7f1114495d40e
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-02-09 12:41:15 -0500
message:
Strengthened conflict tests
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060209173921-59e7f1114495d40e
parent: aaron.bentley at utoronto.ca-20060209131613-1a3edd50ed693dc4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-02-09 12:39:21 -0500
message:
Got cooked conflicts working
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060209131613-1a3edd50ed693dc4
parent: abentley at panoramicfeedback.com-20060208220043-20386bb285886a2c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Thu 2006-02-09 08:16:13 -0500
message:
Work on cooked conflicts
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060208220043-20386bb285886a2c
parent: aaron.bentley at utoronto.ca-20060208171612-728e6d1b9438df4b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-02-08 17:00:43 -0500
message:
More conflict handling, test porting
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060208171612-728e6d1b9438df4b
parent: aaron.bentley at utoronto.ca-20060208033858-46c8840f243241d1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Wed 2006-02-08 12:16:12 -0500
message:
Converted test cases to Tree Transform
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060208033858-46c8840f243241d1
parent: abentley at panoramicfeedback.com-20060207214732-e5afad9e2e0aba1e
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform2
timestamp: Tue 2006-02-07 22:38:58 -0500
message:
Got missing contents test working
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060207214732-e5afad9e2e0aba1e
parent: abentley at panoramicfeedback.com-20060207192151-f3892d6d1aba2d29
parent: abentley at panoramicfeedback.com-20060207214033-bfeef6ca0e6638a9
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-02-07 16:47:32 -0500
message:
Merge from bzr.ab
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060207214033-bfeef6ca0e6638a9
parent: abentley at panoramicfeedback.com-20060206223923-0726a343d2e9d558
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Tue 2006-02-07 16:40:33 -0500
message:
Merge from Robert
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060206223923-0726a343d2e9d558
parent: abentley at panoramicfeedback.com-20060203150941-189c3728c0b3c26a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Mon 2006-02-06 17:39:23 -0500
message:
Test case to show discrepancy between fileid_involved and compare_tree
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060203150941-189c3728c0b3c26a
parent: abentley at panoramicfeedback.com-20060203144007-c988a20be3033dff
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Fri 2006-02-03 10:09:41 -0500
message:
Clarified bogus default test
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060203144007-c988a20be3033dff
parent: abentley at panoramicfeedback.com-20060203143141-4d10c3b628602301
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Fri 2006-02-03 09:40:07 -0500
message:
Made default options play nice with external commands
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060203143141-4d10c3b628602301
parent: aaron.bentley at utoronto.ca-20060202031253-fa4f98b03e7cb0d8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Fri 2006-02-03 09:31:41 -0500
message:
Restored blackbox tests
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060207192151-f3892d6d1aba2d29
parent: aaron.bentley at utoronto.ca-20060202044058-9b55a5c8d0cd24ac
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-02-07 14:21:51 -0500
message:
Fixed executability merge bug
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060202044058-9b55a5c8d0cd24ac
parent: aaron.bentley at utoronto.ca-20060202035112-837e9a6992609b16
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Wed 2006-02-01 23:40:58 -0500
message:
Fixed executability merge bug
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060202035112-837e9a6992609b16
parent: aaron.bentley at utoronto.ca-20060202034533-3815a958b475d822
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Wed 2006-02-01 22:51:12 -0500
message:
Fixed merge_core bug
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060202034533-3815a958b475d822
parent: aaron.bentley at utoronto.ca-20060202032057-f65732829b75feff
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Wed 2006-02-01 22:45:33 -0500
message:
Fixed handling of unversioned files
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060202032057-f65732829b75feff
parent: aaron.bentley at utoronto.ca-20060202031124-bdb9bcb9477f4c53
parent: aaron.bentley at utoronto.ca-20060202031253-fa4f98b03e7cb0d8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Wed 2006-02-01 22:20:57 -0500
message:
merge from bzr.ab
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060202031253-fa4f98b03e7cb0d8
parent: aaron.bentley at utoronto.ca-20060202025758-740c20860a1bef14
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-02-01 22:12:53 -0500
message:
Removed more selftest spam
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060202025758-740c20860a1bef14
parent: abentley at panoramicfeedback.com-20060201180846-c8f1200d1440c465
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-02-01 21:57:58 -0500
message:
Removed lock-related log spam
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060202031124-bdb9bcb9477f4c53
parent: abentley at panoramicfeedback.com-20060130204015-74e12f8b82cba615
parent: abentley at panoramicfeedback.com-20060201180846-c8f1200d1440c465
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Wed 2006-02-01 22:11:24 -0500
message:
Merge from bzr.ab
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060201180846-c8f1200d1440c465
parent: abentley at panoramicfeedback.com-20060201145539-2b5001f74f213385
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Wed 2006-02-01 13:08:46 -0500
message:
Implemented default command options
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060201145539-2b5001f74f213385
parent: abentley at panoramicfeedback.com-20060130232944-9ae96dc68f219710
parent: mbp at sourcefrog.net-20060201130813-1240ac51411d1330
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Wed 2006-02-01 09:55:39 -0500
message:
merge from bzr.dev
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060130232944-9ae96dc68f219710
parent: abentley at panoramicfeedback.com-20060130203733-fb122a042b5c6c8a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Mon 2006-01-30 18:29:44 -0500
message:
Fixed find-merge-base for new API
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060130204015-74e12f8b82cba615
parent: abentley at panoramicfeedback.com-20060130203853-8e89aae567e9a9a5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Mon 2006-01-30 15:40:15 -0500
message:
PEP8 fixes
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060130203853-8e89aae567e9a9a5
parent: abentley at panoramicfeedback.com-20060130184650-a7397ec030158835
parent: abentley at panoramicfeedback.com-20060130203733-fb122a042b5c6c8a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Mon 2006-01-30 15:38:53 -0500
message:
Merged PEP8 fixen
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060130203733-fb122a042b5c6c8a
parent: mbp at sourcefrog.net-20060130115534-d9ca79b5856a08fa
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Mon 2006-01-30 15:37:33 -0500
message:
PEP8 fixes
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060130184650-a7397ec030158835
parent: aaron.bentley at utoronto.ca-20060127050018-3af97d0139391a55
parent: mbp at sourcefrog.net-20060130115534-d9ca79b5856a08fa
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Mon 2006-01-30 13:46:50 -0500
message:
Dirty merge of the mainline
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060127050018-3af97d0139391a55
parent: aaron.bentley at utoronto.ca-20060126130815-8d56cce7b4311f78
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Fri 2006-01-27 00:00:18 -0500
message:
Simplified permission handling of existing files in transform.
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060126130815-8d56cce7b4311f78
parent: aaron.bentley at utoronto.ca-20060126004320-33ebc0be567e1963
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Thu 2006-01-26 08:08:15 -0500
message:
Started work on retaining file mode across replacements
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060126004320-33ebc0be567e1963
parent: aaron.bentley at utoronto.ca-20060126004303-76e3fac4fd7a6291
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Wed 2006-01-25 19:43:20 -0500
message:
Added missing import
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060126004303-76e3fac4fd7a6291
parent: aaron.bentley at utoronto.ca-20060126001012-5ed0d8a9c396b03b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Wed 2006-01-25 19:43:03 -0500
message:
Added file renaming test case
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060126001012-5ed0d8a9c396b03b
parent: aaron.bentley at utoronto.ca-20060125081243-0af56b5de868b0cc
parent: abentley at panoramicfeedback.com-20060125202003-563fe26e8e1527bb
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Wed 2006-01-25 19:10:12 -0500
message:
Merge my own changes
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060125202003-563fe26e8e1527bb
parent: abentley at panoramicfeedback.com-20060125160144-d842bd38b846d915
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-01-25 15:20:03 -0500
message:
Added Diff3 merging for tree transforms
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060125160144-d842bd38b846d915
parent: abentley at panoramicfeedback.com-20060125155718-469e33b1e04b2b99
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-01-25 11:01:44 -0500
message:
Implemented weave merge
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060125155718-469e33b1e04b2b99
parent: abentley at panoramicfeedback.com-20060125070807-49c069660199bb7c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-01-25 10:57:18 -0500
message:
Reference files in limbo before their creation is finished, for finalize.
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060125081243-0af56b5de868b0cc
parent: aaron.bentley at utoronto.ca-20060125080731-4285df84eae2e1d6
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Wed 2006-01-25 03:12:43 -0500
message:
Use rename_one instead of TreeTransform in cmd_rename
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060125080731-4285df84eae2e1d6
parent: abentley at panoramicfeedback.com-20060125070807-49c069660199bb7c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Wed 2006-01-25 03:07:31 -0500
message:
Avoid non-file executability
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060125070807-49c069660199bb7c
parent: abentley at panoramicfeedback.com-20060124210511-71d70f6735edaf7b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-01-25 02:08:07 -0500
message:
Handled three-way with deletions better
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060124210511-71d70f6735edaf7b
parent: abentley at panoramicfeedback.com-20060124205913-7a3cf2fe560f01a7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-24 16:05:11 -0500
message:
Fixed executability test, so it works with EmptyTree
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060124205913-7a3cf2fe560f01a7
parent: abentley at panoramicfeedback.com-20060124205757-c1a5eb0641dea7eb
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-24 15:59:13 -0500
message:
Fixed executability handling
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060124205757-c1a5eb0641dea7eb
parent: abentley at panoramicfeedback.com-20060124204215-da753d0281921ec6
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-24 15:57:57 -0500
message:
Implemented show-base
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060124204215-da753d0281921ec6
parent: abentley at panoramicfeedback.com-20060124203420-e68268c16b8adeb6
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-24 15:42:15 -0500
message:
Cleaned up imports, added copyright statements
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060124203420-e68268c16b8adeb6
parent: abentley at panoramicfeedback.com-20060124181900-24f382871118fcc7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-24 15:34:20 -0500
message:
Got merge with rename working
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060124181900-24f382871118fcc7
parent: abentley at panoramicfeedback.com-20060124170248-0753856a890741a6
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-24 13:19:00 -0500
message:
Fixed set_versioned, enhanced conflict testing
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060124170248-0753856a890741a6
parent: abentley at panoramicfeedback.com-20060124170017-bb78d19ab6961828
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-24 12:02:48 -0500
message:
Deleted old pre-conflict contents
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060124170017-bb78d19ab6961828
parent: abentley at panoramicfeedback.com-20060124165259-3097200fe9934255
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-24 12:00:17 -0500
message:
Deleted old pre-conflict contents
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060124165259-3097200fe9934255
parent: abentley at panoramicfeedback.com-20060124143642-485aced9472ceb4f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-24 11:52:59 -0500
message:
Got conflicts on symlinks working properly
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060124143642-485aced9472ceb4f
parent: abentley at panoramicfeedback.com-20060123215421-a8d53dcc745d3aa6
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-24 09:36:42 -0500
message:
Fixed path-relative test cases
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060123215421-a8d53dcc745d3aa6
parent: abentley at panoramicfeedback.com-20060122164044-734d9bced6cd4dea
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Mon 2006-01-23 16:54:21 -0500
message:
Handle non-existent BASE properly
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060122164044-734d9bced6cd4dea
parent: abentley at panoramicfeedback.com-20060122162144-b99e47d5f2fc8a7a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Sun 2006-01-22 11:40:44 -0500
message:
Refactored conflict handling to generic function
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060122162144-b99e47d5f2fc8a7a
parent: aaron.bentley at utoronto.ca-20060121072938-141a4e474573eeda
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Sun 2006-01-22 11:21:44 -0500
message:
Ensured foo.BASE is a directory if there's a conflict
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060121072938-141a4e474573eeda
parent: abentley at panoramicfeedback.com-20060120224252-990de4aa4d82ff22
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Sat 2006-01-21 02:29:38 -0500
message:
Tested with BASE as directory
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060120224252-990de4aa4d82ff22
parent: abentley at panoramicfeedback.com-20060120145615-0afa642301fa4743
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-20 17:42:52 -0500
message:
Added more text merge tests
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060120145615-0afa642301fa4743
parent: aaron.bentley at utoronto.ca-20060120055956-887a53831d1bc293
parent: abentley at panoramicfeedback.com-20060120142258-9d09d6ff707ebd1f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-20 09:56:15 -0500
message:
Merge from bzr.ab
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060120055956-887a53831d1bc293
parent: aaron.bentley at utoronto.ca-20060119030808-d46bafe200ba4a69
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Fri 2006-01-20 00:59:56 -0500
message:
Added text merge test
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060119030808-d46bafe200ba4a69
parent: aaron.bentley at utoronto.ca-20060119014104-ee706fe1b63b48b6
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Wed 2006-01-18 22:08:08 -0500
message:
Handle non-file bases
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060119014104-ee706fe1b63b48b6
parent: aaron.bentley at utoronto.ca-20060119013947-ee7046de0fc5dc97
parent: aaron.bentley at utoronto.ca-20060118015458-ba73c07352e1af17
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Wed 2006-01-18 20:41:04 -0500
message:
Merged the latest from bzr.ab
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060119013947-ee7046de0fc5dc97
parent: aaron.bentley at utoronto.ca-20060118130358-f10c5dcdc91b5c01
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Wed 2006-01-18 20:39:47 -0500
message:
fixed undefined trans_id
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060118130358-f10c5dcdc91b5c01
parent: aaron.bentley at utoronto.ca-20060118045431-a7ed22f573b5f644
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Wed 2006-01-18 08:03:58 -0500
message:
Handle all content types in three-way
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060118045431-a7ed22f573b5f644
parent: abentley at panoramicfeedback.com-20060117233849-3639b17efb3e9f40
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Tue 2006-01-17 23:54:31 -0500
message:
Defer determining trans_id until we need it, because each trans_id carries a cost.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060117233849-3639b17efb3e9f40
parent: abentley at panoramicfeedback.com-20060117233548-0d75a0310c4a464f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-17 18:38:49 -0500
message:
Don't set executability on non-files
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060117233548-0d75a0310c4a464f
parent: abentley at panoramicfeedback.com-20060117232428-4ec3bbce93b25b70
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-17 18:35:48 -0500
message:
Reverted partial change
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060117232428-4ec3bbce93b25b70
parent: abentley at panoramicfeedback.com-20060117223901-f631efa86fbc5e8f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-17 18:24:28 -0500
message:
Handled merging the execute bit
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060117223901-f631efa86fbc5e8f
parent: abentley at panoramicfeedback.com-20060117215620-7868b818a52121a9
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-17 17:39:01 -0500
message:
Added reprocess support, support for varying merge types
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060117215620-7868b818a52121a9
parent: abentley at panoramicfeedback.com-20060117215119-43b775053a9f39c0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-17 16:56:20 -0500
message:
differentiated between this tree(input) and working tree(output) in merge.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060117215119-43b775053a9f39c0
parent: abentley at panoramicfeedback.com-20060117214243-a52003965a9a2389
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-17 16:51:19 -0500
message:
Reported text conflicts programatically
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060117214243-a52003965a9a2389
parent: abentley at panoramicfeedback.com-20060117213032-7f9251bd17deb6ac
parent: abentley at panoramicfeedback.com-20060117214005-4ca4d0b6dc86f1d6
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-17 16:42:43 -0500
message:
Merged the merge_internals_private change
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060117213032-7f9251bd17deb6ac
parent: abentley at panoramicfeedback.com-20060117212901-629ae13449804d25
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-17 16:30:32 -0500
message:
Stopped setting executability on conflict files
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060117212901-629ae13449804d25
parent: abentley at panoramicfeedback.com-20060117212454-80bb9a5dd1e34d4f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-17 16:29:01 -0500
message:
Stopped calling get_file_lines on WorkingTree
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060117212454-80bb9a5dd1e34d4f
parent: abentley at panoramicfeedback.com-20060117212354-511f293f10a80062
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-17 16:24:54 -0500
message:
Used Merge3Merger in do_merge
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060117212354-511f293f10a80062
parent: abentley at panoramicfeedback.com-20060117212257-ced70932e1269d85
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-17 16:23:54 -0500
message:
Got merge functionality starting to work
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060117212257-ced70932e1269d85
parent: abentley at panoramicfeedback.com-20060117212039-1e70279346a00942
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-17 16:22:57 -0500
message:
Fixed final_parent, for the case where finding a parent adds tree id paths.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060117212039-1e70279346a00942
parent: aaron.bentley at utoronto.ca-20060117130420-b28b525375b01e47
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-17 16:20:39 -0500
message:
Added reverse-lookup for versioned files and get_trans_id
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060117130420-b28b525375b01e47
parent: aaron.bentley at utoronto.ca-20060117024503-b2482f406f760e13
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Tue 2006-01-17 08:04:20 -0500
message:
Started on TreeTransform merge
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060117024503-b2482f406f760e13
parent: aaron.bentley at utoronto.ca-20060117020207-a24a499a78c212da
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Mon 2006-01-16 21:45:03 -0500
message:
Changed model again. Now iterator is used immediately.
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060117020207-a24a499a78c212da
parent: abentley at lappy-20060114003738-625704a30cc1ccbd
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Mon 2006-01-16 21:02:07 -0500
message:
Moved new content generation to pre-renames
------------------------------------------------------------
merged: abentley at lappy-20060114003738-625704a30cc1ccbd
parent: abentley at lappy-20060114000330-3463c6438cc54603
committer: abentley <abentley at lappy>
branch nick: bzr.ttransform
timestamp: Fri 2006-01-13 19:37:38 -0500
message:
All tests pass under Windows
------------------------------------------------------------
merged: abentley at lappy-20060114000330-3463c6438cc54603
parent: abentley at panoramicfeedback.com-20060113234634-529aa161c0c97970
committer: abentley <abentley at lappy>
branch nick: bzr.ttransform
timestamp: Fri 2006-01-13 19:03:30 -0500
message:
Fix bug when no paramiko
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060113234634-529aa161c0c97970
parent: abentley at panoramicfeedback.com-20060113205321-06820a18cf48abdd
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-13 18:46:34 -0500
message:
Got real root moves working
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060113205321-06820a18cf48abdd
parent: abentley at panoramicfeedback.com-20060113190326-53128735561a232d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-13 15:53:21 -0500
message:
Got semi-reasonable root directory renaming working
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060113190326-53128735561a232d
parent: abentley at panoramicfeedback.com-20060113184944-3ebcf32dbe4ce1d1
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-13 14:03:26 -0500
message:
Refactored _add_tree_children
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060113184944-3ebcf32dbe4ce1d1
parent: abentley at panoramicfeedback.com-20060113184129-b6f7c1413250ef1c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-13 13:49:44 -0500
message:
Ensured we don't accidentally move the root directory
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060113184129-b6f7c1413250ef1c
parent: abentley at panoramicfeedback.com-20060113183347-8a56b3b704052cdb
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-13 13:41:29 -0500
message:
Text cleaup/docs
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060113183347-8a56b3b704052cdb
parent: abentley at panoramicfeedback.com-20060113182947-11c203d32426f6c7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-13 13:33:47 -0500
message:
Extra testing
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060113182947-11c203d32426f6c7
parent: abentley at panoramicfeedback.com-20060113182703-5b12c177994eb192
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-13 13:29:47 -0500
message:
Ensure transform can be applied after resolution
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060113182703-5b12c177994eb192
parent: abentley at panoramicfeedback.com-20060113174205-b3aece52290b266c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-13 13:27:03 -0500
message:
Fixed moving versioned directories
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060113174205-b3aece52290b266c
parent: abentley at panoramicfeedback.com-20060113171118-cf5f9b79189db2bf
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-13 12:42:05 -0500
message:
Handled parent loops, missing parents, unversioned parents
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060113171118-cf5f9b79189db2bf
parent: abentley at panoramicfeedback.com-20060113161756-6506cbe073bca305
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-13 12:11:18 -0500
message:
Tested existing conflict resolution functionality
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060113161756-6506cbe073bca305
parent: abentley at lappy-20060113043532-f60c7bd6a2e1c5d8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-13 11:17:56 -0500
message:
Simplified tests
------------------------------------------------------------
merged: abentley at lappy-20060113043532-f60c7bd6a2e1c5d8
parent: abentley at panoramicfeedback.com-20060112222257-3fe3f4290b5d6618
committer: abentley <abentley at lappy>
branch nick: bzr.ttransform
timestamp: Thu 2006-01-12 23:35:32 -0500
message:
Fixed executability bug
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060112222257-3fe3f4290b5d6618
parent: abentley at panoramicfeedback.com-20060112214453-64bec969a7bb82b2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-01-12 17:22:57 -0500
message:
Enhanced conflict resolution.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060112214453-64bec969a7bb82b2
parent: abentley at panoramicfeedback.com-20060112205459-6b2e30cd7cc2423b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-01-12 16:44:53 -0500
message:
Implemented the backup file detritus
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060112205459-6b2e30cd7cc2423b
parent: abentley at panoramicfeedback.com-20060112191840-2b54d2654ad96649
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-01-12 15:54:59 -0500
message:
Fixed up the change detection
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060112191840-2b54d2654ad96649
parent: abentley at panoramicfeedback.com-20060112191347-7c7204104f82ebf3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-01-12 14:18:40 -0500
message:
Fixed thinko
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060112191347-7c7204104f82ebf3
parent: abentley at panoramicfeedback.com-20060112190836-adaffb9059be66b5
parent: mbp at sourcefrog.net-20060112063723-4ec91b5ff30f0830
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-01-12 14:13:47 -0500
message:
Merged from mainline
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060112190836-adaffb9059be66b5
parent: abentley at panoramicfeedback.com-20060112181228-2c0a812482434dc1
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-01-12 14:08:36 -0500
message:
Revert fixes with disappearing roots
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060112181228-2c0a812482434dc1
parent: abentley at panoramicfeedback.com-20060112180021-e5be99e8dde8d91e
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-01-12 13:12:28 -0500
message:
New approach to revert
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060112180021-e5be99e8dde8d91e
parent: abentley at panoramicfeedback.com-20060112164401-8d5c3fcbb5810e38
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-01-12 13:00:21 -0500
message:
Detect duplicate inventory ids
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060112164401-8d5c3fcbb5810e38
parent: abentley at panoramicfeedback.com-20060112143849-128d14f9cf6b314c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-01-12 11:44:01 -0500
message:
Printed conflicts in MalformedTransform
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060112143849-128d14f9cf6b314c
parent: aaron.bentley at utoronto.ca-20060112125759-fb61b12df4c62e0c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-01-12 09:38:49 -0500
message:
Ensured we can move/rename dangling inventory entries
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060112125759-fb61b12df4c62e0c
parent: aaron.bentley at utoronto.ca-20060112060535-a0af6198df310a8e
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Thu 2006-01-12 07:57:59 -0500
message:
Started work on 'revert'
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060112060535-a0af6198df310a8e
parent: aaron.bentley at utoronto.ca-20060112053131-c17235f503e556e0
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Thu 2006-01-12 01:05:35 -0500
message:
Ensured a conflict when parents of versioned files are unversioned
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060112053131-c17235f503e556e0
parent: aaron.bentley at utoronto.ca-20060112044230-e1a3c460f3d7a771
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Thu 2006-01-12 00:31:31 -0500
message:
Skipped symlink test more correctly
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060112044230-e1a3c460f3d7a771
parent: abentley at lappy-20060112041554-3bf07d73c72f2997
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Wed 2006-01-11 23:42:30 -0500
message:
Fixed transform symlink tests
------------------------------------------------------------
merged: abentley at lappy-20060112041554-3bf07d73c72f2997
parent: abentley at panoramicfeedback.com-20060111220649-8b7cf1479212c88e
committer: abentley <abentley at lappy>
branch nick: bzr.ttransform
timestamp: Wed 2006-01-11 23:15:54 -0500
message:
Fixed some Windows bugs, introduced a conflicts bug
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060111220649-8b7cf1479212c88e
parent: abentley at panoramicfeedback.com-20060111220241-98793353adebb956
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-01-11 17:06:49 -0500
message:
Removed silly code and debugging code
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060111220241-98793353adebb956
parent: abentley at panoramicfeedback.com-20060111195539-97803de75696e928
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-01-11 17:02:41 -0500
message:
Got inventory ID movement working
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060111195539-97803de75696e928
parent: abentley at panoramicfeedback.com-20060111192248-b50877ec2b4cadce
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-01-11 14:55:39 -0500
message:
Updated docs
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060111192248-b50877ec2b4cadce
parent: abentley at panoramicfeedback.com-20060111185124-46213073ac09c4bf
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-01-11 14:22:48 -0500
message:
Ensured that files can be unversioned (de-versioned?)
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060111185124-46213073ac09c4bf
parent: abentley at panoramicfeedback.com-20060111180215-05f34320247db1cf
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-01-11 13:51:24 -0500
message:
Tested adding paths
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060111180215-05f34320247db1cf
parent: abentley at panoramicfeedback.com-20060111172005-ba9c5f0bb65f9df1
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-01-11 13:02:15 -0500
message:
Allowed removed dirs to have content-free children.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060111172005-ba9c5f0bb65f9df1
parent: abentley at panoramicfeedback.com-20060111170108-300a7de8dd48539b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-01-11 12:20:05 -0500
message:
Added rename tests
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060111170108-300a7de8dd48539b
parent: abentley at panoramicfeedback.com-20060111163107-76d4a58d880c215a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-01-11 12:01:08 -0500
message:
Got file renaming working
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060111163107-76d4a58d880c215a
parent: aaron.bentley at utoronto.ca-20060111063057-81227fc71bf8bc63
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-01-11 11:31:07 -0500
message:
Proper conflicts for removals
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060111063057-81227fc71bf8bc63
parent: aaron.bentley at utoronto.ca-20060111060337-4e776a650d92be99
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Wed 2006-01-11 01:30:57 -0500
message:
Fixed naming
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060111060337-4e776a650d92be99
parent: abentley at panoramicfeedback.com-20060110183158-6b6a382ad5626eab
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Wed 2006-01-11 01:03:37 -0500
message:
Got conflict handling working when conflicts involve existing files
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060110183158-6b6a382ad5626eab
parent: abentley at panoramicfeedback.com-20060110165830-015c326d654bc57e
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-10 13:31:58 -0500
message:
Changed tree root parent to ROOT_PARENT
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060110165830-015c326d654bc57e
parent: aaron.bentley at utoronto.ca-20060109130207-716bbbdeb72fb079
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-10 11:58:30 -0500
message:
Factored out topological id sorting
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060109130207-716bbbdeb72fb079
parent: aaron.bentley at utoronto.ca-20060109065228-7118afeb71312dd9
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Mon 2006-01-09 08:02:07 -0500
message:
Got build passing all tests
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060109065228-7118afeb71312dd9
parent: aaron.bentley at utoronto.ca-20060109050653-57b1eaf9b8710558
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Mon 2006-01-09 01:52:28 -0500
message:
Nearly-working build_tree replacement
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060109050653-57b1eaf9b8710558
parent: aaron.bentley at utoronto.ca-20060109043142-33bc01bd05eb71e7
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Mon 2006-01-09 00:06:53 -0500
message:
Added execute bit to new_file method
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060109043142-33bc01bd05eb71e7
parent: aaron.bentley at utoronto.ca-20060109032025-1005391c39f42ae8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Sun 2006-01-08 23:31:42 -0500
message:
Added conflicts for setting executability on unversioned/non-file entries
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060109032025-1005391c39f42ae8
parent: aaron.bentley at utoronto.ca-20060109025212-7fe338e114bee844
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Sun 2006-01-08 22:20:25 -0500
message:
Added set_executability
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060109025212-7fe338e114bee844
parent: aaron.bentley at utoronto.ca-20060108231939-ee0847dc32aea66a
parent: mbp at sourcefrog.net-20060106011305-3772285d84b5cbb4
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Sun 2006-01-08 21:52:12 -0500
message:
Merge from the mainline
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060108231939-ee0847dc32aea66a
parent: aaron.bentley at utoronto.ca-20060108212351-028f1f6738ff953f
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Sun 2006-01-08 18:19:39 -0500
message:
Transform.new_entry -> Transform._new_entry
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060108212351-028f1f6738ff953f
parent: aaron.bentley at utoronto.ca-20060108204309-3eaf3faa03495a78
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Sun 2006-01-08 16:23:51 -0500
message:
Added symlink support
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060108204309-3eaf3faa03495a78
parent: aaron.bentley at utoronto.ca-20060107235100-8492a0656129c578
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Sun 2006-01-08 15:43:09 -0500
message:
Updated docstrings
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060107235100-8492a0656129c578
parent: aaron.bentley at utoronto.ca-20060107224241-af2b552287c7fee4
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Sat 2006-01-07 18:51:00 -0500
message:
Added directory handling
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060107224241-af2b552287c7fee4
parent: aaron.bentley at utoronto.ca-20060107214818-034649d86584b6e3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Sat 2006-01-07 17:42:41 -0500
message:
Added tests for parent loops
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060107214818-034649d86584b6e3
parent: aaron.bentley at utoronto.ca-20060107214104-b234adc98ba1ef02
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Sat 2006-01-07 16:48:18 -0500
message:
Made FinalPaths more correct
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060107214104-b234adc98ba1ef02
parent: aaron.bentley at utoronto.ca-20060107213640-63f9f986e07018f9
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Sat 2006-01-07 16:41:04 -0500
message:
Added final_parent function
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060107213640-63f9f986e07018f9
parent: abentley at panoramicfeedback.com-20060106190537-6420270a557d4867
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Sat 2006-01-07 16:36:40 -0500
message:
Added get_tree_parent
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060106190537-6420270a557d4867
parent: abentley at panoramicfeedback.com-20060106184412-4ce4893216a74de8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-06 14:05:37 -0500
message:
Add conflict types related to versioning
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060106184412-4ce4893216a74de8
parent: abentley at panoramicfeedback.com-20060106182647-2e21a4631f992566
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-06 13:44:12 -0500
message:
Fixed file_kind call
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060106182647-2e21a4631f992566
parent: abentley at panoramicfeedback.com-20060106182131-29327159267f9d6f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-06 13:26:47 -0500
message:
Implemented final_file_id
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060106182131-29327159267f9d6f
parent: abentley at panoramicfeedback.com-20060106173210-44ed7fb34815bf17
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-06 13:21:31 -0500
message:
Added canonical_path function
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060106173210-44ed7fb34815bf17
parent: abentley at panoramicfeedback.com-20060106172230-0c0d777d91fd8c68
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-06 12:32:10 -0500
message:
Refactored conflict handling
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060106172230-0c0d777d91fd8c68
parent: abentley at panoramicfeedback.com-20060106171620-699bdf25e968ed5a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-06 12:22:30 -0500
message:
Implemented missing parent and non-directory parent conflicts
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060106171620-699bdf25e968ed5a
parent: abentley at panoramicfeedback.com-20060106165906-239a7726e60cfed3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-06 12:16:20 -0500
message:
Fixed up includes
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060106165906-239a7726e60cfed3
parent: abentley at panoramicfeedback.com-20060106160637-e9daf1f3433f9bb0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-06 11:59:06 -0500
message:
Added TreeTransform.final_kind
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060106160637-e9daf1f3433f9bb0
parent: abentley at panoramicfeedback.com-20060105231712-d963fd5517552ae4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-06 11:06:37 -0500
message:
Added support for all-file path ids
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060105231712-d963fd5517552ae4
parent: abentley at panoramicfeedback.com-20060105221102-b2ae796c2d588e0f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-01-05 18:17:12 -0500
message:
Added conflict handling
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060105221102-b2ae796c2d588e0f
parent: abentley at panoramicfeedback.com-20060105215929-dd373b83ae4f8095
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-01-05 17:11:02 -0500
message:
Got unique_add under test
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060105215929-dd373b83ae4f8095
parent: abentley at panoramicfeedback.com-20060105215045-3ccb43accf0933fe
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-01-05 16:59:29 -0500
message:
Unified all file types as 'contents'
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060105215045-3ccb43accf0933fe
parent: abentley at panoramicfeedback.com-20060105214051-d2d7c3a34667d82b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-01-05 16:50:45 -0500
message:
Updated to use a real root id. Or whatever the working tree considers real.
This should eventually allow us to move the root directory into a subdir.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060105214051-d2d7c3a34667d82b
parent: abentley at panoramicfeedback.com-20060105205847-078aa5990bf37f10
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-01-05 16:40:51 -0500
message:
Added convenience function
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060105205847-078aa5990bf37f10
parent: robertc at robertcollins.net-20060103052137-4956578fbb0736ba
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-01-05 15:58:47 -0500
message:
Got creation of a versioned file working
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060221011119-9a0c5d37d496d0d7
parent: pqm at pqm.ubuntu.com-20060220043919-b01f8960604b339d
parent: robertc at robertcollins.net-20060221004343-ccf22f64d96aa17d
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-02-21 01:11:19 +0000
message:
Move the SFTP URL change for relative and absolute paths to the right place in NEWS.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060221004343-ccf22f64d96aa17d
parent: pqm at pqm.ubuntu.com-20060220043919-b01f8960604b339d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2006-02-21 11:43:43 +1100
message:
Move the SFTP URL change for relative and absolute paths to the right place in NEWS.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060220043919-b01f8960604b339d
parent: pqm at pqm.ubuntu.com-20060219235508-029a9d591a35f189
parent: robertc at robertcollins.net-20060220002935-c653f31ef30cadff
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-02-20 04:39:19 +0000
message:
Merge push/pull and branching within repositories bugfix.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060220002935-c653f31ef30cadff
parent: robertc at robertcollins.net-20060215221605-09ef2fed453334c6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Mon 2006-02-20 11:29:35 +1100
message:
Allow push/pull and branch between branches in the same shared repository.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060219235508-029a9d591a35f189
parent: pqm at pqm.ubuntu.com-20060218023347-0952c65f668bfd68
parent: robertc at robertcollins.net-20060219234731-4f361d82e113cbb0
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2006-02-19 23:55:08 +0000
message:
Remove unused patches/ directory.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060219234731-4f361d82e113cbb0
parent: robertc at robertcollins.net-20060218005717-348c76bf711254a5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2006-02-20 10:47:31 +1100
message:
Remove unused patches/ directory.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060218023347-0952c65f668bfd68
parent: mbp at sourcefrog.net-20060201130813-1240ac51411d1330
parent: robertc at robertcollins.net-20060218005717-348c76bf711254a5
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2006-02-18 02:33:47 +0000
message:
Merge Robert Collins integration.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060218005717-348c76bf711254a5
parent: robertc at robertcollins.net-20060217044707-8c15dab107f79a40
parent: robertc at robertcollins.net-20060217041709-7251eb701f69ca7e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Sat 2006-02-18 11:57:17 +1100
message:
Merge in bzr-dir phase 3, enabling controlled upgrades and shared repositories.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060217041709-7251eb701f69ca7e
parent: robertc at robertcollins.net-20060216212934-c10d24ea7748de86
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr-dir
timestamp: Fri 2006-02-17 15:17:09 +1100
message:
Review feedback.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060216212934-c10d24ea7748de86
parent: robertc at robertcollins.net-20060216112639-6a6a78dbb33a4cc8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr-dir
timestamp: Fri 2006-02-17 08:29:34 +1100
message:
Review fixups
------------------------------------------------------------
merged: robertc at robertcollins.net-20060216112639-6a6a78dbb33a4cc8
parent: robertc at robertcollins.net-20060216111947-e6946ac37fe8b21a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr-dir
timestamp: Thu 2006-02-16 22:26:39 +1100
message:
Bugfix upgrades to metadir to set the last-revision correctly.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060216111947-e6946ac37fe8b21a
parent: robertc at robertcollins.net-20060216093327-7c4374cea3c33734
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr-dir
timestamp: Thu 2006-02-16 22:19:47 +1100
message:
Correct buggy test.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060216093327-7c4374cea3c33734
parent: robertc at robertcollins.net-20060216093135-c9345853176d94b2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr-dir
timestamp: Thu 2006-02-16 20:33:27 +1100
message:
Remove ancestry.weave removal todo.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060216093135-c9345853176d94b2
parent: robertc at robertcollins.net-20060216085152-d0311d8efd0c654c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr-dir
timestamp: Thu 2006-02-16 20:31:35 +1100
message:
Implement upgrades to Metaformat trees.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060216085152-d0311d8efd0c654c
parent: robertc at robertcollins.net-20060216081832-4ef742424a888da0
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr-dir
timestamp: Thu 2006-02-16 19:51:52 +1100
message:
Make upgrade driver unaware of the specific formats in play.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060216081832-4ef742424a888da0
parent: robertc at robertcollins.net-20060216072216-1cd8117a8e2a24bf
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr-dir
timestamp: Thu 2006-02-16 19:18:32 +1100
message:
Advise users running upgrade on a checkout to also run it on the branch.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060216072216-1cd8117a8e2a24bf
parent: robertc at robertcollins.net-20060216072025-8a97e0b2c3f3cc92
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr-dir
timestamp: Thu 2006-02-16 18:22:16 +1100
message:
Ensure that bzrdir implementations offer the can_update_format and needs_format_update api.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060216072025-8a97e0b2c3f3cc92
parent: robertc at robertcollins.net-20060216055402-bb6afc4d15c715cd
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr-dir
timestamp: Thu 2006-02-16 18:20:25 +1100
message:
Start factoring out the upgrade policy logic.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060216055402-bb6afc4d15c715cd
parent: robertc at robertcollins.net-20060216025300-dfb5d2536908f060
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr-dir
timestamp: Thu 2006-02-16 16:54:02 +1100
message:
split out converter logic into per-format objects.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060216025300-dfb5d2536908f060
parent: robertc at robertcollins.net-20060216004439-5110484bd7b39a88
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr-dir
timestamp: Thu 2006-02-16 13:53:00 +1100
message:
Move is_control_file into WorkingTree.is_control_filename and test.
Remove the bzrlib.BZRDIR constant as no longer needed. Deliberately
not deprecating is as it should not ever have been public.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060216004439-5110484bd7b39a88
parent: robertc at robertcollins.net-20060215081137-4c27377517e96dd1
parent: robertc at robertcollins.net-20060215221605-09ef2fed453334c6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr-dir
timestamp: Thu 2006-02-16 11:44:39 +1100
message:
merge repository.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060215221605-09ef2fed453334c6
parent: robertc at robertcollins.net-20060215203303-b089365be1ea915e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Thu 2006-02-16 09:16:05 +1100
message:
Typo found by John Meinel.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060215203303-b089365be1ea915e
parent: robertc at robertcollins.net-20060215035815-93475eacfb0b41d2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Thu 2006-02-16 07:33:03 +1100
message:
Review feedback.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060215081137-4c27377517e96dd1
parent: robertc at robertcollins.net-20060215070853-c7b2e20915f6be58
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr-dir
timestamp: Wed 2006-02-15 19:11:37 +1100
message:
Make format 4/5/6 branches share a single LockableFiles instance across wt/branch/repository.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060215070853-c7b2e20915f6be58
parent: robertc at robertcollins.net-20060215060808-d47d40998fea0aee
parent: robertc at robertcollins.net-20060215035815-93475eacfb0b41d2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr-dir
timestamp: Wed 2006-02-15 18:08:53 +1100
message:
Merge repository so I dont trample on myself.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060215035815-93475eacfb0b41d2
parent: robertc at robertcollins.net-20060214112307-824f0b126b3c70a9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Wed 2006-02-15 14:58:15 +1100
message:
Finish use of repositories support.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060214112307-824f0b126b3c70a9
parent: robertc at robertcollins.net-20060214082509-40b79032956d7ae1
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Tue 2006-02-14 22:23:07 +1100
message:
sprouting into shared repositories
------------------------------------------------------------
merged: robertc at robertcollins.net-20060214082509-40b79032956d7ae1
parent: robertc at robertcollins.net-20060214081409-f4f364f43abf04da
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Tue 2006-02-14 19:25:09 +1100
message:
Test the use of clone on empty bzrdir with force_new_repo.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060214081409-f4f364f43abf04da
parent: robertc at robertcollins.net-20060214040706-ab43d8450989c555
parent: robertc at robertcollins.net-20060214065221-23180801f3c7cb18
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Tue 2006-02-14 19:14:09 +1100
message:
Merge from integration.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060214040706-ab43d8450989c555
parent: robertc at robertcollins.net-20060213105450-ecb3a07f7774a697
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Tue 2006-02-14 15:07:06 +1100
message:
Move find_repository to bzrdir, its not quite ideal there but its simpler and until someone chooses to vary the search by branch type its completely sufficient.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060213105450-ecb3a07f7774a697
parent: robertc at robertcollins.net-20060213084957-29f8ae569f789cef
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Mon 2006-02-13 21:54:50 +1100
message:
Cloning of repos preserves shared and make-working-tree attributes.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060213084957-29f8ae569f789cef
parent: robertc at robertcollins.net-20060213081516-3d13375f0de0ccb6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Mon 2006-02-13 19:49:57 +1100
message:
Creating or opening a branch will use the repository if the format supports that.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060213081516-3d13375f0de0ccb6
parent: robertc at robertcollins.net-20060213071300-a816a826be25821b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Mon 2006-02-13 19:15:16 +1100
message:
find_repository sufficiently robust.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060213071300-a816a826be25821b
parent: robertc at robertcollins.net-20060213064504-0bb16aece9d8abd9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Mon 2006-02-13 18:13:00 +1100
message:
find_repository limit cases.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060213064504-0bb16aece9d8abd9
parent: robertc at robertcollins.net-20060212205854-5bd98a23ff8314f4
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Mon 2006-02-13 17:45:04 +1100
message:
allow API creation of shared repositories
------------------------------------------------------------
merged: robertc at robertcollins.net-20060215060808-d47d40998fea0aee
parent: robertc at robertcollins.net-20060214065221-23180801f3c7cb18
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr-dir
timestamp: Wed 2006-02-15 17:08:08 +1100
message:
Give info some reasonable output and tests.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060217044707-8c15dab107f79a40
parent: robertc at robertcollins.net-20060214065221-23180801f3c7cb18
parent: john at arbash-meinel.com-20060217035556-b86991407ef095d9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2006-02-17 15:47:07 +1100
message:
Merge jam-integration.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060217035556-b86991407ef095d9
parent: john at arbash-meinel.com-20060217024753-edfa0e845eed8993
parent: john at arbash-meinel.com-20060217020102-a26538d2b32bff80
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2006-02-16 21:55:56 -0600
message:
[merge] jam-pending: add sign-my-commits, fix repository.clone, add progress bars.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060217020102-a26538d2b32bff80
parent: john at arbash-meinel.com-20060216171015-1c017977993fbe9b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Thu 2006-02-16 20:01:02 -0600
message:
cleanups from Robert
------------------------------------------------------------
merged: john at arbash-meinel.com-20060216171015-1c017977993fbe9b
parent: john at arbash-meinel.com-20060216170909-155c5aa4a20620dc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Thu 2006-02-16 11:10:15 -0600
message:
Adding progress bars to copy_all and copy_multi, fixing ordering of repository.clone() to pull inventories after weaves.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060216170909-155c5aa4a20620dc
parent: john at arbash-meinel.com-20060216170234-28b00293a6fdb5bf
parent: john at arbash-meinel.com-20060215223111-db659aff6ab35804
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Thu 2006-02-16 11:09:09 -0600
message:
[merge] bump up sign-my-commits
------------------------------------------------------------
merged: john at arbash-meinel.com-20060215223111-db659aff6ab35804
parent: john at arbash-meinel.com-20060215154209-1db9dff063341810
parent: john at arbash-meinel.com-20060215220155-08afc2aced7548dc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Wed 2006-02-15 16:31:11 -0600
message:
[merge] jam-integration, along with BzrDir changes
------------------------------------------------------------
merged: john at arbash-meinel.com-20060215154209-1db9dff063341810
parent: john at arbash-meinel.com-20060215153329-5d70f0eda01f5cfe
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Wed 2006-02-15 09:42:09 -0600
message:
Adding sign-my-commits as a builtin, along with some simple tests.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060215153329-5d70f0eda01f5cfe
parent: john at arbash-meinel.com-20060215151844-ce3e3efccd19da3f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Wed 2006-02-15 09:33:29 -0600
message:
Fix doc bug
------------------------------------------------------------
merged: john at arbash-meinel.com-20060215151844-ce3e3efccd19da3f
parent: john at arbash-meinel.com-20060214183630-bf533b848ea5edce
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Wed 2006-02-15 09:18:44 -0600
message:
Reverting gpg changes, should not be mainline, see gpg_uses_tempfile plugin.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060214183630-bf533b848ea5edce
parent: john at arbash-meinel.com-20060214170602-5959f911674708c9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Tue 2006-02-14 12:36:30 -0600
message:
Updated gpg to use a named file, rather than using stdin, so that gpg-agent will work properly
------------------------------------------------------------
merged: john at arbash-meinel.com-20060217024753-edfa0e845eed8993
parent: john at arbash-meinel.com-20060216170234-28b00293a6fdb5bf
parent: michael at ellerman.id.au-20060216005059-dde4ec75b1b58ebf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2006-02-16 20:47:53 -0600
message:
[merge] Michael Ellerman: support 'bzr log -r ..' and add tests, also clarify 'bzr help --long'
------------------------------------------------------------
merged: michael at ellerman.id.au-20060216005059-dde4ec75b1b58ebf
parent: michael at ellerman.id.au-20060216004340-37abb307ac2b63cf
committer: Michael Ellerman <michael at ellerman.id.au>
branch nick: mpe
timestamp: Thu 2006-02-16 11:50:59 +1100
message:
Add custom description for help's --long option, this fixes bug #31217.
There were no real tests for help, so add a bunch of black box tests
to confirm all the various incantations work.
------------------------------------------------------------
merged: michael at ellerman.id.au-20060216004340-37abb307ac2b63cf
parent: michael at ellerman.id.au-20060215050736-2b2c17f50a210b4d
committer: Michael Ellerman <michael at ellerman.id.au>
branch nick: mpe
timestamp: Thu 2006-02-16 11:43:40 +1100
message:
Make bzr log -r .. work, fixes bug #4609. Add a bunch of tests to make sure
it doesn't break in future.
------------------------------------------------------------
merged: michael at ellerman.id.au-20060215050736-2b2c17f50a210b4d
parent: mbp at sourcefrog.net-20060201130813-1240ac51411d1330
parent: john at arbash-meinel.com-20060214181443-42056ee264cc28fe
committer: Michael Ellerman <michael at ellerman.id.au>
branch nick: revision-ranges
timestamp: Wed 2006-02-15 16:07:36 +1100
message:
Merge JAM Integration
------------------------------------------------------------
merged: john at arbash-meinel.com-20060216170234-28b00293a6fdb5bf
parent: john at arbash-meinel.com-20060216164908-3b469d969279998a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2006-02-16 11:02:34 -0600
message:
small cleanup of test
------------------------------------------------------------
merged: john at arbash-meinel.com-20060216164908-3b469d969279998a
parent: john at arbash-meinel.com-20060216164307-5a0d008322cbf1d8
parent: marienz at gentoo.org-20060213232429-dd6f4ee24918e675
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2006-02-16 10:49:08 -0600
message:
[merge] Marien Zwart: make testament actually support unicode strings.
------------------------------------------------------------
merged: marienz at gentoo.org-20060213232429-dd6f4ee24918e675
parent: marienz at gentoo.org-20060212234125-9d198c5d818af110
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr.dev
timestamp: Tue 2006-02-14 00:24:29 +0100
message:
Move the encoding step into the test to make it more obvious we are comparing bytestrings.
------------------------------------------------------------
merged: marienz at gentoo.org-20060212234125-9d198c5d818af110
parent: marienz at gentoo.org-20060212224024-782d3bcc922d980c
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr.dev
timestamp: Mon 2006-02-13 00:41:25 +0100
message:
Whitespace cleanup (pep 3)
------------------------------------------------------------
merged: marienz at gentoo.org-20060212224024-782d3bcc922d980c
parent: marienz at gentoo.org-20060212223951-4827a2850a0da0e6
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr.dev
timestamp: Sun 2006-02-12 23:40:24 +0100
message:
Remove a useless local function.
------------------------------------------------------------
merged: marienz at gentoo.org-20060212223951-4827a2850a0da0e6
parent: mbp at sourcefrog.net-20060201130813-1240ac51411d1330
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr.dev
timestamp: Sun 2006-02-12 23:39:51 +0100
message:
Make Testament.as_text_lines return utf-8 instead of unicode objects and add a test for this.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060216164307-5a0d008322cbf1d8
parent: john at arbash-meinel.com-20060215220155-08afc2aced7548dc
parent: erik at bagfors.nu-20060216104622-46a6394829db2ee8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2006-02-16 10:43:07 -0600
message:
[merge] bzr.log.plugins: add --log-format to 'bzr log', allow a default to be set in config
------------------------------------------------------------
merged: erik at bagfors.nu-20060216104622-46a6394829db2ee8
parent: erik at bagfors.nu-20060216104544-42f90be7bc2e5856
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.log.plugins
timestamp: Thu 2006-02-16 11:46:22 +0100
message:
reformat NEWS
------------------------------------------------------------
merged: erik at bagfors.nu-20060216104544-42f90be7bc2e5856
parent: erik at bagfors.nu-20060216104359-444d0956bed3a1f7
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.log.plugins
timestamp: Thu 2006-02-16 11:45:44 +0100
message:
bugfix, typo bug
------------------------------------------------------------
merged: erik at bagfors.nu-20060216104359-444d0956bed3a1f7
parent: erik at bagfors.nu-20060215204913-66b12988b85e0b57
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.log.plugins
timestamp: Thu 2006-02-16 11:43:59 +0100
message:
blackbox tests for default log format and log-format arguments
------------------------------------------------------------
merged: erik at bagfors.nu-20060215204913-66b12988b85e0b57
parent: erik at bagfors.nu-20060210212329-0b949820c96ebe15
parent: john at arbash-meinel.com-20060213214027-f87283ba0fa50538
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.log.plugins
timestamp: Wed 2006-02-15 21:49:13 +0100
message:
[merge] jam-integration
------------------------------------------------------------
merged: erik at bagfors.nu-20060210212329-0b949820c96ebe15
parent: erik at bagfors.nu-20060206201243-3f60d7473fcf9ef3
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.log.plugins
timestamp: Fri 2006-02-10 22:23:29 +0100
message:
log_formatter => log_format for "named" formatters
The name of a formatter is now called log_format and is exposed
as "log-format" and not "log-formatter" to the user for more consitency
------------------------------------------------------------
merged: erik at bagfors.nu-20060206201243-3f60d7473fcf9ef3
parent: erik at bagfors.nu-20060206201150-73d89be9e6320dad
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.log.plugins
timestamp: Mon 2006-02-06 21:12:43 +0100
message:
tests for config log_formatter
------------------------------------------------------------
merged: erik at bagfors.nu-20060206201150-73d89be9e6320dad
parent: erik at bagfors.nu-20060204115126-c9ee420cc8876c25
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.log.plugins
timestamp: Mon 2006-02-06 21:11:50 +0100
message:
fix in help, log_format -> log_formatter
------------------------------------------------------------
merged: erik at bagfors.nu-20060204115126-c9ee420cc8876c25
parent: erik at bagfors.nu-20060204114014-ef72c583019c8342
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.log.plugins
timestamp: Sat 2006-02-04 12:51:26 +0100
message:
Make default formatter work for the missing command
Also, removed debugging
------------------------------------------------------------
merged: erik at bagfors.nu-20060204114014-ef72c583019c8342
parent: erik at bagfors.nu-20060204113623-016da21eeb5723ca
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.log.plugins
timestamp: Sat 2006-02-04 12:40:14 +0100
message:
update NEWS
------------------------------------------------------------
merged: erik at bagfors.nu-20060204113623-016da21eeb5723ca
parent: erik at bagfors.nu-20060203213448-af43e1511444f3fd
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.log.plugins
timestamp: Sat 2006-02-04 12:36:23 +0100
message:
Support for setting the default log format at a configuration option
Also, removed the possibility for plugins to set the default formatter
------------------------------------------------------------
merged: erik at bagfors.nu-20060203213448-af43e1511444f3fd
parent: erik at bagfors.nu-20060203195457-046f39c916b2ee12
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.log.plugins
timestamp: Fri 2006-02-03 22:34:48 +0100
message:
cover the missing command with formatters as well
------------------------------------------------------------
merged: erik at bagfors.nu-20060203195457-046f39c916b2ee12
parent: erik at bagfors.nu-20060203195059-1cf8ff5aa68de0ea
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.log.plugins
timestamp: Fri 2006-02-03 20:54:57 +0100
message:
Made "unknown log formatter" error message work
------------------------------------------------------------
merged: erik at bagfors.nu-20060203195059-1cf8ff5aa68de0ea
parent: mbp at sourcefrog.net-20060201130813-1240ac51411d1330
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.log.plugins
timestamp: Fri 2006-02-03 20:50:59 +0100
message:
Support for plugins to register log formatters and set default formatter
Also, change one command line option for "log"
------------------------------------------------------------
merged: john at arbash-meinel.com-20060215220155-08afc2aced7548dc
parent: john at arbash-meinel.com-20060214181443-42056ee264cc28fe
parent: robertc at robertcollins.net-20060214065221-23180801f3c7cb18
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Wed 2006-02-15 16:01:55 -0600
message:
[merge] robertc's integration branch: add BzrDir, and checkouts
------------------------------------------------------------
merged: john at arbash-meinel.com-20060214181443-42056ee264cc28fe
parent: john at arbash-meinel.com-20060213214027-f87283ba0fa50538
parent: john at arbash-meinel.com-20060214170602-5959f911674708c9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-02-14 12:14:43 -0600
message:
[merge] jam-pending: allow bzr re-sign to take multiple arguments
------------------------------------------------------------
merged: john at arbash-meinel.com-20060214170602-5959f911674708c9
parent: john at arbash-meinel.com-20060214170148-2765fe23e7309b93
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Tue 2006-02-14 11:06:02 -0600
message:
Updated NEWS
------------------------------------------------------------
merged: john at arbash-meinel.com-20060214170148-2765fe23e7309b93
parent: john at arbash-meinel.com-20060213214027-f87283ba0fa50538
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Tue 2006-02-14 11:01:48 -0600
message:
Updating bzr re-sign to allow multiple arguments, and updating tests
More information about the bazaar-commits
mailing list