# HG changeset patch # User Christian Ebert # Date 1253354402 -7200 # Node ID b3d3788db7ef6467ddcd0233f06ef153145723d8 # Parent 7e80fc29ba271229e03c6270a815adf0bc657ee6 (0.9.2compat): run kwdemo before setting up [keyword] files Ensures that kwdemo runs correctly without further configuration. Also no need to specify --default option. diff -r 7e80fc29ba27 -r b3d3788db7ef tests/test-keyword --- a/tests/test-keyword Wed Aug 05 17:25:33 2009 +0200 +++ b/tests/test-keyword Sat Sep 19 12:00:02 2009 +0200 @@ -4,6 +4,21 @@ [extensions] hgext.keyword = hgext.mq = +hgext.notify = +EOF + +# demo before [keyword] files are set up +# would succeed without uisetup otherwise +echo % hg kwdemo +hg --quiet kwdemo \ +| sed -e 's![^ ][^ ]*demo.txt,v!/TMP/demo.txt,v!' \ + -e 's/,v [a-z0-9][a-z0-9]* /,v xxxxxxxxxxxx /' \ + -e '/[$]Revision/ s/: [a-z0-9][a-z0-9]* /: xxxxxxxxxxxx /' \ + -e 's! 20[0-9][0-9]/[01][0-9]/[0-3][0-9] [0-2][0-9]:[0-6][0-9]:[0-6][0-9]! 2000/00/00 00:00:00!' + +hg --quiet kwdemo "Branch = {branches}" + +cat <> $HGRCPATH [keyword] * = b = ignore @@ -12,15 +27,6 @@ commit.test=cp a hooktest EOF -echo % hg kwdemo -hg --quiet kwdemo --default \ -| sed -e 's![^ ][^ ]*demo.txt,v!/TMP/demo.txt,v!' \ - -e 's/,v [a-z0-9][a-z0-9]* /,v xxxxxxxxxxxx /' \ - -e '/[$]Revision/ s/: [a-z0-9][a-z0-9]* /: xxxxxxxxxxxx /' \ - -e 's! 20[0-9][0-9]/[01][0-9]/[0-3][0-9] [0-2][0-9]:[0-6][0-9]:[0-6][0-9]! 2000/00/00 00:00:00!' - -hg --quiet kwdemo "Branch = {branches}" - hg init Test-bndl cd Test-bndl diff -r 7e80fc29ba27 -r b3d3788db7ef tests/test-keyword.out --- a/tests/test-keyword.out Wed Aug 05 17:25:33 2009 +0200 +++ b/tests/test-keyword.out Sat Sep 19 12:00:02 2009 +0200 @@ -2,8 +2,6 @@ [extensions] hgext.keyword = [keyword] -* = -b = ignore demo.txt = [keywordmaps] RCSFile = {file|basename},v @@ -23,8 +21,6 @@ [extensions] hgext.keyword = [keyword] -* = -b = ignore demo.txt = [keywordmaps] Branch = {branches}