diff -r ce5eb725d0c6 -r 0683aaf458d8 tests/test-keyword.out --- a/tests/test-keyword.out Wed Feb 06 11:32:34 2008 +0100 +++ b/tests/test-keyword.out Wed Feb 06 17:25:37 2008 +0100 @@ -46,7 +46,6 @@ list of commands: - kwcat output the current or given revision of files expanding keywords kwdemo print [keywordmaps] configuration and an expansion example kwexpand expand keywords in working directory kwfiles print files currently configured for keyword expansion @@ -85,23 +84,6 @@ Branch = {branches} $Branch: demobranch $ % kwshrink should exit silently in empty/invalid repo -% symlink nonexisting file -% commit hook must fail with missing file -cp: a: No such file or directory -adding sym -sym -running hook commit.test: cp a hooktest -warning: commit.test hook exited with status 1 -% bundle null revision containing empty symlink -1 changesets found -% pull from bundle -pulling from ../test-keyword.hg -requesting all changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -1 files updated, 0 files merged, 0 files removed, 0 files unresolved % cat expand $Id$ do not process $Id: @@ -113,38 +95,43 @@ % addremove adding a adding b +adding sym % status A a A b +A sym % default keyword expansion including commit hook % interrupted commit should not change state or run commit hook a b +sym transaction abort! rollback completed abort: empty commit message % status A a A b +A sym % commit a b +sym overwriting a expanding keywords running hook commit.test: cp a hooktest % status ? hooktest % identify -cecf1e2cc3d3 +f782df5f9602 % cat -expand $Id: a,v cecf1e2cc3d3 1970/01/01 00:00:01 user $ +expand $Id: a,v f782df5f9602 1970/01/01 00:00:00 user $ do not process $Id: xxx $ -expand $Id: a,v cecf1e2cc3d3 1970/01/01 00:00:01 user $ +expand $Id: a,v f782df5f9602 1970/01/01 00:00:00 user $ do not process $Id: xxx $ ignore $Id$ -% hg kwcat -expand $Id: a,v cecf1e2cc3d3 1970/01/01 00:00:01 user $ +% hg cat +expand $Id: a,v f782df5f9602 1970/01/01 00:00:00 user $ do not process $Id: xxx $ ignore $Id$ @@ -156,10 +143,10 @@ % update 3 files updated, 0 files merged, 0 files removed, 0 files unresolved % cat -expand $Id: a,v cecf1e2cc3d3 1970/01/01 00:00:01 user $ +expand $Id: a,v f782df5f9602 1970/01/01 00:00:00 user $ do not process $Id: xxx $ -expand $Id: a,v cecf1e2cc3d3 1970/01/01 00:00:01 user $ +expand $Id: a,v f782df5f9602 1970/01/01 00:00:00 user $ do not process $Id: xxx $ ignore $Id$ @@ -170,25 +157,23 @@ overwriting a expanding keywords overwriting c expanding keywords % compare changenodes in a c -expand $Id: a,v cecf1e2cc3d3 1970/01/01 00:00:01 user $ +expand $Id: a,v f782df5f9602 1970/01/01 00:00:00 user $ do not process $Id: xxx $ -$Id: c,v c033759cd8fd 1970/01/01 00:00:02 user $ +$Id: c,v ba4426d1938e 1970/01/01 00:00:01 user $ tests for different changenodes -% qinit -c % qimport -% qcommit % keywords should not be expanded in patch # HG changeset patch # User User Name -# Date 2 0 -# Node ID c033759cd8fd162b7863dc4e5d1eea433603880f -# Parent cecf1e2cc3d3447fcc20dd4eac5c4faa8a615df3 +# Date 1 0 +# Node ID ba4426d1938ec9673e03ab274d88c44e24618f7f +# Parent f782df5f9602483b4e51c31a12315f353bba380c cndiff -diff -r cecf1e2cc3d3 -r c033759cd8fd c +diff -r f782df5f9602 -r ba4426d1938e c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/c Thu Jan 01 00:00:02 1970 +0000 ++++ b/c Thu Jan 01 00:00:01 1970 +0000 @@ -0,0 +1,2 @@ +$Id$ +tests for different changenodes @@ -198,7 +183,7 @@ applying mqtest.diff Now at: mqtest.diff % cat -$Id: c,v c033759cd8fd 1970/01/01 00:00:02 user $ +$Id: c,v ba4426d1938e 1970/01/01 00:00:01 user $ tests for different changenodes % qpop and move on Patch queue now empty @@ -211,10 +196,10 @@ c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292 overwriting c expanding keywords % cat a c -expand $Id: a,v cecf1e2cc3d3 1970/01/01 00:00:01 user $ +expand $Id: a,v f782df5f9602 1970/01/01 00:00:00 user $ do not process $Id: xxx $ -expand $Id: c,v 1fed52d26fd0 1970/01/01 00:00:02 user $ +expand $Id: c,v 0ba462c0f077 1970/01/01 00:00:01 user $ do not process $Id: xxx $ % touch copied c after 1 second @@ -223,7 +208,7 @@ a c % diff --rev -diff -r cecf1e2cc3d3 c +diff -r f782df5f9602 c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -0,0 +1,3 @@ +expand $Id$ @@ -247,15 +232,15 @@ Xinfo = {author}: {desc} $Xinfo: test: hg keyword config and expansion example $ % cat -expand $Id: a,v cecf1e2cc3d3 1970/01/01 00:00:01 user $ +expand $Id: a,v f782df5f9602 1970/01/01 00:00:00 user $ do not process $Id: xxx $ -expand $Id: a,v cecf1e2cc3d3 1970/01/01 00:00:01 user $ +expand $Id: a,v f782df5f9602 1970/01/01 00:00:00 user $ do not process $Id: xxx $ ignore $Id$ -% hg kwcat -expand $Id: a cecf1e2cc3d3 Thu, 01 Jan 1970 00:00:01 +0000 user $ +% hg cat +expand $Id: a f782df5f9602 Thu, 01 Jan 1970 00:00:00 +0000 user $ do not process $Id: xxx $ ignore $Id$ @@ -272,17 +257,17 @@ overwriting a expanding keywords % status % cat -expand $Id: a a576e5647736 Thu, 01 Jan 1970 00:00:03 +0000 user $ +expand $Id: a 0729690beff6 Thu, 01 Jan 1970 00:00:02 +0000 user $ do not process $Id: xxx $ $Xinfo: User Name : firstline $ -expand $Id: a a576e5647736 Thu, 01 Jan 1970 00:00:03 +0000 user $ +expand $Id: a 0729690beff6 Thu, 01 Jan 1970 00:00:02 +0000 user $ do not process $Id: xxx $ $Xinfo: User Name : firstline $ ignore $Id$ -% hg kwcat -expand $Id: a a576e5647736 Thu, 01 Jan 1970 00:00:03 +0000 user $ +% hg cat +expand $Id: a 0729690beff6 Thu, 01 Jan 1970 00:00:02 +0000 user $ do not process $Id: xxx $ $Xinfo: User Name : firstline $ @@ -296,7 +281,7 @@ R a % revert a % cat a -expand $Id: a a576e5647736 Thu, 01 Jan 1970 00:00:03 +0000 user $ +expand $Id: a 0729690beff6 Thu, 01 Jan 1970 00:00:02 +0000 user $ do not process $Id: xxx $ $Xinfo: User Name : firstline $ @@ -305,15 +290,15 @@ adding changesets adding manifests adding file changes -added 2 changesets with 3 changes to 3 files +added 1 changesets with 3 changes to 3 files 3 files updated, 0 files merged, 0 files removed, 0 files unresolved % incoming comparing with test-keyword/Test searching for changes -changeset: 2:a576e5647736 +changeset: 1:0729690beff6 tag: tip user: User Name -date: Thu Jan 01 00:00:03 1970 +0000 +date: Thu Jan 01 00:00:02 1970 +0000 summary: firstline % commit rejecttest @@ -323,11 +308,11 @@ % import applying ../rejecttest.diff % cat -expand $Id: a 97b8d4afd122 Thu, 01 Jan 1970 00:00:04 +0000 user $ rejecttest +expand $Id: a 82983f13f138 Thu, 01 Jan 1970 00:00:03 +0000 user $ rejecttest do not process $Id: rejecttest xxx $ $Xinfo: User Name : rejects? $ -expand $Id: a 97b8d4afd122 Thu, 01 Jan 1970 00:00:04 +0000 user $ rejecttest +expand $Id: a 82983f13f138 Thu, 01 Jan 1970 00:00:03 +0000 user $ rejecttest do not process $Id: rejecttest xxx $ $Xinfo: User Name : rejects? $ @@ -347,7 +332,7 @@ x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e overwriting x/a expanding keywords % cat a -expand $Id: x/a 6ae8e7fbf16c Thu, 01 Jan 1970 00:00:04 +0000 user $ +expand $Id: x/a f27c134d2d9b Thu, 01 Jan 1970 00:00:03 +0000 user $ do not process $Id: xxx $ $Xinfo: User Name : xa $ @@ -360,6 +345,7 @@ $Xinfo$ % kwexpand nonexistent nonexistent: No such file or directory +% switch off expansion % kwshrink with unknown file u overwriting a shrinking keywords overwriting x/a shrinking keywords @@ -373,10 +359,27 @@ xxx $ $Xinfo$ ignore $Id$ -% hg kwcat -expand $Id: a a576e5647736 Thu, 01 Jan 1970 00:00:03 +0000 user $ +% hg cat +expand $Id: a 0729690beff6 Thu, 01 Jan 1970 00:00:02 +0000 user $ do not process $Id: xxx $ $Xinfo: User Name : firstline $ ignore $Id$ a +% cat +expand $Id$ +do not process $Id: +xxx $ +$Xinfo$ +expand $Id$ +do not process $Id: +xxx $ +$Xinfo$ +ignore $Id$ +% hg cat +expand $Id$ +do not process $Id: +xxx $ +$Xinfo$ +ignore $Id$ +a