Rev 1409: Update snapshot from integration. in
/home/robertc/source/baz/launchpad
Robert Collins
robertc at robertcollins.net
Wed Nov 30 00:10:37 GMT 2005
------------------------------------------------------------
revno: 1409
revision-id: robertc at robertcollins.net-20051130001032-0797751a44eeead0
parent: robertc at robertcollins.net-20051108005548-417f470e4b50a467
parent: robertc at robertcollins.net-20051129232031-916cdaefe3a3c19b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: launchpad
timestamp: Wed 2005-11-30 11:10:32 +1100
message:
Update snapshot from integration.
removed:
bzrlib/mdiff.py mdiff.py-20050409024839-5452d11fb73b3c362eb84816
bzrlib/revfile.py revfile.py-20050409024839-f50e8777febf943eac029aeb
bzrlib/store/compressed_text.py compressed_text_store.py-20050915193447-e643128846816ac1
patches/cache-remote-revisions.diff cacheremoterevisions.diff-20050615041652-ec41056afda8ec11
patches/cache_weave_inclusions.diff cache_weave_inclusions.diff-20050919104607-e3cc67f726e0cc84
patches/find-touching-from-seq.diff findtouchingfromseq.diff-20050606123253-430d602a8eb2cd5e
patches/meta-data-in-inventory.patch metadataininventory.patch-20050613121049-251bafe6906dca57
patches/ndiff.patch ndiff.patch-20050704121052-b73266660305dfef
testbzr testbzr-20050428033045-e528c9fe33219494
added:
bzrlib/basicio.py basicio.py-20051030024756-e8775e065eb84891
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/tests/blackbox/ blackbox-20051117211451-419928a2e5754ac1
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/test_basicio.py testbasicio.py-20051030024756-af280f112d7bbe3a
bzrlib/tests/test_trace.py testtrace.py-20051110225523-a21117fc7a07eeff
bzrlib/tests/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/uncommit.py uncommit.py-20050626215513-5ec509fa425b305c
tools/biobench.py biobench.py-20051101131608-0942e1592d0a8ba9
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/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.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/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
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
.rsyncexclude rsyncexclude-20050408053852-27e0a5928b6829f645beb2e6
HACKING HACKING-20050805200004-2a5dc975d870f78c
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
TODO TODO-20050426050852-44d2ad9048dafbe9
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/add.py add.py-20050323030017-3a77d63feda58e33
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/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/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/externalcommand.py externalcommand.py-20050901092254-b4fc642a55bb815b
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/hashcache.py hashcache.py-20050706091756-fe3a8cc1143ff24f
bzrlib/help.py help.py-20050505025907-4dd7a6d63912f894
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/lock.py lock.py-20050527050856-ec090bb51bc03349
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/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/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/store/__init__.py store.py-20050309040759-164dc5173d6406c2
bzrlib/store/text.py text.py-20050928201105-c26468dcb5d9b18b
bzrlib/tests/HTTPTestUtil.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_ancestry.py test_ancestry.py-20050913023709-69768e94848312c6
bzrlib/tests/test_bad_files.py test_bad_files.py-20050918155938-c76a2295c8ab9503
bzrlib/tests/test_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_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
bzrlib/tests/test_xml.py test_xml.py-20050905091053-80b45588931a9b35
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/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/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/xml4.py xml4.py-20050916091259-db5ab55e7e6ca324
doc/random.txt random.txt-20050309044946-269c29512b381f5b
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
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.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_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
------------------------------------------------------------
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: 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: mbp at sourcefrog.net-20051125062856-e4c887417108fd9e
parent: mbp at sourcefrog.net-20051125043654-106a589368532d7e
parent: john at arbash-meinel.com-20051123154759-784e7805281e831c
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: merge-recovered
timestamp: Fri 2005-11-25 17:28:56 +1100
message:
[merge] test renames and other fixes (John)
------------------------------------------------------------
merged: john at arbash-meinel.com-20051123154759-784e7805281e831c
parent: john at arbash-meinel.com-20051123154424-a02f8bf990a1fed5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Wed 2005-11-23 09:47:59 -0600
message:
I was stripping off too much of the name in --verbose mode.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051123154424-a02f8bf990a1fed5
parent: john at arbash-meinel.com-20051123153207-adf60598914ab5c2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Wed 2005-11-23 09:44:24 -0600
message:
Renamed all of the tests from selftest/foo.py to tests/test_foo.py
------------------------------------------------------------
merged: john at arbash-meinel.com-20051123153207-adf60598914ab5c2
parent: john at arbash-meinel.com-20051123135446-6d79a500f3e3f3e2
parent: john at arbash-meinel.com-20051117204707-4f738cb8f6857051
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Wed 2005-11-23 09:32:07 -0600
message:
[merge] Added the uncommit plugin
------------------------------------------------------------
merged: john at arbash-meinel.com-20051117204707-4f738cb8f6857051
parent: john at arbash-meinel.com-20051027213130-d2c5a6c65a3bfbb2
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Thu 2005-11-17 14:47:07 -0600
message:
[merge] Aaron's fix to log messages, when undoing multiple entries.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051027213130-d2c5a6c65a3bfbb2
parent: jelmer at samba.org-20051020122445-a5526166d1199517
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Thu 2005-10-27 16:31:30 -0500
message:
Updated to latest bzr.dev code, and added tests.
------------------------------------------------------------
merged: jelmer at samba.org-20051020122445-a5526166d1199517
parent: john at arbash-meinel.com-20051012030827-6c1b3d68011e7b82
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Thu 2005-10-20 14:24:45 +0200
message:
Update for new options API
------------------------------------------------------------
merged: john at arbash-meinel.com-20051012030827-6c1b3d68011e7b82
parent: john at arbash-meinel.com-20050924000443-6cf6a4c848bab97e
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Tue 2005-10-11 22:08:27 -0500
message:
Upgrading plugin for v5
------------------------------------------------------------
merged: john at arbash-meinel.com-20050924000443-6cf6a4c848bab97e
parent: john at arbash-meinel.com-20050923183322-1441a26b3cd167dc
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-09-23 19:04:43 -0500
message:
Changed the --remove command to --all
------------------------------------------------------------
merged: john at arbash-meinel.com-20050923183322-1441a26b3cd167dc
parent: john at arbash-meinel.com-20050923183046-1d5dc250bb7d4e4d
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-09-23 13:33:22 -0500
message:
Made --dry-run print a better warning, so we don't scare people.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050923183046-1d5dc250bb7d4e4d
parent: john at arbash-meinel.com-20050923181227-bbc42f66c1dc197b
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-09-23 13:30:46 -0500
message:
Adding ability to revert back to earlier revisions.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050923181227-bbc42f66c1dc197b
parent: john at arbash-meinel.com-20050627215851-6105227ec3848593
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-09-23 13:12:27 -0500
message:
Updated to not use find_branch.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050627215851-6105227ec3848593
parent: john at arbash-meinel.com-20050627215821-28583a3356383aaf
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Mon 2005-06-27 15:58:51 -0600
message:
Updated for new log_formatter.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050627215821-28583a3356383aaf
parent: john at arbash-meinel.com-20050627215733-f4419eee3c33dd37
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Mon 2005-06-27 15:58:21 -0600
message:
Updated for new log_formatter.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050627215733-f4419eee3c33dd37
parent: john at arbash-meinel.com-20050626215527-0deb543cd20be09a
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Mon 2005-06-27 15:57:33 -0600
message:
Updated for new log_formatter.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050626215527-0deb543cd20be09a
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sun 2005-06-26 16:55:27 -0500
message:
Creating a plugin for uncommitting the last revision.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051123135446-6d79a500f3e3f3e2
parent: john at arbash-meinel.com-20051123134057-6fb7565337e9e18b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Wed 2005-11-23 07:54:46 -0600
message:
[patch] Johan Rydberg - let clone use set_revision_history instead of append_revision
------------------------------------------------------------
merged: john at arbash-meinel.com-20051123134057-6fb7565337e9e18b
parent: john at arbash-meinel.com-20051121154158-1845aa886bfac4b4
parent: mbp at sourcefrog.net-20051122230822-b876b5abe3f6bd0c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Wed 2005-11-23 07:40:57 -0600
message:
[merge] bzr.dev
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051122230822-b876b5abe3f6bd0c
parent: mbp at sourcefrog.net-20051122230746-bf3c32915a79653b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-23 10:08:22 +1100
message:
NEWS typo
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051122230746-bf3c32915a79653b
parent: mbp at sourcefrog.net-20051122043014-6df209fd93033b59
parent: robey at lag.net-20051122015612-24810f5a892a6bd6
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-23 10:07:46 +1100
message:
[merge] sftp fixes
------------------------------------------------------------
merged: robey at lag.net-20051122015612-24810f5a892a6bd6
parent: robey at lag.net-20051122015034-755f8d30106bfb8b
committer: Robey Pointer <robey at lag.net>
branch nick: bzr.sftp
timestamp: Mon 2005-11-21 17:56:12 -0800
message:
modified version of john's patch to add atomic put and locking to the sftp transport
------------------------------------------------------------
merged: robey at lag.net-20051122015034-755f8d30106bfb8b
parent: robey at lag.net-20051122014631-42d9600803476389
committer: Robey Pointer <robey at lag.net>
branch nick: bzr.sftp
timestamp: Mon 2005-11-21 17:50:34 -0800
message:
patch from erik to fix sftp relpath to only check the path component
------------------------------------------------------------
merged: robey at lag.net-20051122014631-42d9600803476389
parent: robey at lag.net-20051122014514-eef2e2bce22d7356
committer: Robey Pointer <robey at lag.net>
branch nick: bzr.sftp
timestamp: Mon 2005-11-21 17:46:31 -0800
message:
tighten up the sftp unit tests a bit to make them work better on windows
------------------------------------------------------------
merged: robey at lag.net-20051122014514-eef2e2bce22d7356
parent: robey at lag.net-20051122014331-6f62bc9dead6483c
committer: Robey Pointer <robey at lag.net>
branch nick: bzr.sftp
timestamp: Mon 2005-11-21 17:45:14 -0800
message:
modified patch from alexey shamrin & john meinel to stdout-encode the getpass prompts within sftp transport
------------------------------------------------------------
merged: robey at lag.net-20051122014331-6f62bc9dead6483c
parent: robey at lag.net-20051122014146-5186f5e310a15202
committer: Robey Pointer <robey at lag.net>
branch nick: bzr.sftp
timestamp: Mon 2005-11-21 17:43:31 -0800
message:
fix sftp urls to support the ietf draft url spec wrt relative vs absolute sftp urls (this will break existing branch urls); fix username/password parsing in sftp urls; add unit tests to make sure sftp url parsing is working
------------------------------------------------------------
merged: robey at lag.net-20051122014146-5186f5e310a15202
parent: mbp at sourcefrog.net-20051118081007-80523bf145eb319b
parent: robey at lag.net-20051107050204-885fb734a3dd3906
committer: Robey Pointer <robey at lag.net>
branch nick: bzr.sftp
timestamp: Mon 2005-11-21 17:41:46 -0800
message:
make sftp put faster when using paramiko 1.5.1
------------------------------------------------------------
merged: robey at lag.net-20051107050204-885fb734a3dd3906
parent: mbp at sourcefrog.net-20051031205250-b0c7f1d9ece522f5
committer: Robey Pointer <robey at lag.net>
timestamp: Sun 2005-11-06 21:02:04 -0800
message:
prefetch files under paramiko 1.5.1 for improved speed
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051118081007-80523bf145eb319b
parent: mbp at sourcefrog.net-20051118080151-8c35865828c63a4b
parent: hmeland at twoflower.uio.no-20051006225544-bc7ef2300f20d9a3
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Fri 2005-11-18 19:10:07 +1100
message:
[merge] fix \t in commit messages
------------------------------------------------------------
merged: hmeland at twoflower.uio.no-20051006225544-bc7ef2300f20d9a3
parent: hmeland at twoflower.uio.no-20051006120356-10cd03703265f8c3
committer: Harald Meland <hmeland at twoflower.uio.no>
timestamp: Fri 2005-10-07 00:55:44 +0200
message:
Cleanup + better test of commit-msg control character escape code.
------------------------------------------------------------
merged: hmeland at twoflower.uio.no-20051006120356-10cd03703265f8c3
parent: mbp at sourcefrog.net-20051006105312-06320dbb986e4bb3
committer: Harald Meland <hmeland at twoflower.uio.no>
timestamp: Thu 2005-10-06 14:03:56 +0200
message:
Fixed typo that could cause TABs in commit messages to be escaped.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051118080151-8c35865828c63a4b
parent: mbp at sourcefrog.net-20051118065820-baa729335645fc75
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Fri 2005-11-18 19:01:51 +1100
message:
Make annotate cope better with revisions committed without a valid
email address. (Marien Zwart)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051118065820-baa729335645fc75
parent: mbp at sourcefrog.net-20051117080757-c491f5a14f179f3b
parent: jamie at anchor.net.au-20051118063902-a487ab27c9b0b700
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Fri 2005-11-18 17:58:20 +1100
message:
[merge] jaq
------------------------------------------------------------
merged: jamie at anchor.net.au-20051118063902-a487ab27c9b0b700
parent: jamie at anchor.net.au-20051118054504-e2c6795412301c92
committer: Jamie Wilkinson <jamie at anchor.net.au>
branch nick: bzr.dev
timestamp: Fri 2005-11-18 17:39:02 +1100
message:
add some examples to the documentation for Command.takes_args
------------------------------------------------------------
merged: jamie at anchor.net.au-20051118054504-e2c6795412301c92
parent: jamie at anchor.net.au-20051118023024-feaa5729c868a450
parent: mbp at sourcefrog.net-20051117074538-5e113b7ad19a3b5d
committer: Jamie Wilkinson <jamie at anchor.net.au>
branch nick: bzr.dev
timestamp: Fri 2005-11-18 16:45:04 +1100
message:
partial merge from Martin, fixed conflicts with bzrlib/tree.py and revno 1391
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051117074538-5e113b7ad19a3b5d
parent: mbp at sourcefrog.net-20051117034930-68148f4f6ee985e8
parent: robertc at robertcollins.net-20051113201422-8a34ef413bfc8222
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Thu 2005-11-17 18:45:38 +1100
message:
[merge] much integrated work from robert and john
------------------------------------------------------------
merged: robertc at robertcollins.net-20051113201422-8a34ef413bfc8222
parent: robertc at robertcollins.net-20051113194406-eb8cd529cf26c68e
parent: john at arbash-meinel.com-20051110021113-6ebd7a9777d10840
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-11-14 07:14:22 +1100
message:
Stores with some compressed texts and some uncompressed texts are now able to
be used. (John A Meinel)
------------------------------------------------------------
merged: john at arbash-meinel.com-20051110021113-6ebd7a9777d10840
parent: john at arbash-meinel.com-20051110013141-f6cc853a1d85a9a9
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Wed 2005-11-09 20:11:13 -0600
message:
Updated the stores, all tests pass, and a store doesn't have to be 100% compressed
------------------------------------------------------------
merged: john at arbash-meinel.com-20051110013141-f6cc853a1d85a9a9
parent: john at arbash-meinel.com-20051110011001-68e7ffc01241d226
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Wed 2005-11-09 20:31:41 -0500
message:
Added a test that copy_to raises NoSuchFile when a directory is missing (not IOError)
------------------------------------------------------------
merged: john at arbash-meinel.com-20051110011001-68e7ffc01241d226
parent: john at arbash-meinel.com-20051110005006-7218f1b4b0fbafea
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Wed 2005-11-09 20:10:01 -0500
message:
Added ability for TextStore to handle both compressed and uncompressed, it just looks for one type first
------------------------------------------------------------
merged: john at arbash-meinel.com-20051110005006-7218f1b4b0fbafea
parent: john at arbash-meinel.com-20051109222409-a5d4048531079fa0
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Wed 2005-11-09 19:50:06 -0500
message:
Adding a note about changing copy_to's interface
------------------------------------------------------------
merged: john at arbash-meinel.com-20051109222409-a5d4048531079fa0
parent: mbp at sourcefrog.net-20051107162112-4f7170c06c6cde98
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Wed 2005-11-09 17:24:09 -0500
message:
Added a has_any function to the Transport API
------------------------------------------------------------
merged: robertc at robertcollins.net-20051113194406-eb8cd529cf26c68e
parent: robertc at robertcollins.net-20051113185726-39ede10d746eee6d
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-11-14 06:44:06 +1100
message:
Test case for removing deleted contents from Wouter van Heyst.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051113185726-39ede10d746eee6d
parent: robertc at robertcollins.net-20051108005548-417f470e4b50a467
parent: john at arbash-meinel.com-20051113164619-6f9ba5898a45dc5c
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-11-14 05:57:26 +1100
message:
Merge Johns current integration work.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051113164619-6f9ba5898a45dc5c
parent: john at arbash-meinel.com-20051113164037-506b728afc8f26e8
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sun 2005-11-13 10:46:19 -0600
message:
Changed to printing the full path, rather than just the relative portion.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051113164037-506b728afc8f26e8
parent: john at arbash-meinel.com-20051113163433-d2db15d58d504a46
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sun 2005-11-13 10:40:37 -0600
message:
Modified mkdir functionality, to handle multiple nested trees.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051113163433-d2db15d58d504a46
parent: john at arbash-meinel.com-20051111001255-581ed1a337aebc4e
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sun 2005-11-13 10:34:33 -0600
message:
Applying Alexander Belchenko's patch to handle multiple mkdir calls
------------------------------------------------------------
merged: john at arbash-meinel.com-20051111001255-581ed1a337aebc4e
parent: john at arbash-meinel.com-20051111001050-619c41bb436c31af
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Thu 2005-11-10 18:12:55 -0600
message:
Removed testbzr, it wasn't even executable, just was cruft.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051111001050-619c41bb436c31af
parent: john at arbash-meinel.com-20051110030353-113e2bb27f7b157f
parent: john at arbash-meinel.com-20051027030813-9dfbcadd282e6512
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Thu 2005-11-10 18:10:50 -0600
message:
Merged pull --verbose changes
------------------------------------------------------------
merged: john at arbash-meinel.com-20051027030813-9dfbcadd282e6512
parent: john at arbash-meinel.com-20051027024110-609396a0bd1a5b3b
parent: mbp at sourcefrog.net-20051027005309-2a7590d8bc3f9087
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Wed 2005-10-26 22:08:13 -0500
message:
[merge] up-to-date against bzr.dev
------------------------------------------------------------
merged: john at arbash-meinel.com-20051027024110-609396a0bd1a5b3b
parent: john at arbash-meinel.com-20051027023847-a3dc4032752a2085
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Wed 2005-10-26 21:41:10 -0500
message:
Added NEWS entry.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051027023847-a3dc4032752a2085
parent: john at arbash-meinel.com-20051026032219-e8eafcb931465df3
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Wed 2005-10-26 21:38:47 -0500
message:
Refactor pull --verbose into a log.py function, add tests.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051026032219-e8eafcb931465df3
parent: mbp at sourcefrog.net-20051024102201-4a850a2e1c8724d7
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Tue 2005-10-25 22:22:19 -0500
message:
Updated bzr pull to support a --verbose flag, which prints out what changes.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051110030353-113e2bb27f7b157f
parent: john at arbash-meinel.com-20051109183020-9023d82766865430
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Wed 2005-11-09 21:03:53 -0600
message:
Fixing mutter() calls to not have to do string processing.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051109183020-9023d82766865430
parent: john at arbash-meinel.com-20051109172418-1cf119bbf93fa44d
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Wed 2005-11-09 13:30:20 -0500
message:
Fix ExternalCommand to not run random files in the current directory, unless it is truly in BZRPATH
------------------------------------------------------------
merged: john at arbash-meinel.com-20051109172418-1cf119bbf93fa44d
parent: john at arbash-meinel.com-20051020052212-ab9f5c12844209cc
parent: robertc at robertcollins.net-20051108005548-417f470e4b50a467
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Wed 2005-11-09 11:24:18 -0600
message:
[merge] robert's integration branch
------------------------------------------------------------
merged: john at arbash-meinel.com-20051020052212-ab9f5c12844209cc
parent: mbp at sourcefrog.net-20051020035533-aeb2314d74708a3d
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Thu 2005-10-20 00:22:12 -0500
message:
Made InvalidRevisionId take the revision_id as a parameter, fixed up locations where it was called.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051117034930-68148f4f6ee985e8
parent: mbp at sourcefrog.net-20051117032731-d76f4b67834e0f8c
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Thu 2005-11-17 14:49:30 +1100
message:
Give a warning, not exception, when trying to merge
x-bit against deletion.
Workaround for #4558
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051117032731-d76f4b67834e0f8c
parent: mbp at sourcefrog.net-20051117010225-1be5054d78de0774
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Thu 2005-11-17 14:27:31 +1100
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051117010225-1be5054d78de0774
parent: mbp at sourcefrog.net-20051116074703-03f47cbe4a4f1e43
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Thu 2005-11-17 12:02:25 +1100
message:
Add alias 'resolved'
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051116074703-03f47cbe4a4f1e43
parent: mbp at sourcefrog.net-20051116073657-5ce3bc2f64ef1e23
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-16 18:47:03 +1100
message:
Add test for merging metadata change vs file deletion
(currently passes but should fail)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051116073657-5ce3bc2f64ef1e23
parent: mbp at sourcefrog.net-20051116072650-0d408c1006d92ea5
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-16 18:36:57 +1100
message:
Remove obsolete import of revfile
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051116072650-0d408c1006d92ea5
parent: mbp at sourcefrog.net-20051116071416-89d66c80f8202539
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-16 18:26:50 +1100
message:
Document BZR_PDB
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051116071416-89d66c80f8202539
parent: mbp at sourcefrog.net-20051116070625-897f4b981477d328
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-16 18:14:16 +1100
message:
Really enter the debugger on failure
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051116070625-897f4b981477d328
parent: mbp at sourcefrog.net-20051116040729-114e9e3777d53f36
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-16 18:06:25 +1100
message:
Run postmortem debugger if BZR_PDB is set
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051116040729-114e9e3777d53f36
parent: mbp at sourcefrog.net-20051116032119-119984187b55614a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-16 15:07:29 +1100
message:
[patch] handle bad IOError subclass raised by urlopen
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051116032119-119984187b55614a
parent: mbp at sourcefrog.net-20051115211836-f5bcd5655a854f0e
parent: abentley at panoramicfeedback.com-20051115210909-65710970107c20a3
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-16 14:21:19 +1100
message:
[merge] aaron, various fixes
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051115210909-65710970107c20a3
parent: aaron.bentley at utoronto.ca-20051112153337-ab72703188dbde9a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Tue 2005-11-15 16:09:09 -0500
message:
Throw ConnectionError instead of NoSuchFile except when we get a 404
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051112153337-ab72703188dbde9a
parent: aaron.bentley at utoronto.ca-20051111174611-05c622f83aca3d78
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sat 2005-11-12 10:33:37 -0500
message:
Fixed missing --verbose
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051111174611-05c622f83aca3d78
parent: aaron.bentley at utoronto.ca-20051111172622-bff7851191b357b9
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2005-11-11 12:46:11 -0500
message:
Support whitespace in diff filenames
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051111172622-bff7851191b357b9
parent: aaron.bentley at utoronto.ca-20051110161534-cc77434068bc3789
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2005-11-11 12:26:22 -0500
message:
Support diff with two branches as input.
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051110161534-cc77434068bc3789
parent: aaron.bentley at utoronto.ca-20051109174311-247622bef3c8b28b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2005-11-10 11:15:34 -0500
message:
Got unicode nicks working properly, even when gannotate is installed.
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051109174311-247622bef3c8b28b
parent: aaron.bentley at utoronto.ca-20051109160251-798e03cb54337415
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2005-11-09 12:43:11 -0500
message:
Fixed diff and status on newly-added, newly-deleted files
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051109160251-798e03cb54337415
parent: aaron.bentley at utoronto.ca-20051109155022-1b2e34d53af30253
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron Bentley devel
timestamp: Wed 2005-11-09 11:02:51 -0500
message:
Updated NEWS
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051109155022-1b2e34d53af30253
parent: aaron.bentley at utoronto.ca-20051109150758-28ae2276023b9ebb
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron Bentley devel
timestamp: Wed 2005-11-09 10:50:22 -0500
message:
Fixed handling of short options not accepted by the command
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051109150758-28ae2276023b9ebb
parent: aaron.bentley at utoronto.ca-20051108171256-655710b03a52fb91
parent: mbp at sourcefrog.net-20051107162112-4f7170c06c6cde98
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron Bentley devel
timestamp: Wed 2005-11-09 10:07:58 -0500
message:
Merged Martin's latest
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051108171256-655710b03a52fb91
parent: aaron.bentley at utoronto.ca-20051107214055-992c47dfe068ab3e
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron Bentley devel
timestamp: Tue 2005-11-08 12:12:56 -0500
message:
Handled more pipe errors for display commands.
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051107214055-992c47dfe068ab3e
parent: aaron.bentley at utoronto.ca-20051107153116-783a2e083b3cd1dd
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron Bentley devel
timestamp: Mon 2005-11-07 16:40:55 -0500
message:
Changed error status to 3
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051107153116-783a2e083b3cd1dd
parent: aaron.bentley at utoronto.ca-20051107072654-ec8a0d82496d09b2
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron Bentley devel
timestamp: Mon 2005-11-07 10:31:16 -0500
message:
Only keep test failure directories if --keep-output is specified
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051107072654-ec8a0d82496d09b2
parent: aaron.bentley at utoronto.ca-20051106210147-55494cae0fef8161
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron Bentley devel
timestamp: Mon 2005-11-07 02:26:54 -0500
message:
Tweaked short-log as Meinel suggested
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051106210147-55494cae0fef8161
parent: aaron.bentley at utoronto.ca-20051106203107-656664b5d52fcc1a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron Bentley devel
timestamp: Sun 2005-11-06 16:01:47 -0500
message:
Refactored long-format log printing
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051106203107-656664b5d52fcc1a
parent: aaron.bentley at utoronto.ca-20051106063454-80e2a7db6887426c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron Bentley devel
timestamp: Sun 2005-11-06 15:31:07 -0500
message:
Added branch nicks to long-format logs
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051106063454-80e2a7db6887426c
parent: aaron.bentley at utoronto.ca-20051105225606-fba8ce12fd8f35d0
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron Bentley devel
timestamp: Sun 2005-11-06 01:34:54 -0500
message:
Fixed tests
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051105225606-fba8ce12fd8f35d0
parent: aaron.bentley at utoronto.ca-20051105054948-94eeb17b8949b265
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron Bentley devel
timestamp: Sat 2005-11-05 17:56:06 -0500
message:
Added branch nicks to revisions
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051105054948-94eeb17b8949b265
parent: aaron.bentley at utoronto.ca-20051104232254-a0bf87b338b2d29d
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Sat 2005-11-05 00:49:48 -0500
message:
Implemented nick command
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051104232254-a0bf87b338b2d29d
parent: aaron.bentley at utoronto.ca-20051102150604-cef0eda2504b0830
parent: mbp at sourcefrog.net-20051031205250-b0c7f1d9ece522f5
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Fri 2005-11-04 18:22:54 -0500
message:
Merged Martin
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051102150604-cef0eda2504b0830
parent: aaron.bentley at utoronto.ca-20051102071053-d3837c9849d7aaa2
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Wed 2005-11-02 10:06:04 -0500
message:
Got writes of existing tree configs working.
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051102071053-d3837c9849d7aaa2
parent: abentley at panoramicfeedback.com-20051031214324-46595f15fe93be37
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Wed 2005-11-02 02:10:53 -0500
message:
Added support for branch nicks
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051031214324-46595f15fe93be37
parent: abentley at panoramicfeedback.com-20051031162255-daf9d40a1045ce7a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Mon 2005-10-31 16:43:24 -0500
message:
Error when run with -OO
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051031162255-daf9d40a1045ce7a
parent: aaron.bentley at utoronto.ca-20051029043647-3eb210c9544af457
parent: mbp at sourcefrog.net-20051031120610-da41deafd12fdbb8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Mon 2005-10-31 11:22:55 -0500
message:
Merge from mainline
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051029043647-3eb210c9544af457
parent: abentley at panoramicfeedback.com-20051028194818-1c851625a7c8f6ae
parent: aaron.bentley at utoronto.ca-20051028035424-6b86500f7601bb64
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Sat 2005-10-29 00:36:47 -0400
message:
Merged me
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051028035424-6b86500f7601bb64
parent: aaron.bentley at utoronto.ca-20051028023422-f4c0b704edd5f79d
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Thu 2005-10-27 23:54:24 -0400
message:
Switched to specific error; not all URLErrors have a .code member
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051028194818-1c851625a7c8f6ae
parent: abentley at panoramicfeedback.com-20051028194043-6eb3ea6a2127b3ff
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Fri 2005-10-28 15:48:18 -0400
message:
Fixed weave conflict handling
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051028194043-6eb3ea6a2127b3ff
parent: abentley at panoramicfeedback.com-20051028183841-134d2004d4f716e9
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Fri 2005-10-28 15:40:43 -0400
message:
Removed todo, restored test
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051028183841-134d2004d4f716e9
parent: abentley at panoramicfeedback.com-20051028175907-ae6a1d10ee73fd54
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Fri 2005-10-28 14:38:41 -0400
message:
Made weave merge succeed if interesting files match history
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051028175907-ae6a1d10ee73fd54
parent: abentley at panoramicfeedback.com-20051028170313-17197f70bb87c1bc
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Fri 2005-10-28 13:59:07 -0400
message:
Implemented remerge
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051028170313-17197f70bb87c1bc
parent: abentley at panoramicfeedback.com-20051028154016-d6db283d08fc2b73
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Fri 2005-10-28 13:03:13 -0400
message:
Handle errors logging errors
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051028154016-d6db283d08fc2b73
parent: abentley at panoramicfeedback.com-20051028153925-2273973029880103
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Fri 2005-10-28 11:40:16 -0400
message:
Added early-exit message in merge
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051028153925-2273973029880103
parent: mbp at sourcefrog.net-20051028055302-14e925407b2b09d4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Fri 2005-10-28 11:39:25 -0400
message:
Implemented conflicts.restore
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051115211836-f5bcd5655a854f0e
parent: mbp at sourcefrog.net-20051115014345-19d5f29117a85db9
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-11-16 08:18:36 +1100
message:
remove obsolete module
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051115014345-19d5f29117a85db9
parent: mbp at sourcefrog.net-20051115013834-f3ac006b080f099c
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-11-15 12:43:45 +1100
message:
[path] bgu in help_on_command (Robert Widhopf-Frank)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051115013834-f3ac006b080f099c
parent: mbp at sourcefrog.net-20051110232200-e59722d2c343821f
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-11-15 12:38:34 +1100
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051110232200-e59722d2c343821f
parent: mbp at sourcefrog.net-20051110230750-6c7eda1ecc454e22
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-11-10 18:22:00 -0500
message:
Hide more stuff in bzrlib.trace
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051110230750-6c7eda1ecc454e22
parent: mbp at sourcefrog.net-20051110230246-359fb27e659a0ae8
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-11-10 18:07:50 -0500
message:
Remove some direct calls to logging, and some dead code
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051110230246-359fb27e659a0ae8
parent: mbp at sourcefrog.net-20051110230148-897aa161a6be2b56
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-11-10 18:02:46 -0500
message:
Code format cleanups
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051110230148-897aa161a6be2b56
parent: mbp at sourcefrog.net-20051110225532-5b461dd44225acea
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-11-10 18:01:48 -0500
message:
Remove dead code
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051110225532-5b461dd44225acea
parent: mbp at sourcefrog.net-20051110224711-f081f4c75d572d45
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-11-10 17:55:32 -0500
message:
Add new selftest module.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051110224711-f081f4c75d572d45
parent: mbp at sourcefrog.net-20051110224001-6d43e9ddff8df7a5
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-11-10 17:47:11 -0500
message:
Cleanup exception formatting stuff
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051110224001-6d43e9ddff8df7a5
parent: mbp at sourcefrog.net-20051110222235-a4236d905bf8f851
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-11-10 17:40:01 -0500
message:
Better formatting of builtin errors
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051110222235-a4236d905bf8f851
parent: mbp at sourcefrog.net-20051110214657-568aa1b0d69b32e4
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-11-10 17:22:35 -0500
message:
Code and tests for shorter formatting of error messages
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051110214657-568aa1b0d69b32e4
parent: mbp at sourcefrog.net-20051110213944-f30c55bbea1d311c
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-11-10 16:46:57 -0500
message:
Remove some obsolete patches/modules
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051110213944-f30c55bbea1d311c
parent: mbp at sourcefrog.net-20051108201602-cf6302c61e4cd412
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-11-10 16:39:44 -0500
message:
Disable selftest that was creating .bazaar in source directory
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051108201602-cf6302c61e4cd412
parent: mbp at sourcefrog.net-20051108164424-8b210743db6f470a
parent: jelmer at samba.org-20051108005305-b26c6faafa3d8955
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-11-08 15:16:02 -0500
message:
[merge] jelmer
------------------------------------------------------------
merged: jelmer at samba.org-20051108005305-b26c6faafa3d8955
parent: jelmer at samba.org-20051108002604-50da4251e6f978e7
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Tue 2005-11-08 01:53:05 +0100
message:
Support -r option to bzr status. The backend code already handled
status differences between revisions, it just wasn't exposed to the user yet.
Add more extended blackbox test for 'bzr status'
------------------------------------------------------------
merged: jelmer at samba.org-20051108002604-50da4251e6f978e7
parent: jelmer at samba.org-20051108000540-a3c63ec1288725da
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Tue 2005-11-08 01:26:04 +0100
message:
Remove already implemented and duplicate items from TODO
------------------------------------------------------------
merged: jelmer at samba.org-20051108000540-a3c63ec1288725da
parent: jelmer at samba.org-20051107222056-ae58aae2cfa2ed58
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Tue 2005-11-08 01:05:40 +0100
message:
Don't quite when tracefile can't be opened. Display warning
correctly.
------------------------------------------------------------
merged: jelmer at samba.org-20051107222056-ae58aae2cfa2ed58
parent: mbp at sourcefrog.net-20051107162112-4f7170c06c6cde98
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Mon 2005-11-07 23:20:56 +0100
message:
Fix a couple of typo's
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051108164424-8b210743db6f470a
parent: mbp at sourcefrog.net-20051108164042-772073c40e6c78f2
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-11-08 11:44:24 -0500
message:
How to maintain the NEWS file
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051108164042-772073c40e6c78f2
parent: mbp at sourcefrog.net-20051107162112-4f7170c06c6cde98
parent: jelmer at samba.org-20051104211455-2aa8047a33d6d957
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-11-08 11:40:42 -0500
message:
[merge] Abstract branch renaming from jelmer
------------------------------------------------------------
merged: jelmer at samba.org-20051104211455-2aa8047a33d6d957
parent: jelmer at samba.org-20051104172605-9288f261492667fd
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Fri 2005-11-04 22:14:55 +0100
message:
Rename NativeBranch -> BzrBranch
------------------------------------------------------------
merged: jelmer at samba.org-20051104172605-9288f261492667fd
parent: jelmer at samba.org-20051030183932-9188295b602ce28c
parent: mbp at sourcefrog.net-20051031205250-b0c7f1d9ece522f5
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Fri 2005-11-04 18:26:05 +0100
message:
Merge from Martin
------------------------------------------------------------
merged: jelmer at samba.org-20051030183932-9188295b602ce28c
parent: jelmer at samba.org-20051030172251-b6c14e0ca0daf326
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Sun 2005-10-30 19:39:32 +0100
message:
Move some more generic methods from NativeBranch to Branch.
------------------------------------------------------------
merged: jelmer at samba.org-20051030172251-b6c14e0ca0daf326
parent: jelmer at samba.org-20051030172031-22843b518b4eae57
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Sun 2005-10-30 18:22:51 +0100
message:
Move some generic methods of NativeBranch to Branch.
Add abstract methods to Branch that simply raise NotImplementedError
------------------------------------------------------------
merged: jelmer at samba.org-20051030172031-22843b518b4eae57
parent: robertc at robertcollins.net-20051030145626-2f57bd49824dd1d7
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Sun 2005-10-30 18:20:31 +0100
message:
Rename _Branch to NativeBranch to better indicate the difference with
foreign branches.
------------------------------------------------------------
merged: jamie at anchor.net.au-20051118023024-feaa5729c868a450
parent: jamie at anchor.net.au-20051114071148-ae0454c7e5297dcd
committer: Jamie Wilkinson <jamie at anchor.net.au>
timestamp: Fri 2005-11-18 13:30:24 +1100
message:
Fix a typo and grammar in Config.username() docstring.
------------------------------------------------------------
merged: jamie at anchor.net.au-20051114071148-ae0454c7e5297dcd
parent: mbp at sourcefrog.net-20051107162112-4f7170c06c6cde98
committer: Jamie Wilkinson <jamie at anchor.net.au>
timestamp: Mon 2005-11-14 18:11:48 +1100
message:
Exclude '.bzrignore' from exports.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051117080757-c491f5a14f179f3b
parent: mbp at sourcefrog.net-20051117080032-d6356c1aa14338a9
parent: dsilvers at digital-scurf.org-20051116162412-3830d783879122c7
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Thu 2005-11-17 19:07:57 +1100
message:
[merge] ftp transport, renamed-modified
------------------------------------------------------------
merged: dsilvers at digital-scurf.org-20051116162412-3830d783879122c7
parent: dsilvers at digital-scurf.org-20051116134641-3bd82ecd1b4af5cd
committer: Daniel Silverstone <dsilvers at digital-scurf.org>
branch nick: bzr.dev
timestamp: Wed 2005-11-16 16:24:12 +0000
message:
Add FTP transport
------------------------------------------------------------
merged: dsilvers at digital-scurf.org-20051116134641-3bd82ecd1b4af5cd
parent: dsilvers at digital-scurf.org-20051116013639-9cf6ba2d9fe0125d
parent: mbp at sourcefrog.net-20051116032119-119984187b55614a
committer: Daniel Silverstone <dsilvers at digital-scurf.org>
branch nick: bzr.dev
timestamp: Wed 2005-11-16 13:46:41 +0000
message:
Merge from mainline
------------------------------------------------------------
merged: dsilvers at digital-scurf.org-20051116013639-9cf6ba2d9fe0125d
parent: dsilvers at digital-scurf.org-20051110223301-1133172e54a0580d
committer: Daniel Silverstone <dsilvers at digital-scurf.org>
timestamp: Wed 2005-11-16 01:36:39 +0000
message:
Allow the delta display routine to show when a file
has been both renamed and modified in any way (text or meta)
This is done without altering the internal structure of the
TreeDelta object in case it is needed elsewhere as-is
------------------------------------------------------------
merged: dsilvers at digital-scurf.org-20051110223301-1133172e54a0580d
parent: mbp at sourcefrog.net-20051107162112-4f7170c06c6cde98
committer: Daniel Silverstone <dsilvers at digital-scurf.org>
timestamp: Thu 2005-11-10 17:33:01 -0500
message:
A revision of zero is meant to be zero, not None. Also order the revisions supplied to cope with the user being confused
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051117080032-d6356c1aa14338a9
parent: mbp at sourcefrog.net-20051117074538-5e113b7ad19a3b5d
parent: aaron.bentley at utoronto.ca-20051116050009-f9639470edb47a84
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Thu 2005-11-17 19:00:32 +1100
message:
[merge] aaron
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051116050009-f9639470edb47a84
parent: aaron.bentley at utoronto.ca-20051116042826-22da9f6f4aca479c
parent: mbp at sourcefrog.net-20051116032119-119984187b55614a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2005-11-16 00:00:09 -0500
message:
Merged the mainline
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051116042826-22da9f6f4aca479c
parent: abentley at panoramicfeedback.com-20051115210909-65710970107c20a3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2005-11-15 23:28:26 -0500
message:
Fixed handling of files in mixed branches
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051122043014-6df209fd93033b59
parent: mbp at sourcefrog.net-20051122041344-d98af0e4bc18f3da
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Tue 2005-11-22 15:30:14 +1100
message:
Exclude more files from dumb-rsync upload
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051122041344-d98af0e4bc18f3da
parent: mbp at sourcefrog.net-20051122033237-5099d6acc4751400
parent: shamrin at gmail.com-20051121092252-4f536da7bb6fee90
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Tue 2005-11-22 15:13:44 +1100
message:
[merge] win32 fixes (alexey)
------------------------------------------------------------
merged: shamrin at gmail.com-20051121092252-4f536da7bb6fee90
parent: shamrin at gmail.com-20051121090718-48400620bf12c6c6
committer: Alexey Shamrin <shamrin at gmail.com>
branch nick: win32.forgotten
timestamp: Mon 2005-11-21 04:22:52 -0500
message:
updated NEWS to include forgotten changes
------------------------------------------------------------
merged: shamrin at gmail.com-20051121090718-48400620bf12c6c6
parent: mbp at sourcefrog.net-20051118081007-80523bf145eb319b
parent: john at arbash-meinel.com-20051028202916-b350435b905ab6c1
committer: Alexey Shamrin <shamrin at gmail.com>
branch nick: win32.forgotten
timestamp: Mon 2005-11-21 04:07:18 -0500
message:
merge forgotten win32 fixes from http://bzr.arbash-meinel.com/branches/bzr/win32/
------------------------------------------------------------
merged: john at arbash-meinel.com-20051028202916-b350435b905ab6c1
parent: john at arbash-meinel.com-20051028202807-09e118d024cc7856
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-10-28 14:29:16 -0600
message:
[patch] Alexander Belchenko patch #12: use os.pathsep for BZR_PLUGIN_PATH
------------------------------------------------------------
merged: john at arbash-meinel.com-20051028202807-09e118d024cc7856
parent: john at arbash-meinel.com-20051028201738-ed1b168cd4aac775
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-10-28 14:28:07 -0600
message:
[patch] Alexander Belchenko patch #9, skip stat tests for win32
------------------------------------------------------------
merged: john at arbash-meinel.com-20051028201738-ed1b168cd4aac775
parent: john at arbash-meinel.com-20051028201605-3479df5255f74bf1
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-10-28 14:17:38 -0600
message:
[patch] testhashcache delay for win32 and cygwin
------------------------------------------------------------
merged: john at arbash-meinel.com-20051028201605-3479df5255f74bf1
parent: john at arbash-meinel.com-20051028193852-a9f11a3ecb984a83
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-10-28 14:16:05 -0600
message:
Updated build_tree to use fixed line-endings for tests which read the file contents and compare
------------------------------------------------------------
merged: john at arbash-meinel.com-20051028193852-a9f11a3ecb984a83
parent: john at arbash-meinel.com-20051028193246-94db6bf24d9b95b2
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-10-28 13:38:52 -0600
message:
Applying fix for EWOULDBLOCK under win32
------------------------------------------------------------
merged: john at arbash-meinel.com-20051028193246-94db6bf24d9b95b2
parent: john at arbash-meinel.com-20051028193206-a197c629d0c5657a
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-10-28 13:32:46 -0600
message:
Updating testconfig to handle missing environment variables
------------------------------------------------------------
merged: john at arbash-meinel.com-20051028193206-a197c629d0c5657a
parent: john at arbash-meinel.com-20051028192629-e441c87ce4bc3b19
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-10-28 13:32:06 -0600
message:
Making old_env a private member
------------------------------------------------------------
merged: john at arbash-meinel.com-20051028192629-e441c87ce4bc3b19
parent: john at arbash-meinel.com-20051028191653-60f76d76b2cac7c2
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-10-28 13:26:29 -0600
message:
Refactored environment cleaning code
------------------------------------------------------------
merged: john at arbash-meinel.com-20051028191653-60f76d76b2cac7c2
parent: john at arbash-meinel.com-20051028191501-8f599abdc5062bd2
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-10-28 13:16:53 -0600
message:
[patch] Aaron Bentley's HOME fix.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051028191501-8f599abdc5062bd2
parent: mbp at sourcefrog.net-20051028055302-14e925407b2b09d4
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-10-28 13:15:01 -0600
message:
Adding my win32 patch for moving the home directory.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051122033237-5099d6acc4751400
parent: mbp at sourcefrog.net-20051121085156-4fc6a9921c2cc723
parent: aaron.bentley at utoronto.ca-20051119225637-e7afc16a06a31b59
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Tue 2005-11-22 14:32:37 +1100
message:
[merge] make sure to get all text revisions during merge (aaron)
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051119225637-e7afc16a06a31b59
parent: aaron.bentley at utoronto.ca-20051119200756-339f5a64abed668d
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sat 2005-11-19 17:56:37 -0500
message:
Fixed fetch to be safer wrt ghosts and corrupt branches
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051119200756-339f5a64abed668d
parent: abentley at panoramicfeedback.com-20051118144716-c27df491076e98f3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sat 2005-11-19 15:07:56 -0500
message:
Added repr for Weave
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051118144716-c27df491076e98f3
parent: abentley at panoramicfeedback.com-20051117204623-4265b87790561ee4
parent: mbp at sourcefrog.net-20051118081007-80523bf145eb319b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Fri 2005-11-18 09:47:16 -0500
message:
Merge from Martin
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051117204623-4265b87790561ee4
parent: abentley at panoramicfeedback.com-20051117204200-efd6b944e3f7a6be
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Thu 2005-11-17 15:46:23 -0500
message:
Removed unused var
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051117204200-efd6b944e3f7a6be
parent: abentley at panoramicfeedback.com-20051117155155-bdf57cc1c7efb11d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Thu 2005-11-17 15:42:00 -0500
message:
Removed debugging code
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051117155155-bdf57cc1c7efb11d
parent: abentley at panoramicfeedback.com-20051117154631-2d0eb45521b98363
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Thu 2005-11-17 10:51:55 -0500
message:
Removed debug prints
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051117154631-2d0eb45521b98363
parent: abentley at panoramicfeedback.com-20051117154041-912d8f3bdd7d5a62
parent: mbp at sourcefrog.net-20051117074538-5e113b7ad19a3b5d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Thu 2005-11-17 10:46:31 -0500
message:
Merge from mainline
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051117154041-912d8f3bdd7d5a62
parent: abentley at panoramicfeedback.com-20051117150928-f40f1a19c81473fb
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Thu 2005-11-17 10:40:41 -0500
message:
Detect AWOL inventory revisions all at once
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051117150928-f40f1a19c81473fb
parent: aaron.bentley at utoronto.ca-20051116050009-f9639470edb47a84
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Thu 2005-11-17 10:09:28 -0500
message:
Made bzr check for stored revisions missing from ancestry
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051121085156-4fc6a9921c2cc723
parent: mbp at sourcefrog.net-20051118081007-80523bf145eb319b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Mon 2005-11-21 19:51:56 +1100
message:
[patch] add 'bzr inventory --kind directory'; remove 'bzr directories'
(Johan Rydberg)
------------------------------------------------------------
merged: john at arbash-meinel.com-20051121154158-1845aa886bfac4b4
parent: john at arbash-meinel.com-20051121152016-f53ba54bbbbc4474
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Mon 2005-11-21 09:41:58 -0600
message:
Added test for log formatting, found bug when redirecting short logs to a file instead of stdout.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051121152016-f53ba54bbbbc4474
parent: john at arbash-meinel.com-20051118210153-88fd1a200bdd872c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Mon 2005-11-21 09:20:16 -0600
message:
Stripping trailing newlines when displaying log messages
------------------------------------------------------------
merged: john at arbash-meinel.com-20051118210153-88fd1a200bdd872c
parent: john at arbash-meinel.com-20051118205706-825c182e74708a7e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Fri 2005-11-18 15:01:53 -0600
message:
Updating transport test, to handle NoSuchFile if a bogus url accidentally resolves.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051118205706-825c182e74708a7e
parent: john at arbash-meinel.com-20051118163428-498977103afee28e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Fri 2005-11-18 14:57:06 -0600
message:
[patch] Alexey Shamrin's patch for small win32 fixes
------------------------------------------------------------
merged: john at arbash-meinel.com-20051118163428-498977103afee28e
parent: john at arbash-meinel.com-20051118161638-f3cc5fcfb6504126
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Fri 2005-11-18 10:34:28 -0600
message:
Shorten test names in verbose mode in a logical way. Removed bzrlib.selftest prefix
------------------------------------------------------------
merged: john at arbash-meinel.com-20051118161638-f3cc5fcfb6504126
parent: john at arbash-meinel.com-20051117221217-7b51f99a1a60c578
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Fri 2005-11-18 10:16:38 -0600
message:
Renamed all test modules to remove the 'test' prefix
------------------------------------------------------------
merged: john at arbash-meinel.com-20051117221217-7b51f99a1a60c578
parent: john at arbash-meinel.com-20051117210621-37e9410490227390
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2005-11-17 16:12:17 -0600
message:
Refactoring blackbox tests into a package, rather than just a single file.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051117210621-37e9410490227390
parent: john at arbash-meinel.com-20051115000939-8861c35580bf690f
parent: mbp at sourcefrog.net-20051117074538-5e113b7ad19a3b5d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2005-11-17 15:06:21 -0600
message:
[merge] bzr.dev
------------------------------------------------------------
merged: john at arbash-meinel.com-20051115000939-8861c35580bf690f
parent: john at arbash-meinel.com-20051114235851-09fdf17b94c10438
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Mon 2005-11-14 18:09:39 -0600
message:
Updated the test to also test zip exports. Fixed some small bugs exposed by test suite.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051114235851-09fdf17b94c10438
parent: john at arbash-meinel.com-20051114230926-08b82fe07c945d30
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Mon 2005-11-14 17:58:51 -0600
message:
Refactored the export code to make it easier to add new export formats.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051114230926-08b82fe07c945d30
parent: john at arbash-meinel.com-20051113195705-ab81d5c77138884f
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Mon 2005-11-14 17:09:26 -0600
message:
Merging Alexander's zip export patch
------------------------------------------------------------
merged: john at arbash-meinel.com-20051113195705-ab81d5c77138884f
parent: john at arbash-meinel.com-20051113164619-6f9ba5898a45dc5c
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sun 2005-11-13 13:57:05 -0600
message:
Adding merge-delete-conflicts test case.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051125043654-106a589368532d7e
parent: mbp at sourcefrog.net-20051125040741-a49e7d347c01d531
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Fri 2005-11-25 15:36:54 +1100
message:
Don't ignore bzrlib/plugins -- really bad idea because they can have bad
old plugins lying around!
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051125040741-a49e7d347c01d531
parent: mbp at sourcefrog.net-20051125040609-9053145620fdc52b
parent: aaron.bentley at utoronto.ca-20051124060520-0279acee0f7c1d70
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Fri 2005-11-25 15:07:41 +1100
message:
[merge] aaron
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051124060520-0279acee0f7c1d70
parent: aaron.bentley at utoronto.ca-20051124041913-de24c05411cdc948
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2005-11-24 01:05:20 -0500
message:
Tweaked tree name generation when applying changesets
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051124041913-de24c05411cdc948
parent: mbp at sourcefrog.net-20051122230822-b876b5abe3f6bd0c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2005-11-23 23:19:13 -0500
message:
Handled cases where inventory entries need renaming but files don't exist
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051125040609-9053145620fdc52b
parent: mbp at sourcefrog.net-20051125003446-c79b479619f99236
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Fri 2005-11-25 15:06:09 +1100
message:
Fix trace of non-ascii messages, and add test.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051125003446-c79b479619f99236
parent: mbp at sourcefrog.net-20051124063651-e74eb497a72609d6
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Fri 2005-11-25 11:34:46 +1100
message:
[patch] Commit editor temporary files now start with 'bzr_log.' (Magnus Therning)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051124063651-e74eb497a72609d6
parent: mbp at sourcefrog.net-20051124043018-863bd95e46cce874
parent: mbp at sourcefrog.net-20051124061140-12da2df0f37a2756
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Thu 2005-11-24 17:36:51 +1100
message:
[merge] basic_io metaformat (mbp)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051124061140-12da2df0f37a2756
parent: mbp at sourcefrog.net-20051124060634-fa1e3a5a871ec5e7
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.basic_io
timestamp: Thu 2005-11-24 17:11:40 +1100
message:
More basicio quoting tests.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051124060634-fa1e3a5a871ec5e7
parent: mbp at sourcefrog.net-20051124053538-25fa7f2dc9ad8b01
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-11-24 17:06:34 +1100
message:
Addition test and bugfix for basic_io escaped strings.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051124053538-25fa7f2dc9ad8b01
parent: mbp at sourcefrog.net-20051104051950-beda983475a8793c
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.basic_io
timestamp: Thu 2005-11-24 16:35:38 +1100
message:
Fix up handling of escaped doublequotes at end of line.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051104051950-beda983475a8793c
parent: mbp at sourcefrog.net-20051104050311-f49d57035d772a7a
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-11-04 00:19:50 -0500
message:
Remove dead code
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051104050311-f49d57035d772a7a
parent: mbp at sourcefrog.net-20051104050210-d27f4c97961e98ee
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-11-04 00:03:11 -0500
message:
Update basic_io revision output
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051104050210-d27f4c97961e98ee
parent: mbp at sourcefrog.net-20051104032149-dd09b953390fcb66
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-11-04 00:02:10 -0500
message:
more basic_io tests
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051104032149-dd09b953390fcb66
parent: mbp at sourcefrog.net-20051104031759-b0f5f6f53e042b68
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-11-03 22:21:49 -0500
message:
Packing of empty basic_io stanzas
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051104031759-b0f5f6f53e042b68
parent: mbp at sourcefrog.net-20051104030537-19aaa444866ed40a
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-11-03 22:17:59 -0500
message:
More basic_io tests for quoting
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051104030537-19aaa444866ed40a
parent: mbp at sourcefrog.net-20051104014631-750e0ad4172c952c
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-11-03 22:05:37 -0500
message:
Go back to multiline quoted string values.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051104014631-750e0ad4172c952c
parent: mbp at sourcefrog.net-20051101215117-e7c33dde397b2350
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-11-03 20:46:31 -0500
message:
Make biobench directly executable
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051101215117-e7c33dde397b2350
parent: mbp at sourcefrog.net-20051101214801-77042eb9a8c56702
parent: mbp at sourcefrog.net-20051101123326-aa08b92ee6e8a659
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-11-01 16:51:17 -0500
message:
[merge] main -> bzr.mbp.basic_io
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051101214801-77042eb9a8c56702
parent: mbp at sourcefrog.net-20051101213350-123332025d47320e
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-11-01 16:48:01 -0500
message:
Get basic_io selftests running again for new format.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051101213350-123332025d47320e
parent: mbp at sourcefrog.net-20051101203022-441edf9d621f8d27
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-11-01 16:33:50 -0500
message:
More basic_io tweaking; break format
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051101203022-441edf9d621f8d27
parent: mbp at sourcefrog.net-20051101201130-e14511e01cae1624
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-11-01 15:30:22 -0500
message:
More basic_io tweaking
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051101201130-e14511e01cae1624
parent: mbp at sourcefrog.net-20051101174138-9dbc20cee1947bb7
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-11-01 15:11:30 -0500
message:
Experiments with basic_io for inventory
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051101174138-9dbc20cee1947bb7
parent: mbp at sourcefrog.net-20051101172517-659cff2957e91d71
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-11-01 12:41:38 -0500
message:
Fix basic_io writing of bools, and test.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051101172517-659cff2957e91d71
parent: mbp at sourcefrog.net-20051101133945-ce6f1c59ebd59002
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-11-01 12:25:17 -0500
message:
New BasicReader to pull a sequence of stanzas from a file, and test.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051101133945-ce6f1c59ebd59002
parent: mbp at sourcefrog.net-20051101131616-4fa90461dedafa7b
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-11-01 08:39:45 -0500
message:
Fix up reading sequence of stanzas from a file, and test.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051101131616-4fa90461dedafa7b
parent: mbp at sourcefrog.net-20051101131541-f499e47897d14d05
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-11-01 08:16:16 -0500
message:
Simple benchmark for basic_io
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051101131541-f499e47897d14d05
parent: mbp at sourcefrog.net-20051030075741-9617a3608c929266
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-11-01 08:15:41 -0500
message:
More basic_io development:
- update BasicWriter
- better writing of inventories
- refactored quoted string parser
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030075741-9617a3608c929266
parent: mbp at sourcefrog.net-20051030074858-7becf1fe627355d8
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 18:57:41 +1100
message:
Add Stanza.get_all and test repeated fields
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030074858-7becf1fe627355d8
parent: mbp at sourcefrog.net-20051030074350-ac526d8179d65a22
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 18:48:58 +1100
message:
More basic_io quoting tests
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030074350-ac526d8179d65a22
parent: mbp at sourcefrog.net-20051030070307-84f53d7f658ce896
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 18:43:50 +1100
message:
More robust basic_io parsing of quoted/multiline strings
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030070307-84f53d7f658ce896
parent: mbp at sourcefrog.net-20051030064119-a511529bd0af1ae6
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 18:03:07 +1100
message:
Fix up reading basic_io multiline strings
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030064119-a511529bd0af1ae6
parent: mbp at sourcefrog.net-20051030063959-1b1b0e558a871f93
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 17:41:19 +1100
message:
Add Stanza eq and ne methods and test.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030063959-1b1b0e558a871f93
parent: mbp at sourcefrog.net-20051030063617-309bc4b4179e0ceb
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 17:39:59 +1100
message:
Fix handling of negative integers and add test
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030063617-309bc4b4179e0ceb
parent: mbp at sourcefrog.net-20051030063449-5b0f79cd4a5803fa
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 17:36:17 +1100
message:
Add len(Stanza)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030063449-5b0f79cd4a5803fa
parent: mbp at sourcefrog.net-20051030063005-fd2d00e417bb7cb0
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 17:34:49 +1100
message:
more basic_io read tests
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030063005-fd2d00e417bb7cb0
parent: mbp at sourcefrog.net-20051030041218-89757315bff8cad5
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 17:30:05 +1100
message:
Update Stanza iteration tests
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030041218-89757315bff8cad5
parent: mbp at sourcefrog.net-20051030035632-fe26a238180a8cff
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 15:12:18 +1100
message:
Simple basic_io from_lines and .get()
Remove Stanza.__iter__; not really list-like
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030035632-fe26a238180a8cff
parent: mbp at sourcefrog.net-20051030034853-9b07d841176bf791
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 14:56:32 +1100
message:
Test basic_io writing multiline strings.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030034853-9b07d841176bf791
parent: mbp at sourcefrog.net-20051030034219-059eafe037aeafb8
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 14:48:53 +1100
message:
Larger test for writing basic_io
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030034219-059eafe037aeafb8
parent: mbp at sourcefrog.net-20051030032112-e24acbeee867b8f7
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 14:42:19 +1100
message:
More basic_io development
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030032112-e24acbeee867b8f7
parent: mbp at sourcefrog.net-20051030031835-7a295ef241d19450
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 14:21:12 +1100
message:
Iteration of Stanzas()
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030031835-7a295ef241d19450
parent: mbp at sourcefrog.net-20051028054949-98b4a70546cb7129
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 14:18:35 +1100
message:
Start bringing in basicio code
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051124043018-863bd95e46cce874
parent: mbp at sourcefrog.net-20051124024527-3cba8d517f403af4
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Thu 2005-11-24 15:30:18 +1100
message:
Hacking notes on TDD
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051124024527-3cba8d517f403af4
parent: mbp at sourcefrog.net-20051124022811-add704653e62d42b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Thu 2005-11-24 13:45:27 +1100
message:
Add ChangesetEntry.__repr__
Fix bad results from ChangesetEntry.summarize_name()
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051124022811-add704653e62d42b
parent: mbp at sourcefrog.net-20051124014111-b73f6da5f344f5ce
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Thu 2005-11-24 13:28:11 +1100
message:
Better exception for one unhandled merge case
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051124014111-b73f6da5f344f5ce
parent: mbp at sourcefrog.net-20051123062927-f33c0abd742146af
parent: robertc at robertcollins.net-20051123071842-ac5f13e1eb9d905b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Thu 2005-11-24 12:41:11 +1100
message:
[merge] refactoring of branch vs working tree, etc (robertc)
------------------------------------------------------------
merged: robertc at robertcollins.net-20051123071842-ac5f13e1eb9d905b
parent: robertc at robertcollins.net-20051118072940-c0e304e5d0935d86
parent: mbp at sourcefrog.net-20051122043014-6df209fd93033b59
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Wed 2005-11-23 18:18:42 +1100
message:
Merge from mpool.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051118072940-c0e304e5d0935d86
parent: robertc at robertcollins.net-20051118013610-33b08df8810ecca7
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-18 18:29:40 +1100
message:
Nuke __main__ for annotate.py
------------------------------------------------------------
merged: robertc at robertcollins.net-20051118013610-33b08df8810ecca7
parent: robertc at robertcollins.net-20051118013104-0189bf9fafb6e21a
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-18 12:36:10 +1100
message:
clarify use of Branch and WorkingTree in annotate.py
------------------------------------------------------------
merged: robertc at robertcollins.net-20051118013104-0189bf9fafb6e21a
parent: robertc at robertcollins.net-20051118012015-2c838373b4117f46
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-18 12:31:04 +1100
message:
Dont use Branch.open in smart_add when checking for child trees.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051118012015-2c838373b4117f46
parent: robertc at robertcollins.net-20051118011319-39cb6e79d1155a19
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-18 12:20:15 +1100
message:
Documentation.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051118011319-39cb6e79d1155a19
parent: robertc at robertcollins.net-20051117225933-612cf96076e37272
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-18 12:13:19 +1100
message:
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20051117225933-612cf96076e37272
parent: robertc at robertcollins.net-20051117225758-4c0f785d2849df07
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-18 09:59:33 +1100
message:
Cleanup the working_tree comments in Branch.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051117225758-4c0f785d2849df07
parent: robertc at robertcollins.net-20051117224342-1bd6578c82bd62aa
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-18 09:57:58 +1100
message:
move move() from Branch to WorkingTree.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051117224342-1bd6578c82bd62aa
parent: robertc at robertcollins.net-20051117222954-3404028201eaabd7
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-18 09:43:42 +1100
message:
Move rename_one from Branch to WorkingTree. (Robert Collins).
------------------------------------------------------------
merged: robertc at robertcollins.net-20051117222954-3404028201eaabd7
parent: robertc at robertcollins.net-20051117215555-035e7347e08eb7c9
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-18 09:29:54 +1100
message:
Move Branch.unknowns() to WorkingTree.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051117215555-035e7347e08eb7c9
parent: robertc at robertcollins.net-20051117081213-cefaacbf5dfb5652
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-18 08:55:55 +1100
message:
Move add from Branch to WorkingTree.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051117081213-cefaacbf5dfb5652
parent: robertc at robertcollins.net-20051117065251-6f7dcf54580a84ec
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Thu 2005-11-17 19:12:13 +1100
message:
Convert most of the front ends commands to use WorkingTree.open_containing
------------------------------------------------------------
merged: robertc at robertcollins.net-20051117065251-6f7dcf54580a84ec
parent: robertc at robertcollins.net-20051117061735-ace312c6dae3f67c
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Thu 2005-11-17 17:52:51 +1100
message:
Do not consider urls to be relative paths within working trees.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051117061735-ace312c6dae3f67c
parent: robertc at robertcollins.net-20051117052111-5f2e91c961f02d5c
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Thu 2005-11-17 17:17:35 +1100
message:
Use abspath not realpath in WorkingTree.open_containing, to avoid symlink resolution lies.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051117052111-5f2e91c961f02d5c
parent: robertc at robertcollins.net-20051113201422-8a34ef413bfc8222
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Thu 2005-11-17 16:21:11 +1100
message:
Provide a open_containing for WorkingTree.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051123062927-f33c0abd742146af
parent: mbp at sourcefrog.net-20051123062550-4da88b201d7d34b8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-23 17:29:27 +1100
message:
[patch] show number of revisions pushed/pulled/merged (Robey Pointer)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051123062550-4da88b201d7d34b8
parent: mbp at sourcefrog.net-20051123051652-13ba89e07170fcc9
parent: mbp at sourcefrog.net-20051123055520-5f2ad7ea4cca7adb
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-23 17:25:50 +1100
message:
[merge] trace improvements
- shorter error messages on exceptions
- shorter display of status and time in selftest output
- send debug output direct to file to reduce cost of going
through Python logging
- always send exception tracebacks to trace file
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051123055520-5f2ad7ea4cca7adb
parent: mbp at sourcefrog.net-20051111232450-aec10ff8afa12bae
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-11-23 16:55:20 +1100
message:
Remove need for BZR_DEBUG to get debug info in trace file.
Clean up new trace file.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051111232450-aec10ff8afa12bae
parent: mbp at sourcefrog.net-20051111232203-e1c6e4437f6fe9a7
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sat 2005-11-12 10:24:50 +1100
message:
Make logging of errors go through our trace functions
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051111232203-e1c6e4437f6fe9a7
parent: mbp at sourcefrog.net-20051111232033-a06ce840d036efa9
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sat 2005-11-12 10:22:03 +1100
message:
Don't enable default logging twice
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051111232033-a06ce840d036efa9
parent: mbp at sourcefrog.net-20051111232015-275817884c803e49
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sat 2005-11-12 10:20:33 +1100
message:
Do debug messages not through python logging
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051111232015-275817884c803e49
parent: mbp at sourcefrog.net-20051111231627-4cb27769d0eb1010
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sat 2005-11-12 10:20:15 +1100
message:
Enable logging early enough to save argv
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051111231627-4cb27769d0eb1010
parent: mbp at sourcefrog.net-20051111230656-b1f0dcf7062e48ae
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sat 2005-11-12 10:16:27 +1100
message:
Update log message quoting
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051111230656-b1f0dcf7062e48ae
parent: mbp at sourcefrog.net-20051111224736-8457569f2b10f629
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sat 2005-11-12 10:06:56 +1100
message:
Fix up format strings for some log calls
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051111224736-8457569f2b10f629
parent: mbp at sourcefrog.net-20051110234206-2fa4ada64c9cb8a0
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sat 2005-11-12 09:47:36 +1100
message:
Remove unnecessary import of obsolete bzrlib.revfile
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051110234206-2fa4ada64c9cb8a0
parent: mbp at sourcefrog.net-20051110233631-da361bc235b6da49
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-11-10 18:42:06 -0500
message:
Nicer display of verbose test results and progress
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051110233631-da361bc235b6da49
parent: mbp at sourcefrog.net-20051110232200-e59722d2c343821f
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-11-10 18:36:31 -0500
message:
Remove direct logging calls from selftest
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051123051652-13ba89e07170fcc9
parent: mbp at sourcefrog.net-20051123022222-8b8514ae885f0c72
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-23 16:16:52 +1100
message:
[patch] make --quiet a global option (robey)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051123022222-8b8514ae885f0c72
parent: mbp at sourcefrog.net-20051123011409-c7bd7982cf710184
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-23 13:22:22 +1100
message:
Fix regression of 'bzr log -v' - it wasn't showing changed files at all. (#4676)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051123011409-c7bd7982cf710184
parent: mbp at sourcefrog.net-20051123004549-32b59267a00938bf
parent: jelmer at samba.org-20051121201056-b5b364b20cb58115
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-23 12:14:09 +1100
message:
[merge] jelmer
------------------------------------------------------------
merged: jelmer at samba.org-20051121201056-b5b364b20cb58115
parent: jelmer at samba.org-20051121175528-358e070f5f303534
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: jelmer.integration
timestamp: Mon 2005-11-21 21:10:56 +0100
message:
Don't clear Revision.parent_ids after it has been set from the arguments
------------------------------------------------------------
merged: jelmer at samba.org-20051121175528-358e070f5f303534
parent: jelmer at samba.org-20051120204442-18bfa8e003cc92ea
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: jelmer.integration
timestamp: Mon 2005-11-21 18:55:28 +0100
message:
Make get_revision_xml_file() private
------------------------------------------------------------
merged: jelmer at samba.org-20051120204442-18bfa8e003cc92ea
parent: jelmer at samba.org-20051120193851-91fb5ea757facb74
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: jelmer.integration
timestamp: Sun 2005-11-20 21:44:42 +0100
message:
Remove methods from BzrBranch that were already implemented in Branch
------------------------------------------------------------
merged: jelmer at samba.org-20051120193851-91fb5ea757facb74
parent: jelmer at samba.org-20051120192409-32999f70ba448f5f
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: integration
timestamp: Sun 2005-11-20 20:38:51 +0100
message:
Fix error that was declared twice
------------------------------------------------------------
merged: jelmer at samba.org-20051120192409-32999f70ba448f5f
parent: jelmer at samba.org-20051118005738-6a5a3f5db00432bd
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: integration
timestamp: Sun 2005-11-20 20:24:09 +0100
message:
Remove some abstract methods that were no longer used.
------------------------------------------------------------
merged: jelmer at samba.org-20051118005738-6a5a3f5db00432bd
parent: mbp at sourcefrog.net-20051117074538-5e113b7ad19a3b5d
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Fri 2005-11-18 01:57:38 +0100
message:
Remove already fixed items from TODO
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051123004549-32b59267a00938bf
parent: mbp at sourcefrog.net-20051122230822-b876b5abe3f6bd0c
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-23 11:45:49 +1100
message:
[patch] annotate --long (robey pointer)
This fixes a single TODO in 'bzr annotate' that has been bugging me:
the email field is truncated even with '--long'.
The fix is pretty tiny (as you can see). It causes some generator
results to be collected instead of iterated, but this turns out to be
not a big deal, since the yield is very shallow and comes from a
collection one stack level deeper.
------------------------------------------------------------
merged: 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.
More information about the bazaar-commits
mailing list