Merge lp:~jelmer/brz/3.2 into lp:brz/3.2

[Jelmer Vernooij]

Release 3.2.2.

Release 3.2.2.

[Jelmer Vernooij (jelmer)]

review: Approve

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

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

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

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

=== modified file '.testr.conf'
--- .testr.conf	2020-02-07 02:14:30 +0000
+++ .testr.conf	2022-03-20 01:52:26 +0000
@@ -1,4 +1,4 @@
 [DEFAULT]
-test_command=BRZ_PLUGIN_PATH=-site:-user python3 ./brz selftest --subunit2 $IDOPTION $LISTOPT
+test_command=PYTHONPATH=`pwd`:$PYTHONPATH BRZ_PLUGIN_PATH=-site:-user ./brz selftest --subunit2 $IDOPTION $LISTOPT
 test_id_option=--load-list $IDFILE
 test_list_option=--list

=== modified file 'Makefile'
--- Makefile	2021-11-16 11:09:01 +0000
+++ Makefile	2022-03-20 01:52:26 +0000
@@ -296,9 +296,9 @@
 	$(PYTHON) ./brz export-pot --include-duplicates > po/brz.pot
 	echo $(TRANSLATABLE_PYFILES) | xargs \
 	  xgettext --package-name "brz" \
-	  --msgid-bugs-address "<[e-mail]>" \
-	  --copyright-holder "Canonical" \
-	  --from-code ISO-8859-1 --join --sort-by-file --add-comments=i18n: \
+	  --msgid-bugs-address "<[e-mail]>" \
+	  --copyright-holder "Breezy Developers" \
+	  --from-code UTF-8 --join --sort-by-file --add-comments=i18n: \
 	  -d bzr -p po -o brz.pot
 
 

=== modified file 'README.rst'
--- README.rst	2020-03-22 01:35:14 +0000
+++ README.rst	2022-03-20 01:52:26 +0000
@@ -18,8 +18,7 @@
 Breezy is a friendly fork of the Bazaar (``bzr``) project, hosted on
 http://bazaar.canonical.com/. It is backwards compatibility with
 Bazaar's disk format and protocols. One of the key differences with
-Bazaar is that Breezy runs on Python 3.3 and later, rather than on
-Python 2.
+Bazaar is that Breezy runs on Python 3, rather than on Python 2.
 
 Breezy highlights
 =================

=== modified file 'breezy/__init__.py'
--- breezy/__init__.py	2021-12-27 22:45:36 +0000
+++ breezy/__init__.py	2022-03-20 01:52:26 +0000
@@ -41,7 +41,7 @@
 
 __copyright__ = (
     "Copyright 2005-2012 Canonical Ltd.\n"
-    "Copyright 2017-2020 Breezy developers"
+    "Copyright 2017-2022 Breezy developers"
 )
 
 # same format as sys.version_info: "A tuple containing the five components of
@@ -51,7 +51,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, 2, 1, 'final', 0)
+version_info = (3, 2, 2, 'final', 0)
 
 
 def _format_version_tuple(version_info):

=== modified file 'breezy/help_topics/en/rules.txt'
--- breezy/help_topics/en/rules.txt	2017-05-21 14:47:52 +0000
+++ breezy/help_topics/en/rules.txt	2022-03-20 01:52:26 +0000
@@ -18,7 +18,7 @@
 provide custom behaviour for selected files.  For more information on 
 end of line conversion see :doc:`eol-help`.
 Keyword support is provided by the `keywords plugin
-<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_.
+<https://www.breezy-vcs.org/doc/plugins/en/keywords-plugin.html>`_.
 
 Files
 -----

=== modified file 'breezy/tests/__init__.py'
--- breezy/tests/__init__.py	2022-01-09 13:12:27 +0000
+++ breezy/tests/__init__.py	2022-03-20 01:52:26 +0000
@@ -546,10 +546,7 @@
 
     def report_tests_starting(self):
         """Display information before the test run begins"""
-        if getattr(sys, 'frozen', None) is None:
-            bzr_path = osutils.realpath(sys.argv[0])
-        else:
-            bzr_path = sys.executable
+        bzr_path = osutils.realpath(sys.argv[0])
         self.stream.write(
             'brz selftest: %s\n' % (bzr_path,))
         self.stream.write(
@@ -2241,10 +2238,7 @@
             # Include the subprocess's log file in the test details, in case
             # the test fails due to an error in the subprocess.
             self._add_subprocess_log(trace._get_brz_log_filename())
-            command = [sys.executable]
-            # frozen executables don't need the path to bzr
-            if getattr(sys, "frozen", None) is None:
-                command.append(bzr_path)
+            command = [sys.executable, bzr_path]
             if not allow_plugins:
                 command.append('--no-plugins')
             command.extend(process_args)
@@ -3653,9 +3647,6 @@
             # We are probably installed. Assume sys.argv is the right file
             bzr_path = sys.argv[0]
         bzr_path = [bzr_path]
-        if sys.platform == "win32":
-            # if we're on windows, we can't execute the bzr script directly
-            bzr_path = [sys.executable] + bzr_path
         fd, test_list_file_name = tempfile.mkstemp()
         test_list_file = os.fdopen(fd, 'wb', 1)
         for test in process_tests:

=== modified file 'breezy/tests/test_setup.py'
--- breezy/tests/test_setup.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/test_setup.py	2022-03-20 01:52:26 +0000
@@ -71,11 +71,13 @@
         args = [sys.executable, './setup.py', ] + args
         self.log('source base directory: %s', self.source_dir)
         self.log('args: %r', args)
+        env = dict(os.environ)
+        env['PYTHONPATH'] = ':'.join(sys.path)
         p = subprocess.Popen(args,
                              cwd=self.source_dir,
                              stdout=subprocess.PIPE,
                              stderr=subprocess.PIPE,
-                             )
+                             env=env)
         stdout, stderr = p.communicate()
         self.log('stdout: %r', stdout)
         self.log('stderr: %r', stderr)

