Rev 1460: merge from integration. in
/home/robertc/source/baz/branch-formats/
Robert Collins
robertc at robertcollins.net
Fri Jan 20 23:49:53 GMT 2006
------------------------------------------------------------
revno: 1460
revision-id: robertc at robertcollins.net-20060120234452-3df6c9440800110b
parent: robertc at robertcollins.net-20060120224536-44e2f4c17879f9a0
parent: robertc at robertcollins.net-20060118011340-ab7ab3d0ecc47c0f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Sat 2006-01-21 10:44:52 +1100
message:
merge from integration.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/changeset.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/hashcache.py hashcache.py-20050706091756-fe3a8cc1143ff24f
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
merged: robertc at robertcollins.net-20060118011340-ab7ab3d0ecc47c0f
parent: robertc at robertcollins.net-20060117230249-a8cb74e3894b8b3d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-01-18 12:13:40 +1100
message:
Update SFTP Urls as per mailing list thread.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060117230249-a8cb74e3894b8b3d
parent: robertc at robertcollins.net-20060112024225-fe991391e088dd58
parent: mbp at sourcefrog.net-20060113074531-d62e6798c2dc5ebc
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-01-18 10:02:49 +1100
message:
Merge from mbp.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060113074531-d62e6798c2dc5ebc
parent: mbp at sourcefrog.net-20060113063142-8e706dc1483c69e1
parent: denys.duchier at mozart-oz.org-20060112160312-2ef168ffc0964c11
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2006-01-13 18:45:31 +1100
message:
[merge] Hold locks around diff to prevent thrashing stat-cache (Denys)
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20060112160312-2ef168ffc0964c11
parent: denys.duchier at mozart-oz.org-20060112140407-8fcdee0baca6d707
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.diff
timestamp: Thu 2006-01-12 17:03:12 +0100
message:
removed the lock_write method for read-only trees
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20060112140407-8fcdee0baca6d707
parent: mbp at sourcefrog.net-20060112063723-4ec91b5ff30f0830
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2006-01-12 15:04:07 +0100
message:
lock operations for trees - use them for diff
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060112063723-4ec91b5ff30f0830
parent: mbp at sourcefrog.net-20060112045444-cc2e49b5bae40e06
parent: robertc at robertcollins.net-20060112024225-fe991391e088dd58
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2006-01-12 17:37:23 +1100
message:
[merge] robertc-integration
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060112045444-cc2e49b5bae40e06
parent: mbp at sourcefrog.net-20060111023617-858327bfdccb46e3
parent: denys.duchier at mozart-oz.org-20060111195859-3ffb9c90dba9caa9
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2006-01-12 15:54:44 +1100
message:
[merge] hashcache and related cleanups from Denys
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20060111195859-3ffb9c90dba9caa9
parent: denys.duchier at mozart-oz.org-20060111191838-1aa7989945935f65
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.cleanup
timestamp: Wed 2006-01-11 20:58:59 +0100
message:
hashcache: new constants and improved comment
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20060111191838-1aa7989945935f65
parent: denys.duchier at mozart-oz.org-20060111191229-370396538858f412
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.cleanup
timestamp: Wed 2006-01-11 20:18:38 +0100
message:
only write the hashcache when releasing the lock
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20060111191229-370396538858f412
parent: denys.duchier at mozart-oz.org-20060111191035-33f9defbfcd52b4d
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.cleanup
timestamp: Wed 2006-01-11 20:12:29 +0100
message:
hashcache: missing import for BzrError
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20060111191035-33f9defbfcd52b4d
parent: denys.duchier at mozart-oz.org-20060111190925-7bbe15ef3ee7b3cd
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.cleanup
timestamp: Wed 2006-01-11 20:10:35 +0100
message:
hashcache: remove useless os.readlink
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20060111190925-7bbe15ef3ee7b3cd
parent: denys.duchier at mozart-oz.org-20060109212309-919eac90ed3bb881
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.cleanup
timestamp: Wed 2006-01-11 20:09:25 +0100
message:
hashcache: import only once from bzrlib.osutils
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20060109212309-919eac90ed3bb881
parent: denys.duchier at mozart-oz.org-20051223180321-b1aca26aa107990f
parent: mbp at sourcefrog.net-20060109015138-d6d6eeb91df1ff0a
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.cleanup
timestamp: Mon 2006-01-09 22:23:09 +0100
message:
merged from trunk
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20051223180321-b1aca26aa107990f
parent: denys.duchier at mozart-oz.org-20051222190314-bc62a9e63173500a
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.cleanup
timestamp: Fri 2005-12-23 19:03:21 +0100
message:
removed apply_changeset_tree and get_inventory_change
apply_changetset_tree not only was not used but called
tree.update_source_inventory which is not defined anywhere
get_inventory_change was only used by apply_changeset_tree
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060111023617-858327bfdccb46e3
parent: mbp at sourcefrog.net-20060109015138-d6d6eeb91df1ff0a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Wed 2006-01-11 13:36:17 +1100
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060113063142-8e706dc1483c69e1
parent: mbp at sourcefrog.net-20060112063723-4ec91b5ff30f0830
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2006-01-13 17:31:42 +1100
message:
Bump version to 0.8pre
More information about the bazaar-commits
mailing list