added --source-branch and --configs init parameters

Author: aho-dips

smud-cli/functions-init.sh

@@ -115,13 +115,21 @@ init()
 {
     if [ "$help" ]; then
         func=${1:-init}
-        echo "${bold}smud $func${normal}: Initializes local repository and sets upstream and origin remotes"
-        printf "With Only ${green}$func${normal}, Upstream '$default_upstream' will be configured if not configured yet. When configured the upstream will be fetched. \n"
-        printf "With ${green}$func ${bold}<value>${normal}, Upstream '<value>' will be configured before upstream is fetched. \n"
-        printf "With ${green}$func ${bold}--upstream-url <value>${normal}, Upstream '<value>' will be configured before upstream is fetched. \n"
-        printf "With ${green}$func ${bold}-${normal}, Upstream will be removed. \n"
+        echo "${bold}smud $func${normal}: Initializes local repository and sets upstream, origin remotes and source-branch"
+        printf "Upstream: \n"
+        printf "  With Only ${green}$func${normal}, Upstream '$default_upstream' will be configured if not configured yet. When configured the upstream will be fetched. \n"
+        printf "  With ${green}$func ${bold}<value>${normal}, Upstream '<value>' will be configured before upstream is fetched. \n"
+        printf "  With ${green}$func ${bold}--upstream-url <value>${normal}, Upstream '<value>' will be configured before upstream is fetched. \n"
+        printf "  With ${green}$func ${bold}-${normal}, Upstream will be removed. \n"
+        printf "source-branch: \n"
+        printf "  With Only ${green}$func${normal}, source-branch will be configured to 'upstream/$default_branch' . \n"
+        printf "  With ${green}$func ${bold}${green}--source-branch${normal} <value>${normal}, source-branch '<value>' will be configured. \n"
+        printf "Show configs: \n"
+        printf "  ${green}$func${normal} ${green}--configs${normal} will list all repository config key/values. ${green}--show${normal} or ${green}--settings${normal} can be used as well. \n"
+        printf "  ${green}$func${normal} ${green}--show${normal} or ${green}--settings${normal} can be used as well. \n"
         return
     fi
+    
     if [ ! "$upstream_url" ]; then
         upstream_url="$1"
         if [ ! "$upstream_url" ]; then
@@ -156,10 +164,33 @@ init()
         fetch_upstream
     fi
 
+    if [ "$is_repo" ]; then
+        if [ ! "$source_branch" ]; then
+            source_branch=$(git config --get source.$current_branch)
+        fi
+        if [ ! "$source_branch" ]; then
+            source_branch="upstream/$default_branch"
+        fi
+
+        old=$(git config --get source.$current_branch)
+        if [ ! "$old" = "$source_branch" ] || [ ! "$old" ] ; then
+            if [ "$old" ]; then
+                dummy=$(git config --unset source.$current_branch)
+            fi
+            dummy=$(git config --add source.$current_branch $source_branch)
+        fi
+    fi
+
+
     if [ ! "$remote_origin" ]; then
         print_not_silent "Setting and fetching origin"
         set_origin
         fetch_origin
         print_not_silent "${green}Initalization complete.\n${normal}"
     fi
+
+    if [ "$configs" ]; then
+        config_command="git config -l"
+        run_command config-list --command-var config_command  --skip-error
+    fi
 }

smud-cli/functions-upgrade.sh

@@ -130,7 +130,7 @@ upgrade()
     # git_range="${rev_list[@]}"
 
     list 
-    
+    error_code=0
     yes_no="yes"
     if [ ! "$silent" ]; then
       ask yes_no "$yellow" "Do you want to continue upgrading the selected $context (Yes/No)?"
@@ -143,28 +143,30 @@ upgrade()
         print_debug "$commits"
         # If there are any current unapplied changes, cherry pick will fail. Catch this.
         cherrypick_commits_command="git cherry-pick $commits $cherrypick_options"
-        run_command cherry-pick --command-var=cherrypick_commits_command --return-var=log --skip-error --debug-title='Start cherry-pick' || error_message=$log
+        run_command cherry-pick --command-var=cherrypick_commits_command --return-var=log --skip-error --error-code error_code --debug-title='Start cherry-pick' || error_message=$log
 
         # Check if cherry-pick in progress
         error_index="$(echo "$error_message" | grep "cherry-pick is already in progress" -c)"
         if [ $error_index -gt 0 ]; then
+            error_code=0
             error_message=""
             cherrypick_commits_command="git cherry-pick --continue $cherrypick_options"
-            run_command cherry-pick --command-var=cherrypick_commits_command --return-var=log --debug-title='Continue cherry-pick' || error_message=$log
+            run_command cherry-pick --command-var=cherrypick_commits_command --return-var=log --error-code error_code --debug-title='Continue cherry-pick' || error_message=$log
         fi
 
         # Check if cherry-pick was resolved
         error_index="$(echo "$error_message" | grep "The previous cherry-pick is now empty, possibly due to conflict resolution" -c)"
         if [ $error_index -gt 0 ]; then
             error_message=""
+            error_code=0
             cherrypick_commits_command="git cherry-pick --skip $cherrypick_options"
-            run_command cherry-pick --command-var=cherrypick_commits_command --return-var=log --debug-title='Skip cherry-pick' || error_message=$log
+            run_command cherry-pick --command-var=cherrypick_commits_command --return-var=log --error-code error_code --debug-title='Skip cherry-pick' || error_message=$log
         fi
 
         # Loop until no conflicts
         # Print status in plain text after each file listing
         # If the conflict is UD (delete happened in remote) resolve it automatically using "merge-strategy theirs"
