Merge branch 'plugin_reorder'

docs/CHANGES.rst

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+0.5.0 - 2023-10-06
+------------------
+
+- Dulwich is now registered first.
+- Have the registration by name show all available implementations.
+
 0.4.0 - 2023-06-16
 ------------------
 

src/pmr2/wfctrl/cmd.py

@@ -310,7 +310,7 @@ def add(self, workspace, path, **kw):
 
 
 def _register():
-    register_cmd(MercurialDvcsCmd, GitDvcsCmd, DulwichDvcsCmd)
+    register_cmd(MercurialDvcsCmd, DulwichDvcsCmd, GitDvcsCmd)
 
 register = _register
 register()

src/pmr2/wfctrl/core.py

@@ -15,13 +15,14 @@ def dummy_action(workspace):
 
 def register_cmd(*cmd_classes):
     for cmd_cls in cmd_classes:
-        if cmd_cls.marker in _cmd_classes:
+        if not cmd_cls.available():
             continue
-        if cmd_cls.available():
+        # The classes passed to register_cmd controls the order of which
+        # the marker gets priority - the first one wins.
+        if cmd_cls.marker not in _cmd_classes:
             _cmd_classes[cmd_cls.marker] = cmd_cls
-            # XXX we are not handling cases where two markers in different
-            # classes that uses the same name
-            _cmd_names[cmd_cls.name] = cmd_cls
+        # The name gets registered regardless.
+        _cmd_names[cmd_cls.name] = cmd_cls
 
 def get_cmd_by_name(cmd_name):
     return _cmd_names.get(cmd_name)

tests/test_cmd.py

@@ -273,6 +273,10 @@ def _make_remote(self):
     def test_get_cmd_by_name(self):
         self.assertEqual(get_cmd_by_name('git'), self.cmdcls)
 
+    @skipIf(DulwichDvcsCmd.available(), 'git is not available')
+    def test_auto_init(self):  # pragma: no cover
+        super(GitDvcsCmdTestCase, self).test_auto_init()
+
 
 @skipIf(not MercurialDvcsCmd.available(), 'mercurial is not available')
 class MercurialDvcsCmdTestCase(CoreTestCase, RawCmdTests):
@@ -339,7 +343,4 @@ def _ls_root(self, workspace=None):
         return ''.join(outstream.getvalue()).encode(), b'', 0
 
     def test_get_cmd_by_name(self):
-        pass
-
-    def test_auto_init(self):
-        pass
+        self.assertEqual(get_cmd_by_name('dulwich'), self.cmdcls)