##// END OF EJS Templates
py3: manually import pycompat.open into files that need it...
py3: manually import pycompat.open into files that need it We want to eliminate the source transformer. Currently it inserts a `from mercurial.pycompat import ...` at the top of files to alias some builtins. This commit replaces the implicit import of `open` with an explicit import on files that need it and changes the source transformer to no longer import `open`. As part of this, we needed to store an explicit local for `open` in the Python 2 code path in `pycompat` so the import works. (Builtins that are automatically in scope cannot be imported.) Differential Revision: https://phab.mercurial-scm.org/D7005

File last commit:

r43347:687b865b default
r43355:eef9a2d6 default
Show More
eol.py
468 lines | 15.8 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``
Yuya Nishihara
eol: replace "working copy" with "working directory" in extension help
r24367 configuration file found in the root of the working directory. 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
Yuya Nishihara
eol: replace "working copy" with "working directory" in extension help
r24367 converted between the working directory and the repository. The format is
Erik Zielke
eol: improve help on whether EOLs are changed in working copy or repository...
r13124 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
timeless@mozdev.org
spelling: behaviour -> behavior
r26098 default behavior; it is only needed if you need to override a later,
Erik Zielke
eol: improve help on whether EOLs are changed in working copy or repository...
r13124 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::
Simon Heimberg
documentation: add an extra newline after note directive...
r19997
Erik Zielke
eol: improve help on whether EOLs are changed in working copy or repository...
r13124 The rules will first apply when files are touched in the working
Yuya Nishihara
eol: replace "working copy" with "working directory" in extension help
r24367 directory, e.g. by updating to null and back to tip to touch all files.
Erik Zielke
eol: improve help on whether EOLs are changed in working copy or repository...
r13124
Martin Geisler
eol: document new eol.fix-trailing-newline setting
r14856 The extension uses an optional ``[eol]`` section read from both the
normal Mercurial configuration files and the ``.hgeol`` file, with the
latter overriding the former. You can use that section to control the
overall behavior. There are three settings:
Martin Geisler
eol: extension for managing file EOLs
r11249
- ``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: document new eol.fix-trailing-newline setting
r14856 - ``eol.fix-trailing-newline`` (default False) can be set to True to
Matt Mackall
eol: fix silly test-gendoc breakage by escaping control characters
r14857 ensure that converted files end with a EOL character (either ``\\n``
or ``\\r\\n`` as per the configured patterns).
Martin Geisler
eol: document new eol.fix-trailing-newline setting
r14856
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.
"""
Pulkit Goyal
py3: make eol use absolute_import
r28969 from __future__ import absolute_import
import os
import re
Martin Geisler
eol: extension for managing file EOLs
r11249 from mercurial.i18n import _
Pulkit Goyal
py3: make eol use absolute_import
r28969 from mercurial import (
config,
eol: import 'error' as 'errormod'...
r32995 error as errormod,
Pulkit Goyal
py3: make eol use absolute_import
r28969 extensions,
match,
Yuya Nishihara
pycompat: provide bytes os.linesep
r31775 pycompat,
Boris Feld
configitems: register the 'eol.fix-trailing-newline' config
r34119 registrar,
Martin von Zweigbergk
eol: look up partial nodeid as partial nodeid...
r37525 scmutil,
Pulkit Goyal
py3: make eol use absolute_import
r28969 util,
)
Augie Fackler
formatting: blacken the codebase...
r43346 from mercurial.utils import stringutil
Martin Geisler
eol: extension for managing file EOLs
r11249
Augie Fackler
extensions: change magic "shipped with hg" string...
r29841 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
Augie Fackler
extensions: document that `testedwith = 'internal'` is special...
r25186 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
# be specifying the version(s) of Mercurial they are tested with, or
# leave the attribute unspecified.
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 testedwith = b'ships-with-hg-core'
Augie Fackler
hgext: mark all first-party extensions as such
r16743
Boris Feld
configitems: register the 'eol.fix-trailing-newline' config
r34119 configtable = {}
configitem = registrar.configitem(configtable)
Augie Fackler
formatting: blacken the codebase...
r43346 configitem(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'eol', b'fix-trailing-newline', default=False,
Boris Feld
configitems: register the 'eol.fix-trailing-newline' config
r34119 )
Augie Fackler
formatting: blacken the codebase...
r43346 configitem(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'eol', b'native', default=pycompat.oslinesep,
Boris Feld
configitems: register the 'eol.native' config
r34120 )
Augie Fackler
formatting: blacken the codebase...
r43346 configitem(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'eol', b'only-consistent', default=True,
Boris Feld
configitems: register the 'eol.only-consistent' config
r34121 )
Boris Feld
configitems: register the 'eol.fix-trailing-newline' config
r34119
Martin Geisler
eol: extension for managing file EOLs
r11249 # Matches a lone LF, i.e., one that is not part of CRLF.
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 singlelf = re.compile(b'(^|[^\r])\n')
Martin Geisler
eol: extension for managing file EOLs
r11249
Augie Fackler
formatting: blacken the codebase...
r43346
Martin Geisler
eol: extension for managing file EOLs
r11249 def inconsistenteol(data):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return b'\r\n' in data and singlelf.search(data)
Martin Geisler
eol: extension for managing file EOLs
r11249
Augie Fackler
formatting: blacken the codebase...
r43346
Martin Geisler
eol: extension for managing file EOLs
r11249 def tolf(s, params, ui, **kwargs):
"""Filter to convert to LF EOLs."""
Yuya Nishihara
stringutil: bulk-replace call sites to point to new module...
r37102 if stringutil.binary(s):
Martin Geisler
eol: extension for managing file EOLs
r11249 return s
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if ui.configbool(b'eol', b'only-consistent') and inconsistenteol(s):
Martin Geisler
eol: extension for managing file EOLs
r11249 return s
Augie Fackler
formatting: blacken the codebase...
r43346 if (
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 ui.configbool(b'eol', b'fix-trailing-newline')
Augie Fackler
formatting: blacken the codebase...
r43346 and s
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 and not s.endswith(b'\n')
Augie Fackler
formatting: blacken the codebase...
r43346 ):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 s = s + b'\n'
Yuya Nishihara
util: extract pure tolf/tocrlf() functions from eol extension...
r31776 return util.tolf(s)
Martin Geisler
eol: extension for managing file EOLs
r11249
Augie Fackler
formatting: blacken the codebase...
r43346
Martin Geisler
eol: extension for managing file EOLs
r11249 def tocrlf(s, params, ui, **kwargs):
"""Filter to convert to CRLF EOLs."""
Yuya Nishihara
stringutil: bulk-replace call sites to point to new module...
r37102 if stringutil.binary(s):
Martin Geisler
eol: extension for managing file EOLs
r11249 return s
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if ui.configbool(b'eol', b'only-consistent') and inconsistenteol(s):
Martin Geisler
eol: extension for managing file EOLs
r11249 return s
Augie Fackler
formatting: blacken the codebase...
r43346 if (
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 ui.configbool(b'eol', b'fix-trailing-newline')
Augie Fackler
formatting: blacken the codebase...
r43346 and s
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 and not s.endswith(b'\n')
Augie Fackler
formatting: blacken the codebase...
r43346 ):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 s = s + b'\n'
Yuya Nishihara
util: extract pure tolf/tocrlf() functions from eol extension...
r31776 return util.tocrlf(s)
Martin Geisler
eol: extension for managing file EOLs
r11249
Augie Fackler
formatting: blacken the codebase...
r43346
Martin Geisler
eol: extension for managing file EOLs
r11249 def isbinary(s, params):
"""Filter to do nothing with the file."""
return s
Augie Fackler
formatting: blacken the codebase...
r43346
Martin Geisler
eol: extension for managing file EOLs
r11249 filters = {
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'to-lf': tolf,
b'to-crlf': tocrlf,
b'is-binary': isbinary,
Colin Caughie
eol: added filter aliases for backwards compatibility with win32text...
r12975 # The following provide backwards compatibility with win32text
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'cleverencode:': tolf,
b'cleverdecode:': tocrlf,
Martin Geisler
eol: extension for managing file EOLs
r11249 }
Augie Fackler
formatting: blacken the codebase...
r43346
Patrick Mezard
eol: separate .hgeol parsing from merge in ui...
r13613 class eolfile(object):
def __init__(self, ui, root, data):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 self._decode = {
b'LF': b'to-lf',
b'CRLF': b'to-crlf',
b'BIN': b'is-binary',
}
self._encode = {
b'LF': b'to-lf',
b'CRLF': b'to-crlf',
b'BIN': b'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.
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 self.cfg.set(b'patterns', b'.hg*', b'BIN', b'eol')
Patrick Mezard
eol: separate .hgeol parsing from merge in ui...
r13613 # We can then parse the user's patterns.
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 self.cfg.parse(b'.hgeol', data)
Patrick Mezard
eol: separate .hgeol parsing from merge in ui...
r13613
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 isrepolf = self.cfg.get(b'repository', b'native') != b'CRLF'
self._encode[b'NATIVE'] = isrepolf and b'to-lf' or b'to-crlf'
iswdlf = ui.config(b'eol', b'native') in (b'LF', b'\n')
self._decode[b'NATIVE'] = iswdlf and b'to-lf' or b'to-crlf'
Patrick Mezard
eol: separate .hgeol parsing from merge in ui...
r13613
include = []
exclude = []
Mads Kiilerich
eol: store and reuse pattern matchers instead of creating in tight loop...
r30114 self.patterns = []
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 for pattern, style in self.cfg.items(b'patterns'):
Patrick Mezard
eol: separate .hgeol parsing from merge in ui...
r13613 key = style.upper()
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if key == b'BIN':
Patrick Mezard
eol: separate .hgeol parsing from merge in ui...
r13613 exclude.append(pattern)
else:
include.append(pattern)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 m = match.match(root, b'', [pattern])
Mads Kiilerich
eol: store and reuse pattern matchers instead of creating in tight loop...
r30114 self.patterns.append((pattern, key, m))
Patrick Mezard
eol: separate .hgeol parsing from merge in ui...
r13613 # This will match the files for which we need to care
# about inconsistent newlines.
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 self.match = match.match(root, b'', [], include, exclude)
Patrick Mezard
eol: separate .hgeol parsing from merge in ui...
r13613
Stepan Koltsov
eol: eol.only-consistent can now be specified in .hgeol
r14854 def copytoui(self, ui):
Mads Kiilerich
eol: store and reuse pattern matchers instead of creating in tight loop...
r30114 for pattern, key, m in self.patterns:
Patrick Mezard
eol: separate .hgeol parsing from merge in ui...
r13613 try:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 ui.setconfig(b'decode', pattern, self._decode[key], b'eol')
ui.setconfig(b'encode', pattern, self._encode[key], b'eol')
Patrick Mezard
eol: separate .hgeol parsing from merge in ui...
r13613 except KeyError:
Augie Fackler
formatting: blacken the codebase...
r43346 ui.warn(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _(b"ignoring unknown EOL style '%s' from %s\n")
% (key, self.cfg.source(b'patterns', pattern))
Augie Fackler
formatting: blacken the codebase...
r43346 )
Stepan Koltsov
eol: eol.only-consistent can now be specified in .hgeol
r14854 # eol.only-consistent can be specified in ~/.hgrc or .hgeol
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 for k, v in self.cfg.items(b'eol'):
ui.setconfig(b'eol', k, v, b'eol')
Patrick Mezard
eol: separate .hgeol parsing from merge in ui...
r13613
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 = []
Augie Fackler
formatting: blacken the codebase...
r43346 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
Mads Kiilerich
eol: store and reuse pattern matchers instead of creating in tight loop...
r30114 for pattern, key, m in self.patterns:
if not m(f):
Patrick Mezard
eol: the hook no longer requires the extension to be loaded...
r13615 continue
Mads Kiilerich
eol: store and reuse pattern matchers instead of creating in tight loop...
r30114 target = self._encode[key]
Patrick Mezard
eol: the hook no longer requires the extension to be loaded...
r13615 data = ctx[f].data()
Augie Fackler
formatting: blacken the codebase...
r43346 if (
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 target == b"to-lf"
and b"\r\n" in data
or target == b"to-crlf"
Augie Fackler
formatting: blacken the codebase...
r43346 and singlelf.search(data)
):
Pulkit Goyal
py3: use bytes() instead of str()...
r36685 failed.append((f, target, bytes(ctx)))
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
Augie Fackler
formatting: blacken the codebase...
r43346
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.
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 data = repo.wvfs(b'.hgeol').read()
Patrick Mezard
eol: extract parsing error handling in parseeol()
r13614 else:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 data = repo[node][b'.hgeol'].data()
Patrick Mezard
eol: extract parsing error handling in parseeol()
r13614 return eolfile(ui, repo.root, data)
except (IOError, LookupError):
pass
eol: import 'error' as 'errormod'...
r32995 except errormod.ParseError as inst:
Augie Fackler
formatting: blacken the codebase...
r43346 ui.warn(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _(
b"warning: ignoring .hgeol file due to parse error "
b"at %s: %s\n"
)
Augie Fackler
formatting: blacken the codebase...
r43346 % (inst.args[1], inst.args[0])
)
Patrick Mezard
eol: extract parsing error handling in parseeol()
r13614 return None
Martin Geisler
eol: extension for managing file EOLs
r11249
Augie Fackler
formatting: blacken the codebase...
r43346
Boris Feld
eol: ensure the eol extensions is loaded when hooks run...
r34831 def ensureenabled(ui):
"""make sure the extension is enabled when used as hook
When eol is used through hooks, the extension is never formally loaded and
enabled. This has some side effect, for example the config declaration is
never loaded. This function ensure the extension is enabled when running
hooks.
"""
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if b'eol' in ui._knownconfig:
Boris Feld
eol: ensure the eol extensions is loaded when hooks run...
r34831 return
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 ui.setconfig(b'extensions', b'eol', b'', source=b'internal')
extensions.loadall(ui, [b'eol'])
Boris Feld
eol: ensure the eol extensions is loaded when hooks run...
r34831
Augie Fackler
formatting: blacken the codebase...
r43346
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
Boris Feld
eol: ensure the eol extensions is loaded when hooks run...
r34831 ensureenabled(ui)
Martin Geisler
eol: extension for managing file EOLs
r11249 files = set()
Patrick Mezard
eol: rename hook into checkheadshook, add checkallhook (issue2665)...
r13617 revs = set()
Gregory Szorc
global: use pycompat.xrange()...
r38806 for rev in pycompat.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:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 eols = {b'to-lf': b'CRLF', b'to-crlf': b'LF'}
Patrick Mezard
eol: improve hook failure output...
r13649 msgs = []
Bryan O'Sullivan
eol: make output stable...
r27524 for f, target, node in sorted(failed):
Augie Fackler
formatting: blacken the codebase...
r43346 msgs.append(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _(b" %s in %s should not have %s line endings")
Augie Fackler
formatting: blacken the codebase...
r43346 % (f, node, eols[target])
)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 raise errormod.Abort(
_(b"end-of-line check failed:\n") + b"\n".join(msgs)
)
Martin Geisler
eol: extension for managing file EOLs
r11249
Augie Fackler
formatting: blacken the codebase...
r43346
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)
Augie Fackler
formatting: blacken the codebase...
r43346
Patrick Mezard
eol: rename hook into checkheadshook, add checkallhook (issue2665)...
r13617 def checkheadshook(ui, repo, node, hooktype, **kwargs):
"""verify that files have expected EOLs"""
_checkhook(ui, repo, node, True)
Augie Fackler
formatting: blacken the codebase...
r43346
Patrick Mezard
eol: rename hook into checkheadshook, add checkallhook (issue2665)...
r13617 # "checkheadshook" used to be called "hook"
hook = checkheadshook
Martin Geisler
eol: extension for managing file EOLs
r11249
Augie Fackler
formatting: blacken the codebase...
r43346
Martin Geisler
eol: extension for managing file EOLs
r11249 def preupdate(ui, repo, hooktype, parent1, parent2):
Martin von Zweigbergk
scmutil: rename resolvepartialhexnodeid() to resolvehexnodeidprefix()...
r37696 p1node = scmutil.resolvehexnodeidprefix(repo, parent1)
Martin von Zweigbergk
eol: look up partial nodeid as partial nodeid...
r37525 repo.loadeol([p1node])
Martin Geisler
eol: extension for managing file EOLs
r11249 return False
Augie Fackler
formatting: blacken the codebase...
r43346
Martin Geisler
eol: extension for managing file EOLs
r11249 def uisetup(ui):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 ui.setconfig(b'hooks', b'preupdate.eol', preupdate, b'eol')
Martin Geisler
eol: extension for managing file EOLs
r11249
Augie Fackler
formatting: blacken the codebase...
r43346
Martin Geisler
eol: extension for managing file EOLs
r11249 def extsetup(ui):
try:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 extensions.find(b'win32text')
Augie Fackler
formatting: blacken the codebase...
r43346 ui.warn(
_(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b"the eol extension is incompatible with the "
b"win32text extension\n"
Augie Fackler
formatting: blacken the codebase...
r43346 )
)
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
if not repo.local():
return
for name, fn in filters.iteritems():
repo.adddatafilter(name, fn)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 ui.setconfig(b'patch', b'eol', b'auto', b'eol')
Martin Geisler
eol: extension for managing file EOLs
r11249
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
Stepan Koltsov
eol: eol.only-consistent can now be specified in .hgeol
r14854 eol.copytoui(self.ui)
Patrick Mezard
eol: separate .hgeol parsing from merge in ui...
r13613 return eol.match
Martin Geisler
eol: extension for managing file EOLs
r11249
def _hgcleardirstate(self):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 self._eolmatch = self.loadeol([None, b'tip'])
Mads Kiilerich
eol: fix variable naming - call it _eolmatch instead of _eolfile...
r30113 if not self._eolmatch:
self._eolmatch = util.never
Martin Geisler
eol: extension for managing file EOLs
r11249 return
Mads Kiilerich
eol: on update, only re-check files if filtering changed...
r30140 oldeol = None
Martin Geisler
eol: extension for managing file EOLs
r11249 try:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 cachemtime = os.path.getmtime(self.vfs.join(b"eol.cache"))
Martin Geisler
eol: extension for managing file EOLs
r11249 except OSError:
cachemtime = 0
Mads Kiilerich
eol: on update, only re-check files if filtering changed...
r30140 else:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 olddata = self.vfs.read(b"eol.cache")
Mads Kiilerich
eol: on update, only re-check files if filtering changed...
r30140 if olddata:
oldeol = eolfile(self.ui, self.root, olddata)
Martin Geisler
eol: extension for managing file EOLs
r11249
try:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 eolmtime = os.path.getmtime(self.wjoin(b".hgeol"))
Martin Geisler
eol: extension for managing file EOLs
r11249 except OSError:
eolmtime = 0
if eolmtime > cachemtime:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 self.ui.debug(b"eol: detected change in .hgeol\n")
Mads Kiilerich
eol: on update, only re-check files if filtering changed...
r30140
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 hgeoldata = self.wvfs.read(b'.hgeol')
Mads Kiilerich
eol: on update, only re-check files if filtering changed...
r30140 neweol = eolfile(self.ui, self.root, hgeoldata)
Martin Geisler
eol: extension for managing file EOLs
r11249 wlock = None
try:
wlock = self.wlock()
Martin Geisler
eol: use dirstate methods to clear dirstate...
r13581 for f in self.dirstate:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if self.dirstate[f] != b'n':
Mads Kiilerich
eol: on update, only re-check files if filtering changed...
r30140 continue
if oldeol is not None:
if not oldeol.match(f) and not neweol.match(f):
continue
oldkey = None
for pattern, key, m in oldeol.patterns:
if m(f):
oldkey = key
break
newkey = None
for pattern, key, m in neweol.patterns:
if m(f):
newkey = key
break
if oldkey == newkey:
continue
# all normal files need to be looked at again since
# the new .hgeol file specify a different filter
self.dirstate.normallookup(f)
# Write the cache to update mtime and cache .hgeol
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 with self.vfs(b"eol.cache", b"w") as f:
Mads Kiilerich
eol: on update, only re-check files if filtering changed...
r30140 f.write(hgeoldata)
eol: import 'error' as 'errormod'...
r32995 except errormod.LockUnavailable:
Martin Geisler
eol: handle LockUnavailable error (issue2569)...
r13475 # 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
Pierre-Yves David
eol: make sure we always release the wlock when writing cache...
r30164 finally:
if wlock is not None:
wlock.release()
Martin Geisler
eol: extension for managing file EOLs
r11249
Valentin Gatien-Baron
convert: add a config option to help doing identity hg->hg conversion...
r42839 def commitctx(self, ctx, error=False, origctx=None):
Martin Geisler
eol: extension for managing file EOLs
r11249 for f in sorted(ctx.added() + ctx.modified()):
Mads Kiilerich
eol: fix variable naming - call it _eolmatch instead of _eolfile...
r30113 if not self._eolmatch(f):
Martin Geisler
eol: extension for managing file EOLs
r11249 continue
Mads Kiilerich
eol: fix crash when handling removed files...
r23068 fctx = ctx[f]
if fctx is None:
Nicholas Riley
eol: ignore IOError from deleted files in commitctx...
r14862 continue
Mads Kiilerich
eol: fix crash when handling removed files...
r23068 data = fctx.data()
Yuya Nishihara
stringutil: bulk-replace call sites to point to new module...
r37102 if stringutil.binary(data):
Martin Geisler
eol: extension for managing file EOLs
r11249 # 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):
Augie Fackler
formatting: blacken the codebase...
r43346 raise errormod.Abort(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _(b"inconsistent newline style " b"in %s\n") % f
Augie Fackler
formatting: blacken the codebase...
r43346 )
Valentin Gatien-Baron
convert: add a config option to help doing identity hg->hg conversion...
r42839 return super(eolrepo, self).commitctx(ctx, error, origctx)
Augie Fackler
formatting: blacken the codebase...
r43346
Martin Geisler
eol: extension for managing file EOLs
r11249 repo.__class__ = eolrepo
repo._hgcleardirstate()