-        if [ -n "$error_message" ]; then
+        if [ "$error_message" ]; then
             errors_resolved="false"
             printf "${red}Cherry-pick ran into errors that must be resolved manually.\n${normal}"
             #echo "$error_message"
@@ -190,8 +192,12 @@ upgrade()
 
                 merge_conflict_status_codes="DD AU UD UA DU AA UU"
                 untracked_status_code="??"
-
-                printf "${red}The follwing contains changes that must be resolved:\n${normal}" 
+                if [ "$silent" ]; then
+                    printf "${red}There is a merge conflict!"
+                else
+                    printf "${red}The follwing contains changes that must be resolved:\n${normal}" 
+                fi
+                
                 for status_code in "${!status_map[@]}"; do
                     filenames="${status_map[$status_code]}"
                     description=$(get_status_description "$status_code")
@@ -201,13 +207,26 @@ upgrade()
                         printf "\t* ${gray}$filename\n${normal}"
                     done 
                 done
-               
+
+                if [ "$silent" ]; then
+                    echo "Aborting the cherry-pick process."
+                    cherrypick_abort_command="git cherry-pick --abort"
+                    run_command cherry-pick-abort --command-var=cherrypick_abort_command --return-var=dummy --skip-error --debug-title='Abort cherry-pick'
+                    if [ ! "$error_code" ] || [ "$error_code" = "0" ]; then
+                        error_code=1
+                    fi
+
+                    exit $error_code
+                fi
+
                 printf "${red}After resolving the errors, "
                 read -p "press [enter] to continue. To abort press [A][enter]. To skip commit press [S][enter]: " continue_or_abort
                 lower continue_or_abort
                 printf "${normal}\n"
                 if [ "$continue_or_abort" = "a" ]; then
-                    log=$(git cherry-pick --abort > /dev/null 2>&1 )
+                    error_code=0
+                    cherrypick_abort_command="git cherry-pick --abort"
+                    run_command cherry-pick-abort --command-var=cherrypick_abort_command --return-var=dummy --skip-error --debug-title='Abort cherry-pick'
                     exit
                 fi
 
@@ -398,7 +417,7 @@ correlate_against_already_cherripicked()
             fi
         done
         revision_list=("${rev_list_checked[@]}")
-        if [ ${#revision_list[@]} -gt 0 ]; then
+        if [ ${#revision_list[@]} -gt 0 ] && [ ! "$silent" ]; then
             print_gray "Number of revisions corrolated agains already cherry-picked commits: $normal${#revision_list[@]}"
         fi
     fi

smud-cli/include.sh

@@ -353,6 +353,8 @@ first_param="$3"
 parse_arguments ARGS $@
 curr_dir=$(pwd)
 get_arg upstream_url '--upstream-url,--upstream,--up-url,-up-url'
+get_arg source_branch '--source-branch,--source'
+get_arg configs '--configs,--settings,--show'
 get_arg skip_auto_update '--skip-auto-update,--skip-auto'
 get_arg examples '--examples,--ex,-ex'
 get_arg help '--help,-?,-h' "$examples"
@@ -451,23 +453,29 @@ fi
 git_pretty_commit='--pretty=format:%H'
 git_pretty_commit_date='--pretty=format:%H|%ad'
 default_branch="main"
+current_branch="$default_branch"
 if [ "$has_args" ] && [ ! "$help" ] && [ "$is_repo" ]; then
     default_branch="$(git config --list | grep -E 'branch.(main|master).remote' | sed -e 's/branch\.//g' -e 's/\.remote//g' -e 's/=origin//g')"
-    if [ ! "$upstream_url" ]; then
-        upstream_url="$(git config --get remote.upstream.url)"
-    fi
-
     if [ ! "$default_branch" ]; then
-        default_branch=$(git config --get init.defaultbranch)
+        default_branch="$(git config --get init.defaultbranch)"
     fi
-
     if [ ! "$default_branch" ]; then
         default_branch="main"
         can_do_git=""
     else
         can_do_git="$(git branch --list $default_branch)"
     fi
 
+    current_branch="$(git branch --show-current)"
+    if [ ! "$current_branch" ]; then
+        current_branch="$default_branch"
+    fi
+
+    if [ ! "$upstream_url" ]; then
+        upstream_url="$(git config --get remote.upstream.url)"
+    fi
+
+
     if [ ! "$from_commit" ] && [ ! "$from_date" ] && [ "$can_do_git" ] ; then
         from_commit_command="git rev-list $default_branch -1"
         {
@@ -479,8 +487,14 @@ if [ "$has_args" ] && [ ! "$help" ] && [ "$is_repo" ]; then
     fi
 
     if [ ! "$to_commit" ] && [ ! "$is_smud_dev_repo" ];then
-        if [ "$upstream_url" ]; then
-            to_commit_command="git rev-list upstream/$default_branch -1"
+        if [ ! "$source_branch" ]; then
+            source_branch=$(git config --get source.$current_branch)
+        fi
+        if [ ! "$source_branch" ]; then
+            source_branch="upstream/$default_branch"
+        fi
+        if [ "$upstream_url" ] || [ ! "$source_branch" = "upstream/$default_branch" ]; then
+            to_commit_command="git rev-list $source_branch -1"
             run_command to-commit --command-var to_commit_command --return-var to_commit --skip-error --debug-title "to-commit-command"
         fi
     fi