Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/patch.py @ 12070:fddacca3202e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable
author Martin Geisler <mg@lazybytes.net>
date Sun, 29 Aug 2010 22:55:37 +0200
parents ad787252fed6 a4fbbe0fbc38
children be9c4131a8f4
comparison
equal deleted inserted replaced
12066:d01e28657429 12070:fddacca3202e
1282 if files is None: 1282 if files is None:
1283 files = {} 1283 files = {}
1284 if eolmode is None: 1284 if eolmode is None:
1285 eolmode = ui.config('patch', 'eol', 'strict') 1285 eolmode = ui.config('patch', 'eol', 'strict')
1286 if eolmode.lower() not in eolmodes: 1286 if eolmode.lower() not in eolmodes:
1287 raise util.Abort(_('Unsupported line endings type: %s') % eolmode) 1287 raise util.Abort(_('unsupported line endings type: %s') % eolmode)
1288 eolmode = eolmode.lower() 1288 eolmode = eolmode.lower()
1289 1289
1290 try: 1290 try:
1291 fp = open(patchobj, 'rb') 1291 fp = open(patchobj, 'rb')
1292 except TypeError: 1292 except TypeError: