Mercurial > hgbook
changeset 141:627effec9d4e
More attempts to tidy up regexps for ignoring.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Tue, 06 Mar 2007 21:36:14 -0800 |
| parents | 5b034c2b74f7 |
| children | d9f332f85673 |
| files | en/examples/backout en/examples/hook.simple en/examples/mq.tutorial en/examples/run-example en/examples/template.svnstyle |
| diffstat | 5 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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
--- 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
--- 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