Rev 1265: Merge integration. in /home/robertc/source/baz/storage/
Robert Collins
robertc at robertcollins.net
Wed Jan 25 04:23:22 GMT 2006
------------------------------------------------------------
revno: 1265
revision-id: robertc at robertcollins.net-20060125042316-66666bc57f41fb0c
parent: robertc at robertcollins.net-20060125014334-8dd9ed73c26c5956
parent: robertc at robertcollins.net-20060125014801-fbeeac15abb1638c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: storage
timestamp: Wed 2006-01-25 15:23:16 +1100
message:
Merge integration.
added:
bzrlib/tests/blackbox/test_added.py test_added.py-20060119085008-6b8b90369d42a26c
bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
bzrlib/tests/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
renamed:
bzrlib/xml.py => bzrlib/xml_serializer.py xml.py-20050309040759-57d51586fdec365d
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
TODO TODO-20050426050852-44d2ad9048dafbe9
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/changeset.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge_core.py merge_core.py-20050513021216-eda88728698d4401
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/stub_sftp.py stub_sftp.py-20051027032739-0e7ef4f7bab0e174
bzrlib/tests/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_hashcache.py testhashcache.py-20050706091800-0288ab2659338981
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/uncommit.py uncommit.py-20050626215513-5ec509fa425b305c
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/xml4.py xml4.py-20050916091259-db5ab55e7e6ca324
bzrlib/xml5.py xml5.py-20050907032657-aac8f960815b66b1
------------------------------------------------------------
merged: robertc at robertcollins.net-20060125014801-fbeeac15abb1638c
parent: robertc at robertcollins.net-20060124102908-b4a31bf2a3d67913
parent: robey at dhcp-192-168-1-88.danger.com-20060124190413-0bb880bf3a3247c3
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-01-25 12:48:01 +1100
message:
One more warn->warning typo from Robey Pointer.
------------------------------------------------------------
merged: robey at dhcp-192-168-1-88.danger.com-20060124190413-0bb880bf3a3247c3
parent: robey at master-shake.local-20060124173248-5ca94b076ad0d4f5
committer: Robey Pointer <robey at dhcp-192-168-1-88.danger.com>
branch nick: bzr.dev.sftp
timestamp: Tue 2006-01-24 11:04:13 -0800
message:
correct another misspelling of warning
------------------------------------------------------------
merged: robey at master-shake.local-20060124173248-5ca94b076ad0d4f5
parent: robey at dhcp-192-168-1-88.danger.com-20060123220545-a158fe0ed3995768
parent: mbp at sourcefrog.net-20060123020939-567fb193328ed7a6
committer: Robey Pointer <robey at master-shake.local>
branch nick: bzr.dev.sftp
timestamp: Tue 2006-01-24 09:32:48 -0800
message:
merge from bzr.dev
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060123020939-567fb193328ed7a6
parent: mbp at sourcefrog.net-20060119091139-d925dfcfdeef7109
parent: robertc at robertcollins.net-20060121104713-1ccd09539b35a07b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2006-01-23 13:09:39 +1100
message:
[merge] robert's integration
------------------------------------------------------------
merged: robertc at robertcollins.net-20060121104713-1ccd09539b35a07b
parent: robertc at robertcollins.net-20060121104246-604e9a6a3eb8e10b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Sat 2006-01-21 21:47:13 +1100
message:
Format tweaks for latest merges.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060121104246-604e9a6a3eb8e10b
parent: robertc at robertcollins.net-20060121095439-042130d88768fcb2
parent: john at arbash-meinel.com-20060120193409-1466a4908863d28f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Sat 2006-01-21 21:42:46 +1100
message:
Merge from jam-integration.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060120193409-1466a4908863d28f
parent: john at arbash-meinel.com-20060120182322-5294bc7c5bdf3aad
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Fri 2006-01-20 13:34:09 -0600
message:
Get revisions after we get inventories.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060120182322-5294bc7c5bdf3aad
parent: john at arbash-meinel.com-20060119231442-b842ad9c4c2e47fc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Fri 2006-01-20 12:23:22 -0600
message:
[patch] Aaron Bentley: Merge deletes foo.new
------------------------------------------------------------
merged: john at arbash-meinel.com-20060119231442-b842ad9c4c2e47fc
parent: john at arbash-meinel.com-20060117220146-ac8eec58ef8b1123
parent: john at arbash-meinel.com-20060119225642-573470adf632d423
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2006-01-19 17:14:42 -0600
message:
[merge] 0.7-bugfix: Fix fileid_involved to unescape xml characters, fix StubServer to handle paramiko > 1.5.2
------------------------------------------------------------
merged: john at arbash-meinel.com-20060119225642-573470adf632d423
parent: john at arbash-meinel.com-20060119221917-4f1fa4b42fc19b62
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-0.7-bugfix
timestamp: Thu 2006-01-19 16:56:42 -0600
message:
PEP8 comment fixes, and spelling error fix.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060119221917-4f1fa4b42fc19b62
parent: john at arbash-meinel.com-20060119221801-9d6a48e4c22f56a8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-0.7-bugfix
timestamp: Thu 2006-01-19 16:19:17 -0600
message:
Cleanup getattr() code, since getattr(None, '', None) still works
------------------------------------------------------------
merged: john at arbash-meinel.com-20060119221801-9d6a48e4c22f56a8
parent: john at arbash-meinel.com-20060119220047-effbc2821250761f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-0.7-bugfix
timestamp: Thu 2006-01-19 16:18:01 -0600
message:
Add an assert that fileid_involved won't be used if the branch format hasn't been determined to work with it. And a TODO about what needs to be fixed for weave inclusions.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060119220047-effbc2821250761f
parent: john at arbash-meinel.com-20060119212501-cb28cf532a878c41
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-0.7-bugfix
timestamp: Thu 2006-01-19 16:00:47 -0600
message:
Added copyright statement to test_fileid_involved, and minor pep8 cleanup.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060119212501-cb28cf532a878c41
parent: john at arbash-meinel.com-20060119203609-c72700dcc1c4fc9d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-0.7-bugfix
timestamp: Thu 2006-01-19 15:25:01 -0600
message:
fileid_involved needs to unescape the file id and revision id
------------------------------------------------------------
merged: john at arbash-meinel.com-20060119203609-c72700dcc1c4fc9d
parent: mbp at sourcefrog.net-20060118134553-29e4f4aa94391a25
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-0.7-bugfix
timestamp: Thu 2006-01-19 14:36:09 -0600
message:
Bugfix to allow using paramiko > 1.5.2
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060118134553-29e4f4aa94391a25
parent: mbp at sourcefrog.net-20060118134516-86e44fc139ce6aa2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2006-01-19 00:45:53 +1100
message:
bump version to 0.7rc2
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060118134516-86e44fc139ce6aa2
parent: mbp at sourcefrog.net-20060113073748-d6893fbd5454d5a4
parent: ghigo at therra.bhome-20051215213704-f591469a7e3bf212
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2006-01-19 00:45:16 +1100
message:
[merge] (Goffredo) faster merge/fetch by peeking into weave
------------------------------------------------------------
merged: ghigo at therra.bhome-20051215213704-f591469a7e3bf212
parent: ghigo at therra.bhome-20051215211628-f550b3c938813a22
committer: Goffredo Baroncelli <ghigo at therra.bhome>
branch nick: bzr-file_involved
timestamp: Thu 2005-12-15 22:37:04 +0100
message:
renamed test_file_involved -> test_fileid_involved
------------------------------------------------------------
merged: ghigo at therra.bhome-20051215211628-f550b3c938813a22
parent: ghigo at therra.bhome-20051215205928-ee0dbb06205ab6a1
committer: Goffredo Baroncelli <ghigo at therra.bhome>
branch nick: bzr-file_involved
timestamp: Thu 2005-12-15 22:16:28 +0100
message:
small clean-up
------------------------------------------------------------
merged: ghigo at therra.bhome-20051215205928-ee0dbb06205ab6a1
parent: ghigo at therra.bhome-20051215200704-3f398740a310033d
committer: Goffredo Baroncelli <ghigo at therra.bhome>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2005-12-15 21:59:28 +0100
message:
added test for function fileid_involved
------------------------------------------------------------
merged: ghigo at therra.bhome-20051215200704-3f398740a310033d
parent: ghigo at therra.bhome-20051215200546-900e3dc770fb9501
committer: Goffredo Baroncelli <ghigo at therra.bhome>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2005-12-15 21:07:04 +0100
message:
Small cleanup
------------------------------------------------------------
merged: ghigo at therra.bhome-20051215200546-900e3dc770fb9501
parent: ghigo at therra.bhome-20051215195642-afce9fdbdf879e31
committer: Goffredo Baroncelli <ghigo at therra.bhome>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2005-12-15 21:05:46 +0100
message:
The patch changes the way in which the code gets the list of the file_id of the
inventory. Before the code used the listable property of the transport ( not
available in the http transport ) in order to get every file_id contained under
.bzr/weave.
Now the code gets the file_id involved via the file_involved( ) function.
The big gain is that isn't anymore necessary to expand every inventory due
to the existence of the file_involved( ) function to know which file_id had to
be download.
------------------------------------------------------------
merged: ghigo at therra.bhome-20051215195642-afce9fdbdf879e31
parent: ghigo at therra.bhome-20051215195219-41bb08fac33bc5dc
committer: Goffredo Baroncelli <ghigo at therra.bhome>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2005-12-15 20:56:42 +0100
message:
Apply some style changes on the basis of Robert suggest
------------------------------------------------------------
merged: ghigo at therra.bhome-20051215195219-41bb08fac33bc5dc
parent: ghigo at therra.bhome-20051215194529-ab98fb6ad0080d87
committer: Goffredo Baroncelli <ghigo at therra.bhome>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2005-12-15 20:52:19 +0100
message:
This patch changes the fetch code. Before, the original code expanded every inventory and
copied/joined the changed weave. After that it merged the single inventory to the
local inventory weave.
Now the code get ( via the file_involved() function ) the file_id involved, then
copies/joins the weave changed. After that the new code merges the two inventory
(remote and local ). The big gain is that it isn't necessary anymore to expand
and merge every single inventory.
------------------------------------------------------------
merged: ghigo at therra.bhome-20051215194529-ab98fb6ad0080d87
parent: ghigo at therra.bhome-20051215193435-23c282cfdea1711a
committer: Goffredo Baroncelli <ghigo at therra.bhome>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2005-12-15 20:45:29 +0100
message:
- implemented some suggestion by Robert Collins
- renamed the function file_involved in fileid_involved*
- removed the check of the revision_id
------------------------------------------------------------
merged: ghigo at therra.bhome-20051215193435-23c282cfdea1711a
parent: mbp at sourcefrog.net-20051213054804-e1dcb0c21cacd174
committer: Goffredo Baroncelli <ghigo at therra.bhome>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2005-12-15 20:34:35 +0100
message:
function file_involved added
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060113073748-d6893fbd5454d5a4
parent: mbp at sourcefrog.net-20060113055200-7e197ac9ec1326f1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2006-01-13 18:37:48 +1100
message:
[cherrypick] Hold locks around entire diff operations to avoid thrashing
hashcache. (from denys)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060113055200-7e197ac9ec1326f1
parent: mbp at sourcefrog.net-20060109015138-d6d6eeb91df1ff0a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2006-01-13 16:52:00 +1100
message:
[patch] stat-cache fixes from Denys
------------------------------------------------------------
merged: john at arbash-meinel.com-20060117220146-ac8eec58ef8b1123
parent: john at arbash-meinel.com-20060116221250-28226bfc996ecb4d
parent: denys.duchier at mozart-oz.org-20060117161257-d1f67475c18d9b32
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-01-17 16:01:46 -0600
message:
[merge] Denys Duchier: fix revisionspec to allow branch:../otherbranch
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20060117161257-d1f67475c18d9b32
parent: denys.duchier at mozart-oz.org-20060117153121-cd6ea3ce58ecef5c
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.fix.revisionspec
timestamp: Tue 2006-01-17 17:12:57 +0100
message:
order MODULES_TO_DOCTEST alphabetically
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20060117153121-cd6ea3ce58ecef5c
parent: mbp at sourcefrog.net-20060113074531-d62e6798c2dc5ebc
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.fix.revisionspec
timestamp: Tue 2006-01-17 16:31:21 +0100
message:
distinguish ../ as path to branch and .. as revspec separator
------------------------------------------------------------
merged: john at arbash-meinel.com-20060116221250-28226bfc996ecb4d
parent: john at arbash-meinel.com-20060112060603-635de5933db78304
parent: john at arbash-meinel.com-20060116220752-f88bd067eb868bfb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Mon 2006-01-16 16:12:50 -0600
message:
[merge] jam-pending: bzr.dev + give correct error message when not in working tree.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060116220752-f88bd067eb868bfb
parent: john at arbash-meinel.com-20060116202007-9b9239c2f521d257
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Mon 2006-01-16 16:07:52 -0600
message:
Cleanup from Robert Collins.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060116202007-9b9239c2f521d257
parent: john at arbash-meinel.com-20060116195945-1ead0dc4979d3aeb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Mon 2006-01-16 14:20:07 -0600
message:
Adding fix + test for correct error message when not in branch.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060116195945-1ead0dc4979d3aeb
parent: john at arbash-meinel.com-20060116194637-21cc1999f1f38cb2
parent: mbp at sourcefrog.net-20060113074531-d62e6798c2dc5ebc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Mon 2006-01-16 13:59:45 -0600
message:
[merge] bzr.dev
------------------------------------------------------------
merged: john at arbash-meinel.com-20060116194637-21cc1999f1f38cb2
parent: john at arbash-meinel.com-20060108235253-6d04ece651878697
parent: john at arbash-meinel.com-20060112060603-635de5933db78304
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Mon 2006-01-16 13:46:37 -0600
message:
[merge] jam-integration 1503
------------------------------------------------------------
merged: john at arbash-meinel.com-20060112060603-635de5933db78304
parent: john at arbash-meinel.com-20060111214111-dc7ac5a25f1ed038
parent: robertc at robertcollins.net-20060112024225-fe991391e088dd58
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2006-01-12 00:06:03 -0600
message:
[merge] Robert Collins integration.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060111214111-dc7ac5a25f1ed038
parent: john at arbash-meinel.com-20060110203919-6fd543601354ecc2
parent: denys.duchier at mozart-oz.org-20060111191838-1aa7989945935f65
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Wed 2006-01-11 15:41:11 -0600
message:
[merge] Denys Duchier bzr.cleanup revno 1500: a few small code cleanups
------------------------------------------------------------
merged: john at arbash-meinel.com-20060110203919-6fd543601354ecc2
parent: john at arbash-meinel.com-20060110153622-7c751e4607688cee
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-01-10 14:39:19 -0600
message:
[patch] Robey Pointer: diff -r 1.. should diff against working tree.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060110153622-7c751e4607688cee
parent: john at arbash-meinel.com-20060110141623-7e8353f78097e303
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-01-10 09:36:22 -0600
message:
uncommit doesn't need to read inventories since it doesn't do cleanup.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060110141623-7e8353f78097e303
parent: john at arbash-meinel.com-20060109044324-0e6d4e5bc6a180c1
parent: denys.duchier at mozart-oz.org-20060109235237-c332fdaf6843931c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-01-10 08:16:23 -0600
message:
[merge] Denys Duchier bzr.patches: remove apply_changeset and get_inventory_tree
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20060109235237-c332fdaf6843931c
parent: denys.duchier at mozart-oz.org-20060109213204-bfc723a545be8093
parent: denys.duchier at mozart-oz.org-20060109212309-919eac90ed3bb881
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.patches
timestamp: Tue 2006-01-10 00:52:37 +0100
message:
merged in removal of apply_changeset and get_inventory_change after getting +2 on it
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20060109213204-bfc723a545be8093
parent: denys.duchier at mozart-oz.org-20051223182436-196e481a0d75b65d
parent: mbp at sourcefrog.net-20060109015138-d6d6eeb91df1ff0a
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.patches
timestamp: Mon 2006-01-09 22:32:04 +0100
message:
merged from trunk
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20051223182436-196e481a0d75b65d
parent: denys.duchier at mozart-oz.org-20051222190314-bc62a9e63173500a
parent: denys.duchier at mozart-oz.org-20051221231921-e38aacd973ce2e59
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.patches
timestamp: Fri 2005-12-23 19:24:36 +0100
message:
merged bzr.tests up to revision 1494
------------------------------------------------------------
merged: john at arbash-meinel.com-20060109044324-0e6d4e5bc6a180c1
parent: john at arbash-meinel.com-20060108235552-c8b2f2f3f5830f89
parent: mbp at sourcefrog.net-20060109015138-d6d6eeb91df1ff0a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Sun 2006-01-08 22:43:24 -0600
message:
[merge] bzr.dev 1515
------------------------------------------------------------
merged: john at arbash-meinel.com-20060108235552-c8b2f2f3f5830f89
parent: john at arbash-meinel.com-20060104234532-14bf2cb2a1e65ba8
parent: john at arbash-meinel.com-20060108235253-6d04ece651878697
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Sun 2006-01-08 17:55:52 -0600
message:
[merge] jam-pending 1502: remove ancestry.weave, remove --all from uncommit.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060108235253-6d04ece651878697
parent: john at arbash-meinel.com-20060108233437-0e37ff512b0219be
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Sun 2006-01-08 17:52:53 -0600
message:
Adding TODO to upgrade.py to remove ancestry.weave
------------------------------------------------------------
merged: john at arbash-meinel.com-20060108233437-0e37ff512b0219be
parent: john at arbash-meinel.com-20060106153621-671372fb0c7eb964
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Sun 2006-01-08 17:34:37 -0600
message:
Added TODO for bzr uncommit to remove unreferenced information.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060106153621-671372fb0c7eb964
parent: john at arbash-meinel.com-20060103195412-a14e7c169cda46ba
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Fri 2006-01-06 09:36:21 -0600
message:
Removed --all from bzr uncommit, it was broken anyway.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060103195412-a14e7c169cda46ba
parent: john at arbash-meinel.com-20060103151011-2ad890a2ff1475a4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Tue 2006-01-03 13:54:12 -0600
message:
don't create ancestry.weave
------------------------------------------------------------
merged: john at arbash-meinel.com-20060104234532-14bf2cb2a1e65ba8
parent: john at arbash-meinel.com-20060103154418-e6b640e95a1d0e03
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Wed 2006-01-04 17:45:32 -0600
message:
[patch] Wouter Bolsterlee: Fix ftp error in error handling code
------------------------------------------------------------
merged: robertc at robertcollins.net-20060121095439-042130d88768fcb2
parent: robertc at robertcollins.net-20060118011340-ab7ab3d0ecc47c0f
parent: mbp at sourcefrog.net-20060118082354-b28f3ecdecc245b2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Sat 2006-01-21 20:54:39 +1100
message:
Merge from mpool.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060118082354-b28f3ecdecc245b2
parent: mbp at sourcefrog.net-20060113081222-6b572004a2ade0cc
parent: ghigo at therra.bhome-20051215213704-f591469a7e3bf212
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.fileid-involved
timestamp: Wed 2006-01-18 19:23:54 +1100
message:
[merge] goffredo's fetch/clone improvements
These speed up the operations by peeking into the inventory weave to see which
files are affected without extracting every inventory version.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060113081222-6b572004a2ade0cc
parent: mbp at sourcefrog.net-20060113074531-d62e6798c2dc5ebc
parent: denys.duchier at mozart-oz.org-20060112161054-90a5f1b649d87ee0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2006-01-13 19:12:22 +1100
message:
[merge] test_hashcache_raise from Denys
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20060112161054-90a5f1b649d87ee0
parent: denys.duchier at mozart-oz.org-20060112092814-aa4a8fc83ad6df5e
parent: mbp at sourcefrog.net-20060112063723-4ec91b5ff30f0830
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.patches
timestamp: Thu 2006-01-12 17:10:54 +0100
message:
sync with bzr.dev mainline
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20060112092814-aa4a8fc83ad6df5e
parent: denys.duchier at mozart-oz.org-20060109235237-c332fdaf6843931c
parent: denys.duchier at mozart-oz.org-20060112012636-dde78a3a3314b5aa
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.patches
timestamp: Thu 2006-01-12 10:28:14 +0100
message:
merged hashcache test after +2 approval
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20060112012636-dde78a3a3314b5aa
parent: denys.duchier at mozart-oz.org-20060112003410-a96048b76f8c6fa9
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.tests
timestamp: Thu 2006-01-12 02:26:36 +0100
message:
test_hashcache_raise: minor space fix
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20060112003410-a96048b76f8c6fa9
parent: denys.duchier at mozart-oz.org-20060111225357-972e0c46ca0e5263
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.tests
timestamp: Thu 2006-01-12 01:34:10 +0100
message:
test_hashcache: catch no exceptions
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20060111225357-972e0c46ca0e5263
parent: denys.duchier at mozart-oz.org-20060111215238-78996c3541a0b637
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.tests
timestamp: Wed 2006-01-11 23:53:57 +0100
message:
test_hashcache_raise: complain if no weird file type can be created
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20060111215238-78996c3541a0b637
parent: denys.duchier at mozart-oz.org-20060111201505-42a209128c43128b
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.tests
timestamp: Wed 2006-01-11 22:52:38 +0100
message:
simplified test_hashcache_raise as advised by jam
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20060111201505-42a209128c43128b
parent: denys.duchier at mozart-oz.org-20060109211151-7714c42575b9a601
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.tests
timestamp: Wed 2006-01-11 21:15:05 +0100
message:
check that hashcache can raise BzrError
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20060109211151-7714c42575b9a601
parent: denys.duchier at mozart-oz.org-20051221231921-e38aacd973ce2e59
parent: mbp at sourcefrog.net-20060109015138-d6d6eeb91df1ff0a
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.tests
timestamp: Mon 2006-01-09 22:11:51 +0100
message:
merged from trunk
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060119091139-d925dfcfdeef7109
parent: mbp at sourcefrog.net-20060118082354-b28f3ecdecc245b2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2006-01-19 20:11:39 +1100
message:
Fix 'bzr added' typo, and tests for that command.
Patch from Nathan McCallum.
------------------------------------------------------------
merged: robey at dhcp-192-168-1-88.danger.com-20060123220545-a158fe0ed3995768
parent: robey at master-shake.local-20060123081338-82df2d3377709920
committer: Robey Pointer <robey at dhcp-192-168-1-88.danger.com>
branch nick: bzr.dev.sftp
timestamp: Mon 2006-01-23 14:05:45 -0800
message:
use alternate form of getattr(st_mode) for people using paramiko snapshots
------------------------------------------------------------
merged: robey at master-shake.local-20060123081338-82df2d3377709920
parent: robey at master-shake.local-20060123081235-66864912ac0de40b
committer: Robey Pointer <robey at master-shake.local>
branch nick: bzr.dev.sftp
timestamp: Mon 2006-01-23 00:13:38 -0800
message:
add a single full-handshake test to verify that sftp-over-ssh works
------------------------------------------------------------
merged: robey at master-shake.local-20060123081235-66864912ac0de40b
parent: robey at master-shake.local-20060123051335-663b18ee5ae90126
committer: Robey Pointer <robey at master-shake.local>
branch nick: bzr.dev.sftp
timestamp: Mon 2006-01-23 00:12:35 -0800
message:
spell warning correctly :) and move recv_ready close to recv for readability
------------------------------------------------------------
merged: robey at master-shake.local-20060123051335-663b18ee5ae90126
parent: robey at master-shake.local-20060123031251-b0e2bf22b0c91852
committer: Robey Pointer <robey at master-shake.local>
branch nick: bzr.dev.sftp
timestamp: Sun 2006-01-22 21:13:35 -0800
message:
ask paramiko to log into the bzr logging tree during unit tests, and log a warning when the server thread exits due to exception
------------------------------------------------------------
merged: robey at master-shake.local-20060123031251-b0e2bf22b0c91852
parent: mbp at sourcefrog.net-20060118082354-b28f3ecdecc245b2
committer: Robey Pointer <robey at master-shake.local>
branch nick: bzr.dev.sftp
timestamp: Sun 2006-01-22 19:12:51 -0800
message:
modify the sftp unit tests to perform sftp over a direct localhost socket instead of over an actual ssh2 transport
------------------------------------------------------------
merged: robertc at robertcollins.net-20060124102908-b4a31bf2a3d67913
parent: robertc at robertcollins.net-20060124065059-1fcad84661b00b40
parent: robey at dhcp-192-168-1-88.danger.com-20060123220545-a158fe0ed3995768
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2006-01-24 21:29:08 +1100
message:
* SFTP tests now shortcut the SSH negotiation, reducing test overhead
for testing SFTP protocol support. (Robey Pointer)
------------------------------------------------------------
merged: robertc at robertcollins.net-20060124065059-1fcad84661b00b40
parent: robertc at robertcollins.net-20060121104713-1ccd09539b35a07b
parent: mbp at sourcefrog.net-20060123020939-567fb193328ed7a6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2006-01-24 17:50:59 +1100
message:
Merge from bzr.dev
More information about the bazaar-commits
mailing list