=== modified file 'breezy/tests/test_transport.py'
--- breezy/tests/test_transport.py	2021-08-20 12:43:33 +0000
+++ breezy/tests/test_transport.py	2022-03-20 01:52:26 +0000
@@ -1063,10 +1063,7 @@
         self.start_server(ssh_server)
         port = ssh_server.port
 
-        if sys.platform == 'win32':
-            bzr_remote_path = sys.executable + ' ' + self.get_brz_path()
-        else:
-            bzr_remote_path = self.get_brz_path()
+        bzr_remote_path = self.get_brz_path()
         self.overrideEnv('BZR_REMOTE_PATH', bzr_remote_path)
         self.overrideEnv('PYTHONPATH', ':'.join(sys.path))
 

=== modified file 'brz'
--- brz	2021-07-08 11:40:37 +0000
+++ brz	2022-03-20 01:52:26 +0000
@@ -23,7 +23,7 @@
 import warnings
 
 # update this on each release
-_script_version = (3, 2, 1)
+_script_version = (3, 2, 2)
 
 profiling = False
 if '--profile-imports' in sys.argv:

=== modified file 'doc/developers/HACKING.txt'
--- doc/developers/HACKING.txt	2021-05-19 15:07:00 +0000
+++ doc/developers/HACKING.txt	2022-03-20 01:52:26 +0000
@@ -28,7 +28,7 @@
 To answer these questions and more, take a moment to explore the
 overall Breezy Platform. Here are some links to browse:
 
-* The Plugins page on the Wiki - http://wiki.bazaar.canonical.com/BzrPlugins
+* The Plugins page on the Wiki - http://wiki.breezy-vcs.org/Plugins
 
 * The Breezy product family on Launchpad - https://launchpad.net/breezy
 
@@ -73,8 +73,6 @@
 Breezy Development in a Nutshell
 ================================
 
-.. was from http://wiki.bazaar.canonical.com/BzrGivingBack
-
 One of the fun things about working on a version control system like Breezy is
 that the users have a high level of proficiency in contributing back into
 the tool.  Consider the following very brief introduction to contributing back
@@ -212,7 +210,7 @@
 ================================================
 
 Breezy supports many ways of organising your work. See
-http://wiki.bazaar.canonical.com/SharedRepositoryLayouts for a summary of the
+http://wiki.breezy-vcs.org/SharedRepositoryLayouts for a summary of the
 popular alternatives.
 
 Of course, the best choice for you will depend on numerous factors:
@@ -240,8 +238,6 @@
 Navigating the Code Base
 ========================
 
-.. Was at <http://wiki.bazaar.canonical.com/NewDeveloperIntroduction>
-
 Some of the key files in this directory are:
 
 bzr
@@ -513,7 +509,7 @@
 Making Installers for OS Windows
 ================================
 To build a win32 installer, see the instructions on the wiki page:
-http://wiki.bazaar.canonical.com/BzrWin32Installer
+http://wiki.breezy-vcs.org/Win32Installer
 
 Core Developer Tasks
 ####################

=== modified file 'doc/developers/code-style.txt'
--- doc/developers/code-style.txt	2018-11-18 18:23:32 +0000
+++ doc/developers/code-style.txt	2022-03-20 01:52:26 +0000
@@ -77,7 +77,8 @@
 Python versions
 ===============
 
-Breezy supports Python 2.7 and Python 3.5 or later.
+Code should be written such that it runs on all versions of Python that
+Breezy support. See setup.py for what versions those are.
 
 hasattr and getattr
 ===================

=== modified file 'doc/developers/content-filtering.txt'
--- doc/developers/content-filtering.txt	2017-11-11 12:51:45 +0000
+++ doc/developers/content-filtering.txt	2022-03-20 01:52:26 +0000
@@ -136,9 +136,9 @@
 See also
 ********
 
-* http://wiki.bazaar.canonical.com/LineEndings
+* http://wiki.breezy-vcs.org/LineEndings
 
-* http://wiki.bazaar.canonical.com/LineEndings/Roadmap
+* http://wiki.breezy-vcs.org/LineEndings/Roadmap
 
 * `Developer Documentation <index.html>`_
 

=== modified file 'doc/developers/index-plain.txt'
--- doc/developers/index-plain.txt	2018-11-20 08:11:03 +0000
+++ doc/developers/index-plain.txt	2022-03-20 01:52:26 +0000
@@ -15,7 +15,7 @@
   (external link)
   |--| automatically generated API reference information
 
-* `Integrating with Breezy <http://wiki.bazaar.canonical.com/Integrating_with_Bazaar>`_
+* `Integrating with Breezy <http://wiki.breezy-vcs.org/Integrating_with_Breezy>`_
   (wiki) |--| a guide for writing Python programs that work with Breezy.
 
 * `Revision Properties <revision-properties.html>`_ |--| An application
