-
Notifications
You must be signed in to change notification settings - Fork 21
/
odoo-repos-merge-branch.sh
executable file
·121 lines (105 loc) · 4.16 KB
/
odoo-repos-merge-branch.sh
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
#!/bin/bash
if [ -z "$HOME" ]; then
echo "ERROR: Instalation error, HOME is not defined"
exit 1
fi
show_help() {
echo "ERROR: $2"
echo "Usage: $0 <repo> <pr> <remote> <remote_url> <remote_branch>"
exit $1
}
if [ ! $# -eq 5 ]; then
show_help 1 "Bad params"
fi
repo="$1"
show_error() {
local error=$1
local output=$2
echo "ERROR: $error";
if [ -n "$output" ] && [ -f $output ]; then
echo "----------------------------------------------------------------"
cat $output
echo "----------------------------------------------------------------"
rm -rf $output
fi
}
merge_branch() {
local name=$1
local pr=$2
local merge_remote=$3
local merge_remote_url=$4
local merge_remote_branch=$5
local error=0
local temp=/tmp/odoo_repos_merge_branch.$$.tmp
git -C $(pwd)/$name symbolic-ref HEAD > $temp 2>&1
error=$?; if [ $error -ne 0 ]; then printf "%-28s - " "$name"; show_error "No HEAD ref"; return $error; fi
local head=$(cat $temp)
local branch=$(expr $head : 'refs/heads/\(.*\)')
local remote=$(git -C $(pwd)/$name config branch.$branch.remote)
local remote_branch=$(expr $(git -C $(pwd)/$name config branch.$branch.merge) : 'refs/heads/\(.*\)')
local status=''
git -C $(pwd)/$name status --porcelain > $temp 2>&1
if [ -n "$(cat $temp)" ]; then status='DIRTY'; fi
if [ "$status" == 'DIRTY' ]; then
show_error "$name is dirty" $temp
elif ! echo "$branch" | egrep -q "^merge"; then
show_error "$name is not in a merge branch. Run 'odoo-repos-merge-start' first"
elif [ -z "$remote" ] || [ -z "$remote_branch" ]; then
show_error "$name has no tracking branch: remote = '$remote', remote_branch = '$remote_branch'"
else
printf "%-28s - Merging branch: [%s] %s/%s\n" "$name" "$pr" "$merge_remote" "$merge_remote_branch"
local new_branch="${branch}_${pr}"
if ! git -C $(pwd)/$name remote | egrep -q "^$merge_remote\$"; then
echo -n " - Adding remote '$merge_remote' ($merge_remote_url) ... "
git -C $(pwd)/$name remote add $merge_remote $merge_remote_url > $temp 2>&1
error=$?; if [ $error -ne 0 ]; then show_error $error $temp; return $error; fi
echo "OK"
fi
echo -n " - Fetch remote '$merge_remote' ... "
git -C $(pwd)/$name fetch $merge_remote > $temp 2>&1
error=$?; if [ $error -ne 0 ]; then show_error $error $temp; return $error; fi
if ! git -C $(pwd)/$name branch -a --no-color | egrep -q "remotes/$merge_remote/$merge_remote_branch\$"; then
show_error "Branch remotes/$merge_remote/$merge_remote_branch not found" $temp; return 3
fi
echo "OK"
if git -C $(pwd)/$name branch -l --no-color | egrep -q " $new_branch\$"; then
echo -n " - Removing branch '$new_branch' ... "
git -C $(pwd)/$name branch -D $new_branch > $temp 2>&1
error=$?; if [ $error -ne 0 ]; then show_error $error $temp; return $error; fi
echo "OK"
fi
echo -n " - Renaming branch '$branch' to '$new_branch' ... "
git -C $(pwd)/$name branch -m $new_branch > $temp 2>&1
error=$?; if [ $error -ne 0 ]; then show_error $error $temp; return $error; fi
echo "OK"
echo -n " - Merging '$merge_remote/$merge_remote_branch' ... "
git -C $(pwd)/$name merge --no-edit $merge_remote/$merge_remote_branch > $temp 2>&1
error=$?; if [ $error -ne 0 ]; then show_error $error $temp; return $error; fi
echo "OK"
fi
rm -rf $temp
}
odoo_merge_branch() {
cd $HOME
if [ -d $HOME/OCB/.git ]; then
merge_branch OCB ${@:2}
elif [ -d $HOME/odoo/.git ]; then
merge_branch odoo ${@:2}
elif [ -d $HOME/openerp/.git ]; then
merge_branch openerp ${@:2}
fi
}
if [ "$repo" == 'odoo' ]; then
odoo_merge_branch $@
elif [ -d $HOME/repos/$repo/.git ]; then
cd $HOME/repos
merge_branch $@
elif [ -d $HOME/$repo/.git ]; then
cd $HOME
merge_branch $@
elif [ -d $repo/.git ]; then
cd $(dirname $repo)
merge_branch $(basename $repo) ${@:2}
else
show_help 2 "Repo '$repo' not found"
fi