eol: update isbinary filter to work without compat wrapper
authorMads Kiilerich <mads@kiilerich.com>
Mon, 14 Oct 2019 01:33:18 +0200
changeset 43203 d38f9117ee15
parent 43202 8864aa96f1f6
child 43204 fd8c3f59b544
eol: update isbinary filter to work without compat wrapper
hgext/eol.py
tests/test-eol-update.t
--- a/hgext/eol.py	Sun Oct 13 02:05:19 2019 +0200
+++ b/hgext/eol.py	Mon Oct 14 01:33:18 2019 +0200
@@ -165,7 +165,7 @@
     return util.tocrlf(s)
 
 
-def isbinary(s, params):
+def isbinary(s, params, ui, **kwargs):
     """Filter to do nothing with the file."""
     return s
 
--- a/tests/test-eol-update.t	Sun Oct 13 02:05:19 2019 +0200
+++ b/tests/test-eol-update.t	Mon Oct 14 01:33:18 2019 +0200
@@ -187,7 +187,7 @@
   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 @@
   $ 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 @@
   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 @@
   $ 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 @@
   $ 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 @@
   $ 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 ..