@@ -41,7 +41,7 @@
 
 * `Managing the Breezy PPA <ppa.html>`_ |--| Packaging Breezy for Ubuntu.
 
-* `Giving back <http://wiki.bazaar.canonical.com/BzrGivingBack>`_ (wiki) |--| How to get
+* `Giving back <http://wiki.breezy-vcs.org/GivingBack>`_ (wiki) |--| How to get
   your changes to Breezy integrated into a release.
 
 * `Profiling notes <profiling.html>`_ |--| Instructions on how to profile

=== modified file 'doc/developers/index.txt'
--- doc/developers/index.txt	2018-11-20 08:11:03 +0000
+++ doc/developers/index.txt	2022-03-20 01:52:26 +0000
@@ -26,7 +26,7 @@
    code-style
    documenting-changes
 
-* `Contributing to Breezy Documentation <http://wiki.bazaar.canonical.com/ContributingToTheDocs>`_ (wiki)
+* `Contributing to Breezy Documentation <http://wiki.breezy-vcs.org/ContributingToTheDocs>`_ (wiki)
 
 
 Architecture overviews

=== modified file 'doc/developers/plugin-api.txt'
--- doc/developers/plugin-api.txt	2021-01-09 18:19:24 +0000
+++ doc/developers/plugin-api.txt	2022-03-20 01:52:26 +0000
@@ -241,7 +241,7 @@
    <https://launchpad.net/bzr-fastimport>
    and publish the branches or tarballs there
 
- * include the plugin in <http://wiki.bazaar.canonical.com/BzrPlugins>
+ * include the plugin in <http://wiki.breezy-vcs.org/Plugins>
 
  * post about it to the ``bazaar-announce`` list at ``lists.canonical.com``
 

=== modified file 'doc/developers/plugin-development.txt'
--- doc/developers/plugin-development.txt	2019-02-15 17:41:17 +0000
+++ doc/developers/plugin-development.txt	2022-03-20 01:52:26 +0000
@@ -194,7 +194,7 @@
 Learning more
 -------------
 
-`Integrating with Bazaar <http://wiki.bazaar.canonical.com/Integrating_with_Bazaar>`_
+`Integrating with Bazaar <http://wiki.breezy-vcs.org/Integrating_with_Breezy>`_
 explains how to do such operations as ``add``, ``commit``, ``log`` and more.
 
 Reference documentation on some key APIs is provided below. For a more

=== modified file 'doc/developers/ppa.txt'
--- doc/developers/ppa.txt	2018-11-24 15:56:05 +0000
+++ doc/developers/ppa.txt	2022-03-20 01:52:26 +0000
@@ -61,12 +61,7 @@
 <https://code.launchpad.net/~bzr/ubuntu/hardy/bzr/bzr-ppa>.
 or
 <lp:~bzr/ubuntu/hardy/bzr/bzr-ppa>.  These branches are intended to be used
-with the ``bzr-builddeb`` plugin.
-
-The page <http://wiki.bazaar.canonical.com/PpaPackagingBranches> is a
-reference to where the PPA packaging branches for each of the source
-packages in the ``~bzr`` PPAs may be found.
-
+with the ``brz-debian`` plugin.
 
 Supported releases
 ------------------

=== modified file 'doc/developers/releasing.txt'
--- doc/developers/releasing.txt	2020-06-10 23:47:24 +0000
+++ doc/developers/releasing.txt	2022-03-20 01:52:26 +0000
@@ -516,23 +516,10 @@
 
 #. Announce on the Breezy website.
 
-#. Check that the documentation for this release is available in
-   <https://www.breezy-vcs.org/doc/en/>.  It should be automatically build when
-   the branch is created, by a cron script ``update-brz-docs`` on
-   ``escudero``. When the first release is created in a new series, a branch
-   needs to be created on ``escudero``::
-
-     ssh escudero.canonical.com
-     sudo -u brz-web -s
-     cd /srv/doc.bazaar.canonical.com/
-     brz branch lp:brz/2.7 brz/brz.2.7
-
-   And the ``brz/bin/update-brz-docs`` script needs to refer to it.
-
-   The ``lp:brz-alldocs`` branch also needs to be updated when a new series
-   is introduced, see the ``README`` file there for more instructions
-   (looking at the branch history is also a good way to understand what
-   needs to be done and to document any policy changes).
+#. Check that the documentation for this release is available on
+   https://www.breezy-vcs.org/doc/en/.
+
+   This documentation is currently generated by a cron job run by Jelmer.
 
 Announcing the release
 ----------------------
@@ -680,7 +667,7 @@
 approved.
 
 Progress on these realeases is tracked on the `SRU wiki
-<http://wiki.bazaar.canonical.com/UbuntuStableReleaseUpdates>`_
+<http://wiki.breezy-vcs.org/UbuntuStableReleaseUpdates>`_
 page.
 
 **After making a brz stable-release release, nominate the most serious bug

=== modified file 'doc/en/_templates/index.html'
--- doc/en/_templates/index.html	2021-05-03 12:53:04 +0000
+++ doc/en/_templates/index.html	2022-03-20 01:52:26 +0000
@@ -39,7 +39,7 @@
 
   <table class="contentstable" align="center" style="margin-left: 30px"><tr>
     <td width="50%">
