EOL: patch.eol=auto setting

[Martin Geisler]

Alexandr Litjagin <alexraynepe196 at lavabit.com> writes:

Hey

> 23.12.2009 3:12, Martin Geisler пишет:
>>
>>
>>>> That being said, Mads Kiilerich did suggest that we could support
>>>> using different EOL formats for different files in the repository.
>>>> Something like this
>>>>
>>>>    [patterns]
>>>>    foo.py = native/CRLF
>>>>    **.py = native/LF
>>>>
>>>> which should mean that foo.py is checked out in native format and
>>>> stored in CRLF format, whereas all other Python files are stored in
>>>> LF format.
>>
> As i looked at last changes this Mads Kiilerich suggest not
> implemented yet. do you plan to made it? or it can be foggoten?

It's not forgotten, but I have run out of time: I have to finish my PhD
thesis for before March. I'm afraid I wont be doing any more development
on the eol extension before that date.

The extension is getting too complicated for a casual look: I'm not
familiar with the dirstate and don't really know how the encode/decode
filters interact with it. In other words, I see spurious failures from
test-eol:

% while make test-eol; do true; done
cd tests && python run-tests.py --with-hg=`which hg`  test-eol
.
# Ran 1 tests, 0 skipped, 0 failed.
cd tests && python run-tests.py --with-hg=`which hg`  test-eol
.
# Ran 1 tests, 0 skipped, 0 failed.
cd tests && python run-tests.py --with-hg=`which hg`  test-eol
.
# Ran 1 tests, 0 skipped, 0 failed.
cd tests && python run-tests.py --with-hg=`which hg`  test-eol
.
# Ran 1 tests, 0 skipped, 0 failed.
cd tests && python run-tests.py --with-hg=`which hg`  test-eol
.
# Ran 1 tests, 0 skipped, 0 failed.
cd tests && python run-tests.py --with-hg=`which hg`  test-eol

ERROR: test-eol output changed
--- Expected output 
+++ Test output 
@@ -238,15 +238,15 @@
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % hg status (eol extension not yet activated)
 % hg status (eol activated)
+% hg commit
+nothing changed
+% hg status
+
+% hg clone mixed mixed-CRLF
+updating to branch default
+3 files updated, 0 files merged, 0 files removed, 0 files unresolved
+% hg status (eol extension not yet activated)
+% hg status (eol activated)
 M unix.txt
 % hg commit
 % hg status
-
-% hg clone mixed mixed-CRLF
-updating to branch default
-3 files updated, 0 files merged, 0 files removed, 0 files unresolved
-% hg status (eol extension not yet activated)
-% hg status (eol activated)
-M unix.txt
-% hg commit
-% hg status
!
Failed test-eol: output changed
# Ran 1 tests, 0 skipped, 1 failed.
make: *** [test-eol] Error 1

-- 
Martin Geisler

VIFF (Virtual Ideal Functionality Framework) brings easy and efficient
SMPC (Secure Multiparty Computation) to Python. See: http://viff.dk/.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20100114/0969a9f9/attachment.pgp>