Goal

• Given the current <SRC> Git branch (e.g., HelpersTask1273_Get_Mac_tests_to_pass), write instructions to build a child PR on a new <DST> branch

Workflow

Find the Next Branch Name

• Find which branch name is next available:

  > i git_branch_next_name
  12:01:47 - INFO  hgit.py _get_branch_next_name_via_github_api:124       Found highest number '3' in all branches, next is '4'
  branch_next_name='HelpersTask1273_Get_Mac_tests_to_pass_4'
  

Create the Instructions File

• Create a file pr_merge.txt with the instructions to:
  • Create a <DST> branch (e.g., HelpersTask1273_Get_Mac_tests_to_pass_4)
  • Copy the files needed to merge PR2 from github_PR_plan.md from the current branch to the target branch
  • Create a file pr_commit_msg.txt with the description of what the PR does
  • Create a file pr_pytest.sh with the tests to run to check the behavior of the PR
  • Make sure there are comments for each phase and that each command is correct

Example

• Example commands to build a pr_merge.txt:

  > export SRC_BRANCH=HelpersTask1273_Get_Mac_tests_to_pass
  > export DST_BRANCH=HelpersTask1273_Get_Mac_tests_to_pass_6
  
  > git checkout master
  > git pull
  
  > i git_branch_create -b $DST_BRANCH
  > git checkout -b $DST_BRANCH
  
  > cat > pr_commit_msg.txt << 'EOF'
  Unit Test Infrastructure: Purification, Introspection, Numpy, and Base Updates
  
  - Adds new test purification module (hunit_test_purification.py)
  - Updates test infrastructure with new utility functions
  - Improves introspection module for better test support
  - Fixes numpy test compatibility issues
  - Updates base unit test module for macOS compatibility
  - All changes are related to test utilities and infrastructure improvements
  - Well-isolated changes to testing subsystem
  EOF
  
  # Copy the files through branches.
  > helpers_root/dev_scripts_helpers/git/git_sync_between_branches.sh --src_branch $SRC_BRANCH --dst_branch $DST_BRANCH --files "$FILES"
  
  # Copy the files from another dir.
  > export SRC_DIR=/Users/saggese/src/csfy1
  > export DST_DIR=/Users/saggese/src/notes1
  > export SUB_DIR=helpers_root
  > diff_to_vimdiff.py --dir1 $SRC_DIR/$SUB_DIR/ --dir2 ./$SUB_DIR/
  
  > echo "$FILES" | tr ' ' '\n' > /tmp/file_list.txt
  > more /tmp/file_list.txt
  helpers/hunit_test_purification.py
  helpers/test/test_hunit_test_purification.py
  helpers/test/test_hintrospection.py
  helpers/test/test_hnumpy.py
  helpers/test/test_hunit_test.py
  > rsync -avR --files-from=/tmp/file_list.txt $SRC_DIR/$SUB_DIR/ $DST_DIR/$SUB_DIR/
  > rsync -av $SRC_DIR/$SUB_DIR/ $DST_DIR/$SUB_DIR/
  
  > git add $FILES
  > git commit -am pr_commit_msg.txt
  
  > cat > pr_pytest.sh << 'EOF'
  pytest \
      helpers/test/test_hunit_test_purification.py \
      helpers/test/test_hintrospection.py \
      helpers/test/test_hnumpy.py \
      helpers/test/test_hunit_test.py \
      -v
  EOF
  
  > chmod +x pr_pytest.sh
  
  > FILES="helpers/hunit_test_purification.py helpers/test/test_hunit_test_purification.py helpers/test/test_hintrospection.py helpers/test/test_hnumpy.py helpers/test/test_hunit_test.py"
  
  > export CSFY_DOCKER_ENGINE="docker"; i docker_cmd --stage=local -v 1.6.0 --cmd "./pr_pytest.sh 2>&1 | tee build1.txt"
  
  > export CSFY_DOCKER_ENGINE="docker"; ./pr_pytest.sh 2>&1 | tee build2.txt
  
  > export CSFY_DOCKER_ENGINE="apple"; ./pr_pytest.sh 2>&1 | tee build3.txt
  
  > i gh_create_pr --no-draft
  
  > i gh_watch
  
  > pr_pytest.sh
  

Verification

• Confirm pr_merge.txt, pr_commit_msg.txt, and pr_pytest.sh were created
• Confirm pr_pytest.sh is executable and runs the correct tests
• Confirm every phase has a comment and every command is correct