hgbook

changeset 139:ceaca14e49f0

Add local regexps to ignore bits of output.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue Mar 06 20:46:07 2007 -0800 (2007-03-06)
parents d374685eb7fa
children 5b034c2b74f7
files en/examples/hook.simple en/examples/mq.tutorial en/examples/template.simple en/examples/tour en/examples/tour-merge-conflict
line diff
     1.1 --- a/en/examples/hook.simple	Tue Mar 06 20:45:50 2007 -0800
     1.2 +++ b/en/examples/hook.simple	Tue Mar 06 20:46:07 2007 -0800
     1.3 @@ -1,6 +1,7 @@
     1.4  #!/bin/bash
     1.5  
     1.6  #$ name: init
     1.7 +#$ ignore: [0-9a-f]{40}
     1.8  
     1.9  hg init hook-test
    1.10  cd hook-test
    1.11 @@ -12,8 +13,9 @@
    1.12  hg commit -m 'testing commit hook'
    1.13  
    1.14  #$ name: ext
    1.15 +#$ ignore: ^date of commit.*
    1.16  
    1.17 -echo 'commit.when = echo "date of commit:"; date' >> .hg/hgrc
    1.18 +echo 'commit.when = echo -n "date of commit: "; date' >> .hg/hgrc
    1.19  echo a >> a
    1.20  hg commit -m 'i have two hooks'
    1.21  
     2.1 --- a/en/examples/mq.tutorial	Tue Mar 06 20:45:50 2007 -0800
     2.2 +++ b/en/examples/mq.tutorial	Tue Mar 06 20:46:07 2007 -0800
     2.3 @@ -22,6 +22,7 @@
     2.4  ls .hg/patches
     2.5  
     2.6  #$ name: qrefresh
     2.7 +#$ ignore: [0-9a-f]{12}
     2.8  
     2.9  echo 'line 2' >> file1
    2.10  hg diff
     3.1 --- a/en/examples/template.simple	Tue Mar 06 20:45:50 2007 -0800
     3.2 +++ b/en/examples/template.simple	Tue Mar 06 20:46:07 2007 -0800
     3.3 @@ -1,5 +1,9 @@
     3.4  #!/bin/bash
     3.5  
     3.6 +# So many different bits of random output, it would be a nightmare to
     3.7 +# ignore each individually.
     3.8 +#$ ignore: .*
     3.9 +
    3.10  hg init myrepo
    3.11  cd myrepo
    3.12  echo hello > hello
     4.1 --- a/en/examples/tour	Tue Mar 06 20:45:50 2007 -0800
     4.2 +++ b/en/examples/tour	Tue Mar 06 20:46:07 2007 -0800
     4.3 @@ -13,6 +13,7 @@
     4.4  hg clone http://hg.serpentine.com/tutorial/hello
     4.5  
     4.6  #$ name: ls
     4.7 +#$ ignore: ^drwx.*
     4.8  
     4.9  ls -l
    4.10  ls hello
     5.1 --- a/en/examples/tour-merge-conflict	Tue Mar 06 20:45:50 2007 -0800
     5.2 +++ b/en/examples/tour-merge-conflict	Tue Mar 06 20:46:07 2007 -0800
     5.3 @@ -53,6 +53,7 @@
     5.4  hg pull -u ../scam-son
     5.5  
     5.6  #$ name: merge
     5.7 +#$ ignore: [<>]{7} /tmp/.*
     5.8  
     5.9  export HGMERGE=merge
    5.10  hg merge