Merge lp:~gz/bzr/dev_2.5_integration into lp:bzr

Proposed by Martin Packman on 2012-09-05
Status: Merged
Approved by: Martin Packman on 2012-09-05
Approved revision: 6550
Merged at revision: 6558
Proposed branch: lp:~gz/bzr/dev_2.5_integration
Merge into: lp:bzr
Diff against target: 141 lines (+25/-20)
7 files modified
.bzrignore (+1/-0)
INSTALL (+1/-3)
bzrlib/builtins.py (+3/-2)
bzrlib/tests/blackbox/test_testament.py (+11/-0)
doc/developers/code-style.txt (+3/-12)
doc/en/admin-guide/introduction.txt (+2/-3)
doc/en/release-notes/bzr-2.4.txt (+4/-0)
To merge this branch: bzr merge lp:~gz/bzr/dev_2.5_integration
Reviewer Review Type Date Requested Status
bzr-core 2012-09-05 Pending
Review via email: mp+122936@code.launchpad.net

Commit message

Merge 2.5

To post a comment you must log in.
Martin Packman (gz) wrote :

sent to pqm by email

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '.bzrignore'
--- .bzrignore 2010-10-13 00:26:41 +0000
+++ .bzrignore 2012-09-05 20:24:38 +0000
@@ -25,6 +25,7 @@
25# setup.py working directory25# setup.py working directory
26./build26./build
27./build-win3227./build-win32
28./bzrlib/locale
28# Editor temporary/working/backup files29# Editor temporary/working/backup files
29*$30*$
30.*.sw[nop]31.*.sw[nop]
3132
=== modified file 'INSTALL'
--- INSTALL 2010-06-02 05:03:31 +0000
+++ INSTALL 2012-09-05 20:24:38 +0000
@@ -4,9 +4,7 @@
4Dependencies4Dependencies
5------------5------------
66
7bzr requires Python2.4 and cElementTree:7bzr requires Python 2.6 or newer.
8
9 http://effbot.org/zone/element-index.htm
108
11If you wish to access branches over sftp, you will need paramiko and9If you wish to access branches over sftp, you will need paramiko and
12pycrypto:10pycrypto:
1311
=== modified file 'bzrlib/builtins.py'
--- bzrlib/builtins.py 2012-09-05 16:53:58 +0000
+++ bzrlib/builtins.py 2012-09-05 20:24:38 +0000
@@ -5140,6 +5140,7 @@
5140 Option('strict',5140 Option('strict',
5141 help='Produce a strict-format testament.')]5141 help='Produce a strict-format testament.')]
5142 takes_args = ['branch?']5142 takes_args = ['branch?']
5143 encoding_type = 'exact'
5143 @display_command5144 @display_command
5144 def run(self, branch=u'.', revision=None, long=False, strict=False):5145 def run(self, branch=u'.', revision=None, long=False, strict=False):
5145 from bzrlib.testament import Testament, StrictTestament5146 from bzrlib.testament import Testament, StrictTestament
@@ -5158,9 +5159,9 @@
5158 rev_id = revision[0].as_revision_id(b)5159 rev_id = revision[0].as_revision_id(b)
5159 t = testament_class.from_revision(b.repository, rev_id)5160 t = testament_class.from_revision(b.repository, rev_id)
5160 if long:5161 if long:
5161 sys.stdout.writelines(t.as_text_lines())5162 self.outf.writelines(t.as_text_lines())
5162 else:5163 else:
5163 sys.stdout.write(t.as_short_text())5164 self.outf.write(t.as_short_text())
51645165
51655166
5166class cmd_annotate(Command):5167class cmd_annotate(Command):
51675168
=== modified file 'bzrlib/tests/blackbox/test_testament.py'
--- bzrlib/tests/blackbox/test_testament.py 2009-03-23 14:59:43 +0000
+++ bzrlib/tests/blackbox/test_testament.py 2012-09-05 20:24:38 +0000
@@ -16,8 +16,10 @@
1616
17"""Blackbox tests for the 'bzr testament' command"""17"""Blackbox tests for the 'bzr testament' command"""
1818
19import re
1920
20from bzrlib.tests.test_testament import (21from bzrlib.tests.test_testament import (
22 osutils,
21 REV_1_SHORT,23 REV_1_SHORT,
22 REV_1_SHORT_STRICT,24 REV_1_SHORT_STRICT,
23 REV_2_TESTAMENT,25 REV_2_TESTAMENT,
@@ -46,3 +48,12 @@
46 self.assertEqualDiff(err, '')48 self.assertEqualDiff(err, '')
47 self.assertEqualDiff(out, REV_1_SHORT_STRICT)49 self.assertEqualDiff(out, REV_1_SHORT_STRICT)
4850
51 def test_testament_non_ascii(self):
52 self.wt.commit(u"Non \xe5ssci message")
53 long_out, err = self.run_bzr('testament --long')
54 self.assertEqualDiff(err, '')
55 short_out, err = self.run_bzr('testament')
56 self.assertEqualDiff(err, '')
57 sha1_re = re.compile('sha1: (?P<sha1>[a-f0-9]+)$', re.M)
58 sha1 = sha1_re.search(short_out).group('sha1')
59 self.assertEqual(sha1, osutils.sha_string(long_out))
4960
=== modified file 'doc/developers/code-style.txt'
--- doc/developers/code-style.txt 2011-06-28 21:45:01 +0000
+++ doc/developers/code-style.txt 2012-09-05 20:24:38 +0000
@@ -77,20 +77,11 @@
77Python versions77Python versions
78===============78===============
7979
80Bazaar supports Python from 2.4 through 2.6, and in the future we want to80Bazaar supports Python from 2.6 through 2.7, and in the future we want to
81support Python 2.7 and 3.0. Avoid using language features added in 2.5,81support Python 3. Avoid using language features added in
822.6 or 2.7, or features deprecated in Python 3.0. (You can check v3822.7, or features deprecated in Python 3.0. (You can check v3
83compatibility using the ``-3`` option of Python2.6.)83compatibility using the ``-3`` option of Python2.6.)
8484
85Specifically:
86
87* Don't use the ``with`` statement.
88
89* Don't ``from . import``.
90
91* Don't use ``try/except/finally``, which is not supported in Python2.4,
92 use separate nested ``try/except`` and ``try/finally`` blocks.
93
9485
95hasattr and getattr86hasattr and getattr
96===================87===================
9788
=== modified file 'doc/en/admin-guide/introduction.txt'
--- doc/en/admin-guide/introduction.txt 2010-06-02 05:03:31 +0000
+++ doc/en/admin-guide/introduction.txt 2012-09-05 20:24:38 +0000
@@ -31,13 +31,12 @@
31environments. For the purposes of this document, we will consider Mac OS X as31environments. For the purposes of this document, we will consider Mac OS X as
32a type of Unix.32a type of Unix.
3333
34In general, Bazaar requires only Python_ 2.4 or greater and the cElementTree_34In general, Bazaar requires only Python_ 2.6 or greater to run.
35package (included in Python 2.5 and later) to run. If you would *optionally*35If you would *optionally*
36like to be able to access branches using SFTP, you need `paramiko and36like to be able to access branches using SFTP, you need `paramiko and
37pycrypto`_.37pycrypto`_.
3838
39.. _Python: http://www.python.org/39.. _Python: http://www.python.org/
40.. _cElementTree: http://effbot.org/zone/element-index.htm
41.. _paramiko and pycrypto: http://www.lag.net/paramiko/40.. _paramiko and pycrypto: http://www.lag.net/paramiko/
4241
43For maximum performance, Bazaar can make use of compiled versions of some42For maximum performance, Bazaar can make use of compiled versions of some
4443
=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- doc/en/release-notes/bzr-2.4.txt 2012-06-18 11:43:07 +0000
+++ doc/en/release-notes/bzr-2.4.txt 2012-09-05 20:24:38 +0000
@@ -55,6 +55,10 @@
55* Prevent a traceback being printed to stderr when logging has problems and55* Prevent a traceback being printed to stderr when logging has problems and
56 accept utf-8 byte string without breaking. (Martin Packman, #714449)56 accept utf-8 byte string without breaking. (Martin Packman, #714449)
5757
58* Use ``encoding_type='exact'`` for ``bzr testament`` so that on Windows
59 the sha hash of the long testament matches the sha hash in the short
60 form. (John Arbash Meinel, #1010339)
61
58* _Win32Stat object provides members st_uid and st_gid, those are present62* _Win32Stat object provides members st_uid and st_gid, those are present
59 in Python's os.stat object. These members required for external tools like63 in Python's os.stat object. These members required for external tools like
60 bzr-git and dulwich. (Alexander Belchenko, #967060)64 bzr-git and dulwich. (Alexander Belchenko, #967060)