Merge lp:~vila/brz/trunk into lp:brz

[Vincent Ladeuil]

Merge lp:brz/3.0 after 3.0.2 release.

Merge lp:brz/3.0

[Vincent Ladeuil (vila)]

RM self-approval.

review: Approve

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/540/

=== modified file 'breezy/__init__.py'
--- breezy/__init__.py	2019-06-18 11:21:15 +0000
+++ breezy/__init__.py	2019-11-19 20:09:35 +0000
@@ -53,7 +53,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 = (3, 1, 0, 'dev', 1)
+version_info = (3, 1, 0, 'dev', 0)
 
 
 def _format_version_tuple(version_info):

=== modified file 'breezy/_static_tuple_c.c'
--- breezy/_static_tuple_c.c	2017-06-27 00:56:24 +0000
+++ breezy/_static_tuple_c.c	2019-11-19 20:09:35 +0000
@@ -320,6 +320,78 @@
     return result;
 }
 
+/* adapted from tuplehash(), is the specific hash value considered
+ * 'stable'?
+ */
+
+#if PY_MAJOR_VERSION > 3 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 8)
+/* Hash for tuples. This is a slightly simplified version of the xxHash
+   non-cryptographic hash:
+   - we do not use any parallellism, there is only 1 accumulator.
+   - we drop the final mixing since this is just a permutation of the
+     output space: it does not help against collisions.
+   - at the end, we mangle the length with a single constant.
+   For the xxHash specification, see
+   https://github.com/Cyan4973/xxHash/blob/master/doc/xxhash_spec.md
+
+   Below are the official constants from the xxHash specification. Optimizing
+   compilers should emit a single "rotate" instruction for the
+   _PyHASH_XXROTATE() expansion. If that doesn't happen for some important
+   platform, the macro could be changed to expand to a platform-specific rotate
+   spelling instead.
+*/
+#if SIZEOF_PY_UHASH_T > 4
+#define _PyHASH_XXPRIME_1 ((Py_uhash_t)11400714785074694791ULL)
+#define _PyHASH_XXPRIME_2 ((Py_uhash_t)14029467366897019727ULL)
+#define _PyHASH_XXPRIME_5 ((Py_uhash_t)2870177450012600261ULL)
+#define _PyHASH_XXROTATE(x) ((x << 31) | (x >> 33))  /* Rotate left 31 bits */
+#else
+#define _PyHASH_XXPRIME_1 ((Py_uhash_t)2654435761UL)
+#define _PyHASH_XXPRIME_2 ((Py_uhash_t)2246822519UL)
+#define _PyHASH_XXPRIME_5 ((Py_uhash_t)374761393UL)
+#define _PyHASH_XXROTATE(x) ((x << 13) | (x >> 19))  /* Rotate left 13 bits */
+#endif
+
+/* Tests have shown that it's not worth to cache the hash value, see
+   https://bugs.python.org/issue9685 */
+static Py_hash_t
+StaticTuple_hash(StaticTuple *self)
+{
+    Py_ssize_t i, len = self->size;
+    PyObject **item = self->items;
+
+#if STATIC_TUPLE_HAS_HASH
+    if (self->hash != -1) {
+        return self->hash;
+    }
+#endif
+
+    Py_uhash_t acc = _PyHASH_XXPRIME_5;
+    for (i = 0; i < len; i++) {
+        Py_uhash_t lane = PyObject_Hash(item[i]);
+        if (lane == (Py_uhash_t)-1) {
+            return -1;
+        }
+        acc += lane * _PyHASH_XXPRIME_2;
+        acc = _PyHASH_XXROTATE(acc);
+        acc *= _PyHASH_XXPRIME_1;
+    }
+
+    /* Add input length, mangled to keep the historical value of hash(()). */
+    acc += len ^ (_PyHASH_XXPRIME_5 ^ 3527539UL);
+
+    if (acc == (Py_uhash_t)-1) {
+        acc = 1546275796;
+    }
+
+#if STATIC_TUPLE_HAS_HASH
+    self->hash = acc;
+#endif
+    return acc;
+}
+
+
+#else
 static long
 StaticTuple_hash(StaticTuple *self)
 {
@@ -357,6 +429,7 @@
 #endif
     return x;
 }
