comparison hgext/eol.py @ 32987:74930cf4a10e stable

eol: import 'error' as 'errormod'

We need the 'error' name available to fix another bug, so we rename the imported
module.

32827:d3ab31bf9c0e

import os
import re
from mercurial.i18n import _
from mercurial import (
    config,
    error,
    extensions,
    match,
    pycompat,
    util,
)

                else:
                    data = repo[node]['.hgeol'].data()
                return eolfile(ui, repo.root, data)
            except (IOError, LookupError):
                pass
    except error.ParseError as inst:
        ui.warn(_("warning: ignoring .hgeol file due to parse error "
                  "at %s: %s\n") % (inst.args[1], inst.args[0]))
    return None

def _checkhook(ui, repo, node, headsonly):

        eols = {'to-lf': 'CRLF', 'to-crlf': 'LF'}
        msgs = []
        for f, target, node in sorted(failed):
            msgs.append(_("  %s in %s should not have %s line endings") %
                        (f, node, eols[target]))
        raise error.Abort(_("end-of-line check failed:\n") + "\n".join(msgs))

def checkallhook(ui, repo, node, hooktype, **kwargs):
    """verify that files have expected EOLs"""
    _checkhook(ui, repo, node, False)

                        # the new .hgeol file specify a different filter
                        self.dirstate.normallookup(f)
                    # Write the cache to update mtime and cache .hgeol
                    with self.vfs("eol.cache", "w") as f:
                        f.write(hgeoldata)
                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.

                    # 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 error.Abort(_("inconsistent newline style "
                                       "in %s\n") % f)
            return super(eolrepo, self).commitctx(ctx, haserror)
    repo.__class__ = eolrepo
    repo._hgcleardirstate()

32987:74930cf4a10e

import os
import re
from mercurial.i18n import _
from mercurial import (
    config,
    error as errormod,
    extensions,
    match,
    pycompat,
    util,
)

                else:
                    data = repo[node]['.hgeol'].data()
                return eolfile(ui, repo.root, data)
            except (IOError, LookupError):
                pass
    except errormod.ParseError as inst:
        ui.warn(_("warning: ignoring .hgeol file due to parse error "
                  "at %s: %s\n") % (inst.args[1], inst.args[0]))
    return None

def _checkhook(ui, repo, node, headsonly):

        eols = {'to-lf': 'CRLF', 'to-crlf': 'LF'}
        msgs = []
        for f, target, node in sorted(failed):
            msgs.append(_("  %s in %s should not have %s line endings") %
                        (f, node, eols[target]))
        raise errormod.Abort(_("end-of-line check failed:\n") + "\n".join(msgs))

def checkallhook(ui, repo, node, hooktype, **kwargs):
    """verify that files have expected EOLs"""
    _checkhook(ui, repo, node, False)

                        # the new .hgeol file specify a different filter
                        self.dirstate.normallookup(f)
                    # Write the cache to update mtime and cache .hgeol
                    with self.vfs("eol.cache", "w") as f:
                        f.write(hgeoldata)
                except errormod.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.

                    # 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 errormod.Abort(_("inconsistent newline style "
                                           "in %s\n") % f)
            return super(eolrepo, self).commitctx(ctx, haserror)
    repo.__class__ = eolrepo
    repo._hgcleardirstate()