Track the files conflict history

[stgit] / t / t1400-patch-history.sh

#!/bin/sh
#
# Copyright (c) 2006 Catalin Marinas
#

test_description='Test the patch history generation.

'

. ./test-lib.sh

test_expect_success \
	'Initialize the StGIT repository' \
	'
	stg init
	'

test_expect_success \
	'Create the first patch' \
	'
	stg new foo -m "Foo Patch" &&
	echo foo > test && echo foo2 >> test &&
	stg add test &&
	stg refresh
	'

test_expect_success \
	'Create the second patch' \
	'
	stg new bar -m "Bar Patch" &&
	echo bar >> test &&
	stg refresh
	'

test_expect_success \
	'Check the "new" and "refresh" logs' \
	'
	stg log foo | grep -q -e "^new" &&
	stg log foo | grep -q -e "^refresh" &&
	stg log | grep -q -e "^new" &&
	stg log | grep -q -e "^refresh"
	'

test_expect_success \
	'Check the "push" log' \
	'
	stg pop &&
	echo foo > test2 && stg add test2 && stg refresh &&
	stg push &&
	stg log | grep -q -e "^push	"
	'

test_expect_success \
	'Check the "push(f)" log' \
	'
	stg pop &&
	stg refresh -m "Foo2 Patch" &&
	stg push &&
	stg log | grep -q -e "^push(f)	"
	'

test_expect_success \
	'Check the "push(m)" log' \
	'
	stg pop &&
	echo foo2 > test && stg refresh &&
	stg push &&
	stg log | grep -q -e "^push(m)	"
	'

test_expect_success \
	'Check the "push(c)" log' \
	'
	echo bar > test && stg refresh &&
	stg pop &&
	echo foo > test && stg refresh &&
	! stg push &&
	stg log | grep -q -e "^push(c)	"
	'

test_expect_success \
	'Check the push "undo" log' \
	'
	stg status --reset &&
	stg push --undo &&
	stg log bar | grep -q -e "^undo	"
	'

test_expect_success \
	'Check the refresh "undo" log' \
	'
	stg refresh --undo &&
	stg log | grep -q -e "^undo	"
	'

test_done