+#endif
 
 static PyObject *
 StaticTuple_richcompare_to_tuple(StaticTuple *v, PyObject *wt, int op)

=== modified file 'breezy/bzr/_dirstate_helpers_pyx.pyx'
--- breezy/bzr/_dirstate_helpers_pyx.pyx	2019-09-22 02:25:23 +0000
+++ breezy/bzr/_dirstate_helpers_pyx.pyx	2019-11-19 20:09:35 +0000
@@ -109,6 +109,9 @@
     int PyBytes_Size(object p)
     int PyBytes_GET_SIZE_void "PyBytes_GET_SIZE" (void *p)
     int PyBytes_CheckExact(object p)
+    int PyFloat_Check(object p)
+    double PyFloat_AsDouble(object p)
+    int PyLong_Check(object p)
     void Py_INCREF(object o)
     void Py_DECREF(object o)
 
@@ -794,6 +797,14 @@
 _encode = binascii.b2a_base64
 
 
+cdef unsigned long _time_to_unsigned(object t):  # cannot_raise
+    cdef double dt
+    if PyFloat_Check(t):
+        dt = PyFloat_AsDouble(t)
+        return <unsigned long>dt
+    return PyInt_AsUnsignedLongMask(t)
+
+
 cdef _pack_stat(stat_value):
     """return a string representing the stat value's key fields.
 
@@ -805,8 +816,8 @@
     aliased = <int *>result
     aliased[0] = htonl(PyInt_AsUnsignedLongMask(stat_value.st_size))
     # mtime and ctime will often be floats but get converted to PyInt within
-    aliased[1] = htonl(PyInt_AsUnsignedLongMask(stat_value.st_mtime))
-    aliased[2] = htonl(PyInt_AsUnsignedLongMask(stat_value.st_ctime))
+    aliased[1] = htonl(_time_to_unsigned(stat_value.st_mtime))
+    aliased[2] = htonl(_time_to_unsigned(stat_value.st_ctime))
     aliased[3] = htonl(PyInt_AsUnsignedLongMask(stat_value.st_dev))
     aliased[4] = htonl(PyInt_AsUnsignedLongMask(stat_value.st_ino))
     aliased[5] = htonl(PyInt_AsUnsignedLongMask(stat_value.st_mode))

=== modified file 'breezy/git/annotate.py'
--- breezy/git/annotate.py	2018-11-11 14:23:06 +0000
+++ breezy/git/annotate.py	2019-11-19 20:09:35 +0000
@@ -100,11 +100,12 @@
             self.change_scanner.repository.lookup_bzr_revision_id(
                 text_revision))
         text_parents = []
+        path = path.encode('utf-8')
         for commit_parent in self.store[commit_id].parents:
             try:
                 (path, text_parent) = (
                     self.change_scanner.find_last_change_revision(
-                        path.encode('utf-8'), commit_parent))
+                        path, commit_parent))
             except KeyError:
                 continue
             if text_parent not in text_parents:

=== modified file 'breezy/git/filegraph.py'
--- breezy/git/filegraph.py	2018-11-11 14:23:06 +0000
+++ breezy/git/filegraph.py	2019-11-19 20:09:35 +0000
@@ -84,7 +84,7 @@
             self.change_scanner.repository.lookup_bzr_revision_id(
                 text_revision))
         try:
-            path = mapping.parse_file_id(file_id)
+            path = mapping.parse_file_id(file_id).encode('utf-8')
         except ValueError:
             raise KeyError(file_id)
         text_parents = []
@@ -92,7 +92,7 @@
             try:
                 (path, text_parent) = (
                     self.change_scanner.find_last_change_revision(
-                        path.encode('utf-8'), commit_parent))
+                        path, commit_parent))
             except KeyError:
                 continue
             if text_parent not in text_parents:

=== modified file 'breezy/git/remote.py'
--- breezy/git/remote.py	2019-08-11 16:27:38 +0000
+++ breezy/git/remote.py	2019-11-19 20:09:35 +0000
@@ -123,10 +123,10 @@
 
 try:
     import urllib.parse as urlparse
-    from urllib.parse import splituser, splitnport
+    from urllib.parse import splituser
 except ImportError:
     import urlparse
-    from urllib import splituser, splitnport
+    from urllib import splituser
 
 # urlparse only supports a limited number of schemes by default
 register_urlparse_netloc_protocol('git')
@@ -165,13 +165,11 @@
     :param url: Git URL
     :return: Tuple with host, port, username, path.
     """
