Rev 3185: (mbp) merge 1.1 back to trunk in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Tue Jan 15 23:59:10 GMT 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3185
revision-id:pqm at pqm.ubuntu.com-20080115235859-r1zm2a49cqjfnl2b
parent: pqm at pqm.ubuntu.com-20080115141934-3vujw0up5rc8e0gn
parent: mbp at sourcefrog.net-20080115111319-ts5ghlxie2jz3ng5
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-01-15 23:58:59 +0000
message:
(mbp) merge 1.1 back to trunk
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3183.1.1
revision-id:mbp at sourcefrog.net-20080115111319-ts5ghlxie2jz3ng5
parent: pqm at pqm.ubuntu.com-20080115074456-0v1w54h783oq7n48
parent: pqm at pqm.ubuntu.com-20080115030052-x4n7l0pf5g5icfp4
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: integration
timestamp: Tue 2008-01-15 22:13:19 +1100
message:
Merge 1.1 release and prepare 1.2dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3170.2.1
revision-id:pqm at pqm.ubuntu.com-20080115030052-x4n7l0pf5g5icfp4
parent: pqm at pqm.ubuntu.com-20080107174938-hvwo399dzshh3cod
parent: mbp at sourcefrog.net-20080115005559-chpi0npub7frp0k5
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.1
timestamp: Tue 2008-01-15 03:00:52 +0000
message:
(mbp) prepare 1.1final
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3167.2.3
revision-id:mbp at sourcefrog.net-20080115005559-chpi0npub7frp0k5
parent: mbp at sourcefrog.net-20080104235304-ms9b1y63r710qv2i
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.1
timestamp: Tue 2008-01-15 11:55:59 +1100
message:
(mbp) prepare 1.1final
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3167.2.2
revision-id:mbp at sourcefrog.net-20080104235304-ms9b1y63r710qv2i
parent: mbp at sourcefrog.net-20080104235154-scexgca1m022yqwn
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.1rc1
timestamp: Sat 2008-01-05 10:53:04 +1100
message:
Prepare 1.1rc1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3167.2.1
revision-id:mbp at sourcefrog.net-20080104235154-scexgca1m022yqwn
parent: pqm at pqm.ubuntu.com-20080104045747-v647p21t9f2iicow
parent: mbp at sourcefrog.net-20080104080642-0som1my1v6qnf3ti
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.1rc1
timestamp: Sat 2008-01-05 10:51:54 +1100
message:
merge doc updates
modified:
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
tools/rst2html.py rst2html.py-20060817120932-gn177u8v0008txhu-1
=== modified file 'NEWS'
--- a/NEWS 2008-01-15 12:45:43 +0000
+++ b/NEWS 2008-01-15 23:58:59 +0000
@@ -8,25 +8,78 @@
--------------
CHANGES:
+
+ * Fetching via bzr+ssh will no longer fill ghosts by default (this is
+ consistent with pack-0.92 fetching over SFTP). (Robert Collins)
+
+ FEATURES:
+
+ * New smart method, ``Repository.stream_revisions_chunked``, for fetching
+ revision data that streams revision data via a chunked encoding. This
+ avoids buffering large amounts of revision data on the server and on the
+ client. (Andrew Bennetts, #178353)
+
+ IMPROVEMENTS:
+
+ * Fetching between different repository formats with compatible models now
+ takes advantage of the smart method to stream revisions. (Andrew Bennetts)
+
+ BUGFIXES:
+
+ * Calculate remote path relative to the shared medium in _SmartClient. This
+ is related to the problem in bug #124089. (Andrew Bennetts)
+
+ * ``reconfigure`` can safely be interrupted while fetching.
+ (Aaron Bentley, #179316)
+
+ * Unknown hostnames when connecting to a ``bzr://`` URL no longer cause
+ tracebacks. (Andrew Bennetts, #182849)
+
+ INTERNALS:
+
+ * Add -Dtimes debug flag, which records a timestamp against each mutter to
+ the trace file, relative to the first mutter. (Andrew Bennetts)
+
+ * Fetching now passes the find_ghosts flag through to the
+ ``InterRepository.missing_revision_ids`` call consistently for all
+ repository types. This will enable faster missing revision discovery with
+ bzr+ssh. (Robert Collins)
+
+ * New method ``iter_inventories`` on Repository for access to many
+ inventories. This is primarily used by the ``revision_trees`` method, as
+ direct access to inventories is discouraged. (Robert Collins)
+
+ * New method ``next_with_ghosts`` on the Graph breadth-first-search objects
+ which will split out ghosts and present parents into two separate sets,
+ useful for code which needs to be aware of ghosts (e.g. fetching data
+ cares about ghosts during revision selection). (Robert Collins)
+
+ * Repository has a new method ``has_revisions`` which signals the presence
+ of many revisions by returning a set of the revisions listed which are
+ present. This can be done by index queries without reading data for parent
+ revision names etc. (Robert Collins)
+
+
+bzr 1.1 2008-01-15
+------------------
+
+(no changes from 1.1rc1)
+
+bzr 1.1rc1 2008-01-05
+---------------------
+
+ CHANGES:
* The syntax ``bzr diff branch1 branch2`` is no longer supported.
Use ``bzr diff branch1 --new branch2`` instead. This change has
been made to remove the ambiguity where ``branch2`` is in fact a
specific file to diff within ``branch1``.
- * Fetching via bzr+ssh will no longer fill ghosts by default (this is
- consistent with pack-0.92 fetching over SFTP). (Robert Collins)
-
FEATURES:
* New option to use custom template-based formats in ``bzr version-info``.
(Lukáš Lalinský)
- * New smart method, ``Repository.stream_revisions_chunked``, for fetching
- revision data that streams revision data via a chunked encoding. This
- avoids buffering large amounts of revision data on the server and on the
- client. (Andrew Bennetts, #178353)
-
* diff '--using' allows an external diff tool to be used for files.
(Aaron Bentley)
@@ -54,9 +107,6 @@
at the start of the file, promoting linear reads for ``bzr log`` and the
like. This partially fixes #154129. (Robert Collins)
- * Fetching between different repository formats with compatible models now
- takes advantage of the smart method to stream revisions. (Andrew Bennetts)
-
* Merge directives now fetch prerequisites from the target branch if
needed. (Aaron Bentley)
@@ -84,9 +134,6 @@
* build_tree acceleration uses the correct path when a file has been moved.
(Aaron Bentley)
- * Calculate remote path relative to the shared medium in _SmartClient. This
- is related to the problem in bug #124089. (Andrew Bennetts)
-
* ``commit`` now succeeds when a checkout and its master branch share a
repository. (Aaron Bentley, #177592)
@@ -122,9 +169,6 @@
* ``reconfigure`` is able to convert trees into lightweight checkouts.
(Aaron Bentley)
- * ``reconfigure`` can safely be interrupted while fetching.
- (Aaron Bentley, #179316)
-
* Reduce lockdir timeout to 0 when running ``bzr serve``. (Andrew Bennetts,
#148087)
@@ -138,9 +182,6 @@
removed use characters not supported in the terminal encoding.
(Aaron Bentley)
- * Unknown hostnames when connecting to a ``bzr://`` URL no longer cause
- tracebacks. (Andrew Bennetts, #182849)
-
* When dumb http servers return whole files instead of the requested ranges,
read the remaining bytes by chunks to avoid overflowing network buffers.
(Vincent Ladeuil, #175886)
@@ -161,46 +202,24 @@
INTERNALS:
- * Add -Dtimes debug flag, which records a timestamp against each mutter to
- the trace file, relative to the first mutter. (Andrew Bennetts)
-
- * Fetching now passes the find_ghosts flag through to the
- ``InterRepository.missing_revision_ids`` call consistently for all
- repository types. This will enable faster missing revision discovery with
- bzr+ssh. (Robert Collins)
-
- * find_* methods available for BzrDirs, Branches and WorkingTrees.
- (Aaron Bentley)
-
- * Help topics can now be loaded from files.
- (Ian Clatworthy, Alexander Belchenko)
-
- * get_parent_map now always provides tuples as its output. (Aaron Bentley)
-
- * New method ``iter_inventories`` on Repository for access to many
- inventories. This is primarily used by the ``revision_trees`` method, as
- direct access to inventories is discouraged. (Robert Collins)
-
- * New method ``next_with_ghosts`` on the Graph breadth-first-search objects
- which will split out ghosts and present parents into two separate sets,
- useful for code which needs to be aware of ghosts (e.g. fetching data
- cares about ghosts during revision selection). (Robert Collins)
-
- * Parent Providers should now implement ``get_parent_map`` returning a
- dictionary instead of ``get_parents`` returning a list.
- ``Graph.get_parents`` is now deprecated. (John Arbash Meinel,
- Robert Collins)
-
- * Patience Diff now supports arbitrary python objects, as long as they
- support ``hash()``. (John Arbash Meinel)
-
- * Reduce selftest overhead to establish test names by memoization.
- (Vincent Ladeuil)
-
- * Repository has a new method ``has_revisions`` which signals the presence
- of many revisions by returning a set of the revisions listed which are
- present. This can be done by index queries without reading data for parent
- revision names etc. (Robert Collins)
+ * find_* methods available for BzrDirs, Branches and WorkingTrees.
+ (Aaron Bentley)
+
+ * Help topics can now be loaded from files.
+ (Ian Clatworthy, Alexander Belchenko)
+
+ * get_parent_map now always provides tuples as its output. (Aaron Bentley)
+
+ * Parent Providers should now implement ``get_parent_map`` returning a
+ dictionary instead of ``get_parents`` returning a list.
+ ``Graph.get_parents`` is now deprecated. (John Arbash Meinel,
+ Robert Collins)
+
+ * Patience Diff now supports arbitrary python objects, as long as they
+ support ``hash()``. (John Arbash Meinel)
+
+ * Reduce selftest overhead to establish test names by memoization.
+ (Vincent Ladeuil)
API BREAKS:
=== modified file 'bzr'
--- a/bzr 2007-12-14 07:35:49 +0000
+++ b/bzr 2008-01-15 11:13:19 +0000
@@ -22,7 +22,7 @@
import sys
# update this on each release
-_script_version = (1, 1, 0)
+_script_version = (1, 2, 0)
if __doc__ is None:
print "bzr does not support python -OO."
=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py 2007-12-14 07:35:49 +0000
+++ b/bzrlib/__init__.py 2008-01-15 11:13:19 +0000
@@ -26,7 +26,7 @@
user_encoding = get_user_encoding()
-__copyright__ = "Copyright 2005, 2006, 2007 Canonical Ltd."
+__copyright__ = "Copyright 2005, 2006, 2007, 2008 Canonical Ltd."
# same format as sys.version_info: "A tuple containing the five components of
# the version number: major, minor, micro, releaselevel, and serial. All
@@ -35,7 +35,7 @@
# Python version 2.0 is (2, 0, 0, 'final', 0)." Additionally we use a
# releaselevel of 'dev' for unreleased under-development code.
-version_info = (1, 1, 0, 'dev', 0)
+version_info = (1, 2, 0, 'dev', 0)
# API compatibility version: bzrlib is currently API compatible with 0.18.
api_minimum_version = (0, 18, 0)
More information about the bazaar-commits
mailing list