blob: 484dbabb75702d2c38ca0b73e84c0a1f3d9930a4 [file] [log] [blame]
#!/bin/sh
#
# Copyright (c) 2006 Catalin Marinas
#
test_description='Test the sync command.'
. ./test-lib.sh
test_expect_success \
'Initialize the StGIT repository' \
'
stg init
'
test_expect_success \
'Create some patches' \
'
stg new p1 -m p1 &&
echo foo1 > foo1.txt &&
stg add foo1.txt &&
stg refresh &&
stg new p2 -m p2 &&
echo foo2 > foo2.txt &&
stg add foo2.txt &&
stg refresh &&
stg new p3 -m p3 &&
echo foo3 > foo3.txt &&
stg add foo3.txt &&
stg refresh &&
stg export &&
stg pop &&
[ "$(echo $(stg applied))" = "p1 p2" ] &&
[ "$(echo $(stg unapplied))" = "p3" ]
'
test_expect_success \
'Create a branch with empty patches' \
'
stg branch -c foo base &&
stg new p1 -m p1 &&
stg new p2 -m p2 &&
stg new p3 -m p3 &&
[ "$(echo $(stg applied))" = "p1 p2 p3" ] &&
[ "$(echo $(stg unapplied))" = "" ]
'
test_expect_success \
'Synchronise second patch with the master branch' \
'
stg sync -B master p2 &&
[ "$(echo $(stg applied))" = "p1 p2 p3" ] &&
[ "$(echo $(stg unapplied))" = "" ] &&
test $(cat foo2.txt) = "foo2"
'
test_expect_success \
'Synchronise the first two patches with the master branch' \
'
stg sync -B master -a &&
[ "$(echo $(stg applied))" = "p1 p2 p3" ] &&
[ "$(echo $(stg unapplied))" = "" ] &&
test $(cat foo1.txt) = "foo1" &&
test $(cat foo2.txt) = "foo2"
'
test_expect_success \
'Synchronise all the patches with the exported series' \
'
stg sync -s patches-master/series -a &&
[ "$(echo $(stg applied))" = "p1 p2 p3" ] &&
[ "$(echo $(stg unapplied))" = "" ] &&
test $(cat foo1.txt) = "foo1" &&
test $(cat foo2.txt) = "foo2" &&
test $(cat foo3.txt) = "foo3"
'
test_expect_success \
'Modify the master patches' \
'
stg branch master &&
[ "$(echo $(stg applied))" = "p1 p2" ] &&
[ "$(echo $(stg unapplied))" = "p3" ] &&
stg goto p1 &&
echo bar1 >> foo1.txt &&
stg refresh &&
stg goto p2 &&
echo bar2 > bar2.txt &&
stg add bar2.txt &&
stg refresh &&
stg goto p3 &&
echo bar3 >> foo3.txt &&
stg refresh &&
[ "$(echo $(stg applied))" = "p1 p2 p3" ] &&
[ "$(echo $(stg unapplied))" = "" ] &&
stg export &&
stg branch foo
'
test_expect_success \
'Synchronise second patch with the master branch' \
'
stg sync -B master p2 &&
[ "$(echo $(stg applied))" = "p1 p2 p3" ] &&
[ "$(echo $(stg unapplied))" = "" ] &&
test $(cat bar2.txt) = "bar2"
'
test_expect_success \
'Synchronise the first two patches with the master branch (to fail)' \
'
! stg sync -B master -a
'
test_expect_success \
'Restore the stack status after the failed sync' \
'
[ "$(echo $(stg applied))" = "p1" ] &&
[ "$(echo $(stg unapplied))" = "p2 p3" ] &&
stg resolved -a &&
stg refresh &&
stg goto p3
[ "$(echo $(stg applied))" = "p1 p2 p3" ] &&
[ "$(echo $(stg unapplied))" = "" ]
'
test_expect_success \
'Synchronise the third patch with the exported series (to fail)' \
'
! stg sync -s patches-master/series p3
'
test_expect_success \
'Restore the stack status after the failed sync' \
'
[ "$(echo $(stg applied))" = "p1 p2 p3" ] &&
[ "$(echo $(stg unapplied))" = "" ] &&
stg resolved -a &&
stg refresh &&
[ "$(echo $(stg applied))" = "p1 p2 p3" ] &&
[ "$(echo $(stg unapplied))" = "" ]
'
test_done