-
Notifications
You must be signed in to change notification settings - Fork 6
/
omgf
1239 lines (1139 loc) · 35.3 KB
/
omgf
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
#!/usr/bin/env bash
shopt -s extglob
set -u
# shellcheck disable=SC2086
: ${OMGF_DATAPATH:=.}
# shellcheck disable=SC2086
: ${OMGF_CHANGELOG:=CHANGELOG.md}
# shellcheck disable=SC2086
: ${OMGF_VERSION:=VERSION}
# shellcheck disable=SC2086
: ${OMGF_DEV:=dev}
# shellcheck disable=SC2086
: ${OMGF_ORIGIN:=origin}
# shellcheck disable=SC2086
: ${OMGF_UPSTREAM:=$OMGF_ORIGIN}
# shellcheck disable=SC2086
: ${OMGF_CHANGELOG_HEADER:=# Change Log
All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).}
# shellcheck disable=SC2086
: ${OMGF_NOPREFIX:=}
: ${COLUMNS:=$(tput cols)}
: ${LINES:=$(tput lines)}
function main {
function msg_start {
[[ $verbose -eq 0 ]] && return
if stdoutpipe || [[ $COLUMNS -lt 41 ]]; then
echo -n "$1" && return 0
fi
echo -n "[ "
save_cursor_position
echo " .... ] $1"
}
function msg_end {
[[ $verbose -eq 0 ]] && return
if stdoutpipe || [[ $COLUMNS -lt 41 ]]; then
echo " [ $1 ]" && return 0
fi
set_cursor_position
echo "$1"
}
function stdout_silent {
[[ $verbose == 0 ]] && exec 5<&1 && exec 1>/dev/null
return 0
}
function stdout_verbose {
[[ $verbose == 0 ]] && exec 1<&5
return 0
}
function err {
echo "$(basename "${0}")[error]: $*" >&2
return 1
}
function setcolor {
local c
c=${1:-always}
case $c in
always|never|auto)
color=$c
return 0
;;
esac
return 2
}
function stdoutpipe {
readlink /proc/$$/fd/1 | grep -q "^pipe:"
}
function colorize {
[[ $color == never ]] && echo -n "$1" && return
[[ $color == auto ]] && stdoutpipe && echo -n "$1" && return
local c
c="${2:-$GREEN}"
tput setaf "$c"
echo -n "$1"
tput sgr0
}
function clear_stdin {
while read -r -t 0; do read -r; done
}
function save_cursor_position {
local curpos oldstty
curpos="1;1"
exec < /dev/tty
oldstty=$(stty -g)
stty raw -echo min 0
echo -en "\033[6n" >/dev/tty
# shellcheck disable=SC2162
read -d"R" curpos </dev/tty
stty "$oldstty"
pos_x=$( echo "${curpos#??}" | cut -d";" -f1 )
pos_y=$( echo "${curpos#??}" | cut -d";" -f2 )
}
function set_cursor_position {
[[ "$pos_x" == "$LINES" ]] && : $(( pos_x-- ))
tput cup $(( pos_x-1 )) $(( pos_y-1 ))
}
function strtolower {
echo "$1" | tr '[:upper:]' '[:lower:]'
}
function trim {
echo "$1" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//'
}
function confirm {
[[ $yes == 1 ]] && return 0
if [[ $is_stdin == 0 ]]; then
stdout_verbose
echo -n "${1:-"Are you sure?"} [YES/No] "
save_cursor_position
clear_stdin
read -r
[[ -z "$REPLY" ]] && set_cursor_position && echo "yes"
stdout_silent
else
read -r
fi
[[ "$REPLY" =~ ^y(es)?$ || -z "$REPLY" ]] && return 0
[[ "$REPLY" =~ ^no?$ ]] && return 1
confirm "Type"
}
function git_status_empty {
[[ -z "$(git status --porcelain)" ]] \
|| err "Uncommitted changes"
}
# make git return only error to stderr
function git_checkout {
local out
out="$(git checkout "$@" 2>&1)" \
|| err "$out"
}
# make git return only error to stderr
function git_fetch {
msg_start "Fetching $*"
local out
out="$(git fetch --update-head-ok "$@" 2>&1)" \
|| err "$out" \
|| return 1
msg_end "$DONE"
}
# make git return only error to stderr
function git_tag {
local out
out="$(git tag "$@" 2>&1)" \
|| err "$out"
}
# make git return only error to stderr
function git_merge {
local out
out="$(git merge "$@" 2>&1)" \
|| err "$out"
}
function git_push {
msg_start "Pushing $*"
local out
out="$(git push "$@" 2>&1)" \
|| err "$out" \
|| return 1
msg_end "$DONE"
}
function git_checkout_branch {
msg_start "Creating branch '$1'"
git_checkout -b "$1" || return 1
msg_end "$DONE"
}
function git_branch_create {
local to
to="${2:-HEAD}"
git_remote_branch_exists "$1" \
&& to="$OMGF_ORIGIN/$1"
msg_start "Creating branch '$1' on '$to'"
git branch "$1" "$to" >/dev/null
msg_end "$DONE"
}
function git_branch_exists {
git_local_branch_exists "$1" && return
git_remote_branch_exists "$1"
}
function git_local_branch_exists {
git rev-parse --verify "$1" >/dev/null 2>&1
}
function git_remote_branch_exists {
git ls-remote --heads "$OMGF_ORIGIN" 2>/dev/null | grep -q "$REFSHEADS/$1"$
}
function git_tag_exists {
git tag | grep -q "^$1"
}
function git_tag_here {
git tag --points-at HEAD | grep -q "^$1$"
}
function git_repo_exists {
[[ -d .git ]]
}
function git_remote_exists {
git config remote."$OMGF_ORIGIN".url >/dev/null \
|| err "Remote url for '$OMGF_ORIGIN' does not exist" \
|| return 1
}
function git_commit_diff {
[[ "$( git rev-parse "$1" )" != "$( git rev-parse "$2" )" ]]
}
function git_version_diff {
[[ "$(git show "$1":"$OMGF_VERSION" | cut -d. -f1-2)" != "$2" ]]
}
function git_current_branch {
git rev-parse --abbrev-ref HEAD
}
function git_current_commit {
git rev-parse HEAD
}
function git_stash {
git_status_empty 2>/dev/null && return 0
msg_start "Stashing files"
git add -A >/dev/null || return 1
git stash >/dev/null || return 1
if git_status_empty 2>/dev/null; then
stashed=1
msg_end "$DONE"
else
msg_end "$FAIL"
return 1
fi
}
function git_stash_pop {
[[ $stashed == 0 ]] && return 0
msg_start "Popping stashed files"
git stash pop >/dev/null || { msg_end "$FAIL"; return 1; }
msg_end "$DONE"
}
function git_has_commits {
git log >/dev/null 2>&1
}
function additional_commits {
git log "$1".."${2:-$gf_branch}"
}
function merge_branches {
local prev_branch
prev_branch="$(git_current_branch)"
msg_start "Merging '$1' into branch '$2'"
[[ -z "$(additional_commits "$2" "$1")" ]] \
&& msg_end "$SKIP" \
&& return
# $4 can be --no-commit if explicitly given
git_checkout "$2" \
&& { git_merge "${3:---no-ff}" "${4:---commit}" "$1" || return 5; } \
&& { [[ -n "${4:-}" ]] || git_checkout "$prev_branch"; } \
&& msg_end "$DONE"
}
function delete_gf_branch {
[[ "$(git_current_branch)" != "$gf_branch" ]] \
|| git_checkout "$OMGF_DEV" \
|| return $?
if git_remote_branch_exists "$gf_branch"; then
msg_start "Deleting remote branch '$gf_branch'"
local out
out="$(git push "$OMGF_ORIGIN" ":$REFSHEADS/$gf_branch" 2>&1)" \
|| err "$out" \
|| return 1
msg_end "$DONE"
fi
msg_start "Deleting local branch '$gf_branch'"
git branch -d "$gf_branch" >/dev/null || return 1
msg_end "$DONE"
}
function load_version {
[[ -f "$OMGF_VERSION" ]] \
|| err "Version file not found" \
|| return 3
[[ -n "$(cat "$OMGF_VERSION")" ]] \
|| err "Version file is empty" \
|| return 3
[[ "$(cat "$OMGF_VERSION")" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] \
|| err "Invalid version file content format" \
|| return 1
IFS=. read -r major minor patch < "$OMGF_VERSION" \
|| err "Unable to load version" \
|| return 1
master=$prefix$major.$minor
gf_branch="$(git_current_branch)"
}
function master_last_change {
git cherry -v "$OMGF_DEV" master | tail -n1 | cut -d" " -f2
}
# $1 filepath
# $2 default content
# $3 allow empty file
function init_file {
[[ -f "$1" ]] && return 0
[[ -z "$1" && $3 == 1 ]] && return 0
local or_empty_msg
or_empty_msg=
[[ $3 == 0 ]] && or_empty_msg=" or empty"
[[ $conform == 1 ]] \
|| err "Missing$or_empty_msg file '$1'" \
|| return 3
local message
message="Initializing '$1' file"
msg_start "$message"
echo "$2" > "$1" || return 1
git add "$1" >/dev/null \
&& git commit -m "$message" >/dev/null \
|| return 1
msg_end "$DONE"
}
function initial_commit {
git_status_empty 2>/dev/null && return 0
msg_start "Initial commit"
git add -A >/dev/null \
&& git commit -m "Commit initial files" >/dev/null \
|| err "Unable to commit existing files" \
|| return 1
msg_end "$DONE"
}
function parse_version {
echo "$1" | sed -n 's/.*\([0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/p'
}
function verlte {
[ "$1" = "$(echo -e "$1\n$2" | sort -V | head -n1)" ]
}
function validate_requirements {
bash_min_version=3.2
git_min_version=1.8.0
bash_version="$(parse_version "$(bash --version 2>/dev/null)")"
git_version="$(parse_version "$(git --version 2>/dev/null)")"
verlte "$bash_min_version" "$bash_version" \
|| err "OMGF requires Bash version $bash_min_version or later (you have ${bash_version:-no Bash installed})" \
|| return 1
verlte "$git_min_version" "$git_version" \
|| err "OMGF requires Git version $git_min_version or later (you have ${git_version:-no Git installed})" \
|| return 1
}
# 1) validate repository existence
# 2) validate repository consistency:
# - at least one commit
# - master branch
function validate_git_repository {
if ! git_repo_exists; then
[[ $conform == 0 ]] && { err "Git repository does not exist" || return 3; }
msg_start "Initializing git repository"
git init >/dev/null || return 1
msg_end "$DONE"
fi
if ! git_has_commits; then
[[ $conform == 0 ]] && { err "Git repository without commits" || return 3; }
initial_commit || return $?
elif ! git_local_branch_exists master; then
[[ $conform == 0 ]] && { err "Missing branch 'master'" || return 3; }
git_branch_create master || return 1
fi
}
# validate $OMGF_VERSION and $OMGF_HANGELOG files
function validate_gf_files {
init_file "$OMGF_VERSION" "0.0.0" 0 \
&& init_file "$OMGF_CHANGELOG" "$OMGF_CHANGELOG_HEADER" 1 \
&& load_version \
|| return $?
}
# validate tag on ($)master
function validate_master_tag {
if ([[ $1 == master ]] || [[ $1 == "$master" ]]) && ! git_tag_here "$master.$patch"; then
[[ $conform == 0 ]] && { err "Missing tag '$master.$patch' on current HEAD" || return 3; }
git_tag "$master.$patch";
fi
}
# 1) validate $OMGF_DEV branch
# 2) validate $OMGF_DEV is up to date with master
function validate_dev {
if ! git_local_branch_exists "$OMGF_DEV"; then
[[ $conform == 0 ]] && { err "Missing branch '$OMGF_DEV'" || return 3; }
git_branch_create dev master || return 1
fi
local last_change
last_change="$(master_last_change)"
if [[ -n "$last_change" ]] && ! git branch --contains "$last_change" | grep -q "$OMGF_DEV"; then
[[ $conform == 0 ]] && { err "Branch master is not merged with '$OMGF_DEV'" || return 3; }
merge_branches "$last_change" "$OMGF_DEV" || return $?
fi
}
# validate git status
function validate_status_empty {
if [[ $force == 1 ]]; then
git_stash || return $?
else
git_status_empty || return 4
fi
}
function validate_changelog_heading {
grep -qE "^# " "$OMGF_CHANGELOG" && return 0
[[ "$conform" == 1 ]] \
|| err "File $OMGF_CHANGELOG missing '# Heading'" \
|| return 3
local msg
msg="Add default heading to $OMGF_CHANGELOG"
msg_start "$msg"
echo -e "$OMGF_CHANGELOG_HEADER\n$(cat "$OMGF_CHANGELOG")" > "$OMGF_CHANGELOG" \
&& git commit -am "$msg" >/dev/null \
|| return 1
msg_end "$DONE"
}
function gf_validate {
validate_requirements || return $?
validate_git_repository || return $?
validate_gf_files || return $?
validate_master_tag "$gf_branch" || return $?
validate_dev || return $?
validate_status_empty || return $?
validate_changelog_heading || return $?
# load and validate user params
[[ $arg_count -gt 2 ]] \
&& { err "Wrong number of parameters" || return 1; }
if [[ $arg_count -eq 2 ]]; then
par_kw="$par1"
par_name="$par2"
is_gf_keyword "$par_kw" \
|| err "Parameter '$par_kw' is not a valid keyword" \
|| return 1
elif [[ $arg_count == 1 ]]; then
if is_gf_keyword "$par1"; then par_kw="$par1"
else par_name="$par1"; fi
fi
[[ -z "$par_name" ]] && return 0
git check-ref-format "$REFSHEADS/$par_name" \
|| err "Invalid branch name format" \
|| return 1
}
function is_gf_keyword {
[[ "$1" == "$HOTFIX" || "$1" == "$RELEASE" || "$1" == "$FEATURE" || "$1" == "$PULL" || "$1" == "$PUSH" ]]
}
# Get free branch name (increment suffix)
# Eg. when branch "$HOTFIX-john" and "$HOTFIX-john-1" already exists
# then for param "$HOTFIX-john" return "$HOTFIX-john-2"
function get_branch_name {
local count
local branch
branch="$1"
count="${2:-}"
[[ -z "$count" ]] \
&& ! git_branch_exists "$branch" \
&& echo "$branch" \
&& return
[[ -z "$count" ]] && count=1
git_branch_exists "$branch-$count" \
&& get_branch_name "$branch" $(( ++count )) \
|| echo "$branch-$count"
}
function prefix_branch {
local kw name
kw="${1:-}"
name="${2:-}"
[[ -n "$kw" ]] \
|| err "prefix_branch: missing kw param" \
|| return 1
[[ "$name" == "$kw-"* ]] \
&& echo "$name" \
&& return
# [[ "$name" == "$kw" ]] ?
[[ -z "$name" ]] && name="$(id -u -n | tr '[:upper:]' '[:lower:]')"
get_branch_name "$kw-$name"
}
function create_stable_branch {
git_commit_diff "$gf_branch" master \
|| { git_checkout master; return $?; }
if git_branch_exists "$master"; then
git_commit_diff "$gf_branch" "$master" \
|| { git_checkout "$master"; return $?; }
fi
git_checkout_branch "$master" || return 1
}
function gf_process {
# explicit init
[[ $init == 1 ]] \
&& git_checkout "$OMGF_DEV" \
&& return 0
local branch_name
# action according to current branch
if [[ $arg_count -eq 0 ]]; then
case "${gf_branch%%-*}" in
HEAD|master|$prefix+([0-9]).+([0-9]))
branch_name="$(prefix_branch "$HOTFIX" "$(strtolower "$(whoami)")" )"
gf_hotfix "$branch_name"
;;
$OMGF_DEV)
branch_name="$(prefix_branch "$FEATURE" "$(strtolower "$(whoami)")" )"
gf_feature "$branch_name"
;;
$FEATURE) gf_merge_feature "$gf_branch" ;;
$RELEASE) gf_merge_release ;;
$HOTFIX) gf_merge_hotfix "$gf_branch" ;;
*) err "Current branch '$gf_branch' is not recognized" || return 1 ;;
esac
return $?
fi
# action according to given kw
if [[ $arg_count -eq 1 && -n "$par_kw" ]]; then
branch_name="$(prefix_branch "$par_kw" "$(strtolower "$(whoami)")" )"
case "$par_kw" in
$HOTFIX) gf_hotfix "$branch_name" ;;
$RELEASE)
if [[ "$gf_branch" == "$RELEASE" ]]; then
gf_release_release
return $?
fi
gf_release
;;
$FEATURE) gf_feature "$branch_name";;
$PULL) gf_pull ;;
$PUSH) gf_push ;;
esac
return $?
fi
# action according to given name and kw
if [[ -z "$par_kw" ]]; then
case "${gf_branch%%-*}" in
HEAD|master|$prefix+([0-9]).+([0-9])|$RELEASE|$HOTFIX) par_kw="$HOTFIX" ;;
$OMGF_DEV|$FEATURE) par_kw="$FEATURE" ;;
*) err "Current branch '$gf_branch' is not recognized" || return 1 ;;
esac
fi
case "$par_kw" in
$HOTFIX) gf_hotfix "$par_kw" "$par_name" ;;
$FEATURE) gf_feature "$par_kw-$par_name";;
*) err "'$par_kw' with second parameter is not supported" || return 1 ;;
esac
return $?
}
function gf_checkout {
local branch
branch="$1"
msg_start "Checkout '$branch'"
[[ "$(git_current_branch)" == "$branch" ]] && msg_end "$SKIP" && return 0
git_checkout "$branch" || return $?
msg_end "$DONE"
}
function gf_confirm_checkout {
local msg
# shellcheck disable=SC2016
msg="${2:-* Branch '$1' already exists, checkout?}"
confirm "$msg" || return 1
gf_checkout "$1"
}
function gf_release {
if git_branch_exists "$RELEASE"; then
gf_confirm_checkout "$RELEASE"
return $?
fi
local last_merge valid_commits confirmed
confirmed=0
last_merge="$(git reflog show dev --format="%h:%gs" | grep -m1 ":merge release:" | cut -d: -f1)"
# commits on dev before last release merge
valid_commits="$(git reflog show dev --format="%H")"
[[ -n "$last_merge" ]] && valid_commits="$(echo "$valid_commits" | sed "/$last_merge/Q")"
# on invalid commit?
if ! echo "$valid_commits" | grep -q "$(git_current_commit)"; then
gf_confirm_checkout "$OMGF_DEV" "* Unable to create '$RELEASE' from current commit, create '$RELEASE' from '$OMGF_DEV'?" \
|| return 1
confirmed=1
fi
# HEAD and master has no diff, nothing to do
[[ -n "$(git diff HEAD master)" ]] \
|| err "Current HEAD is same as branch 'master', nothing to do" \
|| return 1
[[ $confirmed == 0 ]] \
&& { confirm "* Create branch '$RELEASE' from current HEAD?" || return 0; }
git_checkout_branch "$RELEASE"
((minor++))
patch=0
gf_commit_version \
&& load_version \
&& gf_update_changelog_header
}
function gf_feature {
local feature_name
feature_name="$1"
if git_branch_exists "$feature_name"; then
gf_confirm_checkout "$feature_name"
return $?
fi
confirm "* Create branch '$feature_name' from branch '$OMGF_DEV'?" || return 0
git_checkout_branch "$feature_name"
}
function gf_hotfixable {
git_commit_diff "$master.$patch" HEAD \
&& { err "Required tag $master.$patch not detected on current HEAD" || return 1; }
}
function gf_hotfix {
local hotfix_name to
if [ -n "${2:-}" ]; then
if echo "$2" | grep -q "^$prefix[0-9]\+\.[0-9]\+$"; then
master="$2"
hotfix_name="$(prefix_branch "$par_kw" "$(strtolower "$(whoami)")" )"
else
hotfix_name="$1-$2"
fi
else
hotfix_name="$1"
fi
to="$( git tag | grep -e ^"$master". | sort -V | tail -n1 )"
[ -z "$to" ] && to="master"
if git_branch_exists "$hotfix_name"; then
gf_confirm_checkout "$hotfix_name"
return $?
fi
confirm "* Create hotfix '$hotfix_name' from '$to'?" || return 0
gf_checkout "$to" \
&& load_version \
|| return $?
if [[ "$gf_branch" != master ]]; then
create_stable_branch || return $?
fi
git_checkout_branch "$hotfix_name" || return $?
}
function gf_merge_release {
confirm "* Merge '$RELEASE' branch into '$OMGF_DEV'?" || return 0
merge_branches "$gf_branch" "$OMGF_DEV" || return $?
}
function gf_release_release {
local confirm_suffix
[[ $request == 1 ]] && confirm_suffix="$pr_suffix" || confirm_suffix=
confirm "* Create stable branch from release$confirm_suffix?" || return 0
merge_branches master "$gf_branch" || return $?
[[ $request == 1 ]] && { gf_request master; return $?; }
git_checkout master \
&& merge_branches "$gf_branch" "$OMGF_DEV" \
&& merge_branches "$gf_branch" master \
&& git_tag "$master".0 \
&& delete_gf_branch \
&& git_checkout "$OMGF_DEV" \
|| return $?
}
function gf_get_compare_url {
url="$(git config remote."$OMGF_ORIGIN".url)"
url="$(trim_url "$url")"
case "$url" in
*"$GITHUB"*) echo "https://$url/compare/$1...$2" ;;
*"$BITBUCKET"*) echo "https://$url/compare/$2..$1" ;;
*) echo "" ;;
esac
}
function gf_update_changelog_header {
local header tmpfile compare_url prev_tag
msg_start "Updating version history header"
header="## [$major.$minor.$patch] - $(date "+%Y-%m-%d")"
prev_tag="$(git tag | sort -V | tail -n1 )"
compare_url="$(gf_get_compare_url "$prev_tag" "$master.$patch" )"
[[ -n "$compare_url" ]] \
&& compare_url="[$major.$minor.$patch]: $compare_url" \
|| compare_url="[$major.$minor.$patch]: $prev_tag..$master.$patch"
tmpfile="$(mktemp)"
gawk -v header="$header" -v compare_url="$compare_url" '
BEGIN {
writemsg=1
writeurl=1
}
/^\[Unreleased\]/ { next }
writemsg == 1 && /^## / {
print header
writemsg=0
if($0 ~ "^## \\[?Unreleased\\]?") { next }
print ""
}
writeurl == 1 && /^\[/ && ! /^\[Unreleased\]/ {
print compare_url
writeurl=0
}
{print}
ENDFILE {
if(writemsg==1) { print header }
if(writeurl==1) { print ""; print compare_url }
}
' "$OMGF_CHANGELOG" > "$tmpfile"
cat "$tmpfile" > "$OMGF_CHANGELOG"
git commit -am "Update $OMGF_CHANGELOG header" >/dev/null || return 1
msg_end "$DONE"
}
function gf_write_changelog_line {
local tmpfile compare_url
tmpfile="$(mktemp)"
compare_url="$(gf_get_compare_url master "$OMGF_DEV")"
[[ -n "$compare_url" ]] \
&& compare_url="[Unreleased]: $compare_url" \
|| compare_url="[Unreleased]: master..$OMGF_DEV"
gawk -v keyword="$1" -v next_keywords="$2" -v message="$3" -v compare_url="$compare_url" '
function print_unreleased () { print "## [Unreleased]" }
function print_keyword () { print "### " keyword }
function print_message () { print " - " message }
BEGIN {
writemsg=1
unreleased=0
writeurl=1
}
/^## \[?Unreleased\]?/ { unreleased=1 }
writemsg == 1 && unreleased == 0 && /^## / && ! /^## \[?Unreleased\]?/ {
print_unreleased()
print_keyword()
print_message()
print ""
writemsg=0
}
writemsg == 1 && $0 ~ "^## " next_keywords && ! /^## \[?Unreleased\]?/ {
print_keyword()
print_message()
print ""
writemsg=0
}
/^\[Unreleased\]/ { writeurl=0 }
writeurl == 1 && /^\[/ {
print compare_url
writeurl=0
}
{print}
writemsg == 1 && $0 == "### " keyword {
print_message()
writemsg=0
}
ENDFILE {
if(writemsg == 1) {
print ""
if(unreleased == 0) { print_unreleased() }
print_keyword()
print_message()
}
if(writeurl==1) { print compare_url }
}
' "$OMGF_CHANGELOG" > "$tmpfile"
cat "$tmpfile" > "$OMGF_CHANGELOG"
}
function gf_update_changelog {
local commits
commits="$(git log "$OMGF_DEV".."$gf_branch" --pretty=format:"* %h %s")"
stdout_verbose
echo
echo "***"
echo "* Please enter the $gf_branch description for $OMGF_CHANGELOG."
echo "*"
echo "* Keywords:"
echo "* $(echo "${CHANGELOG_KEYWORDS[@]}" | sed "s/ /, /g;s/${CHANGELOG_KEYWORDS[$1]}/${CHANGELOG_KEYWORDS[$1]} (default)/")"
echo "*"
echo "* Commits of '$gf_branch':"
echo "$commits"
echo "*"
REPLY=
if [[ $is_stdin == 0 ]]; then
echo "Type \"Keyword: Message\", empty line to end:"
clear_stdin
fi
local message keyword next_keywords i found
while read -e -r message; do
[[ -z "$message" ]] && break
history -s "$message"
keyword="$(trim "$(echo "$message" | cut -sd':' -f1)")"
next_keywords=
found=0
i=
if [[ -n "$keyword" ]]; then
for i in "${!CHANGELOG_KEYWORDS[@]}"; do
[[ "${CHANGELOG_KEYWORDS[i]}" != "$keyword"* ]] && continue
keyword="${CHANGELOG_KEYWORDS[i]}"
found=1
break
done
if [[ "$found" == 0 ]]; then
echo "'$keyword' is not a valid keyword"
continue
fi
else
i=$1
keyword="${CHANGELOG_KEYWORDS[$i]}"
fi
for ((index="$i+1"; index < ${#CHANGELOG_KEYWORDS[@]}; index++)); do
next_keywords="$next_keywords|^### ${CHANGELOG_KEYWORDS[index]}"
done
[[ "$found" == 1 ]] && message="$(echo "$message" | cut -d':' -f2-)"
gf_write_changelog_line "$keyword" "$next_keywords" "$(trim "$message")"
done
stdout_silent
msg_start "Updating version history"
if ! git_status_empty 2>/dev/null; then
git commit -am "Update $OMGF_CHANGELOG" >/dev/null || return 1
msg_end "$DONE"
else
msg_end "$SKIP"
fi
}
function gf_merge_feature {
[[ -n "$(additional_commits "$OMGF_DEV")" ]] \
|| err "Nothing to merge - feature branch '$gf_branch' is empty" \
|| return 1
local confirm_suffix
[[ $request == 1 ]] && confirm_suffix="$pr_suffix" || confirm_suffix=
confirm "* Merge feature '$gf_branch' into '$OMGF_DEV'$confirm_suffix?" || return 0
merge_branches "$OMGF_DEV" "$gf_branch" \
&& gf_update_changelog 0 \
|| return $?
[[ $request == 1 ]] \
&& { gf_request "$OMGF_DEV"; return $?; }
merge_branches "$gf_branch" "$OMGF_DEV" \
&& git_checkout "$OMGF_DEV" \
&& delete_gf_branch \
|| return $?
}
function gf_prepare_to_merge {
local ver
ver="$(git show "$1":"$OMGF_VERSION")"
# get and commit VERSION from master
msg_start "Updating version number from '$1'"
if [[ "$ver" != "$major.$minor.$patch" ]]; then
echo "$ver" > "$OMGF_VERSION"
git commit -am "Update $OMGF_VERSION from '$1'" >/dev/null || return 1
msg_end "$DONE"
else
msg_end "$SKIP"
fi
load_version
merge_branches "$1" "$gf_branch"
}
function gf_commit_version {
msg_start "Increment version number to '$major.$minor.$patch'"
echo "$major.$minor.$patch" > "$OMGF_VERSION"
git commit -am "Increment version number" >/dev/null || return 1
msg_end "$DONE"
}
function gf_merge_hotfix {
local confirm_suffix into
[[ $request == 1 ]] && confirm_suffix="$pr_suffix" || confirm_suffix=
# master -> merge hotfix into master and dev
if ! git_version_diff master "$major.$minor"; then
into=master
confirm "* Merge hotfix into master and '$OMGF_DEV'$confirm_suffix?" || return 0
else
into="$master"
confirm "* Merge hotfix into stable branch '$master'$confirm_suffix?" || return 0
fi
if [[ -n "$(additional_commits "$into")" ]]; then
gf_prepare_to_merge "$into" \
&& patch=$((patch+1)) \
&& gf_commit_version \
&& gf_update_changelog 4 \
&& gf_update_changelog_header \
|| return $?
[[ $request == 1 ]] && { gf_request "$into"; return $?; }
merge_branches "$gf_branch" "$into" \
&& git_checkout "$into" \
&& git_tag "$master.$patch" \
|| return $?
fi
[[ $request == 1 ]] && { gf_request "$into"; return $?; }
if [[ "$into" == master ]]; then
# ignore changes in VERSION file iff conflict occured
if git_branch_exists "$RELEASE"; then
gf_version_ignore_merge "$OMGF_DEV" \
&& gf_version_ignore_merge "$RELEASE" \
|| return $?
else
merge_branches "$gf_branch" "$OMGF_DEV" || return $?
fi
fi
delete_gf_branch
}
function gf_version_ignore_merge {
local ecode
[[ -z "$(additional_commits "$1")" ]] \
&& return
merge_branches "$gf_branch" "$1" "--no-ff" "--no-commit"
ecode=$?
# ignore version iff conflict occurred
if [[ $ecode == 5 ]]; then
git reset "$OMGF_VERSION" >/dev/null \
&& git_checkout "$OMGF_VERSION" \
|| return $?
fi
# no conflicts, proceed merge
if [[ $ecode == 0 ]]; then
git commit -am "Merge branch '$gf_branch' into $1" >/dev/null \
&& git_checkout "$gf_branch" \
|| return $?
fi
return $ecode
}
function gf_pull_branch {
git_remote_branch_exists "$1" \
|| return
git_fetch "$OMGF_ORIGIN" "$1:$1"
}
function gf_pull {
git_remote_exists \
&& git_fetch --tags \
&& gf_pull_branch "$OMGF_DEV" \
&& gf_pull_branch master \
&& gf_pull_branch "$RELEASE" \
|| return $?
local stable
for stable in $(git branch -r | grep 'origin/' | grep -o 'v[0-9]\+\.[0-9]\+'); do
gf_pull_branch "$stable" \
|| return $?
done
}
function gf_push {
git_remote_exists \
&& git_push --tags \
&& git_push "$OMGF_ORIGIN" "$OMGF_DEV" \
&& git_push "$OMGF_ORIGIN" master \
|| return $?
git_local_branch_exists "$RELEASE" \
&& { git_push "$OMGF_ORIGIN" "$RELEASE" || return $?; }
for stable in $(git branch -r | grep 'origin/' | grep -o 'v[0-9]\+\.[0-9]\+'); do
git_local_branch_exists "$stable" \
&& { git_push "$OMGF_ORIGIN" "$stable" || return $?; }
done
}
function gf_request {
git_remote_exists \
&& { [[ "$OMGF_ORIGIN" != "$OMGF_UPSTREAM" ]] || git_push "$OMGF_ORIGIN" "$1"; } \
&& git_push "$OMGF_ORIGIN" "$gf_branch" \
&& gf_request_url "$1" \
|| return $?
}