-    (scheme, netloc, loc, _, _) = urlparse.urlsplit(url)
-    path = urlparse.unquote(loc)
+    parsed_url = urlparse.urlparse(url)
+    path = urlparse.unquote(parsed_url.path)
     if path.startswith("/~"):
         path = path[1:]
-    (username, hostport) = splituser(netloc)
-    (host, port) = splitnport(hostport, None)
-    return (host, port, username, path)
+    return ((parsed_url.hostname or '', parsed_url.port, parsed_url.username, path))
 
 
 class RemoteGitError(BzrError):

=== modified file 'breezy/git/tests/test_blackbox.py'
--- breezy/git/tests/test_blackbox.py	2019-06-22 18:46:21 +0000
+++ breezy/git/tests/test_blackbox.py	2019-11-19 20:09:35 +0000
@@ -216,6 +216,28 @@
         self.assertNotContainsRe(error, 'Committed revision 2.')
         self.assertContainsRe(error, 'Committed revid .*.')
 
+    def test_log_file(self):
+        # Smoke test for "bzr log" in a git repository.
+        repo = GitRepo.init(self.test_dir)
+        builder = tests.GitBranchBuilder()
+        builder.set_file('a', b'text for a\n', False)
+        r1 = builder.commit(b'Joe Foo <[e-mail]>', u'First')
+        builder.set_file('a', b'text 3a for a\n', False)
+        r2a = builder.commit(b'Joe Foo <[e-mail]>', u'Second a', base=r1)
+        builder.set_file('a', b'text 3b for a\n', False)
+        r2b = builder.commit(b'Joe Foo <[e-mail]>', u'Second b', base=r1)
+        builder.set_file('a', b'text 4 for a\n', False)
+        builder.commit(b'Joe Foo <[e-mail]>', u'Third', merge=[r2a], base=r2b)
+        builder.finish()
+
+        # Check that bzr log does not fail and includes the revision.
+        output, error = self.run_bzr(['log', '-n2', 'a'])
+        self.assertEqual(error, '')
+        self.assertIn('Second a', output)
+        self.assertIn('Second b', output)
+        self.assertIn('First', output)
+        self.assertIn('Third', output)
+
     def test_tags(self):
         git_repo, commit_sha1 = self.simple_commit()
         git_repo.refs[b"refs/tags/foo"] = commit_sha1

=== modified file 'breezy/git/tests/test_remote.py'
--- breezy/git/tests/test_remote.py	2019-08-06 07:11:09 +0000
+++ breezy/git/tests/test_remote.py	2019-11-19 20:09:35 +0000
@@ -65,6 +65,11 @@
         self.assertEqual(("foo", None, "la", "/bar"),
                          split_git_url("git://la@foo/bar"))
 
+    def test_username_password(self):
+        self.assertEqual(
+            ("foo", None, "la", "/bar"),
+            split_git_url("git://la:passwd@foo/bar"))
+
     def test_nopath(self):
         self.assertEqual(("foo", None, None, "/"),
                          split_git_url("git://foo/"))
@@ -77,6 +82,11 @@
         self.assertEqual(("foo", None, None, "~bar"),
                          split_git_url("git://foo/~bar"))
 
+    def test_file(self):
+        self.assertEqual(
+            ("", None, None, "/bar"),
+            split_git_url("file:///bar"))
+
 
 class ParseGitErrorTests(TestCase):
 

=== modified file 'breezy/ignores.py'
--- breezy/ignores.py	2019-06-16 01:03:51 +0000
+++ breezy/ignores.py	2019-11-19 20:09:35 +0000
@@ -101,8 +101,8 @@
         # since get_* should be a safe operation
         try:
             _set_user_ignores(USER_DEFAULTS)
