Merge lp:~gz/bzr/2.5_2.4_integration into lp:bzr/2.5

Proposed by Martin Packman on 2012-09-05
Status: Merged
Approved by: Martin Packman on 2012-09-05
Approved revision: 6508
Merged at revision: 6508
Proposed branch: lp:~gz/bzr/2.5_2.4_integration
Merge into: lp:bzr/2.5
Diff against target: 129 lines (+24/-20)
6 files modified
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/2.5_2.4_integration
Reviewer Review Type Date Requested Status
bzr-core 2012-09-05 Pending
Review via email: mp+122919@code.launchpad.net

Commit message

Merge 2.4 into 2.5

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

With the correct merge target this time...

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
1=== modified file 'INSTALL'
2--- INSTALL 2010-06-02 05:03:31 +0000
3+++ INSTALL 2012-09-05 18:27:21 +0000
4@@ -4,9 +4,7 @@
5 Dependencies
6 ------------
7
8-bzr requires Python2.4 and cElementTree:
9-
10- http://effbot.org/zone/element-index.htm
11+bzr requires Python 2.6 or newer.
12
13 If you wish to access branches over sftp, you will need paramiko and
14 pycrypto:
15
16=== modified file 'bzrlib/builtins.py'
17--- bzrlib/builtins.py 2012-05-22 08:10:13 +0000
18+++ bzrlib/builtins.py 2012-09-05 18:27:21 +0000
19@@ -5114,6 +5114,7 @@
20 Option('strict',
21 help='Produce a strict-format testament.')]
22 takes_args = ['branch?']
23+ encoding_type = 'exact'
24 @display_command
25 def run(self, branch=u'.', revision=None, long=False, strict=False):
26 from bzrlib.testament import Testament, StrictTestament
27@@ -5132,9 +5133,9 @@
28 rev_id = revision[0].as_revision_id(b)
29 t = testament_class.from_revision(b.repository, rev_id)
30 if long:
31- sys.stdout.writelines(t.as_text_lines())
32+ self.outf.writelines(t.as_text_lines())
33 else:
34- sys.stdout.write(t.as_short_text())
35+ self.outf.write(t.as_short_text())
36
37
38 class cmd_annotate(Command):
39
40=== modified file 'bzrlib/tests/blackbox/test_testament.py'
41--- bzrlib/tests/blackbox/test_testament.py 2009-03-23 14:59:43 +0000
42+++ bzrlib/tests/blackbox/test_testament.py 2012-09-05 18:27:21 +0000
43@@ -16,8 +16,10 @@
44
45 """Blackbox tests for the 'bzr testament' command"""
46
47+import re
48
49 from bzrlib.tests.test_testament import (
50+ osutils,
51 REV_1_SHORT,
52 REV_1_SHORT_STRICT,
53 REV_2_TESTAMENT,
54@@ -46,3 +48,12 @@
55 self.assertEqualDiff(err, '')
56 self.assertEqualDiff(out, REV_1_SHORT_STRICT)
57
58+ def test_testament_non_ascii(self):
59+ self.wt.commit(u"Non \xe5ssci message")
60+ long_out, err = self.run_bzr('testament --long')
61+ self.assertEqualDiff(err, '')
62+ short_out, err = self.run_bzr('testament')
63+ self.assertEqualDiff(err, '')
64+ sha1_re = re.compile('sha1: (?P<sha1>[a-f0-9]+)$', re.M)
65+ sha1 = sha1_re.search(short_out).group('sha1')
66+ self.assertEqual(sha1, osutils.sha_string(long_out))
67
68=== modified file 'doc/developers/code-style.txt'
69--- doc/developers/code-style.txt 2011-06-28 21:45:01 +0000
70+++ doc/developers/code-style.txt 2012-09-05 18:27:21 +0000
71@@ -77,20 +77,11 @@
72 Python versions
73 ===============
74
75-Bazaar supports Python from 2.4 through 2.6, and in the future we want to
76-support Python 2.7 and 3.0. Avoid using language features added in 2.5,
77-2.6 or 2.7, or features deprecated in Python 3.0. (You can check v3
78+Bazaar supports Python from 2.6 through 2.7, and in the future we want to
79+support Python 3. Avoid using language features added in
80+2.7, or features deprecated in Python 3.0. (You can check v3
81 compatibility using the ``-3`` option of Python2.6.)
82
83-Specifically:
84-
85-* Don't use the ``with`` statement.
86-
87-* Don't ``from . import``.
88-
89-* Don't use ``try/except/finally``, which is not supported in Python2.4,
90- use separate nested ``try/except`` and ``try/finally`` blocks.
91-
92
93 hasattr and getattr
94 ===================
95
96=== modified file 'doc/en/admin-guide/introduction.txt'
97--- doc/en/admin-guide/introduction.txt 2010-06-02 05:03:31 +0000
98+++ doc/en/admin-guide/introduction.txt 2012-09-05 18:27:21 +0000
99@@ -31,13 +31,12 @@
100 environments. For the purposes of this document, we will consider Mac OS X as
101 a type of Unix.
102
103-In general, Bazaar requires only Python_ 2.4 or greater and the cElementTree_
104-package (included in Python 2.5 and later) to run. If you would *optionally*
105+In general, Bazaar requires only Python_ 2.6 or greater to run.
106+If you would *optionally*
107 like to be able to access branches using SFTP, you need `paramiko and
108 pycrypto`_.
109
110 .. _Python: http://www.python.org/
111-.. _cElementTree: http://effbot.org/zone/element-index.htm
112 .. _paramiko and pycrypto: http://www.lag.net/paramiko/
113
114 For maximum performance, Bazaar can make use of compiled versions of some
115
116=== modified file 'doc/en/release-notes/bzr-2.4.txt'
117--- doc/en/release-notes/bzr-2.4.txt 2012-06-18 10:46:42 +0000
118+++ doc/en/release-notes/bzr-2.4.txt 2012-09-05 18:27:21 +0000
119@@ -55,6 +55,10 @@
120 * Prevent a traceback being printed to stderr when logging has problems and
121 accept utf-8 byte string without breaking. (Martin Packman, #714449)
122
123+* Use ``encoding_type='exact'`` for ``bzr testament`` so that on Windows
124+ the sha hash of the long testament matches the sha hash in the short
125+ form. (John Arbash Meinel, #1010339)
126+
127 * _Win32Stat object provides members st_uid and st_gid, those are present
128 in Python's os.stat object. These members required for external tools like
129 bzr-git and dulwich. (Alexander Belchenko, #967060)

Subscribers

People subscribed via source and target branches