Rev 1446: Merge from mpool. in /home/robertc/source/baz/integration/
Robert Collins
robertc at robertcollins.net
Sat Jan 21 09:54:45 GMT 2006
------------------------------------------------------------
revno: 1446
revision-id: 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.
added:
bzrlib/tests/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/clone.py clone.py-20050929121333-bc726d1ddd8042bc
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_hashcache.py testhashcache.py-20050706091800-0288ab2659338981
------------------------------------------------------------
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: 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-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: 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
More information about the bazaar-commits
mailing list