hgbook

changeset 141:627effec9d4e

More attempts to tidy up regexps for ignoring.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue Mar 06 21:36:14 2007 -0800 (2007-03-06)
parents 5b034c2b74f7
children d9f332f85673
files en/examples/backout en/examples/hook.simple en/examples/mq.tutorial en/examples/run-example en/examples/template.svnstyle
line diff
     1.1 --- a/en/examples/backout	Tue Mar 06 21:35:51 2007 -0800
     1.2 +++ b/en/examples/backout	Tue Mar 06 21:36:14 2007 -0800
     1.3 @@ -25,6 +25,7 @@
     1.4  cat myfile
     1.5  
     1.6  #$ name: simple.log
     1.7 +#$ ignore: \s+200[78]-.*
     1.8  
     1.9  hg log --style compact
    1.10  
     2.1 --- a/en/examples/hook.simple	Tue Mar 06 21:35:51 2007 -0800
     2.2 +++ b/en/examples/hook.simple	Tue Mar 06 21:36:14 2007 -0800
     2.3 @@ -1,7 +1,6 @@
     2.4  #!/bin/bash
     2.5  
     2.6  #$ name: init
     2.7 -#$ ignore: [0-9a-f]{40}
     2.8  
     2.9  hg init hook-test
    2.10  cd hook-test
     3.1 --- a/en/examples/mq.tutorial	Tue Mar 06 21:35:51 2007 -0800
     3.2 +++ b/en/examples/mq.tutorial	Tue Mar 06 21:36:14 2007 -0800
     3.3 @@ -22,7 +22,7 @@
     3.4  ls .hg/patches
     3.5  
     3.6  #$ name: qrefresh
     3.7 -#$ ignore: [0-9a-f]{12}
     3.8 +#$ ignore: \s+200[78]-.*
     3.9  
    3.10  echo 'line 2' >> file1
    3.11  hg diff
     4.1 --- a/en/examples/run-example	Tue Mar 06 21:35:51 2007 -0800
     4.2 +++ b/en/examples/run-example	Tue Mar 06 21:36:14 2007 -0800
     4.3 @@ -179,12 +179,12 @@
     4.4  
     4.5          ignore = [
     4.6              r'\d+:[0-9a-f]{12}', # changeset number:hash
     4.7 +            r'[0-9a-f]{40}', # long changeset hash
     4.8 +            r'[0-9a-f]{12}', # short changeset hash
     4.9              r'^(?:---|\+\+\+) .*', # diff header with dates
    4.10              r'^date:.*', # date
    4.11 -            r'^diff -r.*', # "diff -r" is followed by hash
    4.12 +            #r'^diff -r.*', # "diff -r" is followed by hash
    4.13              r'^# Date \d+ \d+', # hg patch header
    4.14 -            r'^# Node ID [0-9a-f]{40}', # hg patch header
    4.15 -            r'^# Parent  [0-9a-f]{40}', # hg patch header
    4.16              ]
    4.17  
    4.18          err = False
     5.1 --- a/en/examples/template.svnstyle	Tue Mar 06 21:35:51 2007 -0800
     5.2 +++ b/en/examples/template.svnstyle	Tue Mar 06 21:36:14 2007 -0800
     5.3 @@ -64,6 +64,7 @@
     5.4  cat svn.style
     5.5  
     5.6  #$ name: result
     5.7 +#$ ignore: \+0000 \(.*
     5.8  
     5.9  hg log -r1 --style svn.style
    5.10