Rev 3634: (jam) Merge bzr-1.6rc3 into bzr.dev in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Thu Aug 14 20:57:44 BST 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3634
revision-id: pqm at pqm.ubuntu.com-20080814195737-7tpxreg897vxlmr5
parent: pqm at pqm.ubuntu.com-20080814185546-98x0mdzxsmj5b5wr
parent: john at arbash-meinel.com-20080814192259-lwm1mqhwgzi3u600
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-08-14 20:57:37 +0100
message:
(jam) Merge bzr-1.6rc3 into bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3633.1.1
revision-id: john at arbash-meinel.com-20080814192259-lwm1mqhwgzi3u600
parent: pqm at pqm.ubuntu.com-20080814185546-98x0mdzxsmj5b5wr
parent: pqm at pqm.ubuntu.com-20080814165207-0sfq9u9vy6rl7oxc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2008-08-14 14:22:59 -0500
message:
Merge bzr-1.6rc3 into bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3606.5.5
revision-id: pqm at pqm.ubuntu.com-20080814165207-0sfq9u9vy6rl7oxc
parent: pqm at pqm.ubuntu.com-20080814161828-cnj0l5hcd118zmt5
parent: john at arbash-meinel.com-20080814151046-75yoco8fdw9mk2ny
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.6
timestamp: Thu 2008-08-14 17:52:07 +0100
message:
Release bzr-1.6rc3
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3606.6.3
revision-id: john at arbash-meinel.com-20080814151046-75yoco8fdw9mk2ny
parent: john at arbash-meinel.com-20080814150333-gth1p57ghvbpu54o
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2008-08-14 10:10:46 -0500
message:
Update version strings for bzr-1.6rc3
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3606.6.2
revision-id: john at arbash-meinel.com-20080814150333-gth1p57ghvbpu54o
parent: john at arbash-meinel.com-20080814145830-hsj8dytdcqze3mvg
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2008-08-14 10:03:33 -0500
message:
Add NEWS entries for the other changes that were added for bzr-1.6rc3
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3606.5.4
revision-id: pqm at pqm.ubuntu.com-20080814161828-cnj0l5hcd118zmt5
parent: pqm at pqm.ubuntu.com-20080814055033-myv5ibn1lb50yf0t
parent: john at arbash-meinel.com-20080814145830-hsj8dytdcqze3mvg
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.6
timestamp: Thu 2008-08-14 17:18:28 +0100
message:
(robertc) Trigger index._buffer_all when a significant (>1/20) of the
index is being queried.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
------------------------------------------------------------
revno: 3606.6.1
revision-id: john at arbash-meinel.com-20080814145830-hsj8dytdcqze3mvg
parent: pqm at pqm.ubuntu.com-20080814055033-myv5ibn1lb50yf0t
author: Robert Collins <robertc at robertcollins.net>
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2008-08-14 09:58:30 -0500
message:
Cherry-pick Robert's index buffering.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
------------------------------------------------------------
revno: 3606.5.3
revision-id: pqm at pqm.ubuntu.com-20080814055033-myv5ibn1lb50yf0t
parent: pqm at pqm.ubuntu.com-20080814051958-e951os44voh2p373
parent: mhammond at skippinet.com.au-20080814014130-ohoxsrqy94jldajv
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.6
timestamp: Thu 2008-08-14 06:50:33 +0100
message:
(Mark Hammond) Updates to setup.py to support bundling tortoisebzr
and qbzr into the standalone win32 installer.
modified:
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 3606.5.2
revision-id: pqm at pqm.ubuntu.com-20080814051958-e951os44voh2p373
parent: pqm at pqm.ubuntu.com-20080814045127-s91yxfoqylz4i6jr
parent: john at arbash-meinel.com-20080814030842-fuc2xackfdyatf42
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.6
timestamp: Thu 2008-08-14 06:19:58 +0100
message:
(robertc) Disable reading .bzrrules from the working tree.
modified:
bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
bzrlib/tests/tree_implementations/test_iter_search_rules.py test_iter_search_rul-20080528065532-1ml1ttb12az20cxf-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
------------------------------------------------------------
revno: 3606.5.1
revision-id: pqm at pqm.ubuntu.com-20080814045127-s91yxfoqylz4i6jr
parent: pqm at pqm.ubuntu.com-20080813185456-kn2cq6pkj6h52z9k
parent: andrew.bennetts at canonical.com-20080814021531-3axt0ak75mpxobrk
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.6
timestamp: Thu 2008-08-14 05:51:27 +0100
message:
(spiv) Fix a regression in bzr+http:// where http wasn't implementing
a necessary function.
modified:
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
=== modified file 'NEWS'
--- a/NEWS 2008-08-14 18:55:46 +0000
+++ b/NEWS 2008-08-14 19:22:59 +0000
@@ -42,6 +42,29 @@
is unknown in both source and target.
(Robert Collins, Aaron Bentley)
+
+bzr 1.6rc3 2008-08-14
+---------------------
+
+ CHANGES:
+
+ * Disable reading ``.bzrrules`` as a per-branch rule preferences
+ file. The feature was not quite ready for a full release.
+ (Robert Collins)
+
+ IMPROVEMENTS:
+
+ * Update the windows installer to bundle TortoiseBzr and ``qbzr``
+ into the standalone installer. This will be the first official
+ windows release that installs Tortoise by default.
+ (Mark Hammond)
+
+ BUG FIXES:
+
+ * Fix a regression in ``bzr+http`` support. There was a missing
+ function (``_read_line``) that needed to be carried over from
+ ``bzr+ssh`` support. (Andrew Bennetts)
+
* ``GraphIndex`` objects will internally read an entire index if more
than 1/20th of their keyspace is requested in a single operation.
This largely mitigates a performance regression in ``bzr log FILE``
=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py 2008-08-13 22:51:55 +0000
+++ b/bzrlib/__init__.py 2008-08-14 19:22:59 +0000
@@ -47,6 +47,7 @@
# API compatibility version: bzrlib is currently API compatible with 1.7.
api_minimum_version = (1, 7, 0)
+
def _format_version_tuple(version_info):
"""Turn a version number 3-tuple or 5-tuple into a short string.
More information about the bazaar-commits
mailing list