Rev 1428: merge (but not test) from upstream in
/home/robertc/source/baz/tags
Robert Collins
robertc at robertcollins.net
Thu Dec 15 05:07:42 GMT 2005
------------------------------------------------------------
revno: 1428
revision-id: robertc at robertcollins.net-20051215050734-1835d36ce62b960f
parent: robertc at robertcollins.net-20051009231308-7a4f1988e74cf169
parent: mbp at sourcefrog.net-20051213054804-e1dcb0c21cacd174
committer: Robert Collins <robertc at robertcollins.net>
branch nick: tags
timestamp: Thu 2005-12-15 16:07:34 +1100
message:
merge (but not test) from upstream
removed:
bzrlib/mdiff.py mdiff.py-20050409024839-5452d11fb73b3c362eb84816
bzrlib/revfile.py revfile.py-20050409024839-f50e8777febf943eac029aeb
bzrlib/store/compressed_text.py compressed_text_store.py-20050915193447-e643128846816ac1
patches/cache-remote-revisions.diff cacheremoterevisions.diff-20050615041652-ec41056afda8ec11
patches/cache_weave_inclusions.diff cache_weave_inclusions.diff-20050919104607-e3cc67f726e0cc84
patches/find-touching-from-seq.diff findtouchingfromseq.diff-20050606123253-430d602a8eb2cd5e
patches/meta-data-in-inventory.patch metadataininventory.patch-20050613121049-251bafe6906dca57
patches/ndiff.patch ndiff.patch-20050704121052-b73266660305dfef
testbzr testbzr-20050428033045-e528c9fe33219494
added:
INSTALL INSTALL-20051019070340-4b27f2fb240c7943
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/export/ export-20051114235827-0df92bc1a6ef3ac0
bzrlib/export/__init__.py __init__.py-20051114235828-1ba62cb4062304e6
bzrlib/export/dir_exporter.py dir_exporter.py-20051114235828-b51397f56bc7b117
bzrlib/export/tar_exporter.py tar_exporter.py-20051114235828-1f6349a2f090a5d0
bzrlib/export/zip_exporter.py zip_exporter.py-20051114235828-8f57f954fba6497e
bzrlib/gpg.py gpg.py-20051017065112-8654536d415dacc6
bzrlib/lsprof.py lsprof.py-20051208071030-833790916798ceed
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/rio.py rio.py-20051128032247-770b120b34dfff60
bzrlib/testament.py testament.py-20051011100429-6d319a18183b13c8
bzrlib/tests/blackbox/ blackbox-20051117211451-419928a2e5754ac1
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_cat.py test_cat.py-20051201162916-f0937e4e19ea24b3
bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/blackbox/test_revno.py test_revno.py-20051204214528-2f0bf83a71b7656a
bzrlib/tests/stub_sftp.py stub_sftp.py-20051027032739-0e7ef4f7bab0e174
bzrlib/tests/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
bzrlib/tests/test_api.py testapi.py-20051027033546-6f9be2d308d18a52
bzrlib/tests/test_command.py test_command.py-20051019190109-3b17be0f52eaa7a8
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_gpg.py testgpg.py-20051017042228-9276cd40a784c93c
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_missing.py test_missing.py-20051212000028-694fa4f658a81f48
bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
bzrlib/tests/test_nonascii.py testnonascii.py-20051018022645-ea1d8b6477b058a6
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_remove.py test_remove.py-20051212071329-1925f463b565a5c3
bzrlib/tests/test_revprops.py testrevprops.py-20051013073044-92bc3c68302ce1bf
bzrlib/tests/test_reweave.py testreweave.py-20051025042437-a2a02abae3551489
bzrlib/tests/test_rio.py test_rio.py-20051128032247-dcd1082dfc86d3d3
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_setup.py test_setup.py-20051208073730-4a59a6368c4efa04
bzrlib/tests/test_sftp.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_source.py test_source.py-20051207061333-a58dea6abecc030d
bzrlib/tests/test_testament.py testtestament.py-20051011100429-5df1657310caa929
bzrlib/tests/test_trace.py testtrace.py-20051110225523-a21117fc7a07eeff
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/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/tsort.py tsort.py-20051025073946-7808f6aaf7d07208
bzrlib/ui/ ui-20051130153613-246bba9a38f01be6
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
bzrlib/uncommit.py uncommit.py-20050626215513-5ec509fa425b305c
bzrlib/util/configobj/ configobj-20051018184548-18c76a60384b575a
bzrlib/util/configobj/__init__.py __init__.py-20051018184548-f715e1ce433801ee
bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
bzrlib/util/configobj/docs/ docs-20051018184548-5eb1575f28e645ab
bzrlib/util/configobj/docs/BSD-LICENSE.txt BSDLICENSE.txt-20051018184548-29b89ff3102657f5
bzrlib/util/configobj/docs/configobj.txt configobj.txt-20051018184548-4949b5f17e6a19c7
bzrlib/util/configobj/docs/validate.txt validate.txt-20051018184548-9e0e5ad913e258f5
bzrlib/util/configobj/validate.py validate.py-20051018184548-e700c5f98afa9389
bzrlib/win32console.py win32console.py-20051021033308-123c6c929d04973d
tools/biobench.py biobench.py-20051101131608-0942e1592d0a8ba9
tools/riodemo.py riodemo.py-20051128080255-352dc1600f3d58c7
tools/trace-revisions tracerevisions-20051107162041-9dfee0a7324d206d
renamed:
bzr-man.py => bzr_man.py bzrman.py-20050601153041-0ff7f74de456d15e
bzrlib/plugins/conflicts.py => bzrlib/conflicts.py conflicts.py-20051001061850-78ef952ba63d2b42
bzrlib/selftest => bzrlib/tests selftest-20050621060616-bb8b5b36e3c950c8
bzrlib/selftest/blackbox.py => bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/selftest/plugins.py => bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/selftest/testbranch.py => bzrlib/tests/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/selftest/testdiff.py => bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/selftest/testfetch.py => bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/selftest/testgraph.py => bzrlib/tests/test_graph.py testgraph.py-20050905070950-42e6c958106610fd
bzrlib/selftest/testhashcache.py => bzrlib/tests/test_hashcache.py testhashcache.py-20050706091800-0288ab2659338981
bzrlib/selftest/testidentitymap.py => bzrlib/tests/test_identitymap.py testidentitymap.py-20051007040721-37936d473bd1ac51
bzrlib/selftest/testinv.py => bzrlib/tests/test_inv.py testinv.py-20050722220913-1dc326138d1a5892
bzrlib/selftest/testlog.py => bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/selftest/testmerge.py => bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/selftest/testmerge3.py => bzrlib/tests/test_merge3.py merge3.py-20050704130834-556689114c89e6f2
bzrlib/selftest/testrevision.py => bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/selftest/testrevisionnamespaces.py => bzrlib/tests/test_revisionnamespaces.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
bzrlib/selftest/testsampler.py => bzrlib/tests/test_sampler.py testsampler.py-20051006114006-67f6d8ecb1fda6de
bzrlib/selftest/teststatus.py => bzrlib/tests/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/selftest/teststore.py => bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
bzrlib/selftest/testtransactions.py => bzrlib/tests/test_transactions.py testtransaction.py-20051006222840-1f55858f890d4b0a
bzrlib/selftest/testtransport.py => bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/selftest/testworkingtree.py => bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/selftest/versioning.py => bzrlib/tests/blackbox/test_versioning.py versioning.py-20050622071821-3ddf5e2e5e93c602
bzrlib/selftest/whitebox.py => bzrlib/tests/test_whitebox.py whitebox.py-20050530064534-a063aafb4a0a3a04
bzrlib/ui.py => bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
.rsyncexclude rsyncexclude-20050408053852-27e0a5928b6829f645beb2e6
HACKING HACKING-20050805200004-2a5dc975d870f78c
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
NEWS.developers NEWS.developers-20050919074335-ad69ad48eec18028
README README-20050309040720-8f368abf9f346b9d
TODO TODO-20050426050852-44d2ad9048dafbe9
build-api build-api-20050309064830-a0be0dc1452cda87
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/add.py add.py-20050323030017-3a77d63feda58e33
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/atomicfile.py atomicfile.py-20050509044450-dbd24e6c564f7c66
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/changeset.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/clone.py clone.py-20050929121333-bc726d1ddd8042bc
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
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/hashcache.py hashcache.py-20050706091756-fe3a8cc1143ff24f
bzrlib/help.py help.py-20050505025907-4dd7a6d63912f894
bzrlib/identitymap.py identitymap.py-20051007040721-83e837d831a6636a
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/lock.py lock.py-20050527050856-ec090bb51bc03349
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge3.py merge3.py-20050704130834-bf0597094828a2e1
bzrlib/merge_core.py merge_core.py-20050513021216-eda88728698d4401
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/shellcomplete.py shellcomplete.py-20050822153127-3be115ff5e70fc39
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/store/__init__.py store.py-20050309040759-164dc5173d6406c2
bzrlib/store/text.py text.py-20050928201105-c26468dcb5d9b18b
bzrlib/store/weave.py weavestore.py-20050907094258-88262e0434babab9
bzrlib/tests/HTTPTestUtil.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_ancestry.py test_ancestry.py-20050913023709-69768e94848312c6
bzrlib/tests/test_bad_files.py test_bad_files.py-20050918155938-c76a2295c8ab9503
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_commit_merge.py test_commit_merge.py-20050920084723-819eeeff77907bc5
bzrlib/tests/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_parent.py test_parent.py-20050830052751-5e62766623c32222
bzrlib/tests/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
bzrlib/tests/test_xml.py test_xml.py-20050905091053-80b45588931a9b35
bzrlib/tests/treeshape.py treeshape.py-20051004094628-312a98f0194306a8
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
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/tree.py tree.py-20050309040759-9d5f2496be663e77
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
bzrlib/xml.py xml.py-20050309040759-57d51586fdec365d
bzrlib/xml4.py xml4.py-20050916091259-db5ab55e7e6ca324
bzrlib/xml5.py xml5.py-20050907032657-aac8f960815b66b1
contrib/zsh/_bzr _bzr-20050503074841-b2f107964e03958e
doc/random.txt random.txt-20050309044946-269c29512b381f5b
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
bzr_man.py bzrman.py-20050601153041-0ff7f74de456d15e
bzrlib/conflicts.py conflicts.py-20051001061850-78ef952ba63d2b42
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_graph.py testgraph.py-20050905070950-42e6c958106610fd
bzrlib/tests/test_hashcache.py testhashcache.py-20050706091800-0288ab2659338981
bzrlib/tests/test_identitymap.py testidentitymap.py-20051007040721-37936d473bd1ac51
bzrlib/tests/test_inv.py testinv.py-20050722220913-1dc326138d1a5892
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge3.py merge3.py-20050704130834-556689114c89e6f2
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_revisionnamespaces.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
bzrlib/tests/test_sampler.py testsampler.py-20051006114006-67f6d8ecb1fda6de
bzrlib/tests/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
bzrlib/tests/test_transactions.py testtransaction.py-20051006222840-1f55858f890d4b0a
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/tests/blackbox/test_versioning.py versioning.py-20050622071821-3ddf5e2e5e93c602
bzrlib/tests/test_whitebox.py whitebox.py-20050530064534-a063aafb4a0a3a04
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051213054804-e1dcb0c21cacd174
parent: mbp at sourcefrog.net-20051213054640-05a8971e11b1ba66
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Tue 2005-12-13 16:48:04 +1100
message:
MsgEditor tests should be skipped on platforms without unicode fs.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051213054640-05a8971e11b1ba66
parent: mbp at sourcefrog.net-20051213054051-a82f95d7d417f73b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Tue 2005-12-13 16:46:40 +1100
message:
Fix up display of reasons why tests were skipped.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051213054051-a82f95d7d417f73b
parent: mbp at sourcefrog.net-20051213051217-5efd4ec3b060bfaf
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Tue 2005-12-13 16:40:51 +1100
message:
New TestSkipped facility, and tests for it.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051213051217-5efd4ec3b060bfaf
parent: mbp at sourcefrog.net-20051213035433-26282b8f72702fc3
parent: robertc at robertcollins.net-20051212223421-c0f6e7a7fae0b5ee
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Tue 2005-12-13 16:12:17 +1100
message:
[merge] robertc, source-examination test
------------------------------------------------------------
merged: robertc at robertcollins.net-20051212223421-c0f6e7a7fae0b5ee
parent: robertc at robertcollins.net-20051212220750-e1ff9f5a18f795ad
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2005-12-13 09:34:21 +1100
message:
Bugfix to source testing logic to get the right path when .py is returned by __file__
------------------------------------------------------------
merged: robertc at robertcollins.net-20051212220750-e1ff9f5a18f795ad
parent: robertc at robertcollins.net-20051208055700-5d85edd70fd15d4d
parent: mbp at sourcefrog.net-20051212072002-d3a0d6a76a3017c0
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2005-12-13 09:07:50 +1100
message:
Merge from mbp.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051212072002-d3a0d6a76a3017c0
parent: mbp at sourcefrog.net-20051212070634-364b095fe76623e5
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2005-12-12 18:20:02 +1100
message:
[patch] fix for 'bzr rm -v' (Wouter van Heyst)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051212070634-364b095fe76623e5
parent: mbp at sourcefrog.net-20051212052559-d3b1591f2404e90a
parent: aaron.bentley at utoronto.ca-20051212002414-d5c9e3eab54e705a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2005-12-12 18:06:34 +1100
message:
[merge] improved 'missing' command from aaron
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051212002414-d5c9e3eab54e705a
parent: aaron.bentley at utoronto.ca-20051129050222-56e09f54af4e21d5
parent: aaron.bentley at utoronto.ca-20051212002032-1a2c4bdb573bf3bc
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sun 2005-12-11 19:24:14 -0500
message:
Merged the new bzr missing command
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051212002032-1a2c4bdb573bf3bc
parent: aaron.bentley at utoronto.ca-20051211232656-8b2d7eaa92903c39
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 19:20:32 -0500
message:
Added unit tests for find_unmerged
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051211232656-8b2d7eaa92903c39
parent: aaron.bentley at utoronto.ca-20051211224007-bf524313537779dc
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 18:26:56 -0500
message:
Test every option for "bzr missing"
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051211224007-bf524313537779dc
parent: aaron.bentley at utoronto.ca-20051211223621-bd7b225c3f212d15
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 17:40:07 -0500
message:
Fixed up tests
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051211223621-bd7b225c3f212d15
parent: aaron.bentley at utoronto.ca-20051211222951-7adde03c2e93b70c
parent: larstiq at larstiq.dyndns.org-20051211220521-094e867abca7417c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 17:36:21 -0500
message:
Added tests from LarstiQ
------------------------------------------------------------
merged: larstiq at larstiq.dyndns.org-20051211220521-094e867abca7417c
parent: mbp at sourcefrog.net-20051206065325-54ba77d544b4501a
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: bzr.lq
timestamp: Sun 2005-12-11 23:05:21 +0100
message:
Add testcase for missing command, improved with feedback from Robert
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051206065325-54ba77d544b4501a
parent: mbp at sourcefrog.net-20051206051943-e7422764401f2d2e
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Tue 2005-12-06 17:53:25 +1100
message:
News entries for recent merge from John.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051206051943-e7422764401f2d2e
parent: mbp at sourcefrog.net-20051206051616-5952d343e0ea9a45
parent: james.henstridge at canonical.com-20051202033643-11c50c1f530b3e13
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Tue 2005-12-06 16:19:43 +1100
message:
[merge] jamesh, unicode fixes
------------------------------------------------------------
merged: james.henstridge at canonical.com-20051202033643-11c50c1f530b3e13
parent: mbp at sourcefrog.net-20051130064100-50469cf3ee5f42b2
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.smallfixes
timestamp: Fri 2005-12-02 11:36:43 +0800
message:
Don't encode unicode messages to UTF-8 in mutter() (the stream writer does it).
Use a codec wrapped log file in tests to match the real environment.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051130064100-50469cf3ee5f42b2
parent: mbp at sourcefrog.net-20051130002550-47e24cc1e5fd5f50
parent: james.henstridge at canonical.com-20051129031349-2da672586ac3ade9
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-30 17:41:00 +1100
message:
[merge] use /usr/bin/ssh if we can (jamesh)
------------------------------------------------------------
merged: james.henstridge at canonical.com-20051129031349-2da672586ac3ade9
parent: james.henstridge at canonical.com-20051129020047-6795eaed4d43baa8
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.sftp
timestamp: Tue 2005-11-29 11:13:49 +0800
message:
More URL handling fixes
------------------------------------------------------------
merged: james.henstridge at canonical.com-20051129020047-6795eaed4d43baa8
parent: james.henstridge at canonical.com-20051124144621-a07e949c2bc2ccb5
parent: mbp at sourcefrog.net-20051128042154-862e59e71e8cd5c5
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.sftp
timestamp: Tue 2005-11-29 10:00:47 +0800
message:
merge from bzr.dev
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051128042154-862e59e71e8cd5c5
parent: mbp at sourcefrog.net-20051128032041-b83d451b0a70bcd5
parent: aaron.bentley at utoronto.ca-20051126013218-9c8e1f00ccba641e
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Mon 2005-11-28 15:21:54 +1100
message:
[merge] aaron
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051126013218-9c8e1f00ccba641e
parent: aaron.bentley at utoronto.ca-20051126012317-0af7f775be52b3ab
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2005-11-25 20:32:18 -0500
message:
Added test for renaming both parent and child
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051126012317-0af7f775be52b3ab
parent: mbp at sourcefrog.net-20051125062856-e4c887417108fd9e
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2005-11-25 20:23:17 -0500
message:
Test case when file to be renamed is also deleted
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051125062856-e4c887417108fd9e
parent: mbp at sourcefrog.net-20051125043654-106a589368532d7e
parent: john at arbash-meinel.com-20051123154759-784e7805281e831c
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: merge-recovered
timestamp: Fri 2005-11-25 17:28:56 +1100
message:
[merge] test renames and other fixes (John)
------------------------------------------------------------
merged: john at arbash-meinel.com-20051123154759-784e7805281e831c
parent: john at arbash-meinel.com-20051123154424-a02f8bf990a1fed5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Wed 2005-11-23 09:47:59 -0600
message:
I was stripping off too much of the name in --verbose mode.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051123154424-a02f8bf990a1fed5
parent: john at arbash-meinel.com-20051123153207-adf60598914ab5c2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Wed 2005-11-23 09:44:24 -0600
message:
Renamed all of the tests from selftest/foo.py to tests/test_foo.py
------------------------------------------------------------
merged: john at arbash-meinel.com-20051123153207-adf60598914ab5c2
parent: john at arbash-meinel.com-20051123135446-6d79a500f3e3f3e2
parent: john at arbash-meinel.com-20051117204707-4f738cb8f6857051
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Wed 2005-11-23 09:32:07 -0600
message:
[merge] Added the uncommit plugin
------------------------------------------------------------
merged: john at arbash-meinel.com-20051117204707-4f738cb8f6857051
parent: john at arbash-meinel.com-20051027213130-d2c5a6c65a3bfbb2
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Thu 2005-11-17 14:47:07 -0600
message:
[merge] Aaron's fix to log messages, when undoing multiple entries.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051027213130-d2c5a6c65a3bfbb2
parent: jelmer at samba.org-20051020122445-a5526166d1199517
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Thu 2005-10-27 16:31:30 -0500
message:
Updated to latest bzr.dev code, and added tests.
------------------------------------------------------------
merged: jelmer at samba.org-20051020122445-a5526166d1199517
parent: john at arbash-meinel.com-20051012030827-6c1b3d68011e7b82
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Thu 2005-10-20 14:24:45 +0200
message:
Update for new options API
------------------------------------------------------------
merged: john at arbash-meinel.com-20051012030827-6c1b3d68011e7b82
parent: john at arbash-meinel.com-20050924000443-6cf6a4c848bab97e
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Tue 2005-10-11 22:08:27 -0500
message:
Upgrading plugin for v5
------------------------------------------------------------
merged: john at arbash-meinel.com-20050924000443-6cf6a4c848bab97e
parent: john at arbash-meinel.com-20050923183322-1441a26b3cd167dc
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-09-23 19:04:43 -0500
message:
Changed the --remove command to --all
------------------------------------------------------------
merged: john at arbash-meinel.com-20050923183322-1441a26b3cd167dc
parent: john at arbash-meinel.com-20050923183046-1d5dc250bb7d4e4d
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-09-23 13:33:22 -0500
message:
Made --dry-run print a better warning, so we don't scare people.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050923183046-1d5dc250bb7d4e4d
parent: john at arbash-meinel.com-20050923181227-bbc42f66c1dc197b
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-09-23 13:30:46 -0500
message:
Adding ability to revert back to earlier revisions.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050923181227-bbc42f66c1dc197b
parent: john at arbash-meinel.com-20050627215851-6105227ec3848593
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-09-23 13:12:27 -0500
message:
Updated to not use find_branch.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050627215851-6105227ec3848593
parent: john at arbash-meinel.com-20050627215821-28583a3356383aaf
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Mon 2005-06-27 15:58:51 -0600
message:
Updated for new log_formatter.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050627215821-28583a3356383aaf
parent: john at arbash-meinel.com-20050627215733-f4419eee3c33dd37
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Mon 2005-06-27 15:58:21 -0600
message:
Updated for new log_formatter.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050627215733-f4419eee3c33dd37
parent: john at arbash-meinel.com-20050626215527-0deb543cd20be09a
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Mon 2005-06-27 15:57:33 -0600
message:
Updated for new log_formatter.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050626215527-0deb543cd20be09a
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sun 2005-06-26 16:55:27 -0500
message:
Creating a plugin for uncommitting the last revision.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051123135446-6d79a500f3e3f3e2
parent: john at arbash-meinel.com-20051123134057-6fb7565337e9e18b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Wed 2005-11-23 07:54:46 -0600
message:
[patch] Johan Rydberg - let clone use set_revision_history instead of append_revision
------------------------------------------------------------
merged: john at arbash-meinel.com-20051123134057-6fb7565337e9e18b
parent: john at arbash-meinel.com-20051121154158-1845aa886bfac4b4
parent: mbp at sourcefrog.net-20051122230822-b876b5abe3f6bd0c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Wed 2005-11-23 07:40:57 -0600
message:
[merge] bzr.dev
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051122230822-b876b5abe3f6bd0c
parent: mbp at sourcefrog.net-20051122230746-bf3c32915a79653b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-23 10:08:22 +1100
message:
NEWS typo
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051122230746-bf3c32915a79653b
parent: mbp at sourcefrog.net-20051122043014-6df209fd93033b59
parent: robey at lag.net-20051122015612-24810f5a892a6bd6
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-23 10:07:46 +1100
message:
[merge] sftp fixes
------------------------------------------------------------
merged: robey at lag.net-20051122015612-24810f5a892a6bd6
parent: robey at lag.net-20051122015034-755f8d30106bfb8b
committer: Robey Pointer <robey at lag.net>
branch nick: bzr.sftp
timestamp: Mon 2005-11-21 17:56:12 -0800
message:
modified version of john's patch to add atomic put and locking to the sftp transport
------------------------------------------------------------
merged: robey at lag.net-20051122015034-755f8d30106bfb8b
parent: robey at lag.net-20051122014631-42d9600803476389
committer: Robey Pointer <robey at lag.net>
branch nick: bzr.sftp
timestamp: Mon 2005-11-21 17:50:34 -0800
message:
patch from erik to fix sftp relpath to only check the path component
------------------------------------------------------------
merged: robey at lag.net-20051122014631-42d9600803476389
parent: robey at lag.net-20051122014514-eef2e2bce22d7356
committer: Robey Pointer <robey at lag.net>
branch nick: bzr.sftp
timestamp: Mon 2005-11-21 17:46:31 -0800
message:
tighten up the sftp unit tests a bit to make them work better on windows
------------------------------------------------------------
merged: robey at lag.net-20051122014514-eef2e2bce22d7356
parent: robey at lag.net-20051122014331-6f62bc9dead6483c
committer: Robey Pointer <robey at lag.net>
branch nick: bzr.sftp
timestamp: Mon 2005-11-21 17:45:14 -0800
message:
modified patch from alexey shamrin & john meinel to stdout-encode the getpass prompts within sftp transport
------------------------------------------------------------
merged: robey at lag.net-20051122014331-6f62bc9dead6483c
parent: robey at lag.net-20051122014146-5186f5e310a15202
committer: Robey Pointer <robey at lag.net>
branch nick: bzr.sftp
timestamp: Mon 2005-11-21 17:43:31 -0800
message:
fix sftp urls to support the ietf draft url spec wrt relative vs absolute sftp urls (this will break existing branch urls); fix username/password parsing in sftp urls; add unit tests to make sure sftp url parsing is working
------------------------------------------------------------
merged: robey at lag.net-20051122014146-5186f5e310a15202
parent: mbp at sourcefrog.net-20051118081007-80523bf145eb319b
parent: robey at lag.net-20051107050204-885fb734a3dd3906
committer: Robey Pointer <robey at lag.net>
branch nick: bzr.sftp
timestamp: Mon 2005-11-21 17:41:46 -0800
message:
make sftp put faster when using paramiko 1.5.1
------------------------------------------------------------
merged: robey at lag.net-20051107050204-885fb734a3dd3906
parent: mbp at sourcefrog.net-20051031205250-b0c7f1d9ece522f5
committer: Robey Pointer <robey at lag.net>
timestamp: Sun 2005-11-06 21:02:04 -0800
message:
prefetch files under paramiko 1.5.1 for improved speed
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051031205250-b0c7f1d9ece522f5
parent: mbp at sourcefrog.net-20051031204026-5ccf0105c365b913
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-31 15:52:50 -0500
message:
Fix up assert with sideeffects in CompressedTextStore._copy_one
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051031204026-5ccf0105c365b913
parent: mbp at sourcefrog.net-20051031172115-86efd5e038c8777d
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-31 15:40:26 -0500
message:
Remove all assert statements from test cases.
Tests should always be evaluated even when run with 'python -O', and so should
use TestCase.assert_ etc.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051031172115-86efd5e038c8777d
parent: mbp at sourcefrog.net-20051031172011-b7cecd0b3435944a
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-31 12:21:15 -0500
message:
Bump version to 0.7pre
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051031172011-b7cecd0b3435944a
parent: mbp at sourcefrog.net-20051031171704-4e16f11e8135aeff
parent: larstiq at larstiq.dyndns.org-20051028203032-94a016293d15f207
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-31 12:20:11 -0500
message:
[merge] build and install manpage
------------------------------------------------------------
merged: larstiq at larstiq.dyndns.org-20051028203032-94a016293d15f207
parent: larstiq at larstiq.dyndns.org-20051028202320-9664a5530b91b23c
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
timestamp: Fri 2005-10-28 22:30:32 +0200
message:
Add reinvocation code to ensure setup.py is run by python2.4
------------------------------------------------------------
merged: larstiq at larstiq.dyndns.org-20051028202320-9664a5530b91b23c
parent: larstiq at larstiq.dyndns.org-20051028201251-d3015a1cf8ec0420
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
timestamp: Fri 2005-10-28 22:23:20 +0200
message:
bump version to 0.6
------------------------------------------------------------
merged: larstiq at larstiq.dyndns.org-20051028201251-d3015a1cf8ec0420
parent: larstiq at larstiq.dyndns.org-20051028193513-4e2c5316dba6c217
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
timestamp: Fri 2005-10-28 22:12:51 +0200
message:
Create bzr.1 manpage from setup.py
------------------------------------------------------------
merged: larstiq at larstiq.dyndns.org-20051028193513-4e2c5316dba6c217
parent: larstiq at larstiq.dyndns.org-20051028192845-2ca20eec675cddb8
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
timestamp: Fri 2005-10-28 21:35:13 +0200
message:
Kill the python reinvocation, it doesn't work for me, and
it's moving to be imported from setup.py
------------------------------------------------------------
merged: larstiq at larstiq.dyndns.org-20051028192845-2ca20eec675cddb8
parent: mbp at sourcefrog.net-20051028055302-14e925407b2b09d4
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
timestamp: Fri 2005-10-28 21:28:45 +0200
message:
Eliminate double whitespace lines in manpage, reported by liw
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051028055302-14e925407b2b09d4
parent: mbp at sourcefrog.net-20051028054949-98b4a70546cb7129
parent: john at arbash-meinel.com-20051027205644-deb2019ab9deebd9
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-10-28 15:53:02 +1000
message:
[merge] fixes for ls
------------------------------------------------------------
merged: john at arbash-meinel.com-20051027205644-deb2019ab9deebd9
parent: john at arbash-meinel.com-20051027204409-98cc537ee55a9f2e
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Thu 2005-10-27 15:56:44 -0500
message:
Added more tests.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051027204409-98cc537ee55a9f2e
parent: mbp at sourcefrog.net-20051027034457-acfead93c532ec29
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Thu 2005-10-27 15:44:09 -0500
message:
Made ls work again, and take extra arguments.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051027034457-acfead93c532ec29
parent: mbp at sourcefrog.net-20051027034323-31ce572c5cdcbc45
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-27 13:44:57 +1000
message:
Fix tests
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051027034323-31ce572c5cdcbc45
parent: mbp at sourcefrog.net-20051027033618-0ea59d3acff2b408
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-27 13:43:23 +1000
message:
Add check that the bzr program and bzrlib version match.
This may trap installation errors where bin/bzr is upgraded but not
bzrlib, or vice versa.
Change new variable to bzrlib.version_info to be consistent with
sys.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051027033618-0ea59d3acff2b408
parent: mbp at sourcefrog.net-20051027032848-5edee386ede10b21
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-27 13:36:18 +1000
message:
Expose library API version in bzrlib.bzr_version_info
similar to sys.version_info.
Add tests for this.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051027032848-5edee386ede10b21
parent: mbp at sourcefrog.net-20051027032619-323471e9b77bd69a
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-27 13:28:48 +1000
message:
[patch] paramiko sftp tests (robey)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051027032619-323471e9b77bd69a
parent: mbp at sourcefrog.net-20051027022612-a259d9eacbe71552
parent: michael at ellerman.id.au-20051026100630-64c305951927e02a
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-27 13:26:19 +1000
message:
[merge] Fixes and tests for strict commits (mpe)
------------------------------------------------------------
merged: michael at ellerman.id.au-20051026100630-64c305951927e02a
parent: michael at ellerman.id.au-20051026100347-bb0b2bd42f7953f2
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Wed 2005-10-26 20:06:30 +1000
message:
Fix error in run_bzr_captured() doco
------------------------------------------------------------
merged: michael at ellerman.id.au-20051026100347-bb0b2bd42f7953f2
parent: michael at ellerman.id.au-20051019054013-518c59352d12019a
parent: mbp at sourcefrog.net-20051026062015-ab8c2e8913b19989
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Wed 2005-10-26 20:03:47 +1000
message:
Merge mainline.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051026062015-ab8c2e8913b19989
parent: mbp at sourcefrog.net-20051026055204-425ddb6e1457aac2
committer: mbp at sourcefrog.net
timestamp: Wed 2005-10-26 16:20:15 +1000
message:
Move weave errors into bzrlib.errors and make consistent with new system.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051026055204-425ddb6e1457aac2
parent: mbp at sourcefrog.net-20051026054906-9a5608902d33bf8f
committer: mbp at sourcefrog.net
timestamp: Wed 2005-10-26 15:52:04 +1000
message:
Another topo_sort test
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051026054906-9a5608902d33bf8f
parent: mbp at sourcefrog.net-20051026023628-4fa68e04f44f5a13
committer: mbp at sourcefrog.net
timestamp: Wed 2005-10-26 15:49:06 +1000
message:
Improved topological sort
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051026023628-4fa68e04f44f5a13
parent: mbp at sourcefrog.net-20051025232907-7c14ff3affd08906
committer: mbp at sourcefrog.net
timestamp: Wed 2005-10-26 12:36:28 +1000
message:
Add topo_sort utility function
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051025232907-7c14ff3affd08906
parent: mbp at sourcefrog.net-20051025232422-babcb3f6fda554c3
committer: mbp at sourcefrog.net
timestamp: Wed 2005-10-26 09:29:07 +1000
message:
todo
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051025232422-babcb3f6fda554c3
parent: mbp at sourcefrog.net-20051025071214-df55048f97f01917
committer: mbp at sourcefrog.net
timestamp: Wed 2005-10-26 09:24:22 +1000
message:
Add .sconsign* to default ignore list
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051025071214-df55048f97f01917
parent: mbp at sourcefrog.net-20051025070730-af93bccefc008d4e
committer: mbp at sourcefrog.net
timestamp: Tue 2005-10-25 17:12:14 +1000
message:
Refactor test setup/teardown into cleanup callbacks
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051025070730-af93bccefc008d4e
parent: mbp at sourcefrog.net-20051025064159-10e7a898748bbf42
committer: mbp at sourcefrog.net
timestamp: Tue 2005-10-25 17:07:30 +1000
message:
Clean up test log files when tests complete.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051025064159-10e7a898748bbf42
parent: mbp at sourcefrog.net-20051025050430-a0d658f0767aa56f
committer: mbp at sourcefrog.net
timestamp: Tue 2005-10-25 16:41:59 +1000
message:
Add TestCase.addCleanup method.
This is an alternative to overriding the tearDown() method, which tends to
cause confusion when subclasses want different cleanups, or cleanups that
should be done in only particular cases.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051025050430-a0d658f0767aa56f
parent: mbp at sourcefrog.net-20051025044352-c562c69359d344d8
committer: mbp at sourcefrog.net
timestamp: Tue 2005-10-25 15:04:30 +1000
message:
Test for correct annotations after simple reweave
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051025044352-c562c69359d344d8
parent: mbp at sourcefrog.net-20051025044326-48a847b93274442e
committer: mbp at sourcefrog.net
timestamp: Tue 2005-10-25 14:43:52 +1000
message:
Split reweave tests into new file and add one more.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051025044326-48a847b93274442e
parent: mbp at sourcefrog.net-20051025015221-007dbda9872fa88b
committer: mbp at sourcefrog.net
timestamp: Tue 2005-10-25 14:43:26 +1000
message:
- fix Weave.names()
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051025015221-007dbda9872fa88b
parent: mbp at sourcefrog.net-20051024235941-9a2711dfaa8a522d
committer: mbp at sourcefrog.net
timestamp: Tue 2005-10-25 11:52:21 +1000
message:
Add Weave.names()
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024235941-9a2711dfaa8a522d
parent: mbp at sourcefrog.net-20051024235401-7f76b82a94d55621
committer: mbp at sourcefrog.net
timestamp: Tue 2005-10-25 09:59:41 +1000
message:
Fix up all calls to InvalidRevisionId() to specify parameters.
Pointed out by Jelmer.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024235401-7f76b82a94d55621
parent: mbp at sourcefrog.net-20051024121950-8d8cbc53f5a7da0b
parent: jelmer at samba.org-20051019234501-02d07eb6d5a0510e
committer: mbp at sourcefrog.net
timestamp: Tue 2005-10-25 09:54:01 +1000
message:
[merge] small fixes from Jelmer
------------------------------------------------------------
merged: jelmer at samba.org-20051019234501-02d07eb6d5a0510e
parent: jelmer at samba.org-20051019105209-55ff676b4f3b0efe
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Thu 2005-10-20 01:45:01 +0200
message:
Fix typo
------------------------------------------------------------
merged: jelmer at samba.org-20051019105209-55ff676b4f3b0efe
parent: jelmer at samba.org-20051019093439-e1d8e3508d1ba46b
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Wed 2005-10-19 12:52:09 +0200
message:
InvalidRevisionId lost its argument
------------------------------------------------------------
merged: jelmer at samba.org-20051019093439-e1d8e3508d1ba46b
parent: jelmer at samba.org-20051018181306-96bd114e1f43f112
parent: mbp at sourcefrog.net-20051019061131-6489a7f68564588e
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Wed 2005-10-19 11:34:39 +0200
message:
Merge from Martin
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051019061131-6489a7f68564588e
parent: mbp at sourcefrog.net-20051019050345-3632317811c8ce93
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-10-19 16:11:31 +1000
message:
- load paramiko sftp transport by default
(will break if paramiko isn't installed)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051019050345-3632317811c8ce93
parent: mbp at sourcefrog.net-20051019050312-d5791b27e7926a28
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-10-19 15:03:45 +1000
message:
- import sftp transport from robey
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051019050312-d5791b27e7926a28
parent: mbp at sourcefrog.net-20051019024912-cd8806cde41991f6
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-10-19 15:03:12 +1000
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051019024912-cd8806cde41991f6
parent: mbp at sourcefrog.net-20051018114741-569e2fada4aa2c1d
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-10-19 12:49:12 +1000
message:
- improved eta estimation for progress bar
(patch from John Arbash Meinel)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051018114741-569e2fada4aa2c1d
parent: mbp at sourcefrog.net-20051018064730-700a03dca884a488
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-10-18 21:47:41 +1000
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051018064730-700a03dca884a488
parent: mbp at sourcefrog.net-20051018063047-13fc3067d2f579a3
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-10-18 16:47:30 +1000
message:
- in error messages, show cwd as repr in case it's in unicode
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051018063047-13fc3067d2f579a3
parent: mbp at sourcefrog.net-20051018023349-45ebeadb7e105db5
parent: robertc at robertcollins.net-20051017233518-6746654be564edde
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-10-18 16:30:47 +1000
message:
[merge] from robert and fix up tests
------------------------------------------------------------
merged: robertc at robertcollins.net-20051017233518-6746654be564edde
parent: robertc at robertcollins.net-20051017203812-7f01cc90974d01ca
parent: robertc at robertcollins.net-20051017233206-cbd6059e27bd4e39
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-18 09:35:18 +1000
message:
Merge in more GPG work, and more Branch-api-shrinkage.
* Branch.remove has been moved to WorkingTree, which has also gained
lock_read, lock_write and unlock methods for convenience. (Robert
Collins)
* Two decorators, needs_read_lock and needs_write_lock have been added
to the branch module. Use these to cause a function to run in a
read or write lock respectively. (Robert Collins)
* Branch.open_containing now returns a tuple (Branch, relative-path),
which allows direct access to the common case of 'get me this file
from its branch'. (Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20051017233206-cbd6059e27bd4e39
parent: robertc at robertcollins.net-20051017231300-e1c9e931bcfacd6a
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-18 09:32:06 +1000
message:
Branch.remove has been moved to WorkingTree.
Part of this is providing WorkingTree with locking primitives,
to allow the use of the needs_write_lock decorator.
(Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20051017231300-e1c9e931bcfacd6a
parent: robertc at robertcollins.net-20051017223139-63e850d7069466d6
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-18 09:13:00 +1000
message:
Branch.open_containing now returns a tuple (Branch, relative-path).
This allows direct access to the common case of 'get me this file
from its branch'. (Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20051017223139-63e850d7069466d6
parent: robertc at robertcollins.net-20051017215732-08f487800e726748
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-18 08:31:39 +1000
message:
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
Two decorators, needs_read_lock and needs_write_lock have been added
to the branch module. Use these to cause a function to run in a
read or write lock respectively.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051017215732-08f487800e726748
parent: robertc at robertcollins.net-20051017212018-5e2a78c67f36a026
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-18 07:57:32 +1000
message:
Allow creation of testaments from uncommitted data, and use that to get signatures before committing revisions.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051017212018-5e2a78c67f36a026
parent: robertc at lifelesslap.robertcollins.net-20051017113105-76c3855778da1baa
parent: robertc at robertcollins.net-20051017203812-7f01cc90974d01ca
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-18 07:20:18 +1000
message:
merge from integration
------------------------------------------------------------
merged: robertc at robertcollins.net-20051017203812-7f01cc90974d01ca
parent: robertc at robertcollins.net-20051017115654-662239e1587524a8
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-18 06:38:12 +1000
message:
Typo in config.py (Thanks Fabbione)
------------------------------------------------------------
merged: robertc at robertcollins.net-20051017115654-662239e1587524a8
parent: robertc at robertcollins.net-20051017114107-f5586285d825c105
parent: mbp at sourcefrog.net-20051017065711-1c65e58938222fdd
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-10-17 21:56:54 +1000
message:
merge from martin.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051017065711-1c65e58938222fdd
parent: mbp at sourcefrog.net-20051017062803-317b7d176b212e64
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-17 16:57:11 +1000
message:
- store revprops in testaments
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051017062803-317b7d176b212e64
parent: mbp at sourcefrog.net-20051017051820-092df2c2ec42a426
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-17 16:28:03 +1000
message:
- run all selftests by default
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051017051820-092df2c2ec42a426
parent: mbp at sourcefrog.net-20051017045742-1dbebef480c5ac5d
parent: abentley at lappy-20051016235625-f2e4f5d4ff1e889c
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-17 15:18:20 +1000
message:
[merge] from aaron
------------------------------------------------------------
merged: abentley at lappy-20051016235625-f2e4f5d4ff1e889c
parent: abentley at lappy-20051016234726-c7699fd0b77457d2
committer: abentley <abentley at lappy>
timestamp: Sun 2005-10-16 19:56:25 -0400
message:
Cleanups for pull
------------------------------------------------------------
merged: abentley at lappy-20051016234726-c7699fd0b77457d2
parent: abentley at lappy-20051016051558-502eb6c3601ceb90
committer: abentley <abentley at lappy>
timestamp: Sun 2005-10-16 19:47:26 -0400
message:
Restored branch convergence to bzr pull
------------------------------------------------------------
merged: abentley at lappy-20051016051558-502eb6c3601ceb90
parent: abentley at lappy-20051015010702-0b7a58668e447397
parent: robertc at lifelesslap.robertcollins.net-20051016002327-3181e7214d4e132f
committer: abentley <abentley at lappy>
timestamp: Sun 2005-10-16 01:15:58 -0400
message:
Merged Robert's latest
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016002327-3181e7214d4e132f
parent: robertc at lifelesslap.robertcollins.net-20051015114321-538f440683c51672
parent: robertc at lifelesslap.robertcollins.net-20051016002217-aa38f9c1eb13ee48
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sun 2005-10-16 10:23:27 +1000
message:
make plugins able to use other plugins in normal python style
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016002217-aa38f9c1eb13ee48
parent: robertc at lifelesslap.robertcollins.net-20051015232744-be395943ade852d4
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sun 2005-10-16 10:22:17 +1000
message:
Plugins are now loaded under bzrlib.plugins, not bzrlib.plugin.
Plugins are also made available for other plugins to use by making them
accessible via import bzrlib.plugins.NAME. You should not import other
plugins during the __init__ of your plugin though, as no ordering is
guaranteed, and the plugins directory is not on the python path.
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051015232744-be395943ade852d4
parent: robertc at lifelesslap.robertcollins.net-20051015091908-983318b7ee4b824c
parent: robertc at lifelesslap.robertcollins.net-20051015114321-538f440683c51672
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sun 2005-10-16 09:27:44 +1000
message:
merge from integration
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051015114321-538f440683c51672
parent: robertc at lifelesslap.robertcollins.net-20051015113829-40226233fb246920
parent: robertc at lifelesslap.robertcollins.net-20051015091908-983318b7ee4b824c
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sat 2005-10-15 21:43:21 +1000
message:
merge in branches.conf support
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051015091908-983318b7ee4b824c
parent: robertc at lifelesslap.robertcollins.net-20051015003203-38a52da69f847663
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sat 2005-10-15 19:19:08 +1000
message:
create signature_needed() call for commit to trigger creating signatures
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051015003203-38a52da69f847663
parent: robertc at lifelesslap.robertcollins.net-20051014053601-3d7ae175e179ad85
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sat 2005-10-15 10:32:03 +1000
message:
add some documentation on options
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051014053601-3d7ae175e179ad85
parent: robertc at lifelesslap.robertcollins.net-20051014052405-9ad674cebb0017cb
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Fri 2005-10-14 15:36:01 +1000
message:
BranchConfigs inherit signature_checking policy from their LocationConfig.
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051014052405-9ad674cebb0017cb
parent: robertc at lifelesslap.robertcollins.net-20051014045403-321deeebf084406f
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Fri 2005-10-14 15:24:05 +1000
message:
permit per branch location overriding of signature checking policy
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051014045403-321deeebf084406f
parent: robertc at lifelesslap.robertcollins.net-20051014045030-7d2bf042f48d9133
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Fri 2005-10-14 14:54:03 +1000
message:
allow global overriding of signature policy to force checking, or (pointless but allowed) to set auto checking
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051014045030-7d2bf042f48d9133
parent: robertc at lifelesslap.robertcollins.net-20051014043437-11ff9c436c3c6995
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Fri 2005-10-14 14:50:30 +1000
message:
allow global overriding of signature policy to never check
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051014043437-11ff9c436c3c6995
parent: robertc at lifelesslap.robertcollins.net-20051014042939-d03fe7c79012279c
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Fri 2005-10-14 14:34:37 +1000
message:
make getting the signature checking policy a template method
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051014042939-d03fe7c79012279c
parent: robertc at lifelesslap.robertcollins.net-20051014042529-3459f87cf3dc753f
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Fri 2005-10-14 14:29:39 +1000
message:
Create a default signature checking policy of CHECK_IF_POSSIBLE
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051014042529-3459f87cf3dc753f
parent: robertc at lifelesslap.robertcollins.net-20051014042222-5d1209d88d5bfef5
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Fri 2005-10-14 14:25:29 +1000
message:
branches.conf is now able to override the users email
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051014042222-5d1209d88d5bfef5
parent: robertc at lifelesslap.robertcollins.net-20051014035653-87226a9e512e00f3
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Fri 2005-10-14 14:22:22 +1000
message:
LocationConfig section retrieval falls into my lap
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051014035653-87226a9e512e00f3
parent: robertc at lifelesslap.robertcollins.net-20051014035502-e2b68b86f17c52fc
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Fri 2005-10-14 13:56:53 +1000
message:
LocationConfig lookups for non matching prefixes pass tests
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051014035502-e2b68b86f17c52fc
parent: robertc at lifelesslap.robertcollins.net-20051014035244-72493c820c5bff02
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Fri 2005-10-14 13:55:02 +1000
message:
explicit over glob test passes
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051014035244-72493c820c5bff02
parent: robertc at lifelesslap.robertcollins.net-20051014034915-0475e1670206e54f
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Fri 2005-10-14 13:52:44 +1000
message:
exact section test passes
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051014034915-0475e1670206e54f
parent: robertc at lifelesslap.robertcollins.net-20051014022929-43937d292327f618
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Fri 2005-10-14 13:49:15 +1000
message:
preparing some tests for LocationConfig
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051014022929-43937d292327f618
parent: robertc at lifelesslap.robertcollins.net-20051014015608-2970671a76324ad8
parent: robertc at lifelesslap.robertcollins.net-20051014021736-7230e59066856096
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Fri 2005-10-14 12:29:29 +1000
message:
Merge from upstream
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051014021736-7230e59066856096
parent: robertc at lifelesslap.robertcollins.net-20051014015924-3149bd0ff5e56a90
parent: mbp at sourcefrog.net-20051013070844-02902f3a477cbfbc
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Fri 2005-10-14 12:17:36 +1000
message:
Merge from Martin.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051013070844-02902f3a477cbfbc
parent: mbp at sourcefrog.net-20051013070601-8e1e177942d5614d
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-13 17:08:44 +1000
message:
- ignore .swp files from upload
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051013070601-8e1e177942d5614d
parent: mbp at sourcefrog.net-20051013063322-12ace37b470745e7
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-13 17:06:01 +1000
message:
- move 'conflict' and 'resolved' from shipped plugin to regular builtins
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051013063322-12ace37b470745e7
parent: mbp at sourcefrog.net-20051013043244-6aaab7bb3515f5c0
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-13 16:33:22 +1000
message:
- add a basic annotate built-in command
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051013043244-6aaab7bb3515f5c0
parent: mbp at sourcefrog.net-20051013042642-cf1c73e1d067ecdb
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-13 14:32:44 +1000
message:
- remove dead validate_revision_id function and tests
revision ids are now only constrained by convention
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051013042642-cf1c73e1d067ecdb
parent: mbp at sourcefrog.net-20051013040248-c2d0a027e234df3e
committer: mbp at sourcefrog.net
timestamp: Thu 2005-10-13 14:26:42 +1000
message:
- fix broken config test
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051013040248-c2d0a027e234df3e
parent: mbp at sourcefrog.net-20051013035435-723262fd3a1c2555
parent: robertc at lifelesslap.robertcollins.net-20051012072841-ffbcdc4c5285b374
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-13 14:02:48 +1000
message:
[merge] config file and other things from robert
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051012072841-ffbcdc4c5285b374
parent: robertc at lifelesslap.robertcollins.net-20051012002452-64068f25c8656f66
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Wed 2005-10-12 17:28:41 +1000
message:
revert symlinks correctly
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051012002452-64068f25c8656f66
parent: robertc at lifelesslap.robertcollins.net-20051011225745-5c02a0cfc85b36d1
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Wed 2005-10-12 10:24:52 +1000
message:
Wipe the hashcache after a successful upgrade
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051011225745-5c02a0cfc85b36d1
parent: robertc at lifelesslap.robertcollins.net-20051011083129-fa720bc6cd6c039f
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Wed 2005-10-12 08:57:45 +1000
message:
fixup the verbose-does-nothing for add - add a --quiet instead
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051011083129-fa720bc6cd6c039f
parent: robertc at lifelesslap.robertcollins.net-20051011080640-7fa85c53602e1ae4
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Tue 2005-10-11 18:31:29 +1000
message:
inline and simplify branch.find_branch_root, it should just try to create a branch at each step, which is simpler than probing for a specific dir and has less round trips.
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051011080640-7fa85c53602e1ae4
parent: robertc at robertcollins.net-20051011074240-9516582d48eab66b
parent: robertc at lifelesslap.robertcollins.net-20051011080545-daa592731b2c0a15
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Tue 2005-10-11 18:06:40 +1000
message:
merge in test suite improvements from test-fixes branch
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051011080545-daa592731b2c0a15
parent: robertc at lifelesslap.robertcollins.net-20051011075229-e1a1429e0b59f80f
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Tue 2005-10-11 18:05:45 +1000
message:
make selftest -v show the elapsed time for each test run.
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051011075229-e1a1429e0b59f80f
parent: robertc at lifelesslap.robertcollins.net-20051011074453-19e467438720556e
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Tue 2005-10-11 17:52:29 +1000
message:
nuke --pattern to selftest, replace with regexp.search calls.
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051011074453-19e467438720556e
parent: robertc at robertcollins.net-20051010033111-5a2da5ec20c9ce49
parent: robertc at robertcollins.net-20051011074240-9516582d48eab66b
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Tue 2005-10-11 17:44:53 +1000
message:
merge in latest integration changes
------------------------------------------------------------
merged: robertc at robertcollins.net-20051011074240-9516582d48eab66b
parent: robertc at robertcollins.net-20051011034144-19aca2bd13f66055
parent: robertc at robertcollins.net-20051011072100-16996b55c43ff24f
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-11 17:42:40 +1000
message:
merge in introduction of an ini file in ~/.bazaar/bazaar.conf
------------------------------------------------------------
merged: robertc at robertcollins.net-20051011072100-16996b55c43ff24f
parent: robertc at robertcollins.net-20051011070025-bac6b53cb6186dfd
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-11 17:21:00 +1000
message:
move editor into the config file too
------------------------------------------------------------
merged: robertc at robertcollins.net-20051011070025-bac6b53cb6186dfd
parent: robertc at robertcollins.net-20051011043238-104295a8eb7eba91
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-11 17:00:25 +1000
message:
create a config module - there is enough config logic to make this worthwhile, and start testing config processing.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051011043238-104295a8eb7eba91
parent: robertc at robertcollins.net-20051011034144-19aca2bd13f66055
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-11 14:32:38 +1000
message:
move config_dir into bzrlib.config
------------------------------------------------------------
merged: robertc at robertcollins.net-20051011034144-19aca2bd13f66055
parent: robertc at robertcollins.net-20051011032729-a0ba11dfb9bee3a3
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-11 13:41:44 +1000
message:
only do a local merge during pull if the revision history changed
------------------------------------------------------------
merged: robertc at robertcollins.net-20051011032729-a0ba11dfb9bee3a3
parent: robertc at robertcollins.net-20051011031929-2d523107133c43be
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-11 13:27:29 +1000
message:
tests passing is a good idea - move the branch open in cmd_branch to ensure this, and remove noise from the test suite
------------------------------------------------------------
merged: robertc at robertcollins.net-20051011031929-2d523107133c43be
parent: robertc at robertcollins.net-20051011030850-fef51d00c2eb82bf
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-11 13:19:29 +1000
message:
further tuning of pull, do not do a local merge or fetch at all, if the remote branch is no newer than we are
------------------------------------------------------------
merged: robertc at robertcollins.net-20051011030850-fef51d00c2eb82bf
parent: robertc at robertcollins.net-20051011025247-4b95466bb6509385
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-11 13:08:50 +1000
message:
fix a prior bad merge of cmd_pull, which had resulted in double opens of remote branches
------------------------------------------------------------
merged: robertc at robertcollins.net-20051011025247-4b95466bb6509385
parent: robertc at robertcollins.net-20051010215215-6ff59a09c2f7b6b7
parent: robertc at robertcollins.net-20051011025115-e62a9e17c28e7f34
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-11 12:52:47 +1000
message:
merge in revision-history caching, and tuning of fetch to not retrieve more data than needed when nothing needs to be pulled
------------------------------------------------------------
merged: robertc at robertcollins.net-20051011025115-e62a9e17c28e7f34
parent: robertc at robertcollins.net-20051011024125-4e05fd2ffc83c965
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-11 12:51:15 +1000
message:
do not download remote ancestry.weave if the target revision we are stopping at is in our local store
------------------------------------------------------------
merged: robertc at robertcollins.net-20051011024125-4e05fd2ffc83c965
parent: robertc at robertcollins.net-20051011010823-2f97e5e5aa1e52d3
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-11 12:41:25 +1000
message:
cache revision history during read transactions
------------------------------------------------------------
merged: robertc at robertcollins.net-20051011010823-2f97e5e5aa1e52d3
parent: robertc at robertcollins.net-20051011010524-e258bc8d051cc9d2
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-11 11:08:23 +1000
message:
null identity maps never have objects in them, so someone calling remove_object would be silly - check we do not have a remove_object method
------------------------------------------------------------
merged: robertc at robertcollins.net-20051011010524-e258bc8d051cc9d2
parent: robertc at robertcollins.net-20051010231827-f9e2dda2e92bf565
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-11 11:05:24 +1000
message:
add a cache bound to Transactions, and a precious facility, so that we keep inventory.weave in memory, but can discard weaves for other such files.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051010231827-f9e2dda2e92bf565
parent: robertc at robertcollins.net-20051007061313-9a835e979434e721
parent: robertc at robertcollins.net-20051010215215-6ff59a09c2f7b6b7
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-11 09:18:27 +1000
message:
merge from upstream
------------------------------------------------------------
merged: robertc at robertcollins.net-20051010215215-6ff59a09c2f7b6b7
parent: robertc at robertcollins.net-20051010082942-4d1442a783ba926d
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-11 07:52:15 +1000
message:
lock during fetch, which is a separate code path to the special case of cloning
------------------------------------------------------------
merged: robertc at robertcollins.net-20051010082942-4d1442a783ba926d
parent: robertc at robertcollins.net-20051010082726-b709d6577691ba69
parent: scott at netsplit.com-20051010065708-7ebaebe2717cc0a4
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-10-10 18:29:42 +1000
message:
bugfix from scott for symlink support when not in the tree root.
------------------------------------------------------------
merged: scott at netsplit.com-20051010065708-7ebaebe2717cc0a4
parent: mbp at sourcefrog.net-20051010051240-7f39a1847bab34a3
committer: Scott James Remnant <scott at netsplit.com>
timestamp: Mon 2005-10-10 07:57:08 +0100
message:
Fix WorkingTree.get_symlink_target() to read the absolute path of the
symlink, not the relative; so we can do things outside of the root
directory.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051010051240-7f39a1847bab34a3
parent: mbp at sourcefrog.net-20051010043052-ac2d0768646592e2
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-10 15:12:40 +1000
message:
[patch] show argv and pwd in exceptions (from ddaa)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051010043052-ac2d0768646592e2
parent: mbp at sourcefrog.net-20051010035243-1efe79a3884cfc6d
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-10 14:30:52 +1000
message:
- bump version to 0.1rc2
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051010035243-1efe79a3884cfc6d
parent: mbp at sourcefrog.net-20051010034524-ee060fb2846b52c5
parent: robertc at robertcollins.net-20051010032415-2d3840758bc6e9b8
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-10 13:52:43 +1000
message:
[merge] indented log and x-bit fix from robert
------------------------------------------------------------
merged: robertc at robertcollins.net-20051010032415-2d3840758bc6e9b8
parent: robertc at robertcollins.net-20051010013208-163c23746972763a
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-10-10 13:24:15 +1000
message:
merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051010013208-163c23746972763a
parent: robertc at robertcollins.net-20051010000525-cbfcc0ff413510c5
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-10-10 11:32:08 +1000
message:
branch: namespace
------------------------------------------------------------
merged: robertc at robertcollins.net-20051010000525-cbfcc0ff413510c5
parent: robertc at robertcollins.net-20051009235204-0abf18346c658e34
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-10-10 10:05:25 +1000
message:
BUGFIX: disable symlink support tests when no symlink support is present on the system.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051009235204-0abf18346c658e34
parent: robertc at robertcollins.net-20051009234212-7973344d900afb0b
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-10-10 09:52:04 +1000
message:
touchup the prefixed-store patch
------------------------------------------------------------
merged: robertc at robertcollins.net-20051009234212-7973344d900afb0b
parent: robertc at robertcollins.net-20051009232021-45463f8050057539
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-10-10 09:42:12 +1000
message:
merge in niemeyers prefixed-store patch
------------------------------------------------------------
merged: robertc at robertcollins.net-20051009232021-45463f8050057539
parent: robertc at robertcollins.net-20051009231235-93626e72cac71b78
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-10-10 09:20:21 +1000
message:
report the url location on failed http requests
------------------------------------------------------------
merged: robertc at robertcollins.net-20051009231235-93626e72cac71b78
parent: robertc at robertcollins.net-20051009225939-abab7cf72ffdb97f
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-10-10 09:12:35 +1000
message:
clean up test dirs on make clean
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051010034524-ee060fb2846b52c5
parent: mbp at sourcefrog.net-20051010033519-54139460fb00d0a8
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-10 13:45:24 +1000
message:
- release note limitation of branch eta
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051010033519-54139460fb00d0a8
parent: mbp at sourcefrog.net-20051010015841-40f673d638152fa4
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-10 13:35:19 +1000
message:
- clone should be done with the source branch read-locked
this lets us cache objects in memory and avoids repeatedly
reading the inventory weave
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051010015841-40f673d638152fa4
parent: mbp at sourcefrog.net-20051010015818-d27ec760b0fd9585
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-10 11:58:41 +1000
message:
- exclude test tmp directories from rsync
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051010015818-d27ec760b0fd9585
parent: mbp at sourcefrog.net-20051010014815-7c61308062e7ec35
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-10 11:58:18 +1000
message:
- exclude build directory from rsync
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051010014815-7c61308062e7ec35
parent: mbp at sourcefrog.net-20051010010221-6d19cae36bc09858
parent: robertc at robertcollins.net-20051010000525-cbfcc0ff413510c5
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-10 11:48:15 +1000
message:
[merge] from robert and newformat
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051010010221-6d19cae36bc09858
parent: robertc at robertcollins.net-20051006130814-90d99eeecdb3218f
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-10 11:02:21 +1000
message:
- make bzr executable
------------------------------------------------------------
merged: robertc at robertcollins.net-20051010082726-b709d6577691ba69
parent: robertc at robertcollins.net-20051010034229-f73abf6311a88366
parent: mbp at sourcefrog.net-20051010051240-7f39a1847bab34a3
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-10-10 18:27:26 +1000
message:
merge from upstream
------------------------------------------------------------
merged: robertc at robertcollins.net-20051010034229-f73abf6311a88366
parent: robertc at robertcollins.net-20051010032415-2d3840758bc6e9b8
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-10-10 13:42:29 +1000
message:
merge Gustavos executable2 patch
------------------------------------------------------------
merged: robertc at robertcollins.net-20051010033111-5a2da5ec20c9ce49
parent: robertc at robertcollins.net-20051010015111-ef1c70ea56255500
parent: robertc at robertcollins.net-20051010032415-2d3840758bc6e9b8
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-10-10 13:31:11 +1000
message:
merge from latest integration
------------------------------------------------------------
merged: robertc at robertcollins.net-20051010015111-ef1c70ea56255500
parent: robertc at robertcollins.net-20051008004913-542d2cc46704c6e2
parent: robertc at robertcollins.net-20051010013208-163c23746972763a
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-10-10 11:51:11 +1000
message:
merge from newformat
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051013035435-723262fd3a1c2555
parent: mbp at sourcefrog.net-20051013035428-c8a119cf3ca99cc1
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-13 13:54:35 +1000
message:
- note new manifest stuff
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051013035428-c8a119cf3ca99cc1
parent: mbp at sourcefrog.net-20051013034645-f295273cb9cb0f3b
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-13 13:54:28 +1000
message:
- increment version
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051013034645-f295273cb9cb0f3b
parent: mbp at sourcefrog.net-20051013032322-dc469f4b81f8e7f9
parent: mbp at sourcefrog.net-20051012111523-db2c963f04b94d7f
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-13 13:46:45 +1000
message:
[merge] fixes from 0.1 series
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051012111523-db2c963f04b94d7f
parent: mbp at sourcefrog.net-20051012111506-0e800db53a9f6990
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-10-12 21:15:23 +1000
message:
- set version to 0.1.1
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051012111506-0e800db53a9f6990
parent: mbp at sourcefrog.net-20051012110935-e0e9f7ac55cdc58c
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-10-12 21:15:06 +1000
message:
- note cherrypicked changes
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051012110935-e0e9f7ac55cdc58c
parent: mbp at sourcefrog.net-20051012110125-95ad588eb43670c8
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-10-12 21:09:35 +1000
message:
[pick] larger read lock scope for branch command
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051012110125-95ad588eb43670c8
parent: mbp at sourcefrog.net-20051012104457-a186917c83a2afc7
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-10-12 21:01:25 +1000
message:
[pick] avoid problems in fetching when .bzr is not listable
don't try to read the directory; tty to read things inside it
robertc at robertcollins.net-20051011034144-19aca2bd13f66055
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051012104457-a186917c83a2afc7
parent: mbp at sourcefrog.net-20051011041347-7f245e0de620592a
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-10-12 20:44:57 +1000
message:
[pick] clear hashcache in format upgrade to avoid worrisome warning
robertc at lifelesslap.robertcollins.net-20051012002452-64068f25c8656f66
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051011041347-7f245e0de620592a
parent: mbp at sourcefrog.net-20051011041314-fa913d44f267914f
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-10-11 14:13:47 +1000
message:
- prepare 0.1 release
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051011041314-fa913d44f267914f
parent: mbp at sourcefrog.net-20051011040325-8f5b4a6089dc5a53
parent: robertc at robertcollins.net-20051011034144-19aca2bd13f66055
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-10-11 14:13:14 +1000
message:
[merge] speedups from robertc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051011040325-8f5b4a6089dc5a53
parent: mbp at sourcefrog.net-20051011025014-ad8960cbd2284b13
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-10-11 14:03:25 +1000
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051011025014-ad8960cbd2284b13
parent: mbp at sourcefrog.net-20051011010959-d5ef67e398c3c3e9
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-10-11 12:50:14 +1000
message:
- bump version number
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051011010959-d5ef67e398c3c3e9
parent: mbp at sourcefrog.net-20051011005926-fe161da282b9d928
parent: robertc at robertcollins.net-20051010215215-6ff59a09c2f7b6b7
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-10-11 11:09:59 +1000
message:
[merge] from robert
- fix handling of symlinks in tree
- improved executable bits
- cache pull over http and test for this
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051011005926-fe161da282b9d928
parent: mbp at sourcefrog.net-20051011003616-836a196f510dc4fb
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-10-11 10:59:26 +1000
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051011003616-836a196f510dc4fb
parent: mbp at sourcefrog.net-20051010091526-f3fa48b91d400b38
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-10-11 10:36:16 +1000
message:
- doc and todo for ignore command
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051010091526-f3fa48b91d400b38
parent: mbp at sourcefrog.net-20051010062137-13ee5dccaa2d7dd0
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-10 19:15:26 +1000
message:
- remove all TODOs from bzr help messages
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051010062137-13ee5dccaa2d7dd0
parent: mbp at sourcefrog.net-20051010061731-03c4eef824fb14de
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-10 16:21:37 +1000
message:
- try to get better reporting of http errors
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051010061731-03c4eef824fb14de
parent: mbp at sourcefrog.net-20051010051240-7f39a1847bab34a3
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-10 16:17:31 +1000
message:
- update annotate for new branch api
- show date for annotations that don't have a revno
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051013032322-dc469f4b81f8e7f9
parent: mbp at sourcefrog.net-20051013030057-5b0e4e07c2b207f0
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-13 13:23:22 +1000
message:
- testament symlink support
- more testament tests
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051013030057-5b0e4e07c2b207f0
parent: mbp at sourcefrog.net-20051013023614-82c5be87698b733f
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-13 13:00:57 +1000
message:
- add and test 'testament' builtin command
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051013023614-82c5be87698b733f
parent: mbp at sourcefrog.net-20051013023432-6d5db92483151033
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-13 12:36:14 +1000
message:
- clean up imports
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051013023432-6d5db92483151033
parent: mbp at sourcefrog.net-20051013021009-f84e4c2a481ada35
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-13 12:34:32 +1000
message:
- more testament development
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051013021009-f84e4c2a481ada35
parent: mbp at sourcefrog.net-20051013020115-fd8f646d5cb57063
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-13 12:10:09 +1000
message:
- tweak diff shown by assertEqualDiff
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051013020115-fd8f646d5cb57063
parent: mbp at sourcefrog.net-20051013015229-2c065e03ab350787
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-13 12:01:15 +1000
message:
- add short-form of testaments
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051013015229-2c065e03ab350787
parent: mbp at sourcefrog.net-20051013015135-2d7ac3b0beee8392
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-13 11:52:29 +1000
message:
- testament now contains summary of parents and inventory
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051013015135-2d7ac3b0beee8392
parent: mbp at sourcefrog.net-20051013015114-7406226e795663e5
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-13 11:51:35 +1000
message:
- trim imports
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051013015114-7406226e795663e5
parent: mbp at sourcefrog.net-20051013010930-c3657067b1aea5f9
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-13 11:51:14 +1000
message:
- avoid warning about log not being registered during startup
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051013010930-c3657067b1aea5f9
parent: mbp at sourcefrog.net-20051012035952-ad8984b804620b82
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-13 11:09:30 +1000
message:
- add TestCase.assertEqualDiffs helper
much nicer when comparing large values
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051012035952-ad8984b804620b82
parent: mbp at sourcefrog.net-20051012025725-afb71858e262bc1a
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-10-12 13:59:52 +1000
message:
- test text form for testaments
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051012025725-afb71858e262bc1a
parent: mbp at sourcefrog.net-20051011232240-931f45831d5a9a79
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-10-12 12:57:25 +1000
message:
- make TestCase._get_log work even if setup was aborted
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051011232240-931f45831d5a9a79
parent: mbp at sourcefrog.net-20051011101208-a383c8bf885bd3bc
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-10-12 09:22:40 +1000
message:
todo
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051011101208-a383c8bf885bd3bc
parent: mbp at sourcefrog.net-20051011100130-7081e39611f003b7
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-10-11 20:12:08 +1000
message:
- basic testament class
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051011100130-7081e39611f003b7
parent: mbp at sourcefrog.net-20051011041347-7f245e0de620592a
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-10-11 20:01:30 +1000
message:
todo
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051014015924-3149bd0ff5e56a90
parent: robertc at lifelesslap.robertcollins.net-20051013034337-595921e7d73b9ba6
parent: robertc at lifelesslap.robertcollins.net-20051014015608-2970671a76324ad8
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Fri 2005-10-14 11:59:24 +1000
message:
merge current config support - classes split out
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051014015608-2970671a76324ad8
parent: robertc at lifelesslap.robertcollins.net-20051014014652-d4583fc4d0df1357
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Fri 2005-10-14 11:56:08 +1000
message:
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051014014652-d4583fc4d0df1357
parent: robertc at lifelesslap.robertcollins.net-20051013073014-cdfd16f95c395b6b
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Fri 2005-10-14 11:46:52 +1000
message:
Give branch.base a docstring.
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051013073014-cdfd16f95c395b6b
parent: robertc at robertcollins.net-20051011072100-16996b55c43ff24f
parent: robertc at lifelesslap.robertcollins.net-20051013034337-595921e7d73b9ba6
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Thu 2005-10-13 17:30:14 +1000
message:
merge from integration
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051013034337-595921e7d73b9ba6
parent: robertc at lifelesslap.robertcollins.net-20051013014405-1f230a49790d25fb
parent: mbp at sourcefrog.net-20051011041347-7f245e0de620592a
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Thu 2005-10-13 13:43:37 +1000
message:
merge from martin
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051013014405-1f230a49790d25fb
parent: robertc at lifelesslap.robertcollins.net-20051013014344-f9acea80dda9bd43
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Thu 2005-10-13 11:44:05 +1000
message:
make MergeTree clearer
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051013014344-f9acea80dda9bd43
parent: robertc at lifelesslap.robertcollins.net-20051013012922-b0249adeccecc4ed
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Thu 2005-10-13 11:43:44 +1000
message:
hah, missed tests in check changes
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051013012922-b0249adeccecc4ed
parent: robertc at lifelesslap.robertcollins.net-20051012072841-ffbcdc4c5285b374
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Thu 2005-10-13 11:29:22 +1000
message:
teach check about ghosts
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051015113829-40226233fb246920
parent: robertc at lifelesslap.robertcollins.net-20051014021736-7230e59066856096
parent: mbp at sourcefrog.net-20051014043241-381a202478a6f17b
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sat 2005-10-15 21:38:29 +1000
message:
merge from martin
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051014043241-381a202478a6f17b
parent: mbp at sourcefrog.net-20051014042655-748587d8961affc4
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-10-14 14:32:41 +1000
message:
todo
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051014042655-748587d8961affc4
parent: mbp at sourcefrog.net-20051014042313-f782402c7a277101
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-10-14 14:26:55 +1000
message:
- constraints on revprops
- tests for this
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051014042313-f782402c7a277101
parent: mbp at sourcefrog.net-20051014033326-83209fe60369b5ca
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-10-14 14:23:13 +1000
message:
- move contains_whitespace and contains_linebreaks to osutils
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051014033326-83209fe60369b5ca
parent: mbp at sourcefrog.net-20051014032025-8e4ecdbe6ed55e5d
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-10-14 13:33:26 +1000
message:
- properties are retrieved when revisions are loaded
- test for this
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051014032025-8e4ecdbe6ed55e5d
parent: mbp at sourcefrog.net-20051013073057-05ad152a07fc4278
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-10-14 13:20:25 +1000
message:
- store revision properties in revision xml
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051013073057-05ad152a07fc4278
parent: mbp at sourcefrog.net-20051013070844-02902f3a477cbfbc
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-13 17:30:57 +1000
message:
- stub for revision properties
------------------------------------------------------------
merged: abentley at lappy-20051015010702-0b7a58668e447397
parent: abentley at lappy-20051014052143-2368d04b9caaab2b
parent: mbp at sourcefrog.net-20051014043241-381a202478a6f17b
committer: abentley <abentley at lappy>
timestamp: Fri 2005-10-14 21:07:02 -0400
message:
Merge from Martin
------------------------------------------------------------
merged: abentley at lappy-20051014052143-2368d04b9caaab2b
parent: abentley at lappy-20051014045326-97313b563161422e
committer: abentley <abentley at lappy>
timestamp: Fri 2005-10-14 01:21:43 -0400
message:
Got rid of MergeAdapterTree
------------------------------------------------------------
merged: abentley at lappy-20051014045326-97313b563161422e
parent: abentley at lappy-20051014043224-347635f0e1fbc673
committer: abentley <abentley at lappy>
timestamp: Fri 2005-10-14 00:53:26 -0400
message:
Got even closer to standard Tree interface
------------------------------------------------------------
merged: abentley at lappy-20051014043224-347635f0e1fbc673
parent: abentley at lappy-20051014035050-d779472ccb599a51
committer: abentley <abentley at lappy>
timestamp: Fri 2005-10-14 00:32:24 -0400
message:
Propogated has_or_had_id to Tree
------------------------------------------------------------
merged: abentley at lappy-20051014035050-d779472ccb599a51
parent: abentley at lappy-20051014023846-276686141002cfa1
committer: abentley <abentley at lappy>
timestamp: Thu 2005-10-13 23:50:50 -0400
message:
semi-broke merge
------------------------------------------------------------
merged: abentley at lappy-20051014023846-276686141002cfa1
parent: abentley at lappy-20051014023455-a86628f6fdc2e6d1
committer: abentley <abentley at lappy>
timestamp: Thu 2005-10-13 22:38:46 -0400
message:
remove method definition
------------------------------------------------------------
merged: abentley at lappy-20051014023455-a86628f6fdc2e6d1
parent: abentley at lappy-20051014015307-8b917f78d9f61b99
committer: abentley <abentley at lappy>
timestamp: Thu 2005-10-13 22:34:55 -0400
message:
Removed all remaining use of readonly_path
------------------------------------------------------------
merged: abentley at lappy-20051014015307-8b917f78d9f61b99
parent: abentley at troll-20051013225139-e96a8ebd8f4b54da
committer: abentley <abentley at lappy>
timestamp: Thu 2005-10-13 21:53:07 -0400
message:
Avoided readonly_path in ApplyDiff3
------------------------------------------------------------
merged: abentley at troll-20051013225139-e96a8ebd8f4b54da
parent: abentley at troll-20051013215818-0900f030e3923901
committer: Aaron Bentley <abentley at troll>
timestamp: Thu 2005-10-13 18:51:39 -0400
message:
Added symlink three-way tests
------------------------------------------------------------
merged: abentley at troll-20051013215818-0900f030e3923901
parent: abentley at troll-20051013212909-cfde7d2d05ccd47e
parent: robertc at lifelesslap.robertcollins.net-20051012002452-64068f25c8656f66
committer: Aaron Bentley <abentley at troll>
timestamp: Thu 2005-10-13 17:58:18 -0400
message:
Fixed symlink reverting
------------------------------------------------------------
merged: abentley at troll-20051013212909-cfde7d2d05ccd47e
parent: abentley at panoramicfeedback.com-20051013211011-7aeccd5c452e31ee
parent: robertc at lifelesslap.robertcollins.net-20051013014405-1f230a49790d25fb
committer: Aaron Bentley <abentley at troll>
timestamp: Thu 2005-10-13 17:29:09 -0400
message:
Merged latest from robert collins
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051013211011-7aeccd5c452e31ee
parent: abentley at panoramicfeedback.com-20051013184118-37b9bf4a111d4550
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Thu 2005-10-13 17:10:11 -0400
message:
Replaced FileCreate with TreeFileCreate, fixed revert with empty parents
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051013184118-37b9bf4a111d4550
parent: abentley at panoramicfeedback.com-20051013173952-224b00aa1f32b7fe
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Thu 2005-10-13 14:41:18 -0400
message:
Moved all fooCreate into get_contents
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051013173952-224b00aa1f32b7fe
parent: abentley at panoramicfeedback.com-20051013170320-731d9d3efaeb81d6
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Thu 2005-10-13 13:39:52 -0400
message:
Removed readonly_path from changeset generation
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051013170320-731d9d3efaeb81d6
parent: abentley at panoramicfeedback.com-20051013161650-c44c58f105d9f7cb
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Thu 2005-10-13 13:03:20 -0400
message:
Removed use of readonly path for executability test
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051013161650-c44c58f105d9f7cb
parent: abentley at panoramicfeedback.com-20051013152350-2b1ad39d05212ae3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Thu 2005-10-13 12:16:50 -0400
message:
Use line log for pending merges
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051013152350-2b1ad39d05212ae3
parent: abentley at panoramicfeedback.com-20051013152150-454a9cc25007f24d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Thu 2005-10-13 11:23:50 -0400
message:
Avoid gathering merge info if log formatter can't display it.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051013152150-454a9cc25007f24d
parent: abentley at panoramicfeedback.com-20051013152112-8744970e04966460
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Thu 2005-10-13 11:21:50 -0400
message:
Added one-line log format
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051013152112-8744970e04966460
parent: aaron.bentley at utoronto.ca-20051011054954-e31fd972bd88f2a5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Thu 2005-10-13 11:21:12 -0400
message:
Made format_date more flexible
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051011054954-e31fd972bd88f2a5
parent: aaron.bentley at utoronto.ca-20051011054752-1b29fbebcdf43693
committer: aaron.bentley at utoronto.ca
timestamp: Tue 2005-10-11 01:49:54 -0400
message:
Removed unused Branch.common_ancestor function
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051011054752-1b29fbebcdf43693
parent: aaron.bentley at utoronto.ca-20051011053602-aa069cc6a96764cf
committer: aaron.bentley at utoronto.ca
timestamp: Tue 2005-10-11 01:47:52 -0400
message:
Moved fixme to more appropriate place
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051011053602-aa069cc6a96764cf
parent: aaron.bentley at utoronto.ca-20051011052036-23ff7bae64a29826
committer: aaron.bentley at utoronto.ca
timestamp: Tue 2005-10-11 01:36:02 -0400
message:
Cleaned up Fetcher._find_last_revision
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051011052036-23ff7bae64a29826
parent: aaron.bentley at utoronto.ca-20051010041348-3049184277dce841
parent: robertc at robertcollins.net-20051011034144-19aca2bd13f66055
committer: aaron.bentley at utoronto.ca
timestamp: Tue 2005-10-11 01:20:36 -0400
message:
latest from robert collins
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051010041348-3049184277dce841
parent: aaron.bentley at utoronto.ca-20051008064121-364ef62ae059cf5c
committer: aaron.bentley at utoronto.ca
timestamp: Mon 2005-10-10 00:13:48 -0400
message:
Restored old tests
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051017045742-1dbebef480c5ac5d
parent: mbp at sourcefrog.net-20051017041640-5c3119b097480367
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-17 14:57:42 +1000
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051017041640-5c3119b097480367
parent: mbp at sourcefrog.net-20051017040433-79379c10856d7b83
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-17 14:16:40 +1000
message:
- more option help
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051017040433-79379c10856d7b83
parent: mbp at sourcefrog.net-20051017024647-17ecb7c7608a8332
parent: robertc at lifelesslap.robertcollins.net-20051016223310-c4798eb9deb09a7c
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-17 14:04:33 +1000
message:
[merge] from robert
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016223310-c4798eb9deb09a7c
parent: robertc at lifelesslap.robertcollins.net-20051016002327-3181e7214d4e132f
parent: robertc at lifelesslap.robertcollins.net-20051016223125-26d4401cb94b7b82
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Mon 2005-10-17 08:33:10 +1000
message:
Merge start of removal of WorkingTree concepts from Branch.
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016223125-26d4401cb94b7b82
parent: robertc at lifelesslap.robertcollins.net-20051016220909-3e008de51bb9ef9c
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Mon 2005-10-17 08:31:25 +1000
message:
Branch.relpath has been moved to WorkingTree.relpath.
WorkingTree no no longer takes an inventory, rather it takes an optional branch
parameter, and if None is given will open the branch at basedir implicitly.
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016220909-3e008de51bb9ef9c
parent: robertc at lifelesslap.robertcollins.net-20051016220454-0418f1911d37b342
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Mon 2005-10-17 08:09:09 +1000
message:
make Branch.relpath delegate to the working tree.
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016220454-0418f1911d37b342
parent: robertc at lifelesslap.robertcollins.net-20051016215155-e6431a4a5f1d1fb8
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Mon 2005-10-17 08:04:54 +1000
message:
move branch._relpath into osutils as relpath
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016215155-e6431a4a5f1d1fb8
parent: robertc at lifelesslap.robertcollins.net-20051016002327-3181e7214d4e132f
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Mon 2005-10-17 07:51:55 +1000
message:
rather than getting the branch inventory, WorkingTree can use the whole Branch, or make its own.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051017024647-17ecb7c7608a8332
parent: mbp at sourcefrog.net-20051017024220-bd72837ef19ad42f
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-17 12:46:47 +1000
message:
- annotate improvements from Goffreddo, with extra bug fixes and tests
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051017024220-bd72837ef19ad42f
parent: mbp at sourcefrog.net-20051017014625-f7f58af5edf05eee
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-17 12:42:20 +1000
message:
- add extract_email_address
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051017014625-f7f58af5edf05eee
parent: mbp at sourcefrog.net-20051014103707-4a95ccec6436e995
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-17 11:46:25 +1000
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051014103707-4a95ccec6436e995
parent: mbp at sourcefrog.net-20051014094249-3d24c68f322d6bff
committer: mbp at sourcefrog.net
timestamp: Fri 2005-10-14 20:37:07 +1000
message:
[patch] better zsh completion
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051014094249-3d24c68f322d6bff
parent: mbp at sourcefrog.net-20051014093721-a78913d0bd418688
committer: mbp at sourcefrog.net
timestamp: Fri 2005-10-14 19:42:49 +1000
message:
- more refactoring and tests of commandline
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051014093721-a78913d0bd418688
parent: mbp at sourcefrog.net-20051014084555-437e7a0cc242b41d
committer: mbp at sourcefrog.net
timestamp: Fri 2005-10-14 19:37:21 +1000
message:
- more refactoring of and tests for option parsing
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051014084555-437e7a0cc242b41d
parent: mbp at sourcefrog.net-20051014084100-0f385943cf422f3f
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-10-14 18:45:55 +1000
message:
- help for global options
- test for this
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051014084100-0f385943cf422f3f
parent: mbp at sourcefrog.net-20051014083715-acc6a0c53bdb2e3e
committer: mbp at sourcefrog.net
timestamp: Fri 2005-10-14 18:41:00 +1000
message:
- add help strings to some options
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051014083715-acc6a0c53bdb2e3e
parent: mbp at sourcefrog.net-20051014083656-8b02bda5873ad72a
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-10-14 18:37:15 +1000
message:
- refactor handling of short option names
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051014083656-8b02bda5873ad72a
parent: mbp at sourcefrog.net-20051014080525-5251fec74e669a07
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-10-14 18:36:56 +1000
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051014080525-5251fec74e669a07
parent: mbp at sourcefrog.net-20051014055328-6fff7b94347a17ca
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-10-14 18:05:25 +1000
message:
- clean up handling of option objects
- add help for commit --file
- test for this
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051014055328-6fff7b94347a17ca
parent: mbp at sourcefrog.net-20051014053449-2ec50e1a47085c46
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-10-14 15:53:28 +1000
message:
- Add assertContainsRe
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051014053449-2ec50e1a47085c46
parent: mbp at sourcefrog.net-20051014043241-381a202478a6f17b
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-10-14 15:34:49 +1000
message:
[patch] define cli options as objects, not strings
patch from Magnus Thering
------------------------------------------------------------
merged: robertc at robertcollins.net-20051017114107-f5586285d825c105
parent: robertc at lifelesslap.robertcollins.net-20051016223310-c4798eb9deb09a7c
parent: robertc at lifelesslap.robertcollins.net-20051017113105-76c3855778da1baa
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-10-17 21:41:07 +1000
message:
Merge in first part of GPG support.
This adds check_signatures config support, triams back the transport api
to be leaner and easier to hook in suffixes - non primary streams in the store
associated with the fileid that primary data is stored in, a gpg module which
will encapsulate all signing and checking operations.
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051017113105-76c3855778da1baa
parent: robertc at lifelesslap.robertcollins.net-20051017105039-87b9e081c41cb906
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Mon 2005-10-17 21:31:05 +1000
message:
gpg sign commits if the policy says we need to
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051017105039-87b9e081c41cb906
parent: robertc at lifelesslap.robertcollins.net-20051017081509-f108fef422640aba
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Mon 2005-10-17 20:50:39 +1000
message:
Add re-sign command to generate a digital signature on a single revision.
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051017081509-f108fef422640aba
parent: robertc at lifelesslap.robertcollins.net-20051017065310-836e3179c48b4f6f
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Mon 2005-10-17 18:15:09 +1000
message:
gpg signing of content
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051017065310-836e3179c48b4f6f
parent: robertc at lifelesslap.robertcollins.net-20051017062223-ef02def7780ccfb7
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Mon 2005-10-17 16:53:10 +1000
message:
check that we get the right command line from the default gpg strategy.
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051017062223-ef02def7780ccfb7
parent: robertc at lifelesslap.robertcollins.net-20051017042717-6f94bc63b0c04a01
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Mon 2005-10-17 16:22:23 +1000
message:
gpg_signing_command configuration item
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051017042717-6f94bc63b0c04a01
parent: robertc at lifelesslap.robertcollins.net-20051017021612-1bc159c29da0e0fe
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Mon 2005-10-17 14:27:17 +1000
message:
move environment preservation up to the root test case, making it available to all tests
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051017021612-1bc159c29da0e0fe
parent: robertc at lifelesslap.robertcollins.net-20051017014024-1c0d392828f918c3
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Mon 2005-10-17 12:16:12 +1000
message:
Teach store.copy_all about fileid suffixes
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051017014024-1c0d392828f918c3
parent: robertc at lifelesslap.robertcollins.net-20051017005441-57c0f0eb7972158e
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Mon 2005-10-17 11:40:24 +1000
message:
Unroll the multiple-copy logic enough to remove the duplicate iteration and yet retain the optimised gzip->gzip copy.
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051017005441-57c0f0eb7972158e
parent: robertc at lifelesslap.robertcollins.net-20051017004610-6130019f89a92d04
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Mon 2005-10-17 10:54:41 +1000
message:
Inline Store.add_multi, and remove unused prefetch method on CachedStore
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051017004610-6130019f89a92d04
parent: robertc at lifelesslap.robertcollins.net-20051017001149-fe23a449de1385f7
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Mon 2005-10-17 10:46:10 +1000
message:
teach iter about suffixes
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051017001149-fe23a449de1385f7
parent: robertc at lifelesslap.robertcollins.net-20051017000033-b7385b1772d31605
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Mon 2005-10-17 10:11:49 +1000
message:
test get with suffixes
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051017000033-b7385b1772d31605
parent: robertc at lifelesslap.robertcollins.net-20051016235302-818de607403e1c6e
parent: robertc at lifelesslap.robertcollins.net-20051016223310-c4798eb9deb09a7c
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Mon 2005-10-17 10:00:33 +1000
message:
merge in integration
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016235302-818de607403e1c6e
parent: robertc at lifelesslap.robertcollins.net-20051016235029-bae228a6289c5121
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Mon 2005-10-17 09:53:02 +1000
message:
test that the presence of a signature does not make a missing base file magically appear present
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016235029-bae228a6289c5121
parent: robertc at lifelesslap.robertcollins.net-20051016233906-e8b3ec7eb4898dc6
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Mon 2005-10-17 09:50:29 +1000
message:
test for has with suffixed files
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016233906-e8b3ec7eb4898dc6
parent: robertc at lifelesslap.robertcollins.net-20051016145121-01852573f8c63daa
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Mon 2005-10-17 09:39:06 +1000
message:
test simple has_id
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016145121-01852573f8c63daa
parent: robertc at lifelesslap.robertcollins.net-20051016141924-8dcbb20f1c03756e
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Mon 2005-10-17 00:51:21 +1000
message:
replace __contains__ calls in stores with has_id
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016141924-8dcbb20f1c03756e
parent: robertc at lifelesslap.robertcollins.net-20051016101150-c47ea7aac97aa585
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Mon 2005-10-17 00:19:24 +1000
message:
Many transport related tweaks:
- Remove get_partial as it was not used at all.
- Move store._iter_relpaths into transport as iter_files_recursive.
- Nuke ImmutableMemoryStore, replaced with MemoryTransport.
- Remove all direct use of the stat module from store logic.
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016101150-c47ea7aac97aa585
parent: robertc at lifelesslap.robertcollins.net-20051016093048-9d12448dab8f8b97
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sun 2005-10-16 20:11:50 +1000
message:
add registration of suffixes, in preparation for ensuring iteration is regular
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016093048-9d12448dab8f8b97
parent: robertc at lifelesslap.robertcollins.net-20051016083842-74ce6bd9a3951d1a
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sun 2005-10-16 19:30:48 +1000
message:
rebuild ScratchBranch on top of ScratchTransport
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016083842-74ce6bd9a3951d1a
parent: robertc at lifelesslap.robertcollins.net-20051016083040-de4b6177b8a0531a
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sun 2005-10-16 18:38:42 +1000
message:
move duplicate scratch logic into a scratch transport
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016083040-de4b6177b8a0531a
parent: robertc at lifelesslap.robertcollins.net-20051016082916-dae075fdf18af47e
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sun 2005-10-16 18:30:40 +1000
message:
unify __len__() implementations for TransportStore classes
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016082916-dae075fdf18af47e
parent: robertc at lifelesslap.robertcollins.net-20051016082643-a2300b765aea49b4
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sun 2005-10-16 18:29:16 +1000
message:
unify has() implementations for TransportStore classes
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016082643-a2300b765aea49b4
parent: robertc at lifelesslap.robertcollins.net-20051016082322-b0ee714c30d084e6
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sun 2005-10-16 18:26:43 +1000
message:
unify __contains__ for TransportStore classes
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016082322-b0ee714c30d084e6
parent: robertc at lifelesslap.robertcollins.net-20051016082027-eefe2ec6b7d47a21
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sun 2005-10-16 18:23:22 +1000
message:
pull up total_size into TransportStore
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016082027-eefe2ec6b7d47a21
parent: robertc at lifelesslap.robertcollins.net-20051016081323-8393c2878dc4dc9e
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sun 2005-10-16 18:20:27 +1000
message:
convert get() in TextStore and CompressedTextStore into a template method
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016081323-8393c2878dc4dc9e
parent: robertc at lifelesslap.robertcollins.net-20051016075409-a01b5f59444f4dee
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sun 2005-10-16 18:13:23 +1000
message:
convert all users of __getitem__ into TransportStores to use .get instead
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016075409-a01b5f59444f4dee
parent: robertc at lifelesslap.robertcollins.net-20051016071129-d0cd8a663a42cea0
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sun 2005-10-16 17:54:09 +1000
message:
Remove the Store.get multiple-get interface which was not used, and remove much spurious duplication in teststore.py.
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016071129-d0cd8a663a42cea0
parent: robertc at lifelesslap.robertcollins.net-20051016070617-825ca9863ba0bc91
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sun 2005-10-16 17:11:29 +1000
message:
teach TransportStore.add to accept an optional file suffix, which does not alter the fileid.
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016070617-825ca9863ba0bc91
parent: robertc at lifelesslap.robertcollins.net-20051016070057-e60bb578080f233f
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sun 2005-10-16 17:06:17 +1000
message:
Teach CompressedTextStore._relpath to support file suffixes too.
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016070057-e60bb578080f233f
parent: robertc at lifelesslap.robertcollins.net-20051016065655-28a0e5183996ef32
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sun 2005-10-16 17:00:57 +1000
message:
test that TransportStore.add calls _add appropriately.
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016065655-28a0e5183996ef32
parent: robertc at lifelesslap.robertcollins.net-20051016065321-fa8735f78154f92d
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sun 2005-10-16 16:56:55 +1000
message:
Add stuf has and mkdir to MockTransport to enable testing store adds
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016065321-fa8735f78154f92d
parent: robertc at lifelesslap.robertcollins.net-20051016025253-bee0d4e8715606d4
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sun 2005-10-16 16:53:21 +1000
message:
create an instrumented transport store for testing common logic.
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016025253-bee0d4e8715606d4
parent: robertc at lifelesslap.robertcollins.net-20051016023400-9e6c7a550a478165
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sun 2005-10-16 12:52:53 +1000
message:
pull up core TransportStore.add from TextStore.add and CompressedTextStore.add
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016023400-9e6c7a550a478165
parent: robertc at lifelesslap.robertcollins.net-20051016022511-0bd5ebf69bd26bd2
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sun 2005-10-16 12:34:00 +1000
message:
Check that file suffixes in TransportStore are also valid
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016022511-0bd5ebf69bd26bd2
parent: robertc at lifelesslap.robertcollins.net-20051016015701-a3047f8fc145d6cf
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sun 2005-10-16 12:25:11 +1000
message:
Pull up _relpath with gz suffix for CompressedTextStore into TransportStore
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016015701-a3047f8fc145d6cf
parent: robertc at lifelesslap.robertcollins.net-20051016015159-580cca34cb41e771
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sun 2005-10-16 11:57:01 +1000
message:
Test TransportStore._relpath for simple cases: pull up _prefixed attribute as a result.
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016015159-580cca34cb41e771
parent: robertc at lifelesslap.robertcollins.net-20051016002217-aa38f9c1eb13ee48
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sun 2005-10-16 11:51:59 +1000
message:
Pull up _check_id and _relpath from Text and CompressedText stores into TransportStore
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051018023349-45ebeadb7e105db5
parent: mbp at sourcefrog.net-20051018023111-280509dabbb1a499
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-10-18 12:33:49 +1000
message:
- try to avoid test failure on platforms with ascii-only filesystems
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051018023111-280509dabbb1a499
parent: mbp at sourcefrog.net-20051018021405-f956fbed28cf8a63
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-10-18 12:31:11 +1000
message:
- improved handling of non-ascii branch names and test
patch from Joel Rosdahl
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051018021405-f956fbed28cf8a63
parent: mbp at sourcefrog.net-20051018020830-7c9938e1aad0964a
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-10-18 12:14:05 +1000
message:
- better display of argv and pwd in exceptions
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051018020830-7c9938e1aad0964a
parent: mbp at sourcefrog.net-20051018020148-610087c2a964bf5b
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-10-18 12:08:30 +1000
message:
- http url fixes suggested by Robey Pointer, and tests
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051018020148-610087c2a964bf5b
parent: mbp at sourcefrog.net-20051018011818-f4de53a5d08eeb05
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-10-18 12:01:48 +1000
message:
- assertEqualDiff handles strings without trailing newline
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051018011818-f4de53a5d08eeb05
parent: mbp at sourcefrog.net-20051018011321-453ec15baa6f01c0
committer: mbp at sourcefrog.net
timestamp: Tue 2005-10-18 11:18:18 +1000
message:
- todo
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051018011321-453ec15baa6f01c0
parent: mbp at sourcefrog.net-20051017093946-d28e99e7305deaf7
committer: mbp at sourcefrog.net
timestamp: Tue 2005-10-18 11:13:21 +1000
message:
- new commit --strict option
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051017093946-d28e99e7305deaf7
parent: mbp at sourcefrog.net-20051017093643-07c748d32c6f98ab
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-17 19:39:46 +1000
message:
- more error conversions
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051017093643-07c748d32c6f98ab
parent: mbp at sourcefrog.net-20051017080050-25ad02d43731ecf1
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-17 19:36:43 +1000
message:
- more error conversion
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051017080050-25ad02d43731ecf1
parent: mbp at sourcefrog.net-20051017074802-4b70a1bb4d5c4194
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-17 18:00:50 +1000
message:
- convert NotBranchError to new exception base
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051017074802-4b70a1bb4d5c4194
parent: mbp at sourcefrog.net-20051017070028-fb9229d4fd85af36
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-17 17:48:02 +1000
message:
- start introducing hct error classes
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051017070028-fb9229d4fd85af36
parent: mbp at sourcefrog.net-20051017065711-1c65e58938222fdd
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-17 17:00:28 +1000
message:
- update news of testaments and revprops
------------------------------------------------------------
merged: jelmer at samba.org-20051018181306-96bd114e1f43f112
parent: jelmer at samba.org-20051018173958-64b4a27c64719927
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Tue 2005-10-18 20:13:06 +0200
message:
Properly import exception.
------------------------------------------------------------
merged: jelmer at samba.org-20051018173958-64b4a27c64719927
parent: jelmer at samba.org-20051017234828-c250f2060f104fcc
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Tue 2005-10-18 19:39:58 +0200
message:
Fix typo
------------------------------------------------------------
merged: jelmer at samba.org-20051017234828-c250f2060f104fcc
parent: jelmer at samba.org-20051017233140-9666fb5abe3b5f81
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Tue 2005-10-18 01:48:28 +0200
message:
Remove TODO item that is already implemented.
------------------------------------------------------------
merged: jelmer at samba.org-20051017233140-9666fb5abe3b5f81
parent: jelmer at samba.org-20051017231429-fa6f49e760ed2f22
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Tue 2005-10-18 01:31:40 +0200
message:
Argument 'transport' can not be a string (assert on first line
checks it is an instance of Transport). Removing this comment (there was also
no test for this behaviour)
------------------------------------------------------------
merged: jelmer at samba.org-20051017231429-fa6f49e760ed2f22
parent: jelmer at samba.org-20051017231343-1388004327a41b4a
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Tue 2005-10-18 01:14:29 +0200
message:
Remove executable properties from Makefile (set by bzr itself now)
------------------------------------------------------------
merged: jelmer at samba.org-20051017231343-1388004327a41b4a
parent: jelmer at samba.org-20051017132619-72b6d48f8ec48c49
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Tue 2005-10-18 01:13:43 +0200
message:
Make setup.py executable
------------------------------------------------------------
merged: jelmer at samba.org-20051017132619-72b6d48f8ec48c49
parent: mbp at sourcefrog.net-20051017065711-1c65e58938222fdd
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Mon 2005-10-17 15:26:19 +0200
message:
Fix typo
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024121950-8d8cbc53f5a7da0b
parent: mbp at sourcefrog.net-20051024105058-49bdcfdb34d19bdd
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-24 22:19:50 +1000
message:
todo
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024105058-49bdcfdb34d19bdd
parent: mbp at sourcefrog.net-20051024102201-4a850a2e1c8724d7
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-24 20:50:58 +1000
message:
Update fetch command for new Branch constructors.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024102201-4a850a2e1c8724d7
parent: mbp at sourcefrog.net-20051024100558-678a90e04ba42706
parent: robertc at robertcollins.net-20051024085433-5e48ed93d1546627
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-24 20:22:01 +1000
message:
[merge] improve resign command (robertc)
------------------------------------------------------------
merged: robertc at robertcollins.net-20051024085433-5e48ed93d1546627
parent: robertc at robertcollins.net-20051024085306-a3173edd40c87abd
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-10-24 18:54:33 +1000
message:
touch up plugin.py docstring
------------------------------------------------------------
merged: robertc at robertcollins.net-20051024085306-a3173edd40c87abd
parent: robertc at robertcollins.net-20051024083732-7f99eeec70f2bbb8
parent: mbp at sourcefrog.net-20051024023528-817a47f36cb21963
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-10-24 18:53:06 +1000
message:
merge from martin
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024023528-817a47f36cb21963
parent: mbp at sourcefrog.net-20051024022002-91c6683873cdbb87
parent: robertc at robertcollins.net-20051023151126-c18d3642d09a27ba
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-24 12:35:28 +1000
message:
[merge] robertc
------------------------------------------------------------
merged: robertc at robertcollins.net-20051023151126-c18d3642d09a27ba
parent: robertc at robertcollins.net-20051023140720-aaa80c33984831a3
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-10-24 01:11:26 +1000
message:
'revision.revision_graph can handle having only partial history.
Previously, it would fail for a graph with no revision with no parents.
(Robert Collins).
------------------------------------------------------------
merged: robertc at robertcollins.net-20051023140720-aaa80c33984831a3
parent: robertc at robertcollins.net-20051023135059-99090b3a95ade1eb
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-10-24 00:07:20 +1000
message:
Allow the first revision on revision-history to have parents.
'bzr check' allows the first revision on revision-history to have
parents - something that is expected for cheap checkouts, and occurs
when conversions from baz do not have all history.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051023135059-99090b3a95ade1eb
parent: robertc at robertcollins.net-20051023114619-cec8ca25207b1344
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Sun 2005-10-23 23:50:59 +1000
message:
BUGFIX: fetch was not skipping all missing parents for inventory insertion
------------------------------------------------------------
merged: robertc at robertcollins.net-20051023114619-cec8ca25207b1344
parent: robertc at robertcollins.net-20051022132747-706eed356bb1a11e
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Sun 2005-10-23 21:46:19 +1000
message:
More quoting at the transport layer bugfixes.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051022132747-706eed356bb1a11e
parent: robertc at robertcollins.net-20051021034358-055268a69a324169
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Sat 2005-10-22 23:27:47 +1000
message:
convert versioning tests to use self.run_bzr, making the test suite quieter
------------------------------------------------------------
merged: robertc at robertcollins.net-20051021034358-055268a69a324169
parent: robertc at robertcollins.net-20051020092046-f41cd3e0c9896b98
parent: robertc at robertcollins.net-20051020074848-6dde0abbc59a1238
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-10-21 13:43:58 +1000
message:
merge setting of name during branching
------------------------------------------------------------
merged: robertc at robertcollins.net-20051020074848-6dde0abbc59a1238
parent: robertc at robertcollins.net-20051020055809-70047c9f64e0a0a0
parent: robertc at robertcollins.net-20051020040918-4498d0a87aa37c87
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Thu 2005-10-20 17:48:48 +1000
message:
merge from upstream
------------------------------------------------------------
merged: robertc at robertcollins.net-20051020040918-4498d0a87aa37c87
parent: robertc at robertcollins.net-20051020040812-fecd1bc32aa3478e
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Thu 2005-10-20 14:09:18 +1000
message:
update NEWS for post_commit
------------------------------------------------------------
merged: robertc at robertcollins.net-20051020040812-fecd1bc32aa3478e
parent: robertc at robertcollins.net-20051020030620-3fa3160be265c585
parent: aaron.bentley at utoronto.ca-20051020025755-e03df41c52aa3156
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Thu 2005-10-20 14:08:12 +1000
message:
Merge from Aaron Bentley.
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051020025755-e03df41c52aa3156
parent: aaron.bentley at utoronto.ca-20051020025055-ae7bbc83f64bfd82
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Wed 2005-10-19 22:57:55 -0400
message:
tweaked spacing
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051020025055-ae7bbc83f64bfd82
parent: aaron.bentley at utoronto.ca-20051020024033-6c024ecc0c78f471
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Wed 2005-10-19 22:50:55 -0400
message:
attempted to clarify the three-way merge code
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051020024033-6c024ecc0c78f471
parent: aaron.bentley at utoronto.ca-20051020021004-566dee52da0fcd22
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Wed 2005-10-19 22:40:33 -0400
message:
committed fixes for new file conflict
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051020021004-566dee52da0fcd22
parent: aaron.bentley at utoronto.ca-20051020020343-ae2f546b12a67485
parent: mbp at sourcefrog.net-20051019070401-0536bd80d1282c7f
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Wed 2005-10-19 22:10:04 -0400
message:
Merge martin
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051019070401-0536bd80d1282c7f
parent: mbp at sourcefrog.net-20051019064453-4d0ad1d57ab87aef
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-10-19 17:04:01 +1000
message:
Update news and readme
- better explanation of dependencies
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051019064453-4d0ad1d57ab87aef
parent: mbp at sourcefrog.net-20051019061131-6489a7f68564588e
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-10-19 16:44:53 +1000
message:
Load transports when they're first used.
- cleans up startup code
- plugins can import modules like paramiko that won't be present,
and just fail if they're not loaded
- possibly faster at startup
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051020020343-ae2f546b12a67485
parent: aaron.bentley at utoronto.ca-20051020011258-c5d516d8965056aa
parent: robertc at robertcollins.net-20051019115459-a850274afcf87734
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Wed 2005-10-19 22:03:43 -0400
message:
Merged Robert's latest
------------------------------------------------------------
merged: robertc at robertcollins.net-20051019115459-a850274afcf87734
parent: robertc at robertcollins.net-20051019072540-0ab4d3bd16ff8c94
parent: robertc at robertcollins.net-20051019101157-17438d311e746b4f
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Wed 2005-10-19 21:54:59 +1000
message:
merge from Martin, via newformat, and teach sftp about urlescaped paths
------------------------------------------------------------
merged: robertc at robertcollins.net-20051019101157-17438d311e746b4f
parent: robertc at robertcollins.net-20051018131157-76a9970aa78e927e
parent: mbp at sourcefrog.net-20051019061131-6489a7f68564588e
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Wed 2005-10-19 20:11:57 +1000
message:
merge from upstream
------------------------------------------------------------
merged: robertc at robertcollins.net-20051018131157-76a9970aa78e927e
parent: robertc at robertcollins.net-20051018125307-730e47c1a034cb6f
parent: mbp at sourcefrog.net-20051018063047-13fc3067d2f579a3
parent: A
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-18 23:11:57 +1000
message:
Merged Martin.
------------------------------------------------------------
merged: A
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Tue 2005-10-18 16:34:40 +1000
message:
silly commit
------------------------------------------------------------
merged: robertc at robertcollins.net-20051018125307-730e47c1a034cb6f
parent: robertc at robertcollins.net-20051017233518-6746654be564edde
parent: robertc at robertcollins.net-20051018120755-dff7965f9c6f9ee8
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-18 22:53:07 +1000
message:
Merge in various improvements to pull, testing and configuration.
* 'bzr pull' now accepts '--clobber' which will discard local changes
and make this branch identical to the source branch. (Robert Collins)
* There is a new method for TestCaseInTempDir, assertFileEqual, which
will check that a given content is equal to the content of the named
file. (Robert Collins)
* 'pull' has been factored out of the command as WorkingTree.pull().
A new option to WorkingTree.pull has been added, clobber, which will
ignore diverged history and pull anyway.
(Robert Collins)
* config.Config has a 'get_user_option' call that accepts an option name.
This will be looked up in branches.conf and bazaar.conf as normal.
It is intended that this be used by plugins to support options -
options of built in programs should have specific methods on the config.
(Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20051018120755-dff7965f9c6f9ee8
parent: robertc at robertcollins.net-20051018073853-1206e813d89ba440
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-18 22:07:55 +1000
message:
Add assertFileEqual to TestCaseInTempDir.
There is a new method for TestCaseInTempDir, assertFileEqual, which
will check that a given content is equal to the content of the named
file.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051018073853-1206e813d89ba440
parent: robertc at robertcollins.net-20051018065624-e92ff4e7ab3175bb
parent: A
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-18 17:38:53 +1000
message:
config.Config has a 'get_user_option' call that accepts an option name.
This will be looked up in branches.conf and bazaar.conf as normal.
It is intended that this be used by plugins to support options -
options of built in programs should have specific methods on the config.
(Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20051018065624-e92ff4e7ab3175bb
parent: robertc at robertcollins.net-20051018064217-e810bd94c74a9ad1
parent: A
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-18 16:56:24 +1000
message:
'bzr pull' now accepts '--clobber'.
This will discard local changes and make this branch identical to the source
branch. (Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20051018064217-e810bd94c74a9ad1
parent: robertc at robertcollins.net-20051018052622-653d638c9e26fde4
parent: A
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-18 16:42:17 +1000
message:
Factor out the guts of 'pull' from the command into WorkingTree.pull().
(Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20051018052622-653d638c9e26fde4
parent: robertc at robertcollins.net-20051017233206-cbd6059e27bd4e39
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-18 15:26:22 +1000
message:
fix broken tests
------------------------------------------------------------
merged: robertc at robertcollins.net-20051019072540-0ab4d3bd16ff8c94
parent: robertc at robertcollins.net-20051019063338-45b891502a09911c
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Wed 2005-10-19 17:25:40 +1000
message:
Change Transport.* to work with URL's.
* bzrlib.transport.Transport now accepts *ONLY* url escaped relative paths
to apis like 'put', 'get' and 'has'. This is to provide consistent
behaviour - it operates on url's only. (Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20051019063338-45b891502a09911c
parent: robertc at robertcollins.net-20051019060101-1f62d4fb1a5f59dc
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Wed 2005-10-19 16:33:38 +1000
message:
The HTTP transport would return NoSuchFile inappropriately.
bzrlib.transport.http has been modified so that only 404 urllib errors
are returned as NoSuchFile. Other exceptions will propogate as normal.
This allows debuging of actual errors. (Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20051019060101-1f62d4fb1a5f59dc
parent: robertc at robertcollins.net-20051019045120-88cf0c30850cf736
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Wed 2005-10-19 16:01:01 +1000
message:
WorkingTree.__del__ has been removed.
It was non deterministic and not doing what it was intended
to. See WorkingTree.__init__ for a comment about future directions.
(Robert Collins/Martin Pool)
------------------------------------------------------------
merged: robertc at robertcollins.net-20051019045120-88cf0c30850cf736
parent: robertc at robertcollins.net-20051018234712-45a83974f691c860
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Wed 2005-10-19 14:51:20 +1000
message:
revision may be None in cmd_branch, do not treat as an int.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051018234712-45a83974f691c860
parent: robertc at robertcollins.net-20051018131157-76a9970aa78e927e
parent: A
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Wed 2005-10-19 09:47:12 +1000
message:
Bugfix the new pull --clobber to not generate spurious conflicts.
When --clobber clobbered the history, a bad merge base was used.
Supporting this:
* merge.merge_inner now has tempdir as an optional parameter. (Robert Collins)
* Tree.kind is not recorded at the top level of the hierarchy, as it was
missing on EmptyTree, leading to a bug with merge on EmptyTrees.
(Robert Collins)
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051020011258-c5d516d8965056aa
parent: aaron.bentley at utoronto.ca-20051020004917-6c576ac8d91f46ea
parent: robertc at robertcollins.net-20051019072540-0ab4d3bd16ff8c94
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Wed 2005-10-19 21:12:58 -0400
message:
Merged lifeless
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051020004917-6c576ac8d91f46ea
parent: aaron.bentley at utoronto.ca-20051020000855-35ba5831ddaafee6
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Wed 2005-10-19 20:49:17 -0400
message:
Restored merge-type selection
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051020000855-35ba5831ddaafee6
parent: abentley at panoramicfeedback.com-20051019195211-df4e4a8f8608f8fe
parent: aaron.bentley at utoronto.ca-20051019053950-8e77f1fca82f8865
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Wed 2005-10-19 20:08:55 -0400
message:
Merge my show-base change
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051019053950-8e77f1fca82f8865
parent: abentley at panoramicfeedback.com-20051019053042-8c2e001e21a5a692
parent: aaron.bentley at utoronto.ca-20051019024058-4562b385778ee490
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Wed 2005-10-19 01:39:50 -0400
message:
merged show-base from other branch
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051019024058-4562b385778ee490
parent: abentley at panoramicfeedback.com-20051018190214-384640a1ae232299
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Tue 2005-10-18 22:40:58 -0400
message:
Added --show-base to merge
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051018190214-384640a1ae232299
parent: abentley at panoramicfeedback.com-20051018185256-3724349b6bef67ec
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Tue 2005-10-18 15:02:14 -0400
message:
Allowed second call of _get_parser() to not require a file
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051018185256-3724349b6bef67ec
parent: abentley at panoramicfeedback.com-20051018184827-2cc69376beb1cdf3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Tue 2005-10-18 14:52:56 -0400
message:
Mentioned CO in NEWS
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051018184827-2cc69376beb1cdf3
parent: abentley at panoramicfeedback.com-20051017201755-48ed4650792388ab
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Tue 2005-10-18 14:48:27 -0400
message:
Switched to ConfigObj
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051017201755-48ed4650792388ab
parent: abentley at panoramicfeedback.com-20051017174957-9669ee80955f0adf
parent: mbp at sourcefrog.net-20051017065711-1c65e58938222fdd
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Mon 2005-10-17 16:17:55 -0400
message:
Merged latest from Martin
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051017174957-9669ee80955f0adf
parent: abentley at panoramicfeedback.com-20051017152349-d8a9fdcf75898bd9
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Mon 2005-10-17 13:49:57 -0400
message:
Fixed selftest bug for users with short ids
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051017152349-d8a9fdcf75898bd9
parent: abentley at lappy-20051016235625-f2e4f5d4ff1e889c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Mon 2005-10-17 11:23:49 -0400
message:
Fixed -r brokenness in merge
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051019053042-8c2e001e21a5a692
parent: abentley at panoramicfeedback.com-20051018205309-4ccd131f3ddabd51
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Wed 2005-10-19 01:30:42 -0400
message:
did test wrapping for option text
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051018205309-4ccd131f3ddabd51
parent: abentley at panoramicfeedback.com-20051018201944-42864e79d8e9ad29
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Tue 2005-10-18 16:53:09 -0400
message:
Fixed wrong-long-option errors
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051018201944-42864e79d8e9ad29
parent: abentley at panoramicfeedback.com-20051018194704-47d6827cc1d0d11b
parent: robertc at robertcollins.net-20051018125307-730e47c1a034cb6f
parent: A
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Tue 2005-10-18 16:19:44 -0400
message:
Merged more from Robert
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051018194704-47d6827cc1d0d11b
parent: abentley at panoramicfeedback.com-20051018190214-384640a1ae232299
parent: robertc at robertcollins.net-20051017115654-662239e1587524a8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Tue 2005-10-18 15:47:04 -0400
message:
Merged more config stuff from Robert
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051019195211-df4e4a8f8608f8fe
parent: abentley at panoramicfeedback.com-20051019190125-96dbdbd6c7816f0b
parent: mbp at sourcefrog.net-20051019050312-d5791b27e7926a28
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Wed 2005-10-19 15:52:11 -0400
message:
Merge from mainline
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051019190125-96dbdbd6c7816f0b
parent: abentley at panoramicfeedback.com-20051019190103-7592b0cfc94e4109
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Wed 2005-10-19 15:01:25 -0400
message:
Added command-quieting test
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051019190103-7592b0cfc94e4109
parent: abentley at panoramicfeedback.com-20051019175751-47021813f45f6122
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Wed 2005-10-19 15:01:03 -0400
message:
Included configobj in setup.py
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051019175751-47021813f45f6122
parent: abentley at panoramicfeedback.com-20051019175331-77ee21c8dc29d9ee
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Wed 2005-10-19 13:57:51 -0400
message:
Fixed bzr ancestry find_branch call
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051019175331-77ee21c8dc29d9ee
parent: abentley at panoramicfeedback.com-20051019053042-8c2e001e21a5a692
parent: A
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Wed 2005-10-19 13:53:31 -0400
message:
Prevented display commands from printing broken pipe errors
------------------------------------------------------------
merged: robertc at robertcollins.net-20051020030620-3fa3160be265c585
parent: robertc at robertcollins.net-20051020025244-fa1017d19a0ef618
parent: mbp at sourcefrog.net-20051019070401-0536bd80d1282c7f
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Thu 2005-10-20 13:06:20 +1000
message:
merge from Martin
------------------------------------------------------------
merged: robertc at robertcollins.net-20051020025244-fa1017d19a0ef618
parent: robertc at robertcollins.net-20051020010507-5b7356be0f80930e
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Thu 2005-10-20 12:52:44 +1000
message:
post commit hook, first pass implementation
------------------------------------------------------------
merged: robertc at robertcollins.net-20051020010507-5b7356be0f80930e
parent: robertc at robertcollins.net-20051019115459-a850274afcf87734
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Thu 2005-10-20 11:05:07 +1000
message:
Bugfix to previous url escaping patch - include weave stores
------------------------------------------------------------
merged: robertc at robertcollins.net-20051020055809-70047c9f64e0a0a0
parent: robertc at robertcollins.net-20051018120755-dff7965f9c6f9ee8
parent: A
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Thu 2005-10-20 15:58:09 +1000
message:
'bzr branch' sets the branch-name,
It will now set the branch-name to the last component of the
output directory, if one was supplied.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051020092046-f41cd3e0c9896b98
parent: robertc at robertcollins.net-20051020040918-4498d0a87aa37c87
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Thu 2005-10-20 19:20:46 +1000
message:
Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
'merge_flex' no longer calls conflict_handler.finalize(), instead that
is called by merge_inner. This is so that the conflict count can be
retrieved (and potentially manipulated) before returning to the caller
of merge_inner. Likewise 'merge' now returns the conflict count to the
caller. (Robert Collins)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024022002-91c6683873cdbb87
parent: mbp at sourcefrog.net-20051021053602-d0b789804a0dbdd7
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-24 12:20:02 +1000
message:
Fix http server tests for win32/macos (John)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051021053602-d0b789804a0dbdd7
parent: mbp at sourcefrog.net-20051021051225-4d9cebc5dde11096
committer: mbp at sourcefrog.net
timestamp: Fri 2005-10-21 15:36:02 +1000
message:
Make commit message long enough in test for pending merges
so that we see the elipsis characters.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051021051225-4d9cebc5dde11096
parent: mbp at sourcefrog.net-20051021033318-5a5e313f24684453
committer: mbp at sourcefrog.net
timestamp: Fri 2005-10-21 15:12:25 +1000
message:
- fix line endings in sftp transport
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051021033318-5a5e313f24684453
parent: mbp at sourcefrog.net-20051020053220-98d5bce475edc359
committer: mbp at sourcefrog.net
timestamp: Fri 2005-10-21 13:33:18 +1000
message:
- win32 get_console_size from Alexander
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051020053220-98d5bce475edc359
parent: mbp at sourcefrog.net-20051020040116-3896b2868de9e05e
committer: mbp at sourcefrog.net
timestamp: Thu 2005-10-20 15:32:20 +1000
message:
- rules for using destructors
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051020040116-3896b2868de9e05e
parent: mbp at sourcefrog.net-20051020035533-aeb2314d74708a3d
committer: mbp at sourcefrog.net
timestamp: Thu 2005-10-20 14:01:16 +1000
message:
- fix indents
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051020035533-aeb2314d74708a3d
parent: mbp at sourcefrog.net-20051020034046-c15388d921246708
committer: mbp at sourcefrog.net
timestamp: Thu 2005-10-20 13:55:33 +1000
message:
- notes on testability of plugins
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051020034046-c15388d921246708
parent: mbp at sourcefrog.net-20051020021707-8a59b483bb86fe9c
committer: mbp at sourcefrog.net
timestamp: Thu 2005-10-20 13:40:46 +1000
message:
- give a quieter warning if a plugin can't be loaded
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051020021707-8a59b483bb86fe9c
parent: mbp at sourcefrog.net-20051019070401-0536bd80d1282c7f
parent: robertc at robertcollins.net-20051020010507-5b7356be0f80930e
committer: mbp at sourcefrog.net
timestamp: Thu 2005-10-20 12:17:07 +1000
message:
[merge] robert
------------------------------------------------------------
merged: robertc at robertcollins.net-20051024083732-7f99eeec70f2bbb8
parent: robertc at robertcollins.net-20051023151126-c18d3642d09a27ba
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-10-24 18:37:32 +1000
message:
BUGFIX: re-sign should accept ranges
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024100558-678a90e04ba42706
parent: mbp at sourcefrog.net-20051024091557-81fd166614c71dd0
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-24 20:05:58 +1000
message:
Doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024091557-81fd166614c71dd0
parent: mbp at sourcefrog.net-20051024083738-b0ece45ea3b783b9
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-24 19:15:57 +1000
message:
Unconditionally fetch all new history during merge
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024083738-b0ece45ea3b783b9
parent: mbp at sourcefrog.net-20051024083722-791734e579375c9d
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-24 18:37:38 +1000
message:
More merge/fetch tests
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024083722-791734e579375c9d
parent: mbp at sourcefrog.net-20051024081707-3bb0882c4ff583b1
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-24 18:37:22 +1000
message:
Make weave.py executable as a script
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024081707-3bb0882c4ff583b1
parent: mbp at sourcefrog.net-20051024081252-b0b27a00a68d87a3
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-24 18:17:07 +1000
message:
New test that merge fetches revisions from source
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024081252-b0b27a00a68d87a3
parent: mbp at sourcefrog.net-20051024080750-8c60dd9c8e346198
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-24 18:12:52 +1000
message:
Fix trace message
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024080750-8c60dd9c8e346198
parent: mbp at sourcefrog.net-20051024074547-81a9806a45b2a88b
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-24 18:07:50 +1000
message:
API docs for merge
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024074547-81a9806a45b2a88b
parent: mbp at sourcefrog.net-20051024023528-817a47f36cb21963
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-24 17:45:47 +1000
message:
- add trace to merge
------------------------------------------------------------
merged: michael at ellerman.id.au-20051019054013-518c59352d12019a
parent: michael at ellerman.id.au-20051019053733-fdbf18701d7ab8ea
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Wed 2005-10-19 15:40:13 +1000
message:
Fix doctest failure in Branch
------------------------------------------------------------
merged: michael at ellerman.id.au-20051019053733-fdbf18701d7ab8ea
parent: michael at ellerman.id.au-20051019051845-1d3018be81222b18
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Wed 2005-10-19 15:37:33 +1000
message:
Strict commit was a little .. ah .. too strict, oops :}
branch.unknowns() returns a generator, so we can't do if branch.unknowns(),
it's always True.
if len(list(branch.unknowns())) might look cleanest, but creating the list of
unknowns is not cheap for large numbers of unknown files.
Instead we use a for loop to raise an exception as soon as we get one unknown
back from the generator.
Add more tests to make sure this doesn't break again.
------------------------------------------------------------
merged: michael at ellerman.id.au-20051019051845-1d3018be81222b18
parent: michael at concordia-20051019043528-6cf6dc8fe5e72bb2
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Wed 2005-10-19 15:18:45 +1000
message:
Undo double merge of strict commit
------------------------------------------------------------
merged: michael at concordia-20051019043528-6cf6dc8fe5e72bb2
parent: michael at ellerman.id.au-20051017115918-be3eadbee7ffa6fb
parent: mbp at sourcefrog.net-20051018114741-569e2fada4aa2c1d
committer: Michael Ellerman <michael at concordia>
timestamp: Wed 2005-10-19 14:35:28 +1000
message:
Merge from mainline.
------------------------------------------------------------
merged: michael at ellerman.id.au-20051017115918-be3eadbee7ffa6fb
parent: mbp at sourcefrog.net-20051017065711-1c65e58938222fdd
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Mon 2005-10-17 21:59:18 +1000
message:
Implement strict commits with --strict flag.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051027022612-a259d9eacbe71552
parent: mbp at sourcefrog.net-20051027020153-20bf39a493557b9c
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-27 12:26:12 +1000
message:
Test for 'name in weave'
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051027020153-20bf39a493557b9c
parent: mbp at sourcefrog.net-20051027020125-5e14fcc894afd240
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-27 12:01:53 +1000
message:
Add Weave.__contains__.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051027020125-5e14fcc894afd240
parent: mbp at sourcefrog.net-20051027005309-2a7590d8bc3f9087
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-27 12:01:25 +1000
message:
Fix syntax of serializer_v5.pack_revision_to_string
*_to_string functions should return strings with a trailing newline.
Add tests for this.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051027005309-2a7590d8bc3f9087
parent: mbp at sourcefrog.net-20051027000207-deb15558011913b1
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-27 10:53:09 +1000
message:
[patch] Close test log file before deleting, needed on Windows
(Alexander Belchenko)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051027000207-deb15558011913b1
parent: mbp at sourcefrog.net-20051026234727-6b85ff2120f62cf0
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-27 10:02:07 +1000
message:
Sort and clean up list of default ignores
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051026234727-6b85ff2120f62cf0
parent: mbp at sourcefrog.net-20051026234028-db434f9bc9e84fbf
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-27 09:47:27 +1000
message:
Show exception class in error messages
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051026234028-db434f9bc9e84fbf
parent: mbp at sourcefrog.net-20051026064515-b13cf1f96bf814dc
parent: abentley at panoramicfeedback.com-20051026160834-23cda6ed223ded07
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-27 09:40:28 +1000
message:
[merge] aaron
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051026160834-23cda6ed223ded07
parent: abentley at panoramicfeedback.com-20051026135750-1076ead7e75afac2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Wed 2005-10-26 12:08:34 -0400
message:
Substituted branch_files for equivalent code
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051026135750-1076ead7e75afac2
parent: abentley at panoramicfeedback.com-20051026131719-17ef96584de39262
parent: mbp at sourcefrog.net-20051026062015-ab8c2e8913b19989
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Wed 2005-10-26 09:57:50 -0400
message:
Merged Martin's latest
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051026131719-17ef96584de39262
parent: abentley at panoramicfeedback.com-20051025231834-78f6025f59a16c8b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Wed 2005-10-26 09:17:19 -0400
message:
Fixed add_suffix when renaming tree version to foo.THIS
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051025231834-78f6025f59a16c8b
parent: abentley at panoramicfeedback.com-20051025230939-c96bc00f6cf969c5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Tue 2005-10-25 19:18:34 -0400
message:
Updated NEWS
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051025230939-c96bc00f6cf969c5
parent: abentley at panoramicfeedback.com-20051025222400-d8420bad3680928b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Tue 2005-10-25 19:09:39 -0400
message:
Made commit take branch from first argument, if supplied.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051025222400-d8420bad3680928b
parent: abentley at panoramicfeedback.com-20051024174246-7b1be2b168413272
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Tue 2005-10-25 18:24:00 -0400
message:
Updated news
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051024174246-7b1be2b168413272
parent: abentley at panoramicfeedback.com-20051024164918-4e3f89415dc6d7cd
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Mon 2005-10-24 13:42:46 -0400
message:
Handled conflicts with versioned files better
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051024164918-4e3f89415dc6d7cd
parent: abentley at panoramicfeedback.com-20051024160919-282458b455bf5b4e
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Mon 2005-10-24 12:49:18 -0400
message:
Support for forcing merges of unrelated trees
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051024160919-282458b455bf5b4e
parent: abentley at panoramicfeedback.com-20051024155615-6af1ed78ba9e4f9f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Mon 2005-10-24 12:09:19 -0400
message:
Updated docs
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051024155615-6af1ed78ba9e4f9f
parent: abentley at panoramicfeedback.com-20051024150909-88bf8a581c631f6c
parent: mbp at sourcefrog.net-20051024102201-4a850a2e1c8724d7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Mon 2005-10-24 11:56:15 -0400
message:
Merge from mpool
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051024150909-88bf8a581c631f6c
parent: abentley at panoramicfeedback.com-20051024145714-d3ae79be081f39d8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Mon 2005-10-24 11:09:09 -0400
message:
Fixes for default ignores
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051024145714-d3ae79be081f39d8
parent: abentley at panoramicfeedback.com-20051024141840-957302d19be73e7f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Mon 2005-10-24 10:57:14 -0400
message:
Added default ignores for Arch, autofoo, compiled files
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051024141840-957302d19be73e7f
parent: abentley at panoramicfeedback.com-20051024135749-64122a285339663d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Mon 2005-10-24 10:18:40 -0400
message:
Fixed obsolete help
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051024135749-64122a285339663d
parent: abentley at panoramicfeedback.com-20051024124852-c1214f7527292c30
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Mon 2005-10-24 09:57:49 -0400
message:
Fixed pull help, renamed clobber to overwrite
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051024124852-c1214f7527292c30
parent: aaron.bentley at utoronto.ca-20051024044121-fc3059fae13e23e2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Mon 2005-10-24 08:48:52 -0400
message:
Fixed exception (No such thing as EncodingError that I can see)
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051024044121-fc3059fae13e23e2
parent: aaron.bentley at utoronto.ca-20051024005115-11eb6ff177fc195d
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Mon 2005-10-24 00:41:21 -0400
message:
Fixed InvalidRevisionID handling in Branch.get_revision_xml
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051024005115-11eb6ff177fc195d
parent: aaron.bentley at utoronto.ca-20051023234145-809a01974c2dc38b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Sun 2005-10-23 20:51:15 -0400
message:
Improved sort order of indirect merges
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051023234145-809a01974c2dc38b
parent: aaron.bentley at utoronto.ca-20051023055504-118466d505ee4f52
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Sun 2005-10-23 19:41:45 -0400
message:
Added weave merge conflict to ExceptionConflictHandler
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051023055504-118466d505ee4f52
parent: aaron.bentley at utoronto.ca-20051023052822-5d24a0faccc37a69
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Sun 2005-10-23 01:55:04 -0400
message:
Updated NEWS, error out if --show-base supplied and unsupported
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051023052822-5d24a0faccc37a69
parent: aaron.bentley at utoronto.ca-20051023052047-3b6e36d9548cda07
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Sun 2005-10-23 01:28:22 -0400
message:
Switched to standard 7-char conflict markers
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051023052047-3b6e36d9548cda07
parent: aaron.bentley at utoronto.ca-20051023033827-00e09ee38fe6eb84
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Sun 2005-10-23 01:20:47 -0400
message:
Added conflict handling for weave merges
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051023033827-00e09ee38fe6eb84
parent: aaron.bentley at utoronto.ca-20051023002617-d57101d2671509f7
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Sat 2005-10-22 23:38:27 -0400
message:
got merge type selection under test
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051023002617-d57101d2671509f7
parent: aaron.bentley at utoronto.ca-20051023000410-ea7f59932e2d3777
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Sat 2005-10-22 20:26:17 -0400
message:
Preliminary weave merge support
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051023000410-ea7f59932e2d3777
parent: aaron.bentley at utoronto.ca-20051022234501-236f63fda8c236ea
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Sat 2005-10-22 20:04:10 -0400
message:
Fix missing import
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051022234501-236f63fda8c236ea
parent: aaron.bentley at utoronto.ca-20051022232356-861a8b02872b132f
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Sat 2005-10-22 19:45:01 -0400
message:
Restored merge type selection
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051022232356-861a8b02872b132f
parent: abentley at panoramicfeedback.com-20051021205609-004cda57d9f600fc
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Sat 2005-10-22 19:23:56 -0400
message:
Added mode preservation to AtomicFile
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051021205609-004cda57d9f600fc
parent: abentley at panoramicfeedback.com-20051021201536-08d19a910242bcd0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Fri 2005-10-21 16:56:09 -0400
message:
Fixed double-reporting of pending merges
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051021201536-08d19a910242bcd0
parent: abentley at panoramicfeedback.com-20051021194706-1f9e6e0c9b8647f9
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Fri 2005-10-21 16:15:36 -0400
message:
Show indirect merges in status
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051021194706-1f9e6e0c9b8647f9
parent: abentley at panoramicfeedback.com-20051021193207-b995bd6ca86366ac
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Fri 2005-10-21 15:47:06 -0400
message:
Prevented all ancestors from being marked as pending merges
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051021193207-b995bd6ca86366ac
parent: abentley at panoramicfeedback.com-20051021175916-fe9541771c0d7e4e
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Fri 2005-10-21 15:32:07 -0400
message:
Refactored merge and merge_inner to use Merger
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051021175916-fe9541771c0d7e4e
parent: abentley at panoramicfeedback.com-20051021170219-d00be37b77b15040
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Fri 2005-10-21 13:59:16 -0400
message:
Introduced transform_tree
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051021170219-d00be37b77b15040
parent: abentley at panoramicfeedback.com-20051021165153-bfb2a975b6d364c7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Fri 2005-10-21 13:02:19 -0400
message:
Cleanup of merge.py
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051021165153-bfb2a975b6d364c7
parent: abentley at panoramicfeedback.com-20051021163021-1e34da95b3cb56c3
parent: mbp at sourcefrog.net-20051021053602-d0b789804a0dbdd7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Fri 2005-10-21 12:51:53 -0400
message:
Merge Martin's latest
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051021163021-1e34da95b3cb56c3
parent: aaron.bentley at utoronto.ca-20051021032845-9c9e306061a42651
parent: robertc at robertcollins.net-20051020092046-f41cd3e0c9896b98
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Fri 2005-10-21 12:30:21 -0400
message:
Merged Robert Collins
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051021032845-9c9e306061a42651
parent: aaron.bentley at utoronto.ca-20051021032050-88224a49b5001bb6
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Thu 2005-10-20 23:28:45 -0400
message:
Merge3 cleanups
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051021032050-88224a49b5001bb6
parent: abentley at panoramicfeedback.com-20051020213453-796630baa6e08bf6
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Thu 2005-10-20 23:20:50 -0400
message:
Removed b
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051020213453-796630baa6e08bf6
parent: aaron.bentley at utoronto.ca-20051020025755-e03df41c52aa3156
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Thu 2005-10-20 17:34:53 -0400
message:
Ignored ^C in display commands
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051026064515-b13cf1f96bf814dc
parent: mbp at sourcefrog.net-20051026063958-8742c9b5c23a9e8b
committer: mbp at sourcefrog.net
timestamp: Wed 2005-10-26 16:45:15 +1000
message:
More reweave tests
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051026063958-8742c9b5c23a9e8b
parent: mbp at sourcefrog.net-20051026062015-ab8c2e8913b19989
committer: mbp at sourcefrog.net
timestamp: Wed 2005-10-26 16:39:58 +1000
message:
Reweave in topological-sort order.
Previous ad-hoc order could fail when the weaves contained extensively
different but still consistent graphs.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051028054949-98b4a70546cb7129
parent: mbp at sourcefrog.net-20051028053540-3eb02450833461e1
parent: aaron.bentley at utoronto.ca-20051028023422-f4c0b704edd5f79d
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-10-28 15:49:49 +1000
message:
[merge] short-option fix and merge --reprocess
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051028023422-f4c0b704edd5f79d
parent: abentley at panoramicfeedback.com-20051027234449-f257689f3a79d80a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Thu 2005-10-27 22:34:22 -0400
message:
Restored short options in help
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051027234449-f257689f3a79d80a
parent: abentley at panoramicfeedback.com-20051027234315-1f51cfe5a0303e31
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Thu 2005-10-27 19:44:49 -0400
message:
Updated NEWS
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051027234315-1f51cfe5a0303e31
parent: mbp at sourcefrog.net-20051027034457-acfead93c532ec29
parent: abentley at panoramicfeedback.com-20051027234145-cc851c8f0f63eaba
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Thu 2005-10-27 19:43:15 -0400
message:
Merged reprocessing for merge
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051027234145-cc851c8f0f63eaba
parent: abentley at panoramicfeedback.com-20051027231448-ba0ae9cde819edc9
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Thu 2005-10-27 19:41:45 -0400
message:
Integrated reprocessing into the rest of the merge stuff
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051027231448-ba0ae9cde819edc9
parent: abentley at panoramicfeedback.com-20051027230926-4e9911d404596430
parent: mbp at sourcefrog.net-20051027034457-acfead93c532ec29
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Thu 2005-10-27 19:14:48 -0400
message:
Merge from mainline
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051027230926-4e9911d404596430
parent: abentley at panoramicfeedback.com-20051024174246-7b1be2b168413272
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Thu 2005-10-27 19:09:26 -0400
message:
Got reprocessing working
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051028053540-3eb02450833461e1
parent: mbp at sourcefrog.net-20051027035040-076326e2321b5257
parent: aaron.bentley at utoronto.ca-20051028043558-b39b4663f21c99dc
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-10-28 15:35:40 +1000
message:
[merge] win32 fixes
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051028043558-b39b4663f21c99dc
parent: aaron.bentley at utoronto.ca-20051028043446-9a5efa4bc437d071
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Fri 2005-10-28 00:35:58 -0400
message:
win32 locking fix from Belchenko
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051028043446-9a5efa4bc437d071
parent: aaron.bentley at utoronto.ca-20051028043155-f87e0a6f5e905b12
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Fri 2005-10-28 00:34:46 -0400
message:
win32 glob expansion fix from Belchenko
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051028043155-f87e0a6f5e905b12
parent: mbp at sourcefrog.net-20051027034457-acfead93c532ec29
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Fri 2005-10-28 00:31:55 -0400
message:
win32 setup fixes from Belchenko
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051027035040-076326e2321b5257
parent: mbp at sourcefrog.net-20051027034457-acfead93c532ec29
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-27 13:50:40 +1000
message:
Prepare for 0.6rc1
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051031171704-4e16f11e8135aeff
parent: mbp at sourcefrog.net-20051031133705-7216138f826218cd
parent: robertc at robertcollins.net-20051030235846-fda8b626748cce52
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-31 12:17:04 -0500
message:
[merge] robert
------------------------------------------------------------
merged: robertc at robertcollins.net-20051030235846-fda8b626748cce52
parent: robertc at robertcollins.net-20051030173220-0a4a8cf5dbde6673
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Sun 2005-10-30 18:58:46 -0500
message:
Move Branch.read_working_inventory to WorkingTree.
Branch.read_working_inventory has moved to
WorkingTree.read_working_inventory. This necessitated changes to
Branch.get_root_id, and a move of Branch.set_inventory to WorkingTree
as well. To make it clear that a WorkingTree cannot always be obtained
Branch.working_tree() will raise 'errors.NoWorkingTree' if one cannot
be obtained. (Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20051030173220-0a4a8cf5dbde6673
parent: robertc at robertcollins.net-20051030145626-2f57bd49824dd1d7
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Sun 2005-10-30 12:32:20 -0500
message:
Bugfix: SFTP had index errors walking up to the root path.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051030145626-2f57bd49824dd1d7
parent: robertc at robertcollins.net-20051030134112-e0c65fc981721f18
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Sun 2005-10-30 09:56:26 -0500
message:
Add a --create-prefix to the new push command.
As part of this, some option parsing errors will raise 'BzrOptionError',
allowing granular detection for decorating commands. (Robert Collins).
------------------------------------------------------------
merged: robertc at robertcollins.net-20051030134112-e0c65fc981721f18
parent: robertc at robertcollins.net-20051030133625-2d0cb66618da4f6c
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Sun 2005-10-30 08:41:12 -0500
message:
Set push and pull locations only upon success.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051030133625-2d0cb66618da4f6c
parent: robertc at robertcollins.net-20051030014016-98a4fba7d6a4176c
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Sun 2005-10-30 08:36:25 -0500
message:
Adjust sftp url regex to allow foo at bar usernames.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051030014016-98a4fba7d6a4176c
parent: robertc at robertcollins.net-20051030000009-9db99a338a0dfdac
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Sat 2005-10-29 21:40:16 -0400
message:
Support decoration of commands.
Commands.register_command now takes an optional flag to signal that the
registrant is planning to decorate an existing command. When given
multiple plugins registering a command is not an error, and the original
command class (whether built in or a plugin based one) is returned to the
caller. There is a new error 'MustUseDecorated' for signalling when a
wrapping command should switch to the original version. (Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20051030000009-9db99a338a0dfdac
parent: robertc at robertcollins.net-20051029234845-7ae4e7d118bdd3ed
parent: mbp at sourcefrog.net-20051028055302-14e925407b2b09d4
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Sat 2005-10-29 20:00:09 -0400
message:
Merge from Martin.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051029234845-7ae4e7d118bdd3ed
parent: robertc at robertcollins.net-20051028222236-24a8086314b34613
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Sat 2005-10-29 19:48:45 -0400
message:
Implement a 'bzr push' command, with saved locations; update diff to return 1.
* 'bzr diff' now returns 1 when there are changes in the working
tree.
* 'bzr push' now exists and can push changes to a remote location.
This uses the transport infrastructure, and can store the remote
location in the ~/.bazaar/branches.conf configuration file.
* WorkingTree.pull has been split across Branch and WorkingTree,
to allow Branch only pulls.
* commands.display_command now returns the result of the decorated
function.
* LocationConfig now has a set_user_option(key, value) call to save
a setting in its matching location section (a new one is created
if needed).
* Branch has two new methods, get_push_location and set_push_location
to respectively, get and set the push location.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051028222236-24a8086314b34613
parent: robertc at robertcollins.net-20051027194518-58afabc9ab280bb0
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-10-28 18:22:36 -0400
message:
Make the paramiko tests pass. Nice huh.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051027194518-58afabc9ab280bb0
parent: robertc at robertcollins.net-20051024140519-8c20eb83b8981c05
parent: mbp at sourcefrog.net-20051027034457-acfead93c532ec29
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Thu 2005-10-27 15:45:18 -0400
message:
Merge from Martin
------------------------------------------------------------
merged: robertc at robertcollins.net-20051024140519-8c20eb83b8981c05
parent: robertc at robertcollins.net-20051024135918-024629d7ee347b5c
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-25 00:05:19 +1000
message:
NEWS file entry for prior commit - upgrades of trees with no revisions should not fail.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051024135918-024629d7ee347b5c
parent: robertc at robertcollins.net-20051024085433-5e48ed93d1546627
parent: dilinger at athenacr.com-20051020194856-86687868337effed
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-10-24 23:59:18 +1000
message:
fix upgrading of trees with no commits
------------------------------------------------------------
merged: dilinger at athenacr.com-20051020194856-86687868337effed
parent: mbp at sourcefrog.net-20051020035533-aeb2314d74708a3d
committer: Andres Salomon <dilinger at athenacr.com>
timestamp: Thu 2005-10-20 15:48:56 -0400
message:
Handle the case where revision_history() returns an empty list during
an upgrade. Not a huge problem, since there's really nothing to convert,
but it's nice to not spew errors anyways.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051031133705-7216138f826218cd
parent: mbp at sourcefrog.net-20051031131752-937c2ac79930eb6c
parent: steve at borho.org-20051031155052-c771ab6189cd2691
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-31 08:37:05 -0500
message:
[merge] zsh improvements (Steve Borho)
------------------------------------------------------------
merged: steve at borho.org-20051031155052-c771ab6189cd2691
parent: steve at borho.org-20051031062521-a655b2f5cc24eec2
committer: Steve Borho <steve at borho.org>
timestamp: Mon 2005-10-31 09:50:52 -0600
message:
Protect against error messages when not inside a branch
------------------------------------------------------------
merged: steve at borho.org-20051031062521-a655b2f5cc24eec2
parent: steve at borho.org-20051029142439-1d227ee477827410
committer: Steve Borho <steve at borho.org>
timestamp: Mon 2005-10-31 00:25:21 -0600
message:
Fixed spelling of detritus in clean-tree completion function
------------------------------------------------------------
merged: steve at borho.org-20051029142439-1d227ee477827410
parent: steve at borho.org-20051028193443-3247785118d72ad6
committer: Steve Borho <steve at borho.org>
timestamp: Sat 2005-10-29 09:24:39 -0500
message:
Added zsh completions for common plugins
------------------------------------------------------------
merged: steve at borho.org-20051028193443-3247785118d72ad6
parent: mbp at sourcefrog.net-20051028055302-14e925407b2b09d4
committer: Steve Borho <steve at borho.org>
timestamp: Fri 2005-10-28 14:34:43 -0500
message:
zsh completions updated for bzr 0.6
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051031131752-937c2ac79930eb6c
parent: mbp at sourcefrog.net-20051031123645-20ecc5dd9337fb90
parent: robertc at robertcollins.net-20051024140519-8c20eb83b8981c05
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-31 08:17:52 -0500
message:
[merge] upgrade fix
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051031123645-20ecc5dd9337fb90
parent: mbp at sourcefrog.net-20051031120610-da41deafd12fdbb8
parent: jelmer at samba.org-20051030171629-f0af39611b2a072c
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-31 07:36:45 -0500
message:
[merge] fix sftp selftest and parsing of passwords in sftp urls
------------------------------------------------------------
merged: jelmer at samba.org-20051030171629-f0af39611b2a072c
parent: mbp at sourcefrog.net-20051028055302-14e925407b2b09d4
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Sun 2005-10-30 18:16:29 +0100
message:
Parse passwords in sftp URLs (sftp://foo:bar@localhost/).
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051031120610-da41deafd12fdbb8
parent: mbp at sourcefrog.net-20051031120304-2dcdacfc04b814d8
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-31 07:06:10 -0500
message:
[patch] 'bzr init DIR' (John)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051031120304-2dcdacfc04b814d8
parent: mbp at sourcefrog.net-20051028072011-e5f623cec5769d4e
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-31 07:03:04 -0500
message:
Remove duplicated NEWS entry
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051028072011-e5f623cec5769d4e
parent: mbp at sourcefrog.net-20051028055627-b80f0d7d43d07407
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-10-28 17:20:11 +1000
message:
Set logger level depending on BZR_DEBUG to reduce work
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051028055627-b80f0d7d43d07407
parent: mbp at sourcefrog.net-20051028055302-14e925407b2b09d4
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-10-28 15:56:27 +1000
message:
0.6 release
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051118081007-80523bf145eb319b
parent: mbp at sourcefrog.net-20051118080151-8c35865828c63a4b
parent: hmeland at twoflower.uio.no-20051006225544-bc7ef2300f20d9a3
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Fri 2005-11-18 19:10:07 +1100
message:
[merge] fix \t in commit messages
------------------------------------------------------------
merged: hmeland at twoflower.uio.no-20051006225544-bc7ef2300f20d9a3
parent: hmeland at twoflower.uio.no-20051006120356-10cd03703265f8c3
committer: Harald Meland <hmeland at twoflower.uio.no>
timestamp: Fri 2005-10-07 00:55:44 +0200
message:
Cleanup + better test of commit-msg control character escape code.
------------------------------------------------------------
merged: hmeland at twoflower.uio.no-20051006120356-10cd03703265f8c3
parent: mbp at sourcefrog.net-20051006105312-06320dbb986e4bb3
committer: Harald Meland <hmeland at twoflower.uio.no>
timestamp: Thu 2005-10-06 14:03:56 +0200
message:
Fixed typo that could cause TABs in commit messages to be escaped.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051118080151-8c35865828c63a4b
parent: mbp at sourcefrog.net-20051118065820-baa729335645fc75
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Fri 2005-11-18 19:01:51 +1100
message:
Make annotate cope better with revisions committed without a valid
email address. (Marien Zwart)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051118065820-baa729335645fc75
parent: mbp at sourcefrog.net-20051117080757-c491f5a14f179f3b
parent: jamie at anchor.net.au-20051118063902-a487ab27c9b0b700
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Fri 2005-11-18 17:58:20 +1100
message:
[merge] jaq
------------------------------------------------------------
merged: jamie at anchor.net.au-20051118063902-a487ab27c9b0b700
parent: jamie at anchor.net.au-20051118054504-e2c6795412301c92
committer: Jamie Wilkinson <jamie at anchor.net.au>
branch nick: bzr.dev
timestamp: Fri 2005-11-18 17:39:02 +1100
message:
add some examples to the documentation for Command.takes_args
------------------------------------------------------------
merged: jamie at anchor.net.au-20051118054504-e2c6795412301c92
parent: jamie at anchor.net.au-20051118023024-feaa5729c868a450
parent: mbp at sourcefrog.net-20051117074538-5e113b7ad19a3b5d
committer: Jamie Wilkinson <jamie at anchor.net.au>
branch nick: bzr.dev
timestamp: Fri 2005-11-18 16:45:04 +1100
message:
partial merge from Martin, fixed conflicts with bzrlib/tree.py and revno 1391
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051117074538-5e113b7ad19a3b5d
parent: mbp at sourcefrog.net-20051117034930-68148f4f6ee985e8
parent: robertc at robertcollins.net-20051113201422-8a34ef413bfc8222
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Thu 2005-11-17 18:45:38 +1100
message:
[merge] much integrated work from robert and john
------------------------------------------------------------
merged: robertc at robertcollins.net-20051113201422-8a34ef413bfc8222
parent: robertc at robertcollins.net-20051113194406-eb8cd529cf26c68e
parent: john at arbash-meinel.com-20051110021113-6ebd7a9777d10840
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-11-14 07:14:22 +1100
message:
Stores with some compressed texts and some uncompressed texts are now able to
be used. (John A Meinel)
------------------------------------------------------------
merged: john at arbash-meinel.com-20051110021113-6ebd7a9777d10840
parent: john at arbash-meinel.com-20051110013141-f6cc853a1d85a9a9
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Wed 2005-11-09 20:11:13 -0600
message:
Updated the stores, all tests pass, and a store doesn't have to be 100% compressed
------------------------------------------------------------
merged: john at arbash-meinel.com-20051110013141-f6cc853a1d85a9a9
parent: john at arbash-meinel.com-20051110011001-68e7ffc01241d226
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Wed 2005-11-09 20:31:41 -0500
message:
Added a test that copy_to raises NoSuchFile when a directory is missing (not IOError)
------------------------------------------------------------
merged: john at arbash-meinel.com-20051110011001-68e7ffc01241d226
parent: john at arbash-meinel.com-20051110005006-7218f1b4b0fbafea
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Wed 2005-11-09 20:10:01 -0500
message:
Added ability for TextStore to handle both compressed and uncompressed, it just looks for one type first
------------------------------------------------------------
merged: john at arbash-meinel.com-20051110005006-7218f1b4b0fbafea
parent: john at arbash-meinel.com-20051109222409-a5d4048531079fa0
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Wed 2005-11-09 19:50:06 -0500
message:
Adding a note about changing copy_to's interface
------------------------------------------------------------
merged: john at arbash-meinel.com-20051109222409-a5d4048531079fa0
parent: mbp at sourcefrog.net-20051107162112-4f7170c06c6cde98
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Wed 2005-11-09 17:24:09 -0500
message:
Added a has_any function to the Transport API
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051107162112-4f7170c06c6cde98
parent: mbp at sourcefrog.net-20051105142306-cbcd6929fa416498
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-11-07 11:21:12 -0500
message:
Add trace-revisions utility, which can recover lost or alternative revision
history
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051105142306-cbcd6929fa416498
parent: mbp at sourcefrog.net-20051104151302-40bc77e852ea59cd
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sat 2005-11-05 09:23:06 -0500
message:
[patch] fix help for bzr log (Matthieu)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051104151302-40bc77e852ea59cd
parent: mbp at sourcefrog.net-20051104022935-ff89358304e47826
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-11-04 10:13:02 -0500
message:
Handle URLError without http error code
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051104022935-ff89358304e47826
parent: mbp at sourcefrog.net-20051102225739-61d26622f1f95284
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-11-03 21:29:35 -0500
message:
[patch] win32 fix for InventoryEntry doctest (Alexander, patch 21)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051102225739-61d26622f1f95284
parent: mbp at sourcefrog.net-20051102203425-7fb53a2cce4f822d
parent: jamie at anchor.net.au-20051102040919-896ec2964970546c
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-11-02 17:57:39 -0500
message:
Improved description of python exception policies
------------------------------------------------------------
merged: jamie at anchor.net.au-20051102040919-896ec2964970546c
parent: mbp at sourcefrog.net-20051031205250-b0c7f1d9ece522f5
committer: Jamie Wilkinson <jamie at anchor.net.au>
timestamp: Wed 2005-11-02 15:09:19 +1100
message:
Documentation fix: change the wording of a sentence that scraped fingernails down the blackboard.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051102203425-7fb53a2cce4f822d
parent: mbp at sourcefrog.net-20051101215717-fce2860f5195075a
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-11-02 15:34:25 -0500
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051101215717-fce2860f5195075a
parent: mbp at sourcefrog.net-20051101123326-aa08b92ee6e8a659
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-11-01 16:57:17 -0500
message:
Add pointer from README to INSTALL
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051101123326-aa08b92ee6e8a659
parent: mbp at sourcefrog.net-20051031205250-b0c7f1d9ece522f5
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-11-01 07:33:26 -0500
message:
[patch] Test base directory must be unicode (from Alexander)
------------------------------------------------------------
merged: robertc at robertcollins.net-20051113194406-eb8cd529cf26c68e
parent: robertc at robertcollins.net-20051113185726-39ede10d746eee6d
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-11-14 06:44:06 +1100
message:
Test case for removing deleted contents from Wouter van Heyst.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051113185726-39ede10d746eee6d
parent: robertc at robertcollins.net-20051108005548-417f470e4b50a467
parent: john at arbash-meinel.com-20051113164619-6f9ba5898a45dc5c
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-11-14 05:57:26 +1100
message:
Merge Johns current integration work.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051113164619-6f9ba5898a45dc5c
parent: john at arbash-meinel.com-20051113164037-506b728afc8f26e8
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sun 2005-11-13 10:46:19 -0600
message:
Changed to printing the full path, rather than just the relative portion.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051113164037-506b728afc8f26e8
parent: john at arbash-meinel.com-20051113163433-d2db15d58d504a46
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sun 2005-11-13 10:40:37 -0600
message:
Modified mkdir functionality, to handle multiple nested trees.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051113163433-d2db15d58d504a46
parent: john at arbash-meinel.com-20051111001255-581ed1a337aebc4e
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sun 2005-11-13 10:34:33 -0600
message:
Applying Alexander Belchenko's patch to handle multiple mkdir calls
------------------------------------------------------------
merged: john at arbash-meinel.com-20051111001255-581ed1a337aebc4e
parent: john at arbash-meinel.com-20051111001050-619c41bb436c31af
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Thu 2005-11-10 18:12:55 -0600
message:
Removed testbzr, it wasn't even executable, just was cruft.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051111001050-619c41bb436c31af
parent: john at arbash-meinel.com-20051110030353-113e2bb27f7b157f
parent: john at arbash-meinel.com-20051027030813-9dfbcadd282e6512
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Thu 2005-11-10 18:10:50 -0600
message:
Merged pull --verbose changes
------------------------------------------------------------
merged: john at arbash-meinel.com-20051027030813-9dfbcadd282e6512
parent: john at arbash-meinel.com-20051027024110-609396a0bd1a5b3b
parent: mbp at sourcefrog.net-20051027005309-2a7590d8bc3f9087
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Wed 2005-10-26 22:08:13 -0500
message:
[merge] up-to-date against bzr.dev
------------------------------------------------------------
merged: john at arbash-meinel.com-20051027024110-609396a0bd1a5b3b
parent: john at arbash-meinel.com-20051027023847-a3dc4032752a2085
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Wed 2005-10-26 21:41:10 -0500
message:
Added NEWS entry.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051027023847-a3dc4032752a2085
parent: john at arbash-meinel.com-20051026032219-e8eafcb931465df3
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Wed 2005-10-26 21:38:47 -0500
message:
Refactor pull --verbose into a log.py function, add tests.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051026032219-e8eafcb931465df3
parent: mbp at sourcefrog.net-20051024102201-4a850a2e1c8724d7
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Tue 2005-10-25 22:22:19 -0500
message:
Updated bzr pull to support a --verbose flag, which prints out what changes.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051110030353-113e2bb27f7b157f
parent: john at arbash-meinel.com-20051109183020-9023d82766865430
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Wed 2005-11-09 21:03:53 -0600
message:
Fixing mutter() calls to not have to do string processing.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051109183020-9023d82766865430
parent: john at arbash-meinel.com-20051109172418-1cf119bbf93fa44d
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Wed 2005-11-09 13:30:20 -0500
message:
Fix ExternalCommand to not run random files in the current directory, unless it is truly in BZRPATH
------------------------------------------------------------
merged: john at arbash-meinel.com-20051109172418-1cf119bbf93fa44d
parent: john at arbash-meinel.com-20051020052212-ab9f5c12844209cc
parent: robertc at robertcollins.net-20051108005548-417f470e4b50a467
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Wed 2005-11-09 11:24:18 -0600
message:
[merge] robert's integration branch
------------------------------------------------------------
merged: robertc at robertcollins.net-20051108005548-417f470e4b50a467
parent: robertc at robertcollins.net-20051107202951-6ae936c7a3e57f6f
parent: mbp at sourcefrog.net-20051107162112-4f7170c06c6cde98
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-11-07 19:55:48 -0500
message:
Merge from Martin.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051107202951-6ae936c7a3e57f6f
parent: robertc at robertcollins.net-20051106001204-b8c6d5169308d7e6
parent: robertc at robertcollins.net-20051107201757-51b4922fe3ce4f3a
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-11-07 15:29:51 -0500
message:
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20051107201757-51b4922fe3ce4f3a
parent: robertc at robertcollins.net-20051105232539-7ecddc1d5c8f66fe
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-11-07 15:17:57 -0500
message:
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20051105232539-7ecddc1d5c8f66fe
parent: robertc at robertcollins.net-20051105231911-daec2c32fe7ca454
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Sat 2005-11-05 18:25:39 -0500
message:
Move set_pending_merges to WorkingTree.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051105231911-daec2c32fe7ca454
parent: robertc at robertcollins.net-20051105230107-63b2bb28dd1f6199
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Sat 2005-11-05 18:19:11 -0500
message:
Move add_pending_merge to WorkingTree.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051105230107-63b2bb28dd1f6199
parent: robertc at robertcollins.net-20051105222406-40c8684ad68d97dc
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Sat 2005-11-05 18:01:07 -0500
message:
Move pending_merges() to WorkingTree.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051105222406-40c8684ad68d97dc
parent: robertc at robertcollins.net-20051105221812-a2a774e6f8d993be
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Sat 2005-11-05 17:24:06 -0500
message:
whitespace
------------------------------------------------------------
merged: robertc at robertcollins.net-20051105221812-a2a774e6f8d993be
parent: robertc at robertcollins.net-20051105155019-a343c6aff1a8eaa0
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Sat 2005-11-05 17:18:12 -0500
message:
Update comment to reflect author.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051105155019-a343c6aff1a8eaa0
parent: robertc at robertcollins.net-20051105152357-2b072e3f033d6596
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Sat 2005-11-05 10:50:19 -0500
message:
Move _write_inventory to WorkingTree.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051105152357-2b072e3f033d6596
parent: robertc at robertcollins.net-20051105150939-642e7e572c1e9ddb
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Sat 2005-11-05 10:23:57 -0500
message:
Move set_root_id to WorkingTree.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051105150939-642e7e572c1e9ddb
parent: robertc at robertcollins.net-20051105144839-0778253797be08ec
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Sat 2005-11-05 10:09:39 -0500
message:
Change cmd_revert implementation to call workingtree.Revert.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051105144839-0778253797be08ec
parent: robertc at robertcollins.net-20051104165442-a49126bfb45faea7
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Sat 2005-11-05 09:48:39 -0500
message:
Replace the WorkingTree.revert method algorithm with a call to merge_inner.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051104165442-a49126bfb45faea7
parent: robertc at robertcollins.net-20051104165404-61dfbc093c768448
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-04 11:54:42 -0500
message:
Change cmd_revert to use merge_inner.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051104165404-61dfbc093c768448
parent: robertc at robertcollins.net-20051021040258-84a5db1be67b30b9
parent: robertc at robertcollins.net-20051104150539-c99884403b7b9e3f
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-04 11:54:04 -0500
message:
Merge from integration.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051104150539-c99884403b7b9e3f
parent: robertc at robertcollins.net-20051104143748-03c6d6bf9dddabce
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-04 10:05:39 -0500
message:
Move revert from Branch to WorkingTree.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051104143748-03c6d6bf9dddabce
parent: robertc at robertcollins.net-20051104143319-5293770efa92f56d
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-04 09:37:48 -0500
message:
Remove unneeded shebang from upgrade.py and mark revfile as executable.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051104143319-5293770efa92f56d
parent: robertc at robertcollins.net-20051103160817-ce8f8dbaafab2a22
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-04 09:33:19 -0500
message:
Remove some unneeded shebangs.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051103160817-ce8f8dbaafab2a22
parent: robertc at robertcollins.net-20051030235846-fda8b626748cce52
parent: mbp at sourcefrog.net-20051031205250-b0c7f1d9ece522f5
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Thu 2005-11-03 11:08:17 -0500
message:
Merge from Martin.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051021040258-84a5db1be67b30b9
parent: robertc at lifelesslap.robertcollins.net-20051016223125-26d4401cb94b7b82
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-10-21 14:02:58 +1000
message:
make build-api have a hasbang
------------------------------------------------------------
merged: robertc at robertcollins.net-20051106001204-b8c6d5169308d7e6
parent: robertc at robertcollins.net-20051104232747-5872c68d759bc7be
parent: robertc at robertcollins.net-20051105232539-7ecddc1d5c8f66fe
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Sat 2005-11-05 19:12:04 -0500
message:
All pending merges operations from Branch are now on WorkingTree.
(Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20051104232747-5872c68d759bc7be
parent: robertc at robertcollins.net-20051104150539-c99884403b7b9e3f
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-04 18:27:47 -0500
message:
Bugfix the config test suite to not create .bazaar in the dir where it is run.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051020052212-ab9f5c12844209cc
parent: mbp at sourcefrog.net-20051020035533-aeb2314d74708a3d
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Thu 2005-10-20 00:22:12 -0500
message:
Made InvalidRevisionId take the revision_id as a parameter, fixed up locations where it was called.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051117034930-68148f4f6ee985e8
parent: mbp at sourcefrog.net-20051117032731-d76f4b67834e0f8c
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Thu 2005-11-17 14:49:30 +1100
message:
Give a warning, not exception, when trying to merge
x-bit against deletion.
Workaround for #4558
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051117032731-d76f4b67834e0f8c
parent: mbp at sourcefrog.net-20051117010225-1be5054d78de0774
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Thu 2005-11-17 14:27:31 +1100
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051117010225-1be5054d78de0774
parent: mbp at sourcefrog.net-20051116074703-03f47cbe4a4f1e43
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Thu 2005-11-17 12:02:25 +1100
message:
Add alias 'resolved'
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051116074703-03f47cbe4a4f1e43
parent: mbp at sourcefrog.net-20051116073657-5ce3bc2f64ef1e23
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-16 18:47:03 +1100
message:
Add test for merging metadata change vs file deletion
(currently passes but should fail)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051116073657-5ce3bc2f64ef1e23
parent: mbp at sourcefrog.net-20051116072650-0d408c1006d92ea5
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-16 18:36:57 +1100
message:
Remove obsolete import of revfile
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051116072650-0d408c1006d92ea5
parent: mbp at sourcefrog.net-20051116071416-89d66c80f8202539
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-16 18:26:50 +1100
message:
Document BZR_PDB
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051116071416-89d66c80f8202539
parent: mbp at sourcefrog.net-20051116070625-897f4b981477d328
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-16 18:14:16 +1100
message:
Really enter the debugger on failure
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051116070625-897f4b981477d328
parent: mbp at sourcefrog.net-20051116040729-114e9e3777d53f36
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-16 18:06:25 +1100
message:
Run postmortem debugger if BZR_PDB is set
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051116040729-114e9e3777d53f36
parent: mbp at sourcefrog.net-20051116032119-119984187b55614a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-16 15:07:29 +1100
message:
[patch] handle bad IOError subclass raised by urlopen
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051116032119-119984187b55614a
parent: mbp at sourcefrog.net-20051115211836-f5bcd5655a854f0e
parent: abentley at panoramicfeedback.com-20051115210909-65710970107c20a3
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-16 14:21:19 +1100
message:
[merge] aaron, various fixes
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051115210909-65710970107c20a3
parent: aaron.bentley at utoronto.ca-20051112153337-ab72703188dbde9a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Tue 2005-11-15 16:09:09 -0500
message:
Throw ConnectionError instead of NoSuchFile except when we get a 404
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051112153337-ab72703188dbde9a
parent: aaron.bentley at utoronto.ca-20051111174611-05c622f83aca3d78
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sat 2005-11-12 10:33:37 -0500
message:
Fixed missing --verbose
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051111174611-05c622f83aca3d78
parent: aaron.bentley at utoronto.ca-20051111172622-bff7851191b357b9
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2005-11-11 12:46:11 -0500
message:
Support whitespace in diff filenames
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051111172622-bff7851191b357b9
parent: aaron.bentley at utoronto.ca-20051110161534-cc77434068bc3789
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2005-11-11 12:26:22 -0500
message:
Support diff with two branches as input.
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051110161534-cc77434068bc3789
parent: aaron.bentley at utoronto.ca-20051109174311-247622bef3c8b28b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2005-11-10 11:15:34 -0500
message:
Got unicode nicks working properly, even when gannotate is installed.
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051109174311-247622bef3c8b28b
parent: aaron.bentley at utoronto.ca-20051109160251-798e03cb54337415
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2005-11-09 12:43:11 -0500
message:
Fixed diff and status on newly-added, newly-deleted files
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051109160251-798e03cb54337415
parent: aaron.bentley at utoronto.ca-20051109155022-1b2e34d53af30253
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron Bentley devel
timestamp: Wed 2005-11-09 11:02:51 -0500
message:
Updated NEWS
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051109155022-1b2e34d53af30253
parent: aaron.bentley at utoronto.ca-20051109150758-28ae2276023b9ebb
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron Bentley devel
timestamp: Wed 2005-11-09 10:50:22 -0500
message:
Fixed handling of short options not accepted by the command
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051109150758-28ae2276023b9ebb
parent: aaron.bentley at utoronto.ca-20051108171256-655710b03a52fb91
parent: mbp at sourcefrog.net-20051107162112-4f7170c06c6cde98
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron Bentley devel
timestamp: Wed 2005-11-09 10:07:58 -0500
message:
Merged Martin's latest
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051108171256-655710b03a52fb91
parent: aaron.bentley at utoronto.ca-20051107214055-992c47dfe068ab3e
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron Bentley devel
timestamp: Tue 2005-11-08 12:12:56 -0500
message:
Handled more pipe errors for display commands.
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051107214055-992c47dfe068ab3e
parent: aaron.bentley at utoronto.ca-20051107153116-783a2e083b3cd1dd
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron Bentley devel
timestamp: Mon 2005-11-07 16:40:55 -0500
message:
Changed error status to 3
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051107153116-783a2e083b3cd1dd
parent: aaron.bentley at utoronto.ca-20051107072654-ec8a0d82496d09b2
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron Bentley devel
timestamp: Mon 2005-11-07 10:31:16 -0500
message:
Only keep test failure directories if --keep-output is specified
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051107072654-ec8a0d82496d09b2
parent: aaron.bentley at utoronto.ca-20051106210147-55494cae0fef8161
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron Bentley devel
timestamp: Mon 2005-11-07 02:26:54 -0500
message:
Tweaked short-log as Meinel suggested
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051106210147-55494cae0fef8161
parent: aaron.bentley at utoronto.ca-20051106203107-656664b5d52fcc1a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron Bentley devel
timestamp: Sun 2005-11-06 16:01:47 -0500
message:
Refactored long-format log printing
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051106203107-656664b5d52fcc1a
parent: aaron.bentley at utoronto.ca-20051106063454-80e2a7db6887426c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron Bentley devel
timestamp: Sun 2005-11-06 15:31:07 -0500
message:
Added branch nicks to long-format logs
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051106063454-80e2a7db6887426c
parent: aaron.bentley at utoronto.ca-20051105225606-fba8ce12fd8f35d0
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron Bentley devel
timestamp: Sun 2005-11-06 01:34:54 -0500
message:
Fixed tests
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051105225606-fba8ce12fd8f35d0
parent: aaron.bentley at utoronto.ca-20051105054948-94eeb17b8949b265
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron Bentley devel
timestamp: Sat 2005-11-05 17:56:06 -0500
message:
Added branch nicks to revisions
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051105054948-94eeb17b8949b265
parent: aaron.bentley at utoronto.ca-20051104232254-a0bf87b338b2d29d
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Sat 2005-11-05 00:49:48 -0500
message:
Implemented nick command
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051104232254-a0bf87b338b2d29d
parent: aaron.bentley at utoronto.ca-20051102150604-cef0eda2504b0830
parent: mbp at sourcefrog.net-20051031205250-b0c7f1d9ece522f5
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Fri 2005-11-04 18:22:54 -0500
message:
Merged Martin
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051102150604-cef0eda2504b0830
parent: aaron.bentley at utoronto.ca-20051102071053-d3837c9849d7aaa2
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Wed 2005-11-02 10:06:04 -0500
message:
Got writes of existing tree configs working.
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051102071053-d3837c9849d7aaa2
parent: abentley at panoramicfeedback.com-20051031214324-46595f15fe93be37
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Wed 2005-11-02 02:10:53 -0500
message:
Added support for branch nicks
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051031214324-46595f15fe93be37
parent: abentley at panoramicfeedback.com-20051031162255-daf9d40a1045ce7a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Mon 2005-10-31 16:43:24 -0500
message:
Error when run with -OO
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051031162255-daf9d40a1045ce7a
parent: aaron.bentley at utoronto.ca-20051029043647-3eb210c9544af457
parent: mbp at sourcefrog.net-20051031120610-da41deafd12fdbb8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Mon 2005-10-31 11:22:55 -0500
message:
Merge from mainline
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051029043647-3eb210c9544af457
parent: abentley at panoramicfeedback.com-20051028194818-1c851625a7c8f6ae
parent: aaron.bentley at utoronto.ca-20051028035424-6b86500f7601bb64
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Sat 2005-10-29 00:36:47 -0400
message:
Merged me
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051028035424-6b86500f7601bb64
parent: aaron.bentley at utoronto.ca-20051028023422-f4c0b704edd5f79d
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Thu 2005-10-27 23:54:24 -0400
message:
Switched to specific error; not all URLErrors have a .code member
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051028194818-1c851625a7c8f6ae
parent: abentley at panoramicfeedback.com-20051028194043-6eb3ea6a2127b3ff
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Fri 2005-10-28 15:48:18 -0400
message:
Fixed weave conflict handling
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051028194043-6eb3ea6a2127b3ff
parent: abentley at panoramicfeedback.com-20051028183841-134d2004d4f716e9
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Fri 2005-10-28 15:40:43 -0400
message:
Removed todo, restored test
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051028183841-134d2004d4f716e9
parent: abentley at panoramicfeedback.com-20051028175907-ae6a1d10ee73fd54
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Fri 2005-10-28 14:38:41 -0400
message:
Made weave merge succeed if interesting files match history
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051028175907-ae6a1d10ee73fd54
parent: abentley at panoramicfeedback.com-20051028170313-17197f70bb87c1bc
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Fri 2005-10-28 13:59:07 -0400
message:
Implemented remerge
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051028170313-17197f70bb87c1bc
parent: abentley at panoramicfeedback.com-20051028154016-d6db283d08fc2b73
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Fri 2005-10-28 13:03:13 -0400
message:
Handle errors logging errors
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051028154016-d6db283d08fc2b73
parent: abentley at panoramicfeedback.com-20051028153925-2273973029880103
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Fri 2005-10-28 11:40:16 -0400
message:
Added early-exit message in merge
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051028153925-2273973029880103
parent: mbp at sourcefrog.net-20051028055302-14e925407b2b09d4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Fri 2005-10-28 11:39:25 -0400
message:
Implemented conflicts.restore
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051115211836-f5bcd5655a854f0e
parent: mbp at sourcefrog.net-20051115014345-19d5f29117a85db9
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-11-16 08:18:36 +1100
message:
remove obsolete module
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051115014345-19d5f29117a85db9
parent: mbp at sourcefrog.net-20051115013834-f3ac006b080f099c
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-11-15 12:43:45 +1100
message:
[path] bgu in help_on_command (Robert Widhopf-Frank)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051115013834-f3ac006b080f099c
parent: mbp at sourcefrog.net-20051110232200-e59722d2c343821f
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-11-15 12:38:34 +1100
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051110232200-e59722d2c343821f
parent: mbp at sourcefrog.net-20051110230750-6c7eda1ecc454e22
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-11-10 18:22:00 -0500
message:
Hide more stuff in bzrlib.trace
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051110230750-6c7eda1ecc454e22
parent: mbp at sourcefrog.net-20051110230246-359fb27e659a0ae8
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-11-10 18:07:50 -0500
message:
Remove some direct calls to logging, and some dead code
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051110230246-359fb27e659a0ae8
parent: mbp at sourcefrog.net-20051110230148-897aa161a6be2b56
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-11-10 18:02:46 -0500
message:
Code format cleanups
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051110230148-897aa161a6be2b56
parent: mbp at sourcefrog.net-20051110225532-5b461dd44225acea
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-11-10 18:01:48 -0500
message:
Remove dead code
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051110225532-5b461dd44225acea
parent: mbp at sourcefrog.net-20051110224711-f081f4c75d572d45
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-11-10 17:55:32 -0500
message:
Add new selftest module.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051110224711-f081f4c75d572d45
parent: mbp at sourcefrog.net-20051110224001-6d43e9ddff8df7a5
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-11-10 17:47:11 -0500
message:
Cleanup exception formatting stuff
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051110224001-6d43e9ddff8df7a5
parent: mbp at sourcefrog.net-20051110222235-a4236d905bf8f851
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-11-10 17:40:01 -0500
message:
Better formatting of builtin errors
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051110222235-a4236d905bf8f851
parent: mbp at sourcefrog.net-20051110214657-568aa1b0d69b32e4
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-11-10 17:22:35 -0500
message:
Code and tests for shorter formatting of error messages
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051110214657-568aa1b0d69b32e4
parent: mbp at sourcefrog.net-20051110213944-f30c55bbea1d311c
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-11-10 16:46:57 -0500
message:
Remove some obsolete patches/modules
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051110213944-f30c55bbea1d311c
parent: mbp at sourcefrog.net-20051108201602-cf6302c61e4cd412
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-11-10 16:39:44 -0500
message:
Disable selftest that was creating .bazaar in source directory
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051108201602-cf6302c61e4cd412
parent: mbp at sourcefrog.net-20051108164424-8b210743db6f470a
parent: jelmer at samba.org-20051108005305-b26c6faafa3d8955
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-11-08 15:16:02 -0500
message:
[merge] jelmer
------------------------------------------------------------
merged: jelmer at samba.org-20051108005305-b26c6faafa3d8955
parent: jelmer at samba.org-20051108002604-50da4251e6f978e7
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Tue 2005-11-08 01:53:05 +0100
message:
Support -r option to bzr status. The backend code already handled
status differences between revisions, it just wasn't exposed to the user yet.
Add more extended blackbox test for 'bzr status'
------------------------------------------------------------
merged: jelmer at samba.org-20051108002604-50da4251e6f978e7
parent: jelmer at samba.org-20051108000540-a3c63ec1288725da
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Tue 2005-11-08 01:26:04 +0100
message:
Remove already implemented and duplicate items from TODO
------------------------------------------------------------
merged: jelmer at samba.org-20051108000540-a3c63ec1288725da
parent: jelmer at samba.org-20051107222056-ae58aae2cfa2ed58
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Tue 2005-11-08 01:05:40 +0100
message:
Don't quite when tracefile can't be opened. Display warning
correctly.
------------------------------------------------------------
merged: jelmer at samba.org-20051107222056-ae58aae2cfa2ed58
parent: mbp at sourcefrog.net-20051107162112-4f7170c06c6cde98
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Mon 2005-11-07 23:20:56 +0100
message:
Fix a couple of typo's
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051108164424-8b210743db6f470a
parent: mbp at sourcefrog.net-20051108164042-772073c40e6c78f2
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-11-08 11:44:24 -0500
message:
How to maintain the NEWS file
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051108164042-772073c40e6c78f2
parent: mbp at sourcefrog.net-20051107162112-4f7170c06c6cde98
parent: jelmer at samba.org-20051104211455-2aa8047a33d6d957
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-11-08 11:40:42 -0500
message:
[merge] Abstract branch renaming from jelmer
------------------------------------------------------------
merged: jelmer at samba.org-20051104211455-2aa8047a33d6d957
parent: jelmer at samba.org-20051104172605-9288f261492667fd
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Fri 2005-11-04 22:14:55 +0100
message:
Rename NativeBranch -> BzrBranch
------------------------------------------------------------
merged: jelmer at samba.org-20051104172605-9288f261492667fd
parent: jelmer at samba.org-20051030183932-9188295b602ce28c
parent: mbp at sourcefrog.net-20051031205250-b0c7f1d9ece522f5
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Fri 2005-11-04 18:26:05 +0100
message:
Merge from Martin
------------------------------------------------------------
merged: jelmer at samba.org-20051030183932-9188295b602ce28c
parent: jelmer at samba.org-20051030172251-b6c14e0ca0daf326
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Sun 2005-10-30 19:39:32 +0100
message:
Move some more generic methods from NativeBranch to Branch.
------------------------------------------------------------
merged: jelmer at samba.org-20051030172251-b6c14e0ca0daf326
parent: jelmer at samba.org-20051030172031-22843b518b4eae57
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Sun 2005-10-30 18:22:51 +0100
message:
Move some generic methods of NativeBranch to Branch.
Add abstract methods to Branch that simply raise NotImplementedError
------------------------------------------------------------
merged: jelmer at samba.org-20051030172031-22843b518b4eae57
parent: robertc at robertcollins.net-20051030145626-2f57bd49824dd1d7
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Sun 2005-10-30 18:20:31 +0100
message:
Rename _Branch to NativeBranch to better indicate the difference with
foreign branches.
------------------------------------------------------------
merged: jamie at anchor.net.au-20051118023024-feaa5729c868a450
parent: jamie at anchor.net.au-20051114071148-ae0454c7e5297dcd
committer: Jamie Wilkinson <jamie at anchor.net.au>
timestamp: Fri 2005-11-18 13:30:24 +1100
message:
Fix a typo and grammar in Config.username() docstring.
------------------------------------------------------------
merged: jamie at anchor.net.au-20051114071148-ae0454c7e5297dcd
parent: mbp at sourcefrog.net-20051107162112-4f7170c06c6cde98
committer: Jamie Wilkinson <jamie at anchor.net.au>
timestamp: Mon 2005-11-14 18:11:48 +1100
message:
Exclude '.bzrignore' from exports.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051117080757-c491f5a14f179f3b
parent: mbp at sourcefrog.net-20051117080032-d6356c1aa14338a9
parent: dsilvers at digital-scurf.org-20051116162412-3830d783879122c7
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Thu 2005-11-17 19:07:57 +1100
message:
[merge] ftp transport, renamed-modified
------------------------------------------------------------
merged: dsilvers at digital-scurf.org-20051116162412-3830d783879122c7
parent: dsilvers at digital-scurf.org-20051116134641-3bd82ecd1b4af5cd
committer: Daniel Silverstone <dsilvers at digital-scurf.org>
branch nick: bzr.dev
timestamp: Wed 2005-11-16 16:24:12 +0000
message:
Add FTP transport
------------------------------------------------------------
merged: dsilvers at digital-scurf.org-20051116134641-3bd82ecd1b4af5cd
parent: dsilvers at digital-scurf.org-20051116013639-9cf6ba2d9fe0125d
parent: mbp at sourcefrog.net-20051116032119-119984187b55614a
committer: Daniel Silverstone <dsilvers at digital-scurf.org>
branch nick: bzr.dev
timestamp: Wed 2005-11-16 13:46:41 +0000
message:
Merge from mainline
------------------------------------------------------------
merged: dsilvers at digital-scurf.org-20051116013639-9cf6ba2d9fe0125d
parent: dsilvers at digital-scurf.org-20051110223301-1133172e54a0580d
committer: Daniel Silverstone <dsilvers at digital-scurf.org>
timestamp: Wed 2005-11-16 01:36:39 +0000
message:
Allow the delta display routine to show when a file
has been both renamed and modified in any way (text or meta)
This is done without altering the internal structure of the
TreeDelta object in case it is needed elsewhere as-is
------------------------------------------------------------
merged: dsilvers at digital-scurf.org-20051110223301-1133172e54a0580d
parent: mbp at sourcefrog.net-20051107162112-4f7170c06c6cde98
committer: Daniel Silverstone <dsilvers at digital-scurf.org>
timestamp: Thu 2005-11-10 17:33:01 -0500
message:
A revision of zero is meant to be zero, not None. Also order the revisions supplied to cope with the user being confused
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051117080032-d6356c1aa14338a9
parent: mbp at sourcefrog.net-20051117074538-5e113b7ad19a3b5d
parent: aaron.bentley at utoronto.ca-20051116050009-f9639470edb47a84
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Thu 2005-11-17 19:00:32 +1100
message:
[merge] aaron
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051116050009-f9639470edb47a84
parent: aaron.bentley at utoronto.ca-20051116042826-22da9f6f4aca479c
parent: mbp at sourcefrog.net-20051116032119-119984187b55614a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2005-11-16 00:00:09 -0500
message:
Merged the mainline
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051116042826-22da9f6f4aca479c
parent: abentley at panoramicfeedback.com-20051115210909-65710970107c20a3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2005-11-15 23:28:26 -0500
message:
Fixed handling of files in mixed branches
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051122043014-6df209fd93033b59
parent: mbp at sourcefrog.net-20051122041344-d98af0e4bc18f3da
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Tue 2005-11-22 15:30:14 +1100
message:
Exclude more files from dumb-rsync upload
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051122041344-d98af0e4bc18f3da
parent: mbp at sourcefrog.net-20051122033237-5099d6acc4751400
parent: shamrin at gmail.com-20051121092252-4f536da7bb6fee90
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Tue 2005-11-22 15:13:44 +1100
message:
[merge] win32 fixes (alexey)
------------------------------------------------------------
merged: shamrin at gmail.com-20051121092252-4f536da7bb6fee90
parent: shamrin at gmail.com-20051121090718-48400620bf12c6c6
committer: Alexey Shamrin <shamrin at gmail.com>
branch nick: win32.forgotten
timestamp: Mon 2005-11-21 04:22:52 -0500
message:
updated NEWS to include forgotten changes
------------------------------------------------------------
merged: shamrin at gmail.com-20051121090718-48400620bf12c6c6
parent: mbp at sourcefrog.net-20051118081007-80523bf145eb319b
parent: john at arbash-meinel.com-20051028202916-b350435b905ab6c1
committer: Alexey Shamrin <shamrin at gmail.com>
branch nick: win32.forgotten
timestamp: Mon 2005-11-21 04:07:18 -0500
message:
merge forgotten win32 fixes from http://bzr.arbash-meinel.com/branches/bzr/win32/
------------------------------------------------------------
merged: john at arbash-meinel.com-20051028202916-b350435b905ab6c1
parent: john at arbash-meinel.com-20051028202807-09e118d024cc7856
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-10-28 14:29:16 -0600
message:
[patch] Alexander Belchenko patch #12: use os.pathsep for BZR_PLUGIN_PATH
------------------------------------------------------------
merged: john at arbash-meinel.com-20051028202807-09e118d024cc7856
parent: john at arbash-meinel.com-20051028201738-ed1b168cd4aac775
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-10-28 14:28:07 -0600
message:
[patch] Alexander Belchenko patch #9, skip stat tests for win32
------------------------------------------------------------
merged: john at arbash-meinel.com-20051028201738-ed1b168cd4aac775
parent: john at arbash-meinel.com-20051028201605-3479df5255f74bf1
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-10-28 14:17:38 -0600
message:
[patch] testhashcache delay for win32 and cygwin
------------------------------------------------------------
merged: john at arbash-meinel.com-20051028201605-3479df5255f74bf1
parent: john at arbash-meinel.com-20051028193852-a9f11a3ecb984a83
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-10-28 14:16:05 -0600
message:
Updated build_tree to use fixed line-endings for tests which read the file contents and compare
------------------------------------------------------------
merged: john at arbash-meinel.com-20051028193852-a9f11a3ecb984a83
parent: john at arbash-meinel.com-20051028193246-94db6bf24d9b95b2
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-10-28 13:38:52 -0600
message:
Applying fix for EWOULDBLOCK under win32
------------------------------------------------------------
merged: john at arbash-meinel.com-20051028193246-94db6bf24d9b95b2
parent: john at arbash-meinel.com-20051028193206-a197c629d0c5657a
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-10-28 13:32:46 -0600
message:
Updating testconfig to handle missing environment variables
------------------------------------------------------------
merged: john at arbash-meinel.com-20051028193206-a197c629d0c5657a
parent: john at arbash-meinel.com-20051028192629-e441c87ce4bc3b19
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-10-28 13:32:06 -0600
message:
Making old_env a private member
------------------------------------------------------------
merged: john at arbash-meinel.com-20051028192629-e441c87ce4bc3b19
parent: john at arbash-meinel.com-20051028191653-60f76d76b2cac7c2
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-10-28 13:26:29 -0600
message:
Refactored environment cleaning code
------------------------------------------------------------
merged: john at arbash-meinel.com-20051028191653-60f76d76b2cac7c2
parent: john at arbash-meinel.com-20051028191501-8f599abdc5062bd2
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-10-28 13:16:53 -0600
message:
[patch] Aaron Bentley's HOME fix.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051028191501-8f599abdc5062bd2
parent: mbp at sourcefrog.net-20051028055302-14e925407b2b09d4
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-10-28 13:15:01 -0600
message:
Adding my win32 patch for moving the home directory.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051122033237-5099d6acc4751400
parent: mbp at sourcefrog.net-20051121085156-4fc6a9921c2cc723
parent: aaron.bentley at utoronto.ca-20051119225637-e7afc16a06a31b59
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Tue 2005-11-22 14:32:37 +1100
message:
[merge] make sure to get all text revisions during merge (aaron)
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051119225637-e7afc16a06a31b59
parent: aaron.bentley at utoronto.ca-20051119200756-339f5a64abed668d
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sat 2005-11-19 17:56:37 -0500
message:
Fixed fetch to be safer wrt ghosts and corrupt branches
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051119200756-339f5a64abed668d
parent: abentley at panoramicfeedback.com-20051118144716-c27df491076e98f3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sat 2005-11-19 15:07:56 -0500
message:
Added repr for Weave
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051118144716-c27df491076e98f3
parent: abentley at panoramicfeedback.com-20051117204623-4265b87790561ee4
parent: mbp at sourcefrog.net-20051118081007-80523bf145eb319b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Fri 2005-11-18 09:47:16 -0500
message:
Merge from Martin
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051117204623-4265b87790561ee4
parent: abentley at panoramicfeedback.com-20051117204200-efd6b944e3f7a6be
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Thu 2005-11-17 15:46:23 -0500
message:
Removed unused var
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051117204200-efd6b944e3f7a6be
parent: abentley at panoramicfeedback.com-20051117155155-bdf57cc1c7efb11d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Thu 2005-11-17 15:42:00 -0500
message:
Removed debugging code
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051117155155-bdf57cc1c7efb11d
parent: abentley at panoramicfeedback.com-20051117154631-2d0eb45521b98363
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Thu 2005-11-17 10:51:55 -0500
message:
Removed debug prints
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051117154631-2d0eb45521b98363
parent: abentley at panoramicfeedback.com-20051117154041-912d8f3bdd7d5a62
parent: mbp at sourcefrog.net-20051117074538-5e113b7ad19a3b5d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Thu 2005-11-17 10:46:31 -0500
message:
Merge from mainline
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051117154041-912d8f3bdd7d5a62
parent: abentley at panoramicfeedback.com-20051117150928-f40f1a19c81473fb
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Thu 2005-11-17 10:40:41 -0500
message:
Detect AWOL inventory revisions all at once
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051117150928-f40f1a19c81473fb
parent: aaron.bentley at utoronto.ca-20051116050009-f9639470edb47a84
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Thu 2005-11-17 10:09:28 -0500
message:
Made bzr check for stored revisions missing from ancestry
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051121085156-4fc6a9921c2cc723
parent: mbp at sourcefrog.net-20051118081007-80523bf145eb319b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Mon 2005-11-21 19:51:56 +1100
message:
[patch] add 'bzr inventory --kind directory'; remove 'bzr directories'
(Johan Rydberg)
------------------------------------------------------------
merged: john at arbash-meinel.com-20051121154158-1845aa886bfac4b4
parent: john at arbash-meinel.com-20051121152016-f53ba54bbbbc4474
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Mon 2005-11-21 09:41:58 -0600
message:
Added test for log formatting, found bug when redirecting short logs to a file instead of stdout.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051121152016-f53ba54bbbbc4474
parent: john at arbash-meinel.com-20051118210153-88fd1a200bdd872c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Mon 2005-11-21 09:20:16 -0600
message:
Stripping trailing newlines when displaying log messages
------------------------------------------------------------
merged: john at arbash-meinel.com-20051118210153-88fd1a200bdd872c
parent: john at arbash-meinel.com-20051118205706-825c182e74708a7e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Fri 2005-11-18 15:01:53 -0600
message:
Updating transport test, to handle NoSuchFile if a bogus url accidentally resolves.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051118205706-825c182e74708a7e
parent: john at arbash-meinel.com-20051118163428-498977103afee28e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Fri 2005-11-18 14:57:06 -0600
message:
[patch] Alexey Shamrin's patch for small win32 fixes
------------------------------------------------------------
merged: john at arbash-meinel.com-20051118163428-498977103afee28e
parent: john at arbash-meinel.com-20051118161638-f3cc5fcfb6504126
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Fri 2005-11-18 10:34:28 -0600
message:
Shorten test names in verbose mode in a logical way. Removed bzrlib.selftest prefix
------------------------------------------------------------
merged: john at arbash-meinel.com-20051118161638-f3cc5fcfb6504126
parent: john at arbash-meinel.com-20051117221217-7b51f99a1a60c578
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Fri 2005-11-18 10:16:38 -0600
message:
Renamed all test modules to remove the 'test' prefix
------------------------------------------------------------
merged: john at arbash-meinel.com-20051117221217-7b51f99a1a60c578
parent: john at arbash-meinel.com-20051117210621-37e9410490227390
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2005-11-17 16:12:17 -0600
message:
Refactoring blackbox tests into a package, rather than just a single file.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051117210621-37e9410490227390
parent: john at arbash-meinel.com-20051115000939-8861c35580bf690f
parent: mbp at sourcefrog.net-20051117074538-5e113b7ad19a3b5d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2005-11-17 15:06:21 -0600
message:
[merge] bzr.dev
------------------------------------------------------------
merged: john at arbash-meinel.com-20051115000939-8861c35580bf690f
parent: john at arbash-meinel.com-20051114235851-09fdf17b94c10438
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Mon 2005-11-14 18:09:39 -0600
message:
Updated the test to also test zip exports. Fixed some small bugs exposed by test suite.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051114235851-09fdf17b94c10438
parent: john at arbash-meinel.com-20051114230926-08b82fe07c945d30
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Mon 2005-11-14 17:58:51 -0600
message:
Refactored the export code to make it easier to add new export formats.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051114230926-08b82fe07c945d30
parent: john at arbash-meinel.com-20051113195705-ab81d5c77138884f
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Mon 2005-11-14 17:09:26 -0600
message:
Merging Alexander's zip export patch
------------------------------------------------------------
merged: john at arbash-meinel.com-20051113195705-ab81d5c77138884f
parent: john at arbash-meinel.com-20051113164619-6f9ba5898a45dc5c
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sun 2005-11-13 13:57:05 -0600
message:
Adding merge-delete-conflicts test case.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051125043654-106a589368532d7e
parent: mbp at sourcefrog.net-20051125040741-a49e7d347c01d531
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Fri 2005-11-25 15:36:54 +1100
message:
Don't ignore bzrlib/plugins -- really bad idea because they can have bad
old plugins lying around!
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051125040741-a49e7d347c01d531
parent: mbp at sourcefrog.net-20051125040609-9053145620fdc52b
parent: aaron.bentley at utoronto.ca-20051124060520-0279acee0f7c1d70
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Fri 2005-11-25 15:07:41 +1100
message:
[merge] aaron
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051124060520-0279acee0f7c1d70
parent: aaron.bentley at utoronto.ca-20051124041913-de24c05411cdc948
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2005-11-24 01:05:20 -0500
message:
Tweaked tree name generation when applying changesets
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051124041913-de24c05411cdc948
parent: mbp at sourcefrog.net-20051122230822-b876b5abe3f6bd0c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2005-11-23 23:19:13 -0500
message:
Handled cases where inventory entries need renaming but files don't exist
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051125040609-9053145620fdc52b
parent: mbp at sourcefrog.net-20051125003446-c79b479619f99236
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Fri 2005-11-25 15:06:09 +1100
message:
Fix trace of non-ascii messages, and add test.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051125003446-c79b479619f99236
parent: mbp at sourcefrog.net-20051124063651-e74eb497a72609d6
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Fri 2005-11-25 11:34:46 +1100
message:
[patch] Commit editor temporary files now start with 'bzr_log.' (Magnus Therning)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051124063651-e74eb497a72609d6
parent: mbp at sourcefrog.net-20051124043018-863bd95e46cce874
parent: mbp at sourcefrog.net-20051124061140-12da2df0f37a2756
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Thu 2005-11-24 17:36:51 +1100
message:
[merge] basic_io metaformat (mbp)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051124061140-12da2df0f37a2756
parent: mbp at sourcefrog.net-20051124060634-fa1e3a5a871ec5e7
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.basic_io
timestamp: Thu 2005-11-24 17:11:40 +1100
message:
More basicio quoting tests.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051124060634-fa1e3a5a871ec5e7
parent: mbp at sourcefrog.net-20051124053538-25fa7f2dc9ad8b01
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-11-24 17:06:34 +1100
message:
Addition test and bugfix for basic_io escaped strings.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051124053538-25fa7f2dc9ad8b01
parent: mbp at sourcefrog.net-20051104051950-beda983475a8793c
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.basic_io
timestamp: Thu 2005-11-24 16:35:38 +1100
message:
Fix up handling of escaped doublequotes at end of line.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051104051950-beda983475a8793c
parent: mbp at sourcefrog.net-20051104050311-f49d57035d772a7a
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-11-04 00:19:50 -0500
message:
Remove dead code
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051104050311-f49d57035d772a7a
parent: mbp at sourcefrog.net-20051104050210-d27f4c97961e98ee
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-11-04 00:03:11 -0500
message:
Update basic_io revision output
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051104050210-d27f4c97961e98ee
parent: mbp at sourcefrog.net-20051104032149-dd09b953390fcb66
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-11-04 00:02:10 -0500
message:
more basic_io tests
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051104032149-dd09b953390fcb66
parent: mbp at sourcefrog.net-20051104031759-b0f5f6f53e042b68
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-11-03 22:21:49 -0500
message:
Packing of empty basic_io stanzas
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051104031759-b0f5f6f53e042b68
parent: mbp at sourcefrog.net-20051104030537-19aaa444866ed40a
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-11-03 22:17:59 -0500
message:
More basic_io tests for quoting
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051104030537-19aaa444866ed40a
parent: mbp at sourcefrog.net-20051104014631-750e0ad4172c952c
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-11-03 22:05:37 -0500
message:
Go back to multiline quoted string values.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051104014631-750e0ad4172c952c
parent: mbp at sourcefrog.net-20051101215117-e7c33dde397b2350
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-11-03 20:46:31 -0500
message:
Make biobench directly executable
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051101215117-e7c33dde397b2350
parent: mbp at sourcefrog.net-20051101214801-77042eb9a8c56702
parent: mbp at sourcefrog.net-20051101123326-aa08b92ee6e8a659
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-11-01 16:51:17 -0500
message:
[merge] main -> bzr.mbp.basic_io
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051101214801-77042eb9a8c56702
parent: mbp at sourcefrog.net-20051101213350-123332025d47320e
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-11-01 16:48:01 -0500
message:
Get basic_io selftests running again for new format.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051101213350-123332025d47320e
parent: mbp at sourcefrog.net-20051101203022-441edf9d621f8d27
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-11-01 16:33:50 -0500
message:
More basic_io tweaking; break format
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051101203022-441edf9d621f8d27
parent: mbp at sourcefrog.net-20051101201130-e14511e01cae1624
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-11-01 15:30:22 -0500
message:
More basic_io tweaking
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051101201130-e14511e01cae1624
parent: mbp at sourcefrog.net-20051101174138-9dbc20cee1947bb7
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-11-01 15:11:30 -0500
message:
Experiments with basic_io for inventory
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051101174138-9dbc20cee1947bb7
parent: mbp at sourcefrog.net-20051101172517-659cff2957e91d71
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-11-01 12:41:38 -0500
message:
Fix basic_io writing of bools, and test.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051101172517-659cff2957e91d71
parent: mbp at sourcefrog.net-20051101133945-ce6f1c59ebd59002
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-11-01 12:25:17 -0500
message:
New BasicReader to pull a sequence of stanzas from a file, and test.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051101133945-ce6f1c59ebd59002
parent: mbp at sourcefrog.net-20051101131616-4fa90461dedafa7b
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-11-01 08:39:45 -0500
message:
Fix up reading sequence of stanzas from a file, and test.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051101131616-4fa90461dedafa7b
parent: mbp at sourcefrog.net-20051101131541-f499e47897d14d05
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-11-01 08:16:16 -0500
message:
Simple benchmark for basic_io
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051101131541-f499e47897d14d05
parent: mbp at sourcefrog.net-20051030075741-9617a3608c929266
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-11-01 08:15:41 -0500
message:
More basic_io development:
- update BasicWriter
- better writing of inventories
- refactored quoted string parser
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030075741-9617a3608c929266
parent: mbp at sourcefrog.net-20051030074858-7becf1fe627355d8
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 18:57:41 +1100
message:
Add Stanza.get_all and test repeated fields
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030074858-7becf1fe627355d8
parent: mbp at sourcefrog.net-20051030074350-ac526d8179d65a22
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 18:48:58 +1100
message:
More basic_io quoting tests
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030074350-ac526d8179d65a22
parent: mbp at sourcefrog.net-20051030070307-84f53d7f658ce896
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 18:43:50 +1100
message:
More robust basic_io parsing of quoted/multiline strings
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030070307-84f53d7f658ce896
parent: mbp at sourcefrog.net-20051030064119-a511529bd0af1ae6
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 18:03:07 +1100
message:
Fix up reading basic_io multiline strings
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030064119-a511529bd0af1ae6
parent: mbp at sourcefrog.net-20051030063959-1b1b0e558a871f93
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 17:41:19 +1100
message:
Add Stanza eq and ne methods and test.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030063959-1b1b0e558a871f93
parent: mbp at sourcefrog.net-20051030063617-309bc4b4179e0ceb
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 17:39:59 +1100
message:
Fix handling of negative integers and add test
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030063617-309bc4b4179e0ceb
parent: mbp at sourcefrog.net-20051030063449-5b0f79cd4a5803fa
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 17:36:17 +1100
message:
Add len(Stanza)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030063449-5b0f79cd4a5803fa
parent: mbp at sourcefrog.net-20051030063005-fd2d00e417bb7cb0
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 17:34:49 +1100
message:
more basic_io read tests
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030063005-fd2d00e417bb7cb0
parent: mbp at sourcefrog.net-20051030041218-89757315bff8cad5
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 17:30:05 +1100
message:
Update Stanza iteration tests
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030041218-89757315bff8cad5
parent: mbp at sourcefrog.net-20051030035632-fe26a238180a8cff
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 15:12:18 +1100
message:
Simple basic_io from_lines and .get()
Remove Stanza.__iter__; not really list-like
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030035632-fe26a238180a8cff
parent: mbp at sourcefrog.net-20051030034853-9b07d841176bf791
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 14:56:32 +1100
message:
Test basic_io writing multiline strings.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030034853-9b07d841176bf791
parent: mbp at sourcefrog.net-20051030034219-059eafe037aeafb8
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 14:48:53 +1100
message:
Larger test for writing basic_io
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030034219-059eafe037aeafb8
parent: mbp at sourcefrog.net-20051030032112-e24acbeee867b8f7
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 14:42:19 +1100
message:
More basic_io development
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030032112-e24acbeee867b8f7
parent: mbp at sourcefrog.net-20051030031835-7a295ef241d19450
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 14:21:12 +1100
message:
Iteration of Stanzas()
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030031835-7a295ef241d19450
parent: mbp at sourcefrog.net-20051028054949-98b4a70546cb7129
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 14:18:35 +1100
message:
Start bringing in basicio code
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051124043018-863bd95e46cce874
parent: mbp at sourcefrog.net-20051124024527-3cba8d517f403af4
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Thu 2005-11-24 15:30:18 +1100
message:
Hacking notes on TDD
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051124024527-3cba8d517f403af4
parent: mbp at sourcefrog.net-20051124022811-add704653e62d42b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Thu 2005-11-24 13:45:27 +1100
message:
Add ChangesetEntry.__repr__
Fix bad results from ChangesetEntry.summarize_name()
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051124022811-add704653e62d42b
parent: mbp at sourcefrog.net-20051124014111-b73f6da5f344f5ce
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Thu 2005-11-24 13:28:11 +1100
message:
Better exception for one unhandled merge case
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051124014111-b73f6da5f344f5ce
parent: mbp at sourcefrog.net-20051123062927-f33c0abd742146af
parent: robertc at robertcollins.net-20051123071842-ac5f13e1eb9d905b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Thu 2005-11-24 12:41:11 +1100
message:
[merge] refactoring of branch vs working tree, etc (robertc)
------------------------------------------------------------
merged: robertc at robertcollins.net-20051123071842-ac5f13e1eb9d905b
parent: robertc at robertcollins.net-20051118072940-c0e304e5d0935d86
parent: mbp at sourcefrog.net-20051122043014-6df209fd93033b59
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Wed 2005-11-23 18:18:42 +1100
message:
Merge from mpool.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051118072940-c0e304e5d0935d86
parent: robertc at robertcollins.net-20051118013610-33b08df8810ecca7
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-18 18:29:40 +1100
message:
Nuke __main__ for annotate.py
------------------------------------------------------------
merged: robertc at robertcollins.net-20051118013610-33b08df8810ecca7
parent: robertc at robertcollins.net-20051118013104-0189bf9fafb6e21a
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-18 12:36:10 +1100
message:
clarify use of Branch and WorkingTree in annotate.py
------------------------------------------------------------
merged: robertc at robertcollins.net-20051118013104-0189bf9fafb6e21a
parent: robertc at robertcollins.net-20051118012015-2c838373b4117f46
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-18 12:31:04 +1100
message:
Dont use Branch.open in smart_add when checking for child trees.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051118012015-2c838373b4117f46
parent: robertc at robertcollins.net-20051118011319-39cb6e79d1155a19
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-18 12:20:15 +1100
message:
Documentation.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051118011319-39cb6e79d1155a19
parent: robertc at robertcollins.net-20051117225933-612cf96076e37272
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-18 12:13:19 +1100
message:
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20051117225933-612cf96076e37272
parent: robertc at robertcollins.net-20051117225758-4c0f785d2849df07
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-18 09:59:33 +1100
message:
Cleanup the working_tree comments in Branch.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051117225758-4c0f785d2849df07
parent: robertc at robertcollins.net-20051117224342-1bd6578c82bd62aa
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-18 09:57:58 +1100
message:
move move() from Branch to WorkingTree.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051117224342-1bd6578c82bd62aa
parent: robertc at robertcollins.net-20051117222954-3404028201eaabd7
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-18 09:43:42 +1100
message:
Move rename_one from Branch to WorkingTree. (Robert Collins).
------------------------------------------------------------
merged: robertc at robertcollins.net-20051117222954-3404028201eaabd7
parent: robertc at robertcollins.net-20051117215555-035e7347e08eb7c9
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-18 09:29:54 +1100
message:
Move Branch.unknowns() to WorkingTree.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051117215555-035e7347e08eb7c9
parent: robertc at robertcollins.net-20051117081213-cefaacbf5dfb5652
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-18 08:55:55 +1100
message:
Move add from Branch to WorkingTree.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051117081213-cefaacbf5dfb5652
parent: robertc at robertcollins.net-20051117065251-6f7dcf54580a84ec
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Thu 2005-11-17 19:12:13 +1100
message:
Convert most of the front ends commands to use WorkingTree.open_containing
------------------------------------------------------------
merged: robertc at robertcollins.net-20051117065251-6f7dcf54580a84ec
parent: robertc at robertcollins.net-20051117061735-ace312c6dae3f67c
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Thu 2005-11-17 17:52:51 +1100
message:
Do not consider urls to be relative paths within working trees.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051117061735-ace312c6dae3f67c
parent: robertc at robertcollins.net-20051117052111-5f2e91c961f02d5c
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Thu 2005-11-17 17:17:35 +1100
message:
Use abspath not realpath in WorkingTree.open_containing, to avoid symlink resolution lies.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051117052111-5f2e91c961f02d5c
parent: robertc at robertcollins.net-20051113201422-8a34ef413bfc8222
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Thu 2005-11-17 16:21:11 +1100
message:
Provide a open_containing for WorkingTree.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051123062927-f33c0abd742146af
parent: mbp at sourcefrog.net-20051123062550-4da88b201d7d34b8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-23 17:29:27 +1100
message:
[patch] show number of revisions pushed/pulled/merged (Robey Pointer)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051123062550-4da88b201d7d34b8
parent: mbp at sourcefrog.net-20051123051652-13ba89e07170fcc9
parent: mbp at sourcefrog.net-20051123055520-5f2ad7ea4cca7adb
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-23 17:25:50 +1100
message:
[merge] trace improvements
- shorter error messages on exceptions
- shorter display of status and time in selftest output
- send debug output direct to file to reduce cost of going
through Python logging
- always send exception tracebacks to trace file
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051123055520-5f2ad7ea4cca7adb
parent: mbp at sourcefrog.net-20051111232450-aec10ff8afa12bae
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-11-23 16:55:20 +1100
message:
Remove need for BZR_DEBUG to get debug info in trace file.
Clean up new trace file.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051111232450-aec10ff8afa12bae
parent: mbp at sourcefrog.net-20051111232203-e1c6e4437f6fe9a7
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sat 2005-11-12 10:24:50 +1100
message:
Make logging of errors go through our trace functions
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051111232203-e1c6e4437f6fe9a7
parent: mbp at sourcefrog.net-20051111232033-a06ce840d036efa9
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sat 2005-11-12 10:22:03 +1100
message:
Don't enable default logging twice
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051111232033-a06ce840d036efa9
parent: mbp at sourcefrog.net-20051111232015-275817884c803e49
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sat 2005-11-12 10:20:33 +1100
message:
Do debug messages not through python logging
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051111232015-275817884c803e49
parent: mbp at sourcefrog.net-20051111231627-4cb27769d0eb1010
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sat 2005-11-12 10:20:15 +1100
message:
Enable logging early enough to save argv
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051111231627-4cb27769d0eb1010
parent: mbp at sourcefrog.net-20051111230656-b1f0dcf7062e48ae
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sat 2005-11-12 10:16:27 +1100
message:
Update log message quoting
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051111230656-b1f0dcf7062e48ae
parent: mbp at sourcefrog.net-20051111224736-8457569f2b10f629
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sat 2005-11-12 10:06:56 +1100
message:
Fix up format strings for some log calls
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051111224736-8457569f2b10f629
parent: mbp at sourcefrog.net-20051110234206-2fa4ada64c9cb8a0
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sat 2005-11-12 09:47:36 +1100
message:
Remove unnecessary import of obsolete bzrlib.revfile
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051110234206-2fa4ada64c9cb8a0
parent: mbp at sourcefrog.net-20051110233631-da361bc235b6da49
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-11-10 18:42:06 -0500
message:
Nicer display of verbose test results and progress
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051110233631-da361bc235b6da49
parent: mbp at sourcefrog.net-20051110232200-e59722d2c343821f
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-11-10 18:36:31 -0500
message:
Remove direct logging calls from selftest
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051123051652-13ba89e07170fcc9
parent: mbp at sourcefrog.net-20051123022222-8b8514ae885f0c72
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-23 16:16:52 +1100
message:
[patch] make --quiet a global option (robey)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051123022222-8b8514ae885f0c72
parent: mbp at sourcefrog.net-20051123011409-c7bd7982cf710184
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-23 13:22:22 +1100
message:
Fix regression of 'bzr log -v' - it wasn't showing changed files at all. (#4676)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051123011409-c7bd7982cf710184
parent: mbp at sourcefrog.net-20051123004549-32b59267a00938bf
parent: jelmer at samba.org-20051121201056-b5b364b20cb58115
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-23 12:14:09 +1100
message:
[merge] jelmer
------------------------------------------------------------
merged: jelmer at samba.org-20051121201056-b5b364b20cb58115
parent: jelmer at samba.org-20051121175528-358e070f5f303534
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: jelmer.integration
timestamp: Mon 2005-11-21 21:10:56 +0100
message:
Don't clear Revision.parent_ids after it has been set from the arguments
------------------------------------------------------------
merged: jelmer at samba.org-20051121175528-358e070f5f303534
parent: jelmer at samba.org-20051120204442-18bfa8e003cc92ea
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: jelmer.integration
timestamp: Mon 2005-11-21 18:55:28 +0100
message:
Make get_revision_xml_file() private
------------------------------------------------------------
merged: jelmer at samba.org-20051120204442-18bfa8e003cc92ea
parent: jelmer at samba.org-20051120193851-91fb5ea757facb74
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: jelmer.integration
timestamp: Sun 2005-11-20 21:44:42 +0100
message:
Remove methods from BzrBranch that were already implemented in Branch
------------------------------------------------------------
merged: jelmer at samba.org-20051120193851-91fb5ea757facb74
parent: jelmer at samba.org-20051120192409-32999f70ba448f5f
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: integration
timestamp: Sun 2005-11-20 20:38:51 +0100
message:
Fix error that was declared twice
------------------------------------------------------------
merged: jelmer at samba.org-20051120192409-32999f70ba448f5f
parent: jelmer at samba.org-20051118005738-6a5a3f5db00432bd
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: integration
timestamp: Sun 2005-11-20 20:24:09 +0100
message:
Remove some abstract methods that were no longer used.
------------------------------------------------------------
merged: jelmer at samba.org-20051118005738-6a5a3f5db00432bd
parent: mbp at sourcefrog.net-20051117074538-5e113b7ad19a3b5d
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Fri 2005-11-18 01:57:38 +0100
message:
Remove already fixed items from TODO
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051123004549-32b59267a00938bf
parent: mbp at sourcefrog.net-20051122230822-b876b5abe3f6bd0c
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-23 11:45:49 +1100
message:
[patch] annotate --long (robey pointer)
This fixes a single TODO in 'bzr annotate' that has been bugging me:
the email field is truncated even with '--long'.
The fix is pretty tiny (as you can see). It causes some generator
results to be collected instead of iterated, but this turns out to be
not a big deal, since the yield is very shallow and comes from a
collection one stack level deeper.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051128032041-b83d451b0a70bcd5
parent: mbp at sourcefrog.net-20051128031030-3d7262bf039ec1ec
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Mon 2005-11-28 14:20:41 +1100
message:
fixup setup.py for test renaming
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051128031030-3d7262bf039ec1ec
parent: mbp at sourcefrog.net-20051125062856-e4c887417108fd9e
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Mon 2005-11-28 14:10:30 +1100
message:
[patch] weave fetch optimizations (Goffredo Baroncelli)
The patch adds 2 optimizations:
1) The patch add a hash ( file_ids_names ) which caches the revision
contained in a weave already processed, so it isn't needed to reload the
weave in order to check if a revision is present.
2) Moreover if it is required to merge a remote weave without a correspondent
weave in the local branch, the merge phase is skipped and the remote weave is
copied into the repository without other action.
The test below highlights a gain of 3x of user time, against a repository with
a history of 2548 revisions and 350 files. The repository is in the same machine,
which is a Duron 700MHz w/ 384MB of ram.
$ # w/ patch
$ time bzr branch http://kreijack.homelinux.net:8077/bazaar/hgweb_devel/
Branched 1279 revision(s).
real 59m9.511s
user 40m14.090s
sys 1m57.430s
$ # w/o patch
$ time bzr branch http://kreijack.homelinux.net:8077/bazaar/hgweb_devel/
Branched 1279 revision(s).
real 147m34.191s
user 122m10.273s
sys 5m43.247s
------------------------------------------------------------
merged: james.henstridge at canonical.com-20051124144621-a07e949c2bc2ccb5
parent: james.henstridge at canonical.com-20051124061234-dcad0140c10abf79
parent: mbp at sourcefrog.net-20051124063651-e74eb497a72609d6
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.sftp
timestamp: Thu 2005-11-24 22:46:21 +0800
message:
merge from bzr.dev
------------------------------------------------------------
merged: james.henstridge at canonical.com-20051124061234-dcad0140c10abf79
parent: james.henstridge at canonical.com-20051124042447-4adc3522e6ef6172
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.sftp
timestamp: Thu 2005-11-24 14:12:34 +0800
message:
Change SFTP url parsing back to treat the path in sftp://host/path as
homedir relative.
------------------------------------------------------------
merged: james.henstridge at canonical.com-20051124042447-4adc3522e6ef6172
parent: james.henstridge at canonical.com-20051123155318-897ce387da00a3bd
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.sftp
timestamp: Thu 2005-11-24 12:24:47 +0800
message:
Some test suite updates. The relative URI handling is pretty iffy ...
------------------------------------------------------------
merged: james.henstridge at canonical.com-20051123155318-897ce387da00a3bd
parent: james.henstridge at canonical.com-20051123073201-e27fe18a76845f6b
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.sftp
timestamp: Wed 2005-11-23 23:53:18 +0800
message:
More fixes
------------------------------------------------------------
merged: james.henstridge at canonical.com-20051123073201-e27fe18a76845f6b
parent: james.henstridge at canonical.com-20051123071514-c52a69fb25455d12
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.sftp
timestamp: Wed 2005-11-23 15:32:01 +0800
message:
Fix some bugs so it actually works
------------------------------------------------------------
merged: james.henstridge at canonical.com-20051123071514-c52a69fb25455d12
parent: mbp at sourcefrog.net-20051122230822-b876b5abe3f6bd0c
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.sftp
timestamp: Wed 2005-11-23 15:15:14 +0800
message:
Use /usr/bin/ssh if we can.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051130002550-47e24cc1e5fd5f50
parent: mbp at sourcefrog.net-20051129224508-a00d4c713de2d29c
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-30 11:25:50 +1100
message:
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
> When you use flat string on Windows for base part of file names then all
> derived file names is always representing as flat string. On Linux/Cygwin as
> I can see in situations when path cannot be represented as flat string (or in
> ascii encoding?) it silently converted to unicode. As result we have
> different behaviour with non-ascii (non-english) file names.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051129224508-a00d4c713de2d29c
parent: mbp at sourcefrog.net-20051129100414-54250ca617c5252c
parent: robertc at robertcollins.net-20051128083347-e792ce37b3ecd5a0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-30 09:45:08 +1100
message:
[merge] robertc
------------------------------------------------------------
merged: robertc at robertcollins.net-20051128083347-e792ce37b3ecd5a0
parent: robertc at robertcollins.net-20051128053717-b1a3a7dbe854eeae
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2005-11-28 19:33:47 +1100
message:
Unbreak self.build_tree_shape in tests.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051128053717-b1a3a7dbe854eeae
parent: robertc at robertcollins.net-20051128051341-059936f2f29a12c8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2005-11-28 16:37:17 +1100
message:
Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
If adding a new test script please add that to bzrlib.tests.blackbox.__init__.
(Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20051128051341-059936f2f29a12c8
parent: robertc at robertcollins.net-20051127225107-51ad77cb1f322e3d
parent: mbp at sourcefrog.net-20051125062856-e4c887417108fd9e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2005-11-28 16:13:41 +1100
message:
Merge from Martin. Adjust check to work with HTTP again.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051127225107-51ad77cb1f322e3d
parent: robertc at robertcollins.net-20051127223834-d00ecca0d0b9384a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2005-11-28 09:51:07 +1100
message:
Make the commenting out of a test in testconfig explicit.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051127223834-d00ecca0d0b9384a
parent: robertc at robertcollins.net-20051122212830-885c284847f0b17b
parent: mbp at sourcefrog.net-20051122043014-6df209fd93033b59
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2005-11-28 09:38:34 +1100
message:
Merge from mpool, adjusting check to retain HTTP support.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051122212830-885c284847f0b17b
parent: robertc at robertcollins.net-20051113201422-8a34ef413bfc8222
parent: mbp at sourcefrog.net-20051118081007-80523bf145eb319b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2005-11-23 08:28:30 +1100
message:
Merge from mpool.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051129100414-54250ca617c5252c
parent: mbp at sourcefrog.net-20051129075836-3623cd52d08943e4
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Tue 2005-11-29 21:04:14 +1100
message:
Remove dead Weave.merge() method (use weave_merge instead)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051129075836-3623cd52d08943e4
parent: mbp at sourcefrog.net-20051129073919-f54c6a6480761588
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Tue 2005-11-29 18:58:36 +1100
message:
Better display of BzrError classes that are not BzrNewErrors.
(Suggested by mpe)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051129073919-f54c6a6480761588
parent: mbp at sourcefrog.net-20051129073828-bdab256dd48bf4e8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Tue 2005-11-29 18:39:19 +1100
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051129073828-bdab256dd48bf4e8
parent: mbp at sourcefrog.net-20051129012057-b58ef94c6da92d25
parent: mbp at sourcefrog.net-20051129070922-00b43f2c7169525c
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Tue 2005-11-29 18:38:28 +1100
message:
[merge] remove basic_io; merge rio format
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051129070922-00b43f2c7169525c
parent: mbp at sourcefrog.net-20051128083556-5a3d8423b567599c
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.rio
timestamp: Tue 2005-11-29 18:09:22 +1100
message:
Remove basic_io in favor of rio.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051128083556-5a3d8423b567599c
parent: mbp at sourcefrog.net-20051128080342-b7db3190dca90484
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.rio
timestamp: Mon 2005-11-28 19:35:56 +1100
message:
Finish rio format and tests.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051128080342-b7db3190dca90484
parent: mbp at sourcefrog.net-20051128032041-b83d451b0a70bcd5
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.rio
timestamp: Mon 2005-11-28 19:03:42 +1100
message:
[broken] start converting basic_io to more rfc822-like format
Suggestions from mailing list:
no double quotes
no cute right-alignment
no escaping
just indent continuation lines
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051129012057-b58ef94c6da92d25
parent: mbp at sourcefrog.net-20051129011250-ff1702902b64498a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Tue 2005-11-29 12:20:57 +1100
message:
Use full terminal width for verbose test output.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051129011250-ff1702902b64498a
parent: mbp at sourcefrog.net-20051129004710-b17d0a7258f453f2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Tue 2005-11-29 12:12:50 +1100
message:
[patch] keep a cached basis inventory (Johan Rydberg)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051129004710-b17d0a7258f453f2
parent: mbp at sourcefrog.net-20051128042154-862e59e71e8cd5c5
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Tue 2005-11-29 11:47:10 +1100
message:
[patch] Better error when sftp urls are given with invalid port numbers (Matthieu Moy)
Plus test case from me.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051206051616-5952d343e0ea9a45
parent: mbp at sourcefrog.net-20051205120437-b6b3e28a9ea0fae5
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Tue 2005-12-06 16:16:16 +1100
message:
Remove deleted test of basicio from list of tests
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051205120437-b6b3e28a9ea0fae5
parent: mbp at sourcefrog.net-20051205070710-70afd75c420d1901
parent: john at arbash-meinel.com-20051204215501-9ee53a39579d1e28
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2005-12-05 23:04:37 +1100
message:
[merge] john
------------------------------------------------------------
merged: john at arbash-meinel.com-20051204215501-9ee53a39579d1e28
parent: john at arbash-meinel.com-20051204214539-cce799161beccc33
parent: mbp at sourcefrog.net-20051202054235-ea9c5479f97c3bf6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Sun 2005-12-04 15:55:01 -0600
message:
[merge] bzr.dev
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051202054235-ea9c5479f97c3bf6
parent: mbp at sourcefrog.net-20051202052553-164b888b6b8835bd
parent: mbp at sourcefrog.net-20051202044419-b9c98565fb46e473
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2005-12-02 16:42:35 +1100
message:
[merge] better test module loading
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051202044419-b9c98565fb46e473
parent: mbp at sourcefrog.net-20051201050927-e89c80bb2b71c4bc
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.testimporterror
timestamp: Fri 2005-12-02 15:44:19 +1100
message:
Better message when failing to import a test suite.
unittest masks them (who knows why?), so load test modules by hand
and get proper errors.
Add tests for loader and move around meta-tests.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051201050927-e89c80bb2b71c4bc
parent: mbp at sourcefrog.net-20051201050754-e800716ab4264446
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2005-12-01 16:09:27 +1100
message:
Status tests include unicode character.
Make it work by going to an encoded temporary file, not a StringIO.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051201050754-e800716ab4264446
parent: mbp at sourcefrog.net-20051201043514-e77b2696e370b75d
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2005-12-01 16:07:54 +1100
message:
Refactor status display code.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051201043514-e77b2696e370b75d
parent: mbp at sourcefrog.net-20051201003331-e26c04e018bcfc51
parent: john at arbash-meinel.com-20051201010206-0b2476ecb6f0f9a8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2005-12-01 15:35:14 +1100
message:
[merge] John, sftp and others
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201010206-0b2476ecb6f0f9a8
parent: john at arbash-meinel.com-20051130224614-bf204f5bf2201072
parent: john at arbash-meinel.com-20051201004321-67f38d47e3be46ec
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2005-11-30 19:02:06 -0600
message:
[merge] sftp fixes
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201004321-67f38d47e3be46ec
parent: john at arbash-meinel.com-20051201001638-cbdbada25e469d93
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp-fix
timestamp: Wed 2005-11-30 18:43:21 -0600
message:
Added a couple more test cases, just in case.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201001638-cbdbada25e469d93
parent: john at arbash-meinel.com-20051201001441-58b25763f5b0298d
parent: john at arbash-meinel.com-20051130224614-bf204f5bf2201072
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp-fix
timestamp: Wed 2005-11-30 18:16:38 -0600
message:
Merging the close_fds changes
------------------------------------------------------------
merged: john at arbash-meinel.com-20051130224614-bf204f5bf2201072
parent: john at arbash-meinel.com-20051130165254-9e8cb6d9383a06f7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Wed 2005-11-30 16:46:14 -0600
message:
From Matt Lavin: close_fds is not supported on Windows platforms
------------------------------------------------------------
merged: john at arbash-meinel.com-20051130165254-9e8cb6d9383a06f7
parent: mbp at sourcefrog.net-20051130064100-50469cf3ee5f42b2
parent: john at arbash-meinel.com-20051130164108-f5d8517a01eee379
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2005-11-30 10:52:54 -0600
message:
[merge] sftp fixes
------------------------------------------------------------
merged: john at arbash-meinel.com-20051130164108-f5d8517a01eee379
parent: john at arbash-meinel.com-20051130154357-614206b3a7b83cd0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp-fix
timestamp: Wed 2005-11-30 10:41:08 -0600
message:
Added get_password to the UIFactory, using it inside of sftp.py
------------------------------------------------------------
merged: john at arbash-meinel.com-20051130154357-614206b3a7b83cd0
parent: john at arbash-meinel.com-20051130153512-174444ce2e324335
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp-fix
timestamp: Wed 2005-11-30 09:43:57 -0600
message:
Refactored bzrlib/ui.py into a module with the possibility for multiple ui forms.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051130153512-174444ce2e324335
parent: john at arbash-meinel.com-20051130153220-89d7a3f2fde10714
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp-fix
timestamp: Wed 2005-11-30 09:35:12 -0600
message:
NEWS
------------------------------------------------------------
merged: john at arbash-meinel.com-20051130153220-89d7a3f2fde10714
parent: john at arbash-meinel.com-20051130151843-5861058d9a5f6271
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp-fix
timestamp: Wed 2005-11-30 09:32:20 -0600
message:
Testing that sftp.base gets properly sanitized
------------------------------------------------------------
merged: john at arbash-meinel.com-20051130151843-5861058d9a5f6271
parent: john at arbash-meinel.com-20051130151517-311798f286f65992
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp-fix
timestamp: Wed 2005-11-30 09:18:43 -0600
message:
Fixed a typo in sftp.py with port handling
------------------------------------------------------------
merged: john at arbash-meinel.com-20051130151517-311798f286f65992
parent: john at arbash-meinel.com-20051130150018-9eddb345cd6b42e1
parent: robey at lag.net-20051121232259-224d536cb891cd10
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp-fix
timestamp: Wed 2005-11-30 09:15:17 -0600
message:
[merge] Robey Pointer - some sftp fixes, and an http patch
------------------------------------------------------------
merged: robey at lag.net-20051121232259-224d536cb891cd10
parent: robey at lag.net-20051121230632-6b6173313d0f7887
committer: Robey Pointer <robey at lag.net>
branch nick: bzr
timestamp: Mon 2005-11-21 15:22:59 -0800
message:
allow user:pass@ info in http urls to be used for auth; this should be easily expandable later to use auth config files
------------------------------------------------------------
merged: robey at lag.net-20051121230632-6b6173313d0f7887
parent: robey at lag.net-20051121214635-12197cb50a89208c
committer: Robey Pointer <robey at lag.net>
branch nick: bzr
timestamp: Mon 2005-11-21 15:06:32 -0800
message:
fix the new sftp selftest (it was failing as written)
------------------------------------------------------------
merged: robey at lag.net-20051121214635-12197cb50a89208c
parent: robey at lag.net-20051120062236-90ee5ca81731a1ec
committer: Robey Pointer <robey at lag.net>
branch nick: bzr
timestamp: Mon 2005-11-21 13:46:35 -0800
message:
fix count display on push
------------------------------------------------------------
merged: robey at lag.net-20051120062236-90ee5ca81731a1ec
parent: robey at lag.net-20051118192158-506bbc6afe0e6c5e
parent: mbp at sourcefrog.net-20051118081007-80523bf145eb319b
committer: Robey Pointer <robey at lag.net>
branch nick: bzr
timestamp: Sat 2005-11-19 22:22:36 -0800
message:
merge from bzr.dev
------------------------------------------------------------
merged: robey at lag.net-20051118192158-506bbc6afe0e6c5e
parent: robey at lag.net-20051118081812-f15e6083232a1f08
committer: Robey Pointer <robey at lag.net>
branch nick: bzr
timestamp: Fri 2005-11-18 11:21:58 -0800
message:
make 'push' give a status line too
------------------------------------------------------------
merged: robey at lag.net-20051118081812-f15e6083232a1f08
parent: robey at lag.net-20051118071050-caf77d9406fc57d5
committer: Robey Pointer <robey at lag.net>
branch nick: bzr
timestamp: Fri 2005-11-18 00:18:12 -0800
message:
sftp doesn't allow rename of A to B if B already exists, so play some tricks (worked out on irc) where we move any existing file out of the way before renaming, and blow it away later
------------------------------------------------------------
merged: robey at lag.net-20051118071050-caf77d9406fc57d5
parent: robey at lag.net-20051118014640-199735f7f745701a
parent: john at arbash-meinel.com-20051105083701-efc57f6197d8b137
committer: Robey Pointer <robey at lag.net>
branch nick: bzr
timestamp: Thu 2005-11-17 23:10:50 -0800
message:
merge john's sftp fixes (atomic put, locking)
------------------------------------------------------------
merged: john at arbash-meinel.com-20051105083701-efc57f6197d8b137
parent: john at arbash-meinel.com-20051105075016-c11d132cd87c5a6a
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sat 2005-11-05 03:37:01 -0500
message:
Added a form of locking to sftp branches. Refactored _sftp_open_exclusive to take a relative path
------------------------------------------------------------
merged: john at arbash-meinel.com-20051105075016-c11d132cd87c5a6a
parent: john at arbash-meinel.com-20051105070627-193d996deee82a31
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sat 2005-11-05 02:50:16 -0500
message:
Adding a open_exclusive function since paramiko supports it, but doesn't expose it
------------------------------------------------------------
merged: john at arbash-meinel.com-20051105070627-193d996deee82a31
parent: mbp at sourcefrog.net-20051031205250-b0c7f1d9ece522f5
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sat 2005-11-05 02:06:27 -0500
message:
Updating SftpTransport.put() so that it is atomic
------------------------------------------------------------
merged: robey at lag.net-20051118014640-199735f7f745701a
parent: robey at lag.net-20051118004623-a5c0bd7a3897739a
parent: mbp at sourcefrog.net-20051117074538-5e113b7ad19a3b5d
committer: Robey Pointer <robey at lag.net>
branch nick: bzr
timestamp: Thu 2005-11-17 17:46:40 -0800
message:
merge from bzr.dev
------------------------------------------------------------
merged: robey at lag.net-20051118004623-a5c0bd7a3897739a
parent: robey at lag.net-20051115180504-29c471c8880c59be
committer: Robey Pointer <robey at lag.net>
timestamp: Thu 2005-11-17 16:46:23 -0800
message:
odd fix for python 2.4 bug on the mac: trick python into using locale settings instead of just assuming you're always using an archaic encoding
------------------------------------------------------------
merged: robey at lag.net-20051115180504-29c471c8880c59be
parent: robey at lag.net-20051114190227-2459f1718cfbd6eb
committer: Robey Pointer <robey at lag.net>
timestamp: Tue 2005-11-15 10:05:04 -0800
message:
oops, can't have keyword args for .encode
------------------------------------------------------------
merged: robey at lag.net-20051114190227-2459f1718cfbd6eb
parent: robey at lag.net-20051111233758-18a081aaa37092af
committer: Robey Pointer <robey at lag.net>
timestamp: Mon 2005-11-14 11:02:27 -0800
message:
set REUSEADDR on the listen socket in sftp transport tests, and delay opening the listening socket until we know the test is really going to run (some tests are currently stubs)
------------------------------------------------------------
merged: robey at lag.net-20051111233758-18a081aaa37092af
parent: robey at lag.net-20051111232620-4c5eb04d8ada7df1
committer: Robey Pointer <robey at lag.net>
timestamp: Fri 2005-11-11 15:37:58 -0800
message:
[erik bågfors] fix sftp relpath check to only check the path component of the url.
------------------------------------------------------------
merged: robey at lag.net-20051111232620-4c5eb04d8ada7df1
parent: robey at lag.net-20051111183105-b882a38267028163
committer: Robey Pointer <robey at lag.net>
timestamp: Fri 2005-11-11 15:26:20 -0800
message:
modification of a patch by alexey shamrin to make more of the transport tests pass on windows
------------------------------------------------------------
merged: robey at lag.net-20051111183105-b882a38267028163
parent: robey at lag.net-20051110224158-bc686cde6a05ca49
committer: Robey Pointer <robey at lag.net>
timestamp: Fri 2005-11-11 10:31:05 -0800
message:
modified patch from alexey shamrin & john meinel to stdout-encode the getpass prompts within SFTP transport, and a whine that we shouldn't be trying to do UI from there
------------------------------------------------------------
merged: robey at lag.net-20051110224158-bc686cde6a05ca49
parent: robey at lag.net-20051107230705-e576babae389e326
parent: mbp at sourcefrog.net-20051107162112-4f7170c06c6cde98
committer: Robey Pointer <robey at lag.net>
timestamp: Thu 2005-11-10 14:41:58 -0800
message:
merge from bzr.dev
------------------------------------------------------------
merged: robey at lag.net-20051107230705-e576babae389e326
parent: robey at lag.net-20051107075631-95a57ed02ee8cca0
committer: Robey Pointer <robey at lag.net>
timestamp: Mon 2005-11-07 15:07:05 -0800
message:
turn --quiet into a universal option, and make it squelch note/info-level messages
------------------------------------------------------------
merged: robey at lag.net-20051107075631-95a57ed02ee8cca0
parent: robey at lag.net-20051107075453-984036143634073f
committer: Robey Pointer <robey at lag.net>
timestamp: Sun 2005-11-06 23:56:31 -0800
message:
fix sftp urls to support the ietf draft url spec wrt relative vs absolute sftp urls (this will break existing branch urls); fix username/password parsing in sftp urls; add unit tests to make sure sftp url parsing is working
------------------------------------------------------------
merged: robey at lag.net-20051107075453-984036143634073f
parent: robey at lag.net-20051107052554-7b94656b5aec1a05
committer: Robey Pointer <robey at lag.net>
timestamp: Sun 2005-11-06 23:54:53 -0800
message:
note number of branched revisions when branching
------------------------------------------------------------
merged: robey at lag.net-20051107052554-7b94656b5aec1a05
parent: robey at lag.net-20051107050204-885fb734a3dd3906
committer: Robey Pointer <robey at lag.net>
timestamp: Sun 2005-11-06 21:25:54 -0800
message:
when doing a 'pull', display the number of revisions pulled; on 'commit', display the current (new) revision number
------------------------------------------------------------
merged: john at arbash-meinel.com-20051130150018-9eddb345cd6b42e1
parent: john at arbash-meinel.com-20051130145824-502cd85fac264723
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp-fix
timestamp: Wed 2005-11-30 09:00:18 -0600
message:
Disabling prefetch
------------------------------------------------------------
merged: john at arbash-meinel.com-20051130145824-502cd85fac264723
parent: john at arbash-meinel.com-20051130145503-95fed0de893c86a1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp-fix
timestamp: Wed 2005-11-30 08:58:24 -0600
message:
[patch] Robey Pointer - Need to adjust_cwd in _sftp_openexclusive
------------------------------------------------------------
merged: john at arbash-meinel.com-20051130145503-95fed0de893c86a1
parent: john at arbash-meinel.com-20051120182538-35c3c84165a794c7
parent: mbp at sourcefrog.net-20051130064100-50469cf3ee5f42b2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp-fix
timestamp: Wed 2005-11-30 08:55:03 -0600
message:
[merge] bzr.dev
------------------------------------------------------------
merged: john at arbash-meinel.com-20051120182538-35c3c84165a794c7
parent: john at arbash-meinel.com-20051120173001-f073d581983ee3ba
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-sftp-fix
timestamp: Sun 2005-11-20 12:25:38 -0600
message:
Removed delayed setup, since it broke some tests. Fixed other small bugs. All tests pass.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051120173001-f073d581983ee3ba
parent: john at arbash-meinel.com-20051120172759-e7f678bdd6d360ff
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-sftp-fix
timestamp: Sun 2005-11-20 11:30:01 -0600
message:
Changed pumpfile to work on blocks, rather than reading the entire file at once.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051120172759-e7f678bdd6d360ff
parent: john at arbash-meinel.com-20051120170043-52cdb7aefe86140e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-sftp-fix
timestamp: Sun 2005-11-20 11:27:59 -0600
message:
Setting up framework for making sftp remote copy faster
------------------------------------------------------------
merged: john at arbash-meinel.com-20051120170043-52cdb7aefe86140e
parent: john at arbash-meinel.com-20051120153725-0dfa31bf1347c014
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-sftp-fix
timestamp: Sun 2005-11-20 11:00:43 -0600
message:
Use a weakref dictionary to enable re-use of a connection (for sftp).
------------------------------------------------------------
merged: john at arbash-meinel.com-20051120153725-0dfa31bf1347c014
parent: john at arbash-meinel.com-20051120153517-2ef7391005322069
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-sftp-fix
timestamp: Sun 2005-11-20 09:37:25 -0600
message:
Removing the password from url after it is parsed, so we don't show it later.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051120153517-2ef7391005322069
parent: john at arbash-meinel.com-20051120152932-34456fecf99e4a39
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp-fix
timestamp: Sun 2005-11-20 09:35:17 -0600
message:
[unmerge] removed --quiet work from Robey's patches
------------------------------------------------------------
merged: john at arbash-meinel.com-20051120152932-34456fecf99e4a39
parent: john at arbash-meinel.com-20051120152735-212761084abc8469
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-sftp-fix
timestamp: Sun 2005-11-20 09:29:32 -0600
message:
Removing AttributeError exceptions in favor of hasattr
------------------------------------------------------------
merged: john at arbash-meinel.com-20051120152735-212761084abc8469
parent: john at arbash-meinel.com-20051120152100-fdc6af5f43c80e14
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-sftp-fix
timestamp: Sun 2005-11-20 09:27:35 -0600
message:
Fixed the double rename, to rename the safety in case of problem.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051120152100-fdc6af5f43c80e14
parent: john at arbash-meinel.com-20051120141001-c4d7a67c44b330b8
parent: robey at lag.net-20051118192158-506bbc6afe0e6c5e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp-fix
timestamp: Sun 2005-11-20 09:21:00 -0600
message:
[merge] Robey Pointer's sftp (+ be_quiet) changes
------------------------------------------------------------
merged: john at arbash-meinel.com-20051120141001-c4d7a67c44b330b8
parent: john at arbash-meinel.com-20051105083701-efc57f6197d8b137
parent: mbp at sourcefrog.net-20051118081007-80523bf145eb319b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp-fix
timestamp: Sun 2005-11-20 08:10:01 -0600
message:
[merge] up-to-date with bzr.dev
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201001441-58b25763f5b0298d
parent: john at arbash-meinel.com-20051130164108-f5d8517a01eee379
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp-fix
timestamp: Wed 2005-11-30 18:14:41 -0600
message:
bugreport from Matthieu Moy: relpath was failing, but throwing an unhelpful exception.
Exception is cleaned up with better information, ports are back to defaulting to None.
Also in test_sftp.py don't load bzrlib.transport.sftp unless paramiko exists, otherwise we would
get a premature exception when paramiko wasn't installed.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051201003331-e26c04e018bcfc51
parent: mbp at sourcefrog.net-20051130064100-50469cf3ee5f42b2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Thu 2005-12-01 11:33:31 +1100
message:
Emit warning to trace file only if using cElementTree.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051202052553-164b888b6b8835bd
parent: mbp at sourcefrog.net-20051201050927-e89c80bb2b71c4bc
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2005-12-02 16:25:53 +1100
message:
Fix commit message template for non-ascii files, and add test for handling of
non-unicode.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051204214539-cce799161beccc33
parent: john at arbash-meinel.com-20051204214109-c8ab203540fba5df
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Sun 2005-12-04 15:45:39 -0600
message:
Forgot to add the test case
------------------------------------------------------------
merged: john at arbash-meinel.com-20051204214109-c8ab203540fba5df
parent: john at arbash-meinel.com-20051203180221-6b0304c6353a9c9c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Sun 2005-12-04 15:41:09 -0600
message:
[patch] Michael Ellerman: 'Trivial patch to allow revno to take a location'
Plus a test case.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051203180221-6b0304c6353a9c9c
parent: john at arbash-meinel.com-20051202171817-0ac180714e18a125
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Sat 2005-12-03 12:02:21 -0600
message:
Added some extra logging when we get http exceptions.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051202171817-0ac180714e18a125
parent: john at arbash-meinel.com-20051202171410-3496e296756926f9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Fri 2005-12-02 11:18:17 -0600
message:
Changing final merge message to All changes applied successfully, rather than 0 conflicts applied.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051202171410-3496e296756926f9
parent: john at arbash-meinel.com-20051202054031-273baec33b90578c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Fri 2005-12-02 11:14:10 -0600
message:
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051202054031-273baec33b90578c
parent: john at arbash-meinel.com-20051201213142-3bf0c6acc9c5355d
parent: john at arbash-meinel.com-20051202053717-d7fd7760c548661e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2005-12-01 23:40:31 -0600
message:
[merge] Fixing port selection bug with sftp.py
------------------------------------------------------------
merged: john at arbash-meinel.com-20051202053717-d7fd7760c548661e
parent: john at arbash-meinel.com-20051201013132-76797e2be4758e1c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp-fix
timestamp: Thu 2005-12-01 23:37:17 -0600
message:
James Henstridge confirmed that sftp.py needs self._port or 22
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201013132-76797e2be4758e1c
parent: john at arbash-meinel.com-20051201004321-67f38d47e3be46ec
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp-fix
timestamp: Wed 2005-11-30 19:31:32 -0600
message:
Adding tests for remote sftp branches without working trees, plus a bugfix to allow push to still work with a warning.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201213142-3bf0c6acc9c5355d
parent: john at arbash-meinel.com-20051201211342-209492d29f37ef65
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2005-12-01 15:31:42 -0600
message:
[merge] Refactor NoSuchFile style exceptions.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201211342-209492d29f37ef65
parent: john at arbash-meinel.com-20051201164205-77a96ba84f3085f8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2005-12-01 15:13:42 -0600
message:
Don't import ui_factory directly, in case it gets changed later.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201164205-77a96ba84f3085f8
parent: john at arbash-meinel.com-20051201154910-65a7e42375c28cbc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2005-12-01 10:42:05 -0600
message:
[bug 3632] Matthieu Moy- bzr cat should default to last revision
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201154910-65a7e42375c28cbc
parent: john at arbash-meinel.com-20051201152250-e794a08480d6dfa9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2005-12-01 09:49:10 -0600
message:
Cleanup of test_pull.py headers
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201152250-e794a08480d6dfa9
parent: john at arbash-meinel.com-20051201151922-11869ebb4993123f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2005-12-01 09:22:50 -0600
message:
Fix broken test from refactoring blackbox/test_pull
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201151922-11869ebb4993123f
parent: john at arbash-meinel.com-20051201145705-28071de6fbc274af
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2005-12-01 09:19:22 -0600
message:
Fixed a broken test from my 'push updates local working tree' fix
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201145705-28071de6fbc274af
parent: john at arbash-meinel.com-20051201013527-f890aade00ef57b9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2005-12-01 08:57:05 -0600
message:
pull --overwrite should always overwrite, not just if diverged. (Test case from Robey Pointer)
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201013527-f890aade00ef57b9
parent: john at arbash-meinel.com-20051201010206-0b2476ecb6f0f9a8
parent: john at arbash-meinel.com-20051201013132-76797e2be4758e1c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2005-11-30 19:35:27 -0600
message:
[merge] fix bug where push was broken to remote trees
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051205070710-70afd75c420d1901
parent: mbp at sourcefrog.net-20051205032419-25f8b2e13aaabf8b
parent: robertc at robertcollins.net-20051202032347-ba08123207a945a0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2005-12-05 18:07:10 +1100
message:
[merge] robert
------------------------------------------------------------
merged: robertc at robertcollins.net-20051202032347-ba08123207a945a0
parent: robertc at robertcollins.net-20051129232031-916cdaefe3a3c19b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2005-12-02 14:23:47 +1100
message:
Test for Jeff Bailey.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051129232031-916cdaefe3a3c19b
parent: robertc at robertcollins.net-20051129224327-ea254360b6b77a3a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2005-11-30 10:20:31 +1100
message:
* bzrlib.plugin.all_plugins has been changed from an attribute to a
query method. (Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20051129224327-ea254360b6b77a3a
parent: robertc at robertcollins.net-20051128083347-e792ce37b3ecd5a0
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2005-11-30 09:43:27 +1100
message:
* Plugins with the same name in different directories in the bzr plugin
path are no longer loaded: only the first successfully loaded one is
used. (Robert Collins)
* bzrlib.plugin.all_plugins has been removed, instead look in
bzrlib.plugins. (Robert Collins)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051205032419-25f8b2e13aaabf8b
parent: mbp at sourcefrog.net-20051205031406-af55d2be22d9391a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2005-12-05 14:24:19 +1100
message:
Change fetch status message to "copying revision" so it makes sense when pushing.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051205031406-af55d2be22d9391a
parent: mbp at sourcefrog.net-20051205002644-087cb385d51c332b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2005-12-05 14:14:06 +1100
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051205002644-087cb385d51c332b
parent: mbp at sourcefrog.net-20051205002226-8ed952828d6e7e86
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2005-12-05 11:26:44 +1100
message:
Fix import error.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051205002226-8ed952828d6e7e86
parent: mbp at sourcefrog.net-20051202055901-560598c586ebe3ce
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2005-12-05 11:22:26 +1100
message:
Include new submodules in setup.py list of modules.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051202055901-560598c586ebe3ce
parent: mbp at sourcefrog.net-20051202054235-ea9c5479f97c3bf6
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2005-12-02 16:59:01 +1100
message:
pychecker cleanups
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051211222951-7adde03c2e93b70c
parent: aaron.bentley at utoronto.ca-20051211220440-287aea608ac8ed8b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 17:29:51 -0500
message:
All tests pass
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051211220440-287aea608ac8ed8b
parent: aaron.bentley at utoronto.ca-20051211220405-6002fa6de0ef8ce0
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 17:04:40 -0500
message:
Noted difference of opinion wrt BzrCommandError
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051211220405-6002fa6de0ef8ce0
parent: aaron.bentley at utoronto.ca-20051211215248-7e44e03f11ad2ec5
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 17:04:05 -0500
message:
Set status to 1 when there are missing revisions on either side.
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051211215248-7e44e03f11ad2ec5
parent: aaron.bentley at utoronto.ca-20051211202841-44e47aeb2895bf49
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 16:52:48 -0500
message:
fixed location handling to match old missing
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051211202841-44e47aeb2895bf49
parent: aaron.bentley at utoronto.ca-20051211075914-ef46f14b0ab647b8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 15:28:41 -0500
message:
Removed merge fix with no test case
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051211075914-ef46f14b0ab647b8
parent: aaron.bentley at utoronto.ca-20051211075126-7785e370b0f70cbc
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 02:59:14 -0500
message:
Added missing revision counts.
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051211075126-7785e370b0f70cbc
parent: abentley at panoramicfeedback.com-20051129211134-2e69b6ad9ef11c85
parent: mbp at sourcefrog.net-20051206065325-54ba77d544b4501a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 02:51:26 -0500
message:
merged the mainline
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129211134-2e69b6ad9ef11c85
parent: abentley at panoramicfeedback.com-20051129202344-10d31e85468d0de8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 16:11:34 -0500
message:
Added log formatter selection and show-ids to missing
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129202344-10d31e85468d0de8
parent: abentley at panoramicfeedback.com-20051129200000-cd4331961ebedd63
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 15:23:44 -0500
message:
Added no-difference message
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129200000-cd4331961ebedd63
parent: abentley at panoramicfeedback.com-20051129195419-9f87fe116aff380d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 15:00:00 -0500
message:
Refactored shortcut
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129195419-9f87fe116aff380d
parent: abentley at panoramicfeedback.com-20051129192044-43b22b9806c73fb3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 14:54:19 -0500
message:
Added revision-history shortcuts
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129192044-43b22b9806c73fb3
parent: abentley at panoramicfeedback.com-20051129191719-08a4f85324588aa5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 14:20:44 -0500
message:
Ensured progress bar is cleaned up except for lock errors
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129191719-08a4f85324588aa5
parent: abentley at panoramicfeedback.com-20051129184747-3f28d5b7a02f7955
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 14:17:19 -0500
message:
More refactoring, handled branches with no commits
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129184747-3f28d5b7a02f7955
parent: abentley at panoramicfeedback.com-20051129183500-0da736b0a323dded
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 13:47:47 -0500
message:
Used more set operations
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129183500-0da736b0a323dded
parent: abentley at panoramicfeedback.com-20051129183421-8ee4609bc4c8fec3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 13:35:00 -0500
message:
Inverted the meaning of reverse
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129183421-8ee4609bc4c8fec3
parent: abentley at panoramicfeedback.com-20051129181721-b7818abfc198e50a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 13:34:21 -0500
message:
Restructured find_unmerged, so it returns lists of (revno, revision) pairs
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129181721-b7818abfc198e50a
parent: abentley at panoramicfeedback.com-20051129174759-b6fc5d163e28834b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 13:17:21 -0500
message:
Factored out find_unmerged
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129174759-b6fc5d163e28834b
parent: abentley at panoramicfeedback.com-20051129174721-c2ba7e09668e0b89
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 12:47:59 -0500
message:
Replace missing
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129174721-c2ba7e09668e0b89
parent: aaron.bentley at utoronto.ca-20051129050222-56e09f54af4e21d5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 12:47:21 -0500
message:
Import Kinnison's plugin
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051129050222-56e09f54af4e21d5
parent: aaron.bentley at utoronto.ca-20051126013218-9c8e1f00ccba641e
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2005-11-29 00:02:22 -0500
message:
Fixed revert bug [NEEDS TEST CASE]
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051212052559-d3b1591f2404e90a
parent: mbp at sourcefrog.net-20051208120109-dbead329ce38f295
parent: michael at ellerman.id.au-20051209071246-cc9d514bb992f011
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2005-12-12 16:25:59 +1100
message:
[merge] add --dry-run option (mpe)
------------------------------------------------------------
merged: michael at ellerman.id.au-20051209071246-cc9d514bb992f011
parent: michael at ellerman.id.au-20051209071231-5b895fd4faca47b8
committer: Michael Ellerman <michael at ellerman.id.au>
branch nick: add-dry-run
timestamp: Fri 2005-12-09 01:12:46 -0600
message:
Add tests for bzr add --dry-run
------------------------------------------------------------
merged: michael at ellerman.id.au-20051209071231-5b895fd4faca47b8
parent: mbp at sourcefrog.net-20051206065325-54ba77d544b4501a
committer: Michael Ellerman <michael at ellerman.id.au>
branch nick: add-dry-run
timestamp: Fri 2005-12-09 01:12:31 -0600
message:
Add support for bzr add --dry-run
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051208120109-dbead329ce38f295
parent: mbp at sourcefrog.net-20051208073529-61ad33e6c4fc8e61
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2005-12-08 23:01:09 +1100
message:
[patch] add a selftest test that the setup build script works (Alexander Belchenko)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051208073529-61ad33e6c4fc8e61
parent: mbp at sourcefrog.net-20051208071308-3a71ecddda863fa8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2005-12-08 18:35:29 +1100
message:
[patch] read only the table-of-contents of weaves to speed up commit
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051208071308-3a71ecddda863fa8
parent: mbp at sourcefrog.net-20051208071037-1a8ad346ec267c2d
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2005-12-08 18:13:08 +1100
message:
[patch] refactor code that make sure stores are opened with unicode filenames (robertc)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051208071037-1a8ad346ec267c2d
parent: mbp at sourcefrog.net-20051208061800-1849090041773314
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2005-12-08 18:10:37 +1100
message:
Add additional module for lsprof.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051208061800-1849090041773314
parent: mbp at sourcefrog.net-20051208040047-8fdf91aa5b0047f0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2005-12-08 17:18:00 +1100
message:
New --lsprof option from Denys Duchier
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051208040047-8fdf91aa5b0047f0
parent: mbp at sourcefrog.net-20051206065325-54ba77d544b4501a
parent: robertc at robertcollins.net-20051207061337-6edae828b9c29103
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2005-12-08 15:00:47 +1100
message:
[merge] robertc, small tests
------------------------------------------------------------
merged: robertc at robertcollins.net-20051207061337-6edae828b9c29103
parent: robertc at robertcollins.net-20051207055358-757787e694d89456
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2005-12-07 17:13:37 +1100
message:
Test for the number of uses of self.working_tree() in branch.py
------------------------------------------------------------
merged: robertc at robertcollins.net-20051207055358-757787e694d89456
parent: robertc at robertcollins.net-20051207030832-1f86f7bf2daeecf2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2005-12-07 16:53:58 +1100
message:
Test for the number of uses of self.working_tree() in branch.py
------------------------------------------------------------
merged: robertc at robertcollins.net-20051207030832-1f86f7bf2daeecf2
parent: robertc at robertcollins.net-20051206082223-46591e053716a9ce
parent: mbp at sourcefrog.net-20051206065325-54ba77d544b4501a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2005-12-07 14:08:32 +1100
message:
Merge from mbp.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051206082223-46591e053716a9ce
parent: robertc at robertcollins.net-20051206050437-700e48df5e094d7f
parent: mbp at sourcefrog.net-20051206051943-e7422764401f2d2e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2005-12-06 19:22:23 +1100
message:
Merge from mbp AGAIN.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051206050437-700e48df5e094d7f
parent: robertc at robertcollins.net-20051205074009-ab11929b3456c4c9
parent: mbp at sourcefrog.net-20051205120437-b6b3e28a9ea0fae5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2005-12-06 16:04:37 +1100
message:
merge from mbp.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051205074009-ab11929b3456c4c9
parent: robertc at robertcollins.net-20051202032347-ba08123207a945a0
parent: mbp at sourcefrog.net-20051205032419-25f8b2e13aaabf8b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2005-12-05 18:40:09 +1100
message:
Merge from mbp.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051208055700-5d85edd70fd15d4d
parent: robertc at robertcollins.net-20051207061337-6edae828b9c29103
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2005-12-08 16:57:00 +1100
message:
Test the uses of WorkingTree from branch.py
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051213035433-26282b8f72702fc3
parent: mbp at sourcefrog.net-20051212072002-d3a0d6a76a3017c0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Tue 2005-12-13 14:54:33 +1100
message:
[patch] Speed improvement for Weave.join() (Goffredo Baroncelli)
More information about the bazaar-commits
mailing list