Skip to content

G
gitflow
Commit 96182988 authored by cmosh's avatar cmosh
Browse files
Options

Flow shortcuts

parent 8200131f
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 32 deletions
git-flow-feature
View file @ 96182988
...@@ -222,7 +222,7 @@ cmd_start() { ...@@ -222,7 +222,7 @@ cmd_start() {
die "Could not create feature branch '$BRANCH'" die "Could not create feature branch '$BRANCH'"
fi fi
echo "How long do you think this feature will take (HH:MM:SS)?" echo "How long do you think this feature will take in hours (e.g 1.5)?"
read TIME_REQUIRED read TIME_REQUIRED
...@@ -231,7 +231,7 @@ cmd_start() { ...@@ -231,7 +231,7 @@ cmd_start() {
git add .gitignore git add .gitignore
git commit --allow-empty -m "Started working on $BRANCH on $(date) estimated Time $TIME_REQUIRED" git commit --allow-empty -m "--Flow message(start) -- Started working on $BRANCH on $(date) estimated Time $TIME_REQUIRED"
echo $(date +%s) >> ".timelog-feature-$NAME" echo $(date +%s) >> ".timelog-feature-$NAME"
...@@ -383,7 +383,7 @@ cmd_finish() { ...@@ -383,7 +383,7 @@ cmd_finish() {
FINALTIME=$((TOTAL_TIME/86400))" days "$(date -d "1970-01-01 + $TOTAL_TIME seconds" "+%H hours %M minutes %S seconds") FINALTIME=$((TOTAL_TIME/86400))" days "$(date -d "1970-01-01 + $TOTAL_TIME seconds" "+%H hours %M minutes %S seconds")
TOTAL_TIME_OFF=$((TOTAL_BREAK_TIME/86400))" days "$(date -d "1970-01-01 + $TOTAL_BREAK_TIME seconds" "+%H hours %M minutes %S seconds") TOTAL_TIME_OFF=$((TOTAL_BREAK_TIME/86400))" days "$(date -d "1970-01-01 + $TOTAL_BREAK_TIME seconds" "+%H hours %M minutes %S seconds")
git commit --allow-empty -m "$BRANCH was completed on $(date), total time taken:$FINALTIME expectde time was $TIME_EXPECTED, Time spent on breaks was $TOTAL_TIME_OFF" git commit --allow-empty -m "--Flow message(finish) --$BRANCH was completed on $(date), total time taken:$FINALTIME expectde time was $TIME_EXPECTED, Time spent on breaks was $TOTAL_TIME_OFF"
# when no merge conflict is detected, just clean up the feature branch # when no merge conflict is detected, just clean up the feature branch
...@@ -580,21 +580,24 @@ cmd_pause() { ...@@ -580,21 +580,24 @@ cmd_pause() {
parse_args "$@" parse_args "$@"
require_name_arg require_name_arg
# sanity checks local current_branch
require_branch "$BRANCH" local current_name
require_branch_absent "$BRANCH-paused"
echo $(date +%s) >> ".timelog-feature-$NAME" current_branch=$(git branch --no-color | grep '^\* ' | grep -v 'no branch' | sed 's/^* //g')
current_name=${current_branch//[^[:alnum:]]/}
LAST_LINE="$(wc -l < .timelog-feature-$NAME)"
echo $(date +%s) >> ".timelog-feature-$current_name"
LAST_LINE="$(wc -l < .timelog-feature-$current_name)"
PREV_LINE=$((LAST_LINE-1)) PREV_LINE=$((LAST_LINE-1))
LAST_TIME=$(sed "${LAST_LINE}q;d" .timelog-feature-$NAME) LAST_TIME=$(sed "${LAST_LINE}q;d" .timelog-feature-$current_name)
PREV_TIME=$(sed "${PREV_LINE}q;d" .timelog-feature-$NAME) PREV_TIME=$(sed "${PREV_LINE}q;d" .timelog-feature-$current_name)
TIME_USED=$((LAST_TIME-PREV_TIME)) TIME_USED=$((LAST_TIME-PREV_TIME))
echo "$TIME_USED" >> ".seconds-feature-$NAME" echo "$TIME_USED" >> ".seconds-feature-$current_name"
...@@ -602,22 +605,22 @@ cmd_pause() { ...@@ -602,22 +605,22 @@ cmd_pause() {
git add --all . git add --all .
git commit -m "$BRANCH/WIP" git commit -m "$current_branch/WIP"
git commit --allow-empty -m "$BRANCH/WIP time-paused:$(date), time taken thus far:$TIMESTAMP" git commit --allow-empty -m "--Flow message(pause) -- $current_branch/WIP time-paused:$(date), time taken thus far:$TIMESTAMP"
git checkout --orphan "$BRANCH-paused" git checkout -b "$current_branch-paused" "flopharn"
git reset -- * git reset -- *
echo echo
echo "Summary of actions:" echo "Summary of actions:"
echo "- Created orphan branch called '$BRANCH-paused'" echo "- Created orphan branch called '$current_branch-paused'"
echo "- You are now free to take a break, you have spent $TIMESTAMP in this session" echo "- You are now free to take a break, you have spent $TIMESTAMP in this session"
echo "" echo ""
echo "Now, have some coffee and when you are done, use:" echo "Now, have some coffee and when you are done, use:"
echo "" echo ""
echo " git flow feature resume $BRANCH" echo " git flow feature resume $current_name"
echo echo
} }
...@@ -627,44 +630,47 @@ cmd_interrupt() { ...@@ -627,44 +630,47 @@ cmd_interrupt() {
parse_args "$@" parse_args "$@"
require_name_arg require_name_arg
# sanity checks local current_branch
require_branch "$BRANCH" local current_name
require_branch_absent "$BRANCH-paused"
echo $(date +%s) >> ".timelog-feature-$NAME" current_branch=$(git branch --no-color | grep '^\* ' | grep -v 'no branch' | sed 's/^* //g')
current_name=${current_branch//[^[:alnum:]]/}
LAST_LINE="$(wc -l < .timelog-feature-$NAME)"
echo $(date +%s) >> ".timelog-feature-$current_name"
LAST_LINE="$(wc -l < .timelog-feature-$current_name)"
PREV_LINE=$((LAST_LINE-1)) PREV_LINE=$((LAST_LINE-1))
LAST_TIME=$(sed "${LAST_LINE}q;d" .timelog-feature-$NAME) LAST_TIME=$(sed "${LAST_LINE}q;d" .timelog-feature-$current_name)
PREV_TIME=$(sed "${PREV_LINE}q;d" .timelog-feature-$NAME) PREV_TIME=$(sed "${PREV_LINE}q;d" .timelog-feature-$current_name)
TIME_USED=$((LAST_TIME-PREV_TIME)) TIME_USED=$((LAST_TIME-PREV_TIME))
echo "$TIME_USED" >> ".seconds-feature-$NAME" echo "$TIME_USED" >> ".seconds-feature-$current_name"
touch .interrupt-feature-$NAME touch .interrupt-feature-$current_name
seconds=$TIME_USED; TIMESTAMP=$((seconds/86400))" days "$(date -d "1970-01-01 + $seconds seconds" "+%H hours %M minutes %S seconds") seconds=$TIME_USED; TIMESTAMP=$((seconds/86400))" days "$(date -d "1970-01-01 + $seconds seconds" "+%H hours %M minutes %S seconds")
git add --all . git add --all .
git commit -m "$BRANCH/WIP" git commit -m "$current_branch/WIP"
git commit --allow-empty -m "$BRANCH/WIP You were disturbed on $(date), time taken so far:$TIMESTAMP" git commit --allow-empty -m "--Flow message(interrupt) --$current_branch/WIP You were disturbed on $(date), time taken so far:$TIMESTAMP"
git checkout --orphan "$BRANCH-paused" git checkout -b "$current_branch-paused" "flopharn"
git reset -- * git reset -- *
echo echo
echo "Summary of actions:" echo "Summary of actions:"
echo "- Created orphan branch called '$BRANCH-paused'" echo "- Created orphan branch called '$current_branch-paused'"
echo "- You are now free to take a break, you have spent $TIMESTAMP in this session" echo "- You are now free to take a break, you have spent $TIMESTAMP in this session"
echo "" echo ""
echo "Now, have some coffee and when you are done, use:" echo "Now, have some coffee and when you are done, use:"
echo "" echo ""
echo " git flow feature resume $BRANCH" echo " git flow feature resume $current_branch"
echo echo
} }
...@@ -707,7 +713,7 @@ cmd_resume() { ...@@ -707,7 +713,7 @@ cmd_resume() {
git branch -D "$BRANCH-paused" git branch -D "$BRANCH-paused"
git commit --allow-empty -m "$BRANCH/Back to Work at:$(date) Time off:$TIME_OFF, Reason: $INTERRUPT_REASON" git commit --allow-empty -m "--Flow message(resume) --$BRANCH/Back to Work at:$(date) Time off:$TIME_OFF, Reason: $INTERRUPT_REASON"
echo $(date +%s) >> ".timelog-feature-$NAME" echo $(date +%s) >> ".timelog-feature-$NAME"
...@@ -719,7 +725,7 @@ cmd_resume() { ...@@ -719,7 +725,7 @@ cmd_resume() {
echo "" echo ""
echo "Remmember when you need a break use:" echo "Remmember when you need a break use:"
echo "" echo ""
echo " git flow feature pause $NAME" echo " git flow feature pause"
echo echo
} }
......
git-flow-init
View file @ 96182988
...@@ -52,6 +52,9 @@ cmd_default() { ...@@ -52,6 +52,9 @@ cmd_default() {
DEFINE_boolean defaults false 'use default branch naming conventions' d DEFINE_boolean defaults false 'use default branch naming conventions' d
parse_args "$@" parse_args "$@"
echo ".gitflow/" >> .gitignore
git_do commit .gitignore -m "gitignore"
if ! git rev-parse --git-dir >/dev/null 2>&1; then if ! git rev-parse --git-dir >/dev/null 2>&1; then
git_do init git_do init
else else
...@@ -239,6 +242,17 @@ cmd_default() { ...@@ -239,6 +242,17 @@ cmd_default() {
echo "How to name your supporting branch prefixes?" echo "How to name your supporting branch prefixes?"
fi fi
git config --global alias.start 'flow feature start'
git config --global alias.finish 'flow feature finish'
git config --global alias.fin 'flow feature finish'
git config --global alias.stop 'flow feature finish'
git config --global alias.resume 'flow feature resume'
git config --global alias.res 'flow feature resume'
git config --global alias.interrupt 'flow feature interrupt'
git config --global alias.int 'flow feature interrupt'
git config --global alias.pause 'flow feature pause'
git config --global alias.p 'flow feature pause'
local prefix local prefix
# Feature branches # Feature branches
...@@ -308,6 +322,14 @@ cmd_default() { ...@@ -308,6 +322,14 @@ cmd_default() {
[ "$answer" = "-" ] && prefix= || prefix=${answer:-$default_suggestion} [ "$answer" = "-" ] && prefix= || prefix=${answer:-$default_suggestion}
git_do config gitflow.prefix.versiontag "$prefix" git_do config gitflow.prefix.versiontag "$prefix"
fi fi
mkdir .gitflow
git checkout --orphan flopharn
find . -path ./.git -prune -o \( \! -path ./.gitflow \) -exec rm -rf {} \; 2> /dev/null
echo ".gitflow/" >> .gitignore
git add .
git commit -m "flopharn was created successfully"
git checkout $develop_branch
# TODO: what to do with origin? # TODO: what to do with origin?
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment