blob: a2b3c811609a6459fee7e08694840a91ae0cba88 (
plain)
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
|
#!/bin/bash -euE
# when $gitmode is true, $ibranch's commits are used as IDs
gitmode=true
tag='git-rewrite-id'
ibranch=''
obranch=''
wbranch=''
usage() {
echo 'malformed call to internal function'
}
verbose() {
: "$*"
#echo "$*"
}
################################################################################
id2commit() {
[[ $# = 2 ]] || { usage; return 1; }
local branch=$1
local id=$2
if [[ $branch == $ibranch ]] && $gitmode; then
printf '%s\n' "$id"
else
git log "$branch" --pretty=format:'%H' --grep "${tag}: ${id}"
fi
}
commit2id() {
[[ $# = 2 ]] || { usage; return 1; }
local branch=$1
local commit=$2
if [[ $branch == $ibranch ]] && $gitmode; then
printf '%s\n' "$commit"
else
git log "$branch" -n1 --pretty=formtat:'%B' "$commit" | sed -n "s|^\s*${tag}: ||p"
fi
}
# commit2commit
c2c() {
[[ $# = 3 ]] || { usage; return 1; }
local from=$1
local to=$2
local commit=$3
if [[ "$from" == "$to" ]]; then
# optimization
# also, properly normalizes $ibranch when $gitmode=true
git log "$commit" -n1 --pretty=format:'%H'
else
id2commit "$to" "$(commit2id "$from" "$commit")"
fi
}
################################################################################
main() {
# Parse command line arguments #########################################
if [[ $1 = '--svn' ]]; then
gitmode=false
tag='git-svn-id'
shift
fi
if [[ $# < 3 ]]; then
usage
exit 1
fi
ibranch=$1
obranch=$2
shift 2
local filters=();
if $gitmode; then
filters=(--msg-filter "git-rewrite-branch--appendid '${tag}'")
fi
filters+=("$@")
# Main #################################################################
if git checkout "$obranch" -- 2>/dev/null; then
# obranch exists, update it
echo 'Updating existing rewritten branch...'
local icommit="$(c2c "$ibranch" "$ibranch" "$ibranch")"
local ocommit="$(c2c "$obranch" "$ibranch" "$obranch")"
if [[ "$icommit" == "$ocommit" ]]; then
echo "Nothing to do"
return 0
fi
# Just to be safe
git branch -D "$obranch.tmp" 2>/dev/null || true
wbranch="$obranch.tmp"
local common="$(c2c "$obranch" "$ibranch" "$obranch")"
if c2c "$ibranch" "$ibranch" "${common}^" &>/dev/null; then
revlist="$(c2c "$obranch" "$ibranch" "$obranch")^..${wbranch}"
else
# There is only one commit from $ibranch in $obranch
revlist="$wbranch"
fi
else
# obranch does not exist, create it
echo 'Creating new rewritten branch...'
wbranch=$obranch
revlist=$wbranch
fi
git checkout "$ibranch"
git checkout -b "$wbranch"
git filter-branch -f "${filters[@]}" "$revlist"
if [[ "$obranch" != "$wbranch" ]]; then
# rebase the changes in wbranch onto obranch
echo 'Rebasing rewrites onto existing branch...'
local wcommit="$(c2c "$wbranch" "$ibranch" "$wbranch")"
if [[ "$wcommit" == "$ocommit" ]]; then
echo "Nothing to do"
return 0
fi
local commonish="$(c2c "$obranch" "$wbranch" "$obranch")"
cmd=(git rebase --onto "$obranch" "$commonish" "$wbranch")
verbose
verbose " o---o---o $obranch"
verbose ' :'
verbose " o---o---o---o---o $ibranch"
verbose ' \ :'
verbose ' `-C---o---o '"$wbranch"
verbose
verbose " C = $commonish"
verbose
verbose " ${cmd[*]}"
verbose
"${cmd[@]}"
git checkout "$obranch"
git branch -d "$wbranch"
fi
}
main "$@"
|
