Rev 6558: (gz) Merge 2.5 (Martin Packman) in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/
Patch Queue Manager
pqm at pqm.ubuntu.com
Wed Sep 5 20:52:27 UTC 2012
At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 6558 [merge]
revision-id: pqm at pqm.ubuntu.com-20120905205226-8s3bzolvduug3ifj
parent: pqm at pqm.ubuntu.com-20120905190432-xq2pt8i1xxv8jhrk
parent: martin.packman at canonical.com-20120905202217-79io6livc1q0p66u
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2012-09-05 20:52:26 +0000
message:
(gz) Merge 2.5 (Martin Packman)
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
INSTALL INSTALL-20051019070340-4b27f2fb240c7943
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_testament.py test_testament.py-20060816161839-snq405g3jk15gpax-1
doc/developers/code-style.txt codestyle.txt-20100515105711-133ealf7ereiq2eq-1
doc/en/admin-guide/introduction.txt introduction.txt-20091205144603-lgpl0e0z6lzk2rdw-7
doc/en/release-notes/bzr-2.4.txt bzr2.4.txt-20110114053217-k7ym9jfz243fddjm-1
=== modified file '.bzrignore'
--- a/.bzrignore 2010-10-13 00:26:41 +0000
+++ b/.bzrignore 2012-08-07 06:32:51 +0000
@@ -25,6 +25,7 @@
# setup.py working directory
./build
./build-win32
+./bzrlib/locale
# Editor temporary/working/backup files
*$
.*.sw[nop]
=== modified file 'INSTALL'
--- a/INSTALL 2010-06-02 05:03:31 +0000
+++ b/INSTALL 2012-08-30 20:36:18 +0000
@@ -4,9 +4,7 @@
Dependencies
------------
-bzr requires Python2.4 and cElementTree:
-
- http://effbot.org/zone/element-index.htm
+bzr requires Python 2.6 or newer.
If you wish to access branches over sftp, you will need paramiko and
pycrypto:
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py 2012-09-05 16:53:58 +0000
+++ b/bzrlib/builtins.py 2012-09-05 20:52:26 +0000
@@ -5140,6 +5140,7 @@
Option('strict',
help='Produce a strict-format testament.')]
takes_args = ['branch?']
+ encoding_type = 'exact'
@display_command
def run(self, branch=u'.', revision=None, long=False, strict=False):
from bzrlib.testament import Testament, StrictTestament
@@ -5158,9 +5159,9 @@
rev_id = revision[0].as_revision_id(b)
t = testament_class.from_revision(b.repository, rev_id)
if long:
- sys.stdout.writelines(t.as_text_lines())
+ self.outf.writelines(t.as_text_lines())
else:
- sys.stdout.write(t.as_short_text())
+ self.outf.write(t.as_short_text())
class cmd_annotate(Command):
=== modified file 'bzrlib/tests/blackbox/test_testament.py'
--- a/bzrlib/tests/blackbox/test_testament.py 2009-03-23 14:59:43 +0000
+++ b/bzrlib/tests/blackbox/test_testament.py 2012-06-08 06:59:50 +0000
@@ -16,8 +16,10 @@
"""Blackbox tests for the 'bzr testament' command"""
+import re
from bzrlib.tests.test_testament import (
+ osutils,
REV_1_SHORT,
REV_1_SHORT_STRICT,
REV_2_TESTAMENT,
@@ -46,3 +48,12 @@
self.assertEqualDiff(err, '')
self.assertEqualDiff(out, REV_1_SHORT_STRICT)
+ def test_testament_non_ascii(self):
+ self.wt.commit(u"Non \xe5ssci message")
+ long_out, err = self.run_bzr('testament --long')
+ self.assertEqualDiff(err, '')
+ short_out, err = self.run_bzr('testament')
+ self.assertEqualDiff(err, '')
+ sha1_re = re.compile('sha1: (?P<sha1>[a-f0-9]+)$', re.M)
+ sha1 = sha1_re.search(short_out).group('sha1')
+ self.assertEqual(sha1, osutils.sha_string(long_out))
=== modified file 'doc/developers/code-style.txt'
--- a/doc/developers/code-style.txt 2011-06-28 21:45:01 +0000
+++ b/doc/developers/code-style.txt 2012-08-30 21:54:35 +0000
@@ -77,20 +77,11 @@
Python versions
===============
-Bazaar supports Python from 2.4 through 2.6, and in the future we want to
-support Python 2.7 and 3.0. Avoid using language features added in 2.5,
-2.6 or 2.7, or features deprecated in Python 3.0. (You can check v3
+Bazaar supports Python from 2.6 through 2.7, and in the future we want to
+support Python 3. Avoid using language features added in
+2.7, or features deprecated in Python 3.0. (You can check v3
compatibility using the ``-3`` option of Python2.6.)
-Specifically:
-
-* Don't use the ``with`` statement.
-
-* Don't ``from . import``.
-
-* Don't use ``try/except/finally``, which is not supported in Python2.4,
- use separate nested ``try/except`` and ``try/finally`` blocks.
-
hasattr and getattr
===================
=== modified file 'doc/en/admin-guide/introduction.txt'
--- a/doc/en/admin-guide/introduction.txt 2010-06-02 05:03:31 +0000
+++ b/doc/en/admin-guide/introduction.txt 2012-08-30 21:21:38 +0000
@@ -31,13 +31,12 @@
environments. For the purposes of this document, we will consider Mac OS X as
a type of Unix.
-In general, Bazaar requires only Python_ 2.4 or greater and the cElementTree_
-package (included in Python 2.5 and later) to run. If you would *optionally*
+In general, Bazaar requires only Python_ 2.6 or greater to run.
+If you would *optionally*
like to be able to access branches using SFTP, you need `paramiko and
pycrypto`_.
.. _Python: http://www.python.org/
-.. _cElementTree: http://effbot.org/zone/element-index.htm
.. _paramiko and pycrypto: http://www.lag.net/paramiko/
For maximum performance, Bazaar can make use of compiled versions of some
=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- a/doc/en/release-notes/bzr-2.4.txt 2012-06-18 11:43:07 +0000
+++ b/doc/en/release-notes/bzr-2.4.txt 2012-09-05 20:22:17 +0000
@@ -55,6 +55,10 @@
* Prevent a traceback being printed to stderr when logging has problems and
accept utf-8 byte string without breaking. (Martin Packman, #714449)
+* Use ``encoding_type='exact'`` for ``bzr testament`` so that on Windows
+ the sha hash of the long testament matches the sha hash in the short
+ form. (John Arbash Meinel, #1010339)
+
* _Win32Stat object provides members st_uid and st_gid, those are present
in Python's os.stat object. These members required for external tools like
bzr-git and dulwich. (Alexander Belchenko, #967060)
More information about the bazaar-commits
mailing list