RF: AnnexRepo.get_corresponding_branch() -> None without a managed branch

datalad/distribution/tests/test_update.py

@@ -756,8 +756,7 @@ def check_merge_follow_parentds_subdataset_detached(on_adjusted, path):
     # the explicit revision fetch fails.
     (ds_src_s1.pathobj / "bar").write_text("bar content")
     ds_src.save(recursive=True)
-    ds_src_s1.repo.checkout(
-        ds_src_s1.repo.get_corresponding_branch("master"))
+    ds_src_s1.repo.checkout('master')
     # This is the default, but just in case:
     ds_src_s1.repo.config.set("uploadpack.allowAnySHA1InWant", "false",
                               where="local")

datalad/support/annexrepo.py

@@ -465,25 +465,19 @@ def is_managed_branch(self, branch=None):
         return False
 
     def get_corresponding_branch(self, branch=None):
-        """In case of a managed branch, get the corresponding one.
-
-        If `branch` is not a managed branch, return that branch without any
-        changes.
-
-        Note: Since default for `branch` is the active branch,
-        `get_corresponding_branch()` is equivalent to `get_active_branch()` if
-        the active branch is not a managed branch.
+        """Get the name of a potential corresponding branch.
 
         Parameters
         ----------
-        branch: str
-          name of the branch; defaults to active branch
+        branch: str, optional
+          Name of the branch to report a corresponding branch for;
+          defaults to active branch
 
         Returns
         -------
-        str
-          name of the corresponding branch if there is any, name of the queried
-          branch otherwise.
+        str or None
+          Name of the corresponding branch, or `None` if there is no
+          corresponding branch.
         """
 
         if branch is None:
@@ -509,7 +503,7 @@ def get_corresponding_branch(self, branch=None):
             return cor_branch
 
         else:
-            return branch
+            return None
 
     def get_tracking_branch(self, branch=None, remote_only=False,
                             corresponding=True):
@@ -539,9 +533,9 @@ def get_tracking_branch(self, branch=None, remote_only=False,
             branch = self.get_active_branch()
 
         return super(AnnexRepo, self).get_tracking_branch(
-                        remote_only=remote_only,
-                        branch=self.get_corresponding_branch(branch)
-                        if corresponding else branch)
+            remote_only=remote_only,
+            branch=(self.get_corresponding_branch(branch) or branch)
+            if corresponding else branch)
 
     @classmethod
     def _check_git_annex_version(cls):
@@ -1241,7 +1235,8 @@ def _init(self, version=None, description=None):
                                 self.config.sections()]
         for sct in sections_to_preserve:
             orig_branch = sct[7:]
-            new_branch = self.get_corresponding_branch(orig_branch)
+            new_branch = \
+                self.get_corresponding_branch(orig_branch) or orig_branch
             new_section = "branch.{}".format(new_branch)
             for opt in self.config.options(sct):
                 orig_value = self.config.get_value(sct, opt)
@@ -3494,17 +3489,16 @@ def localsync(self, remote=None, managed_only=False):
         """
         branch = self.get_active_branch()
         corresponding_branch = self.get_corresponding_branch(branch)
+        branch = corresponding_branch or branch
 
-        have_corresponding_branch = branch != corresponding_branch
-
-        if managed_only and not have_corresponding_branch:
+        if managed_only and not corresponding_branch:
             lgr.debug('No sync necessary, no corresponding branch detected')
             return
 
         lgr.debug(
             "Sync local 'git-annex' branch%s.",
             ", and corresponding '{}' branch".format(corresponding_branch)
-            if have_corresponding_branch else '')
+            if corresponding_branch else '')
 
         synced_branch = 'synced/{}'.format(corresponding_branch)
         had_synced_branch = synced_branch in self.get_branches()

datalad/support/gitrepo.py

@@ -1914,6 +1914,10 @@ def get_active_branch(self):
                 raise e
         return out.strip()[11:]  # strip refs/heads/
 
+    def get_corresponding_branch(self, branch=None):
+        """Always returns None, a plain GitRepo has no managed branches"""
+        return None
+
     def get_branches(self):
         """Get all branches of the repo.
 

datalad/support/tests/test_annexrepo.py

@@ -1984,7 +1984,7 @@ def test_AnnexRepo_get_corresponding_branch(path):
     ar = AnnexRepo(path)
 
     # we should be on master.
-    eq_('master', ar.get_corresponding_branch())
+    eq_('master', ar.get_corresponding_branch() or ar.get_active_branch())
 
     # special case v6 adjusted branch is not provided by a dedicated build:
     if ar.supports_unlocked_pointers: