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