##// END OF EJS Templates
merge with abuehl
merge with abuehl

File last commit:

r13650:56e71e7d default
r14238:d466d592 merge default
Show More
eol.py
332 lines | 12.3 KiB | text/x-python | PythonLexer
Martin Geisler
eol: extension for managing file EOLs
r11249 """automatically manage newlines in repository files
This extension allows you to manage the type of line endings (CRLF or
LF) that are used in the repository and in the local working
directory. That way you can get CRLF line endings on Windows and LF on
Unix/Mac, thereby letting everybody use their OS native line endings.
The extension reads its configuration from a versioned ``.hgeol``
Martin Geisler
eol: clarify where the .hgeol file is located
r13471 configuration file found in the root of the working copy. The
Martin Geisler
eol: extension for managing file EOLs
r11249 ``.hgeol`` file use the same syntax as all other Mercurial
configuration files. It uses two sections, ``[patterns]`` and
``[repository]``.
Erik Zielke
eol: improve help on whether EOLs are changed in working copy or repository...
r13124 The ``[patterns]`` section specifies how line endings should be
converted between the working copy and the repository. The format is
specified by a file pattern. The first match is used, so put more
specific patterns first. The available line endings are ``LF``,
``CRLF``, and ``BIN``.
Martin Geisler
eol: extension for managing file EOLs
r11249
Files with the declared format of ``CRLF`` or ``LF`` are always
Erik Zielke
eol: improve help on whether EOLs are changed in working copy or repository...
r13124 checked out and stored in the repository in that format and files
declared to be binary (``BIN``) are left unchanged. Additionally,
``native`` is an alias for checking out in the platform's default line
ending: ``LF`` on Unix (including Mac OS X) and ``CRLF`` on
Windows. Note that ``BIN`` (do nothing to line endings) is Mercurial's
default behaviour; it is only needed if you need to override a later,
more general pattern.
Martin Geisler
eol: extension for managing file EOLs
r11249
The optional ``[repository]`` section specifies the line endings to
use for files stored in the repository. It has a single setting,
``native``, which determines the storage line endings for files
declared as ``native`` in the ``[patterns]`` section. It can be set to
``LF`` or ``CRLF``. The default is ``LF``. For example, this means
that on Windows, files configured as ``native`` (``CRLF`` by default)
will be converted to ``LF`` when stored in the repository. Files
declared as ``LF``, ``CRLF``, or ``BIN`` in the ``[patterns]`` section
are always stored as-is in the repository.
Example versioned ``.hgeol`` file::
[patterns]
**.py = native
**.vcproj = CRLF
**.txt = native
Makefile = LF
**.jpg = BIN
[repository]
native = LF
Erik Zielke
eol: improve help on whether EOLs are changed in working copy or repository...
r13124 .. note::
The rules will first apply when files are touched in the working
copy, e.g. by updating to null and back to tip to touch all files.
Martin Geisler
eol: extension for managing file EOLs
r11249 The extension uses an optional ``[eol]`` section in your hgrc file
(not the ``.hgeol`` file) for settings that control the overall
behavior. There are two settings:
- ``eol.native`` (default ``os.linesep``) can be set to ``LF`` or
Georg Brandl
eol: add missing word in module docstring
r12802 ``CRLF`` to override the default interpretation of ``native`` for
Martin Geisler
eol: extension for managing file EOLs
r11249 checkout. This can be used with :hg:`archive` on Unix, say, to
generate an archive where files have line endings for Windows.
- ``eol.only-consistent`` (default True) can be set to False to make
the extension convert files with inconsistent EOLs. Inconsistent
means that there is both ``CRLF`` and ``LF`` present in the file.
Such files are normally not touched under the assumption that they
have mixed EOLs on purpose.
Martin Geisler
eol: fix win32text encode/decode filter names
r12979 The extension provides ``cleverencode:`` and ``cleverdecode:`` filters
like the deprecated win32text extension does. This means that you can
disable win32text and enable eol and your filters will still work. You
only need to these filters until you have prepared a ``.hgeol`` file.
Martin Geisler
eol: mention the hook in the module docstring
r12980 The ``win32text.forbid*`` hooks provided by the win32text extension
Patrick Mezard
eol: rename hook into checkheadshook, add checkallhook (issue2665)...
r13617 have been unified into a single hook named ``eol.checkheadshook``. The
hook will lookup the expected line endings from the ``.hgeol`` file,
which means you must migrate to a ``.hgeol`` file first before using
the hook. ``eol.checkheadshook`` only checks heads, intermediate
invalid revisions will be pushed. To forbid them completely, use the
``eol.checkallhook`` hook. These hooks are best used as
``pretxnchangegroup`` hooks.
Martin Geisler
eol: mention the hook in the module docstring
r12980
Martin Geisler
eol: extension for managing file EOLs
r11249 See :hg:`help patterns` for more information about the glob patterns
used.
"""
from mercurial.i18n import _
Martin Geisler
eol: handle LockUnavailable error (issue2569)...
r13475 from mercurial import util, config, extensions, match, error
Martin Geisler
eol: extension for managing file EOLs
r11249 import re, os
# Matches a lone LF, i.e., one that is not part of CRLF.
singlelf = re.compile('(^|[^\r])\n')
# Matches a single EOL which can either be a CRLF where repeated CR
# are removed or a LF. We do not care about old Machintosh files, so a
# stray CR is an error.
eolre = re.compile('\r*\n')
def inconsistenteol(data):
return '\r\n' in data and singlelf.search(data)
def tolf(s, params, ui, **kwargs):
"""Filter to convert to LF EOLs."""
if util.binary(s):
return s
if ui.configbool('eol', 'only-consistent', True) and inconsistenteol(s):
return s
return eolre.sub('\n', s)
def tocrlf(s, params, ui, **kwargs):
"""Filter to convert to CRLF EOLs."""
if util.binary(s):
return s
if ui.configbool('eol', 'only-consistent', True) and inconsistenteol(s):
return s
return eolre.sub('\r\n', s)
def isbinary(s, params):
"""Filter to do nothing with the file."""
return s
filters = {
'to-lf': tolf,
'to-crlf': tocrlf,
'is-binary': isbinary,
Colin Caughie
eol: added filter aliases for backwards compatibility with win32text...
r12975 # The following provide backwards compatibility with win32text
Martin Geisler
eol: fix win32text encode/decode filter names
r12979 'cleverencode:': tolf,
'cleverdecode:': tocrlf
Martin Geisler
eol: extension for managing file EOLs
r11249 }
Patrick Mezard
eol: separate .hgeol parsing from merge in ui...
r13613 class eolfile(object):
def __init__(self, ui, root, data):
self._decode = {'LF': 'to-lf', 'CRLF': 'to-crlf', 'BIN': 'is-binary'}
self._encode = {'LF': 'to-lf', 'CRLF': 'to-crlf', 'BIN': 'is-binary'}
Martin Geisler
eol: extension for managing file EOLs
r11249
Patrick Mezard
eol: separate .hgeol parsing from merge in ui...
r13613 self.cfg = config.config()
# Our files should not be touched. The pattern must be
# inserted first override a '** = native' pattern.
self.cfg.set('patterns', '.hg*', 'BIN')
# We can then parse the user's patterns.
self.cfg.parse('.hgeol', data)
isrepolf = self.cfg.get('repository', 'native') != 'CRLF'
self._encode['NATIVE'] = isrepolf and 'to-lf' or 'to-crlf'
iswdlf = ui.config('eol', 'native', os.linesep) in ('LF', '\n')
self._decode['NATIVE'] = iswdlf and 'to-lf' or 'to-crlf'
include = []
exclude = []
for pattern, style in self.cfg.items('patterns'):
key = style.upper()
if key == 'BIN':
exclude.append(pattern)
else:
include.append(pattern)
# This will match the files for which we need to care
# about inconsistent newlines.
self.match = match.match(root, '', [], include, exclude)
def setfilters(self, ui):
for pattern, style in self.cfg.items('patterns'):
key = style.upper()
try:
ui.setconfig('decode', pattern, self._decode[key])
ui.setconfig('encode', pattern, self._encode[key])
except KeyError:
ui.warn(_("ignoring unknown EOL style '%s' from %s\n")
% (style, self.cfg.source('patterns', pattern)))
Patrick Mezard
eol: the hook no longer requires the extension to be loaded...
r13615 def checkrev(self, repo, ctx, files):
Patrick Mezard
eol: improve hook failure output...
r13649 failed = []
Patrick Mezard
eol: no need to accumulate files when checking all changesets...
r13650 for f in (files or ctx.files()):
Patrick Mezard
eol: the hook no longer requires the extension to be loaded...
r13615 if f not in ctx:
continue
for pattern, style in self.cfg.items('patterns'):
if not match.match(repo.root, '', [pattern])(f):
continue
target = self._encode[style.upper()]
data = ctx[f].data()
Patrick Mezard
eol: improve hook failure output...
r13649 if (target == "to-lf" and "\r\n" in data
or target == "to-crlf" and singlelf.search(data)):
failed.append((str(ctx), target, f))
Antoine Pitrou
eol: stop after first matched rule in hook (issue2660)...
r13501 break
Patrick Mezard
eol: improve hook failure output...
r13649 return failed
Martin Geisler
eol: extension for managing file EOLs
r11249
Patrick Mezard
eol: extract parsing error handling in parseeol()
r13614 def parseeol(ui, repo, nodes):
Patrick Mezard
eol: separate .hgeol parsing from merge in ui...
r13613 try:
Patrick Mezard
eol: extract parsing error handling in parseeol()
r13614 for node in nodes:
try:
if node is None:
# Cannot use workingctx.data() since it would load
# and cache the filters before we configure them.
data = repo.wfile('.hgeol').read()
else:
data = repo[node]['.hgeol'].data()
return eolfile(ui, repo.root, data)
except (IOError, LookupError):
pass
except error.ParseError, inst:
ui.warn(_("warning: ignoring .hgeol file due to parse error "
"at %s: %s\n") % (inst.args[1], inst.args[0]))
return None
Martin Geisler
eol: extension for managing file EOLs
r11249
Patrick Mezard
eol: rename hook into checkheadshook, add checkallhook (issue2665)...
r13617 def _checkhook(ui, repo, node, headsonly):
# Get revisions to check and touched files at the same time
Martin Geisler
eol: extension for managing file EOLs
r11249 files = set()
Patrick Mezard
eol: rename hook into checkheadshook, add checkallhook (issue2665)...
r13617 revs = set()
Martin Geisler
eol: extension for managing file EOLs
r11249 for rev in xrange(repo[node].rev(), len(repo)):
Patrick Mezard
eol: rename hook into checkheadshook, add checkallhook (issue2665)...
r13617 revs.add(rev)
if headsonly:
Patrick Mezard
eol: no need to accumulate files when checking all changesets...
r13650 ctx = repo[rev]
files.update(ctx.files())
Patrick Mezard
eol: rename hook into checkheadshook, add checkallhook (issue2665)...
r13617 for pctx in ctx.parents():
revs.discard(pctx.rev())
Patrick Mezard
eol: improve hook failure output...
r13649 failed = []
Patrick Mezard
eol: rename hook into checkheadshook, add checkallhook (issue2665)...
r13617 for rev in revs:
Patrick Mezard
eol: make the hook check all new heads, not only tip (issue2666)...
r13616 ctx = repo[rev]
eol = parseeol(ui, repo, [ctx.node()])
if eol:
Patrick Mezard
eol: improve hook failure output...
r13649 failed.extend(eol.checkrev(repo, ctx, files))
if failed:
eols = {'to-lf': 'CRLF', 'to-crlf': 'LF'}
msgs = []
for node, target, f in failed:
msgs.append(_(" %s in %s should not have %s line endings") %
(f, node, eols[target]))
raise util.Abort(_("end-of-line check failed:\n") + "\n".join(msgs))
Martin Geisler
eol: extension for managing file EOLs
r11249
Patrick Mezard
eol: rename hook into checkheadshook, add checkallhook (issue2665)...
r13617 def checkallhook(ui, repo, node, hooktype, **kwargs):
"""verify that files have expected EOLs"""
_checkhook(ui, repo, node, False)
def checkheadshook(ui, repo, node, hooktype, **kwargs):
"""verify that files have expected EOLs"""
_checkhook(ui, repo, node, True)
# "checkheadshook" used to be called "hook"
hook = checkheadshook
Martin Geisler
eol: extension for managing file EOLs
r11249
def preupdate(ui, repo, hooktype, parent1, parent2):
#print "preupdate for %s: %s -> %s" % (repo.root, parent1, parent2)
Patrick Mezard
eol: extract parsing error handling in parseeol()
r13614 repo.loadeol([parent1])
Martin Geisler
eol: extension for managing file EOLs
r11249 return False
def uisetup(ui):
ui.setconfig('hooks', 'preupdate.eol', preupdate)
def extsetup(ui):
try:
extensions.find('win32text')
Steve Borho
eol: do not abort when win32text is found, only warn...
r13624 ui.warn(_("the eol extension is incompatible with the "
"win32text extension\n"))
Martin Geisler
eol: extension for managing file EOLs
r11249 except KeyError:
pass
def reposetup(ui, repo):
Steve Borho
eol: setup the repo.ui in reposetup()...
r12307 uisetup(repo.ui)
Martin Geisler
eol: extension for managing file EOLs
r11249 #print "reposetup for", repo.root
if not repo.local():
return
for name, fn in filters.iteritems():
repo.adddatafilter(name, fn)
ui.setconfig('patch', 'eol', 'auto')
class eolrepo(repo.__class__):
Patrick Mezard
eol: extract parsing error handling in parseeol()
r13614 def loadeol(self, nodes):
eol = parseeol(self.ui, self, nodes)
Patrick Mezard
eol: separate .hgeol parsing from merge in ui...
r13613 if eol is None:
Patrick Mezard
eol: remove unused argument in readhgeol()
r13612 return None
Patrick Mezard
eol: separate .hgeol parsing from merge in ui...
r13613 eol.setfilters(self.ui)
return eol.match
Martin Geisler
eol: extension for managing file EOLs
r11249
def _hgcleardirstate(self):
Patrick Mezard
eol: extract parsing error handling in parseeol()
r13614 self._eolfile = self.loadeol([None, 'tip'])
Martin Geisler
eol: extension for managing file EOLs
r11249 if not self._eolfile:
self._eolfile = util.never
return
try:
cachemtime = os.path.getmtime(self.join("eol.cache"))
except OSError:
cachemtime = 0
try:
eolmtime = os.path.getmtime(self.wjoin(".hgeol"))
except OSError:
eolmtime = 0
if eolmtime > cachemtime:
ui.debug("eol: detected change in .hgeol\n")
wlock = None
try:
wlock = self.wlock()
Martin Geisler
eol: use dirstate methods to clear dirstate...
r13581 for f in self.dirstate:
if self.dirstate[f] == 'n':
# all normal files need to be looked at
# again since the new .hgeol file might no
# longer match a file it matched before
self.dirstate.normallookup(f)
Martin Geisler
eol: handle LockUnavailable error (issue2569)...
r13475 # Touch the cache to update mtime.
Martin Geisler
eol: extension for managing file EOLs
r11249 self.opener("eol.cache", "w").close()
Martin Geisler
eol: handle LockUnavailable error (issue2569)...
r13475 wlock.release()
except error.LockUnavailable:
# If we cannot lock the repository and clear the
# dirstate, then a commit might not see all files
# as modified. But if we cannot lock the
# repository, then we can also not make a commit,
# so ignore the error.
pass
Martin Geisler
eol: extension for managing file EOLs
r11249
def commitctx(self, ctx, error=False):
for f in sorted(ctx.added() + ctx.modified()):
if not self._eolfile(f):
continue
data = ctx[f].data()
if util.binary(data):
# We should not abort here, since the user should
# be able to say "** = native" to automatically
# have all non-binary files taken care of.
continue
if inconsistenteol(data):
raise util.Abort(_("inconsistent newline style "
"in %s\n" % f))
return super(eolrepo, self).commitctx(ctx, error)
repo.__class__ = eolrepo
repo._hgcleardirstate()