test

Author: tien-tong

babs/merge.py

@@ -65,7 +65,10 @@ def babs_merge(self, chunk_size=1000, trial_run=False):
 
         # List all branches in output RIA:
         print('\nListing all branches in output RIA...')
-        list_branches_jobs = self._get_results_branches()
+        # After cloning, branches are available as remote branches in merge_ds
+        from babs.utils import get_results_branches
+
+        list_branches_jobs = get_results_branches(merge_ds_path)
 
         if len(list_branches_jobs) == 0:
             raise ValueError(

babs/utils.py

@@ -334,9 +334,21 @@ def get_git_show_ref_shasum(branch_name, the_path):
     `head -n 1` is to get the first element in the list
     """
 
+    # Try the branch name as-is first (works for local branches and remote branches)
     proc_git_show_ref = subprocess.run(
-        ['git', 'show-ref', branch_name], cwd=the_path, stdout=subprocess.PIPE
+        ['git', 'show-ref', branch_name],
+        cwd=the_path,
+        capture_output=True,
     )
+
+    # If that fails, try with 'origin/' prefix (for remote branches in cloned repos)
+    if proc_git_show_ref.returncode != 0 and not branch_name.startswith('origin/'):
+        proc_git_show_ref = subprocess.run(
+            ['git', 'show-ref', 'origin/' + branch_name],
+            cwd=the_path,
+            capture_output=True,
+        )
+
     proc_git_show_ref.check_returncode()
     msg = proc_git_show_ref.stdout.decode('utf-8')
     # `msg.split()`:    # split by space and '\n'
@@ -362,6 +374,7 @@ def get_results_branches(ria_directory):
         path to the git (or datalad) repository
 
     """
+    # Try local branches first
     branch_output = subprocess.run(
         ['git', 'branch', '--list'],
         cwd=ria_directory,
@@ -370,13 +383,50 @@ def get_results_branches(ria_directory):
     )
 
     # Filter to just branches starting with 'job-'
+    # Handle empty output: if stdout is empty, split('\n') returns [''] which we filter out
+    branch_lines = branch_output.stdout.strip().split('\n') if branch_output.stdout.strip() else []
     branches = [
         # Remove leading and trailing asterisks and spaces
         b.strip().replace('* ', '')
-        for b in branch_output.stdout.strip().split('\n')
+        for b in branch_lines
         if b.strip().replace('* ', '').startswith('job-')
     ]
 
+    # If no local branches found, check if this is a cloned repository
+    # (has 'origin' remote) and try remote branches
+    if not branches:
+        # Check if 'origin' remote exists (indicates a cloned repository)
+        check_remote = subprocess.run(
+            ['git', 'remote', 'show', 'origin'],
+            cwd=ria_directory,
+            capture_output=True,
+            text=True,
+        )
+        # Only check remote branches if 'origin' remote exists
+        # (this indicates it's a cloned repo like merge_ds, not the original RIA)
+        if check_remote.returncode == 0:
+            branch_output_remote = subprocess.run(
+                ['git', 'branch', '-r', '--list'],
+                cwd=ria_directory,
+                capture_output=True,
+                text=True,
+            )
+
+            # Filter to just branches starting with 'origin/job-' and strip 'origin/' prefix
+            # Handle empty output: if stdout is empty, split('\n') returns [''] which we filter out
+            remote_branch_lines = (
+                branch_output_remote.stdout.strip().split('\n')
+                if branch_output_remote.stdout.strip()
+                else []
+            )
+            remote_branches = [
+                # Remove leading and trailing asterisks and spaces, then strip 'origin/' prefix
+                b.strip().replace('* ', '').replace('origin/', '')
+                for b in remote_branch_lines
+                if b.strip().replace('* ', '').startswith('origin/job-')
+            ]
+            branches = remote_branches
+
     return branches