-        except (IOError, OSError) as e:
-            if e.errno not in (errno.EPERM,):
+        except EnvironmentError as e:
+            if e.errno not in (errno.EPERM, errno.ENOENT):
                 raise
         return patterns
 

=== modified file 'breezy/plugins/launchpad/lp_api.py'
--- breezy/plugins/launchpad/lp_api.py	2019-07-15 23:23:48 +0000
+++ breezy/plugins/launchpad/lp_api.py	2019-11-19 20:09:35 +0000
@@ -69,23 +69,6 @@
 MINIMUM_LAUNCHPADLIB_VERSION = (1, 6, 3)
 
 
-# We use production as the default because edge has been deprecated circa
-# 2010-11 (see bug https://bugs.launchpad.net/bzr/+bug/583667)
-DEFAULT_INSTANCE = 'production'
-
-LAUNCHPAD_DOMAINS = {
-    'production': 'launchpad.net',
-    'staging': 'staging.launchpad.net',
-    'qastaging': 'qastaging.launchpad.net',
-    'demo': 'demo.launchpad.net',
-    'dev': 'launchpad.test',
-    }
-
-LAUNCHPAD_BAZAAR_DOMAINS = [
-    'bazaar.%s' % domain
-    for domain in LAUNCHPAD_DOMAINS.values()]
-
-
 def get_cache_directory():
     """Return the directory to cache launchpadlib objects in."""
     return osutils.pathjoin(bedding.cache_dir(), 'launchpad')

=== modified file 'breezy/plugins/launchpad/lp_directory.py'
--- breezy/plugins/launchpad/lp_directory.py	2019-05-29 09:48:08 +0000
+++ breezy/plugins/launchpad/lp_directory.py	2019-11-19 20:09:35 +0000
@@ -35,7 +35,7 @@
     )
 from ...i18n import gettext
 
-from .lp_api import (
+from .uris import (
     DEFAULT_INSTANCE,
     LAUNCHPAD_DOMAINS,
     )

=== modified file 'breezy/plugins/launchpad/lp_registration.py'
--- breezy/plugins/launchpad/lp_registration.py	2019-05-20 02:22:19 +0000
+++ breezy/plugins/launchpad/lp_registration.py	2019-11-19 20:09:35 +0000
@@ -48,7 +48,7 @@
     )
 from ...transport import http, get_transport
 
