eol.py
480 lines
| 16.2 KiB
| text/x-python
|
PythonLexer
/ hgext / eol.py
Martin Geisler
|
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
|
r24367 | configuration file found in the root of the working directory. The | ||
Martin Geisler
|
r11249 | ``.hgeol`` file use the same syntax as all other Mercurial | ||
configuration files. It uses two sections, ``[patterns]`` and | ||||
``[repository]``. | ||||
Erik Zielke
|
r13124 | The ``[patterns]`` section specifies how line endings should be | ||
Yuya Nishihara
|
r24367 | converted between the working directory and the repository. The format is | ||
Erik Zielke
|
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
|
r11249 | |||
Files with the declared format of ``CRLF`` or ``LF`` are always | ||||
Erik Zielke
|
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
|
r26098 | default behavior; it is only needed if you need to override a later, | ||
Erik Zielke
|
r13124 | more general pattern. | ||
Martin Geisler
|
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
|
r13124 | .. note:: | ||
Simon Heimberg
|
r19997 | |||
Erik Zielke
|
r13124 | The rules will first apply when files are touched in the working | ||
Yuya Nishihara
|
r24367 | directory, e.g. by updating to null and back to tip to touch all files. | ||
Erik Zielke
|
r13124 | |||
Martin Geisler
|
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
|
r11249 | |||
- ``eol.native`` (default ``os.linesep``) can be set to ``LF`` or | ||||
Georg Brandl
|
r12802 | ``CRLF`` to override the default interpretation of ``native`` for | ||
Martin Geisler
|
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
|
r14856 | - ``eol.fix-trailing-newline`` (default False) can be set to True to | ||
Matt Mackall
|
r14857 | ensure that converted files end with a EOL character (either ``\\n`` | ||
or ``\\r\\n`` as per the configured patterns). | ||||
Martin Geisler
|
r14856 | |||
Martin Geisler
|
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
|
r12980 | The ``win32text.forbid*`` hooks provided by the win32text extension | ||
Patrick Mezard
|
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
|
r12980 | |||
Martin Geisler
|
r11249 | See :hg:`help patterns` for more information about the glob patterns | ||
used. | ||||
""" | ||||
Pulkit Goyal
|
r28969 | from __future__ import absolute_import | ||
import os | ||||
import re | ||||
Martin Geisler
|
r11249 | from mercurial.i18n import _ | ||
Pulkit Goyal
|
r28969 | from mercurial import ( | ||
config, | ||||
r32995 | error as errormod, | |||
Pulkit Goyal
|
r28969 | extensions, | ||
match, | ||||
Yuya Nishihara
|
r31775 | pycompat, | ||
Boris Feld
|
r34119 | registrar, | ||
Martin von Zweigbergk
|
r37525 | scmutil, | ||
Pulkit Goyal
|
r28969 | util, | ||
) | ||||
Augie Fackler
|
r43346 | from mercurial.utils import stringutil | ||
Martin Geisler
|
r11249 | |||
Augie Fackler
|
r29841 | # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for | ||
Augie Fackler
|
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
|
r43347 | testedwith = b'ships-with-hg-core' | ||
Augie Fackler
|
r16743 | |||
Boris Feld
|
r34119 | configtable = {} | ||
configitem = registrar.configitem(configtable) | ||||
Augie Fackler
|
r43346 | configitem( | ||
Augie Fackler
|
r46554 | b'eol', | ||
b'fix-trailing-newline', | ||||
default=False, | ||||
Boris Feld
|
r34119 | ) | ||
Augie Fackler
|
r43346 | configitem( | ||
Augie Fackler
|
r46554 | b'eol', | ||
b'native', | ||||
default=pycompat.oslinesep, | ||||
Boris Feld
|
r34120 | ) | ||
Augie Fackler
|
r43346 | configitem( | ||
Augie Fackler
|
r46554 | b'eol', | ||
b'only-consistent', | ||||
default=True, | ||||
Boris Feld
|
r34121 | ) | ||
Boris Feld
|
r34119 | |||
Martin Geisler
|
r11249 | # Matches a lone LF, i.e., one that is not part of CRLF. | ||
Augie Fackler
|
r43347 | singlelf = re.compile(b'(^|[^\r])\n') | ||
Martin Geisler
|
r11249 | |||
Augie Fackler
|
r43346 | |||
Martin Geisler
|
r11249 | def inconsistenteol(data): | ||
Augie Fackler
|
r43347 | return b'\r\n' in data and singlelf.search(data) | ||
Martin Geisler
|
r11249 | |||
Augie Fackler
|
r43346 | |||
Martin Geisler
|
r11249 | def tolf(s, params, ui, **kwargs): | ||
"""Filter to convert to LF EOLs.""" | ||||
Yuya Nishihara
|
r37102 | if stringutil.binary(s): | ||
Martin Geisler
|
r11249 | return s | ||
Augie Fackler
|
r43347 | if ui.configbool(b'eol', b'only-consistent') and inconsistenteol(s): | ||
Martin Geisler
|
r11249 | return s | ||
Augie Fackler
|
r43346 | if ( | ||
Augie Fackler
|
r43347 | ui.configbool(b'eol', b'fix-trailing-newline') | ||
Augie Fackler
|
r43346 | and s | ||
Augie Fackler
|
r43347 | and not s.endswith(b'\n') | ||
Augie Fackler
|
r43346 | ): | ||
Augie Fackler
|
r43347 | s = s + b'\n' | ||
Yuya Nishihara
|
r31776 | return util.tolf(s) | ||
Martin Geisler
|
r11249 | |||
Augie Fackler
|
r43346 | |||
Martin Geisler
|
r11249 | def tocrlf(s, params, ui, **kwargs): | ||
"""Filter to convert to CRLF EOLs.""" | ||||
Yuya Nishihara
|
r37102 | if stringutil.binary(s): | ||
Martin Geisler
|
r11249 | return s | ||
Augie Fackler
|
r43347 | if ui.configbool(b'eol', b'only-consistent') and inconsistenteol(s): | ||
Martin Geisler
|
r11249 | return s | ||
Augie Fackler
|
r43346 | if ( | ||
Augie Fackler
|
r43347 | ui.configbool(b'eol', b'fix-trailing-newline') | ||
Augie Fackler
|
r43346 | and s | ||
Augie Fackler
|
r43347 | and not s.endswith(b'\n') | ||
Augie Fackler
|
r43346 | ): | ||
Augie Fackler
|
r43347 | s = s + b'\n' | ||
Yuya Nishihara
|
r31776 | return util.tocrlf(s) | ||
Martin Geisler
|
r11249 | |||
Augie Fackler
|
r43346 | |||
Mads Kiilerich
|
r43474 | def isbinary(s, params, ui, **kwargs): | ||
Martin Geisler
|
r11249 | """Filter to do nothing with the file.""" | ||
return s | ||||
Augie Fackler
|
r43346 | |||
Martin Geisler
|
r11249 | filters = { | ||
Augie Fackler
|
r43347 | b'to-lf': tolf, | ||
b'to-crlf': tocrlf, | ||||
b'is-binary': isbinary, | ||||
Colin Caughie
|
r12975 | # The following provide backwards compatibility with win32text | ||
Augie Fackler
|
r43347 | b'cleverencode:': tolf, | ||
b'cleverdecode:': tocrlf, | ||||
Martin Geisler
|
r11249 | } | ||
Augie Fackler
|
r43346 | |||
Patrick Mezard
|
r13613 | class eolfile(object): | ||
def __init__(self, ui, root, data): | ||||
Augie Fackler
|
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
|
r11249 | |||
Patrick Mezard
|
r13613 | self.cfg = config.config() | ||
# Our files should not be touched. The pattern must be | ||||
# inserted first override a '** = native' pattern. | ||||
Augie Fackler
|
r43347 | self.cfg.set(b'patterns', b'.hg*', b'BIN', b'eol') | ||
Patrick Mezard
|
r13613 | # We can then parse the user's patterns. | ||
Augie Fackler
|
r43347 | self.cfg.parse(b'.hgeol', data) | ||
Patrick Mezard
|
r13613 | |||
Augie Fackler
|
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
|
r13613 | |||
include = [] | ||||
exclude = [] | ||||
Mads Kiilerich
|
r30114 | self.patterns = [] | ||
Augie Fackler
|
r43347 | for pattern, style in self.cfg.items(b'patterns'): | ||
Patrick Mezard
|
r13613 | key = style.upper() | ||
Augie Fackler
|
r43347 | if key == b'BIN': | ||
Patrick Mezard
|
r13613 | exclude.append(pattern) | ||
else: | ||||
include.append(pattern) | ||||
Augie Fackler
|
r43347 | m = match.match(root, b'', [pattern]) | ||
Mads Kiilerich
|
r30114 | self.patterns.append((pattern, key, m)) | ||
Patrick Mezard
|
r13613 | # This will match the files for which we need to care | ||
# about inconsistent newlines. | ||||
Augie Fackler
|
r43347 | self.match = match.match(root, b'', [], include, exclude) | ||
Patrick Mezard
|
r13613 | |||
Stepan Koltsov
|
r14854 | def copytoui(self, ui): | ||
Augie Fackler
|
r44937 | newpatterns = {pattern for pattern, key, m in self.patterns} | ||
Mads Kiilerich
|
r43476 | for section in (b'decode', b'encode'): | ||
for oldpattern, _filter in ui.configitems(section): | ||||
if oldpattern not in newpatterns: | ||||
if ui.configsource(section, oldpattern) == b'eol': | ||||
ui.setconfig(section, oldpattern, b'!', b'eol') | ||||
Mads Kiilerich
|
r30114 | for pattern, key, m in self.patterns: | ||
Patrick Mezard
|
r13613 | try: | ||
Augie Fackler
|
r43347 | ui.setconfig(b'decode', pattern, self._decode[key], b'eol') | ||
ui.setconfig(b'encode', pattern, self._encode[key], b'eol') | ||||
Patrick Mezard
|
r13613 | except KeyError: | ||
Augie Fackler
|
r43346 | ui.warn( | ||
Augie Fackler
|
r43347 | _(b"ignoring unknown EOL style '%s' from %s\n") | ||
% (key, self.cfg.source(b'patterns', pattern)) | ||||
Augie Fackler
|
r43346 | ) | ||
Stepan Koltsov
|
r14854 | # eol.only-consistent can be specified in ~/.hgrc or .hgeol | ||
Augie Fackler
|
r43347 | for k, v in self.cfg.items(b'eol'): | ||
ui.setconfig(b'eol', k, v, b'eol') | ||||
Patrick Mezard
|
r13613 | |||
Patrick Mezard
|
r13615 | def checkrev(self, repo, ctx, files): | ||
Patrick Mezard
|
r13649 | failed = [] | ||
Augie Fackler
|
r43346 | for f in files or ctx.files(): | ||
Patrick Mezard
|
r13615 | if f not in ctx: | ||
continue | ||||
Mads Kiilerich
|
r30114 | for pattern, key, m in self.patterns: | ||
if not m(f): | ||||
Patrick Mezard
|
r13615 | continue | ||
Mads Kiilerich
|
r30114 | target = self._encode[key] | ||
Patrick Mezard
|
r13615 | data = ctx[f].data() | ||
Augie Fackler
|
r43346 | if ( | ||
Augie Fackler
|
r43347 | target == b"to-lf" | ||
and b"\r\n" in data | ||||
or target == b"to-crlf" | ||||
Augie Fackler
|
r43346 | and singlelf.search(data) | ||
): | ||||
Pulkit Goyal
|
r36685 | failed.append((f, target, bytes(ctx))) | ||
Antoine Pitrou
|
r13501 | break | ||
Patrick Mezard
|
r13649 | return failed | ||
Martin Geisler
|
r11249 | |||
Augie Fackler
|
r43346 | |||
Patrick Mezard
|
r13614 | def parseeol(ui, repo, nodes): | ||
Patrick Mezard
|
r13613 | try: | ||
Patrick Mezard
|
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
|
r43347 | data = repo.wvfs(b'.hgeol').read() | ||
Patrick Mezard
|
r13614 | else: | ||
Augie Fackler
|
r43347 | data = repo[node][b'.hgeol'].data() | ||
Patrick Mezard
|
r13614 | return eolfile(ui, repo.root, data) | ||
except (IOError, LookupError): | ||||
pass | ||||
Martin von Zweigbergk
|
r46506 | except errormod.ConfigError as inst: | ||
Augie Fackler
|
r43346 | ui.warn( | ||
Augie Fackler
|
r43347 | _( | ||
b"warning: ignoring .hgeol file due to parse error " | ||||
b"at %s: %s\n" | ||||
) | ||||
Martin von Zweigbergk
|
r46361 | % (inst.location, inst.message) | ||
Augie Fackler
|
r43346 | ) | ||
Patrick Mezard
|
r13614 | return None | ||
Martin Geisler
|
r11249 | |||
Augie Fackler
|
r43346 | |||
Boris Feld
|
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
|
r43347 | if b'eol' in ui._knownconfig: | ||
Boris Feld
|
r34831 | return | ||
Augie Fackler
|
r43347 | ui.setconfig(b'extensions', b'eol', b'', source=b'internal') | ||
extensions.loadall(ui, [b'eol']) | ||||
Boris Feld
|
r34831 | |||
Augie Fackler
|
r43346 | |||
Patrick Mezard
|
r13617 | def _checkhook(ui, repo, node, headsonly): | ||
# Get revisions to check and touched files at the same time | ||||
Boris Feld
|
r34831 | ensureenabled(ui) | ||
Martin Geisler
|
r11249 | files = set() | ||
Patrick Mezard
|
r13617 | revs = set() | ||
Gregory Szorc
|
r38806 | for rev in pycompat.xrange(repo[node].rev(), len(repo)): | ||
Patrick Mezard
|
r13617 | revs.add(rev) | ||
if headsonly: | ||||
Patrick Mezard
|
r13650 | ctx = repo[rev] | ||
files.update(ctx.files()) | ||||
Patrick Mezard
|
r13617 | for pctx in ctx.parents(): | ||
revs.discard(pctx.rev()) | ||||
Patrick Mezard
|
r13649 | failed = [] | ||
Patrick Mezard
|
r13617 | for rev in revs: | ||
Patrick Mezard
|
r13616 | ctx = repo[rev] | ||
eol = parseeol(ui, repo, [ctx.node()]) | ||||
if eol: | ||||
Patrick Mezard
|
r13649 | failed.extend(eol.checkrev(repo, ctx, files)) | ||
if failed: | ||||
Augie Fackler
|
r43347 | eols = {b'to-lf': b'CRLF', b'to-crlf': b'LF'} | ||
Patrick Mezard
|
r13649 | msgs = [] | ||
Bryan O'Sullivan
|
r27524 | for f, target, node in sorted(failed): | ||
Augie Fackler
|
r43346 | msgs.append( | ||
Augie Fackler
|
r43347 | _(b" %s in %s should not have %s line endings") | ||
Augie Fackler
|
r43346 | % (f, node, eols[target]) | ||
) | ||||
Augie Fackler
|
r43347 | raise errormod.Abort( | ||
_(b"end-of-line check failed:\n") + b"\n".join(msgs) | ||||
) | ||||
Martin Geisler
|
r11249 | |||
Augie Fackler
|
r43346 | |||
Patrick Mezard
|
r13617 | def checkallhook(ui, repo, node, hooktype, **kwargs): | ||
"""verify that files have expected EOLs""" | ||||
_checkhook(ui, repo, node, False) | ||||
Augie Fackler
|
r43346 | |||
Patrick Mezard
|
r13617 | def checkheadshook(ui, repo, node, hooktype, **kwargs): | ||
"""verify that files have expected EOLs""" | ||||
_checkhook(ui, repo, node, True) | ||||
Augie Fackler
|
r43346 | |||
Patrick Mezard
|
r13617 | # "checkheadshook" used to be called "hook" | ||
hook = checkheadshook | ||||
Martin Geisler
|
r11249 | |||
Augie Fackler
|
r43346 | |||
Martin Geisler
|
r11249 | def preupdate(ui, repo, hooktype, parent1, parent2): | ||
Martin von Zweigbergk
|
r37696 | p1node = scmutil.resolvehexnodeidprefix(repo, parent1) | ||
Martin von Zweigbergk
|
r37525 | repo.loadeol([p1node]) | ||
Martin Geisler
|
r11249 | return False | ||
Augie Fackler
|
r43346 | |||
Martin Geisler
|
r11249 | def uisetup(ui): | ||
Augie Fackler
|
r43347 | ui.setconfig(b'hooks', b'preupdate.eol', preupdate, b'eol') | ||
Martin Geisler
|
r11249 | |||
Augie Fackler
|
r43346 | |||
Martin Geisler
|
r11249 | def extsetup(ui): | ||
try: | ||||
Augie Fackler
|
r43347 | extensions.find(b'win32text') | ||
Augie Fackler
|
r43346 | ui.warn( | ||
_( | ||||
Augie Fackler
|
r43347 | b"the eol extension is incompatible with the " | ||
b"win32text extension\n" | ||||
Augie Fackler
|
r43346 | ) | ||
) | ||||
Martin Geisler
|
r11249 | except KeyError: | ||
pass | ||||
def reposetup(ui, repo): | ||||
Steve Borho
|
r12307 | uisetup(repo.ui) | ||
Martin Geisler
|
r11249 | |||
if not repo.local(): | ||||
return | ||||
Gregory Szorc
|
r43375 | for name, fn in pycompat.iteritems(filters): | ||
Martin Geisler
|
r11249 | repo.adddatafilter(name, fn) | ||
Augie Fackler
|
r43347 | ui.setconfig(b'patch', b'eol', b'auto', b'eol') | ||
Martin Geisler
|
r11249 | |||
class eolrepo(repo.__class__): | ||||
Patrick Mezard
|
r13614 | def loadeol(self, nodes): | ||
eol = parseeol(self.ui, self, nodes) | ||||
Patrick Mezard
|
r13613 | if eol is None: | ||
Patrick Mezard
|
r13612 | return None | ||
Stepan Koltsov
|
r14854 | eol.copytoui(self.ui) | ||
Patrick Mezard
|
r13613 | return eol.match | ||
Martin Geisler
|
r11249 | |||
def _hgcleardirstate(self): | ||||
Mads Kiilerich
|
r43478 | self._eolmatch = self.loadeol([None]) | ||
Mads Kiilerich
|
r30113 | if not self._eolmatch: | ||
self._eolmatch = util.never | ||||
Martin Geisler
|
r11249 | return | ||
Mads Kiilerich
|
r30140 | oldeol = None | ||
Martin Geisler
|
r11249 | try: | ||
Augie Fackler
|
r43347 | cachemtime = os.path.getmtime(self.vfs.join(b"eol.cache")) | ||
Martin Geisler
|
r11249 | except OSError: | ||
cachemtime = 0 | ||||
Mads Kiilerich
|
r30140 | else: | ||
Augie Fackler
|
r43347 | olddata = self.vfs.read(b"eol.cache") | ||
Mads Kiilerich
|
r30140 | if olddata: | ||
oldeol = eolfile(self.ui, self.root, olddata) | ||||
Martin Geisler
|
r11249 | |||
try: | ||||
Augie Fackler
|
r43347 | eolmtime = os.path.getmtime(self.wjoin(b".hgeol")) | ||
Martin Geisler
|
r11249 | except OSError: | ||
eolmtime = 0 | ||||
Mads Kiilerich
|
r43475 | if eolmtime >= cachemtime and eolmtime > 0: | ||
Augie Fackler
|
r43347 | self.ui.debug(b"eol: detected change in .hgeol\n") | ||
Mads Kiilerich
|
r30140 | |||
Augie Fackler
|
r43347 | hgeoldata = self.wvfs.read(b'.hgeol') | ||
Mads Kiilerich
|
r30140 | neweol = eolfile(self.ui, self.root, hgeoldata) | ||
Martin Geisler
|
r11249 | wlock = None | ||
try: | ||||
wlock = self.wlock() | ||||
Martin Geisler
|
r13581 | for f in self.dirstate: | ||
Augie Fackler
|
r43347 | if self.dirstate[f] != b'n': | ||
Mads Kiilerich
|
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
|
r43347 | with self.vfs(b"eol.cache", b"w") as f: | ||
Mads Kiilerich
|
r30140 | f.write(hgeoldata) | ||
r32995 | except errormod.LockUnavailable: | |||
Martin Geisler
|
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
|
r30164 | finally: | ||
if wlock is not None: | ||||
wlock.release() | ||||
Martin Geisler
|
r11249 | |||
Valentin Gatien-Baron
|
r42839 | def commitctx(self, ctx, error=False, origctx=None): | ||
Martin Geisler
|
r11249 | for f in sorted(ctx.added() + ctx.modified()): | ||
Mads Kiilerich
|
r30113 | if not self._eolmatch(f): | ||
Martin Geisler
|
r11249 | continue | ||
Mads Kiilerich
|
r23068 | fctx = ctx[f] | ||
if fctx is None: | ||||
Nicholas Riley
|
r14862 | continue | ||
Mads Kiilerich
|
r23068 | data = fctx.data() | ||
Yuya Nishihara
|
r37102 | if stringutil.binary(data): | ||
Martin Geisler
|
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
|
r43346 | raise errormod.Abort( | ||
Martin von Zweigbergk
|
r43387 | _(b"inconsistent newline style in %s\n") % f | ||
Augie Fackler
|
r43346 | ) | ||
Valentin Gatien-Baron
|
r42839 | return super(eolrepo, self).commitctx(ctx, error, origctx) | ||
Augie Fackler
|
r43346 | |||
Martin Geisler
|
r11249 | repo.__class__ = eolrepo | ||
repo._hgcleardirstate() | ||||