Merge lp:~jelmer/brz/module-exec into lp:brz/3.1

[Jelmer Vernooij]

Add a breezy.__main__ module.

Add a breezy.__main__ module.

This allows ``python3 -m breezy`` to work.

[Jelmer Vernooij (jelmer)]

review: Approve

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

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

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

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

=== added file 'breezy/__main__.py'
--- breezy/__main__.py	1970-01-01 00:00:00 +0000
+++ breezy/__main__.py	2020-05-05 23:43:27 +0000
@@ -0,0 +1,79 @@
+#! /usr/bin/env python3
+
+# Copyright (C) 2005-2013, 2016, 2017 Canonical Ltd
+# Copyright (C) 2018-2020 Breezy Developers
+#
+# 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
+
+from __future__ import absolute_import
+
+"""Breezy -- a free distributed version-control tool"""
+
+import os
+import sys
+import warnings
+
+
+profiling = False
+if '--profile-imports' in sys.argv:
+    import profile_imports
+    profile_imports.install()
+    profiling = True
+
+
+if os.name == "posix":
+    import locale
+    try:
+        locale.setlocale(locale.LC_ALL, '')
+    except locale.Error as e:
+        sys.stderr.write(
+            'brz: warning: %s\n'
+            '  bzr could not set the application locale.\n'
+            '  Although this should be no problem for bzr itself, it might\n'
+            '  cause problems with some plugins. To investigate the issue,\n'
+            '  look at the output of the locale(1p) tool.\n' % e)
+    # Use better default than ascii with posix filesystems that deal in bytes
+    # natively even when the C locale or no locale at all is given. Note that
+    # we need an immortal string for the hack, hence the lack of a hyphen.
+    sys._brz_default_fs_enc = "utf8"
+
+
+def main():
+    import breezy.breakin
+    breezy.breakin.hook_debugger_to_signal()
+
+    import breezy.commands
+    import breezy.trace
+
+    with breezy.initialize():
+        exit_val = breezy.commands.main()
+        if profiling:
+            profile_imports.log_stack_info(sys.stderr)
+
+    # By this point we really have completed everything we want to do, and
+    # there's no point doing any additional cleanup.  Abruptly exiting here
+    # stops any background threads getting into trouble as code is unloaded,
+    # and it may also be slightly faster, through avoiding gc of objects that
+    # are just about to be discarded anyhow.  This does mean that atexit hooks
+    # won't run but we don't use them.  Also file buffers won't be flushed,
+    # but our policy is to always close files from a finally block. -- mbp 20070215
+    exitfunc = getattr(sys, "exitfunc", None)
+    if exitfunc is not None:
+        exitfunc()
+    os._exit(exit_val)
+
+
+if __name__ == '__main__':
+    main()

=== modified file 'brz'
--- brz	2020-01-31 17:43:44 +0000
+++ brz	2020-05-05 23:43:27 +0000
@@ -80,30 +80,8 @@
             breezy._format_version_tuple(_script_version),
             __file__))
 
-
-import breezy.breakin
-breezy.breakin.hook_debugger_to_signal()
-
-import breezy.commands
-import breezy.trace
-
-
 if __name__ == '__main__':
-    with breezy.initialize():
-        exit_val = breezy.commands.main()
-        if profiling:
-            profile_imports.log_stack_info(sys.stderr)
-
-    # By this point we really have completed everything we want to do, and
-    # there's no point doing any additional cleanup.  Abruptly exiting here
-    # stops any background threads getting into trouble as code is unloaded,
-    # and it may also be slightly faster, through avoiding gc of objects that
-    # are just about to be discarded anyhow.  This does mean that atexit hooks
-    # won't run but we don't use them.  Also file buffers won't be flushed,
-    # but our policy is to always close files from a finally block. -- mbp 20070215
-    exitfunc = getattr(sys, "exitfunc", None)
-    if exitfunc is not None:
-        exitfunc()
-    os._exit(exit_val)
+    from breezy.__main__ import main
+    main()
 else:
     raise ImportError("The brz script cannot be imported.")

=== modified file 'doc/en/release-notes/brz-3.1.txt'
--- doc/en/release-notes/brz-3.1.txt	2020-04-27 02:29:59 +0000
+++ doc/en/release-notes/brz-3.1.txt	2020-05-05 23:43:27 +0000
@@ -84,6 +84,9 @@
    name of the colocated branch to sprout.
    (Jelmer Vernooij, #1869977)
 
+ * Add a ``breezy.__main__`` module so that
+   ``python3 -m breezy`` works. (Jelmer Vernooij)
+
 Improvements
 ************