Compare commits

...

2 Commits

2 changed files with 39 additions and 10 deletions

View File

@ -90,6 +90,15 @@ alias cont='git rebase --continue'
alias branch_clean='git branch --merged | egrep -v "(^\*|master|dev)" | xargs git branch -d' alias branch_clean='git branch --merged | egrep -v "(^\*|master|dev)" | xargs git branch -d'
alias tag_clean='git tag -l | xargs git tag -d && git fetch -t' alias tag_clean='git tag -l | xargs git tag -d && git fetch -t'
function git_parent {
git log --pretty=format:"%D" HEAD^ | \ # Show log refs
grep -v "^$" | \ # Clear empty lines
sed "s/, /\n/g" | \ # One ref by line
grep -v "tag:[^,]*,*" | \ # Filter tag refs
head -n1 | \ # Keep only the last
sed "s/origin\/\([^,]*\)/\1/" # Local reference
}
alias log='git log --graph --decorate --oneline' alias log='git log --graph --decorate --oneline'
# Branch # Branch
@ -125,33 +134,43 @@ function grb {
git rebase --interactive HEAD~$1 git rebase --interactive HEAD~$1
} }
function grbm { function grbi {
# Save current branch # Save current branch
BRANCH=$(git branch | grep \* | cut -d ' ' -f2) BRANCH=$(git branch | grep \* | cut -d ' ' -f2)
# Checkout master & pull # Save parent branch
git checkout master PARENT=$(git_parent)
# Checkout parent & pull
git checkout ${PARENT}
git pull git pull
echo "Rebasing on" ${PARENT}
# Back to previous branch # Back to previous branch
git checkout ${BRANCH} git checkout ${BRANCH}
git rebase --interactive master git rebase --interactive ${PARENT}
} }
function grbr { function grbroot {
git rebase --interactive --autosquash --root git rebase --interactive --autosquash --root
} }
function gam {
git autofixup master
git rebase --interactive --autosquash master
}
function ga { function ga {
git autofixup HEAD~$1 git autofixup HEAD~$1
git rebase --interactive --autosquash HEAD~$1 git rebase --interactive --autosquash HEAD~$1
} }
function gai {
# Save parent branch
PARENT=$(git_parent)
echo "Rebasing with autofixup on" ${PARENT}
git autofixup ${PARENT}
git rebase --interactive --autosquash ${PARENT}
}
# ╔═╗┬┌┬┐ ╔═╗┌┬┐┌─┐┌┐┌┌┬┐ # ╔═╗┬┌┬┐ ╔═╗┌┬┐┌─┐┌┐┌┌┬┐
# ║ ╦│ │ ╠═╣│││├┤ │││ ││ # ║ ╦│ │ ╠═╣│││├┤ │││ ││
# ╚═╝┴ ┴ ╩ ╩┴ ┴└─┘┘└┘─┴┘ # ╚═╝┴ ┴ ╩ ╩┴ ┴└─┘┘└┘─┴┘

View File

@ -9,9 +9,19 @@
# Debug parser Legrand # Debug parser Legrand
<debug_path>/debug_parser.py --project legrand -s <server> -c <syncapi_path>/legrand_<server>.swp -r -pp -g <gateway_mac> <debug_path>/debug_parser.py --project legrand -s <server> -c <syncapi_path>/legrand_<server>.swp -r -pp -g <gateway_mac>
# Enable debug mode Legrand
<debug_path>/debug_config_setter.py --project legrand -s <server> -c <syncapi_path>/legrand_<server>.swp -g <gateway_mac> -t NLG -ke debug_enabled
# Disable debug mode Legrand
<debug_path>/debug_config_setter.py --project legrand -s <server> -c <syncapi_path>/legrand_<server>.swp -g <gateway_mac> -t NLG -kd debug_enabled
# Analyse diagnosis
<syncapi_path>/syncapiadmin.py --project legrand -s <server> --endpoint getdebuginfo -c <syncapi_path>/legrand_<server>.swp --mac <gateway_mac> | jq -r .body.diagnosis_content | <release_path>/decode_diagnosis.py
# Paths # Paths
$ syncapi_path: echo "$HOME/Netatmo/core/python-emb-tools/python/bin/syncapiadmin" $ syncapi_path: echo "$HOME/Netatmo/core/python-emb-tools/python/bin/syncapiadmin"
$ debug_path: echo "$HOME/Netatmo/core/python-emb-tools/python/bin/debug" $ debug_path: echo "$HOME/Netatmo/core/python-emb-tools/python/bin/debug"
$ release_path: echo "$HOME/Netatmo/core/python-emb-tools/python/bin/release"
# Variables # Variables
$ server: echo "prod inte" | tr " " "\n" $ server: echo "prod inte" | tr " " "\n"