blob: aeb7725411eb20038eb307b525644defb7f3f77d (
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
|
#
: ${GDR_TEST_DEBUG=-D}
export GDR_TEST_DEBUG
t-git-debrebase () {
local gdr=${DGIT_GITDEBREBASE_TEST-git-debrebase}
: '
{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
$gdr $GDR_TEST_OPTS $GDR_TEST_DEBUG $t_gdr_xopts "$@"
: '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
'
}
t-gdr-good () {
local state=$1
local beforetag=$2 # say HEAD to skip this check
# state should be one of
# laundered
# stitched
# patches
git diff --quiet ${beforetag-t.before} -- ':.' ':!debian/patches'
local etype netype bwtip
case $state in
laundered)
etype=Upstream
bwtip=Y:`t-git-debrebase breakwater`
;;
stitched) etype=Pseudomerge ;;
pushed) etype=AddPatches; netype=Pseudomerge ;;
esac
t-git-debrebase analyse >../anal.check
expect=`git rev-parse HEAD`
exec <../anal.check
local cid ctype info nparents
while read cid ctype info; do
: ===== $cid $ctype $info =====
test $cid = $expect
local cetype=$etype
if [ "x$ctype" = "x$etype" ]; then cetype=SAME; fi
local parents="`git log -n1 --pretty=format:%P $cid`"
expect="$parents"
enparents=1
: "$ctype/$cetype" "$parents"
case "$ctype/$cetype" in
Pseudomerge/SAME) ;;
Packaging/SAME) ;;
Packaging/Upstream) ;;
AddPatches/SAME) ;;
Changelog/Packaging) ;;
Changelog/Upstream) ;;
Upstream/SAME) ;;
BreakwaterUpstreamMerge/Upstream) ;;
BreakwaterUpstreamMerge/Packaging) ;;
*)
fail "etype=$etype ctype=$ctype cetype=$cetype $cid"
;;
esac
case "$ctype/$etype" in
Packaging/Upstream|\
Changelog/Upstream)
if [ "x$bwtip" != x ]; then
test "$bwtip" = "Y:$cid"
bwtip=''
fi
esac
case "$ctype" in
Pseudomerge)
expect=${info#Contributor=}
expect=${expect%% *}
enparents=2
git diff --quiet $expect..$cid
etype=Upstream
;;
Packaging)
git diff --quiet $expect..$cid -- ':.' ':!debian'
git diff --quiet $expect..$cid -- ':debian/patches'
etype=Packaging
;;
AddPatches)
git diff --quiet $expect..$cid -- \
':.' ':!debian/patches'
etype=$netype
netype=Upstream
;;
Changelog)
git diff --quiet $expect..$cid -- \
':.' ':!debian/changelog'
etype=Packaging
;;
Upstream/SAME)
git diff --quiet $expect..$cid -- ':debian'
;;
BreakwaterUpstreamMerge)
break
;;
esac
local cnparents=`printf "%s" "$parents" | wc -w`
test $cnparents = $enparents
case "$parents" in
*"$expect"*) ;;
*) fail 'unexpected parent' ;;
esac
done
}
t-some-changes () {
local token=$1
echo >>debian/zorkmid "// debian $token"
git add debian/zorkmid
git commit -m "DEBIAN add zorkmid ($token)"
echo >>src.c "// upstream $token"
git commit -a -m "UPSTREAM edit src.c ($token)"
for f in debian/zorkmid src.c; do
echo "// both! $token" >>$f
git add $f
done
git commit -m "MIXED add both ($token)"
}
t-make-new-upstream-tarball () {
local uv=$1
git checkout make-upstream
# leaves ust set to filename of orig tarball
echo "upstream $uv" >>docs/README
git commit -a -m "upstream $uv tarball"
ust=example_$uv.orig.tar.gz
git archive -o ../$ust --prefix=example-2.0/ make-upstream
}
|
