Mercurial > hg
comparison hgext/eol.py @ 12976:793563fd88c0
merge with stable
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Sat, 13 Nov 2010 15:12:09 +0100 |
| parents | 278e3c9b939e 75e4fade4ad9 |
| children | 733345a127ca |
comparison
equal
deleted
inserted
replaced
| 12975:278e3c9b939e | 12976:793563fd88c0 |
|---|---|
| 177 self._decode['NATIVE'] = 'to-lf' | 177 self._decode['NATIVE'] = 'to-lf' |
| 178 else: | 178 else: |
| 179 self._decode['NATIVE'] = 'to-crlf' | 179 self._decode['NATIVE'] = 'to-crlf' |
| 180 | 180 |
| 181 eol = config.config() | 181 eol = config.config() |
| 182 # Our files should not be touched. The pattern must be | |
| 183 # inserted first override a '** = native' pattern. | |
| 184 eol.set('patterns', '.hg*', 'BIN') | |
| 185 # We can then parse the user's patterns. | |
| 182 eol.parse('.hgeol', data) | 186 eol.parse('.hgeol', data) |
| 183 | 187 |
| 184 if eol.get('repository', 'native') == 'CRLF': | 188 if eol.get('repository', 'native') == 'CRLF': |
| 185 self._encode['NATIVE'] = 'to-crlf' | 189 self._encode['NATIVE'] = 'to-crlf' |
| 186 else: | 190 else: |