Patchwork [4,of,8] eol: update isbinary filter to work without compat wrapper

login
register
mail settings
Submitter Mads Kiilerich
Date Oct. 14, 2019, 12:13 a.m.
Message ID <5670699747c92d725927.1571012018@xps>
Download mbox | patch
Permalink /patch/42306/
State Accepted
Headers show

Comments

Mads Kiilerich - Oct. 14, 2019, 12:13 a.m.
# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 1571009598 -7200
#      Mon Oct 14 01:33:18 2019 +0200
# Node ID 5670699747c92d725927e25754817d5aa498d728
# Parent  1e663f4a658dbf6669c9bfd53918bf1daa734dc6
eol: update isbinary filter to work without compat wrapper

Patch

diff --git a/hgext/eol.py b/hgext/eol.py
--- a/hgext/eol.py
+++ b/hgext/eol.py
@@ -165,7 +165,7 @@  def tocrlf(s, params, ui, **kwargs):
     return util.tocrlf(s)
 
 
-def isbinary(s, params):
+def isbinary(s, params, ui, **kwargs):
     """Filter to do nothing with the file."""
     return s
 
diff --git a/tests/test-eol-update.t b/tests/test-eol-update.t
--- a/tests/test-eol-update.t
+++ b/tests/test-eol-update.t
@@ -187,7 +187,7 @@  from tip ... which evidently is wrong:
   calling hook preupdate.eol: hgext.eol.preupdate
    .hgeol: remote created -> g
   getting .hgeol
-  filtering .hgeol through compat-isbinary
+  filtering .hgeol through isbinary
    a.txt: remote created -> g
   getting a.txt
   filtering a.txt through tolf
@@ -200,7 +200,7 @@  from tip ... which evidently is wrong:
   $ touch .hgeol *  # ensure consistent dirtyness checks ignoring dirstate
   $ hg up -C -r 0 -v --debug
   eol: detected change in .hgeol
-  filtering .hgeol through compat-isbinary
+  filtering .hgeol through isbinary
   filtering a.txt through tolf
   resolving manifests
    branchmerge: False, force: True, partial: False
@@ -263,7 +263,7 @@  for f in revision 0, and it thus ends up
   calling hook preupdate.eol: hgext.eol.preupdate
    .hgeol: remote is newer -> g
   getting .hgeol
-  filtering .hgeol through compat-isbinary
+  filtering .hgeol through isbinary
    a.txt: remote is newer -> g
   getting a.txt
   filtering a.txt through tolf
@@ -275,7 +275,7 @@  for f in revision 0, and it thus ends up
   $ touch .hgeol *
   $ hg st --debug
   eol: detected change in .hgeol
-  filtering .hgeol through compat-isbinary
+  filtering .hgeol through isbinary
   filtering a.txt through tolf
   M f
   $ hg diff
@@ -291,7 +291,7 @@  Workaround: Update again - this will rea
   $ touch .hgeol *
   $ hg up -C -r 0 -v --debug
   eol: detected change in .hgeol
-  filtering .hgeol through compat-isbinary
+  filtering .hgeol through isbinary
   filtering a.txt through tolf
   resolving manifests
    branchmerge: False, force: True, partial: False
@@ -304,7 +304,7 @@  Workaround: Update again - this will rea
   $ touch .hgeol *
   $ hg st --debug
   eol: detected change in .hgeol
-  filtering .hgeol through compat-isbinary
+  filtering .hgeol through isbinary
   filtering a.txt through tolf
 
   $ cd ..