Changing behavior when copy another experiment to copy the git session info too (#2830)

(cherry picked from commit 9621313)

Author: VindeeR

CHANGELOG.md

@@ -95,6 +95,7 @@ release.
   Changes and improvements to fixtures and pytest organisation and setup #2745
 - Removed broken migrate command #2617
 - Allow users to delete multiple experiments #1216 #2793
+- Copying git session of an experiment #2828
 
 ### 4.1.15: Bug fixes, enhancements, and new features
 

autosubmit/config/configcommon.py

@@ -33,7 +33,7 @@
 
 from bscearth.utils.date import parse_date
 from configobj import ConfigObj
-from pyparsing import nestedExpr
+from pyparsing import nested_expr
 from ruamel.yaml import YAML
 
 from autosubmit.config.basicconfig import BasicConfig
@@ -2298,7 +2298,7 @@ def get_date_list(self):
                 string = f'[{date_value}]'
             else:
                 string = date_value
-            split_string = nestedExpr('[', ']').parseString(string).asList()
+            split_string = nested_expr('[', ']').parse_string(string).asList()
             string_date = None
             for split in split_string[0]:
                 if type(split) is list:
@@ -2373,7 +2373,7 @@ def get_member_list(self, run_only=False):
             return member_list
         elif not string.startswith("["):
             string = f'[{string}]'
-        split_string = nestedExpr('[', ']').parseString(string).asList()
+        split_string = nested_expr('[', ']').parse_string(string).asList()
         string_member = None
         for split in split_string[0]:
             if type(split) is list:

autosubmit/utils.py

@@ -60,8 +60,10 @@ def as_conf_default_values(autosubmit_version: str, exp_id: str, hpc: str = "",
                     yaml_data['LOCAL']['PROJECT_PATH'] = ""
 
                 if 'GIT' in yaml_data:
-                    yaml_data['GIT']['PROJECT_ORIGIN'] = f'{git_repo}'
-                    yaml_data['GIT']['PROJECT_BRANCH'] = f'{git_branch}'
+                    if git_repo != "":
+                        yaml_data['GIT']['PROJECT_ORIGIN'] = f'{git_repo}'
+                    if git_branch != "":
+                        yaml_data['GIT']['PROJECT_BRANCH'] = f'{git_branch}'
 
                 if minimal_configuration:
                     if 'DEFAULT' in yaml_data:

test/integration/test_expid.py

@@ -88,8 +88,8 @@ def test_copying_experiment_with_hpc_in_command(autosubmit_exp: Callable, autosu
     assert yaml_data['MAIL']['TO'] == ""
     assert yaml_data['JOBS']['LOCAL_SEND_INITIAL']['CHUNKS_FROM']['1']['CHUNKS_TO'] == '1'
     assert yaml_data['LOCAL']['PROJECT_PATH'] == ""
-    assert yaml_data['GIT']['PROJECT_ORIGIN'] == ""
-    assert yaml_data['GIT']['PROJECT_BRANCH'] == ""
+    assert yaml_data['GIT']['PROJECT_ORIGIN'] == "origin_test"
+    assert yaml_data['GIT']['PROJECT_BRANCH'] == "branch_test"
 
 
 def test_copying_experiment_without_hpc_in_command(autosubmit_exp: Callable, autosubmit: Autosubmit, tmp_path):
@@ -190,8 +190,20 @@ def test_copying_experiment_with_hpc_in_file(autosubmit_exp: Callable, autosubmi
     yaml_data = yaml.load(open(tmp_path / f"{exp_id}/conf/metadata/experiment_data.yml"))
     assert yaml_data['DEFAULT']['HPCARCH'] == "MN5"
 
-
-def test_as_conf_default_values(autosubmit_exp: Callable, autosubmit: Autosubmit, tmp_path):
+@pytest.mark.parametrize(
+    'git_command,git_session',
+    [
+        (['', ''], ['', '']),
+        (['test_1', 'test_2'], ['', '']),
+        (['', 'test_2'], ['', '']),
+        (['test_1', ''], ['', '']),
+        (['', ''], ['test_3', 'test_4']),
+        (['test_1', 'test_2'], ['test_3', 'test_4']),
+        (['', 'test_2'], ['test_3', 'test_4']),
+        (['test_1', ''], ['test_3', 'test_4']),
+    ],
+)
+def test_as_conf_default_values(git_command, git_session, autosubmit_exp: Callable, autosubmit: Autosubmit, tmp_path):
     """Test that the ``check_jobs_file_exists`` function ignores a non-existent section."""
     exp = autosubmit_exp(experiment_data={
         'JOBS': {
@@ -203,8 +215,12 @@ def test_as_conf_default_values(autosubmit_exp: Callable, autosubmit: Autosubmit
                 }
             }
         },
+        'GIT': {
+            'PROJECT_ORIGIN': f'{git_session[0]}',
+            'PROJECT_BRANCH': f'{git_session[1]}'
+        },
     })
-    as_conf_default_values(autosubmit.autosubmit_version, exp.expid, 'MN5', True, 'test_1', 'test_2', 'test_3')
+    as_conf_default_values(autosubmit.autosubmit_version, exp.expid, 'MN5', True, git_command[0], git_command[1], 'test_3')
 
     yaml = YAML(typ='rt')
     assert autosubmit.create(exp.expid, noplot=True, hide=True) == 0
@@ -213,8 +229,26 @@ def test_as_conf_default_values(autosubmit_exp: Callable, autosubmit: Autosubmit
     assert yaml_data['DEFAULT']['EXPID'] == exp.expid
     assert yaml_data['DEFAULT']['CUSTOM_CONFIG'] == f'"{tmp_path}/{exp.expid}/proj/test_3"'
     assert yaml_data['LOCAL']['PROJECT_PATH'] == ""
-    assert yaml_data['GIT']['PROJECT_ORIGIN'] == "test_1"
-    assert yaml_data['GIT']['PROJECT_BRANCH'] == "test_2"
+
+    if git_command[0] != '':
+        assert yaml_data['GIT']['PROJECT_ORIGIN'] == git_command[0]
+    else:
+        assert yaml_data['GIT']['PROJECT_ORIGIN'] == git_session[0]
+
+    if git_command[1] != '':
+        assert yaml_data['GIT']['PROJECT_BRANCH'] == git_command[1]
+    else:
+        assert yaml_data['GIT']['PROJECT_BRANCH'] == git_session[1]
+
+    if git_session[0] != '' and git_command[0] == '':
+        assert yaml_data['GIT']['PROJECT_ORIGIN'] == git_session[0]
+    else:
+        assert yaml_data['GIT']['PROJECT_ORIGIN'] == git_command[0]
+
+    if git_session[1] != '' and git_command[1] == '':
+        assert yaml_data['GIT']['PROJECT_BRANCH'] == git_session[1]
+    else:
+        assert yaml_data['GIT']['PROJECT_BRANCH'] == git_command[1]
 
 
 @pytest.mark.parametrize(