-      <p class="biglink"><a class="biglink" href="http://doc.bazaar.canonical.com/explorer/en/guide/">Desktop Guide</a><br/>
+      <p class="biglink"><a class="biglink" href="https://www.breezy-vcs.org/doc/explorer/en/guide/">Desktop Guide</a><br/>
       <span class="linkdescr">how to use our GUI applications</span>
       </p>
         <p class="biglink"><a class="biglink" href="https://answers.launchpad.net/brz/+faqs">FAQ</a><br/>
@@ -53,10 +53,10 @@
       <p class="biglink"><a class="biglink" href="{{ pathto("developers/index") }}">Developer Docs</a><br/>
         <span class="linkdescr">improving and extending brz</span>
       </p>
-      <p class="biglink"><a class="biglink" href="http://doc.bazaar.canonical.com/migration/en/">Migration Docs</a><br/>
+      <p class="biglink"><a class="biglink" href="https://www.breezy-vcs.org/doc/migration/en/">Migration Docs</a><br/>
       <span class="linkdescr">for refugees of other tools</span>
       </p>
-      <p class="biglink"><a class="biglink" href="http://doc.bazaar.canonical.com/plugins/en/">Plugins Guide</a><br/>
+      <p class="biglink"><a class="biglink" href="https://www.breezy-vcs.org/doc/plugins/en/">Plugins Guide</a><br/>
       <span class="linkdescr">help on popular plugins</span>
       </p>
     </td></tr>

