Rev 1427: Merge from integration. in
/home/robertc/source/baz/checkout
Robert Collins
robertc at robertcollins.net
Tue Jan 10 09:46:00 GMT 2006
------------------------------------------------------------
revno: 1427
revision-id: robertc at robertcollins.net-20060110094553-4be9f3f7c641d03b
parent: robertc at robertcollins.net-20051123071842-ac5f13e1eb9d905b
parent: robertc at robertcollins.net-20060109051935-ee3847274413fe22
committer: Robert Collins <robertc at robertcollins.net>
branch nick: checkout
timestamp: Tue 2006-01-10 20:45:53 +1100
message:
Merge from integration.
added:
BRANCH.TODO BRANCH.TODO-20060103052123-79ac4969351c03a9
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/lsprof.py lsprof.py-20051208071030-833790916798ceed
bzrlib/rio.py rio.py-20051128032247-770b120b34dfff60
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
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_export.py test_export.py-20051229024010-e6c26658e460fb1c
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/test_basis_inventory.py test_basis_inventory.py-20051218151655-3650468941091309
bzrlib/tests/test_missing.py test_missing.py-20051212000028-694fa4f658a81f48
bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
bzrlib/tests/test_remove.py test_remove.py-20051212071329-1925f463b565a5c3
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_source.py test_source.py-20051207061333-a58dea6abecc030d
bzrlib/tests/test_symbol_versioning.py test_symbol_versioning.py-20060105104851-51d7722c2018d42b
bzrlib/tests/test_ui.py test_ui.py-20051130162854-458e667a7414af09
bzrlib/tests/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
bzrlib/ui/ ui-20051130153613-246bba9a38f01be6
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
bzrlib/uncommit.py uncommit.py-20050626215513-5ec509fa425b305c
tools/biobench.py biobench.py-20051101131608-0942e1592d0a8ba9
tools/riodemo.py riodemo.py-20051128080255-352dc1600f3d58c7
renamed:
bzrlib/selftest => bzrlib/tests selftest-20050621060616-bb8b5b36e3c950c8
bzrlib/selftest/blackbox.py => bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/selftest/test_revision_info.py => bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
bzrlib/selftest/testannotate.py => bzrlib/tests/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
bzrlib/selftest/testapi.py => bzrlib/tests/test_api.py testapi.py-20051027033546-6f9be2d308d18a52
bzrlib/selftest/testbranch.py => bzrlib/tests/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/selftest/testconfig.py => bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
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/testgpg.py => bzrlib/tests/test_gpg.py testgpg.py-20051017042228-9276cd40a784c93c
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/testhttp.py => bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
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/testnonascii.py => bzrlib/tests/test_nonascii.py testnonascii.py-20051018022645-ea1d8b6477b058a6
bzrlib/selftest/testoptions.py => bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/selftest/testplugins.py => bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
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/testrevprops.py => bzrlib/tests/test_revprops.py testrevprops.py-20051013073044-92bc3c68302ce1bf
bzrlib/selftest/testreweave.py => bzrlib/tests/test_reweave.py testreweave.py-20051025042437-a2a02abae3551489
bzrlib/selftest/testsampler.py => bzrlib/tests/test_sampler.py testsampler.py-20051006114006-67f6d8ecb1fda6de
bzrlib/selftest/testsftp.py => bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
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/testtestament.py => bzrlib/tests/test_testament.py testtestament.py-20051011100429-5df1657310caa929
bzrlib/selftest/testtrace.py => bzrlib/tests/test_trace.py testtrace.py-20051110225523-a21117fc7a07eeff
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/testtsort.py => bzrlib/tests/test_tsort.py testtsort.py-20051025073946-27da871c394d5be4
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
HACKING HACKING-20050805200004-2a5dc975d870f78c
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
TODO TODO-20050426050852-44d2ad9048dafbe9
bzr_man.py bzrman.py-20050601153041-0ff7f74de456d15e
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/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/conflicts.py conflicts.py-20051001061850-78ef952ba63d2b42
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/intset.py intset.py-20050717175247-81cd658f9aaa2731
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
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/option.py option.py-20051014052914-661fb36e76e7362f
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/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/stub_sftp.py stub_sftp.py-20051027032739-0e7ef4f7bab0e174
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_command.py test_command.py-20051019190109-3b17be0f52eaa7a8
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_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/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/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
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tutorial.txt tutorial.txt-20050804190939-9dcbba2ef053bc84
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
bzrlib/tests/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
bzrlib/tests/test_api.py testapi.py-20051027033546-6f9be2d308d18a52
bzrlib/tests/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_gpg.py testgpg.py-20051017042228-9276cd40a784c93c
bzrlib/tests/test_graph.py testgraph.py-20050905070950-42e6c958106610fd
bzrlib/tests/test_hashcache.py testhashcache.py-20050706091800-0288ab2659338981
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_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_nonascii.py testnonascii.py-20051018022645-ea1d8b6477b058a6
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_revisionnamespaces.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
bzrlib/tests/test_revprops.py testrevprops.py-20051013073044-92bc3c68302ce1bf
bzrlib/tests/test_reweave.py testreweave.py-20051025042437-a2a02abae3551489
bzrlib/tests/test_sampler.py testsampler.py-20051006114006-67f6d8ecb1fda6de
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
bzrlib/tests/test_testament.py testtestament.py-20051011100429-5df1657310caa929
bzrlib/tests/test_trace.py testtrace.py-20051110225523-a21117fc7a07eeff
bzrlib/tests/test_transactions.py testtransaction.py-20051006222840-1f55858f890d4b0a
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_tsort.py testtsort.py-20051025073946-27da871c394d5be4
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: robertc at robertcollins.net-20060109051935-ee3847274413fe22
parent: robertc at robertcollins.net-20060105224859-b3a1f2be759672fc
parent: mbp at sourcefrog.net-20060109015138-d6d6eeb91df1ff0a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2006-01-09 16:19:35 +1100
message:
merge from Martin.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060109015138-d6d6eeb91df1ff0a
parent: mbp at sourcefrog.net-20060108233527-3f536f604c954d72
parent: mbp at sourcefrog.net-20060106121804-effcf89487f01864
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2006-01-09 12:51:38 +1100
message:
[merge] Move in tutorial text from wiki.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060106121804-effcf89487f01864
parent: mbp at sourcefrog.net-20060106011305-3772285d84b5cbb4
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2006-01-06 23:18:04 +1100
message:
Move in tutorial text from wiki.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060106011305-3772285d84b5cbb4
parent: mbp at sourcefrog.net-20060105090132-968677325eab0148
parent: robertc at robertcollins.net-20060105224859-b3a1f2be759672fc
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2006-01-06 12:13:05 +1100
message:
[merge] robertc
------------------------------------------------------------
merged: robertc at robertcollins.net-20060105224859-b3a1f2be759672fc
parent: robertc at robertcollins.net-20060105214856-c88e035070de8465
parent: robertc at robertcollins.net-20060105224446-a1ee05b67dead4fc
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2006-01-06 09:48:59 +1100
message:
Merge in :
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion
for functions that need unicode strings. (Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20060105224446-a1ee05b67dead4fc
parent: robertc at robertcollins.net-20060105223059-a8b64f7b47cf12fb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: safe_unicode
timestamp: Fri 2006-01-06 09:44:46 +1100
message:
An extra test for John.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060105223059-a8b64f7b47cf12fb
parent: robertc at robertcollins.net-20060105214856-c88e035070de8465
committer: Robert Collins <robertc at robertcollins.net>
branch nick: safe_unicode
timestamp: Fri 2006-01-06 09:30:59 +1100
message:
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion
for functions that need unicode strings. (Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20060105214856-c88e035070de8465
parent: robertc at robertcollins.net-20060105213257-72e57eb4e30b0bc2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2006-01-06 08:48:56 +1100
message:
Bugfix the symbol_versioning deprecation decorators to update the
__module__ attribute of methods and functions. (Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20060105213257-72e57eb4e30b0bc2
parent: robertc at robertcollins.net-20060104233225-7ce047eb1fca63ec
parent: robertc at robertcollins.net-20060105124646-af18da35bc3f64b4
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2006-01-06 08:32:57 +1100
message:
* Deprecated functions and methods can now be marked as such using the
bzrlib.symbol_versioning module. Marked method have their docstring
updated and will issue a DeprecationWarning using the warnings module
when they are used. (Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20060105124646-af18da35bc3f64b4
parent: robertc at robertcollins.net-20060105120726-6c818f10b227aa62
committer: Robert Collins <robertc at robertcollins.net>
branch nick: deprecation
timestamp: Thu 2006-01-05 23:46:46 +1100
message:
Set the __name__ attribute on decorated methods and functions.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060105120726-6c818f10b227aa62
parent: robertc at robertcollins.net-20060105114350-e21c40532770563e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: deprecation
timestamp: Thu 2006-01-05 23:07:26 +1100
message:
Update NEWS and HACKING for the symbol_versioning module.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060105114350-e21c40532770563e
parent: robertc at robertcollins.net-20060105110307-21db4cbdfd94f2c6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: deprecation
timestamp: Thu 2006-01-05 22:43:50 +1100
message:
decorate docstrings in deprecated functions.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060105110307-21db4cbdfd94f2c6
parent: robertc at robertcollins.net-20060105104926-6e5dc14eff2352ca
committer: Robert Collins <robertc at robertcollins.net>
branch nick: deprecation
timestamp: Thu 2006-01-05 22:03:07 +1100
message:
Implement deprecated_function.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060105104926-6e5dc14eff2352ca
parent: robertc at robertcollins.net-20060104233225-7ce047eb1fca63ec
committer: Robert Collins <robertc at robertcollins.net>
branch nick: deprecation
timestamp: Thu 2006-01-05 21:49:26 +1100
message:
Implement deprecated_method
------------------------------------------------------------
merged: robertc at robertcollins.net-20060104233225-7ce047eb1fca63ec
parent: robertc at robertcollins.net-20060103052137-4956578fbb0736ba
parent: john at arbash-meinel.com-20060103154418-e6b640e95a1d0e03
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-01-05 10:32:25 +1100
message:
Merge from jam-integration.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060103154418-e6b640e95a1d0e03
parent: john at arbash-meinel.com-20060103154333-d2620f4ef0458ac5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-01-03 09:44:18 -0600
message:
Changed exception traceback route to not use hasattr, which generates its own exception.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060103154333-d2620f4ef0458ac5
parent: john at arbash-meinel.com-20060103153337-115c924bb00ae6b3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-01-03 09:43:33 -0600
message:
Fixed exception handling for fancy_rename
------------------------------------------------------------
merged: john at arbash-meinel.com-20060103153337-115c924bb00ae6b3
parent: john at arbash-meinel.com-20060103152652-5a066586feb99370
parent: john at arbash-meinel.com-20060103151011-2ad890a2ff1475a4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-01-03 09:33:37 -0600
message:
[merge] bzr-jam-pending 1498
------------------------------------------------------------
merged: john at arbash-meinel.com-20060103151011-2ad890a2ff1475a4
parent: john at arbash-meinel.com-20051230220342-1b6b476e301bb9b4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Tue 2006-01-03 09:10:11 -0600
message:
Deprecating bzrlib.get_bzr_revision, in favor of bzrlib.builtins._get_bzr_branch
------------------------------------------------------------
merged: john at arbash-meinel.com-20051230220342-1b6b476e301bb9b4
parent: john at arbash-meinel.com-20051230220140-49a50fa3e9215751
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Fri 2005-12-30 16:03:42 -0600
message:
Whitespace cleanup.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051230220140-49a50fa3e9215751
parent: john at arbash-meinel.com-20051230205447-e72814c9e3f22832
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Fri 2005-12-30 16:01:40 -0600
message:
Updated test_set_user_setting_sets_and_saves to remove the print statement, and make sure it is doing the right thing
------------------------------------------------------------
merged: john at arbash-meinel.com-20051230205447-e72814c9e3f22832
parent: john at arbash-meinel.com-20051230204950-1d268051a677a105
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Fri 2005-12-30 14:54:47 -0600
message:
Updated -r revid:foo so that it can match revisions which aren't in the revision history
------------------------------------------------------------
merged: john at arbash-meinel.com-20051230204950-1d268051a677a105
parent: john at arbash-meinel.com-20051230204348-692603ab9626b8d1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Fri 2005-12-30 14:49:50 -0600
message:
Forgot a comma
------------------------------------------------------------
merged: john at arbash-meinel.com-20051230204348-692603ab9626b8d1
parent: john at arbash-meinel.com-20051229023607-95f3ed4a0404cfa5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Fri 2005-12-30 14:43:48 -0600
message:
Sorted the blackbox tests into alphabetical order.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051229023607-95f3ed4a0404cfa5
parent: john at arbash-meinel.com-20051228194754-27fd0b38f0b9a7f2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Wed 2005-12-28 20:36:07 -0600
message:
test_revision_info.py is actually a blackbox test.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051228194754-27fd0b38f0b9a7f2
parent: john at arbash-meinel.com-20051222233243-1ff7ae626c03d3d3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Wed 2005-12-28 13:47:54 -0600
message:
bzr --version prints branch nickname.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051222233243-1ff7ae626c03d3d3
parent: john at arbash-meinel.com-20051222232530-4e3a7260b6f0384b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2005-12-22 17:32:43 -0600
message:
Whitespace cleanups.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051222232530-4e3a7260b6f0384b
parent: john at arbash-meinel.com-20051222141507-756316fc76229621
parent: denys.duchier at mozart-oz.org-20051222190314-bc62a9e63173500a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2005-12-22 17:25:30 -0600
message:
[merge] Dennis Duchier, some cleanups of the bzr merge code.
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20051222190314-bc62a9e63173500a
parent: denys.duchier at mozart-oz.org-20051222185700-2a2fbee2e89c40d5
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.cleanup
timestamp: Thu 2005-12-22 20:03:14 +0100
message:
sort with key and reverse is standard in Python 2.4
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20051222185700-2a2fbee2e89c40d5
parent: denys.duchier at mozart-oz.org-20051222183620-e8b04a95ac15de41
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.cleanup
timestamp: Thu 2005-12-22 19:57:00 +0100
message:
"reversed" is standard in Python 2.4
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20051222183620-e8b04a95ac15de41
parent: mbp at sourcefrog.net-20051216014735-906c2145b95924eb
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.cleanup
timestamp: Thu 2005-12-22 19:36:20 +0100
message:
removed support for applying changesets in reverse
Reverse application of a changeset can just as well be achieved by
reversing the changeset itself (i.e. exchanging the sides) and then
applying it forward.
Following Aaron's suggestion, I also removed support for composing
changesets.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051216014735-906c2145b95924eb
parent: mbp at sourcefrog.net-20051216003931-476d497e6dbd21b9
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2005-12-16 12:47:35 +1100
message:
Remove config.guess and configure.in from builtin ignore list.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051216003931-476d497e6dbd21b9
parent: mbp at sourcefrog.net-20051216002517-73448ea063865983
parent: robertc at robertcollins.net-20051215083203-07b824bae89674c1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2005-12-16 11:39:31 +1100
message:
[merge] robert
------------------------------------------------------------
merged: robertc at robertcollins.net-20051215083203-07b824bae89674c1
parent: robertc at robertcollins.net-20051215032958-9ca8405f44373730
parent: abentley at panoramicfeedback.com-20051214183411-f013b7006e68d0eb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2005-12-15 19:32:03 +1100
message:
* bzr add now lists how many files were ignored per glob. add --verbose
lists the specific files. (Aaron Bentley)
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051214183411-f013b7006e68d0eb
parent: abentley at panoramicfeedback.com-20051213201315-8f8f4ab3bc677d35
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2005-12-14 13:34:11 -0500
message:
Updated NEWS about add and ignored
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051213201315-8f8f4ab3bc677d35
parent: abentley at panoramicfeedback.com-20051213185657-3f900268287d6559
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2005-12-13 15:13:15 -0500
message:
Added verbose option to bzr add, to list all ignored files.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051213185657-3f900268287d6559
parent: abentley at panoramicfeedback.com-20051213175140-f78fa05a446006fa
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2005-12-13 13:56:57 -0500
message:
bzr add reports ignored patterns.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051213175140-f78fa05a446006fa
parent: abentley at panoramicfeedback.com-20051212172310-38340344da93b3cf
parent: mbp at sourcefrog.net-20051213054804-e1dcb0c21cacd174
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2005-12-13 12:51:40 -0500
message:
Merged the mainline
------------------------------------------------------------
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: 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: 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)
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051212172310-38340344da93b3cf
parent: abentley at panoramicfeedback.com-20051212171442-c5eeec64016bb1f7
parent: mbp at sourcefrog.net-20051212072002-d3a0d6a76a3017c0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2005-12-12 12:23:10 -0500
message:
Merged mainline
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051212171442-c5eeec64016bb1f7
parent: aaron.bentley at utoronto.ca-20051212002414-d5c9e3eab54e705a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2005-12-12 12:14:42 -0500
message:
Use unicode pathname in cmd_missing
------------------------------------------------------------
merged: robertc at robertcollins.net-20051215032958-9ca8405f44373730
parent: robertc at robertcollins.net-20051215032111-e68d5e6ffbd4b574
parent: michael at ellerman.id.au-20051212073124-b228f6206d4f395d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2005-12-15 14:29:58 +1100
message:
Take Michaels nicer NEWS entry for dry-run.
------------------------------------------------------------
merged: michael at ellerman.id.au-20051212073124-b228f6206d4f395d
parent: michael at ellerman.id.au-20051209071246-cc9d514bb992f011
committer: Michael Ellerman <michael at ellerman.id.au>
branch nick: add-dry-run
timestamp: Mon 2005-12-12 01:31:24 -0600
message:
Add NEWS entry for bzr add --dry-run
------------------------------------------------------------
merged: robertc at robertcollins.net-20051215032111-e68d5e6ffbd4b574
parent: robertc at robertcollins.net-20051214075934-6e951a9908674e50
parent: michael at ellerman.id.au-20051210221145-7765347ea4ca0093
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2005-12-15 14:21:11 +1100
message:
* Raise NoSuchFile when someone tries to add a non-existant file.
(Michael Ellerman)
* Simplify handling of DivergedBranches in cmd_pull().
(Michael Ellerman)
------------------------------------------------------------
merged: michael at ellerman.id.au-20051210221145-7765347ea4ca0093
parent: michael at ellerman.id.au-20051210221113-99ca561aaab4661e
committer: Michael Ellerman <michael at ellerman.id.au>
branch nick: fixes
timestamp: Sat 2005-12-10 16:11:45 -0600
message:
Raise NoSuchFile when someone tries to add a non-existant file.
------------------------------------------------------------
merged: michael at ellerman.id.au-20051210221113-99ca561aaab4661e
parent: mbp at sourcefrog.net-20051206065325-54ba77d544b4501a
committer: Michael Ellerman <michael at ellerman.id.au>
branch nick: fixes
timestamp: Sat 2005-12-10 16:11:13 -0600
message:
Simplify handling of DivergedBranches in cmd_pull()
------------------------------------------------------------
merged: robertc at robertcollins.net-20051214075934-6e951a9908674e50
parent: robertc at robertcollins.net-20051212223421-c0f6e7a7fae0b5ee
parent: mbp at sourcefrog.net-20051213054804-e1dcb0c21cacd174
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2005-12-14 18:59:34 +1100
message:
merge from mbp.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051216002517-73448ea063865983
parent: mbp at sourcefrog.net-20051216001728-5c9086013d1bbf8f
parent: robertc at robertcollins.net-20051214090140-b70938f467aaea6f
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2005-12-16 11:25:17 +1100
message:
[merge] robertc: file encoding tests, and run all tests in C locale as well as default
------------------------------------------------------------
merged: robertc at robertcollins.net-20051214090140-b70938f467aaea6f
parent: robertc at robertcollins.net-20051214075326-3c1f619fa0f73514
committer: Robert Collins <robertc at robertcollins.net>
branch nick: run_tests_twice_for_i18n
timestamp: Wed 2005-12-14 20:01:40 +1100
message:
forgot my self.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051214075326-3c1f619fa0f73514
parent: robertc at robertcollins.net-20051212233303-1084576233b6e3b1
parent: mbp at sourcefrog.net-20051213054804-e1dcb0c21cacd174
committer: Robert Collins <robertc at robertcollins.net>
branch nick: run_tests_twice_for_i18n
timestamp: Wed 2005-12-14 18:53:26 +1100
message:
Merge from upstream.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051212233303-1084576233b6e3b1
parent: robertc at robertcollins.net-20051212231443-a2228c4350ea0a14
committer: Robert Collins <robertc at robertcollins.net>
branch nick: run_tests_twice_for_i18n
timestamp: Tue 2005-12-13 10:33:03 +1100
message:
Fix typo in my msgeditor test changes.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051212231443-a2228c4350ea0a14
parent: robertc at robertcollins.net-20051212223421-c0f6e7a7fae0b5ee
committer: Robert Collins <robertc at robertcollins.net>
branch nick: run_tests_twice_for_i18n
timestamp: Tue 2005-12-13 10:14:43 +1100
message:
Run the test suite with no locale as well as the default locale. Also add a test for build_tree_shape to selftest.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051216001728-5c9086013d1bbf8f
parent: mbp at sourcefrog.net-20051213054804-e1dcb0c21cacd174
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2005-12-16 11:17:28 +1100
message:
Add notes on merge/review process.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051222141507-756316fc76229621
parent: john at arbash-meinel.com-20051221163838-e5a9f3cb827de3e0
parent: denys.duchier at mozart-oz.org-20051221231921-e38aacd973ce2e59
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2005-12-22 08:15:07 -0600
message:
[merge] Denys Duchier, more tests for test_merge_core, and fixup of one test.
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20051221231921-e38aacd973ce2e59
parent: denys.duchier at mozart-oz.org-20051221220143-193db4ab8caca5d1
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.tests
timestamp: Thu 2005-12-22 00:19:21 +0100
message:
bug fix: missing basename in test_file_moves
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20051221220143-193db4ab8caca5d1
parent: denys.duchier at mozart-oz.org-20051221215958-368732b52af4b8a3
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.tests2
timestamp: Wed 2005-12-21 23:01:43 +0100
message:
4 new merge tests suggested by abentley
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20051221215958-368732b52af4b8a3
parent: mbp at sourcefrog.net-20051216014735-906c2145b95924eb
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.tests2
timestamp: Wed 2005-12-21 22:59:58 +0100
message:
two new tests suggested by abentley
------------------------------------------------------------
merged: john at arbash-meinel.com-20051221163838-e5a9f3cb827de3e0
parent: john at arbash-meinel.com-20051220024527-c62e00c739161df8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Wed 2005-12-21 10:38:38 -0600
message:
[patch] from duchier, include more tests of the merge core.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051220024527-c62e00c739161df8
parent: john at arbash-meinel.com-20051219203101-7d7eba36c66dbfc4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Mon 2005-12-19 20:45:27 -0600
message:
Whitespace and other formatting cleanups suggested by Robert.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051219203101-7d7eba36c66dbfc4
parent: john at arbash-meinel.com-20051219182315-9ff26ff83ae1c43e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Mon 2005-12-19 14:31:01 -0600
message:
Lots of updates for 'bzr check'
Added get_sha1() to Weave,
Updated RevisionTree so that it takes a Branch
(thus it can use get_transaction()),
changed 'bzr check' so that it uses Weave.check(),
rather than having each file extract its own text
------------------------------------------------------------
merged: john at arbash-meinel.com-20051219182315-9ff26ff83ae1c43e
parent: john at arbash-meinel.com-20051219180840-331adddc8d5627c3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Mon 2005-12-19 12:23:15 -0600
message:
Cleaned up the check code by using self._walk() instead of manually writing the loop.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051219180840-331adddc8d5627c3
parent: john at arbash-meinel.com-20051219180624-c16ede0bafc0c21c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Mon 2005-12-19 12:08:40 -0600
message:
Change Weave.check() so that it checks all revisions in parallel.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051219180624-c16ede0bafc0c21c
parent: john at arbash-meinel.com-20051219174825-3046c2b52fda89dc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Mon 2005-12-19 12:06:24 -0600
message:
IntSet doesn't actually provide a performance improvement, so ignore it
------------------------------------------------------------
merged: john at arbash-meinel.com-20051219174825-3046c2b52fda89dc
parent: john at arbash-meinel.com-20051219173644-673e0a432d001872
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Mon 2005-12-19 11:48:25 -0600
message:
Added set_remove to get the set delete function to IntSet
------------------------------------------------------------
merged: john at arbash-meinel.com-20051219173644-673e0a432d001872
parent: john at arbash-meinel.com-20051218151719-166c90b56986dc5d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Mon 2005-12-19 11:36:44 -0600
message:
Adding sha1 check when weave extracts a text.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051218151719-166c90b56986dc5d
parent: john at arbash-meinel.com-20051218151239-a402a0ddc0f9628b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Sun 2005-12-18 09:17:19 -0600
message:
Forgot to add the test.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051218151239-a402a0ddc0f9628b
parent: john at arbash-meinel.com-20051218040846-3d1acb9e626e8671
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Sun 2005-12-18 09:12:39 -0600
message:
Added a test for basis-inventory, which should have happened before.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051218040846-3d1acb9e626e8671
parent: john at arbash-meinel.com-20051216053312-dab01659fc8874f0
parent: john at arbash-meinel.com-20051216150328-3bb1090f181b4c5a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Sat 2005-12-17 22:08:46 -0600
message:
merge permissions branch, also fixup tests so they are lined up with bzr.dev to help prevent conflicts.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051216150328-3bb1090f181b4c5a
parent: john at arbash-meinel.com-20051216062207-f8a9ca3f32934a86
parent: mbp at sourcefrog.net-20051216014735-906c2145b95924eb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-permissions
timestamp: Fri 2005-12-16 09:03:28 -0600
message:
[merge] bzr.dev
------------------------------------------------------------
merged: john at arbash-meinel.com-20051216062207-f8a9ca3f32934a86
parent: john at arbash-meinel.com-20051216061348-219db42d609774a1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-permissions
timestamp: Fri 2005-12-16 00:22:07 -0600
message:
Changing so that sftp tests are skipped rather than hidden when paramiko isn't present
------------------------------------------------------------
merged: john at arbash-meinel.com-20051216061348-219db42d609774a1
parent: john at arbash-meinel.com-20051216061100-6136fb5a1c3acacb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-permissions
timestamp: Fri 2005-12-16 00:13:48 -0600
message:
Made the StubSFTPServer use umask even for mkdir()
------------------------------------------------------------
merged: john at arbash-meinel.com-20051216061100-6136fb5a1c3acacb
parent: john at arbash-meinel.com-20051216013044-9d16c210eae6041d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-permissions
timestamp: Fri 2005-12-16 00:11:00 -0600
message:
[patch] Robey Pointer to fix sftp server using umask for files (failing tests for directories)
------------------------------------------------------------
merged: john at arbash-meinel.com-20051216013044-9d16c210eae6041d
parent: john at arbash-meinel.com-20051215234657-984969271a333a76
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-permissions
timestamp: Thu 2005-12-15 19:30:44 -0600
message:
added NEWS entry.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051215234657-984969271a333a76
parent: john at arbash-meinel.com-20051215220036-e1f4de8dff952819
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-permissions
timestamp: Thu 2005-12-15 17:46:57 -0600
message:
Moved chmod to after pipelined file upload
------------------------------------------------------------
merged: john at arbash-meinel.com-20051215220036-e1f4de8dff952819
parent: john at arbash-meinel.com-20051215213934-c604f80de4902abf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-permissions
timestamp: Thu 2005-12-15 16:00:36 -0600
message:
Added the ability to disable setting permissions
------------------------------------------------------------
merged: john at arbash-meinel.com-20051215213934-c604f80de4902abf
parent: john at arbash-meinel.com-20051215213003-6182bfb1ace9cfc3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-permissions
timestamp: Thu 2005-12-15 15:39:34 -0600
message:
Stores don't have to have a dir_mode or file_mode set
------------------------------------------------------------
merged: john at arbash-meinel.com-20051215213003-6182bfb1ace9cfc3
parent: john at arbash-meinel.com-20051215211109-3c96c1af8cd45cdd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-permissions
timestamp: Thu 2005-12-15 15:30:03 -0600
message:
It turns out that only the StubSFTPServer doesn't mask on open(), adding a chmod call after open
------------------------------------------------------------
merged: john at arbash-meinel.com-20051215211109-3c96c1af8cd45cdd
parent: john at arbash-meinel.com-20051215200502-ece3c53709876892
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-permissions
timestamp: Thu 2005-12-15 15:11:09 -0600
message:
Added permission checking to Branch, and propogated that change into the stores.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051215200502-ece3c53709876892
parent: john at arbash-meinel.com-20051215200303-be2d09abef0f6e57
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-permissions
timestamp: Thu 2005-12-15 14:05:02 -0600
message:
code cleanup
------------------------------------------------------------
merged: john at arbash-meinel.com-20051215200303-be2d09abef0f6e57
parent: john at arbash-meinel.com-20051215175931-0a302899643581cd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-permissions
timestamp: Thu 2005-12-15 14:03:03 -0600
message:
Added mode to the appropriate transport functions, and tests to make sure they work.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051215175931-0a302899643581cd
parent: mbp at sourcefrog.net-20051213054804-e1dcb0c21cacd174
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-permissions
timestamp: Thu 2005-12-15 11:59:31 -0600
message:
Added new permissions test (currently don't pass)
------------------------------------------------------------
merged: john at arbash-meinel.com-20051216053312-dab01659fc8874f0
parent: john at arbash-meinel.com-20051204215501-9ee53a39579d1e28
parent: john at arbash-meinel.com-20051216051321-0a46118f3dd3ccc7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2005-12-15 23:33:12 -0600
message:
[merge] win32
------------------------------------------------------------
merged: john at arbash-meinel.com-20051216051321-0a46118f3dd3ccc7
parent: john at arbash-meinel.com-20051216045300-316811378703a220
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-15 23:13:21 -0600
message:
get_transport() now forces unicode paths, which helps get proper filenames.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051216045300-316811378703a220
parent: john at arbash-meinel.com-20051216044207-b1fdf835d8432d3f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-15 22:53:00 -0600
message:
Switch to sys.executable instead of just 'python' to make sure to run the right executable
------------------------------------------------------------
merged: john at arbash-meinel.com-20051216044207-b1fdf835d8432d3f
parent: john at arbash-meinel.com-20051216034314-1a87179af364d10b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-15 22:42:07 -0600
message:
Updating for new transport tests so that they pass on win32
------------------------------------------------------------
merged: john at arbash-meinel.com-20051216034314-1a87179af364d10b
parent: john at arbash-meinel.com-20051216031326-59a5010e2358813f
parent: mbp at sourcefrog.net-20051213054804-e1dcb0c21cacd174
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-15 21:43:14 -0600
message:
[merge] bzr.dev
------------------------------------------------------------
merged: john at arbash-meinel.com-20051216031326-59a5010e2358813f
parent: john at arbash-meinel.com-20051208183243-89d8bc3803f44848
parent: john at arbash-meinel.com-20051216022556-6abfc63e721f4b95
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-15 21:13:26 -0600
message:
[merge] use the correct python executable
------------------------------------------------------------
merged: john at arbash-meinel.com-20051216022556-6abfc63e721f4b95
parent: john at arbash-meinel.com-20051202221807-418d7ebc9e008cd2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-15 20:25:56 -0600
message:
Use the correct python in case it isn't in the path
------------------------------------------------------------
merged: john at arbash-meinel.com-20051202221807-418d7ebc9e008cd2
parent: john at arbash-meinel.com-20051202220622-41882e3b259fd8f2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Fri 2005-12-02 16:18:07 -0600
message:
Win32 not only doesn't have cat, it changes line-endings too. Should be fixed.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051202220622-41882e3b259fd8f2
parent: john at arbash-meinel.com-20051202041607-e97ca8a3d0e7fd48
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Fri 2005-12-02 16:06:22 -0600
message:
Switching from cat to python -c, since we should always have a python interpreter.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051202041607-e97ca8a3d0e7fd48
parent: john at arbash-meinel.com-20051202020927-0708e0ef7f7c5923
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 22:16:07 -0600
message:
O_BINARY doesn't exist outside of win32, don't pass it if it isn't there.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051202020927-0708e0ef7f7c5923
parent: john at arbash-meinel.com-20051202000711-a95f52add0b1493c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 20:09:27 -0600
message:
Setting binary flags for sftp.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051202000711-a95f52add0b1493c
parent: john at arbash-meinel.com-20051201235216-50aa021d8ed62620
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 18:07:11 -0600
message:
Renaming test_sftp.py => test_sftp_transport.py, so that 'bzr selftest transport' will run it too
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201235216-50aa021d8ed62620
parent: john at arbash-meinel.com-20051201225317-cb05136dbbf947e8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 17:52:16 -0600
message:
Some corrections using the new osutils.rename. **ALL TESTS PASS**
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201225317-cb05136dbbf947e8
parent: john at arbash-meinel.com-20051201225026-142c9a5a04bb38ba
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 16:53:17 -0600
message:
Added a small test to sftp to make sure some replacing was going on in the remote side.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201225026-142c9a5a04bb38ba
parent: john at arbash-meinel.com-20051201214924-17e90ecb4031c39d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 16:50:26 -0600
message:
Added a fancy footwork rename to osutils, made SftpTransport use it.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201214924-17e90ecb4031c39d
parent: john at arbash-meinel.com-20051201211149-adf18296c664f8d5
parent: john at arbash-meinel.com-20051201213142-3bf0c6acc9c5355d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 15:49:24 -0600
message:
[merge] jam-integration
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201211149-adf18296c664f8d5
parent: john at arbash-meinel.com-20051201205836-7ac6c2ef4b1cbcf3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 15:11:49 -0600
message:
Refactoring Exceptions found some places where the wrong exception was caught.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201205836-7ac6c2ef4b1cbcf3
parent: john at arbash-meinel.com-20051201195743-57aefc694d237938
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 14:58:36 -0600
message:
Cleaned up Exceptions for all transports.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201195743-57aefc694d237938
parent: john at arbash-meinel.com-20051201194342-da551dc3c2a1903a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 13:57:43 -0600
message:
Reintroduced ensure_config_dir_exists() for sftp
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201194342-da551dc3c2a1903a
parent: john at arbash-meinel.com-20051201194225-ccbd5466df7af898
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 13:43:42 -0600
message:
Updated whitebox text for new PathNotChild exception
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201194225-ccbd5466df7af898
parent: john at arbash-meinel.com-20051201192748-369238cd06ecf7e8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 13:42:25 -0600
message:
Creating a PathNotChild exception, and using relpath in HTTPTestUtil
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201192748-369238cd06ecf7e8
parent: john at arbash-meinel.com-20051201191230-a2ba94c380e11863
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 13:27:48 -0600
message:
Added osutils.mkdtemp()
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201191230-a2ba94c380e11863
parent: john at arbash-meinel.com-20051201183335-578f560fb6f8d3c3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 13:12:30 -0600
message:
Replacing os.getcwdu() with osutils.getcwd(),
fixing config test which expected config_dir() to have a specific path
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201183335-578f560fb6f8d3c3
parent: john at arbash-meinel.com-20051201181647-2d65af900f14ba6a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 12:33:35 -0600
message:
Changing os.path.normpath to osutils.normpath
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201181647-2d65af900f14ba6a
parent: john at arbash-meinel.com-20051201180300-00f2e67ecf02f55e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 12:16:47 -0600
message:
Switched os.path.abspath and os.path.realpath to osutils.* (still passes on cygwin)
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201180300-00f2e67ecf02f55e
parent: john at arbash-meinel.com-20051201175357-afaa3b6ded6cb81c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 12:03:00 -0600
message:
Fixup test_config.py to handle new paths
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201175357-afaa3b6ded6cb81c
parent: john at arbash-meinel.com-20051201173629-aecb08238e0976a2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 11:53:57 -0600
message:
Couple small fixes, all tests pass on cygwin.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201173629-aecb08238e0976a2
parent: john at arbash-meinel.com-20051201172516-5232226cd9ec1f0e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 11:36:29 -0600
message:
Removing instances of os.sep
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201172516-5232226cd9ec1f0e
parent: john at arbash-meinel.com-20051201171125-5e1f0970246c4925
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 11:25:16 -0600
message:
A couple more path.join statements needed changing.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201171125-5e1f0970246c4925
parent: john at arbash-meinel.com-20051201163508-407545e8302b778c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 11:11:25 -0600
message:
Updated the bzr sourcecode to use bzrlib.osutils.pathjoin rather than os.path.join to enforce internal use of / instead of \
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201163508-407545e8302b778c
parent: john at arbash-meinel.com-20051201152458-4284f6a9025751b0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 10:35:08 -0600
message:
avoiding 'bzr pull .' means all tests pass under cygwin
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201152458-4284f6a9025751b0
parent: john at arbash-meinel.com-20051130230916-9aa0dd45072c7e29
parent: john at arbash-meinel.com-20051201152250-e794a08480d6dfa9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 09:24:58 -0600
message:
[merge] jam-integration
------------------------------------------------------------
merged: john at arbash-meinel.com-20051130230916-9aa0dd45072c7e29
parent: john at arbash-meinel.com-20051130171152-95fc4cd6adf2aa8c
parent: john at arbash-meinel.com-20051130224614-bf204f5bf2201072
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Wed 2005-11-30 17:09:16 -0600
message:
[merge] jam-integration, fix close_fds on win32
------------------------------------------------------------
merged: john at arbash-meinel.com-20051130171152-95fc4cd6adf2aa8c
parent: john at arbash-meinel.com-20051130145745-2055e3cc04ca5bb5
parent: john at arbash-meinel.com-20051130165254-9e8cb6d9383a06f7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Wed 2005-11-30 11:11:52 -0600
message:
[merge] jam-integration
------------------------------------------------------------
merged: john at arbash-meinel.com-20051130145745-2055e3cc04ca5bb5
parent: john at arbash-meinel.com-20051123154759-784e7805281e831c
parent: mbp at sourcefrog.net-20051130064100-50469cf3ee5f42b2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Wed 2005-11-30 08:57:45 -0600
message:
[merge] bzr.dev
------------------------------------------------------------
merged: john at arbash-meinel.com-20051208183243-89d8bc3803f44848
parent: john at arbash-meinel.com-20051202221807-418d7ebc9e008cd2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-08 12:32:43 -0600
message:
Added (win32 failing) test to make sure is_executable is maintained over several operations
------------------------------------------------------------
merged: john at arbash-meinel.com-20060103152652-5a066586feb99370
parent: john at arbash-meinel.com-20060102212036-5013c8712ee1e1ba
parent: robertc at robertcollins.net-20060103052137-4956578fbb0736ba
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2006-01-03 09:26:52 -0600
message:
[merge] robert & aaron's integration
------------------------------------------------------------
merged: robertc at robertcollins.net-20060103052137-4956578fbb0736ba
parent: robertc at robertcollins.net-20060102225445-8554f5b0109dbc41
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2006-01-03 16:21:37 +1100
message:
Add BRANCH.TODO, and update Makefile to clean pyo files.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060102225445-8554f5b0109dbc41
parent: robertc at robertcollins.net-20060102223732-d5221b37ff0f7888
parent: aaron.bentley at utoronto.ca-20051226062928-09c4e07bcdfce3af
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2006-01-03 09:54:45 +1100
message:
Merge Aarons integration branch.
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051226062928-09c4e07bcdfce3af
parent: aaron.bentley at utoronto.ca-20051226052838-b90834b8788c7101
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2005-12-26 01:29:28 -0500
message:
Fixed hashcache
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051226052838-b90834b8788c7101
parent: aaron.bentley at utoronto.ca-20051222031427-8479fe2c80b0a5c1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2005-12-26 00:28:38 -0500
message:
Reactivated hashcache tests
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051222031427-8479fe2c80b0a5c1
parent: aaron.bentley at utoronto.ca-20051215071914-836bc288d9f55a5b
parent: mbp at sourcefrog.net-20051216014735-906c2145b95924eb
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2005-12-21 22:14:27 -0500
message:
Merged Martin's latest
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051215071914-836bc288d9f55a5b
parent: aaron.bentley at utoronto.ca-20051215065024-658b20fddd26a9ec
parent: abentley at panoramicfeedback.com-20051214183411-f013b7006e68d0eb
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2005-12-15 02:19:14 -0500
message:
Merged in other version of NEWS update
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051215065024-658b20fddd26a9ec
parent: aaron.bentley at utoronto.ca-20051215064846-aa6cb6c42313c8e3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2005-12-15 01:50:24 -0500
message:
Removed ignore for configure.in, which is never autogenerated.
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051215064846-aa6cb6c42313c8e3
parent: abentley at panoramicfeedback.com-20051213201315-8f8f4ab3bc677d35
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2005-12-15 01:48:46 -0500
message:
Updated NEWS
------------------------------------------------------------
merged: robertc at robertcollins.net-20060102223732-d5221b37ff0f7888
parent: robertc at robertcollins.net-20060102211101-672549a6c738eb0e
parent: john at arbash-meinel.com-20051222233243-1ff7ae626c03d3d3
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2006-01-03 09:37:32 +1100
message:
Merge in John Meinels integration branch.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060102211101-672549a6c738eb0e
parent: robertc at robertcollins.net-20051215083203-07b824bae89674c1
parent: mbp at sourcefrog.net-20051216014735-906c2145b95924eb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2006-01-03 08:11:01 +1100
message:
Merge from mbp.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060102212036-5013c8712ee1e1ba
parent: john at arbash-meinel.com-20051222233243-1ff7ae626c03d3d3
parent: jaq at spacepants.org-20051230032520-d205be03bad624bd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Mon 2006-01-02 15:20:36 -0600
message:
[merge] Jamie Wilkinson, don't export .bzrignore
------------------------------------------------------------
merged: jaq at spacepants.org-20051230032520-d205be03bad624bd
parent: jaq at spacepants.org-20051229033359-0f03c77b1f99af3b
committer: Jamie Wilkinson <jaq at spacepants.org>
branch nick: bzr.dev
timestamp: Fri 2005-12-30 14:25:20 +1100
message:
add test for directory export
------------------------------------------------------------
merged: jaq at spacepants.org-20051229033359-0f03c77b1f99af3b
parent: jaq at spacepants.org-20051229032631-adc1a9413791860f
committer: Jamie Wilkinson <jaq at spacepants.org>
branch nick: bzr.dev
timestamp: Thu 2005-12-29 14:33:59 +1100
message:
rearrange blackbox tests to be in alphabetical order
------------------------------------------------------------
merged: jaq at spacepants.org-20051229032631-adc1a9413791860f
parent: jaq at spacepants.org-20051229025233-c702c32a14b5001c
committer: Jamie Wilkinson <jaq at spacepants.org>
branch nick: bzr.dev
timestamp: Thu 2005-12-29 14:26:31 +1100
message:
convert tabs to 4-spaces
------------------------------------------------------------
merged: jaq at spacepants.org-20051229025233-c702c32a14b5001c
parent: jaq at spacepants.org-20051229024306-e9ab99850c605c5f
committer: Jamie Wilkinson <jaq at spacepants.org>
branch nick: bzr.dev
timestamp: Thu 2005-12-29 13:52:33 +1100
message:
exclude .bzrignore from exports
------------------------------------------------------------
merged: jaq at spacepants.org-20051229024306-e9ab99850c605c5f
parent: mbp at sourcefrog.net-20051216014735-906c2145b95924eb
committer: Jamie Wilkinson <jaq at spacepants.org>
branch nick: bzr.dev
timestamp: Thu 2005-12-29 13:43:06 +1100
message:
add blackbox tests for ensuring .bzrignore is not exported
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060105090132-968677325eab0148
parent: robertc at robertcollins.net-20060103052137-4956578fbb0736ba
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2006-01-05 20:01:32 +1100
message:
todo idea from John
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060108233527-3f536f604c954d72
parent: mbp at sourcefrog.net-20060108233414-d62c4e95c75a3f34
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2006-01-09 10:35:27 +1100
message:
Prepare for 0.7rc1 release
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060108233414-d62c4e95c75a3f34
parent: mbp at sourcefrog.net-20060108223956-fcfb6cf192119490
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2006-01-09 10:34:14 +1100
message:
ignore .sw[nop] by default
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060108223956-fcfb6cf192119490
parent: mbp at sourcefrog.net-20060106011305-3772285d84b5cbb4
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2006-01-09 09:39:56 +1100
message:
Don't ignore Makefile.in by default (#6413)
More information about the bazaar-commits
mailing list