# HG changeset patch # User Bryan O'Sullivan # Date 1173245774 28800 # Node ID 627effec9d4e843ba63403a2351ea30f81809f80 # Parent 5b034c2b74f7059702d0205e15a1a9613ed9030e More attempts to tidy up regexps for ignoring. diff -r 5b034c2b74f7 -r 627effec9d4e en/examples/backout --- a/en/examples/backout Tue Mar 06 21:35:51 2007 -0800 +++ b/en/examples/backout Tue Mar 06 21:36:14 2007 -0800 @@ -25,6 +25,7 @@ cat myfile #$ name: simple.log +#$ ignore: \s+200[78]-.* hg log --style compact diff -r 5b034c2b74f7 -r 627effec9d4e en/examples/hook.simple --- a/en/examples/hook.simple Tue Mar 06 21:35:51 2007 -0800 +++ b/en/examples/hook.simple Tue Mar 06 21:36:14 2007 -0800 @@ -1,7 +1,6 @@ #!/bin/bash #$ name: init -#$ ignore: [0-9a-f]{40} hg init hook-test cd hook-test diff -r 5b034c2b74f7 -r 627effec9d4e en/examples/mq.tutorial --- a/en/examples/mq.tutorial Tue Mar 06 21:35:51 2007 -0800 +++ b/en/examples/mq.tutorial Tue Mar 06 21:36:14 2007 -0800 @@ -22,7 +22,7 @@ ls .hg/patches #$ name: qrefresh -#$ ignore: [0-9a-f]{12} +#$ ignore: \s+200[78]-.* echo 'line 2' >> file1 hg diff diff -r 5b034c2b74f7 -r 627effec9d4e en/examples/run-example --- a/en/examples/run-example Tue Mar 06 21:35:51 2007 -0800 +++ b/en/examples/run-example Tue Mar 06 21:36:14 2007 -0800 @@ -179,12 +179,12 @@ ignore = [ r'\d+:[0-9a-f]{12}', # changeset number:hash + r'[0-9a-f]{40}', # long changeset hash + r'[0-9a-f]{12}', # short changeset hash r'^(?:---|\+\+\+) .*', # diff header with dates r'^date:.*', # date - r'^diff -r.*', # "diff -r" is followed by hash + #r'^diff -r.*', # "diff -r" is followed by hash r'^# Date \d+ \d+', # hg patch header - r'^# Node ID [0-9a-f]{40}', # hg patch header - r'^# Parent [0-9a-f]{40}', # hg patch header ] err = False diff -r 5b034c2b74f7 -r 627effec9d4e en/examples/template.svnstyle --- a/en/examples/template.svnstyle Tue Mar 06 21:35:51 2007 -0800 +++ b/en/examples/template.svnstyle Tue Mar 06 21:36:14 2007 -0800 @@ -64,6 +64,7 @@ cat svn.style #$ name: result +#$ ignore: \+0000 \(.* hg log -r1 --style svn.style