=== modified file 'doc/en/admin-guide/code-browsing.txt'
--- doc/en/admin-guide/code-browsing.txt	2010-08-13 19:08:57 +0000
+++ doc/en/admin-guide/code-browsing.txt	2022-03-20 01:52:26 +0000
@@ -110,7 +110,7 @@
 --------------------
 
 There are a number of other web interfaces available for Bazaar branches (see
-the list at http://wiki.bazaar.canonical.com/WebInterfaces) and we will just
+the list at http://wiki.breezy-vcs.org/WebInterfaces) and we will just
 mention a couple of them here for their advantages in particular situations.
 
 trac+bzr (http://launchpad.net/trac-bzr)

=== modified file 'doc/en/admin-guide/hooks-plugins.txt'
--- doc/en/admin-guide/hooks-plugins.txt	2020-08-13 18:22:05 +0000
+++ doc/en/admin-guide/hooks-plugins.txt	2022-03-20 01:52:26 +0000
@@ -22,7 +22,7 @@
 purposes, as well as for backups and mirroring.
 
 Information on the whole range of Bazaar plugins is available at
-http://doc.bazaar.canonical.com/plugins/en/.  For purposes of installation,
+https://www.breezy-vcs.org/doc/plugins/en/.  For purposes of installation,
 plugins are simply python packages.  They can be installed alongside Bazaar in
 the ``breezy.plugins`` package using each plugin's ``setup.py``.  They can
 also be installed in the plugin path which is the user's
@@ -59,7 +59,7 @@
 mail should be sent.  If it isn't set, email is sent via ``/usr/bin/mail``.
 It can also be configured to communicate directly with an SMTP server.
 For more details on configuring this plugin, see
-http://doc.bazaar.canonical.com/plugins/en/email-plugin.html.  As examples,
+https://www.breezy-vcs.org/doc/plugins/en/email-plugin.html.  As examples,
 consider the following two possible configurations.  A minimal one (uses
 ``/usr/bin/mail``)
 
@@ -166,8 +166,8 @@
 ``branch.atom`` files.
 
 In addition, there are other tools that are not plugins for creating news
-feeds from Bazaar branches.  See
-http://wiki.bazaar.canonical.com/FeedGenerators for more on those tools.
+feeds from Breezy branches.  See
+http://wiki.breezy-vcs.org/FeedGenerators for more on those tools.
 
 Mirroring
 ---------

=== modified file 'doc/en/admin-guide/migration.txt'
--- doc/en/admin-guide/migration.txt	2020-08-13 18:22:05 +0000
+++ doc/en/admin-guide/migration.txt	2022-03-20 01:52:26 +0000
@@ -3,7 +3,7 @@
 
 Migrating between version control systems can be a complicated process, and
 Bazaar has extensive documentation on the process at 
-http://doc.bazaar.canonical.com/migration/en and we won't attempt to repeat that
+https://www.breezy-vcs.org/doc/migration/en and we won't attempt to repeat that
 here.  We will try to give a few motivating examples for conversion from
 Mercurial and Subversion.
 
@@ -43,7 +43,7 @@
 Bazaar's `svn`_ plugin provides tools for interaction with Subversion
 projects.  In fact, Bazaar can be used transparently with projects stored in
 Subversion, but that is beyond the scope of this document.  (See
-http://doc.bazaar.canonical.com/migration/en/foreign/bzr-on-svn-projects.html for
+https://www.breezy-vcs.org/doc/migration/en/foreign/bzr-on-svn-projects.html for
 more on that subject.)  What is relevant here is the ``svn-import`` command
 provided by that plugin.  This can import an entire subversion repository
 including tags and branches, particularly if they are stored in Subversion's

=== modified file 'doc/en/admin-guide/upgrade.txt'
--- doc/en/admin-guide/upgrade.txt	2010-08-13 19:08:57 +0000
+++ doc/en/admin-guide/upgrade.txt	2022-03-20 01:52:26 +0000
@@ -29,7 +29,7 @@
 Upgrading the Bazaar software is as simple as re-installing the Python package
 using either the latest binary package for Windows or Mac OS X, the binary
 package provided by your GNU/Linux distribution, or installing from the source
-release.  See http://wiki.bazaar.canonical.com/Downloads for the latest
+release.  See http://wiki.breezy-vcs.org/Downloads for the latest
 releases for all supported platforms.
 
 Bazaar's later versions support all of the earlier disk formats (back to the

=== modified file 'doc/en/mini-tutorial/index.txt'
--- doc/en/mini-tutorial/index.txt	2022-03-08 16:02:22 +0000
+++ doc/en/mini-tutorial/index.txt	2022-03-20 01:52:26 +0000
@@ -54,7 +54,7 @@
 make a *repository directory* to hold all our work related to this
 project, where developers can create branches to test development of
 specific features or, more generally, modifications to the working file
-set.  
+set.
 
 After creating the repository, change to that directory, and create the
 project's main trunk branch.
@@ -100,7 +100,7 @@
 Edit ``test1.txt`` in your favourite editor, then use ``brz add`` to tell brz
 to track changes to this file ::
 
-  $ echo test test test > test1.txt 
+  $ echo test test test > test1.txt
   $ brz add test1.txt
   adding test1.txt
 
@@ -139,48 +139,48 @@
 ===================================
 
 Launchpad is a suite of development and hosting tools for
-software projects. You can use it to publish your branch.  (You can 
+software projects. You can use it to publish your branch.  (You can
 also publish branches onto your own server or other hosting services.)
 
 The steps to publishing branches on Launchpad are:
 
 1. Create a Launchpad account: visit the `Launchpad login page`_ and choose to create a new account.
-    
+
 .. _Launchpad login page: https://launchpad.net/+login
-    
+
 2. Breezy uses the SSH encryption and authentication protocol to connect
    to Launchpad.  You need to first `create an SSH key`_ on your own computer,
    by running the command::
-    
+
        $ ssh-keygen
 
-.. _create an SSH key: https://help.launchpad.net/YourAccount/CreatingAnSSHKeyPair    
-       
+.. _create an SSH key: https://help.launchpad.net/YourAccount/CreatingAnSSHKeyPair
+
 3. `Upload your SSH public key to Launchpad`_.
- 
+
 .. _Upload your SSH public key to Launchpad: https://launchpad.net/~/+editsshkeys
-    
+
 4. `Make a team for your project`_.  Even if you're starting as the only
    developer on this project, creating a new one now will let you more
    easily add other people later.
- 
+
 .. _Make a team for your project: https://help.launchpad.net/Teams/CreatingAndRunning
-      
+
 5. `Create a project`_.
-  
+
 .. _Create a project: https://help.launchpad.net/Projects/Registering
 
 6. Tell Breezy your Launchpad account name.  If your account is john.doe, type ::
-  
+
       $ brz launchpad-login john.doe
 
-7. `Push the branch for your project`_.  Once you've committed your changes 
+7. `Push the branch for your project`_.  Once you've committed your changes
    locally, you can publish them as the trunk of your new project by saying
-    
+
        $ brz push lp:~sample-developers/sample/trunk
-       
+
    (Of course, using the team and project names you just chose.)
- 
+
 .. _Push the branch for your project: https://help.launchpad.net/Code/UploadingABranch
 
 Creating your own copy of another branch

=== modified file 'doc/en/release-notes/brz-3.2.txt'
--- doc/en/release-notes/brz-3.2.txt	2022-01-05 16:27:47 +0000
+++ doc/en/release-notes/brz-3.2.txt	2022-03-20 01:52:26 +0000
@@ -5,36 +5,151 @@
 .. toctree::
    :maxdepth: 1
 
-brz 3.2.1
+brz 3.2.2
 #########
 
-:Codename: Nirvana
-:3.2.1: 2021-07-08
+:3.2.2: 2022-03-19
+
+External Compatibility Breaks
+*****************************
+
+ * Breezy now relies on an external fastbencode Python module.
+   (Jelmer Vernooij)
+
+New Features
+************
+
+ * Basic support for nested trees in Git repositories, in the form
+   of Git submodules. (Jelmer Vernooij)
+
+Improvements
+************
+
+ * Improved parsing of remote Git errors, converting those
+   to equivalent Breezy exceptions.
+   (Jelmer Vernooij)
+
+ * When yielding hosters in ``breezy.propose``
+   avoid accessing the hoster until the user
+   needs that. (Jelmer Vernooij)
+
+ * Pull in new version of ``DirtyTracker`` from lintian-brush,
+   adding support for tracking just subpaths of a tree
+   as well as several bug fixes. (Jelmer Vernooij)
+
+ * Add support for finding filesystem types on Windows.
+   (Aleksandr Smyshliaev, Jelmer Vernooij)
+
+ * Require that AppData is known on Windows.
+   (Aleksandr Smyshliaev, Jelmer Vernooij)
 
 Bug Fixes
 *********
 
+ * Several improvements to error handling in the
+   gitlab plugin. (Jelmer Vernooij)
+
+ * Cope with invalid Git submodules when iterating over
+   nested trees.  (Jelmer Vernooij)
+
+ * Fix pulling of revisions that are ancestors of tip in Git. Previously,
+   Breezy would incorrectly raise a DivergedBranches error.
+   (Jelmer Vernooij)
+
+ * Fix handling of ``git-extra`` revision properties in Git support,
+   mostly relevant for hg-git commits with additional properties.
+   (Jelmer Vernooij)
+
+ * Properly close git repositories when unlocking.
+   (Jelmer Vernooij)
+
+ * git: Fix handling of invalid formatted authors field with multiple
+   authors. (Jelmer Vernooij)
+
+ * Fix win32utils on Python 3. (Aleksandr Smyshliaev)
+
+ * Fix accidental creation of "ssh:" urls for local paths on Windows.
+   (Aleksandr Smyshliaev)
+
+ * Let osutils path functions on Windows accept byte strings as well as
+   unicode strings. (Aleksandr Smyshliaev)
+
+ * Make "make installer" pass on Windows. (Aleksandr Smyshliaev)
+
  * Fix compatibility with newer versions of Dulwich.
    (Jelmer Vernooij)
 
- * Avoid using the ``parser`` module, which
+Documentation
+*************
+
+ * Updated various references to Windows support, mentioning
+   that Windows is currently not supported. See
+   https://pad.lv/1951124 for details.
+   (Jelmer Vernooij)
+
+API Changes
+***********
+
+ * Remove ``breezy.osutils.host_os_deferences_symlinks``.
+   (Aleksandr Smyshliaev)
+
+ * Remove unnecessary ``osutils.open_file``.
+   (Aleksandr Smyshliaev)
+
+ * Remove ``breezy.osutils.has_symlinks`` and
+   ``breezy.osutils.has_hardlinks`` in favour of
+   ``breezy.osutils.supports_hardlinks`` and
+   ``breezy.osutils.supports_symlinks``, which
+   take a path argument and run filesystem-specific
+   results. (Jelmer Vernooij)
+
+ * Support passing in probers to
+   ``ControlDir.open_containing_from_transport``.
+   (Jelmer Vernooij)
+
+ * Pass along headers in ``UnexpectedHttpStatus``.
+   (Jelmer Vernooij)
+
+ * Drop support for writing/reading rio to unicode.
+   (Jelmer Vernooij)
+
+Internals
+*********
+
+ * Run flake8 as a separate command. The API is not stable
+   enough to invoke it from the testsuite. (Jelmer Vernooij)
+
+ * Drop unused symbol and token imports.
+   (Jelmer Vernooij)
+
+ * Support nested trees in Tree.get_file_mtime.
+   (Jelmer Vernooij)
+
+ * Use same formatting style for versions that distutils uses, silencing a
+   warning. (Jelmer Vernooij)
+
+ * Drop old and outdated RPM README file.
+   (Jelmer Vernooij)
+
+Testing
+*******
+
+ * test_source: Avoid using the ``parser`` module, which
    has been removed in Python 3.10.
    (Jelmer Vernooij, #1956500)
 
-Testing
-*******
+ * test_import_tariff: Forbid ctypes during basic operations.
+   (Jelmer Vernooij)
+
+ * Preserve sys.path when running bzr subprocesses, rather than
+   accidentally importing the system Breezy.
+   (Jelmer Vernooij)
+
+ * Various fixes for plugin tests on newer versions of Python.
 
  * Extend test certificate expiry to 1000 years.
    (Bernhard M. Wiedemann, #1926151)
 
-External Compatibility Breaks
-*****************************
-
-.. These may require users to change the way they use Breezy.
-
- * Breezy now uses the fastbencode Python package for bencoding.
-   (Jelmer Vernooij)
-
 brz 3.2.0
 #########
 

=== modified file 'doc/en/tutorials/centralized_workflow.txt'
--- doc/en/tutorials/centralized_workflow.txt	2019-09-01 15:33:59 +0000
+++ doc/en/tutorials/centralized_workflow.txt	2022-03-20 01:52:26 +0000
@@ -104,7 +104,7 @@
 document. See `Tracking Upstream`_ for some possibilities (section
 "Converting and keeping history").
 
-.. _Tracking Upstream: http://wiki.bazaar.canonical.com/TrackingUpstream
+.. _Tracking Upstream: http://wiki.breezy-vcs.org/TrackingUpstream
 
 ..
    XXX: We really need a different document for discussing conversion of a

=== modified file 'doc/en/user-guide/hooks.txt'
--- doc/en/user-guide/hooks.txt	2020-12-11 15:47:15 +0000
+++ doc/en/user-guide/hooks.txt	2022-03-20 01:52:26 +0000
@@ -14,7 +14,7 @@
 see the `push-and-update plugin`_ that handles one special case of
 server-side operations.)
 
-.. _push-and-update plugin: http://doc.bazaar.canonical.com/plugins/en/push-and-update-plugin.html
+.. _push-and-update plugin: https://www.breezy-vcs.org/doc/plugins/en/push-and-update-plugin.html
 
 Using hooks
 -----------

=== modified file 'doc/en/user-guide/introducing_breezy.txt'
--- doc/en/user-guide/introducing_breezy.txt	2018-11-18 13:43:04 +0000
+++ doc/en/user-guide/introducing_breezy.txt	2022-03-20 01:52:26 +0000
@@ -89,7 +89,7 @@
  * in companies, easier to work with distributed and outsourced teams.
 
 For a detailed look at the advantages of distributed VCS tools over
-centralized VCS tools, see http://wiki.bazaar.canonical.com/BzrWhy.
+centralized VCS tools, see http://wiki.breezy-vcs.org/Why.
 
 
 Key features of Breezy
@@ -98,7 +98,7 @@
 While Breezy is not the only distributed VCS tool around, it does have some
 notable features that make it an excellent choice for many teams and
 communities. A summary of these and comparisons with other VCS tools
-can be found on the Bazaar Wiki, http://wiki.bazaar.canonical.com.
+can be found on the Breezy Wiki, https://wiki.breezy-vcs.org/.
 
 Of the many features, one in particular is worth highlighting:
 Breezy is completely free software written in Python. As a result,

=== modified file 'doc/en/user-guide/plugins.txt'
--- doc/en/user-guide/plugins.txt	2020-08-13 18:22:05 +0000
+++ doc/en/user-guide/plugins.txt	2022-03-20 01:52:26 +0000
@@ -28,7 +28,7 @@
 Where to find plugins
 ---------------------
 
-We keep our list of plugins on the http://wiki.bazaar.canonical.com/BzrPlugins page.
+We keep our list of plugins on the http://wiki.breezy-vcs.org/Plugins page.
 
 How to install a plugin
 -----------------------

=== modified file 'doc/en/user-guide/shared_repository_layouts.txt'
--- doc/en/user-guide/shared_repository_layouts.txt	2019-09-01 15:33:59 +0000
+++ doc/en/user-guide/shared_repository_layouts.txt	2022-03-20 01:52:26 +0000
@@ -121,7 +121,7 @@
     Letting you ``brz checkout`` one project, and have it grab all the necessary
     sub-projects.
 
-.. _NestedTreeSupport: http://wiki.bazaar.canonical.com/NestedTrees
+.. _NestedTreeSupport: http://wiki.breezy-vcs.org/NestedTrees
 
 
 Nested Style (``project/branch/sub-branch/``)

=== modified file 'doc/en/user-guide/svn_plugin.txt'
--- doc/en/user-guide/svn_plugin.txt	2019-09-01 15:33:59 +0000
+++ doc/en/user-guide/svn_plugin.txt	2022-03-20 01:52:26 +0000
@@ -20,7 +20,7 @@
 who are unable to do so yet for timing or non-technical reasons.
 
 For installation instructions, see the brz-svn home page:
-http://wiki.bazaar.canonical.com/BzrForeignBranches/Subversion.
+http://wiki.breezy-vcs.org/ForeignBranches/Subversion.
 
 
 A simple example
@@ -110,5 +110,5 @@
  * Breezy doesn't support tracking of file copies.
 
 See the brz-svn web page,
-http://wiki.bazaar.canonical.com/BzrForeignBranches/Subversion,
+http://wiki.breezy-vcs.org/ForeignBranches/Subversion,
 for the current list of constraints.

=== modified file 'doc/en/user-guide/web_browsing.txt'
--- doc/en/user-guide/web_browsing.txt	2017-05-21 13:41:54 +0000
+++ doc/en/user-guide/web_browsing.txt	2022-03-20 01:52:26 +0000
@@ -9,7 +9,7 @@
 can be found at https://launchpad.net/loggerhead.
 
 A list of alternative web viewers including download links can be found on
-http://wiki.bazaar.canonical.com/WebInterface.
+http://wiki.breezy-vcs.org/WebInterface.
 
 Note: If your project is hosted or mirrored on Launchpad,
 Loggerhead code browsing is provided as part of the service.

=== modified file 'doc/en/whats-new/whats-new-in-2.1.txt'
--- doc/en/whats-new/whats-new-in-2.1.txt	2010-12-02 09:21:11 +0000
+++ doc/en/whats-new/whats-new-in-2.1.txt	2022-03-20 01:52:26 +0000
@@ -124,8 +124,8 @@
 can now be read by standard Bazaar clients. Changes can also
 be written back via the dpush command.
 
-.. _git: http://doc.bazaar.canonical.com/plugins/en/git-plugin.html
-.. _hg: http://doc.bazaar.canonical.com/plugins/en/hg-plugin.html
+.. _git: https://www.breezy-vcs.org/doc/plugins/en/git-plugin.html
+.. _hg: https://www.breezy-vcs.org/doc/plugins/en/hg-plugin.html
 
 
 Metaprojects
@@ -144,9 +144,9 @@
    be useful for building test images for a QA team or disk images
    for installers, say.
 
-.. _builder: http://doc.bazaar.canonical.com/plugins/en/builder-plugin.html
-.. _externals: http://doc.bazaar.canonical.com/plugins/en/externals-plugin.html
-.. _builddeb: http://doc.bazaar.canonical.com/plugins/en/builddeb-plugin.html
+.. _builder: https://www.breezy-vcs.org/doc/plugins/en/builder-plugin.html
+.. _externals: https://www.breezy-vcs.org/doc/plugins/en/externals-plugin.html
+.. _builddeb: https://www.breezy-vcs.org/doc/plugins/en/builddeb-plugin.html
 
 
 Colocated branch workspaces
@@ -156,7 +156,7 @@
 across one or more branches managed at that same location. This
 is now supported by the new colo_ plugin and by Bazaar Explorer.
 
-.. _colo: http://doc.bazaar.canonical.com/plugins/en/colo-plugin.html
+.. _colo: https://www.breezy-vcs.org/doc/plugins/en/colo-plugin.html
 
 
 Better documentation
@@ -173,7 +173,7 @@
 navigate through and print selected sections of.
 
 To assist users migrating from other tools, a
-`Survival Guide <http://doc.bazaar.canonical.com/migration/en/survival/index.html>`_
+`Survival Guide <https://www.breezy-vcs.org/doc/migration/en/survival/index.html>`_
 has been published explaining Bazaar to users of other tools in terms they
 already know. Sections are provided for existing users of 
 CVS, Subversion, ClearCase, Perforce, Visual SourceSafe, Git, Mercurial,
@@ -195,7 +195,7 @@
 a better working tree browser and a submit delta report showing the
 cumulative effect of a series of commits.
 See `What's New in Bazaar Explorer 1.0?
-<http://doc.bazaar.canonical.com/explorer/en/whats-new/whats-new-in-1.0.html>`_
+<https://www.breezy-vcs.org/doc/explorer/en/whats-new/whats-new-in-1.0.html>`_
 for more information.
 
 

=== modified file 'doc/en/whats-new/whats-new-in-3.2.txt'
--- doc/en/whats-new/whats-new-in-3.2.txt	2020-02-16 23:17:30 +0000
+++ doc/en/whats-new/whats-new-in-3.2.txt	2022-03-20 01:52:26 +0000
@@ -1,11 +1,7 @@
 *************************
-What's New in Breezy x.y?
+What's New in Breezy 3.2?
 *************************
 
-Breezy x.y is still under development, and will be released in Month Year.
-This document accumulates a high level summary of what's changed.  See the
-:doc:`../release-notes/index` for a full list.
-
 The ``brz lp-propose`` command has been removed in favour of the ``brz propose`` command,
 which also supports Launchpad.
 
@@ -15,13 +11,10 @@
 For more detailed information on the changes made, see the the
 :doc:`../release-notes/index` for:
 
-* the interim brz `milestones <https://launchpad.net/bzr/x.y>`_
+* the interim brz `milestones <https://launchpad.net/bzr/3.2>`_
 * the plugins you use.
 
 For a summary of changes made in earlier releases, see:
 
-* :doc:`whats-new-in-2.1`
-* :doc:`whats-new-in-2.2`
-* :doc:`whats-new-in-2.3`
-<intermediate series here>
-* :doc:`whats-new-in-x.(y-1)`
+* :doc:`whats-new-in-3.0`
+* :doc:`whats-new-in-3.1`

=== modified file 'doc/index.txt'
--- doc/index.txt	2018-11-21 21:34:30 +0000
+++ doc/index.txt	2022-03-20 01:52:26 +0000
@@ -45,10 +45,10 @@
 Web links
 =========
 
-* `Switching Guides <http://wiki.bazaar.canonical.com/BzrSwitching>`_
+* `Switching Guides <http://wiki.breezy-vcs.org/Switching>`_
   |--| for users moving from another VCS tool
 
-* `Migration Guide <http://wiki.bazaar.canonical.com/BzrMigration>`_
+* `Migration Guide <http://wiki.breezy-vcs.org/Migration>`_
   |--| for teams migrating history from another VCS tool
 
 * `Glossary <en/user-reference/glossary-help.html>`_

=== modified file 'tools/packaging/lp-upload-release'
--- tools/packaging/lp-upload-release	2008-10-20 23:58:12 +0000
+++ tools/packaging/lp-upload-release	2022-03-20 01:52:26 +0000
@@ -1,6 +1,6 @@
 #! /bin/zsh -e
 
-# upload a release file to Launchpad 
+# upload a release file to Launchpad
 #
 # usage: lp-upload-release [--staging] bzr-1.2.3.tgz
 
@@ -16,7 +16,7 @@
 
 if [ $# -ne 1 ]
 then
-	echo "usage: lp-upload-release VERSION FILENAME"
+	echo "usage: lp-upload-release FILENAME"
 	exit 2
 fi
 
@@ -33,7 +33,7 @@
 	exit 2
 fi
 
-sigfile="$upfile.sig"
+sigfile="$upfile.asc"
 if [ \! -f "$sigfile" ]
 then
 	echo "couldn't find gpg signature $sigfile"

=== modified file 'tools/win32/brz.iss.cog'
--- tools/win32/brz.iss.cog	2021-11-16 11:09:01 +0000
+++ tools/win32/brz.iss.cog	2022-03-20 01:52:26 +0000
@@ -73,8 +73,8 @@
 AppComments="Breezy: Friendly distributed version control system"
 AppPublisher="Breezy Developers"
 AppPublisherURL="https://www.breezy-vcs.org/"
-AppSupportURL="http://wiki.bazaar.canonical.com/BzrSupport"
-AppUpdatesURL="http://wiki.bazaar.canonical.com/WindowsDownloads"
+AppSupportURL="http://wiki.breezy-vcs.org/BzrSupport"
+AppUpdatesURL="http://wiki.breezy-vcs.org/WindowsDownloads"
 ; [[[cog cog.outl('AppVersion=%s' % VERSION) ]]]
 ; [[[end]]]
 

=== modified file 'tools/win32/brz_postinstall.py'
--- tools/win32/brz_postinstall.py	2018-11-22 03:51:03 +0000
+++ tools/win32/brz_postinstall.py	2022-03-20 01:52:26 +0000
@@ -339,7 +339,7 @@
                          "this library manually and put it to directory\n"
                          "where Brz installed.\n"
                          "For detailed instructions see:\n"
-                         "http://wiki.bazaar.canonical.com/BzrOnPureWindows"
+                         "http://wiki.breezy-vcs.org/OnPureWindows"
                          ),
                         "Warning",
                         MB_OK | MB_ICONEXCLAMATION)