Rev 1415: Update from bzr.dev. in
/home/robertc/source/baz/launchpad/
Robert Collins
robertc at robertcollins.net
Wed Mar 8 01:17:20 GMT 2006
------------------------------------------------------------
revno: 1415
revision-id: robertc at robertcollins.net-20060308011706-9f0389a22f64a591
parent: robertc at robertcollins.net-20060224204305-528289ac91698efe
parent: robertc at robertcollins.net-20060308002004-a9950b2fb75d14de
committer: Robert Collins <robertc at robertcollins.net>
branch nick: launchpad
timestamp: Wed 2006-03-08 12:17:06 +1100
message:
Update from bzr.dev.
removed:
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
added:
bzrlib/inter.py inter.py-20060302012326-a57300cb382c618f
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
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_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
bzrlib/tests/branch_implementations/test_bound_sftp.py test_bound_sftp.py-20051231055311-2f96048c4f0940ef
bzrlib/tests/branch_implementations/test_update.py test_update.py-20060305010612-e68efbcbb1baa69f
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_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_reconcile.py test_reconcile.py-20060225054842-50aa618584a86f26
bzrlib/tests/test_reweave.py.moved test_reweave.py-20060302012326-a582932ad7879ccd
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
renamed:
bzrlib/store/weave.py => bzrlib/store/versioned/__init__.py weavestore.py-20050907094258-88262e0434babab9
modified:
BRANCH.TODO BRANCH.TODO-20060103052123-79ac4969351c03a9
NEWS NEWS-20050323055033-4e00b5db738777ff
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/diff.py diff.py-20050309040759-26944fbbf2ebbf36
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/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/lockdir.py lockdir.py-20060220222025-98258adf27fbdda3
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/sign_my_commits.py sign_my_commits.py-20060215152201-5a6363365180e671
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/store/__init__.py store.py-20050309040759-164dc5173d6406c2
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
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_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_re_sign.py test_re_sign.py-20060214165921-4d04eba231454693
bzrlib/tests/blackbox/test_sign_my_commits.py test_sign_my_commits.py-20060215152957-270238a1ffacc841
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/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
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/test_bad_files.py test_bad_files.py-20050918155938-c76a2295c8ab9503
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_inv.py testinv.py-20050722220913-1dc326138d1a5892
bzrlib/tests/test_lockable_files.py test_lockable_files.py-20051225183927-365c7fd99591caf1
bzrlib/tests/test_lockdir.py test_lockdir.py-20060220222025-33d4221569a3d600
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
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_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
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_transactions.py testtransaction.py-20051006222840-1f55858f890d4b0a
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_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
bzrlib/tests/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transactions.py transactions.py-20051007010900-f1313d53cf58e223
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/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/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/weavefile.py weavefile.py-20050629135233-2ffe0200f103f6c2
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
contrib/pwk pwk-20050620015048-974d9719ed8a5c16
bzrlib/store/versioned/__init__.py weavestore.py-20050907094258-88262e0434babab9
------------------------------------------------------------
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-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-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: 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-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: 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-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-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: 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: 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: 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: 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: 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: 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: 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-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: 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: 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: 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-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: 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: 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.
More information about the bazaar-commits
mailing list