chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-debrebase: test suite: t-gdr-good: Introduce etypes, a sequence
[dgit.git]
/
tests
/
lib-gdr
diff --git
a/tests/lib-gdr
b/tests/lib-gdr
index b60ccb8ed2f69b996989fd5c6ef5b2b6bf62d423..08717dd413c113cfc7eca638c2a85058de3b3b89 100644
(file)
--- a/
tests/lib-gdr
+++ b/
tests/lib-gdr
@@
-22,7
+22,7
@@
t-gdr-good () {
git diff --quiet ${beforetag-t.before} -- ':.' ':!debian/patches'
git diff --quiet ${beforetag-t.before} -- ':.' ':!debian/patches'
- local etype
netype
bwtip
+ local etype
s
bwtip
LC_MESSAGES=C t-git-debrebase status >../status.check
case $state in
LC_MESSAGES=C t-git-debrebase status >../status.check
case $state in
@@
-36,13
+36,17
@@
t-gdr-good () {
;;
esac
;;
esac
+ # etypes is either a type,
+ # or PseudoMerge-<more etypes>
+ # or AddPatches-<more etypes>
+
case $state in
laundered)
case $state in
laundered)
- etype=Upstream
+ etype
s
=Upstream
bwtip=Y:`t-git-debrebase breakwater`
;;
bwtip=Y:`t-git-debrebase breakwater`
;;
- stitched) etype
=Pseudomerge
;;
- pushed) etype
=AddPatches; netype=Pseudomerge
;;
+ stitched) etype
s=Pseudomerge-Upstream
;;
+ pushed) etype
s=AddPatches-Pseudomerge-Upstream
;;
esac
t-git-debrebase analyse >../anal.check
esac
t-git-debrebase analyse >../anal.check
@@
-52,8
+56,8
@@
t-gdr-good () {
while read cid ctype info; do
: ===== $cid $ctype $info =====
test $cid = $expect
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 cetype=$
{etypes%%-*}
+ if [ "x$ctype" = "x$
c
etype" ]; then cetype=SAME; fi
local parents="`git log -n1 --pretty=format:%P $cid`"
expect="$parents"
enparents=1
local parents="`git log -n1 --pretty=format:%P $cid`"
expect="$parents"
enparents=1
@@
-70,11
+74,11
@@
t-gdr-good () {
Anchor/Upstream) ;;
Anchor/Packaging) ;;
*)
Anchor/Upstream) ;;
Anchor/Packaging) ;;
*)
- fail "etype
=$etype
ctype=$ctype cetype=$cetype $cid"
+ fail "etype
s=$etypes
ctype=$ctype cetype=$cetype $cid"
;;
esac
;;
esac
- case "$ctype/$etype" in
+ case "$ctype/$etype
s
" in
Packaging/Upstream|\
Changelog/Upstream)
if [ "x$bwtip" != x ]; then
Packaging/Upstream|\
Changelog/Upstream)
if [ "x$bwtip" != x ]; then
@@
-89,7
+93,7
@@
t-gdr-good () {
expect=${expect%% *}
enparents=2
git diff --quiet $expect..$cid
expect=${expect%% *}
enparents=2
git diff --quiet $expect..$cid
- etype
=Upstream
+ etype
s=${etypes#*-}
: 'reject pointless pseudomerges'
local overwritten=${parents/$expect/}
: 'reject pointless pseudomerges'
local overwritten=${parents/$expect/}
@@
-104,18
+108,17
@@
t-gdr-good () {
Packaging)
git diff --quiet $expect..$cid -- ':.' ':!debian'
git diff --quiet $expect..$cid -- ':debian/patches'
Packaging)
git diff --quiet $expect..$cid -- ':.' ':!debian'
git diff --quiet $expect..$cid -- ':debian/patches'
- etype=Packaging
+ etype
s
=Packaging
;;
AddPatches)
git diff --quiet $expect..$cid -- \
':.' ':!debian/patches'
;;
AddPatches)
git diff --quiet $expect..$cid -- \
':.' ':!debian/patches'
- etype=$netype
- netype=Upstream
+ etypes=${etypes#*-}
;;
Changelog)
git diff --quiet $expect..$cid -- \
':.' ':!debian/changelog'
;;
Changelog)
git diff --quiet $expect..$cid -- \
':.' ':!debian/changelog'
- etype=Packaging
+ etype
s
=Packaging
;;
Upstream/SAME)
git diff --quiet $expect..$cid -- ':debian'
;;
Upstream/SAME)
git diff --quiet $expect..$cid -- ':debian'