Mercurial > hg
view tests/test-impexp-branch.t @ 13624:78cc35e75ecc stable
eol: do not abort when win32text is found, only warn
The win32text extension does not break eol or vice-versa, so it is not a fatal
error to have both of them enabled. It's just folly. So spewing warnings in
this condition is preferrable to aborting. When both extensions are enabled,
the user now sees:
% hg st
the eol extension is incompatible with the win32text extension
win32text is deprecated: http://mercurial.selenic.com/wiki/Win32TextExtension
M hgext/eol.py
author | Steve Borho <steve@borho.org> |
---|---|
date | Sun, 13 Mar 2011 10:03:06 -0500 |
parents | 46ab8c5dd99a |
children | fbbe9239574a |
line wrap: on
line source
$ 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 marked working directory as 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 - applying patch from stdin $ hg -R ../a export 1 | hg import - applying patch from stdin $ cd .. $ rm -rf b $ hg init b $ cd b $ hg -R ../a export 0 | hg import --exact - applying patch from stdin $ hg -R ../a export 1 | hg import --exact - applying patch from stdin