Mercurial > hg > mercurial-crew-with-dirclash
annotate contrib/win32/mercurial.ini @ 2550:45235e492cc6
Disable automatic line endings conversion on windows
The rationale behind this is that such conversion implies a particular
situation in which all files in the repo are terminated by only LF. This
is documented nowhere and it bit me sharply when I upgraded.
Furthermore, it works on the assumption that a file containing no NULL
characters are actually a text file. Therefore it cannot guarantee that
no binary file will be harmed in the process.
Currently, if a file already contains CRLF line endings when it is
copied to the working dir from the repo, then the version in the working
dir will be corrupted by an extra CR.
I'm working on a patch that will turn this into a warning. But as a side
effect, committing such a file back will strip it from its CR.
In all case, unrequested data modification can occur under the feet of
the user, which is bad(tm), ihmo.
author | Raphael Marmier <raphael@marmier.net> |
---|---|
date | Mon, 03 Jul 2006 10:18:46 -0700 |
parents | 2dc06dd76ff4 |
children | 2300632a3bc8 |
rev | line source |
---|---|
1298
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
1 ; System-wide Mercurial config file. To override these settings on a |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
2 ; per-user basis, please edit the following file instead, where |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
3 ; USERNAME is your Windows user name: |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
4 ; C:\Documents and Settings\USERNAME\Mercurial.ini |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
5 |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
6 ; By default, we try to encode and decode all files that do not |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
7 ; contain ASCII NUL characters. What this means is that we try to set |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
8 ; line endings to Windows style on update, and to Unix style on |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
9 ; commit. This lets us cooperate with Linux and Unix users, so |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
10 ; everybody sees files with their native line endings. |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
11 |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
12 [extensions] |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
13 ; The win32text extension is available and installed by default. It |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
14 ; provides built-in Python hooks to perform line ending conversions. |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
15 ; This is normally much faster than running an external program. |
1303
2dc06dd76ff4
Fix path of win32text extension in INI file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1298
diff
changeset
|
16 hgext.win32text = |
1298
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
17 |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
18 |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
19 [encode] |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
20 ; Encode files that don't contain NUL characters. |
2550
45235e492cc6
Disable automatic line endings conversion on windows
Raphael Marmier <raphael@marmier.net>
parents:
1303
diff
changeset
|
21 |
45235e492cc6
Disable automatic line endings conversion on windows
Raphael Marmier <raphael@marmier.net>
parents:
1303
diff
changeset
|
22 ; ** = cleverencode: |
1298
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
23 |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
24 ; Alternatively, you can explicitly specify each file extension that |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
25 ; you want encoded (any you omit will be left untouched), like this: |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
26 |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
27 ; *.txt = dumbencode: |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
28 |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
29 |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
30 [decode] |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
31 ; Decode files that don't contain NUL characters. |
2550
45235e492cc6
Disable automatic line endings conversion on windows
Raphael Marmier <raphael@marmier.net>
parents:
1303
diff
changeset
|
32 |
45235e492cc6
Disable automatic line endings conversion on windows
Raphael Marmier <raphael@marmier.net>
parents:
1303
diff
changeset
|
33 ; ** = cleverdecode: |
1298
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
34 |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
35 ; Alternatively, you can explicitly specify each file extension that |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
36 ; you want decoded (any you omit will be left untouched), like this: |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
37 |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
38 ; **.txt = dumbdecode: |