-from .lp_api import (
+from .uris import (
     DEFAULT_INSTANCE,
     LAUNCHPAD_DOMAINS,
     LAUNCHPAD_BAZAAR_DOMAINS,

=== modified file 'breezy/plugins/launchpad/test_lp_directory.py'
--- breezy/plugins/launchpad/test_lp_directory.py	2019-05-29 09:48:08 +0000
+++ breezy/plugins/launchpad/test_lp_directory.py	2019-11-19 20:09:35 +0000
@@ -213,7 +213,7 @@
                            'lp:///apt')
         self.assertResolve('bzr+ssh://bazaar.launchpad.net/+branch/apt',
                            'lp://production/apt')
-        self.assertResolve('bzr+ssh://bazaar.launchpad.test/+branch/apt',
+        self.assertResolve('bzr+ssh://bazaar.launchpad.dev/+branch/apt',
                            'lp://dev/apt')
         self.assertResolve('bzr+ssh://bazaar.staging.launchpad.net/+branch/apt',
                            'lp://staging/apt')

=== modified file 'breezy/plugins/launchpad/test_lp_service.py'
--- breezy/plugins/launchpad/test_lp_service.py	2019-05-29 09:48:08 +0000
+++ breezy/plugins/launchpad/test_lp_service.py	2019-11-19 20:09:35 +0000
@@ -62,7 +62,7 @@
 
     def test_dev_service(self):
         service = LaunchpadService(lp_instance='dev')
-        self.assertEqual('https://xmlrpc.launchpad.test/bazaar/',
+        self.assertEqual('https://xmlrpc.launchpad.dev/bazaar/',
                          service.service_url)
 
     def test_demo_service(self):
@@ -178,7 +178,7 @@
         web_url = service.get_web_url_from_branch_url(
             'bzr+ssh://bazaar.launchpad.net/~foo/bar/baz')
         self.assertEqual(
-            'https://code.launchpad.test/~foo/bar/baz', web_url)
+            'https://code.launchpad.dev/~foo/bar/baz', web_url)
 
     def test_demo_url(self):
         service = LaunchpadService(lp_instance='demo')

=== added file 'breezy/plugins/launchpad/uris.py'
--- breezy/plugins/launchpad/uris.py	1970-01-01 00:00:00 +0000
+++ breezy/plugins/launchpad/uris.py	2019-11-19 20:09:35 +0000
@@ -0,0 +1,36 @@
+# Copyright (C) 2009-2012 Canonical Ltd
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+"""Launchpad URIs."""
+
+from __future__ import absolute_import
+
+
+# We use production as the default because edge has been deprecated circa
+# 2010-11 (see bug https://bugs.launchpad.net/bzr/+bug/583667)
+DEFAULT_INSTANCE = 'production'
+
+LAUNCHPAD_DOMAINS = {
+    'production': 'launchpad.net',
+    'staging': 'staging.launchpad.net',
+    'qastaging': 'qastaging.launchpad.net',
+    'demo': 'demo.launchpad.net',
+    'dev': 'launchpad.dev',
+    }
+
+LAUNCHPAD_BAZAAR_DOMAINS = [
+    'bazaar.%s' % domain
+    for domain in LAUNCHPAD_DOMAINS.values()]

=== modified file 'breezy/tests/blackbox/test_testament.py'
--- breezy/tests/blackbox/test_testament.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/blackbox/test_testament.py	2019-11-19 20:09:35 +0000
@@ -35,28 +35,27 @@
         """Testament containing a file and a directory."""
         out, err = self.run_bzr('testament --long')
         self.assertEqualDiff(err, '')
-        self.assertEqualDiff(out, REV_2_TESTAMENT.decode('utf-8'))
+        self.assertEqualDiff(out, REV_2_TESTAMENT.decode('ascii'))
 
     def test_testament_command_2(self):
         """Command getting short testament of previous version."""
         out, err = self.run_bzr('testament -r1')
         self.assertEqualDiff(err, '')
-        self.assertEqualDiff(out, REV_1_SHORT.decode('utf-8'))
+        self.assertEqualDiff(out, REV_1_SHORT.decode('ascii'))
 
     def test_testament_command_3(self):
         """Command getting short testament of previous version."""
         out, err = self.run_bzr('testament -r1 --strict')
         self.assertEqualDiff(err, '')
-        self.assertEqualDiff(out, REV_1_SHORT_STRICT.decode('utf-8'))
+        self.assertEqualDiff(out, REV_1_SHORT_STRICT.decode('ascii'))
 
     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)
+        long_out, err = self.run_bzr_raw('testament --long', encoding='utf-8')
+        self.assertEqualDiff(err, b'')
+        long_out, err = self.run_bzr_raw('testament --long', encoding='ascii')
+        short_out, err = self.run_bzr_raw('testament', encoding='ascii')
+        self.assertEqualDiff(err, b'')
+        sha1_re = re.compile(b'sha1: (?P<sha1>[a-f0-9]+)$', re.M)
         sha1 = sha1_re.search(short_out).group('sha1')
-        self.assertEqual(
-            sha1.encode('ascii'),
-            osutils.sha_string(long_out.encode('utf-8') if PY3 else long_out))
+        self.assertEqual(sha1, osutils.sha_string(long_out))

=== modified file 'breezy/tests/test_ignores.py'
--- breezy/tests/test_ignores.py	2019-06-16 01:03:51 +0000
+++ breezy/tests/test_ignores.py	2019-11-19 20:09:35 +0000
@@ -16,6 +16,8 @@
 
 """Tests for handling of ignore files"""
 
+import os
+
 from .. import (
     bedding,
     ignores,
@@ -86,6 +88,22 @@
             entries = ignores.parse_ignore_file(f)
         self.assertEqual(set(ignores.USER_DEFAULTS), entries)
 
+    def test_create_with_intermediate_missing(self):
+        # $HOME should be set to '.'
+        ignore_path = bedding.user_ignore_config_path()
+        self.assertPathDoesNotExist(ignore_path)
+        os.mkdir('empty-home')
+
+        config_path = os.path.join(self.test_dir, 'empty-home', '.config')
+        self.overrideEnv('BRZ_HOME', config_path)
+        self.assertPathDoesNotExist(config_path)
+
+        user_ignores = ignores.get_user_ignores()
+        self.assertEqual(set(ignores.USER_DEFAULTS), user_ignores)
+
+        ignore_path = bedding.user_ignore_config_path()
+        self.assertPathDoesNotExist(ignore_path)
+
     def test_use_existing(self):
         patterns = [u'*.o', u'*.py[co]', u'\xe5*']
         ignores._set_user_ignores(patterns)

=== modified file 'breezy/tests/test_server.py'
--- breezy/tests/test_server.py	2018-11-12 01:41:38 +0000
+++ breezy/tests/test_server.py	2019-11-19 20:09:35 +0000
@@ -249,6 +249,10 @@
 
 class TestThread(cethread.CatchingExceptionThread):
 
+    if not getattr(cethread.CatchingExceptionThread, 'is_alive', None):
+        def is_alive(self):
+            return self.isAlive()
+
     def join(self, timeout=5):
         """Overrides to use a default timeout.
 
@@ -256,7 +260,7 @@
         serving a client connection is hung.
         """
         super(TestThread, self).join(timeout)
-        if timeout and self.isAlive():
+        if timeout and self.is_alive():
             # The timeout expired without joining the thread, the thread is
             # therefore stucked and that's a failure as far as the test is
             # concerned. We used to hang here.

=== modified file 'doc/en/release-notes/brz-3.0.txt'
--- doc/en/release-notes/brz-3.0.txt	2019-10-14 00:07:00 +0000
+++ doc/en/release-notes/brz-3.0.txt	2019-11-19 20:09:35 +0000
@@ -5,10 +5,10 @@
 .. toctree::
    :maxdepth: 1
 
-brz 3.0.2
+brz 3.0.3
 #########
 
-:3.0.2: NOT RELEASED YET
+:3.0.3: NOT RELEASED YET
 
 External Compatibility Breaks
 *****************************
@@ -32,10 +32,6 @@
 .. Fixes for situations where brz would previously crash or give incorrect
    or undesirable results.
 
- * Disable loading from entrypoints by default, since it can
-   significantly slow down startup on some platforms.
-   (Jelmer Vernooij, #1832868)
-
 Documentation
 *************
 
@@ -61,6 +57,69 @@
    spurious test failures and changes to the way things should be tested.
 
 
+brz 3.0.2
+#########
+
+:3.0.2: 2019-11-19
+
+External Compatibility Breaks
+*****************************
+
+None.
+
+New Features
+************
+
+None.
+
+Improvements
+************
+
+None.
+
+Bug Fixes
+*********
+
+ * Disable loading from entrypoints by default, since it can
+   significantly slow down startup on some platforms.
+   (Jelmer Vernooij, #1832868)
+
+ * Don't fail when unable to write per-user ignore list due to
+   one of the intermediate directories not existing
+   (Jelmer Vernooij, #1851904)
+
+ * Fix file graph operations on Git repositories.
+   (Jelmer Vernooij, #1847913)
+
+ * Allow running tests without launchpadlib installed.
+   (Jelmer Vernooij, #1849988)
+
+ * Fix compatibility with Python 3.8.
+   (Jelmer Vernooij, Victor Stinner, #1844684)
+
+Documentation
+*************
+
+None
+
+API Changes
+***********
+
+None.
+
+Internals
+*********
+
+None.
+
+Testing
+*******
+
+ * Fix bb.test_testament.TestTestament.test_testament_non_ascii
+   when the host encoding is non-utf8.
+   (Jelmer Vernooij, #1849986)
+
+
 bzr 3.0.1
 #########
 

=== modified file 'doc/en/release-notes/release-template.txt'
--- doc/en/release-notes/release-template.txt	2017-05-21 18:10:28 +0000
+++ doc/en/release-notes/release-template.txt	2019-11-19 20:09:35 +0000
@@ -2,7 +2,7 @@
 #########
 
 :Codename: Nirvana
-:2.x.y: NOT RELEASED YET
+:3.y.z: NOT RELEASED YET
 
 External Compatibility Breaks
 *****************************