Show More
@@ -73,9 +73,9 b'' | |||||
73 |
|
73 | |||
74 | # hgext.churn = /home/user/hg/hg/contrib/churn.py |
|
74 | # hgext.churn = /home/user/hg/hg/contrib/churn.py | |
75 |
|
75 | |||
76 | ### win32text - line ending conversion filters for the Windows platform |
|
76 | ### eol - automatic management of line endings | |
77 |
|
77 | |||
78 |
# hgext. |
|
78 | # hgext.eol = | |
79 |
|
79 | |||
80 | ### --- hgk additional configuration |
|
80 | ### --- hgk additional configuration | |
81 |
|
81 |
@@ -43,6 +43,7 b' editor = notepad' | |||||
43 | ;churn = |
|
43 | ;churn = | |
44 | ;color = |
|
44 | ;color = | |
45 | ;convert = |
|
45 | ;convert = | |
|
46 | ;eol = | |||
46 | ;extdiff = |
|
47 | ;extdiff = | |
47 | ;fetch = |
|
48 | ;fetch = | |
48 | ;gpg = |
|
49 | ;gpg = | |
@@ -63,39 +64,8 b' editor = notepad' | |||||
63 | ;record = |
|
64 | ;record = | |
64 | ;transplant = |
|
65 | ;transplant = | |
65 | ;win32mbcs = |
|
66 | ;win32mbcs = | |
66 | ;win32text = |
|
|||
67 | ;zeroconf = |
|
67 | ;zeroconf = | |
68 |
|
68 | |||
69 | ; To use cleverencode/cleverdecode, you must enable win32text extension |
|
|||
70 |
|
||||
71 | [encode] |
|
|||
72 | ; Encode files that don't contain NUL characters. |
|
|||
73 |
|
||||
74 | ; ** = cleverencode: |
|
|||
75 |
|
||||
76 | ; Alternatively, you can explicitly specify each file extension that |
|
|||
77 | ; you want encoded (any you omit will be left untouched), like this: |
|
|||
78 |
|
||||
79 | ; *.txt = dumbencode: |
|
|||
80 |
|
||||
81 |
|
||||
82 | [decode] |
|
|||
83 | ; Decode files that don't contain NUL characters. |
|
|||
84 |
|
||||
85 | ; ** = cleverdecode: |
|
|||
86 |
|
||||
87 | ; Alternatively, you can explicitly specify each file extension that |
|
|||
88 | ; you want decoded (any you omit will be left untouched), like this: |
|
|||
89 |
|
||||
90 | ; **.txt = dumbdecode: |
|
|||
91 |
|
||||
92 | [patch] |
|
|||
93 | ; If you enable win32text filtering, you will want to enable this |
|
|||
94 | ; line as well to allow patching to work correctly. |
|
|||
95 |
|
||||
96 | ; eol = crlf |
|
|||
97 |
|
||||
98 |
|
||||
99 | ; |
|
69 | ; | |
100 | ; Define external diff commands |
|
70 | ; Define external diff commands | |
101 | ; |
|
71 | ; |
@@ -294,24 +294,9 b' the command.' | |||||
294 | where the standard shell I/O redirection operators often have |
|
294 | where the standard shell I/O redirection operators often have | |
295 | strange effects and may corrupt the contents of your files. |
|
295 | strange effects and may corrupt the contents of your files. | |
296 |
|
296 | |||
297 | The most common usage is for LF <-> CRLF translation on Windows. For |
|
297 | This filter mechanism is used internally by the ``eol`` extension to | |
298 | this, use the "smart" converters which check for binary files:: |
|
298 | translate line ending characters between Windows (CRLF) and Unix (LF) | |
299 |
|
299 | format. We suggest you use the ``eol`` extension for convenience. | ||
300 | [extensions] |
|
|||
301 | hgext.win32text = |
|
|||
302 | [encode] |
|
|||
303 | ** = cleverencode: |
|
|||
304 | [decode] |
|
|||
305 | ** = cleverdecode: |
|
|||
306 |
|
||||
307 | or if you only want to translate certain files:: |
|
|||
308 |
|
||||
309 | [extensions] |
|
|||
310 | hgext.win32text = |
|
|||
311 | [encode] |
|
|||
312 | **.txt = dumbencode: |
|
|||
313 | [decode] |
|
|||
314 | **.txt = dumbdecode: |
|
|||
315 |
|
300 | |||
316 |
|
301 | |||
317 | ``defaults`` |
|
302 | ``defaults`` |
@@ -7,6 +7,14 b'' | |||||
7 |
|
7 | |||
8 | '''perform automatic newline conversion |
|
8 | '''perform automatic newline conversion | |
9 |
|
9 | |||
|
10 | Deprecation: The win32text extension requires each user to configure | |||
|
11 | the extension again and again for each clone since the configuration | |||
|
12 | is not copied when cloning. | |||
|
13 | ||||
|
14 | We have therefore made the ``eol`` as an alternative. The ``eol`` | |||
|
15 | uses a version controlled file for its configuration and each clone | |||
|
16 | will therefore use the right settings from the start. | |||
|
17 | ||||
10 | To perform automatic newline conversion, use:: |
|
18 | To perform automatic newline conversion, use:: | |
11 |
|
19 | |||
12 | [extensions] |
|
20 | [extensions] |
General Comments 0
You need to be logged in to leave comments.
Login now