Mercurial > hg
view tests/test-impexp-branch @ 10128:ea7c392f2b08
patch: drop eol normalization fast-path for 'lf' and 'crlf'
With eolmode set to 'lf' or 'crlf' we avoided the hunk duplication and
normalization by reading the input patch in text mode. Dropping this
optimization simplifies code expectations for a small overhead.
The change in test-mq-eol comes from a tolerance to CRLF instead of LF for last
lines without newlines being broken by this revision. This tolerance was only
partially supported and will be added again in a better way.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Wed, 23 Dec 2009 19:31:48 +0100 |
parents | 32ea809e5bd1 |
children |
line wrap: on
line source
#!/bin/sh cat >findbranch.py <<EOF import re, sys head_re = re.compile('^#(?:(?:\\s+([A-Za-z][A-Za-z0-9_]*)(?:\\s.*)?)|(?:\\s*))$') for line in sys.stdin: hmatch = head_re.match(line) if not hmatch: sys.exit(1) if hmatch.group(1) == 'Branch': sys.exit(0) sys.exit(1) EOF hg init a cd a echo "Rev 1" >rev hg add rev hg commit -m "No branch." hg branch abranch echo "Rev 2" >rev hg commit -m "With branch." if hg export 0 | python ../findbranch.py; then echo "Export of default branch revision has Branch header" 1>&2 exit 1 fi if hg export 1 | python ../findbranch.py; then : # Do nothing else echo "Export of branch revision is missing Branch header" 1>&2 exit 1 fi # Make sure import still works with branch information in patches. cd .. hg init b cd b hg -R ../a export 0 | hg import - hg -R ../a export 1 | hg import - cd .. rm -rf b hg init b cd b hg -R ../a export 0 | hg import --exact - hg -R ../a export 1 | hg import --exact -