Breezy

Merge lp:~jelmer/brz/3.0-merge into lp:brz

  1. 3.0-merge
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/3.0-merge
Merge into: lp:brz
Diff against target: 289 lines (+51/-33)
13 files modified
breezy/git/.testr.conf (+1/-1)
breezy/git/bzr-receive-pack (+4/-4)
breezy/git/bzr-upload-pack (+4/-4)
breezy/osutils.py (+1/-3)
breezy/plugin.py (+6/-1)
breezy/plugins/commitfromnews/__init__.py (+1/-0)
breezy/plugins/darcs/__init__.py (+1/-0)
breezy/plugins/email/__init__.py (+1/-0)
breezy/plugins/fastimport/__init__.py (+1/-0)
breezy/plugins/propose/__init__.py (+1/-0)
breezy/plugins/repodebug/__init__.py (+1/-0)
breezy/tests/test_plugins.py (+25/-20)
doc/en/release-notes/brz-3.0.txt (+4/-0)
To merge this branch: bzr merge lp:~jelmer/brz/3.0-merge
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+374062@code.launchpad.net

Commit message

Merge lp:brz/3.0.

Description of the change

Merge lp:brz/3.0.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve
Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :

There was nothing to merge
https://ci.breezy-vcs.org/job/brz/job/brz-land/524/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'breezy/git/.testr.conf'
--- breezy/git/.testr.conf 2018-03-30 14:33:57 +0000
+++ breezy/git/.testr.conf 2019-10-14 00:07:21 +0000
@@ -1,4 +1,4 @@
1[DEFAULT]1[DEFAULT]
2test_command=BRZ_PLUGINS_AT=git@`pwd` BRZ_PLUGIN_PATH=-site:-user ${BRZ:-../../../brz} selftest ^breezy.plugins.git. Git --subunit2 $IDOPTION $LISTOPT2test_command=BRZ_PLUGINS_AT=git@`pwd` BRZ_PLUGIN_PATH=-site:-user ${BRZ:-../../brz} selftest ^breezy.git. Git --subunit2 $IDOPTION $LISTOPT
3test_id_option=--load-list $IDFILE3test_id_option=--load-list $IDFILE
4test_list_option=--list4test_list_option=--list
55
=== modified file 'breezy/git/bzr-receive-pack'
--- breezy/git/bzr-receive-pack 2018-03-26 22:28:24 +0000
+++ breezy/git/bzr-receive-pack 2019-10-14 00:07:21 +0000
@@ -1,14 +1,14 @@
1#!/usr/bin/env python1#!/usr/bin/env python
22
3import breezy3import breezy
4from breezy.plugin import load_plugins4import breezy.bzr
5load_plugins()5import breezy.git
6from breezy.plugins.git.server import BzrBackend6from breezy.git.server import BzrBackend
7from dulwich.server import ReceivePackHandler, serve_command7from dulwich.server import ReceivePackHandler, serve_command
8import sys, os8import sys, os
99
10if len(sys.argv) < 2:10if len(sys.argv) < 2:
11 print >>sys.stderr, "usage: %s <git-dir>" % os.path.basename(sys.argv[0])11 print("usage: %s <git-dir>" % os.path.basename(sys.argv[0]))
12 sys.exit(1)12 sys.exit(1)
1313
14backend = BzrBackend(breezy.transport.get_transport("/"))14backend = BzrBackend(breezy.transport.get_transport("/"))
1515
=== modified file 'breezy/git/bzr-upload-pack'
--- breezy/git/bzr-upload-pack 2018-03-26 22:28:24 +0000
+++ breezy/git/bzr-upload-pack 2019-10-14 00:07:21 +0000
@@ -1,14 +1,14 @@
1#!/usr/bin/env python1#!/usr/bin/env python
22
3import breezy3import breezy
4from breezy.plugin import load_plugins4import breezy.bzr
5load_plugins ()5import breezy.git
6from breezy.plugins.git.server import BzrBackend6from breezy.git.server import BzrBackend
7from dulwich.server import UploadPackHandler, serve_command7from dulwich.server import UploadPackHandler, serve_command
8import sys, os8import sys, os
99
10if len(sys.argv) < 2:10if len(sys.argv) < 2:
11 print "usage: %s <git-dir>" % os.path.basename(sys.argv[0])11 print("usage: %s <git-dir>" % os.path.basename(sys.argv[0]))
12 sys.exit(1)12 sys.exit(1)
1313
14backend = BzrBackend(breezy.transport.get_transport("/"))14backend = BzrBackend(breezy.transport.get_transport("/"))
1515
=== modified file 'breezy/osutils.py'
--- breezy/osutils.py 2019-10-13 17:17:48 +0000
+++ breezy/osutils.py 2019-10-14 00:07:21 +0000
@@ -520,9 +520,7 @@
520 """Replacer for shutil.rmtree: could remove readonly dirs/files"""520 """Replacer for shutil.rmtree: could remove readonly dirs/files"""
521 return shutil.rmtree(path, ignore_errors, onerror)521 return shutil.rmtree(path, ignore_errors, onerror)
522522
523 f = win32utils.get_unicode_argv # special function or None523 get_unicode_argv = getattr(win32utils, 'get_unicode_argv', get_unicode_argv)
524 if f is not None:
525 get_unicode_argv = f
526 path_from_environ = win32utils.get_environ_unicode524 path_from_environ = win32utils.get_environ_unicode
527 _get_home_dir = win32utils.get_home_location525 _get_home_dir = win32utils.get_home_location
528 getuser_unicode = win32utils.get_user_name526 getuser_unicode = win32utils.get_user_name
529527
=== modified file 'breezy/plugin.py'
--- breezy/plugin.py 2019-06-16 01:03:51 +0000
+++ breezy/plugin.py 2019-10-14 00:07:21 +0000
@@ -225,7 +225,12 @@
225 """225 """
226 path_details = []226 path_details = []
227 env = osutils.path_from_environ(key)227 env = osutils.path_from_environ(key)
228 defaults = {"user": not env, "core": True, "site": True, 'entrypoints': True}228 defaults = {
229 "user": not env,
230 "core": True,
231 "site": True,
232 'entrypoints': False,
233 }
229 if env:234 if env:
230 # Add paths specified by user in order235 # Add paths specified by user in order
231 for p in env.split(os.pathsep):236 for p in env.split(os.pathsep):
232237
=== modified file 'breezy/plugins/commitfromnews/__init__.py'
--- breezy/plugins/commitfromnews/__init__.py 2018-11-11 04:08:32 +0000
+++ breezy/plugins/commitfromnews/__init__.py 2019-10-14 00:07:21 +0000
@@ -35,6 +35,7 @@
3535
36from __future__ import absolute_import36from __future__ import absolute_import
3737
38from ... import version_info # noqa: F401
38from ... import hooks39from ... import hooks
39from ...config import (40from ...config import (
40 option_registry,41 option_registry,
4142
=== modified file 'breezy/plugins/darcs/__init__.py'
--- breezy/plugins/darcs/__init__.py 2018-11-11 04:08:32 +0000
+++ breezy/plugins/darcs/__init__.py 2019-10-14 00:07:21 +0000
@@ -21,6 +21,7 @@
2121
22from __future__ import absolute_import22from __future__ import absolute_import
2323
24from ... import version_info # noqa: F401
24from breezy import (25from breezy import (
25 controldir,26 controldir,
26 errors,27 errors,
2728
=== modified file 'breezy/plugins/email/__init__.py'
--- breezy/plugins/email/__init__.py 2018-11-11 04:08:32 +0000
+++ breezy/plugins/email/__init__.py 2019-10-14 00:07:21 +0000
@@ -66,6 +66,7 @@
6666
67from __future__ import absolute_import67from __future__ import absolute_import
6868
69from ... import version_info # noqa: F401
69from ...config import option_registry70from ...config import option_registry
7071
7172
7273
=== modified file 'breezy/plugins/fastimport/__init__.py'
--- breezy/plugins/fastimport/__init__.py 2018-11-11 04:08:32 +0000
+++ breezy/plugins/fastimport/__init__.py 2019-10-14 00:07:21 +0000
@@ -56,6 +56,7 @@
5656
57from __future__ import absolute_import57from __future__ import absolute_import
5858
59from ... import version_info # noqa: F401
59from ...commands import plugin_cmds60from ...commands import plugin_cmds
6061
6162
6263
=== modified file 'breezy/plugins/propose/__init__.py'
--- breezy/plugins/propose/__init__.py 2019-04-27 15:40:17 +0000
+++ breezy/plugins/propose/__init__.py 2019-10-14 00:07:21 +0000
@@ -18,6 +18,7 @@
1818
19from __future__ import absolute_import19from __future__ import absolute_import
2020
21from ... import version_info # noqa: F401
21from ...commands import plugin_cmds22from ...commands import plugin_cmds
2223
23plugin_cmds.register_lazy("cmd_propose_merge", ["propose"], __name__ + ".cmds")24plugin_cmds.register_lazy("cmd_propose_merge", ["propose"], __name__ + ".cmds")
2425
=== modified file 'breezy/plugins/repodebug/__init__.py'
--- breezy/plugins/repodebug/__init__.py 2017-09-07 08:21:29 +0000
+++ breezy/plugins/repodebug/__init__.py 2019-10-14 00:07:21 +0000
@@ -22,6 +22,7 @@
2222
23from __future__ import absolute_import23from __future__ import absolute_import
2424
25from ... import version_info # noqa: F401
25from ...commands import plugin_cmds26from ...commands import plugin_cmds
2627
2728
2829
=== modified file 'breezy/tests/test_plugins.py'
--- breezy/tests/test_plugins.py 2019-01-25 03:30:39 +0000
+++ breezy/tests/test_plugins.py 2019-10-14 00:07:21 +0000
@@ -606,59 +606,62 @@
606 self.assertEqual(expected_dirs, actual)606 self.assertEqual(expected_dirs, actual)
607607
608 def test_default(self):608 def test_default(self):
609 self.check_path([self.user, self.core, self.entrypoints, self.site],609 self.check_path([self.user, self.core, self.site], None)
610 None)
611610
612 def test_adhoc_policy(self):611 def test_adhoc_policy(self):
613 self.check_path([self.user, self.core, self.site, self.entrypoints],612 self.check_path([self.user, self.core, self.site],
614 ['+user', '+core', '+site'])613 ['+user', '+core', '+site'])
615614
616 def test_fallback_policy(self):615 def test_fallback_policy(self):
617 self.check_path([self.core, self.site, self.user, self.entrypoints],616 self.check_path([self.core, self.site, self.user],
618 ['+core', '+site', '+user'])617 ['+core', '+site', '+user'])
619618
620 def test_override_policy(self):619 def test_override_policy(self):
621 self.check_path([self.user, self.site, self.core, self.entrypoints],620 self.check_path([self.user, self.site, self.core],
622 ['+user', '+site', '+core'])621 ['+user', '+site', '+core'])
623622
623 def test_enable_entrypoints(self):
624 self.check_path([self.user, self.core, self.site, self.entrypoints],
625 ['+user', '+core', '+site', '+entrypoints'])
626
624 def test_disable_user(self):627 def test_disable_user(self):
625 self.check_path([self.core, self.entrypoints, self.site], ['-user'])628 self.check_path([self.core, self.site], ['-user'])
626629
627 def test_disable_user_twice(self):630 def test_disable_user_twice(self):
628 # Ensures multiple removals don't left cruft631 # Ensures multiple removals don't left cruft
629 self.check_path([self.core, self.entrypoints, self.site], ['-user', '-user'])632 self.check_path([self.core, self.site], ['-user', '-user'])
630633
631 def test_duplicates_are_removed(self):634 def test_duplicates_are_removed(self):
632 self.check_path([self.user, self.core, self.entrypoints, self.site],635 self.check_path([self.user, self.core, self.site],
633 ['+user', '+user'])636 ['+user', '+user'])
634 # And only the first reference is kept (since the later references will637 # And only the first reference is kept (since the later references will
635 # only produce '<plugin> already loaded' mutters)638 # only produce '<plugin> already loaded' mutters)
636 self.check_path([self.user, self.core, self.site, self.entrypoints],639 self.check_path([self.user, self.core, self.site],
637 ['+user', '+user', '+core',640 ['+user', '+user', '+core',
638 '+user', '+site', '+site',641 '+user', '+site', '+site',
639 '+core'])642 '+core'])
640643
641 def test_disable_overrides_enable(self):644 def test_disable_overrides_enable(self):
642 self.check_path([self.core, self.entrypoints, self.site], ['-user', '+user'])645 self.check_path([self.core, self.site], ['-user', '+user'])
643646
644 def test_disable_core(self):647 def test_disable_core(self):
645 self.check_path([self.entrypoints, self.site], ['-core'])648 self.check_path([self.site], ['-core'])
646 self.check_path([self.user, self.entrypoints, self.site], ['+user', '-core'])649 self.check_path([self.user, self.site], ['+user', '-core'])
647650
648 def test_disable_site(self):651 def test_disable_site(self):
649 self.check_path([self.core, self.entrypoints], ['-site'])652 self.check_path([self.core], ['-site'])
650 self.check_path([self.user, self.core, self.entrypoints], ['-site', '+user'])653 self.check_path([self.user, self.core], ['-site', '+user'])
651654
652 def test_override_site(self):655 def test_override_site(self):
653 self.check_path(['mysite', self.user, self.core, self.entrypoints],656 self.check_path(['mysite', self.user, self.core],
654 ['mysite', '-site', '+user'])657 ['mysite', '-site', '+user'])
655 self.check_path(['mysite', self.core, self.entrypoints],658 self.check_path(['mysite', self.core],
656 ['mysite', '-site'])659 ['mysite', '-site'])
657660
658 def test_override_core(self):661 def test_override_core(self):
659 self.check_path(['mycore', self.user, self.site, self.entrypoints],662 self.check_path(['mycore', self.user, self.site],
660 ['mycore', '-core', '+user', '+site'])663 ['mycore', '-core', '+user', '+site'])
661 self.check_path(['mycore', self.entrypoints, self.site],664 self.check_path(['mycore', self.site],
662 ['mycore', '-core'])665 ['mycore', '-core'])
663666
664 def test_my_plugin_only(self):667 def test_my_plugin_only(self):
@@ -667,11 +670,11 @@
667 ['myplugin', '-user', '-core', '-site', '-entrypoints'])670 ['myplugin', '-user', '-core', '-site', '-entrypoints'])
668671
669 def test_my_plugin_first(self):672 def test_my_plugin_first(self):
670 self.check_path(['myplugin', self.core, self.site, self.user, self.entrypoints],673 self.check_path(['myplugin', self.core, self.site, self.user],
671 ['myplugin', '+core', '+site', '+user'])674 ['myplugin', '+core', '+site', '+user'])
672675
673 def test_bogus_references(self):676 def test_bogus_references(self):
674 self.check_path(['+foo', '-bar', self.core, self.entrypoints, self.site],677 self.check_path(['+foo', '-bar', self.core, self.site],
675 ['+foo', '-bar'])678 ['+foo', '-bar'])
676679
677680
@@ -923,6 +926,7 @@
923926
924 def test_plugin_loaded(self):927 def test_plugin_loaded(self):
925 self.assertPluginUnknown('plugin')928 self.assertPluginUnknown('plugin')
929 self.overrideEnv('BRZ_PLUGIN_PATH', '+entrypoints')
926 self.setup_plugin()930 self.setup_plugin()
927 p = self.plugins['plugin']931 p = self.plugins['plugin']
928 self.assertIsInstance(p, breezy.plugin.PlugIn)932 self.assertIsInstance(p, breezy.plugin.PlugIn)
@@ -930,6 +934,7 @@
930934
931 def test_plugin_loaded_disabled(self):935 def test_plugin_loaded_disabled(self):
932 self.assertPluginUnknown('plugin')936 self.assertPluginUnknown('plugin')
937 self.overrideEnv('BRZ_PLUGIN_PATH', '+entrypoints')
933 self.overrideEnv('BRZ_DISABLE_PLUGINS', 'plugin')938 self.overrideEnv('BRZ_DISABLE_PLUGINS', 'plugin')
934 self.setup_plugin()939 self.setup_plugin()
935 self.assertNotIn('plugin', self.plugins)940 self.assertNotIn('plugin', self.plugins)
936941
=== modified file 'doc/en/release-notes/brz-3.0.txt'
--- doc/en/release-notes/brz-3.0.txt 2019-06-18 11:21:15 +0000
+++ doc/en/release-notes/brz-3.0.txt 2019-10-14 00:07:21 +0000
@@ -32,6 +32,10 @@
32.. Fixes for situations where brz would previously crash or give incorrect32.. Fixes for situations where brz would previously crash or give incorrect
33 or undesirable results.33 or undesirable results.
3434
35 * Disable loading from entrypoints by default, since it can
36 significantly slow down startup on some platforms.
37 (Jelmer Vernooij, #1832868)
38
35Documentation39Documentation
36*************40*************
3741

Subscribers

People subscribed via source and target branches